From 519b3851865ec599017d6f735f4e9fae2c55bd04 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 24 Nov 2008 10:51:59 +0000
Subject: [PATCH 001/510] setting trunk version to 1.7.001

---
 phpgwapi/setup/setup.inc.php             |   2 +-
 phpgwapi/setup/tables_update.inc.php     | 585 +---------------------
 phpgwapi/setup/tables_update_1_4.inc.php | 604 +++++++++++++++++++++++
 3 files changed, 610 insertions(+), 581 deletions(-)
 create mode 100644 phpgwapi/setup/tables_update_1_4.inc.php

diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index c5e55fdd3b..134b49d89d 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -12,7 +12,7 @@
 /* Basic information about this app */
 $setup_info['phpgwapi']['name']      = 'phpgwapi';
 $setup_info['phpgwapi']['title']     = 'eGroupWare API';
-$setup_info['phpgwapi']['version']   = '1.5.017';
+$setup_info['phpgwapi']['version']   = '1.7.001';
 $setup_info['phpgwapi']['versions']['current_header'] = '1.29';
 $setup_info['phpgwapi']['enable']    = 3;
 $setup_info['phpgwapi']['app_order'] = 1;
diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index 00a3937720..79776917c8 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -2,7 +2,7 @@
 /**
  * eGroupWare - API Setup
  *
- * Update scripts 1.4 --> 1.6
+ * Update scripts 1.6 --> 1.8
  *
  * @link http://www.egroupware.org
  * @package api
@@ -18,587 +18,12 @@ include('tables_update_0_9_12.inc.php');
 include('tables_update_0_9_14.inc.php');
 include('tables_update_1_0.inc.php');
 include('tables_update_1_2.inc.php');
-
-// updates from the stable 1.4 branch
-$test[] = '1.4.001';
-function phpgwapi_upgrade1_4_001()
-{
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
-}
-
-$test[] = '1.4.002';
-function phpgwapi_upgrade1_4_002()
-{
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
-}
-
-$test[] = '1.4.003';
-function phpgwapi_upgrade1_4_003()
-{
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
-}
-
-$test[] = '1.4.004';
-function phpgwapi_upgrade1_4_004()
-{
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
-}
-
-$test[] = '1.5.001';
-function phpgwapi_upgrade1_5_001()
-{
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','org_name',array(
-		'type' => 'varchar',
-		'precision' => '128',
-		'nullable' => true
-	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','contact_email',array(
-		'type' => 'varchar',
-		'precision' => '128',
-		'nullable' => true
-	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','contact_email_home',array(
-		'type' => 'varchar',
-		'precision' => '128',
-		'nullable' => true
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.002';
-}
-
-$test[] = '1.5.002';
-function phpgwapi_upgrade1_5_002()
-{
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_sqlfs',array(
-		'fd' => array(
-			'fs_id' => array('type' => 'auto','nullable' => False),
-			'fs_dir' => array('type' => 'int','precision' => '4','nullable' => False),
-			'fs_name' => array('type' => 'varchar','precision' => '200','nullable' => False),
-			'fs_mode' => array('type' => 'int','precision' => '2','nullable' => False),
-			'fs_uid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'fs_gid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'fs_created' => array('type' => 'timestamp','precision' => '8','nullable' => False,'default' => 'current_timestamp'),
-			'fs_modified' => array('type' => 'timestamp','precision' => '8','nullable' => False),
-			'fs_mime' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'fs_size' => array('type' => 'int','precision' => '8','nullable' => False),
-			'fs_creator' => array('type' => 'int','precision' => '4','nullable' => False),
-			'fs_modifier' => array('type' => 'int','precision' => '4'),
-			'fs_active' => array('type' => 'bool','nullable' => False,'default' => 't'),
-			'fs_comment' => array('type' => 'varchar','precision' => '255'),
-			'fs_content' => array('type' => 'blob')
-		),
-		'pk' => array('fs_id'),
-		'fk' => array(),
-		'ix' => array(array('fs_dir','fs_active','fs_name')),
-		'uc' => array()
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.003';
-}
-
-$test[] = '1.5.003';
-function phpgwapi_upgrade1_5_003()
-{
-	// import the current egw_vfs into egw_sqlfs
-	// ToDo: moving /infolog and /infolog/$app to /apps in the files dir!!!
-	$debug = $GLOBALS['DEBUG'];
-
-	// delete the table in case this update runs multiple times
-	$GLOBALS['egw_setup']->db->query('DELETE FROM egw_sqlfs',__LINE__,__FILE__);
-	if ($GLOBALS['egw_setup']->db->Type == 'mysql')
-	{
-		$GLOBALS['egw_setup']->db->query('ALTER TABLE egw_sqlfs  AUTO_INCREMENT=1',__LINE__,__FILE__);
-	}
-	// make sure the required dirs are there and have the following id's
-	$dirs = array(
-		'/' => 1,
-		'/home' => 2,
-		'/apps' => 3,
-	);
-	foreach($dirs as $path => $id)
-	{
-		$nrow = array(
-			'fs_id' => $id,
-			'fs_dir'  => $path == '/' ? 0 : $dirs['/'],
-			'fs_name' => substr($path,1),
-			'fs_mode' => 05,
-			'fs_uid' => 0,
-			'fs_gid' => 0,
-			'fs_created' => time(),
-			'fs_modified' => time(),
-			'fs_mime' => 'httpd/unix-directory',
-			'fs_size' => 0,
-			'fs_creator' => 0,
-			'fs_modifier' => 0,
-			'fs_comment' => null,
-			'fs_content' => null,
-		);
-		$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
-	}
-	$query = $GLOBALS['egw_setup']->db->select('egw_vfs','*',"vfs_mime_type != 'journal' AND vfs_mime_type != 'journal-deleted'",__LINE__,__FILE__,false,'ORDER BY length(vfs_directory) ASC','phpgwapi');
-	if ($debug) echo "rows=<pre>\n";
-
-	foreach($query as $row)
-	{
-		// rename the /infolog dir to /apps/infolog and /infolog/$app /apps/$app
-		if (substr($row['vfs_directory'],0,8) == '/infolog')
-		{
-			$parts = explode('/',$row['vfs_directory']);	// 0 = '', 1 = 'infolog', 2 = app or info_id
-			//$parts[1] = is_numeric($parts[2]) ? 'apps/infolog' : 'apps';
-			$parts[1] = $row['vfs_directory']=='/infolog' && is_numeric($row['vfs_name']) ||
-				$parts[1]=='infolog' && is_numeric($parts[2]) ? 'apps/infolog' : 'apps';
-			$row['vfs_directory'] = implode('/',$parts);
-		}
-		elseif ($row['vfs_directory'] == '/' && $row['vfs_name'] == 'infolog')
-		{
-			$row['vfs_directory'] = '/apps';
-		}
-		$nrow = array(
-			'fs_dir'  => $dirs[$row['vfs_directory']],
-			'fs_name' => $row['vfs_name'],
-			'fs_mode' => $row['vfs_owner_id'] > 0 ?
-				($row['vfs_mime_type'] == 'Directory' ? 0700 : 0600) :
-				($row['vfs_mime_type'] == 'Directory' ? 0070 : 0060),
-			'fs_uid' => $row['vfs_owner_id'] > 0 ? $row['vfs_owner_id'] : 0,
-			'fs_gid' => $row['vfs_owner_id'] < 0 ? -$row['vfs_owner_id'] : 0,
-			'fs_created' => $row['vfs_created'],
-			'fs_modified' => $row['vfs_modified'] ? $row['vfs_modified'] : $row['vfs_created'],
-			'fs_mime' => $row['vfs_mime_type'] == 'Directory' ? 'httpd/unix-directory' :
-				($row['vfs_mime_type'] ? $row['vfs_mime_type'] : 'application/octet-stream'),
-			'fs_size' => $row['vfs_size'],
-			'fs_creator' => $row['vfs_createdby_id'],
-			'fs_modifier' => $row['vfs_modifedby_id'],
-			'fs_comment' => $row['vfs_comment'] ? $row['vfs_comment'] : null,
-			'fs_content' => $row['vfs_content'],
-		);
-		if ($debug)
-		{
-			foreach($row as $key => $val)
-			{
-				if (is_numeric($key)) unset($row[$key]);
-			}
-			print_r($row);
-			print_r($nrow);
-		}
-		if ($row['vfs_mime_type'] == 'Directory')
-		{
-			$dir = ($row['vfs_directory'] == '/' ? '' : $row['vfs_directory']).'/'.$row['vfs_name'];
-
-			if (!isset($dirs[$dir]))	// ignoring doublicate dirs, my devel box has somehow many of them specially /home
-			{
-				$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
-				$dirs[$dir] = $GLOBALS['egw_setup']->db->get_last_insert_id('egw_sqlfs','fs_id');
-				if ($debug) echo "<b>$dir = {$dirs[$dir]}</b>\n";
-			}
-			elseif ($debug)
-			{
-				echo "<b>ignoring doublicate directory '$dir'!</b>\n";
-			}
-		}
-		else
-		{
-			$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
-		}
-
-	}
-	if ($debug)
-	{
-		echo "dirs=";
-		print_r($dirs);
-		echo "</pre>\n";
-	}
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.004';
-}
-
-$test[] = '1.5.004';
-function phpgwapi_upgrade1_5_004()
-{
-	// convert the filemanager group grants into extended ACL
-
-	// delete all sqlfs entries from the ACL table, in case we run multiple times
-	$GLOBALS['egw_setup']->db->delete('egw_acl',array('acl_appname' => sqlfs_stream_wrapper::EACL_APPNAME),__LINE__,__FILE__);
-
-	$GLOBALS['egw_setup']->setup_account_object();
-	$accounts = $GLOBALS['egw_setup']->accounts;
-	$accounts = new accounts();
-
-	egw_vfs::$is_root = true;	// we need root rights to set the extended acl, without being the owner
-
-	foreach($GLOBALS['egw_setup']->db->select('egw_acl','*',array(
-		'acl_appname' => 'filemanager',
-		"acl_location != 'run'",
-	),__LINE__,__FILE__) as $row)
-	{
-		$rights = egw_vfs::READABLE | egw_vfs::EXECUTABLE;
-		if($row['acl_rights'] > 1) $rights |= egw_vfs::WRITABLE;
-
-		if (($lid = $accounts->id2name($row['acl_account'])) && $accounts->exists($row['acl_location']))
-		{
-			$ret = sqlfs_stream_wrapper::eacl('/home/'.$lid,$rights,(int)$row['acl_location']);
-			//echo "<p>sqlfs_stream_wrapper::eacl('/home/$lid',$rights,$row[acl_location])=$ret</p>\n";
-		}
-	}
-	egw_vfs::$is_root = false;
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.005';
-}
-
-$test[] = '1.5.005';
-function phpgwapi_upgrade1_5_005()
-{
-	// move /infolog/$app to /apps/$app and /infolog to /apps/infolog
-
-	$files_dir = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
-		'config_name' => 'files_dir',
-		'config_app' => 'phpgwapi',
-	),__LINE__,__FILE__)->fetchSingle();
-
-	if ($files_dir && file_exists($files_dir) && file_exists($files_dir.'/infolog'))
-	{
-		mkdir($files_dir.'/apps',0700,true);
-		if (($dir = opendir($files_dir.'/infolog')))
-		{
-			while(($app = readdir($dir)))
-			{
-				if (!is_numeric($app) && $app[0] != '.')	// ingore infolog entries and . or ..
-				{
-					rename($files_dir.'/infolog/'.$app,$files_dir.'/apps/'.$app);
-				}
-			}
-			closedir($dir);
-			rename($files_dir.'/infolog',$files_dir.'/apps/infolog');
-		}
-	}
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.006';
-}
-
-$test[] = '1.5.006';
-function phpgwapi_upgrade1_5_006()
-{
-	// drop filescenter tables, if filecenter is not installed
-	static $filescenter_tables = array(
-		'phpgw_vfs2_mimetypes',
-		'phpgw_vfs2_files',
-		'phpgw_vfs2_customfields',
-		'phpgw_vfs2_quota',
-		'phpgw_vfs2_shares',
-		'phpgw_vfs2_versioning',
-		'phpgw_vfs2_customfields_data',
-		'phpgw_vfs2_prefixes',
-	);
-	$filescenter_app = $GLOBALS['egw_setup']->db->select('egw_applications','*',array(
-		'app_name' => 'filescenter',
-	),__LINE__,__FILE__)->fetchSingle();
-
-	if (!$filescenter_app || !is_dir(EGW_INCLUDE_ROOT.'/filescenter'))
-	{
-		foreach($filescenter_tables as $table)
-		{
-			$GLOBALS['egw_setup']->oProc->DropTable($table);
-		}
-		if ($filescenter_app)	// app installed, but no sources --> deinstall it
-		{
-			$GLOBALS['egw_setup']->db->delete('egw_applications',array(
-				'app_name' => 'filescenter',
-			),__LINE__,__FILE__);
-		}
-	}
-	else
-	{
-		// move tables to the filescenter app
-		$GLOBALS['egw_setup']->db->update('egw_applications',array(
-			'app_tables' => implode(',',$filescenter_tables),
-		),array(
-			'app_name' => 'filescenter',
-		),__LINE__,__FILE__);
-	}
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.007';
-}
-
-$test[] = '1.5.007';
-function phpgwapi_upgrade1_5_007()
-{
-	// tables for the eGW-wide index
-
-	foreach(array(
-	'egw_index_keywords' => array(
-		'fd' => array(
-			'si_id' => array('type' => 'auto','nullable' => False),
-			'si_keyword' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'si_ignore' => array('type' => 'bool')
-		),
-		'pk' => array('si_id'),
-		'fk' => array(),
-		'ix' => array(),
-		'uc' => array('si_keyword')
-	),
-	'egw_index' => array(
-		'fd' => array(
-			'si_app' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'si_app_id' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'si_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'si_owner' => array('type' => 'int','precision' => '4','nullable' => False)
-		),
-		'pk' => array('si_app','si_app_id','si_id'),
-		'fk' => array(),
-		'ix' => array('si_id'),
-		'uc' => array()
-	),
-	'egw_cat2entry' => array(
-		'fd' => array(
-			'ce_app' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'ce_app_id' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'cat_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'ce_owner' => array('type' => 'int','precision' => '4','nullable' => False)
-		),
-		'pk' => array('ce_app','ce_app_id','cat_id'),
-		'fk' => array(),
-		'ix' => array('cat_id'),
-		'uc' => array()
-	)) as $table => $definition)
-	{
-		$GLOBALS['egw_setup']->oProc->CreateTable($table,$definition);
-	}
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.008';
-}
-
-$test[] = '1.5.008';
-function phpgwapi_upgrade1_5_008()
-{
-	// add UID and etag columns to addressbook, required eg. for CardDAV
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','contact_etag',array(
-		'type' => 'int',
-		'precision' => '4',
-		'default' => '0',
-	));
-
-	// add UID column to addressbook, required eg. for CardDAV
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','contact_uid',array(
-		'type' => 'varchar',
-		'precision' => '255'
-	));
-
-	$GLOBALS['egw_setup']->db->query("SELECT config_value FROM egw_config WHERE config_app='phpgwapi' AND config_name='install_id'",__LINE__,__FILE__);
-	$install_id = $GLOBALS['egw_setup']->db->next_record() ? $GLOBALS['egw_setup']->db->f(0) : md5(time());
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_addressbook SET contact_uid='.$GLOBALS['egw_setup']->db->concat("'addressbook-'",'contact_id',"'-$install_id'"),__LINE__,__FILE__);
-
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_addressbook',array('contact_uid'),false);
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.009';
-}
-
-$test[] = '1.5.009';
-function phpgwapi_upgrade1_5_009()
-{
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_locks',array(
-		'fd' => array(
-			'lock_token' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'lock_path' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'lock_expires' => array('type' => 'int','precision' => '8','nullable' => False),
-			'lock_owner' => array('type' => 'varchar','precision' => '255'),
-			'lock_recursive' => array('type' => 'bool','nullable' => False,'default' => '0'),
-			'lock_write' => array('type' => 'bool','nullable' => False,'default' => '0'),
-			'lock_exclusive' => array('type' => 'bool','nullable' => False,'default' => '0'),
-			'lock_created' => array('type' => 'int','precision' => '8','default' => '0'),
-			'lock_modified' => array('type' => 'int','precision' => '8','default' => '0')
-		),
-		'pk' => array('lock_token'),
-		'fk' => array(),
-		'ix' => array('lock_path','lock_expires'),
-		'uc' => array()
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.010';
-}
-
-function phpgwapi_upgrade1_5_010()
-{
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_applications','app_icon',array(
-		'type' => 'varchar',
-		'precision' => '32'
-	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_applications','app_icon_app',array(
-		'type' => 'varchar',
-		'precision' => '25'
-	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_applications','app_index',array(
-		'type' => 'varchar',
-		'precision' => '64'
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.011';
-}
+include('tables_update_1_4.inc.php');
 
 /**
- * Move sqlfs files from their path based location to the new (hashed) id base one and removed the not longer used dirs
- *
- * @return string
+ * Update from the stable 1.6 branch to the new devel branch 1.7.xxx
  */
-function phpgwapi_upgrade1_5_011()
+function phpgwapi_upgrade1_6_001()
 {
-	if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST'])) echo "<pre style='text-align: left;'>\n";
-	egw_vfs::$is_root = true;
-	egw_vfs::load_wrapper('sqlfs');
-	egw_vfs::find('sqlfs://default/',array(
-		'url'  => true,
-		'depth' => true,
-	),create_function('$url,$stat','
-		$new_path = sqlfs_stream_wrapper::_fs_path($stat["ino"]);	// loads egw_info/server/files_dir (!)
-		if (file_exists($old_path = $GLOBALS["egw_info"]["server"]["files_dir"].($path=parse_url($url,PHP_URL_PATH))))
-		{
-			if (!is_dir($old_path))
-			{
-				if ($GLOBALS["DEBUG"]) echo "moving file $old_path --> $new_path\n";
-				if (!file_exists($parent = dirname($new_path))) mkdir($parent,0777,true);	// 777 because setup-cli might run eg. by root
-				rename($old_path,$new_path);
-			}
-			elseif($path != "/")
-			{
-				if ($GLOBALS["DEBUG"]) echo "removing directory $old_path\n";
-				rmdir($old_path);
-			}
-		}
-		elseif(!($stat["mode"] & sqlfs_stream_wrapper::MODE_DIR))
-		{
-			echo "phpgwapi_upgrade1_5_011() $url: $old_path not found!\n";
-		}
-	'));
-	if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST'])) echo "</pre>\n";
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.012';
-}
-
-function phpgwapi_upgrade1_5_012()
-{
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_sqlfs_props',array(
-		'fd' => array(
-			'fs_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'prop_namespace' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'prop_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'prop_value' => array('type' => 'text')
-		),
-		'pk' => array('fs_id','prop_namespace','prop_name'),
-		'fk' => array(),
-		'ix' => array(),
-		'uc' => array()
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.013';
-}
-
-function phpgwapi_upgrade1_5_013()
-{
-	foreach($GLOBALS['egw_setup']->db->select('egw_sqlfs','fs_id,fs_comment',"fs_comment IS NOT NULL AND fs_comment != ''",__LINE__,__FILE__) as $row)
-	{
-		$GLOBALS['egw_setup']->db->insert('egw_sqlfs_props',array(
-			'fs_id' => $row['fs_id'],
-			'prop_namespace' => 'http://egroupware.org/',
-			'prop_name' => 'comment',
-			'prop_value' => $row['fs_comment'],
-		),false,__LINE__,__FILE__);
-	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_sqlfs',array(
-		'fd' => array(
-			'fs_id' => array('type' => 'auto','nullable' => False),
-			'fs_dir' => array('type' => 'int','precision' => '4','nullable' => False),
-			'fs_name' => array('type' => 'varchar','precision' => '200','nullable' => False),
-			'fs_mode' => array('type' => 'int','precision' => '2','nullable' => False),
-			'fs_uid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'fs_gid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'fs_created' => array('type' => 'timestamp','precision' => '8','nullable' => False,'default' => 'current_timestamp'),
-			'fs_modified' => array('type' => 'timestamp','precision' => '8','nullable' => False),
-			'fs_mime' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'fs_size' => array('type' => 'int','precision' => '8','nullable' => False),
-			'fs_creator' => array('type' => 'int','precision' => '4','nullable' => False),
-			'fs_modifier' => array('type' => 'int','precision' => '4'),
-			'fs_active' => array('type' => 'bool','nullable' => False,'default' => 't'),
-			'fs_content' => array('type' => 'blob')
-		),
-		'pk' => array('fs_id'),
-		'fk' => array(),
-		'ix' => array(array('fs_dir','fs_active','fs_name')),
-		'uc' => array()
-	),'fs_comment');
-
-	// no automatic timestamp for created field, as it would update on every update
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_sqlfs','fs_created',array(
-		'type' => 'timestamp',
-		'precision' => '8',
-		'nullable' => False
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.014';
-}
-
-function phpgwapi_upgrade1_5_014()
-{
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_history_log','history_status',array(
-		'type' => 'varchar',
-		'precision' => '64',
-		'nullable' => False
-	));
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.015';
-}
-
-/**
- * Move files created directly in the root of sqlfs (fs_id < 100) into a /00 directory,
- * as they would conflict with dirnames in that directory.
- *
- * This update does nothing, if the files are already in the correct directory
- */
-function phpgwapi_upgrade1_5_015()
-{
-	sqlfs_stream_wrapper::_fs_path(1);	// loads egw_info/server/files_dir (!)
-	$sqlfs_dir = $GLOBALS['egw_info']['server']['files_dir'].'/sqlfs';
-
-	if (file_exists($sqlfs_dir) && ($d = opendir($sqlfs_dir)))
-	{
-		while(($f = readdir($d)))
-		{
-			if (is_file($old_name = $sqlfs_dir.'/'.$f))
-			{
-				if (!$zero_dir)
-				{
-					if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST'])) echo "<pre style='text-align: left;'>\n";
- 					mkdir($zero_dir = $sqlfs_dir.'/00',0777);
-					echo "created dir for files with fs_id < 100: $zero_dir\n";
-				}
-				$new_name = $zero_dir.'/'.$f;
-				if ($GLOBALS['DEBUG']) echo "moving file $old_name --> $new_name\n";
-				rename($old_name,$new_name);
-			}
-		}
-		closedir($d);
-		if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST']) && $zero_dir) echo "</pre>\n";
-	}
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.016';
-}
-
-/**
- * Drop no longer needed egw_api_content_history.sync_guid column
- */
-function phpgwapi_upgrade1_5_016()
-{
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_api_content_history',array(
-		'fd' => array(
-			'sync_appname' => array('type' => 'varchar','precision' => '60','nullable' => False),
-			'sync_contentid' => array('type' => 'varchar','precision' => '60','nullable' => False),
-			'sync_added' => array('type' => 'timestamp'),
-			'sync_modified' => array('type' => 'timestamp'),
-			'sync_deleted' => array('type' => 'timestamp'),
-			'sync_id' => array('type' => 'auto','nullable' => False),
-			'sync_changedby' => array('type' => 'int','precision' => '4','nullable' => False)
-		),
-		'pk' => array('sync_id'),
-		'fk' => array(),
-		'ix' => array('sync_added','sync_modified','sync_deleted','sync_guid','sync_changedby',array('sync_appname','sync_contentid')),
-		'uc' => array()
-	),'sync_guid');
-
-	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.017';
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
 }
diff --git a/phpgwapi/setup/tables_update_1_4.inc.php b/phpgwapi/setup/tables_update_1_4.inc.php
new file mode 100644
index 0000000000..5423cd1fad
--- /dev/null
+++ b/phpgwapi/setup/tables_update_1_4.inc.php
@@ -0,0 +1,604 @@
+<?php
+/**
+ * eGroupWare - API Setup
+ *
+ * Update scripts 1.4 --> 1.6
+ *
+ * @link http://www.egroupware.org
+ * @package api
+ * @subpackage setup
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+// updates from the stable 1.4 branch
+$test[] = '1.4.001';
+function phpgwapi_upgrade1_4_001()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
+}
+
+$test[] = '1.4.002';
+function phpgwapi_upgrade1_4_002()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
+}
+
+$test[] = '1.4.003';
+function phpgwapi_upgrade1_4_003()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
+}
+
+$test[] = '1.4.004';
+function phpgwapi_upgrade1_4_004()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.001';
+}
+
+$test[] = '1.5.001';
+function phpgwapi_upgrade1_5_001()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','org_name',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => true
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','contact_email',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => true
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','contact_email_home',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => true
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.002';
+}
+
+$test[] = '1.5.002';
+function phpgwapi_upgrade1_5_002()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_sqlfs',array(
+		'fd' => array(
+			'fs_id' => array('type' => 'auto','nullable' => False),
+			'fs_dir' => array('type' => 'int','precision' => '4','nullable' => False),
+			'fs_name' => array('type' => 'varchar','precision' => '200','nullable' => False),
+			'fs_mode' => array('type' => 'int','precision' => '2','nullable' => False),
+			'fs_uid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+			'fs_gid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+			'fs_created' => array('type' => 'timestamp','precision' => '8','nullable' => False,'default' => 'current_timestamp'),
+			'fs_modified' => array('type' => 'timestamp','precision' => '8','nullable' => False),
+			'fs_mime' => array('type' => 'varchar','precision' => '64','nullable' => False),
+			'fs_size' => array('type' => 'int','precision' => '8','nullable' => False),
+			'fs_creator' => array('type' => 'int','precision' => '4','nullable' => False),
+			'fs_modifier' => array('type' => 'int','precision' => '4'),
+			'fs_active' => array('type' => 'bool','nullable' => False,'default' => 't'),
+			'fs_comment' => array('type' => 'varchar','precision' => '255'),
+			'fs_content' => array('type' => 'blob')
+		),
+		'pk' => array('fs_id'),
+		'fk' => array(),
+		'ix' => array(array('fs_dir','fs_active','fs_name')),
+		'uc' => array()
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.003';
+}
+
+$test[] = '1.5.003';
+function phpgwapi_upgrade1_5_003()
+{
+	// import the current egw_vfs into egw_sqlfs
+	// ToDo: moving /infolog and /infolog/$app to /apps in the files dir!!!
+	$debug = $GLOBALS['DEBUG'];
+
+	// delete the table in case this update runs multiple times
+	$GLOBALS['egw_setup']->db->query('DELETE FROM egw_sqlfs',__LINE__,__FILE__);
+	if ($GLOBALS['egw_setup']->db->Type == 'mysql')
+	{
+		$GLOBALS['egw_setup']->db->query('ALTER TABLE egw_sqlfs  AUTO_INCREMENT=1',__LINE__,__FILE__);
+	}
+	// make sure the required dirs are there and have the following id's
+	$dirs = array(
+		'/' => 1,
+		'/home' => 2,
+		'/apps' => 3,
+	);
+	foreach($dirs as $path => $id)
+	{
+		$nrow = array(
+			'fs_id' => $id,
+			'fs_dir'  => $path == '/' ? 0 : $dirs['/'],
+			'fs_name' => substr($path,1),
+			'fs_mode' => 05,
+			'fs_uid' => 0,
+			'fs_gid' => 0,
+			'fs_created' => time(),
+			'fs_modified' => time(),
+			'fs_mime' => 'httpd/unix-directory',
+			'fs_size' => 0,
+			'fs_creator' => 0,
+			'fs_modifier' => 0,
+			'fs_comment' => null,
+			'fs_content' => null,
+		);
+		$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
+	}
+	$query = $GLOBALS['egw_setup']->db->select('egw_vfs','*',"vfs_mime_type != 'journal' AND vfs_mime_type != 'journal-deleted'",__LINE__,__FILE__,false,'ORDER BY length(vfs_directory) ASC','phpgwapi');
+	if ($debug) echo "rows=<pre>\n";
+
+	foreach($query as $row)
+	{
+		// rename the /infolog dir to /apps/infolog and /infolog/$app /apps/$app
+		if (substr($row['vfs_directory'],0,8) == '/infolog')
+		{
+			$parts = explode('/',$row['vfs_directory']);	// 0 = '', 1 = 'infolog', 2 = app or info_id
+			//$parts[1] = is_numeric($parts[2]) ? 'apps/infolog' : 'apps';
+			$parts[1] = $row['vfs_directory']=='/infolog' && is_numeric($row['vfs_name']) ||
+				$parts[1]=='infolog' && is_numeric($parts[2]) ? 'apps/infolog' : 'apps';
+			$row['vfs_directory'] = implode('/',$parts);
+		}
+		elseif ($row['vfs_directory'] == '/' && $row['vfs_name'] == 'infolog')
+		{
+			$row['vfs_directory'] = '/apps';
+		}
+		$nrow = array(
+			'fs_dir'  => $dirs[$row['vfs_directory']],
+			'fs_name' => $row['vfs_name'],
+			'fs_mode' => $row['vfs_owner_id'] > 0 ?
+				($row['vfs_mime_type'] == 'Directory' ? 0700 : 0600) :
+				($row['vfs_mime_type'] == 'Directory' ? 0070 : 0060),
+			'fs_uid' => $row['vfs_owner_id'] > 0 ? $row['vfs_owner_id'] : 0,
+			'fs_gid' => $row['vfs_owner_id'] < 0 ? -$row['vfs_owner_id'] : 0,
+			'fs_created' => $row['vfs_created'],
+			'fs_modified' => $row['vfs_modified'] ? $row['vfs_modified'] : $row['vfs_created'],
+			'fs_mime' => $row['vfs_mime_type'] == 'Directory' ? 'httpd/unix-directory' :
+				($row['vfs_mime_type'] ? $row['vfs_mime_type'] : 'application/octet-stream'),
+			'fs_size' => $row['vfs_size'],
+			'fs_creator' => $row['vfs_createdby_id'],
+			'fs_modifier' => $row['vfs_modifedby_id'],
+			'fs_comment' => $row['vfs_comment'] ? $row['vfs_comment'] : null,
+			'fs_content' => $row['vfs_content'],
+		);
+		if ($debug)
+		{
+			foreach($row as $key => $val)
+			{
+				if (is_numeric($key)) unset($row[$key]);
+			}
+			print_r($row);
+			print_r($nrow);
+		}
+		if ($row['vfs_mime_type'] == 'Directory')
+		{
+			$dir = ($row['vfs_directory'] == '/' ? '' : $row['vfs_directory']).'/'.$row['vfs_name'];
+
+			if (!isset($dirs[$dir]))	// ignoring doublicate dirs, my devel box has somehow many of them specially /home
+			{
+				$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
+				$dirs[$dir] = $GLOBALS['egw_setup']->db->get_last_insert_id('egw_sqlfs','fs_id');
+				if ($debug) echo "<b>$dir = {$dirs[$dir]}</b>\n";
+			}
+			elseif ($debug)
+			{
+				echo "<b>ignoring doublicate directory '$dir'!</b>\n";
+			}
+		}
+		else
+		{
+			$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
+		}
+
+	}
+	if ($debug)
+	{
+		echo "dirs=";
+		print_r($dirs);
+		echo "</pre>\n";
+	}
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.004';
+}
+
+$test[] = '1.5.004';
+function phpgwapi_upgrade1_5_004()
+{
+	// convert the filemanager group grants into extended ACL
+
+	// delete all sqlfs entries from the ACL table, in case we run multiple times
+	$GLOBALS['egw_setup']->db->delete('egw_acl',array('acl_appname' => sqlfs_stream_wrapper::EACL_APPNAME),__LINE__,__FILE__);
+
+	$GLOBALS['egw_setup']->setup_account_object();
+	$accounts = $GLOBALS['egw_setup']->accounts;
+	$accounts = new accounts();
+
+	egw_vfs::$is_root = true;	// we need root rights to set the extended acl, without being the owner
+
+	foreach($GLOBALS['egw_setup']->db->select('egw_acl','*',array(
+		'acl_appname' => 'filemanager',
+		"acl_location != 'run'",
+	),__LINE__,__FILE__) as $row)
+	{
+		$rights = egw_vfs::READABLE | egw_vfs::EXECUTABLE;
+		if($row['acl_rights'] > 1) $rights |= egw_vfs::WRITABLE;
+
+		if (($lid = $accounts->id2name($row['acl_account'])) && $accounts->exists($row['acl_location']))
+		{
+			$ret = sqlfs_stream_wrapper::eacl('/home/'.$lid,$rights,(int)$row['acl_location']);
+			//echo "<p>sqlfs_stream_wrapper::eacl('/home/$lid',$rights,$row[acl_location])=$ret</p>\n";
+		}
+	}
+	egw_vfs::$is_root = false;
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.005';
+}
+
+$test[] = '1.5.005';
+function phpgwapi_upgrade1_5_005()
+{
+	// move /infolog/$app to /apps/$app and /infolog to /apps/infolog
+
+	$files_dir = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
+		'config_name' => 'files_dir',
+		'config_app' => 'phpgwapi',
+	),__LINE__,__FILE__)->fetchSingle();
+
+	if ($files_dir && file_exists($files_dir) && file_exists($files_dir.'/infolog'))
+	{
+		mkdir($files_dir.'/apps',0700,true);
+		if (($dir = opendir($files_dir.'/infolog')))
+		{
+			while(($app = readdir($dir)))
+			{
+				if (!is_numeric($app) && $app[0] != '.')	// ingore infolog entries and . or ..
+				{
+					rename($files_dir.'/infolog/'.$app,$files_dir.'/apps/'.$app);
+				}
+			}
+			closedir($dir);
+			rename($files_dir.'/infolog',$files_dir.'/apps/infolog');
+		}
+	}
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.006';
+}
+
+$test[] = '1.5.006';
+function phpgwapi_upgrade1_5_006()
+{
+	// drop filescenter tables, if filecenter is not installed
+	static $filescenter_tables = array(
+		'phpgw_vfs2_mimetypes',
+		'phpgw_vfs2_files',
+		'phpgw_vfs2_customfields',
+		'phpgw_vfs2_quota',
+		'phpgw_vfs2_shares',
+		'phpgw_vfs2_versioning',
+		'phpgw_vfs2_customfields_data',
+		'phpgw_vfs2_prefixes',
+	);
+	$filescenter_app = $GLOBALS['egw_setup']->db->select('egw_applications','*',array(
+		'app_name' => 'filescenter',
+	),__LINE__,__FILE__)->fetchSingle();
+
+	if (!$filescenter_app || !is_dir(EGW_INCLUDE_ROOT.'/filescenter'))
+	{
+		foreach($filescenter_tables as $table)
+		{
+			$GLOBALS['egw_setup']->oProc->DropTable($table);
+		}
+		if ($filescenter_app)	// app installed, but no sources --> deinstall it
+		{
+			$GLOBALS['egw_setup']->db->delete('egw_applications',array(
+				'app_name' => 'filescenter',
+			),__LINE__,__FILE__);
+		}
+	}
+	else
+	{
+		// move tables to the filescenter app
+		$GLOBALS['egw_setup']->db->update('egw_applications',array(
+			'app_tables' => implode(',',$filescenter_tables),
+		),array(
+			'app_name' => 'filescenter',
+		),__LINE__,__FILE__);
+	}
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.007';
+}
+
+$test[] = '1.5.007';
+function phpgwapi_upgrade1_5_007()
+{
+	// tables for the eGW-wide index
+
+	foreach(array(
+	'egw_index_keywords' => array(
+		'fd' => array(
+			'si_id' => array('type' => 'auto','nullable' => False),
+			'si_keyword' => array('type' => 'varchar','precision' => '64','nullable' => False),
+			'si_ignore' => array('type' => 'bool')
+		),
+		'pk' => array('si_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array('si_keyword')
+	),
+	'egw_index' => array(
+		'fd' => array(
+			'si_app' => array('type' => 'varchar','precision' => '25','nullable' => False),
+			'si_app_id' => array('type' => 'varchar','precision' => '50','nullable' => False),
+			'si_id' => array('type' => 'int','precision' => '4','nullable' => False),
+			'si_owner' => array('type' => 'int','precision' => '4','nullable' => False)
+		),
+		'pk' => array('si_app','si_app_id','si_id'),
+		'fk' => array(),
+		'ix' => array('si_id'),
+		'uc' => array()
+	),
+	'egw_cat2entry' => array(
+		'fd' => array(
+			'ce_app' => array('type' => 'varchar','precision' => '25','nullable' => False),
+			'ce_app_id' => array('type' => 'varchar','precision' => '50','nullable' => False),
+			'cat_id' => array('type' => 'int','precision' => '4','nullable' => False),
+			'ce_owner' => array('type' => 'int','precision' => '4','nullable' => False)
+		),
+		'pk' => array('ce_app','ce_app_id','cat_id'),
+		'fk' => array(),
+		'ix' => array('cat_id'),
+		'uc' => array()
+	)) as $table => $definition)
+	{
+		$GLOBALS['egw_setup']->oProc->CreateTable($table,$definition);
+	}
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.008';
+}
+
+$test[] = '1.5.008';
+function phpgwapi_upgrade1_5_008()
+{
+	// add UID and etag columns to addressbook, required eg. for CardDAV
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','contact_etag',array(
+		'type' => 'int',
+		'precision' => '4',
+		'default' => '0',
+	));
+
+	// add UID column to addressbook, required eg. for CardDAV
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','contact_uid',array(
+		'type' => 'varchar',
+		'precision' => '255'
+	));
+
+	$GLOBALS['egw_setup']->db->query("SELECT config_value FROM egw_config WHERE config_app='phpgwapi' AND config_name='install_id'",__LINE__,__FILE__);
+	$install_id = $GLOBALS['egw_setup']->db->next_record() ? $GLOBALS['egw_setup']->db->f(0) : md5(time());
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_addressbook SET contact_uid='.$GLOBALS['egw_setup']->db->concat("'addressbook-'",'contact_id',"'-$install_id'"),__LINE__,__FILE__);
+
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_addressbook',array('contact_uid'),false);
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.009';
+}
+
+$test[] = '1.5.009';
+function phpgwapi_upgrade1_5_009()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_locks',array(
+		'fd' => array(
+			'lock_token' => array('type' => 'varchar','precision' => '255','nullable' => False),
+			'lock_path' => array('type' => 'varchar','precision' => '255','nullable' => False),
+			'lock_expires' => array('type' => 'int','precision' => '8','nullable' => False),
+			'lock_owner' => array('type' => 'varchar','precision' => '255'),
+			'lock_recursive' => array('type' => 'bool','nullable' => False,'default' => '0'),
+			'lock_write' => array('type' => 'bool','nullable' => False,'default' => '0'),
+			'lock_exclusive' => array('type' => 'bool','nullable' => False,'default' => '0'),
+			'lock_created' => array('type' => 'int','precision' => '8','default' => '0'),
+			'lock_modified' => array('type' => 'int','precision' => '8','default' => '0')
+		),
+		'pk' => array('lock_token'),
+		'fk' => array(),
+		'ix' => array('lock_path','lock_expires'),
+		'uc' => array()
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.010';
+}
+
+function phpgwapi_upgrade1_5_010()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_applications','app_icon',array(
+		'type' => 'varchar',
+		'precision' => '32'
+	));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_applications','app_icon_app',array(
+		'type' => 'varchar',
+		'precision' => '25'
+	));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_applications','app_index',array(
+		'type' => 'varchar',
+		'precision' => '64'
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.011';
+}
+
+/**
+ * Move sqlfs files from their path based location to the new (hashed) id base one and removed the not longer used dirs
+ *
+ * @return string
+ */
+function phpgwapi_upgrade1_5_011()
+{
+	if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST'])) echo "<pre style='text-align: left;'>\n";
+	egw_vfs::$is_root = true;
+	egw_vfs::load_wrapper('sqlfs');
+	egw_vfs::find('sqlfs://default/',array(
+		'url'  => true,
+		'depth' => true,
+	),create_function('$url,$stat','
+		$new_path = sqlfs_stream_wrapper::_fs_path($stat["ino"]);	// loads egw_info/server/files_dir (!)
+		if (file_exists($old_path = $GLOBALS["egw_info"]["server"]["files_dir"].($path=parse_url($url,PHP_URL_PATH))))
+		{
+			if (!is_dir($old_path))
+			{
+				if ($GLOBALS["DEBUG"]) echo "moving file $old_path --> $new_path\n";
+				if (!file_exists($parent = dirname($new_path))) mkdir($parent,0777,true);	// 777 because setup-cli might run eg. by root
+				rename($old_path,$new_path);
+			}
+			elseif($path != "/")
+			{
+				if ($GLOBALS["DEBUG"]) echo "removing directory $old_path\n";
+				rmdir($old_path);
+			}
+		}
+		elseif(!($stat["mode"] & sqlfs_stream_wrapper::MODE_DIR))
+		{
+			echo "phpgwapi_upgrade1_5_011() $url: $old_path not found!\n";
+		}
+	'));
+	if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST'])) echo "</pre>\n";
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.012';
+}
+
+function phpgwapi_upgrade1_5_012()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_sqlfs_props',array(
+		'fd' => array(
+			'fs_id' => array('type' => 'int','precision' => '4','nullable' => False),
+			'prop_namespace' => array('type' => 'varchar','precision' => '64','nullable' => False),
+			'prop_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
+			'prop_value' => array('type' => 'text')
+		),
+		'pk' => array('fs_id','prop_namespace','prop_name'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.013';
+}
+
+function phpgwapi_upgrade1_5_013()
+{
+	foreach($GLOBALS['egw_setup']->db->select('egw_sqlfs','fs_id,fs_comment',"fs_comment IS NOT NULL AND fs_comment != ''",__LINE__,__FILE__) as $row)
+	{
+		$GLOBALS['egw_setup']->db->insert('egw_sqlfs_props',array(
+			'fs_id' => $row['fs_id'],
+			'prop_namespace' => 'http://egroupware.org/',
+			'prop_name' => 'comment',
+			'prop_value' => $row['fs_comment'],
+		),false,__LINE__,__FILE__);
+	}
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_sqlfs',array(
+		'fd' => array(
+			'fs_id' => array('type' => 'auto','nullable' => False),
+			'fs_dir' => array('type' => 'int','precision' => '4','nullable' => False),
+			'fs_name' => array('type' => 'varchar','precision' => '200','nullable' => False),
+			'fs_mode' => array('type' => 'int','precision' => '2','nullable' => False),
+			'fs_uid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+			'fs_gid' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+			'fs_created' => array('type' => 'timestamp','precision' => '8','nullable' => False,'default' => 'current_timestamp'),
+			'fs_modified' => array('type' => 'timestamp','precision' => '8','nullable' => False),
+			'fs_mime' => array('type' => 'varchar','precision' => '64','nullable' => False),
+			'fs_size' => array('type' => 'int','precision' => '8','nullable' => False),
+			'fs_creator' => array('type' => 'int','precision' => '4','nullable' => False),
+			'fs_modifier' => array('type' => 'int','precision' => '4'),
+			'fs_active' => array('type' => 'bool','nullable' => False,'default' => 't'),
+			'fs_content' => array('type' => 'blob')
+		),
+		'pk' => array('fs_id'),
+		'fk' => array(),
+		'ix' => array(array('fs_dir','fs_active','fs_name')),
+		'uc' => array()
+	),'fs_comment');
+
+	// no automatic timestamp for created field, as it would update on every update
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_sqlfs','fs_created',array(
+		'type' => 'timestamp',
+		'precision' => '8',
+		'nullable' => False
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.014';
+}
+
+function phpgwapi_upgrade1_5_014()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_history_log','history_status',array(
+		'type' => 'varchar',
+		'precision' => '64',
+		'nullable' => False
+	));
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.015';
+}
+
+/**
+ * Move files created directly in the root of sqlfs (fs_id < 100) into a /00 directory,
+ * as they would conflict with dirnames in that directory.
+ *
+ * This update does nothing, if the files are already in the correct directory
+ */
+function phpgwapi_upgrade1_5_015()
+{
+	sqlfs_stream_wrapper::_fs_path(1);	// loads egw_info/server/files_dir (!)
+	$sqlfs_dir = $GLOBALS['egw_info']['server']['files_dir'].'/sqlfs';
+
+	if (file_exists($sqlfs_dir) && ($d = opendir($sqlfs_dir)))
+	{
+		while(($f = readdir($d)))
+		{
+			if (is_file($old_name = $sqlfs_dir.'/'.$f))
+			{
+				if (!$zero_dir)
+				{
+					if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST'])) echo "<pre style='text-align: left;'>\n";
+ 					mkdir($zero_dir = $sqlfs_dir.'/00',0777);
+					echo "created dir for files with fs_id < 100: $zero_dir\n";
+				}
+				$new_name = $zero_dir.'/'.$f;
+				if ($GLOBALS['DEBUG']) echo "moving file $old_name --> $new_name\n";
+				rename($old_name,$new_name);
+			}
+		}
+		closedir($d);
+		if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST']) && $zero_dir) echo "</pre>\n";
+	}
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.016';
+}
+
+/**
+ * Drop no longer needed egw_api_content_history.sync_guid column
+ */
+function phpgwapi_upgrade1_5_016()
+{
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_api_content_history',array(
+		'fd' => array(
+			'sync_appname' => array('type' => 'varchar','precision' => '60','nullable' => False),
+			'sync_contentid' => array('type' => 'varchar','precision' => '60','nullable' => False),
+			'sync_added' => array('type' => 'timestamp'),
+			'sync_modified' => array('type' => 'timestamp'),
+			'sync_deleted' => array('type' => 'timestamp'),
+			'sync_id' => array('type' => 'auto','nullable' => False),
+			'sync_changedby' => array('type' => 'int','precision' => '4','nullable' => False)
+		),
+		'pk' => array('sync_id'),
+		'fk' => array(),
+		'ix' => array('sync_added','sync_modified','sync_deleted','sync_guid','sync_changedby',array('sync_appname','sync_contentid')),
+		'uc' => array()
+	),'sync_guid');
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.5.017';
+}
+
+/**
+ * Final 1.6 release
+ */
+function phpgwapi_upgrade1_5_017()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.6.001';
+}

From 1eb956fdf5b5be05347128284881b861395e75a6 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 25 Nov 2008 19:36:02 +0000
Subject: [PATCH 002/510] "- do not send session data for clients doing no
 sessions to memcached - use 10min session lifetime for GroupDAV as for
 anonymous sessions"

---
 phpgwapi/inc/class.egw_session_memcache.inc.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_session_memcache.inc.php b/phpgwapi/inc/class.egw_session_memcache.inc.php
index 4fac5a9a4a..51c7339e20 100644
--- a/phpgwapi/inc/class.egw_session_memcache.inc.php
+++ b/phpgwapi/inc/class.egw_session_memcache.inc.php
@@ -106,7 +106,7 @@ class egw_session_memcache
 	 * According to a commentary on php.net (session_set_save_handler) this function has to return
 	 * a string, if the session-id is NOT found, not false. Returning false terminates the script
 	 * with a fatal error!
-	 * 
+	 *
 	 * @param string $id
 	 * @return string|boolean false on error, '' for not found session otherwise session data
 	 */
@@ -137,8 +137,13 @@ class egw_session_memcache
 	{
 		$lifetime = (int)ini_get('session.gc_maxlifetime');
 
+		if ($id == 'no-session')
+		{
+			return true;	// no need to save
+		}
 		// give anon sessions only a lifetime of 10min
-		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A')
+		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A' ||
+			$GLOBALS['egw_info']['flags']['currentapp'] == 'groupdav')
 		{
 			$lifetime = 600;
 		}

From 340e369e0478218d158872be28ea42c497eaa310 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 27 Nov 2008 10:31:19 +0000
Subject: [PATCH 003/510] "fixed changed constructor name"

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

diff --git a/etemplate/inc/class.contact_widget.inc.php b/etemplate/inc/class.contact_widget.inc.php
index 84370f80c7..6281aeffa5 100644
--- a/etemplate/inc/class.contact_widget.inc.php
+++ b/etemplate/inc/class.contact_widget.inc.php
@@ -81,7 +81,7 @@ class contact_widget
 		{
 			case 'contact-fields':
 				$GLOBALS['egw']->translation->add_app('addressbook');
-				$this->contacts->contacts();
+				$this->contacts->__construct();
 				$cell['sel_options'] = $this->contacts->contact_fields;
 				foreach($this->contacts->customfields as $name => $data)
 				{

From 687f6b0a16ac4d985a71dc3aa7acd7a0dbe3d80f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 28 Nov 2008 12:24:02 +0000
Subject: [PATCH 004/510] fixed bug with the multiple category adding (no
 category select dialog appeared)

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

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index b8eac299a7..901b9e96e3 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1964,7 +1964,7 @@ $readonlys['button[vcard]'] = true;
 				if (selbox.value == "infolog_add" && (ids = get_selected(selbox.form,"[rows][checked][]")) && !document.getElementById("exec[use_all]").checked) {
 					win=window.open("'.egw::link('/index.php','menuaction=infolog.infolog_ui.edit&type=task&action=addressbook&action_id=').'"+ids,"_blank","width=750,height=550,left=100,top=200");
 					win.focus();
-				} else if (this.value == "cat_add") {
+				} else if (selbox.value == "cat_add") {
 					win=window.open("'.egw::link('/etemplate/process_exec.php','menuaction=addressbook.addressbook_ui.cat_add').'","_blank","width=300,height=400,left=100,top=200");
 					win.focus();
 				} else {

From e025a14a08363bfbfabfb0e22e7c32f502b3ed11 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 5 Dec 2008 10:26:07 +0000
Subject: [PATCH 005/510] putting some debug into the send class to find
 problems more easily

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

diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index b06679ae0c..92407a18ef 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -31,7 +31,7 @@
 	{
 		var $err    = array();
 		var $to_res = array();
-
+		var $debug  = false;
 		/**
 		* eGW specific initialisation of the PHPMailer: charset, language, smtp-host, ...
 		*
@@ -42,6 +42,7 @@
 		{
 			if ($this->Subject || $this->Body || count($this->to))
 			{
+				if ($this->debug) error_log(__METHOD__." ".print_r($this->Subject,true)." to be send");
 				return PHPMailer::Send();
 			}
 			$this->CharSet = $GLOBALS['egw']->translation->charset();
@@ -56,6 +57,7 @@
 
 			$bopreferences    =& CreateObject('felamimail.bopreferences');
 			if ($bopreferences) {
+				if ($this->debug) error_log(__METHOD__." using felamimail preferences for mailing.");
 				$preferences  = $bopreferences->getPreferences();
 				if ($preferences) {
 					$ogServer = $preferences->getOutgoingServer(0);
@@ -69,9 +71,13 @@
 							$this->Username = $username;
 							$this->Password = $ogServer->password;
 						}
+						if ($this->debug) error_log(__METHOD__." using Host ".print_r($this->Host,true)." to be send");
+						if ($this->debug) error_log(__METHOD__." using User ".print_r($this->Username,true)." to be send");
+						if ($this->debug) error_log(__METHOD__." using Sender ".print_r($this->Sender,true)." to be send");
 					}
 				}
 			} else {
+				if ($this->debug) error_log(__METHOD__." using global config to send");
 				$this->Host = $GLOBALS['egw_info']['server']['smtp_server']?$GLOBALS['egw_info']['server']['smtp_server']:'localhost';
 				$this->Port = $GLOBALS['egw_info']['server']['smtp_port']?$GLOBALS['egw_info']['server']['smtp_port']:25;
 				$this->SMTPAuth = !empty($GLOBALS['egw_info']['server']['smtp_auth_user']);
@@ -79,6 +85,9 @@
 				if (isset($senderadress) && !empty($senderadress)) $this->Sender = $senderadress;
 				$this->Username = $username;
 				$this->Password = $GLOBALS['egw_info']['server']['smtp_auth_passwd'];
+				if ($this->debug) error_log(__METHOD__." using Host ".print_r($this->Host,true)." to be send");
+				if ($this->debug) error_log(__METHOD__." using User ".print_r($this->Username,true)." to be send");
+				if ($this->debug) error_log(__METHOD__." using Sender ".print_r($this->Sender,true)." to be send");
 			}
 			$this->Hostname = $GLOBALS['egw_info']['server']['hostname'];
 		}
@@ -110,6 +119,7 @@
 		*/
 		function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='', $content_type='', $boundary='Message-Boundary')
 		{
+			if ($this->debug) error_log(__METHOD__." to='$to',subject='$subject',,'$msgtype',cc='$cc',bcc='$bcc',from='$from',sender='$sender'");
 			//echo "<p>send::msg(,to='$to',subject='$subject',,'$msgtype',cc='$cc',bcc='$bcc',from='$from',sender='$sender','$content_type','$boundary')<pre>$body</pre>\n";
 			$this->ClearAll();	// reset everything to its default, we might be called more then once !!!
 

From dd749ffa6eb7f4320f04dc25b8322399cf346550 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 5 Dec 2008 21:27:12 +0000
Subject: [PATCH 006/510] Add special handling for query values of 'false' (the
 string) to convert them to false (boolean)

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

diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php
index 801616b42e..5e31f9fbf2 100644
--- a/etemplate/inc/class.ajax_select_widget.inc.php
+++ b/etemplate/inc/class.ajax_select_widget.inc.php
@@ -267,7 +267,7 @@
 			}
 
 			// Expand lists
-			foreach($query as $key => $row) {
+			foreach($query as $key => &$row) {
 				if(strpos($row, ',')) {
 					$query[$key] = explode(',', $row);
 				}
@@ -275,6 +275,8 @@
 				// sometimes it sends 'null' (not null)
 				if($row == 'null') {
 					unset($query[$key]);
+				} elseif (strtolower($row) == 'false') {
+					$row = false;
 				}
 			}
 			$query['search'] = $value;

From f28eed197310e856411f9fe3aa1960145f393fb6 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 12:59:03 +0000
Subject: [PATCH 007/510] enabling debug in some cases, switched off, as
 default

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

diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index 30cee2fb4c..7dc03869ca 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -69,7 +69,7 @@ class preferences
 	var $table = 'egw_preferences';
 
 	var $values,$vars;	// standard notify substitues, will be set by standard_substitues()
-
+	var $debug = false;
 	/**
 	 * Standard constructor for setting $this->account_id
 	 */
@@ -110,6 +110,7 @@ class preferences
 		}
 		foreach($vals as $key => $val)
 		{
+			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
@@ -147,6 +148,7 @@ class preferences
 	 */
 	function standard_substitutes()
 	{
+		if ($this->debug) error_log(__METHOD__." is called ");
 		if (!is_array(@$GLOBALS['egw_info']['user']['preferences']))
 		{
 			$GLOBALS['egw_info']['user']['preferences'] = $this->data;	// else no lang()

From 91c5e6d23c373b625ed680b5c11cebb69940ac40 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 13:07:29 +0000
Subject: [PATCH 008/510] print out the standard substitutes, if debug is
 switched on

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

diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index 7dc03869ca..0bc9be9909 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -176,6 +176,7 @@ class preferences
 			'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
 			'date'      => lang('todays date, eg. "%1"',$this->values['date']),
 		);
+		if ($this->debug) error_log(__METHOD__.print_r($this->vars,true));
 		// do the substituetion in the effective prefs (data)
 		//
 		foreach($this->data as $app => $data)

From 96491ed272e55f9f9356ec51d78981d6f49bde2c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 14:02:10 +0000
Subject: [PATCH 009/510] more debug for calendar notification

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

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index e7c77b31f1..2231733fdb 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -513,6 +513,7 @@ class calendar_boupdate extends calendar_bo
 		}
 		foreach($to_notify as $userid => $statusid)
 		{
+			if ($this->debug > 0) error_log(__METHOD__." trying to notify $userid, with $statusid");
 			if (!is_numeric($userid))
 			{
 				$res_info = $this->resource_info($userid);
@@ -595,11 +596,11 @@ class calendar_boupdate extends calendar_bo
 						$notification->send();
 					}
 					catch (Exception $exception) {
-						error_log('error while notifying user '.$userid.':'.$exception->getMessage());
+						error_log(__METHOD__.' error while notifying user '.$userid.':'.$exception->getMessage());
 						continue;
 					}
 				} else {
-					error_log('calendar: cannot send any notifications because notifications is not installed');
+					error_log(__METHOD__.' cannot send any notifications because notifications is not installed');
 				}
 			}
 		}

From 80c3da850d89ba85ad231eaa5b2de1ec1679f51b Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 14:02:13 +0000
Subject: [PATCH 010/510] enable debug for send class to be passed to
 phpmailer/smtp

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

diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 92407a18ef..3858fec1ff 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -31,7 +31,8 @@
 	{
 		var $err    = array();
 		var $to_res = array();
-		var $debug  = false;
+		// switching on debug with a numeric value other than 0, switches debug in PHPMailer/SMTP Class on
+		var $debug  = false; // false;
 		/**
 		* eGW specific initialisation of the PHPMailer: charset, language, smtp-host, ...
 		*
@@ -45,6 +46,7 @@
 				if ($this->debug) error_log(__METHOD__." ".print_r($this->Subject,true)." to be send");
 				return PHPMailer::Send();
 			}
+			if ($this->debug && is_numeric($this->debug)) $this->SMTPDebug = $this->debug;
 			$this->CharSet = $GLOBALS['egw']->translation->charset();
 			list($lang,$nation) = explode('-',$GLOBALS['egw_info']['user']['preferences']['common']['lang']);
 			$lang_path = EGW_SERVER_ROOT.'/phpgwapi/setup/';

From a6d7f0caf36e1386e7edc4bcaaf2db0b4833a7ac Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 14:02:15 +0000
Subject: [PATCH 011/510] more debug information for notification failure

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

diff --git a/notifications/inc/class.notifications_email.inc.php b/notifications/inc/class.notifications_email.inc.php
index ce9de0dbba..f00e21218d 100644
--- a/notifications/inc/class.notifications_email.inc.php
+++ b/notifications/inc/class.notifications_email.inc.php
@@ -101,10 +101,10 @@ class notifications_email implements notifications_iface {
 		if(is_array($_attachments) && count($_attachments) > 0) {
 		  foreach($_attachments as $attachment) {
 			$this->mail->AddStringAttachment($attachment->string, $attachment->filename, $attachment->encoding, $attachment->type);
-		}
+		  }
 		}
 		if(!$error=$this->mail->Send()) {
-			throw new Exception("Failed sending notification message via email.$error");
+			throw new Exception("Failed sending notification message via email.$error".print_r($this->mail->ErrorInfo,true));
 		}
 	}
 

From 5cf2da77fae873c7c1f12553ceb9e48e298c4137 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 14:02:17 +0000
Subject: [PATCH 012/510] directing debug to error_log

---
 phpgwapi/inc/class.smtp.php | 126 ++++++++++++++++++------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/phpgwapi/inc/class.smtp.php b/phpgwapi/inc/class.smtp.php
index e59efffce1..753e62d614 100644
--- a/phpgwapi/inc/class.smtp.php
+++ b/phpgwapi/inc/class.smtp.php
@@ -126,8 +126,8 @@ class SMTP {
                            "errno" => $errno,
                            "errstr" => $errstr);
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": $errstr ($errno)" . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": $errstr ($errno)" . $this->CRLF);
       }
       return false;
     }
@@ -147,7 +147,7 @@ class SMTP {
     //   socket_set_timeout($this->smtp_conn, 0, 100000);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
+      error_log(__METHOD__."->". "SMTP -> FROM SERVER:" . $this->CRLF . $announce);
     }
 
     return true;
@@ -176,7 +176,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 220) {
@@ -185,7 +185,7 @@ class SMTP {
                "smtp_code" => $code,
                "smtp_msg"  => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -220,8 +220,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -238,8 +238,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -256,8 +256,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -277,8 +277,8 @@ class SMTP {
         // hmm this is an odd situation... the socket is
         // valid but we are not connected anymore
         if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF .
-                 "EOF caught while checking if connected";
+            error_log(__METHOD__."->". "SMTP -> NOTICE:" . $this->CRLF .
+                 "EOF caught while checking if connected");
         }
         $this->Close();
         return false;
@@ -343,7 +343,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->". "SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 354) {
@@ -352,8 +352,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -452,15 +452,15 @@ class SMTP {
 		        "smtp_msg" => "(nothing)");
 
 		if($this->do_debug >= 1) {
-		        echo "SMTP -> ERROR: " . $this->error["error"] .
-		        ": " . $rply . $this->CRLF;
+		        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+		        ": " . $rply . $this->CRLF);
 		}
 		return false;
 	}
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->". "SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -469,8 +469,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -508,7 +508,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -517,8 +517,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -583,7 +583,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER: " . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -592,8 +592,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -638,7 +638,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->". "SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 211 && $code != 214) {
@@ -647,8 +647,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -686,7 +686,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->". "SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -695,8 +695,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -728,7 +728,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -737,8 +737,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -772,7 +772,7 @@ class SMTP {
     $byemsg = $this->get_lines();
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $byemsg);
     }
 
     $rval = true;
@@ -786,8 +786,8 @@ class SMTP {
                  "smtp_rply" => substr($byemsg,4));
       $rval = false;
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " .
-                 $byemsg . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $e["error"] . ": " .
+                 $byemsg . $this->CRLF);
       }
     }
 
@@ -825,7 +825,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->". "SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250 && $code != 251) {
@@ -834,8 +834,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -869,7 +869,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -878,8 +878,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -918,7 +918,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -927,8 +927,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -966,7 +966,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -975,8 +975,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -1014,7 +1014,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250) {
@@ -1023,8 +1023,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -1048,7 +1048,7 @@ class SMTP {
     $this->error = array("error" => "This method, TURN, of the SMTP ".
                                     "is not implemented");
     if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
+      error_log(__METHOD__."->"."SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF);
     }
     return false;
   }
@@ -1081,7 +1081,7 @@ class SMTP {
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+      error_log(__METHOD__."->"."SMTP -> FROM SERVER:" . $this->CRLF . $rply);
     }
 
     if($code != 250 && $code != 251) {
@@ -1090,8 +1090,8 @@ class SMTP {
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] .
-                 ": " . $rply . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] .
+                 ": " . $rply . $this->CRLF);
       }
       return false;
     }
@@ -1115,14 +1115,14 @@ class SMTP {
     $data = "";
     while($str = @fgets($this->smtp_conn,515)) {
       if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" .
-                 $this->CRLF;
-        echo "SMTP -> get_lines(): \$str is \"$str\"" .
-                 $this->CRLF;
+        error_log(__METHOD__."->"."SMTP -> get_lines(): \$data was \"$data\"" .
+                 $this->CRLF);
+        error_log(__METHOD__."->"."SMTP -> get_lines(): \$str is \"$str\"" .
+                 $this->CRLF);
       }
       $data .= $str;
       if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
+        error_log(__METHOD__."->". "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF);
       }
       // if the 4th character is a space then we are done reading
       // so just break the loop

From 0ec64072a296399e3a018e0eb29520632ec7ca24 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 14:02:22 +0000
Subject: [PATCH 013/510] enabling more info FOR THE ERROR_LOG

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

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index ad0593d4da..c32d05c175 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -739,7 +739,10 @@ class egw_session
 		$this->sessionid = $sessionid;
 		$this->kp3       = $kp3;
 
-		if (!$this->sessionid) return false;
+		if (!$this->sessionid) {
+			if (self::$errorlog_debug) error_log(__METHOD__."('$sessionid')_REQUEST[sessionid]='$_REQUEST[sessionid]' No session ID");
+			return false;
+		}
 
 		session_name(self::EGW_SESSION_NAME);
 		session_id($this->sessionid);

From 76faf17eb06a47117f2e749e5d3702919a7939e5 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 9 Dec 2008 15:25:26 +0000
Subject: [PATCH 014/510] strange phenomenon with existing debug variable

---
 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 0bc9be9909..a4b5056d3c 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -69,7 +69,7 @@ class preferences
 	var $table = 'egw_preferences';
 
 	var $values,$vars;	// standard notify substitues, will be set by standard_substitues()
-	var $debug = false;
+	#var $debug = false;
 	/**
 	 * Standard constructor for setting $this->account_id
 	 */

From 66bb41b0650f919ce7e1555e77b640f1be617c97 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 9 Dec 2008 16:02:01 +0000
Subject: [PATCH 015/510] Check to see if the value is a string before we try
 to lowercase it, strtolower() doesn't like arrays.

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

diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php
index 5e31f9fbf2..9b6e1fb822 100644
--- a/etemplate/inc/class.ajax_select_widget.inc.php
+++ b/etemplate/inc/class.ajax_select_widget.inc.php
@@ -275,7 +275,7 @@
 				// sometimes it sends 'null' (not null)
 				if($row == 'null') {
 					unset($query[$key]);
-				} elseif (strtolower($row) == 'false') {
+				} elseif (is_string($row) && strtolower($row) == 'false') {
 					$row = false;
 				}
 			}

From fad2227b8cd1bc11171657b01f26d8e9feea8999 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Wed, 10 Dec 2008 19:47:22 +0000
Subject: [PATCH 016/510] Added new function set_skip_backends() to
 notifications class. The calling application now can set backends which must
 be skipped even if the user has set the backend to be executed in its prefs.
 This is useful for e.g. notifying about new mails in future (where a user
 pref "notify me by mail" does not make sense).

---
 notifications/inc/class.notifications.inc.php | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/notifications/inc/class.notifications.inc.php b/notifications/inc/class.notifications.inc.php
index 050c7b90ca..4838d05d42 100644
--- a/notifications/inc/class.notifications.inc.php
+++ b/notifications/inc/class.notifications.inc.php
@@ -42,6 +42,13 @@ final class notifications {
 	 */
 	private $backends = array('popup', 'winpopup', 'email', 'sms');
 	
+	/**
+	 * backends to skip even if the user has chosen it
+	 * this could be set by the calling application
+	 * @var array
+	 */
+	private $skip_backends = array();
+	
 	/** 
 	 * pre-defined notificaton chains
 	 * @abstract
@@ -316,6 +323,17 @@ final class notifications {
 		return true;
 	}
 	
+	/**
+	 * Sets backends that should be skipped even if the user
+	 * defined them in its chain
+	 *
+	 * @param array $_skip_backends array with names of the backends to be skipped
+	 * e.g. array('popup', 'winpopup')
+	 */
+	public function set_skip_backends(array $_skip_backends) {
+		$this->skip_backends = $_skip_backends;
+	}
+	
 	/**
 	 * sends notifications
 	 */
@@ -373,9 +391,16 @@ final class notifications {
 					continue; //user disabled notifications
 				}
 
-				foreach($notification_chain as $notification_backend => $action) {
+				foreach($notification_chain as $backend => $action) {
 					try {
-						$notification_backend = self::_appname.'_'.$notification_backend;
+						// check if backend should be skipped
+						if( in_array($backend, $this->skip_backends) ) {
+							// log as error just for the case too much skipping prevents user from being notified
+							$backend_errors[] = $backend.' will be skipped (as defined by calling application)';
+							continue;
+						}
+						
+						$notification_backend = self::_appname.'_'.$backend;
 						if(!file_exists(EGW_INCLUDE_ROOT. SEP. self::_appname. SEP. 'inc'. SEP. 'class.'. $notification_backend. '.inc.php')) {
 							throw new Exception('file for '.$notification_backend. ' does not exist');
 						}
@@ -393,19 +418,19 @@ final class notifications {
 						if($action == 'fail' || $action == 'continue') {
 							continue;
 						}
-						// all backends failed - give error message
-						if(!$user_notified) {
-							error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
-							foreach($backend_errors as $id=>$backend_error) {
-								error_log($backend_error);
-							}
-						}
 						break; // stop running through chain
 					}
 					// backend sucseeded
 					$user_notified = true;
 					if($action == 'stop' || $action == 'fail') { break; } // stop running through chain				
 				}
+				// check if the user has been notified at all
+				if(!$user_notified) {
+					error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
+					foreach($backend_errors as $id=>$backend_error) {
+						error_log($backend_error);
+					}
+				}
 			}
 			catch (Exception $exception_user) {
 				error_log('Error: notification of receiver '.$receiver->handle.' failed: '.$exception_user->getMessage());

From 632003f9fed8aae28e3f1435ee66313b9c684848 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 11 Dec 2008 13:44:47 +0000
Subject: [PATCH 017/510] buffer and provide debug on missing participants to
 an event

---
 calendar/inc/class.calendar_bo.inc.php | 41 +++++++++++++++-----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index e319694242..165fc8de36 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -1002,27 +1002,34 @@ class calendar_bo
 			// Check if the $user is one of the participants or has a read-grant from one of them
 			// in that case he has an implicite READ grant for that event
 			//
-			foreach($event['participants'] as $uid => $accept)
+			if ($event['participants'] && is_array($event['participants']))
 			{
-				if ($uid == $user || $uid < 0 && in_array($user,$GLOBALS['egw']->accounts->members($uid,true)))
+				foreach($event['participants'] as $uid => $accept)
 				{
-					// if we are a participant, we have an implicite READ and PRIVAT grant
-					$grants |= EGW_ACL_READ | EGW_ACL_PRIVATE;
-					break;
-				}
-				elseif ($this->grants[$uid] & EGW_ACL_READ)
-				{
-					// if we have a READ grant from a participant, we dont give an implicit privat grant too
-					$grants |= EGW_ACL_READ;
-					// we cant break here, as we might be a participant too, and would miss the privat grant
-				}
-				elseif (!is_numeric($uid))
-				{
-					// if we have a resource as participant
-					$resource = $this->resource_info($uid);
-					$grants |= $resource['rights'];
+					if ($uid == $user || $uid < 0 && in_array($user,$GLOBALS['egw']->accounts->members($uid,true)))
+					{
+						// if we are a participant, we have an implicite READ and PRIVAT grant
+						$grants |= EGW_ACL_READ | EGW_ACL_PRIVATE;
+						break;
+					}
+					elseif ($this->grants[$uid] & EGW_ACL_READ)
+					{
+						// if we have a READ grant from a participant, we dont give an implicit privat grant too
+						$grants |= EGW_ACL_READ;
+						// we cant break here, as we might be a participant too, and would miss the privat grant
+					}
+					elseif (!is_numeric($uid))
+					{
+						// if we have a resource as participant
+						$resource = $this->resource_info($uid);
+						$grants |= $resource['rights'];
+					}
 				}
 			}
+			else
+			{
+				error_log(__METHOD__." no participants for event:".print_r($event,true));
+			}
 		}
 
 		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == EGW_ACL_ADD)

From 42b2b639b3c2c66735e6799fb400a5bc1c22ce72 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 12 Dec 2008 09:47:54 +0000
Subject: [PATCH 018/510] increasing the version number of
 infolog.edit.description and infolog.index.rows after a case-study regarding
 the enabling of HTML in Infolog description. The issue was soon dropped after
 experiencing massive problems with: sync, listview, performance, etc. If you
 are intrested in trying it, contact me for the source snippets. But I wont
 recommend that for anything near production

---
 infolog/setup/etemplates.inc.php | 60 +++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index a47ac61364..f88506996c 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-10-07 15:18
+	* generated by soetemplate::dump4setup() 2008-12-12 10:43
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -12,12 +12,17 @@
 
 $templ_version=1;
 
+$templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:3:"typ";s:8:"onchange";s:1:"1";s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
+.error_msg { color: red; font-style: italics; }','modified' => '1061729975',);
+
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1159943136',);
 
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:3:{s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";s:1:"F";s:3:"80%";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:7:",header";s:5:"label";s:15:"Group owner for";s:4:"name";s:5:"type2";}i:2;a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:11:"None,groups";s:4:"name";s:11:"group_owner";s:4:"help";s:119:"If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!";s:4:"span";s:10:",lpadding5";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1173687088',);
 
+$templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1061734964',);
+
 $templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;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:8:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"3";s:4:"name";s:13:"${row}[type2]";s:4:"help";s:41:"for which types should this field be used";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"${row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1061734964',);
 
 $templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;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:8:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"3";s:4:"name";s:13:"${row}[type2]";s:4:"help";s:41:"for which types should this field be used";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"${row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1061734964',);
@@ -30,6 +35,14 @@ $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','
 
 $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"h4";s:2:"50";s:2:"c3";s:7:",bottom";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:5:"align";s:6:"center";s:4:"name";s:27:"infolog.index.rows-noheader";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:45:"Are you shure you want to delete this entry ?";s:5:"align";s:6:"center";}}i:4;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Yes - Delete";s:4:"name";s:6:"delete";s:4:"help";s:75:"Sub-entries become subs of the parent or main entries, if there\'s no parent";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:34:"Yes - Delete including sub-entries";s:4:"name";s:11:"delete_subs";s:4:"help";s:44:"Delete this entry and all listed sub-entries";}s:5:"align";s:6:"center";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"No - Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:22:"Abort without deleting";}}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1131742953',);
 
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"span";s:3:"all";s:4:"name";s:9:"info_type";s:8:"onchange";s:1:"1";s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:6:"needed";s:1:"1";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142602276',);
+
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
+.link_select select { width: 250px; }','modified' => '1159943980',);
+
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
+.link_select select { width: 250px; }','modified' => '1159943980',);
+
 $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
 .link_select select { width: 250px; }
 .description textarea { width: 98%; }','modified' => '1207297595',);
@@ -38,18 +51,34 @@ $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','gr
 .link_select select { width: 250px; }
 .description textarea { width: 98%; }','modified' => '1207297595',);
 
+$templ_data[] = array('name' => 'infolog.edit.Angebot','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"A";s:3:"100";s:1:"B";s:2:"1%";s:2:"c2";s:7:"noPrint";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:12:"infolog.edit";s:4:"span";s:11:"all,noPrint";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"hrule";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:5:"align";s:5:"right";s:7:"onclick";s:15:"window.print();";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:26:"infolog.edit.Angebot.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1158750796',);
+
+$templ_data[] = array('name' => 'infolog.edit.Angebot','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"B";s:2:"1%";s:2:"c2";s:7:"noPrint";s:2:"c1";s:7:"noPrint";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:12:"infolog.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"hrule";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:7:"onclick";s:31:"document.print(); return false;";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:26:"infolog.edit.Angebot.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1160039724',);
+
+$templ_data[] = array('name' => 'infolog.edit.Angebot.print','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:13:"contact-value";s:4:"size";s:4:"n_fn";s:4:"name";s:12:"info_contact";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1160042614',);
+
 $templ_data[] = array('name' => 'infolog.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.0.0.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:15:"100%,100%,,,0,0";}}','size' => '100%,100%,,,0,0','style' => '','modified' => '1061732462',);
 
 $templ_data[] = array('name' => 'infolog.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:10:"@info_type";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,245,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,245,,row_on,0,0,auto','style' => '','modified' => '1061732462',);
 
+$templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c4";s:2:"th";s:2:"c5";s:7:"row,top";s:2:"c6";s:3:"row";s:2:"h6";s:2:",1";s:2:"c3";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:7:"General";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:4:"size";s:16:",,,info_priority";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"info_priority";s:4:"help";s:31:"select a priority for this task";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:16:",,,info_location";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:13:"info_location";s:4:"size";s:6:"80,255";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:10:"Delegation";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";s:4:"size";s:19:",,,info_responsible";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:2:"10";s:4:"name";s:16:"info_responsible";s:4:"help";s:66:"select a responsible user: a person you want to delegate this task";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Confirm";s:4:"size";s:15:",,,info_confirm";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"info_confirm";s:4:"help";s:87:"do you want a confirmation of the responsible on: accepting, finishing the task or both";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:8:"100%,245";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"245";}}}','size' => '100%,245','style' => '','modified' => '1075972977',);
+
 $templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:2:"th";s:2:"c5";s:7:"row,top";s:2:"c6";s:3:"row";s:2:"h6";s:2:",1";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:7:"General";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:3:{s:4:"name";s:13:"info_priority";s:4:"type";s:6:"select";s:4:"help";s:31:"select a priority for this task";}}i:3;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"size";s:6:"80,255";s:4:"name";s:13:"info_location";s:4:"type";s:4:"text";}}i:4;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:10:"Delegation";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"size";s:19:",,,info_responsible";s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"info_responsible";s:4:"size";s:7:"10,both";s:4:"help";s:66:"select a responsible user: a person you want to delegate this task";}}i:6;a:2:{s:1:"A";a:3:{s:4:"size";s:15:",,,info_confirm";s:4:"type";s:5:"label";s:5:"label";s:7:"Confirm";}s:1:"B";a:3:{s:4:"name";s:12:"info_confirm";s:4:"type";s:6:"select";s:4:"help";s:87:"do you want a confirmation of the responsible on: accepting, finishing the task or both";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:8:"100%,245";}}','size' => '100%,245','style' => '','modified' => '1217409875',);
 
+$templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '0.9.15.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"15,80";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:7:"100%,,0";}}','size' => '100%,,0','style' => '','modified' => '1051391600',);
+
 $templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"13,75";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1051391600',);
 
 $templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:8:"textarea";s:4:"size";s:2:"13";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";s:4:"span";s:12:",description";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1207297749',);
 
+$templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:8:"textarea";s:4:"size";s:2:"13";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";s:4:"span";s:12:",description";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1229074983',);
+
+$templ_data[] = array('name' => 'infolog.edit.GroupType','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:8:",noPrint";s:4:"name";s:12:"infolog.edit";}}i:2;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"hrule";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"contact CF";s:4:"name";s:8:"#contact";}}i:4;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Selection CF";s:4:"name";s:10:"#selection";}}i:5;a:1:{s:1:"A";a:6:{s:4:"type";s:13:"infolog-value";s:4:"size";s:10:"#selection";s:5:"label";s:7:"Auswahl";s:4:"name";s:7:"#linked";s:8:"readonly";s:1:"1";s:7:"options";a:1:{i:0;s:10:"#selection";}}}i:6;a:1:{s:1:"A";a:6:{s:4:"type";s:13:"infolog-value";s:4:"name";s:7:"#linked";s:8:"readonly";s:1:"1";s:4:"size";s:8:"#auftrag";s:5:"label";s:7:"Auftrag";s:7:"options";a:1:{i:0;s:8:"#auftrag";}}}}s:4:"rows";i:6;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1196994147',);
+
 $templ_data[] = array('name' => 'infolog.edit.history','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,250,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"250";i:6;s:4:"auto";}}}','size' => '100%,250,,,,,auto','style' => '','modified' => '1181576846',);
 
+$templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '0.9.15.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"h4";s:3:"164";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1075977056',);
+
 $templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:17:"100%,245,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";}}}','size' => '100%,245,,,,,auto','style' => '','modified' => '1075977056',);
 
 $templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c4";s:2:"th";s:2:"c5";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"link-add";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:17:"100%,245,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";}}}','size' => '100%,245,,,,,auto','style' => '','modified' => '1075977056',);
@@ -58,6 +87,12 @@ $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' =
 
 $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c6";s:7:"row,top";s:2:"h6";s:3:"60%";s:2:"c5";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Projectmanager";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Project";}s:1:"B";a:4:{s:4:"type";s:21:"projectmanager-select";s:4:"name";s:5:"pm_id";s:8:"onchange";s:1:"1";s:4:"size";s:4:"None";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Price";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:207:"this.form[\'exec[info_price]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:10:"info_price";s:4:"span";s:3:"all";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:20:",,,info_planned_time";s:5:"label";s:12:"planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:17:"info_planned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:22:",,,info_replanned_time";s:5:"label";s:15:"Re-planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"info_replanned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,info_used_time";s:5:"label";s:9:"used time";s:4:"help";s:64:"Leave blank to get the used time calculated by timesheet entries";}s:1:"B";a:2:{s:4:"type";s:13:"date-duration";s:4:"name";s:14:"info_used_time";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:8:"100%,245";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"245";}}}','size' => '100%,245','style' => '','modified' => '1223093893',);
 
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
+
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
+
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:244:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
+
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:244:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
 
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1223355813',);
@@ -66,15 +101,38 @@ $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','la
 
 $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"span";s:16:",headertext bold";s:5:"label";s:7:"InfoLog";}}','size' => ',,0,,0,0','style' => '.bold { font-weight: bold; }','modified' => '1056876864',);
 
+$templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=610,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:218:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=550,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=550,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
+
+$templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:218:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
+
 $templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:238:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:240:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:238:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
 
 $templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:239:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=task&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:241:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:239:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
 
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";}i:2;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:11:"Responsible";s:4:"help";s:31:"Select to filter by responsible";}}s:1:"F";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:7:"options";a:1:{i:0;s:1:"3";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1093714137',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:1:"A";s:2:"2%";s:1:"F";s:34:"8%,@no_info_owner_info_responsible";s:1:"G";s:3:"12%";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"I";s:14:"3%,@no_actions";s:1:"D";s:3:"120";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"G";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1093714137',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1195812360',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.4.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1197290396',);
+
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:4;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1197290396',);
 
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1223128790',);
 
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1229074929',);
+
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
+
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:34:"8%,@no_info_onwer_info_responsible";s:1:"F";s:25:"12%,@no_info_datemodified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:37:",@no_info_used_time_info_planned_time";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
+
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
 
+$templ_data[] = array('name' => 'infolog.Lebert.Baienfurt.Kopf','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:17:"Lebert + Co. GmbH";s:4:"span";s:11:",my_heading";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:23:"International Spedition";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Eisenbahnstrasse 4";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"88255 Baienfurt";}}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:8:"logo.png";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:14:"100%,,,my_form";s:7:"options";a:2:{i:3;s:7:"my_form";i:0;s:4:"100%";}}}','size' => '100%,,,my_form','style' => '.xmy_form td { font-size: 20pt; }
+.my_heading { font-size: 120%; font-weight: bold; }','modified' => '1158752011',);
+
+$templ_data[] = array('name' => 'infolog.test','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:19:"customfields-header";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1197441373',);
+

From a40b1c6bfb3a0e139e17b973bbd9122c7fccb71e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 17 Dec 2008 20:05:19 +0000
Subject: [PATCH 019/510] Reworked the categories class to query all cats from
 the database once per session and then operate on that cache. This
 deliminates ~25 database queries for each sitemgr page.

Test carefully before applying this to a production sytem!
---
 phpgwapi/inc/class.categories.inc.php | 527 ++++++++++++++------------
 phpgwapi/inc/class.egw.inc.php        |   6 +
 2 files changed, 294 insertions(+), 239 deletions(-)

diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index bf0e3a3b5e..997fe843e2 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2000, 2001 Joseph Engo, Bettina Gille
  * Copyright (C) 2002, 2003 Bettina Gille
  * Reworked 11/2005 by RalfBecker-AT-outdoor-training.de
+ * Reworked 12/2008 by RalfBecker-AT-outdoor-training.de to operate only on a catergory cache, no longer the db direct
  * @license http://opensource.org/licenses/lgpl-license.php LGPL - GNU Lesser General Public License
  * @package api
  * @subpackage categories
@@ -18,19 +19,56 @@
 
 /**
  * class to manage categories in eGroupWare
+ * 
+ * Categories are read now once from the database into a static cache variable (by the static init_cache method).
+ * The egw object fills that cache ones per session, stores it in a private var, from which it restores it for each
+ * request of that session.
+ * 
+ * @ToDo The cache now contains a backlink from the parent to it's children. Use that link to simplyfy return_all_children
+ * 	and other functions needing to know if a cat has children. Be aware a user might not see all children, as they can
+ * 	belong to other users.
  */
 class categories
 {
+	/**
+	 * Account id this class is instanciated for (-1 for global cats)
+	 *
+	 * @var int
+	 */
 	var $account_id;
+	/**
+	 * Application this class is instancated for ('phpgw' for application global cats)
+	 *
+	 * @var string
+	 */
 	var $app_name;
 	/**
 	 * @var egw_db
 	 */
 	var $db;
+	/**
+	 * Total number of records of return_(sorted_)array (returning only a limited number of rows)
+	 *
+	 * @var int
+	 */
 	var $total_records;
+	/**
+	 * Grants from other users for account_id and app_name (init by return array)
+	 *
+	 * @var array
+	 */
 	var $grants;
-	var $table = 'egw_categories';
-	var $cache_id2cat_data = array();	// a little bit of caching for id2name and return_single
+	/**
+	 * Name of the categories table
+	 */
+	const TABLE = 'egw_categories';
+	/**
+	 * Cache holding all categories, set via init_cache() method
+	 *
+	 * @var array cat_id => array of data 
+	 */
+	private static $cache;
+	
 
 	/**
 	 * constructor for categories class
@@ -45,76 +83,28 @@ class categories
 		$this->account_id	= (int) get_account_id($accountid);
 		$this->app_name		= $app_name;
 		$this->db			= $GLOBALS['egw']->db;
-		####################################################
-		# resolving the group members/grants is very slow with ldap accounts backend
-		# let's skip it for the addressbook, if we are using the ldap accounts backend
-		####################################################
-		if($app_name == 'addressbook' && $GLOBALS['egw_info']['server']['account_repository'] == 'ldap') {
-			$this->grants = $GLOBALS['egw']->acl->get_grants($app_name, false);
-		} else {
-			$this->grants = $GLOBALS['egw']->acl->get_grants($app_name);
-		}
-	}
 
-	/**
-	 * return sql for predifined filters
-	 *
-	 * @param string $type eiterh subs, mains, appandmains, appandsubs, noglobal or noglobalapp
-	 * @return string with sql to add to the where clause
-	 */
-	function filter($type)
-	{
-		switch ($type)
+		if (is_null(self::$cache))	// sould not be necessary, as cache is load and restored by egw object
 		{
-			case 'subs':		$where = 'cat_parent != 0'; break;
-			case 'mains':		$where = 'cat_parent = 0'; break;
-			case 'appandmains':	$where = 'cat_appname='.$this->db->quote($this->app_name).' AND cat_parent = 0'; break;
-			case 'appandsubs':	$where = 'cat_appname='.$this->db->quote($this->app_name).' AND cat_parent != 0'; break;
-			case 'noglobal':	$where = 'cat_appname != '.$this->db->quote($this->app_name); break;
-			case 'noglobalapp':	$where = 'cat_appname='.$this->db->quote($this->app_name).' AND cat_owner != '.(int)$this->account_id; break;
-			default:			return False;
+			self::init_cache();
 		}
-		return $where;
-	}
-
-	/**
-	 * returns the total number of categories for app, subs or mains
-	 *
-	 * @param $for one of either 'app' 'subs' or 'mains'
-	 * @return integer count of categories
-	 */
-	function total($for = 'app')
-	{
-		switch($for)
-		{
-			case 'app':			$where = array('cat_appname' => $this->app_name); break;
-			case 'appandmains':	$where = array('cat_appname' => $this->app_name,'cat_parent' => 0); break;
-			case 'appandsubs':	$where = array('cat_appname' => $this->app_name,'cat_parent != 0'); break;
-			case 'subs':		$where = 'cat_parent != 0'; break;
-			case 'mains':		$where = 'cat_parent = 0'; break;
-			default:			return False;
-		}
-		return $this->db->select($this->table,'COUNT(*)',$where,__LINE__,__FILE__)->fetchSingle();
 	}
 
 	/**
 	 * return_all_children
 	 * returns array with id's of all children from $cat_id and $cat_id itself!
 	 *
-	 * @param $cat_id integer cat-id to search for
+	 * @param int|array $cat_id (array of) integer cat-id to search for
 	 * @return array of cat-id's
 	 */
 	function return_all_children($cat_id)
 	{
-		$all_children = array($cat_id);
+		$all_children = (array) $cat_id;
 
 		$children = $this->return_array('subs',0,False,'','','',True,$cat_id,-1,'id');
 		if (is_array($children) && count($children))
 		{
-			foreach($children as $child)
-			{
-				$all_children = array_merge($all_children,$this->return_all_children($child['id']));
-			}
+			$all_children = array_merge($all_children,$this->return_all_children($children));
 		}
 		//echo "<p>categories::return_all_children($cat_id)=(".implode(',',$all_children).")</p>\n";
 		return $all_children;
@@ -123,170 +113,164 @@ class categories
 	/**
 	 * return an array populated with categories
 	 *
-	 * @param string $type defaults to 'all'
-	 * @param int $start see $limit
-	 * @param boolean $limit if true limited query starting with $start
+	 * @param string $type='all' 'subs','mains','appandmains','appandsubs','noglobal','noglobalapp', defaults to 'all'
+	 * @param int $start=0 see $limit
+	 * @param boolean|int $limit if true limited query to maxmatches rows (starting with $start)
 	 * @param string $query='' query-pattern
-	 * @param string $sort='' sort order, either defaults to 'ASC'
-	 * @param string $order='' order by
+	 * @param string $sort='ASC' sort order, defaults to 'ASC'
+	 * @param string $order='' order by, default cat_main, cat_level, cat_name ASC
 	 * @param boolean $globals includes the global egroupware categories or not
-	 * @param int $parent_id=0 if > 0 return subcats or $parent_id
+	 * @param array|int $parent_id=null return only subcats of $parent_id(s)
 	 * @param int $lastmod = -1 if > 0 return only cats modified since then
 	 * @param string $column='' if column-name given only that column is returned, not the full array with all cat-data
-	 * @return array or cats
+	 * @param array $filter=null array with column-name (without cat_-prefix) => value pairs (! negates the value)
+	 * @return array of cat-arrays or $column values
 	 */
-	function return_array($type,$start,$limit = True,$query = '',$sort = '',$order = '',$globals = False, $parent_id = '', $lastmod = -1, $column = '')
+	function return_array($type='all', $start=0, $limit=true, $query='', $sort='ASC',$order='',$globals=false, $parent_id=null, $lastmod=-1, $column='', $filter=null)
 	{
-		if ($globals)
+		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,globals=$globals,parent=".array2string($parent_id).",$lastmod,$column) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
+
+		// load the grants
+		if ($this->account_id != -1 && is_null($this->grants))
 		{
-			$global_cats = " OR cat_appname='phpgw'";
+			// resolving the group members/grants is very slow with ldap accounts backend
+			// let's skip it for the addressbook, if we are using the ldap accounts backend
+			$this->grants = $GLOBALS['egw']->acl->get_grants($app_name, 
+				$app_name != 'addressbook' || $GLOBALS['egw_info']['server']['account_repository'] != 'ldap');
+		}
+		$cats = array();
+		foreach(self::$cache as $cat_id => $cat)
+		{
+			if ($filter) foreach($filter as $col => $val)
+			{
+				if (!is_array($val) && $val[0] === '!')
+				{
+					if ($cat[$col] == substr($val,1)) continue 2;	// 2 for BOTH foreach!
+				}
+				elseif (is_array($val))
+				{
+					if (!in_array($cat[$col],$val)) continue 2;
+				}
+				else
+				{
+					if ($cat[$col] != $val) continue 2;
+				}
+			}
+			// check if certain parent required
+			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			
+			// apply standard acl / grants: return only application global cats (if $globals) or 
+			if (!($globals && $cat['appname'] == 'phpgw' ||
+				  $cat['appname'] == $this->app_name && ($cat['owner'] == -1 || $cat['owner'] == $this->account_id ||
+				  	$this->account_id != -1 && $cat['access'] == 'public' && $this->grants && isset($this->grants[$cat['owner']]))))
+			{
+				continue;
+			}
+			// check if we have the correct type
+			switch ($type)
+			{
+				case 'subs':
+					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					break;
+				case 'mains':
+					if ($cat['parent']) continue 2;
+					break;
+				case 'appandmains':
+					if ($cat['appname'] != $this->app_name || $cat['parent']) continue 2;
+					break;
+				case 'appandsubs':
+					if ($cat['appname'] != $this->app_name || !$cat['parent']) continue 2;
+					break;
+				case 'noglobal':
+					if ($cat['appname'] == $this->app_name) continue 2;
+					break;
+				case 'noglobalapp':
+					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id) continue 2;
+					break;
+			}
+			
+			// check name and description for $query
+			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			
+			// check if last modified since
+			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
+			
+			$cats[] = $cat;
+		}
+		if (!($this->total_records = count($cats)))
+		{
+			//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = FALSE");
+			return false;
 		}
-
-		if (($filter = $this->filter($type))) $filter = ' AND '.$filter;
-
 		if (!$sort) $sort = 'ASC';
-
-		if (!empty($order) && preg_match('/^[a-zA-Z_(), ]+$/',$order) && (empty($sort) || preg_match('/^(ASC|DESC|asc|desc)$/',$sort)))
+		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
+		if ($this->total_records > 1 && !empty($order) &&
+			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
 		{
-			$ordermethod = 'ORDER BY '.$order.' '.$sort;
+			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
+			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			$sign = strtoupper($sort) == 'DESC' ? '-' : '';
+			usort($cats,create_function('$a,$b',$func=(in_array($order,array('name','description','appname','app_name')) ?
+				"return ${sign}strcasecmp(\$a['$order'],\$b['$order']);" : "return $sign(int)\$a['$order'] - $sign(int)\$b['$order'];")));
 		}
-		else
+		// limit the number of returned rows
+		if ($limit)
 		{
-			$ordermethod = 'ORDER BY cat_main, cat_level, cat_name ASC';
+			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			$cats = array_slice($cats,(int)$start,$limit);
 		}
-
-		if ($this->account_id == '-1')
+		// return only a certain column (why not return is as value?)
+		if ($column)
 		{
-			$grant_cats = ' cat_owner=-1 ';
-		}
-		else
-		{
-			if (is_array($this->grants))
+			foreach($cats as $k => $cat)
 			{
-				$grant_cats = ' (cat_owner=' . $this->account_id . " OR cat_owner=-1 OR cat_access='public' AND cat_owner IN (" . implode(',',array_keys($this->grants)) . ')) ';
-			}
-			else
-			{
-				$grant_cats = ' cat_owner=' . $this->account_id . ' OR cat_owner=-1 ';
-			}
-		}
-
-		if ($parent_id > 0)
-		{
-			$parent_filter = ' AND cat_parent=' . (int)$parent_id;
-		}
-
-		if ($query)
-		{
-			$query = $this->db->quote('%'.$query.'%');
-			$querymethod = " AND (cat_name LIKE $query OR cat_description LIKE $query) ";
-		}
-
-		if($lastmod > 0)
-		{
-			$querymethod .= ' AND last_mod > ' . (int)$lastmod;
-		}
-
-		$where = '(cat_appname=' . $this->db->quote($this->app_name) . ' AND ' . $grant_cats . $global_cats . ')'
-			. $parent_filter . $querymethod . $filter;
-
-		$this->total_records = $this->db->select($this->table,'COUNT(*)',$where,__LINE__,__FILE__)->fetchSingle();
-
-		if (!$this->total_records) return false;
-
-		foreach($this->db->select($this->table,'*',$where,__LINE__,__FILE__,$limit ? (int) $start : false,$ordermethod) as $cat)
-		{
-			$cat = egw_db::strip_array_keys($cat,'cat_');
-			$cat['app_name'] = $cat['appname'];
-			$this->cache_id2cat_data[$cat['id']] = $cat;
-
-			if ($column)
-			{
-				$cats[] = array($column => isset($cat[$column]) ? $cat[$column] : $cat['id']);
-			}
-			else
-			{
-				$cats[] = $cat;
+				$cats[$k] = $cat[$column];
 			}
 		}
+		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = ".array2string($cats));
+		
+		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
 	/**
-	 * return a sorted array populated with categories
+	 * return a sorted array populated with categories (main sorting criteria is hierachy!)
 	 *
-	 * @param int $start see $limit
-	 * @param boolean $limit if true limited query starting with $start
+	 * @param int $start=0 see $limit
+	 * @param boolean|int $limit if true limited query to maxmatches rows (starting with $start)
 	 * @param string $query='' query-pattern
-	 * @param string $sort='' sort order, either defaults to 'ASC'
-	 * @param string $order='' order by
+	 * @param string $sort='ASC' sort order, either defaults to 'ASC'
+	 * @param string $order='cat_name' order by
 	 * @param boolean $globals includes the global egroupware categories or not
-	 * @param int $parent_id=0 if > 0 return subcats or $parent_id
+	 * @param array|int $parent_id=0 return only subcats of $parent_id(s)
 	 * @return array with cats
 	 */
-	function return_sorted_array($start,$limit=True,$query='',$sort='',$order='',$globals=False, $parent_id=0)
+	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0)
 	{
-		if ($globals)
-		{
-			$global_cats = " OR cat_appname='phpgw'";
-		}
+		if (!$sort)  $sort = 'ASC';
+		if (!$order) $order = 'cat_name';
 
-		if (!$sort) $sort = 'ASC';
-
-		if (!empty($order) && preg_match('/^[a-zA-Z_, ]+$/',$order) && (empty($sort) || preg_match('/^(ASC|DESC|asc|desc)$/',$sort)))
-		{
-			$ordermethod = 'ORDER BY '.$order.' '.$sort;
-		}
-		else
-		{
-			$ordermethod = ' ORDER BY cat_name ASC';
-		}
-
-		if ($this->account_id == '-1')
-		{
-			$grant_cats = " cat_owner='-1' ";
-		}
-		else
-		{
-			if (is_array($this->grants))
-			{
-				$grant_cats = " (cat_owner='" . $this->account_id . "' OR cat_owner='-1' OR cat_access='public' AND cat_owner IN (" . implode(',',array_keys($this->grants)) . ")) ";
-			}
-			else
-			{
-				$grant_cats = " cat_owner='" . $this->account_id . "' OR cat_owner='-1' ";
-			}
-		}
-		$parent_select = ' AND cat_parent=' . (int)$parent_id;
-
-		if ($query)
-		{
-			$query = $this->db->quote('%'.$query.'%');
-			$querymethod = " AND (cat_name LIKE $query OR cat_description LIKE $query) ";
-		}
-
-		$where = '(cat_appname=' . $this->db->quote($this->app_name) . ' AND ' . $grant_cats . $global_cats . ')' . $querymethod;
+		//error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 
 		$parents = $cats = array();
-		foreach($this->db->select($this->table,'*',$where . $parent_select,__LINE__,__FILE__,false,$ordermethod) as $cat)
+		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,(array)$parent_id)))
+		{
+			$cats = array();
+		}
+		foreach($cats as $cat)
 		{
-			$cat = egw_db::strip_array_keys($cat,'cat_');
-			$cat['app_name'] = $cat['appname'];
-			$this->cache_id2cat_data[$cat['id']] = $cat;
-
-			$cats[] = $cat;
 			$parents[] = $cat['id'];
 		}
 		while (count($parents))
 		{
 			$sub_select = ' AND cat_parent IN (' . implode(',',$parents) . ')';
-			$parents = $children = array();
-			foreach($this->db->select($this->table,'*',$where . $sub_select,__LINE__,__FILE__,false, $ordermethod) as $cat)
+			if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents)))
+			{
+				break;
+			}
+			$parents = $children = array();
+			foreach($subs as $cat)
 			{
-				$cat = egw_db::strip_array_keys($cat,'cat_');
-				$cat['app_name'] = $cat['appname'];
-				$this->cache_id2cat_data[$cat['id']] = $cat;
-
 				$parents[] = $cat['id'];
 				$children[$cat['parent']][] = $cat;
 			}
@@ -310,9 +294,11 @@ class categories
 		}
 		$this->total_records = count($cats);
 
+		// limit the number of returned rows
 		if ($limit)
 		{
-			return array_slice($cats,(int)$start,$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']);
+			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		return $cats;
 	}
@@ -323,20 +309,11 @@ class categories
 	 * We use a shared cache together with id2name
 	 *
 	 * @param int $id id of category
-	 * @return array/boolean array with one array of cat-data or false if cat not found
+	 * @return array|boolean array with one array of cat-data or false if cat not found
 	 */
-	function return_single($id = '')
+	static function return_single($id)
 	{
-		if (!isset($this->cache_id2cat_data[$id]))
-		{
-			if (($cat = $this->db->select($this->table,'*',array('cat_id' => $id),__LINE__,__FILE__)->fetch()))
-			{
-				$cat = egw_db::strip_array_keys($cat,'cat_');
-				$cat['app_name'] = $cat['appname'];
-			}
-			$this->cache_id2cat_data[$id] = $cat;
-		}
-		return $this->cache_id2cat_data[$id] ? array($this->cache_id2cat_data[$id]) : false;
+		return isset(self::$cache[$id]) ? array(self::$cache[$id]) : false;
 	}
 
 	/**
@@ -346,6 +323,7 @@ class categories
 	 * @param string $type='' subs or mains
 	 * @param int/array $selected - cat_id or array with cat_id values
 	 * @param boolean $globals True or False, includes the global egroupware categories or not
+	 * @deprecated use html class to create selectboxes
 	 * @return string populated with categories
 	 */
 	function formatted_list($format,$type='',$selected = '',$globals = False,$site_link = 'site')
@@ -460,7 +438,7 @@ class categories
 			),
 			$values);
 
-		$this->db->insert($this->table,array(
+		$this->db->insert(self::TABLE,array(
 			'cat_parent'  => $values['parent'],
 			'cat_owner'   => $this->account_id,
 			'cat_access'  => $values['access'],
@@ -473,12 +451,15 @@ class categories
 			'last_mod'    => time(),
 		),(int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(),__LINE__,__FILE__);
 
-		$id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id($this->table,'cat_id');
+		$id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE,'cat_id');
 
 		if (!(int)$values['parent'])
 		{
-			$this->db->update($this->table,array('cat_main' => $id),array('cat_id' => $id),__LINE__,__FILE__);
+			$this->db->update(self::TABLE,array('cat_main' => $id),array('cat_id' => $id),__LINE__,__FILE__);
 		}
+		// update cache accordingly
+		self::invalidate_cache($id);
+
 		return $id;
 	}
 
@@ -499,7 +480,7 @@ class categories
 			{
 				if ($cat['level'] == 1)
 				{
-					$this->db->update($this->table,array(
+					$this->db->update(self::TABLE,array(
 						'cat_level'  => 0,
 						'cat_parent' => 0,
 						'cat_main'   => $cat['id'],
@@ -518,7 +499,7 @@ class categories
 
 					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
 
-					$this->db->update($this->table,$update,array(
+					$this->db->update(self::TABLE,$update,array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
 					),__LINE__,__FILE__);
@@ -535,7 +516,10 @@ class categories
 		}
 		$where['cat_appname'] = $this->app_name;
 
-		$this->db->delete($this->table,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+
+		// update cache accordingly
+		self::invalidate_cache($cat_id);
 	}
 
 	/**
@@ -565,7 +549,7 @@ class categories
 				$values['level'] = 0;
 			}
 		}
-		$this->db->update($this->table,array(
+		$this->db->update(self::TABLE,array(
 			'cat_name' => $values['name'],
 			'cat_description' => $values['descr'],
 			'cat_data' => $values['data'],
@@ -579,6 +563,9 @@ class categories
 			'cat_appname' => $this->app_name,
 		),__LINE__,__FILE__);
 
+		// update cache accordingly
+		self::invalidate_cache($values['id']);
+
 		return (int)$values['id'];
 	}
 
@@ -592,10 +579,10 @@ class categories
 	 * - cat's of other user
 	 *
 	 * @param string $cat_name cat-name
-	 * @param boolean $strip=false if true, strips 'X-' from category names added by some SyncML clients
+	 * @param boolean|string $strip=false if true, strips 'X-'  ($strip) from category names added by some SyncML clients
 	 * @return int cat-id or 0 if not found
 	 */
-	function name2id($cat_name,$strip=false)
+	function name2id($cat_name, $strip=false)
 	{
 		static $cache = array();	// a litle bit of caching
 
@@ -607,7 +594,7 @@ class categories
 		}
 
 		$cats = array($cat_name);
-		if (isset($strip) && strncmp($strip, $cat_name, strlen($strip)) == 0)
+		if ($strip && strncmp($strip, $cat_name, strlen($strip)) == 0)
 		{
 			$stripped_cat_name = substr($cat_name, strlen($strip));
 			if (isset($cache[$stripped_cat_name]))
@@ -618,17 +605,26 @@ class categories
 			$cats[] = $stripped_cat_name;
 		}
 
-
-		$cat = $this->db->select($this->table,array('cat_name','cat_id'),array(
-			'cat_name' => $cats,
-			'cat_appname' => array($this->app_name, 'phpgw'),
-		),__LINE__,__FILE__,0,
-		'ORDER BY cat_name<>'.$this->db->quote($cat_name).',(CASE cat_owner WHEN '.(int)$this->account_id." THEN 1 WHEN -1 THEN 2 ELSE 3 END),cat_appname='phpgw'",
-		false,1)->fetch();
-
-		if (!$cat) return 0;	// cat not found, dont cache it, as it might be created in this request
-
-		return $cache[$cat['cat_name']] = (int) $cat['cat_id'];
+		if (!($cats = $this->return_array('all',0,false,'','','',true,null,-1,'',array(
+			'name' => $cats,
+			'appname' => array($this->app_name, 'phpgw'),
+		))))
+		{
+			return 0;	// cat not found, dont cache it, as it might be created in this request
+		}
+		if (count($cats) > 1)
+		{
+			// if more the one cat matches we weight them by: exact name match; own, global, other users cat; appplication cats
+			foreach($cats as $k => $cat)
+			{
+				$cats[$k]['weight'] = 100 * ($cat['name'] == $cat_name) +
+					10 * ($cat['owner'] == $this->account_id ? 3 : ($cat['owner'] == -1 ? 2 : 1)) +
+					($cat['appname'] != 'phpgw');
+			}
+			// sort heighest weight to the top
+			usort($cats,create_function('$a,$b',"return \$b['weight'] - \$a['weight'];"));
+		}
+		return $cache[$cat['cat_name']] = (int) $cats[0]['id'];
 	}
 
 	/**
@@ -640,20 +636,19 @@ class categories
 	 * @param string $item='name requested information, 'path' = / delimited path of category names (incl. parents)
 	 * @return string information or '--' if not found or !$cat_id
 	 */
-	function id2name($cat_id=0, $item='name')
+	static function id2name($cat_id=0, $item='name')
 	{
 		if(!$cat_id) return '--';
-
-		if (!isset($this->cache_id2cat_data[$cat_id])) $this->return_single($cat_id);
-
 		if (!$item) $item = 'parent';
-
-		$cat = $this->cache_id2cat_data[$cat_id];
+		
+		if (is_null(self::$cache)) self::init_cache();
+		
+		$cat = self::$cache[$cat_id];
 		if ($item == 'path')
 		{
 			if ($cat['parent'])
 			{
-				return $this->id2name($cat['parent'],'path').' / '.$cat['name'];
+				return self::id2name($cat['parent'],'path').' / '.$cat['name'];
 			}
 			$item = 'name';
 		}
@@ -691,27 +686,27 @@ class categories
 	 */
 	function exists($type,$cat_name = '',$cat_id = 0,$parent = 0)
 	{
-		static $cache = array();	// a litle bit of caching
-
-		if (isset($cache[$type][$cat_name][$cat_id])) return $cache[$type][$cat_name][$cat_id];
-
-		$where = array($this->filter($type));
-
 		if ($cat_name)
 		{
-			$where['cat_name'] = $cat_name;
-
-			if ($cat_id) $where[] = 'cat_id != '.(int)$cat_id;
+			$filter['name'] = $cat_name;
+			if ($cat_id) $filter['id'] = '!'.(int)$cat_id;
 		}
 		elseif ($cat_id)
 		{
-			$where['cat_id'] = $cat_id;
+			$filter['id'] = $cat_id;
 		}
-		if ($parent) $where['cat_parent'] = $parent;
-
-		return $cache[$type][$cat_name][$cat_id] = $this->db->select($this->table,'cat_id',$where,__LINE__,__FILE__)->fetchSingle();
+		if (!($cats = $this->return_array($type,0,false,'','','',true,$parent,-1,'id',$filter)))
+		{
+			$ret = false;
+		}
+		else
+		{
+			$ret = $cats[0];
+		}
+		//error_log(__METHOD__."($type,$cat_name,$cat_id,$parent) = ".$ret);
+		return $ret;
 	}
-
+	
 	/**
 	 * Change the owner of all cats owned by $owner to $to OR deletes them if !$to
 	 *
@@ -727,11 +722,65 @@ class categories
 
 		if ((int)$to)
 		{
-			$this->db->update($this->table,array('cat_owner' => $to),$where,__LINE__,__FILE__);
+			$this->db->update(self::TABLE,array('cat_owner' => $to),$where,__LINE__,__FILE__);
 		}
 		else
 		{
-			$this->db->delete($this->table,$where,__LINE__,__FILE__);
+			$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 		}
+		// update cache accordingly
+		self::invalidate_cache();
+	}
+	
+	/**
+	 * Initialise or restore the categories cache
+	 * 
+	 * We use the default ordering of return_array to avoid doing it again there
+	 * 
+	 * @param array &$cache=null cache content to restore it (from the egw-object)
+	 */
+	public static function &init_cache(&$cache=null)
+	{
+		if (!is_null($cache))
+		{
+			//error_log(__METHOD__."() ".count($cache)." cats restored: ".function_backtrace());
+			return self::$cache =& $cache;
+		}
+		self::$cache = array();
+		// read all cats (cant use $this->db!)
+		foreach($GLOBALS['egw']->db->select(self::TABLE,'*',false,__LINE__,__FILE__,
+			false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
+		{
+			$cat = egw_db::strip_array_keys($cat,'cat_');
+			$cat['app_name'] = $cat['appname'];
+			// backlink children to their parent
+			if ($cat['parent'])
+			{
+				self::$cache[$cat['parent']]['children'][] = $cat['id'];
+			}
+			if (isset(self::$cache[$cat['id']]))
+			{
+				$cat['children'] = self::$cache[$cat['id']]['children'];
+				unset(self::$cache[$cat['id']]);	// otherwise the order gets messed up!
+			}
+			self::$cache[$cat['id']] = $cat;
+		}
+		//error_log(__METHOD__."() cache initialised: ".function_backtrace());
+		return self::$cache;
+	}
+	
+	/**
+	 * Invalidate the cache
+	 * 
+	 * Currently we dont care for $cat_id, as changing cats happens very infrequently and
+	 * also changes child categories (!)
+	 *
+	 * @param int $cat_id concerned id or null for all cats
+	 */
+	public static function invalidate_cache($cat_id=null)
+	{
+		self::init_cache();
+		// we need to invalidate the whole session cache, as it stores our cache
+		egw::invalidate_session_cache();
 	}
 }
diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php
index 9d0b0d2430..7d66bbd67b 100644
--- a/phpgwapi/inc/class.egw.inc.php
+++ b/phpgwapi/inc/class.egw.inc.php
@@ -49,6 +49,8 @@ class egw extends egw_minimal
 	 * @var common
 	 */
 	var $common;
+	
+	private $cat_cache;
 
 	/**
 	 * Constructor: Instantiates the sub-classes
@@ -152,6 +154,8 @@ class egw extends egw_minimal
 			$this->check_app_rights();
 
 			$this->load_optional_classes();
+			
+			$this->cat_cache =& categories::init_cache();
 		}
 		else	// set the defines for login, in case it's more then just login
 		{
@@ -178,6 +182,8 @@ class egw extends egw_minimal
 		register_shutdown_function(array($this, 'shutdown'));
 
 		$this->define_egw_constants();
+		
+		categories::init_cache($this->cat_cache);
 	}
 
 	/**

From e7f82e886ce22fcc6fe9c2744932ff71c874ab60 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Thu, 18 Dec 2008 14:47:21 +0000
Subject: [PATCH 020/510] Add a print template to print a single calender event

---
 calendar/inc/class.calendar_uiforms.inc.php   |  40 ++++++-
 calendar/setup/etemplates.inc.php             |  36 +-----
 .../templates/default/print.participants.xet  |  36 ++++++
 calendar/templates/default/print.xet          | 113 ++++++++++++++++++
 4 files changed, 194 insertions(+), 31 deletions(-)
 create mode 100644 calendar/templates/default/print.participants.xet
 create mode 100644 calendar/templates/default/print.xet

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index ac74c03aa2..cfd0ed0870 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -383,6 +383,7 @@ class calendar_uiforms extends calendar_ui
 			// fall through
 		case 'mail':
 		case 'save':
+		case 'print':
 		case 'apply':
 			if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event))
 			{
@@ -394,6 +395,18 @@ class calendar_uiforms extends calendar_ui
 				$msg = lang('Permission denied');
 				break;
 			}
+
+			if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event))
+			{
+				if ($button == 'print')	// just print without edit-rights is ok
+				{
+					$js = $this->custom_print($event,false);
+					break;
+				}
+				$msg = lang('Permission denied');
+				break;
+			}
+
 			if ($event['start'] > $event['end'])
 			{
 				$msg = lang('Error: Starttime has to be before the endtime !!!');
@@ -479,6 +492,11 @@ class calendar_uiforms extends calendar_ui
 					'msg' => $msg,
 				))).'\';';
 
+				if ($button == 'print')
+				{
+					$js = $this->custom_print($event,!$content['id'])."\n".$js;	// first open the new window and then update the view
+				}
+
 				if ($button == 'mail')
 				{
 					$js = $this->custom_mail($event,!$content['id'])."\n".$js;	// first open the new window and then update the view
@@ -660,6 +678,24 @@ class calendar_uiforms extends calendar_ui
 		return "window.open('".$GLOBALS['egw']->link('/index.php',$vars)."','_blank','width=700,height=700,scrollbars=yes,status=no');";
 	}
 
+	/**
+	 * return javascript to open compose window to print the event
+	 *
+	 * @param array $event
+	 * @param boolean $added
+	 * @return string javascript window.open command
+	 */
+	function custom_print($event,$added)
+	{
+			$vars = array(
+			'menuaction'      => 'calendar.calendar_uiforms.edit',
+			'cal_id'      => $event['id'],
+			'print' => true,
+			);
+		return "window.open('".$GLOBALS['egw']->link('/index.php',$vars)."','_blank','width=700,height=700,scrollbars=yes,status=no');";
+	}
+
+
 	/**
 	 * Edit a calendar event
 	 *
@@ -675,7 +711,8 @@ class calendar_uiforms extends calendar_ui
 	 */
 	function edit($event=null,$preserv=null,$msg='',$js = 'window.focus();',$link_to_id='')
 	{
-		$etpl =& CreateObject('etemplate.etemplate','calendar.edit');
+		$template = $_REQUEST['print'] ? 'calendar.print' : 'calendar.edit';
+		$etpl =& CreateObject('etemplate.etemplate',$template);
 		$sel_options = array(
 			'recur_type' => &$this->bo->recur_types,
 			'status'     => $this->bo->verbose_status,
@@ -683,6 +720,7 @@ class calendar_uiforms extends calendar_ui
 			'action'     => array(
 				'copy' => array('label' => 'Copy', 'title' => 'Copy this event'),
 				'ical' => array('label' => 'Export', 'title' => 'Download this event as iCal'),
+				'print' => array('label' => 'Print', 'title' => 'Print this event'),
 				'mail' => array('label' => 'Mail all participants', 'title' => 'compose a mail to all participants after the event is saved'),
 			),
 			'status_recurrence' => array('' => 'for this event', 'A' => 'for all future events'),
diff --git a/calendar/setup/etemplates.inc.php b/calendar/setup/etemplates.inc.php
index a6e7dbda22..d962ec43aa 100644
--- a/calendar/setup/etemplates.inc.php
+++ b/calendar/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application calendar
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-07-30 08:32
+	* generated by soetemplate::dump4setup() 2008-12-18 16:18
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package calendar
@@ -14,59 +14,35 @@ $templ_version=1;
 
 $templ_data[] = array('name' => 'calendar.conflicts','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:3:{i:0;a:3:{s:4:"type";s:5:"label";s:5:"label";s:20:" Scheduling conflict";s:4:"span";s:9:",size120b";}i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:34:"conflicts[$row][icon_participants]";s:5:"label";s:38:"@conflicts[$row][tooltip_participants]";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:27:"conflicts[$row][icon_recur]";s:5:"label";s:28:"@conflicts[$row][text_recur]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:21:"conflicts[$row][time]";s:7:"no_lang";s:1:"1";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"name";s:22:"conflicts[$row][title]";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:41:"conflicts[$row][conflicting_participants]";s:7:"no_lang";s:1:"1";}s:4:"help";s:23:"conflict[$row][tooltip]";}}}s:4:"rows";i:1;s:4:"cols";i:4;}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Ignore conflict";s:4:"name";s:14:"button[ignore]";s:4:"help";s:37:"Saves the event ignoring the conflict";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reedit]";s:5:"label";s:13:"Re-Edit event";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Freetime search";s:4:"name";s:16:"button[freetime]";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}}','size' => '','style' => '','modified' => '1119080124',);
 
-$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:6:{s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:1:"A";s:3:"100";s:2:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"name";s:5:"title";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:63:"General|Description|Participants|Recurrence|Custom|Links|Alarms";s:4:"name";s:63:"general|description|participants|recurrence|custom|links|alarms";s:4:"help";s:158:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:5:"owner";s:8:"readonly";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:9:"date-time";s:5:"label";s:7:"Updated";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}}}i:5;a:3:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:3;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1181140110',);
-
 $templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.005','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:6:{s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:1:"A";s:3:"100";s:2:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"name";s:5:"title";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:63:"General|Description|Participants|Recurrence|Custom|Links|Alarms";s:4:"name";s:63:"general|description|participants|recurrence|custom|links|alarms";s:4:"help";s:158:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:5:"owner";s:8:"readonly";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:9:"date-time";s:5:"label";s:7:"Updated";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}}}i:5;a:3:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:3;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1199959741',);
 
 $templ_data[] = array('name' => 'calendar.edit.alarms','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"h1";s:16:"20,@no_add_alarm";s:2:"c2";s:4:",top";s:2:"h2";s:8:",!@alarm";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"B";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:4:",0,7";s:4:"name";s:15:"new_alarm[days]";s:4:"help";s:4:"days";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[days]";s:5:"label";s:4:"days";}i:3;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:16:"new_alarm[hours]";s:4:"size";s:5:",0,23";s:4:"help";s:5:"hours";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"size";s:19:",,,new_alarm[hours]";s:5:"label";s:5:"hours";}i:5;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:15:"new_alarm[mins]";s:4:"size";s:7:",0,55,5";s:4:"help";s:7:"Minutes";}i:6;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[mins]";s:5:"label";s:7:"Minutes";}i:7;a:5:{s:4:"type";s:6:"select";s:4:"name";s:16:"new_alarm[owner]";s:7:"no_lang";s:1:"1";s:5:"label";s:3:"for";s:4:"help";s:31:"Select who should get the alarm";}i:8;a:3:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[add_alarm]";s:5:"label";s:9:"Add alarm";}}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Alarms";}s:1:"B";a:6:{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:3:"row";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"All participants";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[time]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[offset]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:11:"${row}[all]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"E";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:27:"delete_alarm[$row_cont[id]]";s:4:"help";s:17:"Delete this alarm";s:7:"onclick";s:36:"return confirm(\'Delete this alarm\');";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:4:"name";s:5:"alarm";s:7:"options";a:0:{}}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118780740',);
 
-$templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118737582',);
-
 $templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1184167751',);
 
 $templ_data[] = array('name' => 'calendar.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:7:"row,top";s:1:"A";s:2:"95";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,description";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"12,70";s:4:"name";s:11:"description";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118480337',);
 
-$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:5:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";}}}i:3;a:2:{s:1:"A";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}s:1:"B";a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"60,255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"non blocking";s:5:"width";s:1:"0";}s:1:"B";a:4:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";}}i:7;a:2:{s:1:"A";a:3:{s:4:"size";s:9:",,,public";s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"B";a:3:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
-
-$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"60,255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
-
-$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:257:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"60,255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
-
 $templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:257:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:4:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
 
-$templ_data[] = array('name' => 'calendar.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"h1";s:6:",@view";s:2:"h2";s:6:",@view";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118758702',);
-
-$templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:22:"User or group,both,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1172430059',);
-
 $templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1172430059',);
 
-$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:9:{s:2:"c1";s:2:"th";s:1:"A";s:2:"95";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:7:"row,top";s:1:"D";s:3:"50%";s:2:"h1";s:2:"12";s:2:"h2";s:2:"12";s:2:"h3";s:2:"12";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"be back soon ;-)";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_type";s:5:"label";s:11:"Repeat type";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:10:"recur_type";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,recur_interval";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";s:4:"size";s:9:"None,2,10";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:16:",,,recur_enddate";s:5:"label";s:8:"End date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:13:"recur_enddate";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_data";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:3:"6,1";s:4:"name";s:10:"recur_data";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:16:"@exception_label";s:4:"help";s:38:"Create an exception for the given date";s:7:"no_lang";s:1:"1";}}s:1:"D";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"size";s:6:"delete";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"help";s:21:"Delete this exception";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"rows";i:4;s:4:"cols";i:4;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118737412',);
+$templ_data[] = array('name' => 'calendar.edit.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1229280346',);
 
 $templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:9:{s:2:"c1";s:2:"th";s:1:"A";s:2:"95";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:7:"row,top";s:1:"D";s:3:"50%";s:2:"h1";s:2:"12";s:2:"h2";s:2:"12";s:2:"h3";s:2:"12";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"be back soon ;-)";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_type";s:5:"label";s:11:"Repeat type";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:10:"recur_type";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,recur_interval";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";s:4:"size";s:9:"None,2,31";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:16:",,,recur_enddate";s:5:"label";s:8:"End date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:13:"recur_enddate";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_data";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:3:"6,1";s:4:"name";s:10:"recur_data";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:16:"@exception_label";s:4:"help";s:38:"Create an exception for the given date";s:7:"no_lang";s:1:"1";}}s:1:"D";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"size";s:6:"delete";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"help";s:21:"Delete this exception";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"rows";i:4;s:4:"cols";i:4;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1210321464',);
 
 $templ_data[] = array('name' => 'calendar.export','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:1:{s:2:"h5";s:2:",1";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,start";s:5:"label";s:5:"Start";}s:1:"B";a:3:{s:4:"type";s:4:"date";s:4:"name";s:5:"start";s:4:"help";s:23:"Startdate of the export";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:6:",,,end";s:5:"label";s:3:"End";}s:1:"B";a:3:{s:4:"type";s:4:"date";s:4:"name";s:3:"end";s:4:"help";s:21:"Enddate of the export";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,file";s:5:"label";s:8:"Filename";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"file";s:4:"help";s:24:"Filename of the download";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,version";s:5:"label";s:7:"Version";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:7:"version";}}i:6;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:8:"Download";s:4:"name";s:8:"download";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1130738737',);
 
-$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";s:4:"span";s:9:",end_hide";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"cancel";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
-.redItalic { color: red; font-style: italic; }
-.end_hide { visibility: hidden; }','modified' => '1102850646',);
-
-$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:92:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\');";s:4:"size";s:12:"Use end date";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";s:4:"span";s:9:",end_hide";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"cancel";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
-.redItalic { color: red; font-style: italic; }
-.end_hide { visibility: hidden; }','modified' => '1149297367',);
-
 $templ_data[] = array('name' => 'calendar.freetimesearch.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;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:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Select";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"size";s:3:",16";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[start]";s:4:"help";s:13:"select a time";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Select";s:4:"name";s:12:"select[$row]";s:4:"help";s:41:"use the selected time and close the popup";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1097183756',);
 
 $templ_data[] = array('name' => 'calendar.import','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"iCal file";}s:1:"B";a:3:{s:4:"type";s:4:"file";s:4:"name";s:9:"ical_file";s:6:"needed";s:1:"1";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131469789',);
 
-$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{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:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:18:"calendar.list.rows";s:4:"name";s:2:"nm";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }','modified' => '1128458939',);
-
-$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:18:"calendar.list.rows";s:4:"name";s:2:"nm";}}i:3;a:1:{s:1:"A";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";s:5:"align";s:5:"right";i:1;a:6:{s:4:"type";s:6:"button";s:4:"name";s:9:"deleteall";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:23:"Delete selected Envents";s:7:"onclick";s:43:"return confirm(\'Delete selected Envents?\');";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }','modified' => '1200671585',);
-
 $templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:18:"calendar.list.rows";s:4:"name";s:2:"nm";}}i:3;a:1:{s:1:"A";a:9:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";i:1;a:6:{s:4:"type";s:6:"button";s:4:"name";s:9:"deleteall";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:23:"Delete selected Envents";s:7:"onclick";s:43:"return confirm(\'Delete selected Envents?\');";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }','modified' => '1200671585',);
 
 $templ_data[] = array('name' => 'calendar.list.dates','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:4:"hbox";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}i:2;a:2:{s:4:"type";s:4:"date";s:4:"name";s:9:"startdate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"End";}i:4;a:2:{s:4:"type";s:4:"date";s:4:"name";s:7:"enddate";}s:4:"span";s:12:",custom_hide";}}','size' => '','style' => '.custom_hide { visibility: hidden; }','modified' => '1173420675',);
 
-$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:3:"40%";}i:1;a:12:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"cal_end";s:5:"label";s:3:"End";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}}s:1:"I";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}s:1:"K";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"L";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:12:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";}s:1:"F";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"G";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}}s:1:"I";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"L";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this event";s:7:"onclick";s:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this event";s:7:"onclick";s:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}s:4:"span";s:8:",noPrint";i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:12;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1200064350',);
-
 $templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:3:"40%";}i:1;a:12:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"cal_end";s:5:"label";s:3:"End";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}}s:1:"I";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}s:1:"K";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"L";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:12:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";}s:1:"F";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"G";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}}s:1:"I";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"L";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this event";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this event";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}s:4:"span";s:8:",noPrint";i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:12;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1200064350',);
 
+$templ_data[] = array('name' => 'calendar.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}}}i:4;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:7:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:6:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";s:4:"size";s:5:"12,90";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}','size' => '','style' => '','modified' => '1229596125',);
+
+$templ_data[] = array('name' => 'calendar.print.participants','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:4:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:1:"D";s:24:",@hide_status_recurrence";s:2:"c2";s:2:"th";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}i:2;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}}i:3;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";s:8:"readonly";s:1:"1";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}}}s:4:"rows";i:3;s:4:"cols";i:5;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1229357325',);
+
diff --git a/calendar/templates/default/print.participants.xet b/calendar/templates/default/print.participants.xet
new file mode 100644
index 0000000000..6b841d9f27
--- /dev/null
+++ b/calendar/templates/default/print.participants.xet
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="calendar.print.participants" template="" lang="" group="0" version="1.6.001">
+		<grid width="100%" height="200" overflow="auto" id="participants">
+			<columns>
+				<column width="95"/>
+				<column/>
+				<column/>
+				<column disabled="@hide_status_recurrence"/>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<description span="all"/>
+				</row>
+				<row class="th">
+					<description value="Type"/>
+					<description value="Participants"/>
+					<description value="Quantity"/>
+					<description value="All future"/>
+					<description value="Status"/>
+				</row>
+				<row valign="top">
+					<description id="${row}[app]"/>
+					<description rows="1" cols="2" id="${row}[title]" no_lang="1"/>
+					<int id="${row}[quantity]" options="1,,3" readonly="true"/>
+					<checkbox id="${row}[status_recurrence]" align="center" readonly="true"/>
+					<menulist>
+						<menupopup id="${row}[status]" no_lang="1" onchange="1"/>
+					</menulist>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/print.xet b/calendar/templates/default/print.xet
new file mode 100644
index 0000000000..8e03092a5e
--- /dev/null
+++ b/calendar/templates/default/print.xet
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="calendar.print.participants" template="" lang="" group="0" version="1.6.001">
+		<grid width="100%" height="200" overflow="auto" id="participants">
+			<columns>
+				<column width="95"/>
+				<column/>
+				<column/>
+				<column disabled="@hide_status_recurrence"/>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<description span="all"/>
+				</row>
+				<row class="th">
+					<description value="Type"/>
+					<description value="Participants"/>
+					<description value="Quantity"/>
+					<description value="All future"/>
+					<description value="Status"/>
+				</row>
+				<row valign="top">
+					<description id="${row}[app]"/>
+					<description rows="1" cols="2" id="${row}[title]" no_lang="1"/>
+					<int id="${row}[quantity]" options="1,,3" readonly="true"/>
+					<checkbox id="${row}[status_recurrence]" align="center" readonly="true"/>
+					<menulist>
+						<menupopup id="${row}[status]" no_lang="1" onchange="1"/>
+					</menulist>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="calendar.print" template="" lang="" group="0" version="1.6.001">
+		<hbox options="0,0">
+			<grid width="100%" height="200">
+				<columns>
+					<column width="95"/>
+					<column/>
+				</columns>
+				<rows>
+					<row class="th">
+						<image src="print" onclick="window.print();"/>
+						<description class="bold" value="Calendar" options="bold"/>
+					</row>
+					<row class="th" height="28">
+						<description value="Title"/>
+						<textbox id="title" size="80" maxlength="255" readonly="true" span="all"/>
+					</row>
+					<row class="row">
+						<description width="95" options=",,,start" value="Start"/>
+						<hbox options="0,0">
+							<date-time id="start" readonly="true"/>
+							<checkbox label="whole day" id="whole_day" options=",, ,disable" statustext="Event will occupy the whole day" align="center" readonly="true"/>
+						</hbox>
+					</row>
+					<row class="row">
+						<description width="0" options=",,,duration" value="Duration"/>
+						<hbox options="0,0">
+							<menulist>
+								<menupopup no_lang="1" onchange="set_style_by_class('table','end_hide','visibility',this.value == '' ? 'visible' : 'hidden'); if (this.value == '') document.getElementById(form::name('end[str]')).value = document.getElementById(form::name('start[str]')).value;" id="duration" options="Use end date" statustext="Duration of the meeting" readonly="true"/>
+							</menulist>
+							<date-time id="end" class="end_hide" readonly="true"/>
+						</hbox>
+					</row>
+					<row class="row">
+						<description options=",,,location" value="Location" width="0"/>
+						<textbox maxlength="255" id="location" class="inputFullWidth" readonly="true"/>
+					</row>
+					<row class="row_off">
+						<description options=",,,priority" value="Priority" width="0"/>
+						<menulist>
+							<menupopup type="select-priority" id="priority" readonly="true"/>
+						</menulist>
+					</row>
+					<row class="row">
+						<description value="Options" width="0"/>
+						<checkbox id="non_blocking" options=",, ,disable" statustext="A non blocking event will not conflict with other events" label="non blocking" readonly="true"/>
+					</row>
+					<row class="row">
+						<description/>
+						<checkbox id="public" options="0,1" label="Private" readonly="true"/>
+					</row>
+					<row class="row">
+						<description value="Categories"/>
+						<menulist>
+							<menupopup type="select-cat" id="category" readonly="true"/>
+						</menulist>
+					</row>
+					<row valign="top">
+						<description value="Description"/>
+						<textbox multiline="true" id="description" readonly="true" rows="12" cols="90"/>
+					</row>
+					<row class="th">
+						<description value="custom fields" span="all"/>
+					</row>
+					<row>
+						<customfields span="all" readonly="true"/>
+					</row>
+					<row>
+						<template id="calendar.print.participants" span="all"/>
+					</row>
+					<row>
+						<description/>
+						<description/>
+					</row>
+				</rows>
+			</grid>
+		</hbox>
+	</template>
+</overlay>
\ No newline at end of file

From 9b1132c6311cb056d8e71ea88353d6b8271dc99b Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Jan 2009 18:09:14 +0000
Subject: [PATCH 021/510] - Fix bug that allowed tab key to trigger the search,
 which made tabbing through a list very annoying. - Allow up / down arrow keys
 to trigger a blank search.  Due to the above bug, many users were doing this
 anyway.

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

diff --git a/etemplate/js/ajax_select.js b/etemplate/js/ajax_select.js
index 7d41ca1e11..3d8cbab40b 100644
--- a/etemplate/js/ajax_select.js
+++ b/etemplate/js/ajax_select.js
@@ -233,13 +233,9 @@ function change(e, value) {
 	var base_id = id.substr(0, id.lastIndexOf('['));
 	if(document.getElementById(base_id + '[results]')) {
 		set_id = base_id + '[results]'; 
-		if(document.getElementById(set_id).style.display == 'block') {
-			// Tab and arrow keys don't trigger the search
-			if(e.keyCode == 9 
-				|| e.keyCode == 38 || e.keyCode == 40 
-				|| e.keyCode == 63232 || e.keyCode == 63233) {
-				return;
-			}
+		// Tab doesn't trigger the search
+		if(e.keyCode == 9 ) {
+			return;
 		}
 	} else {
 		set_id = base_id + '[search]';

From 48e7312a27d3a4e7b6f42c0be7724ee99e085e2c Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Tue, 6 Jan 2009 12:07:46 +0000
Subject: [PATCH 022/510] fixed small Bug, that IE 6 is not giving the unsecure
 warning, if ssl is used

---
 phpgwapi/templates/default/navbar.tpl | 2 +-
 phpgwapi/templates/jerryr/navbar.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/templates/default/navbar.tpl b/phpgwapi/templates/default/navbar.tpl
index 6cac9dd6af..bc41b11e01 100644
--- a/phpgwapi/templates/default/navbar.tpl
+++ b/phpgwapi/templates/default/navbar.tpl
@@ -70,7 +70,7 @@
 
 
 <!-- BEGIN appbox -->
-<!--[if lte IE 6.5]></div><iframe frameborder="0" framespacing="0"  class="iframeforselectbox"></iframe></div><![endif]-->
+<!--[if lte IE 6.5]></div><iframe frameborder="0" framespacing="0" src="{img_root}/dragarea_right.png" class="iframeforselectbox"></iframe></div><![endif]-->
 	<div id="divSubContainer">
 		<table width="100%" cellspacing="0" cellpadding="0">
 		<tr>
diff --git a/phpgwapi/templates/jerryr/navbar.tpl b/phpgwapi/templates/jerryr/navbar.tpl
index c1ca9840d2..4e5e890bf2 100644
--- a/phpgwapi/templates/jerryr/navbar.tpl
+++ b/phpgwapi/templates/jerryr/navbar.tpl
@@ -75,7 +75,7 @@
 
 
 <!-- BEGIN appbox -->
-	</div><!--[if lte IE 6.5]><iframe frameborder="0" framespacing="0"  class="iframeforselectbox"></iframe><![endif]--></div>
+	</div><!--[if lte IE 6.5]><iframe frameborder="0" framespacing="0" src="{img_root}/dragarea_right.png" class="iframeforselectbox"></iframe><![endif]--></div>
 	<div id="divSubContainer">
 		<table width="100%" cellspacing="0" cellpadding="0">
 		<tr>

From db48c553ab84dc273d16d050386e86471e9b50d4 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 7 Jan 2009 16:47:00 +0000
Subject: [PATCH 023/510] Fix # more... line at the bottom when there are more
 results that are not displayed

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

diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php
index 9b6e1fb822..3f935e858c 100644
--- a/etemplate/inc/class.ajax_select_widget.inc.php
+++ b/etemplate/inc/class.ajax_select_widget.inc.php
@@ -316,7 +316,7 @@
 					$response->addScript("add_ajax_result('$result_id', '${row['id_field']}', '" . $row['title'] . "', '$html');");
 					$count++;
 					if($count > $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) {
-						$response->addScript("add_ajax_result('$result_id', '', '" . lang("%1 more...", (count($result_list) - $count)) . "');");
+						$response->addScript("add_ajax_result('$result_id', '', '', '" . lang("%1 more...", (count($result_list) - $count)) . "');");
 						break;
 					}
 				}

From d330fe99345e73097894600b4241b87bf7ddbb19 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 13 Jan 2009 11:41:56 +0000
Subject: [PATCH 024/510] bugfix for typo in class-var

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

diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 2a14e7aa4b..41f3df74b1 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -70,7 +70,7 @@ class accounts_sql
 	 *
 	 * @var accounts
 	 */
-	private $fontend;
+	private $frontend;
 
 	/**
 	 * Constructor
@@ -378,6 +378,7 @@ class accounts_sql
 					break;
 			}
 		}
+		$criteria[] = "egw_addressbook.account_id is not null ";
 		$accounts = array();
 		if (!is_object($GLOBALS['egw']->contacts)) throw new exception('No $GLOBALS[egw]->contacts!');
 		if (($contacts =& $GLOBALS['egw']->contacts->search($criteria,false,$order,"account_lid,account_type,account_status,$this->table.account_id",

From 5ed6981210df371f6d32ee106de38946b4e20821 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 14 Jan 2009 08:40:08 +0000
Subject: [PATCH 025/510] added Links to print template

---
 calendar/setup/etemplates.inc.php    | 10 +++++++---
 calendar/templates/default/print.xet | 25 ++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/calendar/setup/etemplates.inc.php b/calendar/setup/etemplates.inc.php
index d962ec43aa..5328a8c7ff 100644
--- a/calendar/setup/etemplates.inc.php
+++ b/calendar/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application calendar
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-12-18 16:18
+	* generated by soetemplate::dump4setup() 2009-01-14 10:14
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package calendar
@@ -24,6 +24,8 @@ $templ_data[] = array('name' => 'calendar.edit.description','template' => '','la
 
 $templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:257:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:4:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
 
+$templ_data[] = array('name' => 'calendar.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:2:"th";s:2:"h1";s:6:",@view";s:2:"c2";s:3:"row";s:2:"h2";s:6:",@view";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:7:"link-to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:4;s:4:"size";s:17:"100%,200,,,,,auto";}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1231922193',);
+
 $templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1172430059',);
 
 $templ_data[] = array('name' => 'calendar.edit.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1229280346',);
@@ -42,7 +44,9 @@ $templ_data[] = array('name' => 'calendar.list.dates','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:3:"40%";}i:1;a:12:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"cal_end";s:5:"label";s:3:"End";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}}s:1:"I";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}s:1:"K";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"L";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:12:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";}s:1:"F";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"G";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}}s:1:"I";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"L";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this event";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this event";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}s:4:"span";s:8:",noPrint";i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:12;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1200064350',);
 
-$templ_data[] = array('name' => 'calendar.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}}}i:4;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:7:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:6:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";s:4:"size";s:5:"12,90";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}','size' => '','style' => '','modified' => '1229596125',);
+$templ_data[] = array('name' => 'calendar.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}}}i:4;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:7:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:6:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:20:"calendar.print.links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}','size' => '','style' => '','modified' => '1229596125',);
 
-$templ_data[] = array('name' => 'calendar.print.participants','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:4:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:1:"D";s:24:",@hide_status_recurrence";s:2:"c2";s:2:"th";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}i:2;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}}i:3;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";s:8:"readonly";s:1:"1";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}}}s:4:"rows";i:3;s:4:"cols";i:5;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1229357325',);
+$templ_data[] = array('name' => 'calendar.print.links','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:2:"95";s:2:"c1";s:2:"th";s:2:"c2";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:2;s:4:"size";s:17:"100%,200,,,,,auto";}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1231922363',);
+
+$templ_data[] = array('name' => 'calendar.print.participants','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c3";s:4:",top";s:1:"D";s:24:",@hide_status_recurrence";s:2:"c2";s:2:"th";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}i:2;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}}i:3;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";s:8:"readonly";s:1:"1";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}}}s:4:"rows";i:3;s:4:"cols";i:5;s:4:"size";s:14:"100%,,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:2:{i:0;s:4:"100%";i:6;s:4:"auto";}}}','size' => '100%,,,,,,auto','style' => '','modified' => '1229357325',);
 
diff --git a/calendar/templates/default/print.xet b/calendar/templates/default/print.xet
index 8e03092a5e..d9403af771 100644
--- a/calendar/templates/default/print.xet
+++ b/calendar/templates/default/print.xet
@@ -2,9 +2,9 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="calendar.print.participants" template="" lang="" group="0" version="1.6.001">
-		<grid width="100%" height="200" overflow="auto" id="participants">
+		<grid width="100%" overflow="auto" id="participants">
 			<columns>
-				<column width="95"/>
+				<column/>
 				<column/>
 				<column/>
 				<column disabled="@hide_status_recurrence"/>
@@ -33,6 +33,22 @@
 			</rows>
 		</grid>
 	</template>
+	<template id="calendar.print.links" template="" lang="" group="0" version="1.6.001">
+		<grid width="100%" height="200" overflow="auto">
+			<columns>
+				<column width="95"/>
+				<column/>
+			</columns>
+			<rows>
+				<row class="th">
+					<description span="all" value="Existing links"/>
+				</row>
+				<row class="row_off" valign="top">
+					<link-list span="all" id="link_to"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
 	<template id="calendar.print" template="" lang="" group="0" version="1.6.001">
 		<hbox options="0,0">
 			<grid width="100%" height="200">
@@ -91,7 +107,7 @@
 					</row>
 					<row valign="top">
 						<description value="Description"/>
-						<textbox multiline="true" id="description" readonly="true" rows="12" cols="90"/>
+						<textbox multiline="true" id="description" readonly="true"/>
 					</row>
 					<row class="th">
 						<description value="custom fields" span="all"/>
@@ -103,8 +119,7 @@
 						<template id="calendar.print.participants" span="all"/>
 					</row>
 					<row>
-						<description/>
-						<description/>
+						<template span="all" id="calendar.print.links"/>
 					</row>
 				</rows>
 			</grid>

From 662f0fc7070a87e6362a4165ca2a613fdd1e71d7 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Jan 2009 09:45:16 +0000
Subject: [PATCH 026/510] fix for missing projectmanagerlinks in timesheet
 (tracker #1876)

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

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 3178ac8a37..6d0c02d220 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -504,7 +504,8 @@ class timesheet_ui extends timesheet_bo
 			$rows = $ids;
 			return $this->total;	// no need to set other fields or $readonlys
 		}
-		$links = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
+		#$links = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
+		$links = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true);
 
 		unset($query['col_filter'][0]);
 

From 1b4d236d4ac08813cd6f7ac297c4dbea213cd1de Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 17 Jan 2009 03:36:58 +0000
Subject: [PATCH 027/510] New class extending so_sql handing all custom fields
 needs: reading, saving, searching, ordering and filtering Makeing a full
 custom field implementation like in addressbook very easy and quick

---
 etemplate/inc/class.so_sql.inc.php    |   7 +-
 etemplate/inc/class.so_sql_cf.inc.php | 434 ++++++++++++++++++++++++++
 2 files changed, 439 insertions(+), 2 deletions(-)
 create mode 100644 etemplate/inc/class.so_sql_cf.inc.php

diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index ef4274218b..c3077b374d 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -6,7 +6,7 @@
  * @package etemplate
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright 2002-8 by RalfBecker@outdoor-training.de
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
  * @version $Id$
  */
 
@@ -592,9 +592,10 @@ class so_sql
 	 * deletes row representing keys in internal data or the supplied $keys if != null
 	 *
 	 * @param array $keys if given array with col => value pairs to characterise the rows to delete
+	 * @param boolean $only_return_query=false return $query of delete call to db object, but not run it (used by so_sql_cf!)
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null)
+	function delete($keys=null,$only_return_query=false)
 	{
 		if ($this->autoinc_id && $keys && !is_array($keys))
 		{
@@ -622,6 +623,8 @@ class so_sql
 		{
 			$query[$db_col] = $data[$col];
 		}
+		if ($only_return_query) return $query;
+		
 		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
 
 		return $this->db->affected_rows();
diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
new file mode 100644
index 0000000000..fa7b865d95
--- /dev/null
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -0,0 +1,434 @@
+<?php
+/**
+ * eGroupWare generalized SQL Storage Object with build in custom field support
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker@outdoor-training.de>
+ * @copyright 2009 by RalfBecker@outdoor-training.de
+ * @version $Id$
+ */
+
+/**
+ * Generalized SQL Storage Object with build in custom field support
+ * 
+ * This class allows to display, search, order and filter by custom fields simply by replacing so_sql
+ * by it and adding custom field widgets to the eTemplates of an applications. 
+ * It's inspired by the code from Klaus Leithoff, which does the same thing limited to addressbook.
+ *
+ * The schema of the custom fields table should be like (the lenght of the cf name is nowhere enfored and
+ * varies throughout eGW from 40-255, the value column from varchar(255) to longtext!):
+ * 
+ * 'egw_app_extra' => array(
+ * 	'fd' => array(
+ * 		'prefix_id' => array('type' => 'int','precision' => '4','nullable' => False),
+ * 		'prefix_name' => array('type' => 'string','precision' => '64','nullable' => False),
+ * 		'prefix_value' => array('type' => 'text'),
+ * 	),
+ *  'pk' => array('prefix_id','prefix_name'),
+ *	'fk' => array(),
+ *	'ix' => array(),
+ *	'uc' => array()
+ * )
+ *
+ * @package etemplate
+ * @subpackage api
+ * @author RalfBecker-AT-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ */
+class so_sql_cf extends so_sql
+{
+	const CF_PREFIX = '#';
+
+	/**
+	 * name of customefields table
+	 *
+	 * @var string
+	 */
+	var $extra_table;
+
+	/**
+	 * name of id column, defaults to the regular tables auto id
+	 * 
+	 * @var string
+	 */
+	var $extra_id = '_id';
+
+	/**
+	 * Name of key (cf name) column or just a postfix added to the table prefix
+	 * 
+	 * @var string
+	 */
+	var $extra_key = '_name';
+
+	/**
+	 * Name of value column or just a postfix added to the table prefix
+	 * 
+	 * @var string
+	 */
+	var $extra_value = '_value';
+
+	var $extra_join;
+	var $extra_join_order;
+	var $extra_join_filter;
+	
+	/**
+	 * Custom fields of $app, read by the constructor
+	 * 
+	 * @var array
+	 */
+	var $customfields;
+
+	/**
+	 * constructor of the class
+	 * 
+	 * Please note the different params compared to so_sql!
+	 *
+	 * @param string $app application name to load table schemas
+	 * @param string $table name of the table to use
+	 * @param string $extra_table name of the custom field table
+	 * @param string $colum_prefix='' column prefix to automatic remove from the column-name, if the column name starts with it
+	 * @param string $extra_key='_name' column name for cf name column (will be prefixed with colum prefix, if starting with _)
+	 * @param string $extra_value='_value' column name for cf value column (will be prefixed with colum prefix, if starting with _)
+	 * @param string $extra_id='_id' column name for cf id column (will be prefixed with colum prefix, if starting with _)
+	 * @param egw_db $db=null database object, if not the one in $GLOBALS['egw']->db should be used, eg. for an other database
+	 * @param boolean $no_clone=true can we avoid to clone the db-object, default yes (different from so_sql!)
+	 * 	new code using appnames and foreach(select(...,$app) can set it to avoid an extra instance of the db object
+	 */
+	function __construct($app,$table,$extra_table,$column_prefix='',
+		$extra_key='_name',$extra_value='_value',$extra_id='_id',
+		$db=null,$no_clone=true)
+	{
+		// calling the so_sql constructor
+		parent::__construct($app,$table,$db,$column_prefix,$no_clone);
+		
+		$this->extra_table = $extra_table;
+		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
+		
+		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
+		if (!($prefix=$column_prefix))
+		{
+			list($prefix) = explode('_',$this->autoinc_id);
+		}
+		elseif(substr($prefix,-1) == '_')
+		{
+			$prefix = substr($prefix,0,-1);	// remove trailing underscore from column prefix parameter
+		}
+		foreach(array('extra_id','extra_key','extra_value') as $col)
+		{
+			$this->$col = $col_name = $$col;
+			if ($col_name[0] == '_') $this->$col = $prefix . $$col;
+		}
+		// some sanity checks, maybe they should be active only for development
+		if (!($extra_defs = $this->db->get_table_definitions($app,$extra_table)))
+		{
+			throw new egw_exception_wrong_parameter("extra table $extra_table is NOT defined!");
+		}
+		foreach(array('extra_id','extra_key','extra_value') as $col)
+		{
+			if (!$this->$col || !isset($extra_defs['fd'][$this->$col]))
+			{
+				throw new egw_exception_wrong_parameter("$col column $extra_table.{$this->$col} is NOT defined!");
+			}
+		}
+		// setting up our extra joins, now we know table and column names
+		$this->extra_join = " LEFT JOIN $extra_table ON $table.$this->autoinc_id=$extra_table.$this->extra_id";
+		$this->extra_join_order = " LEFT JOIN $extra_table extra_order ON $table.$this->autoinc_id=extra_order.$this->extra_id";
+		$this->extra_join_filter = " JOIN $extra_table extra_filter ON $table.$this->autoinc_id=extra_filter.$this->extra_id";
+		
+		$this->customfields = config::get_customfields($app);
+	}
+
+	/**
+	 * Read all customfields of the given id's
+	 *
+	 * @param int|array $ids one ore more id's
+	 * @param array $field_names=null custom fields to read, default all
+	 * @return array id => self::CF_PREFIX.name => value
+	 */
+	function read_customfields($ids,$field_names=null)
+	{
+		if (is_null($field_names)) $field_names = array_keys($this->customfields);
+
+		foreach((array)$ids as $key => $id)
+		{
+			if (!(int)$id && is_array($ids)) unset($ids[$key]);
+		}
+		if (!$ids || !$field_names) return array();	// nothing to do
+
+		$fields = array();
+		foreach($this->db->select($this->extra_table,'*',array(
+			$this->extra_id => $ids,
+			$this->extra_key => $field_names,
+		),__LINE__,__FILE__,false,'',$this->app) as $row)
+		{
+			$fields[$row[$this->extra_id]][self::CF_PREFIX.$row[$this->extra_key]] = $row[$this->extra_value];
+		}
+		return $fields;
+	}
+
+	/**
+	* saves custom field data
+	*
+	* @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
+	* @return bool false on success, errornumber on failure
+	*/
+	function save_customfields($data)
+	{
+		foreach ((array)$this->customfields as $field => $options)
+		{
+			if (!isset($data[self::CF_PREFIX.$field])) continue;
+
+			$where = array(
+				$this->extra_id    => $data[$this->autoinc_id],
+				$this->extra_key   => $field,
+			);
+			
+			if((string) $data[self::CF_PREFIX.$field] === '')	// dont write empty values
+			{
+				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);	// just delete them, in case they were previously set
+				continue;
+			}
+			if (!$this->db->insert($this->extra_table,array($this->extra_value => $data[self::CF_PREFIX.$field]),$where,__LINE__,__FILE__,$this->app))
+			{
+				return $this->db->Errno;
+			}
+		}
+		return false;	// no error
+	}
+	
+	/**
+	 * merges in new values from the given new data-array
+	 *
+	 * reimplemented to also merge the customfields
+	 *
+	 * @param $new array in form col => new_value with values to set
+	 */
+	function data_merge($new)
+	{
+		parent::data_merge($new);
+
+		if ($this->customfields)
+		{
+			foreach($this->customfields as $name => $data)
+			{
+				if (isset($new[self::CF_PREFIX.$name]))
+				{
+					$this->data[self::CF_PREFIX.$name] = $new[self::CF_PREFIX.$name];
+				}
+			}
+		}
+	}
+
+	/**
+	 * reads row matched by key and puts all cols in the data array
+	 * 
+	 * reimplented to also read the custom fields
+	 *
+	 * @param array $keys array with keys in form internalName => value, may be a scalar value if only one key
+	 * @param string|array $extra_cols string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $join sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
+	 * @return array|boolean data if row could be retrived else False
+	 */
+	function read($keys,$extra_cols='',$join='')
+	{
+		if (!parent::read($keys,$extra_cols,$join))
+		{
+			return false;
+		}
+		if (($id = (int)$this->data[$this->autoinc_id]) && $this->customfields &&
+			($cfs = $this->read_customfields($id)))
+		{
+			$this->data = array_merge($this->data,$cfs[$id]);
+		}
+		return $this->data;
+	}
+
+	/**
+	 * saves the content of data to the db
+	 *
+	 * reimplented to also save the custom fields
+	 *
+	 * @param array $keys if given $keys are copied to data before saveing => allows a save as
+	 * @param string|array $extra_where=null extra where clause, eg. to check an etag, returns true if no affected rows!
+	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
+	 */
+	function save($keys=null,$extra_where=null)
+	{
+		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+
+		$ret = parent::save(null,$extra_where);
+		
+		if ($ret == 0 && $this->customfields)
+		{
+			$this->save_customfields($this->data);
+		}
+		return $ret;
+	}
+
+	/**
+	 * deletes row representing keys in internal data or the supplied $keys if != null
+	 *
+	 * reimplented to also delete the custom fields
+	 *
+	 * @param array $keys if given array with col => value pairs to characterise the rows to delete
+	 * @return int affected rows, should be 1 if ok, 0 if an error
+	 */
+	function delete($keys=null)
+	{
+		if ($this->customfields)
+		{
+			$query = parent::delete($keys,true);
+			// check if query contains more then the id's
+			if (!isset($query[$this->autoinc_id]) || count($query) != 1)
+			{
+				foreach($this->db->select($this->table_name,$this->autoinc_id,$query,__LINE__,__FILE__,false,'',$this->app) as $row)
+				{
+					$ids[] = $row[$this->autoinc_id];
+				}
+				if (!$ids) return 0;	// no rows affected
+			}
+			else
+			{
+				$ids = $query[$this->autoinc_id];
+			}
+			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
+		}
+		return parent::delete($keys);
+	}
+
+	/**
+	 * query rows for the nextmatch widget
+	 * 
+	 * Reimplemented to also read the custom fields (if enabled via $query['selectcols']).
+	 * 
+	 * Please note: the name of the nextmatch-customfields has to be 'customfields'!
+	 *
+	 * @param array $query with keys 'start', 'search', 'order', 'sort', 'col_filter'
+	 *	For other keys like 'filter', 'cat_id' you have to reimplement this method in a derived class.
+	 * @param array &$rows returned rows/competitions
+	 * @param array &$readonlys eg. to disable buttons based on acl, not use here, maybe in a derived class
+	 * @param string $join='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
+	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
+	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
+	 * @param mixed $only_keys=false, see search
+	 * @return int total number of rows
+	 */
+	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false)
+	{
+		$criteria = array();
+		if ($query['search'])
+		{
+			foreach($this->db_cols as $col)	// we search all cols
+			{
+				$criteria[$col] = $query['search'];
+			}
+			$criteria[$this->extra_value] = $query['search'];
+		}
+		$rows = $this->search($criteria,$only_keys,$query['order']?$query['order'].' '.$query['sort']:'',
+			'','%',false,'OR',$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
+			$query['col_filter'],$join,$need_full_no_count);
+
+		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		
+		$selectcols = $query['selectcols'] ? explode(',',$query['selectcols']) : array();
+
+		if ($rows && $this->customfields && (!$selectcols || in_array('customfields',$selectcols)))
+		{
+			$id2keys = array();
+			foreach($rows as $key => $row)
+			{
+				$id2keys[$row[$this->autoinc_id]] = $key;
+			}
+			// check if only certain cf's to show
+			foreach($selectcols as $col)
+			{
+				if ($col[0] == self::CF_PREFIX) $fields[] = substr($col,1);
+			}
+			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
+			{
+				foreach($cfs as $id => $data)
+				{
+					$rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]],$data);
+				}
+			}
+		}
+		return $this->total;
+	}
+
+	/**
+	 * searches db for rows matching searchcriteria
+	 * 
+	 * Reimplemented to search, order and filter by custom fields
+	 *
+	 * @param array/string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
+	 * @param boolean/string/array $only_keys=true True returns only keys, False returns all cols. or
+	 *	comma seperated list or array of columns to return
+	 * @param string $order_by='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
+	 * @param string/array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $wildcard='' appended befor and after each criteria
+	 * @param boolean $empty=false False=empty criteria are ignored in query, True=empty have to be empty in row
+	 * @param string $op='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
+	 * @param mixed $start=false if != false, return only maxmatch rows begining with start, or array($start,$num), or 'UNION' for a part of a union query
+	 * @param array $filter=null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
+	 * @param string $join='' sql to do a join, added as is after the table-name, eg. "JOIN table2 ON x=y" or
+	 *	"LEFT JOIN table2 ON (x=y AND z=o)", Note: there's no quoting done on $join, you are responsible for it!!!
+	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
+	 * @return boolean/array of matching rows (the row is an array of the cols) or False
+	 */
+	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	{
+		// check if we search in the custom fields
+		if ($criteria && is_array($criteria) && isset($criteria[$this->extra_value]))
+		{
+			$criteria[] = $this->extra_table.'.'.$this->extra_value . ' ' .
+				$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' . 
+				$this->db->quote('%'.$criteria[$this->extra_value].'%');
+			unset($criteria[$this->extra_value]);
+			$join .= $this->extra_join;
+		}
+		// check if we order by a custom field --> join cf table for given cf and order by it's value
+		if (strpos($order_by,self::CF_PREFIX) !== false && 
+			preg_match('/'.self::CF_PREFIX.'([^ ]+) (asc|desc)/i',$order_by,$matches))
+		{
+			$order_by = str_replace($matches[0],'extra_order.'.$this->extra_value.' IS NULL,extra_order.'.$this->extra_value.' '.$matches[2],$order_by);
+			$join .= $this->extra_join_order.' AND extra_order.'.$this->extra_key.'='.$this->db->quote($matches[1]);
+		}
+		
+		// check if we filter by a custom field
+		foreach($filter as $name => $val)
+		{
+			if (is_string($name) && $name[0] == self::CF_PREFIX)
+			{
+				if (!empty($val))	// empty -> dont filter
+				{
+					$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
+						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($name,1)).
+						' AND extra_filter.'.$this->extra_value.'='.$this->db->quote($val));
+					++$extra_filter;
+				}
+				unset($filter[$name]);
+			}
+			elseif(is_int($name) && $val[0] == self::CF_PREFIX)	// lettersearch: #cfname LIKE 's%'
+			{
+				list($cf) = explode(' ',$val);
+				$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
+					' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($cf,1)).
+					' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));
+				++$extra_filter;
+				unset($filter[$name]);
+			}
+		}
+		
+		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+	}
+	
+	/**
+	 * Prevent someone calling the old php4 so_sql constructor
+	 */
+	function so_sql()
+	{
+		throw new egw_exception_assertion_failed('use __construct()!');
+	}
+}

From 4c5d771cdea996ae6f8c12a18c3b9dc14775f4ef Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 22 Jan 2009 15:05:54 +0000
Subject: [PATCH 028/510] Don't use htmlspecialchars, it causes issues with
 mixed quotes.

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

diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php
index 3f935e858c..483e3f6bdd 100644
--- a/etemplate/inc/class.ajax_select_widget.inc.php
+++ b/etemplate/inc/class.ajax_select_widget.inc.php
@@ -311,8 +311,10 @@
 					$data = ($query['nextmatch_template']) ? array(1=>$row) : $row;
 					$widget =& CreateObject('etemplate.etemplate', $query['template']);
 					$html = addslashes(str_replace("\n", '', $widget->show($data, '', $readonlys)));
-					$row['id_field'] = htmlspecialchars(addslashes($row[$query['id_field']]));
-					$row['title'] = htmlspecialchars(addslashes($row['title']));
+					
+					// If we use htmlspecialchars, it causes issues with mixed quotes.  addslashes() seems to handle it.
+					$row['id_field'] = addslashes($row[$query['id_field']]);
+					$row['title'] = addslashes($row['title']);
 					$response->addScript("add_ajax_result('$result_id', '${row['id_field']}', '" . $row['title'] . "', '$html');");
 					$count++;
 					if($count > $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) {

From d3d47af015e4a1d0d05c5776f1da42f57363efce Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 23 Jan 2009 19:33:19 +0000
Subject: [PATCH 029/510] Fix bug where if there are multiple nextmatches on a
 page, and your default num_rows is not in the list (ex: 15), and you cause a
 nextmatch to submit (by changing a filter or num_rows), the num_rows of the
 next nextmatch to be processed will be cleared

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

diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 4e5e7d64bd..d7e5311ea1 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -292,9 +292,10 @@ class nextmatch_widget
 			if ($n-5 <= $max && $max <= $n+5) $n = $max;
 			$row_options[$n] = $n;
 		}
-		if (!isset($row_options[$max]))
+		if (!isset($row_options[$max]) || !isset($row_options[$value['num_rows']]))
 		{
 			$row_options[$max] = $max;
+			$row_options[$value['num_rows']] = $value['num_rows'];
 			ksort($row_options);
 		}
 		$value['options-num_rows'] =& $row_options;

From f4cf482f4f8bfba8534cfddf8358f99c1b737b49 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Sun, 25 Jan 2009 18:05:13 +0000
Subject: [PATCH 030/510] removed debugging into my home folder. sorry I forgot
 that !

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

diff --git a/notifications/inc/class.notifications_winpopup.inc.php b/notifications/inc/class.notifications_winpopup.inc.php
index 8a3e38cc39..7836228e1a 100644
--- a/notifications/inc/class.notifications_winpopup.inc.php
+++ b/notifications/inc/class.notifications_winpopup.inc.php
@@ -68,7 +68,7 @@ class notifications_winpopup implements notifications_iface {
 	 *
 	 * @var string
 	 */
-	private $netbios_command = "/bin/echo [MESSAGE] >> /Users/jaytraxx/winpopup.out";
+	private $netbios_command = false;
 
 	/**
 	 * constructor of notifications_winpopup

From 87247b6ca4c3758498fbfecf67a7ba51f55fd690 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 27 Jan 2009 15:14:56 +0000
Subject: [PATCH 031/510] adding some debug and have it commented out to
 research the issue in tracker #1876 (Timesheet, in detail view, not shows
 link to the owner project)

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

diff --git a/phpgwapi/inc/class.solink.inc.php b/phpgwapi/inc/class.solink.inc.php
index a239c32e2f..d00ff2453e 100644
--- a/phpgwapi/inc/class.solink.inc.php
+++ b/phpgwapi/inc/class.solink.inc.php
@@ -126,6 +126,7 @@ class solink
 		{
 			$only_app = substr($only_app,1);
 		}
+		#var_dump($not_only);echo "$only_app<br>";
 		$links = array();
 		foreach(self::$db->select(self::TABLE,'*',self::$db->expression(self::TABLE,'(',array(
 					'link_app1'	=> $app,
@@ -155,12 +156,13 @@ class solink
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
 		$linked_id  = $left ? $row['link_id2'] : $row['link_id1'];
 		$app_id = $left ? $row['link_id1'] : $row['link_id2'];
-
 		if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$linked_app])
 		{
+			#echo "$linked_app == $only_app, ";var_dump($linked_app == $only_app);echo "	->dont return a link<br>";
 			return;
 		}
-		$links[$app_id][$row['link_id']] = $only_app && !$not_only ? $linked_id : array(
+		#echo "returning ".(($only_app && !$not_only) ? " linkid:".$linked_id : " full array with linkid $linked_id")."<br>";
+		$links[$app_id][$row['link_id']] = ($only_app && !$not_only) ? $linked_id : array(
 			'app'     => $linked_app,
 			'id'      => $linked_id,
 			'remark'  => $row['link_remark'],

From 84c8de754d0e2a633efc18a777e4b48c21dad002 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 27 Jan 2009 15:51:04 +0000
Subject: [PATCH 032/510] fix for issue in tracker #1876 (Timesheet, in detail
 view, not shows link to the owner project); fix for not working
 'no-project'-filter

---
 timesheet/inc/class.timesheet_ui.inc.php | 33 +++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 6d0c02d220..faf72162bd 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -409,7 +409,7 @@ class timesheet_ui extends timesheet_bo
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
 		$GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
 		$query = $query_in;	// keep the original query
-
+		#_debug_array($query['col_filter']);
 		// PM project filter for the PM integration
 		if ((string)$query['col_filter']['pm_id'] != '')
 		{
@@ -417,11 +417,17 @@ class timesheet_ui extends timesheet_bo
 			$query['col_filter']['ts_id'] = $this->get_ts_links($query['col_filter']['pm_id']);
 			if (!$query['col_filter']['ts_id']) $query['col_filter']['ts_id'] = 0;
 		}
+		if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] == '0') {
+			$query['col_filter']['ts_project'] = 0;
+			unset($query['col_filter']['ts_id']);
+		}
 		unset($query['col_filter']['pm_id']);
 
 		// filter for no project
-		if ((string)$query['col_filter']['ts_project'] == '0') $query['col_filter']['ts_project'] = null;
-
+		if ((string)$query['col_filter']['ts_project'] == '0') {
+			$query['col_filter']['ts_project'] = null;
+		}
+		#_debug_array($query['col_filter']);
 		if ((int)$query['filter2'] != (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'])
 		{
 			$GLOBALS['egw']->preferences->add(TIMESHEET_APP,'show_details',(int)$query['filter2']);
@@ -504,9 +510,24 @@ class timesheet_ui extends timesheet_bo
 			$rows = $ids;
 			return $this->total;	// no need to set other fields or $readonlys
 		}
-		#$links = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
-		$links = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true);
-
+		$links3 = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
+		#_debug_array($links);
+		//as the full array is expected, we must supply the missing but needed (since expected further down) information
+		if (is_array($links3)) {
+			foreach ($links3 as $likey => $liarray) {
+				#echo "$likey";_debug_array($liarray);echo"<br>";
+				if (is_array($liarray)) {
+					foreach ($liarray as $li2key => $lival) {
+						$links[$likey][$li2key]['id'] = $lival;
+						$links[$likey][$li2key]['app'] = 'projectmanager';
+					}
+				}
+			}
+			if (!is_array($links)) $links = array();
+		} else {
+			$links = array();
+		}
+		#_debug_array($links);
 		unset($query['col_filter'][0]);
 
 		// query cf's for the displayed rows

From c2ca3760b7620da8639dd1832ac905a1efd68b4e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 27 Jan 2009 18:31:28 +0000
Subject: [PATCH 033/510] Work around bug in Safari (OS X) Version 3.2.1
 (5525.27.1) on multi-domain sites

---
 phpgwapi/inc/functions.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 42bd864983..591ab09700 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -108,6 +108,10 @@ print_debug('sane environment','messageonly','api');
 /****************************************************************************\
 * Multi-Domain support                                                       *
 \****************************************************************************/
+
+// Work around bug in Safari Version 3.2.1 (5525.27.1) where cookie named domain is called Domain
+if($_REQUEST['Domain']) $_REQUEST['domain'] = $_REQUEST['Domain'];
+
 $GLOBALS['egw_info']['user']['domain'] = egw_session::search_instance(
 	isset($_POST['login']) ? $_POST['login'] : (isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : $_SERVER['REMOTE_USER']),
 	$_REQUEST['domain'],$GLOBALS['egw_info']['server']['default_domain'],$_SERVER['SERVER_NAME'],$GLOBALS['egw_domain']);

From 3b962e706446e024b01bd5043817f93a95b543c4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 29 Jan 2009 18:31:40 +0000
Subject: [PATCH 034/510] Allow to set an explicit name for a tab_widget:
 "tabs=one|two|three" In the example the tab itself is named "tabs", with tabs
 "one", "two" and "three". Therefore the name of the tab-widget (where the
 select tab gets reported and used to disable a single tab) does no longer
 depend on the available tabs. This allows for a deeper customization.
 Examples on how to use it are in the next two commits: tracker and pm

---
 etemplate/inc/class.etemplate.inc.php  |  7 ++++-
 etemplate/inc/class.tab_widget.inc.php | 42 +++++++++++++-------------
 etemplate/inc/class.xul_io.inc.php     |  6 +++-
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 1cb5d723fa..ca6395a6b3 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -957,7 +957,12 @@ class etemplate extends boetemplate
 				$show_c,$show_row,$content['.c'],$content['.row'],$content));
 		}
 		$name = $this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
-
+		// allow names like "tabs=one|two|three", which will be equal to just "tabs"
+		// eg. for tabs to use a name independent of the tabs contained
+		if (is_string($name) && strpos($name,'=') !== false)
+		{
+			list($name) = explode('=',$name);
+		}
 		$form_name = $this->form_name($cname,$name);
 
 		$value = $this->get_array($content,$name);
diff --git a/etemplate/inc/class.tab_widget.inc.php b/etemplate/inc/class.tab_widget.inc.php
index 6f29c1acef..17acea5225 100644
--- a/etemplate/inc/class.tab_widget.inc.php
+++ b/etemplate/inc/class.tab_widget.inc.php
@@ -4,22 +4,18 @@
 	 *
 	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	 * @package etemplate
+	 * @subpackage extensions
 	 * @link http://www.egroupware.org
 	 * @author Ralf Becker <RalfBecker@outdoor-training.de>
 	 * @version $Id$
 	 */
-
+	
 	/**
 	 * eTemplate Extension: widget that shows one row of tabs and an other row with the eTemplate of the selected tab
 	 *
 	 * See the example in 'etemplate.tab_widget.test'
 	 *
 	 * This widget is independent of the UI as it only uses etemplate-widgets and has therefor no render-function
-	 *
-	 * @package etemplate
-	 * @subpackage extensions
-	 * @author RalfBecker-AT-outdoor-training.de
-	 * @license GPL
 	 */
 	class tab_widget
 	{
@@ -36,7 +32,7 @@
 		 * @var string
 		 */
 		var $human_name = 'Tabs';	// this is the name for the editor
-
+	
 		/**
 		 * Constructor of the extension
 		 *
@@ -45,7 +41,7 @@
 		function tab_widget($ui)
 		{
 		}
-
+	
 		/**
 		 * pre-processing of the extension
 		 *
@@ -62,15 +58,19 @@
 		function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 		{
 			//echo "<p>tab_widget::pre_process('$form_name',$value,,$extension_data)</p>\n";
-
+	
 			if (!$cell['onchange'])	// onchange allows to use the old behavior (submit for each new tab)
 			{
 				$dom_enabled = isset($GLOBALS['egw_info']['etemplate']['dom_enabled']) ? $GLOBALS['egw_info']['etemplate']['dom_enabled'] : true;
 			}
 			$labels = explode('|',$cell['label']);
 			$helps = explode('|',$cell['help']);
-			$names = explode('|',$cell['name']);
-
+			if (strpos($cell_name=$tab_names=$cell['name'],'=') !== false)
+			{
+				list($cell_name,$tab_names) = explode('=',$cell['name']);
+				$cell['name'] = $cell_name;
+			}
+			$names = explode('|',$tab_names);
 			// disable tab mentioned in readonlys
 			foreach(is_array($readonlys) ? $readonlys : array($readonlys => true) as $name => $disable)
 			{
@@ -85,7 +85,7 @@
 				}
 			}
 			$all_names = implode('|',$names);
-
+	
 			$tab_widget =& new etemplate('etemplate.tab_widget');
 			$tab_widget->no_onclick = true;
 	
@@ -109,7 +109,7 @@
 				$value = $selected_tab = $names[0];
 			}
 			$extension_data = $value;	// remember the active tab in the extension_data
-
+	
 			foreach($names as $k => $name)
 			{
 				if (strpos($name,'.') === false)
@@ -134,17 +134,17 @@
 				{
 					$tcell['type'] = 'button';
 					$tcell['onchange'] = '1';
-					$tcell['name'] = $cell['name'].'['.$name.']';
+					$tcell['name'] = $cell_name.'['.$name.']';
 				}
 				$tcell['label'] = $labels[$k];
 				$tcell['help'] = $helps[$k];
-
+	
 				$tab_widget->set_cell_attribute('tabs',1+$k,$tcell);
 			}
 			$tab_widget->set_cell_attribute('tabs','type','hbox');
 			$tab_widget->set_cell_attribute('tabs','size',count($names));
 			$tab_widget->set_cell_attribute('tabs','name','');
-
+	
 			if ($dom_enabled)
 			{
 				foreach($names as $n => $name)
@@ -156,7 +156,7 @@
 				$tab_widget->set_cell_attribute('body','type','deck');
 				$tab_widget->set_cell_attribute('body','size',count($names));
 				$tab_widget->set_cell_attribute('body','span',',tab_body');
-				$tab_widget->set_cell_attribute('body','name',$cell['name']);
+				$tab_widget->set_cell_attribute('body','name',$cell_name);
 			}
 			else
 			{
@@ -166,14 +166,14 @@
 				$tab_widget->set_cell_attribute('body','obj',$stab);
 			}
 			$tab_widget->set_cell_attribute('body','name',$selected_tab);
-
+	
 			$cell['type'] = 'template';
 			$cell['obj'] = &$tab_widget;
 			$cell['label'] = $cell['help'] = '';
-
+	
 			return False;	// NO extra Label
 		}
-
+	
 		/**
 		 * postprocessing method, called after the submission of the form
 		 *
@@ -194,7 +194,7 @@
 		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
 		{
 			//echo "<p>tab_widget::post_process($name): value_in = "; _debug_array($value_in);
-
+	
 			if (is_array($value_in))
 			{
 				foreach ($value_in as $tab => $button_pressed)
diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index 335a9ec819..af3cc332c9 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -200,7 +200,11 @@
 			case 'tabbox':
 				$labels = explode('|',$cell['label']);  unset($cell['label']);
 				$helps  = explode('|',$cell['help']);   unset($cell['help']);
-				$names  = explode('|',$cell['name']);   unset($cell['name']);
+				if (strpos($tab_names=$cell['name'],'=') !== false)
+				{
+					list($cell['name'],$tab_names) = explode('=',$cell['name']);
+				}
+				$names  = explode('|',$tab_names);
 				for ($n = 0; $n < count($labels); ++$n)
 				{
 					$tab =& new xmlnode('tab');

From be859fa1f65c3a20759c9b548d87566962264e21 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 29 Jan 2009 18:58:52 +0000
Subject: [PATCH 035/510] fixing various webdav problems, regarding
 pathbuilding

---
 phpgwapi/inc/class.egw_vfs.inc.php            |  6 ++---
 .../inc/class.sqlfs_stream_wrapper.inc.php    | 23 ++++++++++++++++---
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 14 ++++++++---
 webdav.php                                    |  7 ++++++
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 5e27d8b459..d32c9c3a7a 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -349,7 +349,7 @@ class egw_vfs extends vfs_stream_wrapper
 			}
 			if ($is_dir && (!isset($options['maxdepth']) || $options['maxdepth'] > 0) && ($dir = @opendir($path)))
 			{
-				while($file = readdir($dir))
+				while(($file = readdir($dir)) !== false)
 				{
 					if ($file == '.' || $file == '..') continue;	// ignore current and parent dir!
 
@@ -1125,7 +1125,7 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		if (isset(self::$lock_cache[$path]))
 		{
-			error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			//error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
 			return self::$lock_cache[$path];
 		}
 		$where = 'lock_path='.self::$db->quote($path);
@@ -1146,7 +1146,7 @@ class egw_vfs extends vfs_stream_wrapper
 	        	'lock_token' => $result['token'],
 	        ),__LINE__,__FILE__);
 
-			//error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+		//error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
 	        $result = false;
 		}
 		//error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 81745c99ed..baf2c555ed 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -69,7 +69,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 * 1 = only errors
 	 * 2 = all function calls and errors (contains passwords too!)
 	 */
-	const LOG_LEVEL = 1;
+	const LOG_LEVEL = 2;
 
 	/**
 	 * We do versioning AND store the content in the db, NOT YET IMPLEMENTED
@@ -222,7 +222,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			// create the hash-dirs, if they not yet exist
 			elseif(!file_exists($fs_dir=dirname(self::_fs_path($this->opened_fs_id))))
 			{
-				mkdir($fs_dir,0700,true);
+				$umaskbefore = umask();
+				if (self::LOG_LEVEL) error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
+				self::mkdir_recursive($fs_dir,0700,true);
 			}
 		}
 		else
@@ -264,6 +266,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		// do we operate directly on the filesystem
 		if ($this->operation == self::STORE2FS)
 		{
+			if (self::LOG_LEVEL > 1) error_log(__METHOD__." fopen (may create a directory? mkdir) ($this->opened_fs_id,$mode,$options)");
 			$this->opened_stream = fopen(self::_fs_path($this->opened_fs_id),$mode);
 		}
 		if ($mode[0] == 'a')	// append modes: a, a+
@@ -575,6 +578,18 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		));
 	}
 
+	/**
+	 * due to problems with recursive directory creation, we have our own here
+	 */
+	function mkdir_recursive($pathname, $mode, $depth=0)
+	{
+		$maxdepth=10;
+		$depth2propagate = (int)$depth + 1;
+		if ($depth2propagate > $maxdepth) return is_dir($pathname);
+    	is_dir(dirname($pathname)) || self::mkdir_recursive(dirname($pathname), $mode, $depth2propagate);
+    	return is_dir($pathname) || @mkdir($pathname, $mode);
+	}
+
 	/**
 	 * This method is called in response to mkdir() calls on URL paths associated with the wrapper.
 	 *
@@ -589,7 +604,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	static function mkdir ( $url, $mode, $options )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
-
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__." called from:".function_backtrace());
 		$path = parse_url($url,PHP_URL_PATH);
 
 		if (self::url_stat($path,STREAM_URL_STAT_QUIET))
@@ -611,6 +626,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		// if yes call ourself recursive with the parent directory
 		if (($options & STREAM_MKDIR_RECURSIVE) && $path != '/' && !$parent)
 		{
+			if (self::LOG_LEVEL > 1) error_log(__METHOD__." creating parents: $parent_path, $mode");
 			if (!self::mkdir($parent_path,$mode,$options))
 			{
 				return false;
@@ -1291,6 +1307,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			return false;	// parent not found, should never happen ...
 		}
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
 		foreach($rows as $fs_id => $row)
 		{
 			$parent = $row['fs_dir'] > 1 ? $parents[$row['fs_dir']] : '';
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 9e16d327f7..b033fcfc13 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -587,6 +587,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	function dir_opendir ( $path, $options )
 	{
+		//error_log(__METHOD__." called with ".$path);
 		$this->opened_dir = $this->extra_dirs = null;
 		$this->extra_dir_ptr = 0;
 
@@ -596,16 +597,20 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		}
 		if (!($this->opened_dir = opendir($this->opened_dir_url)))
 		{
+			//error_log(__METHOD__." dir failed: ".$this->opened_dir);
 			return false;
 		}
 		$this->opened_dir_writable = egw_vfs::check_access($this->opened_dir_url,egw_vfs::WRITABLE);
-
+		#error_log(__METHOD__." check for ".$this->opened_dir_url);
 		// check our fstab if we need to add some of the mountpoints
 		$basepath = parse_url($this->opened_dir_url,PHP_URL_PATH);
+		#error_log(__METHOD__." basepath here: ".print_r($basepath,true));
 		foreach(self::$fstab as $mounted => $nul)
 		{
-			if (dirname($mounted) == $basepath && $mounted != '/')
+			#error_log(__METHOD__." dirname mounted: ".print_r(dirname($mounted),true));
+			if ((dirname($mounted) == $basepath || dirname($mounted)."/" == $basepath) && $mounted != '/')
 			{
+				#error_log(__METHOD__." mounted dir: ".print_r($mounted,true));
 				$this->extra_dirs[] = basename($mounted);
 			}
 		}
@@ -685,13 +690,16 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	function dir_readdir ( )
 	{
+		#error_log(__METHOD__." called.");
 		if ($this->extra_dirs && count($this->extra_dirs) > $this->extra_dir_ptr)
 		{
 			return $this->extra_dirs[$this->extra_dir_ptr++];
 		}
 		// only return children readable by the user, if dir is not writable
 		do {
+			//error_log(__METHOD__." called with:".$this->opened_dir_url);
 			$file = readdir($this->opened_dir);
+			//error_log(__METHOD__." got:".$file);
 		}
 		while($file !== false && (is_array($this->extra_dirs) && in_array($file,$this->extra_dirs) ||	// dont return mountpoints twice
 			self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
@@ -791,4 +799,4 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	}
 }
 
-vfs_stream_wrapper::init_static();
\ No newline at end of file
+vfs_stream_wrapper::init_static();
diff --git a/webdav.php b/webdav.php
index afaa56fbf9..cf99437b07 100644
--- a/webdav.php
+++ b/webdav.php
@@ -44,6 +44,12 @@ function check_access(&$account)
 
 // if we are called with a /apps/$app path, use that $app as currentapp, to not require filemanager rights for the links
 $parts = explode('/',$_SERVER['PATH_INFO']);
+//error_log("webdav: explode".print_r($parts,true));
+if(count($parts)== 1){
+	echo "Malformed Url: missing slash" ;
+	exit;
+}
+
 $app = count($parts) > 3 && $parts[1] == 'apps' ? $parts[2] : 'filemanager';
 
 $GLOBALS['egw_info'] = array(
@@ -63,3 +69,4 @@ $headertime = microtime(true);
 $webdav_server = new vfs_webdav_server();
 $webdav_server->ServeRequest();
 //error_log(sprintf("GroupDAV %s request took %5.3f s (header include took %5.3f s)",$_SERVER['REQUEST_METHOD'],microtime(true)-$starttime,$headertime-$starttime));
+

From 964e28a3d8d38e0313114ac6084e97e055e83c26 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 4 Feb 2009 07:57:30 +0000
Subject: [PATCH 036/510] adapting regex for emailvalidation to accept single
 letter subdomains

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

diff --git a/etemplate/inc/class.url_widget.inc.php b/etemplate/inc/class.url_widget.inc.php
index f61999eb4b..16bdb7d5dd 100644
--- a/etemplate/inc/class.url_widget.inc.php
+++ b/etemplate/inc/class.url_widget.inc.php
@@ -61,7 +61,7 @@ class url_widget
 	 *
 	 * has to be used case insensitive: /i
 	 */
-	const EMAIL_PREG = '[a-z0-9][a-z0-9._-]*[a-z0-9]@([a-z0-9][a-z0-9_-]*[a-z0-9]\.)+[a-z0-9][a-z0-9_-]*[a-z0-9]';
+	const EMAIL_PREG = '[a-z0-9][a-z0-9._-]*[a-z0-9]@(([a-z0-9]*[a-z0-9]\.)|([a-z0-9][a-z0-9_-]*[a-z0-9]\.))+[a-z0-9][a-z0-9_-]*[a-z0-9]';
 
 	/**
 	 * pre-processing of the extension

From 346f749219d1e127180faeefc33e578e6fb69796 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 4 Feb 2009 17:17:40 +0000
Subject: [PATCH 037/510] Improve readonly handling when a link is specified

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

diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php
index 483e3f6bdd..f8d0476953 100644
--- a/etemplate/inc/class.ajax_select_widget.inc.php
+++ b/etemplate/inc/class.ajax_select_widget.inc.php
@@ -153,7 +153,11 @@
 			$search =& $widget->get_widget_by_name('search');
 			if(($cell['readonly'] || $readonlys['search']) && $options['link']) {
 				$cell['readonly'] = false;
-				$readonlys['search'] = true;
+				if(!is_array($readonlys)) {
+					$readonlys = array('search' => true);
+				} else {
+					$readonlys['search'] = true;
+				}
 				$search['type'] = 'label';
 				$search['no_lang'] = 1;
 				$search['size'] = ',' . $options['link'];

From f62eccd9a76c743f31629ce946295c645a4661df Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 9 Feb 2009 15:17:26 +0000
Subject: [PATCH 038/510] fixing a problem regarding the passing on of the
 charset information, as some clients get confused if there is a blank between
 the word charset and the equual sign.

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

diff --git a/phpgwapi/inc/class.phpmailer.inc.php b/phpgwapi/inc/class.phpmailer.inc.php
index f951e6288f..f9f367814a 100644
--- a/phpgwapi/inc/class.phpmailer.inc.php
+++ b/phpgwapi/inc/class.phpmailer.inc.php
@@ -1083,7 +1083,7 @@ class PHPMailer {
       $encoding = $this->Encoding;
     }
     $result .= $this->TextLine('--' . $boundary);
-    $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
+    $result .= sprintf("Content-Type: %s; charset=\"%s\"", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
     $result .= $this->LE;
@@ -1204,7 +1204,7 @@ class PHPMailer {
 
       $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
 	  if($disposition == 'part') {
-	    $mime[] = sprintf("Content-Type: %s; charset =\"%s\"%s", $type, $this->CharSet, $this->LE);
+	    $mime[] = sprintf("Content-Type: %s; charset=\"%s\"%s", $type, $this->CharSet, $this->LE);
 	  } else {
 	    $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $name, $this->LE);
 	  }

From 5a1a3879ac93960b4baaed9f6175fd22ab0d6d24 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Wed, 11 Feb 2009 19:32:26 +0000
Subject: [PATCH 039/510] First draft of mail notifications, sponsored by
 kk-it.net. Checkout the forum for more information. IMPORTANT: You probably
 have to clear your browsers cache before using it.

---
 .../inc/class.ajaxnotifications.inc.php       | 160 ++++++++++++++++--
 notifications/js/notificationajaxpopup.js     |   1 +
 2 files changed, 146 insertions(+), 15 deletions(-)

diff --git a/notifications/inc/class.ajaxnotifications.inc.php b/notifications/inc/class.ajaxnotifications.inc.php
index f74912579b..091f1742e7 100644
--- a/notifications/inc/class.ajaxnotifications.inc.php
+++ b/notifications/inc/class.ajaxnotifications.inc.php
@@ -18,6 +18,11 @@ class ajaxnotifications {
 	 */
 	const _appname = 'notifications';
 	
+	/**
+	 * Mailappname
+	 */
+	const _mailappname = 'felamimail';
+	
 	/**
 	 * Notification table in SQL database
 	 */
@@ -38,25 +43,48 @@ class ajaxnotifications {
 	private $config;
 	
 	/**
-	 * holds preferences object of user to notify
+	 * holds preferences array of user to notify
 	 *
-	 * @var object
+	 * @var array
 	 */
 	private $preferences;
 	
 	/**
 	 * reference to global db object
 	 *
-	 * @var egw_db
+	 * @var db
 	 */
 	private $db;
-
-
+	
+	/**
+	 * holds the users session data
+	 *
+	 * @var array
+	 */
+	var $session_data;
+	
+	/**
+	 * holds the users session data defaults
+	 *
+	 * @var array
+	 */
+	var $session_data_defaults = array(
+		'notified_mail_uids'	=> array(),
+	);
+	
+	/**
+	 * the xml response object
+	 *
+	 * @var response
+	 */
+	private $response;
+	
 	/**
 	 * constructor of ajaxnotifications
 	 *
 	 */
 	public function __construct() {
+		$this->response = new xajaxResponse();
 		$this->recipient = (object)$GLOBALS['egw']->accounts->read();
 
 		$config = new config(self::_appname);
@@ -64,11 +92,17 @@ class ajaxnotifications {
 
 		$prefs = new preferences($this->recipient->account_id);
 		$preferences = $prefs->read();
-		$this->preferences = (object)$preferences[self::_appname];
+		$this->preferences = $prefs->read();
 
 		$this->db = $GLOBALS['egw']->db;
 	}
 	
+	/**
+	 * destructor of ajaxnotifications
+	 *
+	 */
+	public function __destruct() {}
+	
 	/**
 	 * Gets all egwpopup notification for calling user.
 	 * Requests and response is done via xajax
@@ -76,7 +110,6 @@ class ajaxnotifications {
 	 * @return xajax response
 	 */
 	public function get_popup_notifications() {
-		$response =& new xajaxResponse();
 		$session_id = $GLOBALS['egw_info']['user']['sessionid'];
 		$message = '';
 		$rs = $this->db->select(self::_notification_table, 
@@ -87,27 +120,124 @@ class ajaxnotifications {
 			__LINE__,__FILE__,false,'',self::_appname);
 		if ($rs->NumRows() > 0)	{
 			foreach ($rs as $notification) {
-				$response->addScriptCall('append_notification_message',$notification['message']);
+				$this->response->addScriptCall('append_notification_message',$notification['message']);
 			}
 			$myval=$this->db->delete(self::_notification_table,array(
 				'account_id' => $this->recipient->account_id,
 				'session_id' => $session_id,
 			),__LINE__,__FILE__,self::_appname);
 			
-			switch($this->preferences->egwpopup_verbosity) {
+			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
 				case 'low':
-					$response->addScript('notificationbell_switch("active");');
+					$this->response->addScript('notificationbell_switch("active");');
 					break;
 				case 'high':
-					$response->addAlert(lang('eGroupWare has notifications for you'));
-					$response->addScript('notificationwindow_display();');
+					$this->response->addAlert(lang('eGroupWare has notifications for you'));
+					$this->response->addScript('notificationwindow_display();');
 					break;
 				case 'medium':
 				default:
-					$response->addScript('notificationwindow_display();');
+					$this->response->addScript('notificationwindow_display();');
 					break;
 			}
 		}
-		return $response->getXML();
+		return $this->response->getXML();
 	}
-}
\ No newline at end of file
+	
+	/**
+	 * checks users mailbox and sends a notification if new mails have arrived
+	 * 
+	 * @return xajax response
+	 */
+	public function check_mailbox() {
+		if(!isset($this->preferences[self::_mailappname]['notify_folders'])) {
+			return $this->response->getXML(); //no pref set for notifying - exit
+		}
+		$notify_folders = explode(',', $this->preferences[self::_mailappname]['notify_folders']);
+		if (count($notify_folders) == 0) {
+			return $this->response->getXML(); //no folders configured for notifying - exit
+		}
+		
+		$bofelamimail = new bofelamimail($GLOBALS['egw']->translation->charset());
+		if(!$bofelamimail->openConnection()) {
+			// TODO: This is ugly. Log a bit nicer!
+			error_log(self::_appname.' (user: '.$this->recipient->account_lid.'): cannot connect to mailbox. Please check your prefs!');
+			return $this->response->getXML(); // cannot connect to mailbox
+		}
+		
+		$this->restore_session_data();
+		
+		$recent_messages = array();
+		foreach($notify_folders as $id=>$notify_folder) {
+			$headers = $bofelamimail->getHeaders($notify_folder, 1, false, 0, true, array('status'=>'UNSEEN'));
+			if(is_array($headers['header']) && count($headers['header']) > 0) {
+				foreach($headers['header'] as $id=>$header) {
+					// check if unseen mail has already been notified
+				 	if(!in_array($header['uid'], $this->session_data['notified_mail_uids'])) {
+				 		// got a REAL recent message
+				 		$header['folder'] = $notify_folder;
+				 		$recent_messages[] = $header;
+				 	}
+				}
+			}
+		}
+		
+		if(count($recent_messages) > 0) {
+			// create notify messages and save notification status in user session
+			if(count($recent_messages) == 1) {
+				$notify_subject = lang("You've got a new mail");
+			} else {
+				$notify_subject = lang("You've got new mails");
+			}
+			$notify_message = '<table>';
+			foreach($recent_messages as $id=>$recent_message) {
+				$notify_message .=	'<tr>'
+									.'<td>'.$recent_message['folder'].'</td>'
+									.'<td>'.$recent_message['subject'].'</td>'
+									.'<td>'.$recent_message['sender_address'].'</td>'
+									.'</tr>';
+				// save notification status
+				$this->session_data['notified_mail_uids'][] = $recent_message['uid'];
+			}
+			$notify_message .= '</table>';
+			
+			// send notification
+			$notification = new notifications();
+			$notification->set_receivers(array($this->recipient->account_id));
+			$notification->set_message($notify_message);
+			$notification->set_sender($this->recipient->account_id);
+			$notification->set_subject($notify_subject);
+			$notification->set_skip_backends(array('email'));
+			$notification->send();
+		}
+		
+		$this->save_session_data();
+		return $this->response->getXML();
+	}
+	
+	/**
+	 * restores the users session data for notifications
+	 * 
+	 * @return boolean true
+	 */
+	private function restore_session_data() {
+		$session_data = $GLOBALS['egw']->session->appsession('session_data',self::_appname);
+		if(is_array($session_data)) {
+			$this->session_data = $session_data;
+		} else {
+			$this->session_data = $this->session_data_defaults;
+		}
+		
+		return true;
+	}
+
+	/**
+	 * saves the users session data for notifications
+	 * 
+	 * @return boolean true
+	 */
+	private function save_session_data() {
+		$GLOBALS['egw']->session->appsession('session_data',self::_appname,$this->session_data);
+		return true;
+	}
+}
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index a5129961c8..4437a6d0fc 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -18,6 +18,7 @@ function notificationwindow_setTimeout() {
 	window.setTimeout("notificationwindow_refresh();", 60000);
 }
 function notificationwindow_refresh() {
+	xajax_doXMLHTTP("notifications.ajaxnotifications.check_mailbox");
 	xajax_doXMLHTTP("notifications.ajaxnotifications.get_popup_notifications");
 	notificationwindow_setTimeout();
 }

From 878590ea4c6dc6db8454c482c4be0b446d420331 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Sat, 14 Feb 2009 16:49:10 +0000
Subject: [PATCH 040/510] E-Mail notifications are now using eTemplate. Removed
 unused eTemplate from previous notifications of eGW 1.4. Updated some german
 lang phrases. Complete german translation follows soon.

---
 .../inc/class.ajaxnotifications.inc.php       | 45 ++++++++++++-------
 notifications/setup/egw_de.lang               |  7 ++-
 notifications/setup/egw_en.lang               |  4 ++
 notifications/setup/etemplates.inc.php        | 15 +++++--
 4 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/notifications/inc/class.ajaxnotifications.inc.php b/notifications/inc/class.ajaxnotifications.inc.php
index 091f1742e7..6864105b61 100644
--- a/notifications/inc/class.ajaxnotifications.inc.php
+++ b/notifications/inc/class.ajaxnotifications.inc.php
@@ -168,14 +168,21 @@ class ajaxnotifications {
 		$this->restore_session_data();
 		
 		$recent_messages = array();
+		$folder_status = array();
 		foreach($notify_folders as $id=>$notify_folder) {
+			if(!is_array($this->session_data['notified_mail_uids'][$notify_folder])) {
+				$this->session_data['notified_mail_uids'][$notify_folder] = array();
+			}
+			$folder_status[$notify_folder] = $bofelamimail->getFolderStatus($notify_folder);
 			$headers = $bofelamimail->getHeaders($notify_folder, 1, false, 0, true, array('status'=>'UNSEEN'));
 			if(is_array($headers['header']) && count($headers['header']) > 0) {
 				foreach($headers['header'] as $id=>$header) {
 					// check if unseen mail has already been notified
-				 	if(!in_array($header['uid'], $this->session_data['notified_mail_uids'])) {
+				 	if(!in_array($header['uid'], $this->session_data['notified_mail_uids'][$notify_folder])) {
 				 		// got a REAL recent message
 				 		$header['folder'] = $notify_folder;
+				 		$header['folder_display_name'] = $folder_status[$notify_folder]['displayName'];
+				 		$header['folder_base64'] =  base64_encode($notify_folder);
 				 		$recent_messages[] = $header;
 				 	}
 				}
@@ -183,30 +190,34 @@ class ajaxnotifications {
 		}
 		
 		if(count($recent_messages) > 0) {
-			// create notify messages and save notification status in user session
-			if(count($recent_messages) == 1) {
-				$notify_subject = lang("You've got a new mail");
-			} else {
-				$notify_subject = lang("You've got new mails");
-			}
-			$notify_message = '<table>';
+			// create notify message
+			$notification_subject = lang("You've got new mail");
+			$values = array();
+			$values[] = array(); // content array starts at index 1
 			foreach($recent_messages as $id=>$recent_message) {
-				$notify_message .=	'<tr>'
-									.'<td>'.$recent_message['folder'].'</td>'
-									.'<td>'.$recent_message['subject'].'</td>'
-									.'<td>'.$recent_message['sender_address'].'</td>'
-									.'</tr>';
+				$values[] =	array(
+					'mail_uid'				=> $recent_message['uid'],
+					'mail_folder' 			=> $recent_message['folder_display_name'],
+					'mail_folder_base64' 	=> $recent_message['folder_base64'],
+					'mail_subject'			=> $recent_message['subject'],
+					'mail_from'				=> !empty($recent_message['sender_name']) ? $recent_message['sender_name'] : $recent_message['sender_address'],
+					'mail_received'			=> $recent_message['date'],
+				);
 				// save notification status
-				$this->session_data['notified_mail_uids'][] = $recent_message['uid'];
+				$this->session_data['notified_mail_uids'][$recent_message['folder']][] = $recent_message['uid'];
 			}
-			$notify_message .= '</table>';
+			
+			// create etemplate
+			$tpl = new etemplate();
+			$tpl->read('notifications.checkmailbox');
+			$notification_message = $tpl->exec(false, $values, false, false, false, 1);
 			
 			// send notification
 			$notification = new notifications();
 			$notification->set_receivers(array($this->recipient->account_id));
-			$notification->set_message($notify_message);
+			$notification->set_message($notification_message);
 			$notification->set_sender($this->recipient->account_id);
-			$notification->set_subject($notify_subject);
+			$notification->set_subject($notification_subject);
 			$notification->set_skip_backends(array('email'));
 			$notification->send();
 		}
diff --git a/notifications/setup/egw_de.lang b/notifications/setup/egw_de.lang
index afd927ef67..5ad0311cae 100644
--- a/notifications/setup/egw_de.lang
+++ b/notifications/setup/egw_de.lang
@@ -1,3 +1,8 @@
 don't notify me via popups in egroupware	notifications	de	Benachrichtigungen durch Popups unterdrücken.
-notification	notifications	de	Benachrichtigung
+folder	notifications	de	Ordner
+from	notifications	de	Von
+message from	notifications	de	Nachricht von
+notification	common	de	Benachrichtigung
 preferences for notification	notifications	de	Benachrichtigungs-Einstellungen
+received	notifications	de	Erhalten
+you've got new mail	notifications	de	Sie haben neue E-Mails
diff --git a/notifications/setup/egw_en.lang b/notifications/setup/egw_en.lang
index 9eff673e44..2eb8b79500 100644
--- a/notifications/setup/egw_en.lang
+++ b/notifications/setup/egw_en.lang
@@ -9,6 +9,8 @@ enable egroupware-popup backend	admin	en	Enable eGroupWare-Popup backend
 enable sms backend	admin	en	Enable SMS backend
 enable windows-popup backend	admin	en	Enable Windows-Popup backend
 enabled chains	notifications	en	Enabled chains
+folder	notifications	en	Folder
+from	notifications	en	From
 how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled !<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	en	How verbose should the eGroupware-Popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled !<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself
 if set, embedded links get rendered special for external clients	notifications	en	If set, embedded links get rendered special for external clients
 linked entries:	notifications	en	Linked entries:
@@ -18,6 +20,8 @@ notification	common	en	Notification
 notify me by	notifications	en	Notify me by
 optimize e-mails for external mail client	notifications	en	Optimize E-Mails for external mail client
 preferences for notification	notifications	en	Preferences for notification
+received	notifications	en	Received
 sms backend	admin	en	SMS backend
 this egroupware notification has been sent to you by mail because your	notifications	en	This eGroupWare notification has been sent to you by mail because your
 windows-popup backend	admin	en	Windows-Popup backend
+you've got new mail	notifications	en	You've got new mail
diff --git a/notifications/setup/etemplates.inc.php b/notifications/setup/etemplates.inc.php
index e20cc92364..587cc86330 100644
--- a/notifications/setup/etemplates.inc.php
+++ b/notifications/setup/etemplates.inc.php
@@ -1,9 +1,16 @@
 <?php
-// eTemplates for Application 'notifications', generated by soetemplate::dump4setup() 2006-09-06 19:42
-
-/* $Id$ */
+/**
+	* eGroupWare - eTemplates for Application notifications
+	* http://www.egroupware.org
+	* generated by soetemplate::dump4setup() 2009-02-14 18:23
+	*
+	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+	* @package notifications
+	* @subpackage setup
+	* @version $Id$
+	*/
 
 $templ_version=1;
 
-$templ_data[] = array('name' => 'notifications.prefsindex','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:17:"disable_ajaxpopup";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:40:"Don\'t notify me via popups in eGroupWare";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{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:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"apply";s:4:"name";s:13:"button[apply]";}}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"cancel";s:5:"align";s:5:"right";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1157394610',);
+$templ_data[] = array('name' => 'notifications.checkmailbox','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;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:4:{s:1:"A";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:8:"readonly";s:4:"true";s:4:"type";s:5:"label";s:5:"label";s:6:"Folder";}}s:1:"B";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:8:"readonly";s:4:"true";s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}}s:1:"C";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:8:"readonly";s:4:"true";s:4:"type";s:5:"label";s:5:"label";s:4:"From";}}s:1:"D";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:8:"readonly";s:4:"true";s:4:"type";s:5:"label";s:5:"label";s:8:"Received";}}}i:2;a:4:{s:1:"A";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:2:{s:4:"name";s:19:"${row}[mail_folder]";s:4:"type";s:5:"label";}}s:1:"B";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[mail_subject]";s:4:"size";s:103:"b,felamimail.uidisplay.display&uid=$row_cont[mail_uid]&mailbox=$row_cont[mail_folder_base64],,,,750x500";s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:17:"${row}[mail_from]";s:4:"type";s:5:"label";}}s:1:"D";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:21:"${row}[mail_received]";s:4:"size";s:2:",8";s:4:"type";s:9:"date-time";}}}}s:4:"cols";i:4;s:4:"rows";i:2;}}','size' => '','style' => '','modified' => '1234631988',);
 

From 7441773280cf7a89f2a25f1632e5f4fb8a35a5af Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Feb 2009 08:00:40 +0000
Subject: [PATCH 041/510] "fixed error in docu (no real need to backport to
 1.6)"

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

diff --git a/addressbook/inc/class.addressbook_so.inc.php b/addressbook/inc/class.addressbook_so.inc.php
index 0610db69d6..f6a092ebe7 100755
--- a/addressbook/inc/class.addressbook_so.inc.php
+++ b/addressbook/inc/class.addressbook_so.inc.php
@@ -24,7 +24,7 @@
  *
  * The accounts can be stored in SQL or LDAP too (account_repository):
  * If the account-repository is different from the contacts-repository, the filter all (no owner set)
- * will only search the accounts and NOT the contacts! Only the filter accounts (owner=0) shows accounts.
+ * will only search the contacts and NOT the accounts! Only the filter accounts (owner=0) shows accounts.
  *
  * If sql-ldap is used as contact-storage (LDAP is managed from eGroupWare) the filter all, searches
  * the accounts in the SQL contacts-table too. Change in made in LDAP, are not detected in that case!

From 7fcc5b75e530c10453338d68cafc37617cf9b119 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Feb 2009 08:09:56 +0000
Subject: [PATCH 042/510] "holiday file for Slovakia, thanks to
 Ladislav.Mate@refoma.sk"

---
 calendar/egroupware.org/holidays.SK.csv | 41 +++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/calendar/egroupware.org/holidays.SK.csv b/calendar/egroupware.org/holidays.SK.csv
index 3b21b046a2..836485b3a6 100644
--- a/calendar/egroupware.org/holidays.SK.csv
+++ b/calendar/egroupware.org/holidays.SK.csv
@@ -4,17 +4,52 @@ regular (year=0):
 SK	Nový rok, Deň vzniku SR	1	1	0	0	0
 SK	Zjavenie Pána, Traja králi	6	1	0	0	0
 SK	Sviatok práce	1	5	0	0	0
+SK  Výro�ie úmrtia M.R. Štefánika 4 5 0 0 0
 SK	Deň víťazstva nad fašizmom	8	5	0	0	0
+SK  Výro�ie Memoranda národa slovenského 7 6 0 0 0 
 SK	Sviatok sv.Cyrila a Metoda	5	7	0	0	0
+SK  Výro�ie Deklarácie o zvrchovanosti Slovenskej republiky 17 7 0 0 0
+SK  Deň Matice slovenskej 4 8 0 0 0
 SK	Slovenské národné povstanie	29	8	0	0	0
 SK	Deň Ústavy SR	1	9	0	0	0
 SK	Sedembolestná Panna Mária	15	9	0	0	0
+SK  Deň obetí Dukly 6 10  0 0 0
+SK  Deň narodenia Ľudovíta Štúra  29  10  0 0 0
+SK  Výro�ie Deklarácie slovenského národa 30  10  0 0 0
 SK	Sviatok Všetkých svätých	1	11	0	0	0
 SK	Deň boja za slobodu a demokraciu	17	11	0	0	0
 SK	Štedrý deň	24	12	0	0	0
 SK	Prvý sviatok viano�ný	25	12	0	0	0
 SK	Druhý sviatok viano�ný	26	12	0	0	0
 
-2006:
-SK	Veľký piatok	14	4	2006	0	0
-SK	Veľkono�ný pondelok	17	4	2006	0	0
+2008:
+SK	Veľký piatok	21	3	2008	0	0
+SK	Veľkono�ný pondelok	24	2	2008	0	0
+
+2009:
+SK  Veľký piatok  10  4 2009  0 0
+SK  Veľkono�ný pondelok 13  4 2009  0 0
+
+2010:
+SK  Veľký piatok  2  4 2009  0 0
+SK  Veľkono�ný pondelok 2  4 2009  0 0
+
+2011:
+SK  Veľký piatok  22  4 2009  0 0
+SK  Veľkono�ný pondelok 25  4 2009  0 0
+
+2012:
+SK  Veľký piatok  6  4 2009  0 0
+SK  Veľkono�ný pondelok 9  4 2009  0 0
+
+2013:
+SK  Veľký piatok  29  3 2009  0 0
+SK  Veľkono�ný pondelok 1 4 2009  0 0
+
+2014:
+SK  Veľký piatok  18  4 2009  0 0
+SK  Veľkono�ný pondelok 21  4 2009  0 0
+
+2015:
+SK  Veľký piatok  3  4 2009  0 0
+SK  Veľkono�ný pondelok 6  4 2009  0 0

From 185f934852baedca5ac18a89af2c91765a37de99 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Feb 2009 08:22:22 +0000
Subject: [PATCH 043/510] Patch from jean-charles.passard@provectio.org to fix
 handling of account prefixes

---
 admin/inc/class.boaccounts.inc.php | 4 ++++
 admin/inc/class.uiaccounts.inc.php | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php
index 5b994115a4..8e948c4e4e 100755
--- a/admin/inc/class.boaccounts.inc.php
+++ b/admin/inc/class.boaccounts.inc.php
@@ -266,6 +266,10 @@
 			{
 				$accountPrefix = $GLOBALS['egw_info']['server']['account_prefix'];
 			}
+			if($accountPrefix)
+			{
+				$userData['account_lid'] = $accountPrefix . $userData['account_lid'];
+			}
 
 			$errors = $this->validate_user($userData);
 			if(@is_array($errors))
diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 18933d9948..19b3194dd3 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -562,7 +562,7 @@
 				}
 				$userData = array(
 					'account_type'          => 'u',
-					'account_lid'           => $accountPrefix . $_POST['account_lid'],
+					'account_lid'           => $_POST['account_lid'],
 					'account_firstname'     => $_POST['account_firstname'],
 					'account_lastname'      => $_POST['account_lastname'],
 					'account_passwd'        => $_POST['account_passwd'],
@@ -855,7 +855,7 @@
 					$email = $GLOBALS['egw']->common->email_address($_POST['account_firstname'],$_POST['account_lastname'],$_POST['account_lid']);
 				}
 				$userData = array(
-					'account_lid'           => $accountPrefix.$_POST['account_lid'],
+					'account_lid'           => $_POST['account_lid'],
 					'account_firstname'     => $_POST['account_firstname'],
 					'account_lastname'      => $_POST['account_lastname'],
 					'account_passwd'        => $_POST['account_passwd'],

From c04c124456d526af9e9b4135586348cc31032b9b Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 16 Feb 2009 08:36:22 +0000
Subject: [PATCH 044/510] bugfix for 1677  Timesheet  Version 1.6.001  groups
 are treated like a separate user, not like a bunch for their members;
 additional fix for colselection

---
 timesheet/inc/class.timesheet_ui.inc.php | 15 +++++++++++++--
 timesheet/setup/etemplates.inc.php       |  6 ++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index faf72162bd..15e8566f75 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -409,6 +409,7 @@ class timesheet_ui extends timesheet_bo
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
 		$GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
 		$query = $query_in;	// keep the original query
+		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
 		#_debug_array($query['col_filter']);
 		// PM project filter for the PM integration
 		if ((string)$query['col_filter']['pm_id'] != '')
@@ -451,6 +452,9 @@ class timesheet_ui extends timesheet_bo
 		if ($query['col_filter']['ts_owner'])
 		{
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$GLOBALS['egw']->common->grab_owner_name($query['col_filter']['ts_owner']);
+			#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members");
+			#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			$query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
 		}
 		else
 		{
@@ -609,13 +613,20 @@ class timesheet_ui extends timesheet_bo
 		if (!$have_cats || $query['cat_id']) $rows['no_cat_id'] = true;
 		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
 		$rows['no_owner_col'] = $query['no_owner_col'];
+		if (!$rows['no_owner_col'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
 		if ($query['filter'])
 		{
 			$rows += $this->summary;
 		}
 		$rows['pm_integration'] = $this->pm_integration;
-		$rows['ts_viewtype'] = $this->ts_viewtype == 'short';
-
+		$rows['ts_viewtype'] =  $rows['no_ts_quantity'] =  $rows['no_ts_unitprice'] =  $rows['no_ts_total'] = $this->ts_viewtype == 'short';
+		if (!$rows['ts_viewtype']) {
+			#_debug_array($query['selectcols']);
+			#ts_quantity,ts_unitprice,ts_total
+			if (strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
+			if (strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
+			if (strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
+		}
 		return $total;
 	}
 
diff --git a/timesheet/setup/etemplates.inc.php b/timesheet/setup/etemplates.inc.php
index 668ad29468..335ed36d67 100644
--- a/timesheet/setup/etemplates.inc.php
+++ b/timesheet/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application timesheet
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-10-15 18:52
+	* generated by soetemplate::dump4setup() 2009-02-16 10:01
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package timesheet
@@ -30,7 +30,7 @@ $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','
 
 $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1163173930',);
 
-$templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '','style' => '','modified' => '1163173930',);
+$templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '100%,150,,,,,auto','style' => '','modified' => '1163173930',);
 
 $templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1164289627',);
 
@@ -56,3 +56,5 @@ $templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' =
 
 $templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@ts_viewtype";s:1:"F";s:13:",@ts_viewtype";s:1:"E";s:13:",@ts_viewtype";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164279120',);
 
+$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@no_ts_total";s:1:"F";s:17:",@no_ts_unitprice";s:1:"E";s:16:",@no_ts_quantity";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1234522226',);
+

From 38aa29a8529003642bc4a7374e9f1b79a70b04bb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Feb 2009 08:36:56 +0000
Subject: [PATCH 045/510] "making process_show public again, as requested by
 Raphael Alla (there was no real reason to make it private, beside hiding it
 from public interfaces, as I thought noone else is using it)"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index ca6395a6b3..440668e26c 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1908,7 +1908,7 @@ class etemplate extends boetemplate
 	* @param string $type type of request
 	* @return int number of validation errors (the adjusted content is returned by the var-param &$content !)
 	*/
-	private function process_show(&$content,$to_process,$cname='', $type = 'regular')
+	function process_show(&$content,$to_process,$cname='', $type = 'regular')
 	{
 		if (!isset($content) || !is_array($content) || !is_array($to_process))
 		{

From fd1e565e6eb111a82bd7fe277ab1420d4a899141 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 20 Feb 2009 12:52:16 +0000
Subject: [PATCH 046/510] quitening some errors, regarding some not found
 calendar/link data

---
 resources/inc/class.bo_resources.inc.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/resources/inc/class.bo_resources.inc.php b/resources/inc/class.bo_resources.inc.php
index b839ebec61..2d3008b8fb 100755
--- a/resources/inc/class.bo_resources.inc.php
+++ b/resources/inc/class.bo_resources.inc.php
@@ -288,7 +288,10 @@ class bo_resources
 		if(!is_array($res_id) && $res_id < 1) return;
 
 		$data = $this->so->search(array('res_id' => $res_id),'res_id,cat_id,name,useable');
-
+		if (!is_array($data)) {
+			error_log(__METHOD__." No Calendar Data found for Resource with id $res_id"); 
+			return array();
+		}
 		foreach($data as $num => $resource)
 		{
 			$data[$num]['rights'] = false;
@@ -446,10 +449,14 @@ class bo_resources
 			}
 		} else {
 			// we are not working for the calendar, we loop on the initial $data
-			foreach($data as $num => $resource)
-			{
-				$id=$resource['res_id'];
-				$list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+			if (is_array($data)) {
+				foreach($data as $num => $resource)
+				{
+					$id=$resource['res_id'];
+					$list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
+				}
+			} else {
+				error_log(__METHOD__." No Data found for Resource with id ".$resource['res_id']);
 			}
 		}
 		return $list;

From 5c948f5d5de4018dae7261b5064d306beee24993 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Sun, 22 Feb 2009 12:24:24 +0000
Subject: [PATCH 047/510] =?UTF-8?q?"Addressbook=20is=20now=20=20able=20to?=
 =?UTF-8?q?=20print=20more=20than=20one=20Adresslables=20into=20a=20page.?=
 =?UTF-8?q?=20This=20is=20needed=20to=20print=20out=20Addreslables=20for?=
 =?UTF-8?q?=20a=20mailing.=20New=20Tags=20$$label$$=20and=20$$labelplaceme?=
 =?UTF-8?q?nt$$=20added.=20Also=20possible=20to=20print=20out=20the=20Coun?=
 =?UTF-8?q?ty=20name,=20if=20it=20is=20not=20your=20own=20contry.=20I=20wi?=
 =?UTF-8?q?ll=20add=20a=20exsample=20to=20EGroupware=20demo=20page.=20This?=
 =?UTF-8?q?=20is=20sponsored=20by=20Deutsche=20Kinemathek=20=E2=80=93=20Mu?=
 =?UTF-8?q?seum=20f=C3=BCr=20Film=20und=20Fernsehen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"
---
 .../inc/class.addressbook_merge.inc.php       | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index b72504b15d..dadfe45238 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -205,6 +205,11 @@ class addressbook_merge	// extends bo_merge
 			return false;
 		}
 		list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
+		list($Labelstart,$Labelrepeat,$Labeltend) = preg_split('/\$\$label\$\$/',$contentrepeat,-1, PREG_SPLIT_NO_EMPTY);  //get the Lable content
+		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
+		$countlables =count($countlables[0])+1;
+		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
+		if ($countlables>1) $lableprint = true;
 		if (count($ids) > 1 && !$contentrepeat)
 		{
 			$err = lang('for more then one contact in a document use the tag pagerepeat!');
@@ -214,6 +219,7 @@ class addressbook_merge	// extends bo_merge
 		{
 			if ($contentrepeat)   $content = $contentrepeat;   //content to repeat
 			// generate replacements
+			if ($lableprint) $content = $Labelrepeat;
 			if (!($replacements = $this->contact_replacements($id)))
 			{
 				$err = lang('Contact not found!');
@@ -239,7 +245,6 @@ class addressbook_merge	// extends bo_merge
 			{
 				$content = preg_replace('/\$\$calendar\/[0-9]+\/[a-z_]+\$\$/','',$content);
 			}
-
 			$this->replacements = $replacements;
 			if (strpos($content,'$$IF'))
 			{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
@@ -248,6 +253,31 @@ class addressbook_merge	// extends bo_merge
 
 			if ($contentrepeat) $contentrep[$id] = $content;
 		}
+
+
+		if ($Labelrepeat)
+
+		{
+			$countpage=0;
+			$count=0;
+			$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
+
+			foreach ($contentrep as $Label)
+			{
+				$count=$count+1;
+				if ($count % $countlables == 0)
+				{
+					$countpage=$countpage+1;
+					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
+				}
+				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
+
+			}
+
+			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/','',$contentrepeatpages[$countpage],-1);  //clean empty fields
+			return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
+		}
+
 		if ($contentrepeat)
 		{
 			return $contentstart.implode('\\par \\page\\pard\\plain',$contentrep).$contentend;
@@ -258,6 +288,8 @@ class addressbook_merge	// extends bo_merge
 
 	function replace_callback($param)
 	{
+		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
+		if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
 		$replace = preg_match('/'.$param[2].'/',$this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
 		return $replace;
 	}

From bdcb10ea2d1fd23a76333db938919e8bec0e9535 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 23 Feb 2009 13:21:28 +0000
Subject: [PATCH 048/510] Enable etemplate to mark rows of a grid / table as
 part of the header or footer to repeat them on each printed page.

---
 etemplate/inc/class.editor.inc.php            | 48 ++++++++++++++++++-
 etemplate/inc/class.etemplate.inc.php         |  4 +-
 etemplate/inc/class.xul_io.inc.php            | 29 +++++------
 etemplate/setup/etemplates.inc.php            |  6 ++-
 etemplate/templates/default/editor.widget.xet | 29 +++++++----
 phpgwapi/inc/class.html.inc.php               | 25 ++++++++++
 phpgwapi/templates/idots/print.css            |  8 +++-
 7 files changed, 120 insertions(+), 29 deletions(-)

diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index 89d6e90f62..da148b4a65 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -40,6 +40,11 @@ class editor
 		'bottom' => 'Bottom',
 		'baseline' => 'Baseline',
 	);
+	var $parts = array(
+		'' => 'Body',
+		'header' => 'Header',
+		'footer' => 'Footer',
+	);
 	var $edit_menu = array(
 		'delete' => 'delete',
 		'cut' => 'cut',
@@ -1239,7 +1244,8 @@ class editor
 					{
 						list(,$row,$col) = $matches;
 						$parent['data'][0]['h'.$row] = $content['grid_row']['height'].
-							($content['grid_row']['disabled']?','.$content['grid_row']['disabled']:'');
+							($content['grid_row']['disabled']||$content['grid_row']['part']?','.$content['grid_row']['disabled']:'').
+							($content['grid_row']['part']?','.$content['grid_row']['part']:'');
 						$parent['data'][0]['c'.$row] = $content['grid_row']['class'].
 							($content['grid_row']['valign']?','.$content['grid_row']['valign']:'');
 						$parent['data'][0][$col] = $content['grid_column']['width'].
@@ -1300,12 +1306,17 @@ class editor
 			list(,$row,$col) = $matches;
 
 			$grid_row =& $content['grid_row'];
-			list($grid_row['height'],$grid_row['disabled']) = explode(',',$parent['data'][0]['h'.$row]);
+			list($grid_row['height'],$grid_row['disabled'],$grid_row['part']) = explode(',',$parent['data'][0]['h'.$row]);
 			list($grid_row['class'],$grid_row['valign']) = explode(',',$parent['data'][0]['c'.$row]);
 
 			$grid_column =& $content['grid_column'];
 			list($grid_column['width'],$grid_column['disabled']) = explode(',',$parent['data'][0][$col]);
 			//echo "<p>grid_row($row)=".print_r($grid_row,true).", grid_column($col)=".print_r($grid_column,true)."</p>\n";
+
+			list(,,$previous_part) = explode(',',$parent['data'][0]['h'.($row-1)]);
+			list(,,$next_part) = explode(',',$parent['data'][0]['h'.($row+1)]);
+			$allowed_parts = $this->get_allowed_parts($row,$previous_part,$next_part);
+			//echo "<p>$row: previous=$previous_part, current={$grid_row['part']}, next=$next_part".(!isset($allowed_parts[$grid_row['part']])?': current part is NOT allowed!!!':'')."</p>\n"; _debug_array($allowed_parts);
 		}
 		else
 		{
@@ -1352,6 +1363,7 @@ class editor
 				'type'       => array_merge($this->etemplate->types,$this->extensions),
 				'align'      => &$this->aligns,
 				'valign'     => &$this->valigns,
+				'part'       => $allowed_parts,
 				'edit_menu'  => &$this->edit_menu,
 				'box_menu'   => &$this->box_menu,
 				'row_menu'   => &$this->row_menu,
@@ -1362,6 +1374,38 @@ class editor
 			),'',$preserv,2);
 	}
 
+	/**
+	 * Get the allowed tables-part for a table rows based on row-number, previous and next part
+	 *
+	 * @param int $row (1-based!)
+	 * @param string $previous_part ''=body, 'h'=header, 'f'=footer
+	 * @param string $next_part see above
+	 * @return array
+	 */
+	private function get_allowed_parts($row,$previous_part,$next_part)
+	{
+		$allowed_parts = $this->parts;
+		switch((string)$previous_part)
+		{
+			case 'footer':
+				unset($allowed_parts['header']);
+				break;
+			case '':
+				if ($row > 1) $allowed_parts = array('' => $allowed_parts['']);
+				break;
+		}
+		switch($next_part)
+		{
+			case 'header':
+				$allowed_parts = array('header' => $allowed_parts['header']);
+				break;
+			case 'footer':
+				unset($allowed_parts['']);
+				break;
+		}
+		return $allowed_parts;
+	}
+
 	/**
 	 * edit dialog for the styles of a templat or app
 	 *
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 440668e26c..6234708b6f 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -718,13 +718,15 @@ class etemplate extends boetemplate
 			else
 			{
 				$cols = &$data[$r_key];
-				list($height,$disabled) = explode(',',$opts["h$row"]);
+				$part = '';	// '' = body-prefix
+				list($height,$disabled,$part) = explode(',',$opts["h$row"]);
 				$class = /*TEST-RB$no_table_tr ? $tr_class :*/ $opts["c$row"];
 			}
 			if ($disabled != '' && $this->check_disabled($disabled,$content))
 			{
 				continue;	// row is disabled
 			}
+			if ($part) $row = $part[0].$row;	// add part prefix
 			$rows[".$row"] .= html::formatOptions($height,'height');
 			list($cl) = explode(',',$class);
 			if ($cl == '@' || $cl && strpos($cl,'$') !== false)
diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index af3cc332c9..38c4cf9ca0 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -35,7 +35,7 @@
 	{
 		/**
 		 * translate attr, common to all widgets
-		 * 
+		 *
 		 * @var array
 		 */
 		var $attr2xul = array(
@@ -49,7 +49,7 @@
 		);
 		/**
 		 * translate widget-names and widget-spec. attr., not set ones are identical
-		 * 
+		 *
 		 * @var array
 		 */
 		var $widget2xul = array(
@@ -104,7 +104,7 @@
 		);
 		/**
 		 * translate xul-widget names to our internal ones, not set ones are identical
-		 * 
+		 *
 		 * @var array
 		 */
 		var $xul2widget = array(
@@ -236,7 +236,7 @@
 				{
 					$attr_widget->set_attribute('type',$cell['type']);
 				}
-				break; 
+				break;
 			case 'groupbox':
 				if ($cell['label'])
 				{
@@ -328,7 +328,7 @@
 			{
 				$xul_row =& new xmlnode('row');
 				$this->set_attributes($xul_row,'class,valign',$opts["c$r"]);
-				$this->set_attributes($xul_row,'height,disabled',$opts["h$r"]);
+				$this->set_attributes($xul_row,'height,disabled,part',$opts["h$r"]);
 
 				$spanned = 0;
 				foreach($row as $c => $cell)
@@ -344,7 +344,7 @@
 						continue;	// spanned cells are not written
 					}
 					$this->add_widget($xul_row,$cell,$embeded_too);
-					
+
 					$spanned = $cell['span'] == 'all' ? 999 : $cell['span'];
 				}
 				$xul_rows->add_node($xul_row);
@@ -367,7 +367,7 @@
 			{
 				if (isset($embeded_too[$etempl->name]))
 				{
-					return;	// allready embeded 
+					return;	// allready embeded
 				}
 			}
 			else
@@ -375,14 +375,14 @@
 				$embeded_too = array();
 			}
 			$embeded_too[$etempl->name] = True;
-			
+
 			$template =& new xmlnode('template');
 			$template->set_attribute('id',$etempl->name);
 			$template->set_attribute('template',$etempl->template);
 			$template->set_attribute('lang',$etempl->lang);
 			$template->set_attribute('group',$etempl->group);
 			$template->set_attribute('version',$etempl->version);
-			
+
 			foreach($etempl->children as $child)
 			{
 				$this->add_widget($template,$child,$embeded_too);
@@ -400,7 +400,7 @@
 		 * create an XML representation of an eTemplate
 		 *
 		 * @param object $etempl eTemplate object to export
-		 * @return string the XML 
+		 * @return string the XML
 		 */
 		function export($etempl)
 		{
@@ -431,7 +431,7 @@
 		 * create an eTemplate from it's XML representation
 		 *
 		 * @param object &$etempl eTemplate object to set
-		 * @param string $data the XML 
+		 * @param string $data the XML
 		 * @return array/string array with names of imported templates or error-message
 		 */
 		function import(&$etempl,$data)
@@ -576,7 +576,8 @@
 						$nul = null; soetemplate::add_child($parent,$nul);	// null =& new row
 						$parent['data'][0]['c'.$parent['rows']] = $attr['class'] . ($attr['valign'] ? ','.$attr['valign'] : '');
 						$parent['data'][0]['h'.$parent['rows']] = $attr['height'] .
-							($attr['disabled'] ? ','.$attr['disabled'] : '');
+							($attr['disabled']||$attr['part'] ? ','.$attr['disabled'] : '').
+							($attr['part'] ? ','.$attr['part'] : '');
 						break;
 					case 'styles':
 						$etempl->style = trim($node['value']);
@@ -595,7 +596,7 @@
 							$tab_attr['help'] = implode('|',$tab_helps);
 							$tab_attr['span'] .= $tab_attr['class'] ? ','.$tab_attr['class'] : '';
 							unset($tab_attr['class']);
-							
+
 							soetemplate::add_child($parent,$tab_attr);
 							unset($tab_attr);
 						}
@@ -628,7 +629,7 @@
 							soetemplate::add_child($parent,$menulist_attr);
 							unset($menulist_attr);
 						}
-						break; 
+						break;
 					case 'vbox':
 					case 'hbox':
 					case 'deck':
diff --git a/etemplate/setup/etemplates.inc.php b/etemplate/setup/etemplates.inc.php
index 7f060f43ff..4ed1246e26 100644
--- a/etemplate/setup/etemplates.inc.php
+++ b/etemplate/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application etemplate
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-10-06 19:41
+	* generated by soetemplate::dump4setup() 2009-02-23 14:22
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package etemplate
@@ -151,6 +151,8 @@ $templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang
 
 $templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.0.1.006','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:1:{s:4:"type";s:5:"label";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1131206619',);
 
+$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"3";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:4:{s:4:"type";s:6:"select";s:5:"label";s:4:"Part";s:4:"name";s:14:"grid_row[part]";s:4:"help";s:61:"part of the table (header and footer have to be before body!)";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1235386301',);
+
 $templ_data[] = array('name' => 'etemplate.editor.widget.ajax_select','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:12:",@type=label";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"h8";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:5:"label";s:19:"AJAX Select options";s:7:"options";a:1:{i:0;s:1:"1";}s:4:"data";a:3:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"data";a:1:{i:0;a:0:{}}s:5:"label";s:11:"Data Source";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[0]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Title Source";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"ID Field";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[2]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Result row template";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[3]";}}}s:4:"rows";i:2;s:4:"cols";i:4;}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:8;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1163010571',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.ajax_select','template' => '','lang' => '','group' => '0','version' => '0.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:12:",@type=label";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"h8";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:5:"label";s:19:"AJAX Select options";s:7:"options";a:1:{i:0;s:1:"1";}s:4:"data";a:4:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"data";a:1:{i:0;a:0:{}}s:5:"label";s:11:"Data Source";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[0]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Title Source";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"ID Field";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[2]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Result row template";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[3]";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Link";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[6]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Icon";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[7]";}}}s:4:"rows";i:3;s:4:"cols";i:4;}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:8;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1176828301',);
@@ -300,6 +302,8 @@ $templ_data[] = array('name' => 'etemplate.test.grid-export','template' => '','l
 
 $templ_data[] = array('name' => 'etemplate.test.grid-export','template' => '','lang' => '','group' => '0','version' => '2','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"some cell";}}i:2;a:1:{s:1:"A";a:6:{s:5:"class";s:9:"hboxClass";s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"size";s:1:"1";s:4:"type";s:5:"label";s:5:"label";s:2:"1.";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:2:"2.";}i:3;a:3:{s:5:"align";s:5:"right";s:4:"type";s:5:"label";s:5:"label";s:10:"last right";}}}}s:4:"cols";i:1;s:4:"rows";i:2;s:4:"size";s:16:"100%,,,gridClass";}}','size' => '100%,,,gridClass','style' => '','modified' => '1179507244',);
 
+$templ_data[] = array('name' => 'etemplate.test.table','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h1";s:4:",h,h";s:2:"h3";s:4:",f,f";s:2:"h2";s:3:",,h";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf2";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:12:"2. Kopfzeile";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer2";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body2";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body2";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:3:",,1";s:7:"options";a:1:{i:2;s:1:"1";}}}','size' => '','style' => '','modified' => '1235388984',);
+
 $templ_data[] = array('name' => 'etemplate.test.Ymd','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:4:"text";s:5:"label";s:19:"Date YYYYmmddHHiiss";s:4:"name";s:4:"date";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"date";s:4:"size";s:5:"YmdHi";s:5:"label";s:4:"Date";s:4:"name";s:4:"date";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-timeonly";s:4:"size";s:5:"YmdHi";s:5:"label";s:4:"Time";s:4:"name";s:4:"date";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1179320861',);
 
 $templ_data[] = array('name' => 'etemplate.tree.test','template' => '','lang' => '','group' => '0','version' => '1','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:4:"tree";s:7:"onclick";s:9:"alert(id)";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1185018372',);
diff --git a/etemplate/templates/default/editor.widget.xet b/etemplate/templates/default/editor.widget.xet
index 0a2fc40b6d..832846dc0d 100644
--- a/etemplate/templates/default/editor.widget.xet
+++ b/etemplate/templates/default/editor.widget.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="etemplate.editor.widget.generic" template="" lang="" group="0" version="1.0.1.002">
+	<template id="etemplate.editor.widget.generic" template="" lang="" group="0" version="1.3.001">
 		<grid>
 			<columns>
 				<column/>
@@ -38,7 +38,6 @@
 						<checkbox label="%s needed" align="center" id="needed" statustext="check if field has to be filled by user"/>
 						<checkbox label="%s readonly" align="center" id="readonly" statustext="check if content should only be displayed but not altered (the content is not send back then!)"/>
 						<checkbox label="%s disabled" align="center" id="disabled" statustext="if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell"/>
-						<checkbox label="%s onChange" align="center" id="onchange" statustext="enable JavaScript onChange submit"/>
 					</hbox>
 				</row>
 				<row class="row" disabled="@type=label">
@@ -51,21 +50,30 @@
 				</row>
 				<row class="row">
 					<description options=",,,help" value="Help"/>
-					<textbox size="73" span="all" id="help" statustext="displayed in statusline of browser if input-field gets focus"/>
+					<textbox size="71" span="all" id="help" statustext="displayed in statusline of browser if input-field gets focus"/>
 				</row>
-				<row class="row" disabled="!@type=button">
+				<row class="row" disabled="@type=label">
+					<description value="onChange"/>
+					<hbox span="all">
+						<menulist>
+							<menupopup id="onchange_type" statustext="Should the form be submitted or any custom javascript be executed"/>
+						</menulist>
+						<textbox size="50" span="all" id="onchange" statustext="custom javascript for onChange"/>
+					</hbox>
+				</row>
+				<row class="row">
 					<description options="onclick" value="onClick"/>
 					<hbox span="all">
 						<menulist>
 							<menupopup id="onclick_type" statustext="confirmation necesary or custom java-script"/>
 						</menulist>
-						<textbox size="58" span="all" id="onclick" statustext="confirmation message or custom javascript (returning true or false)"/>
+						<textbox size="53" span="all" id="onclick" statustext="confirmation message or custom javascript (returning true or false)"/>
 					</hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="etemplate.editor.widget" template="" lang="" group="0" version="1.0.1.006">
+	<template id="etemplate.editor.widget" template="" lang="" group="0" version="1.7.001">
 		<grid>
 			<columns>
 				<column/>
@@ -114,12 +122,15 @@
 				<row disabled="!@grid_row">
 					<groupbox span="all" orient="horizontal">
 						<caption label="Grid row attributes"/>
-						<textbox size="5" label="Height" id="grid_row[height]" statustext="height of row (in % or pixel)"/>
-						<textbox size="10" label="Disabled" id="grid_row[disabled]" statustext="to disable: [! = not]&lt;value&gt;[=&lt;check&gt;] eg: '!@data' disables if content of data is empty"/>
-						<textbox size="10" label="Class" id="grid_row[class]" statustext="CSS-class name for this row, preset: 'th' = header, 'row' = alternating row, 'row_off'+'row_on' rows"/>
+						<textbox size="3" label="Height" id="grid_row[height]" statustext="height of row (in % or pixel)"/>
+						<textbox size="8" label="Disabled" id="grid_row[disabled]" statustext="to disable: [! = not]&lt;value&gt;[=&lt;check&gt;] eg: '!@data' disables if content of data is empty"/>
+						<textbox size="8" label="Class" id="grid_row[class]" statustext="CSS-class name for this row, preset: 'th' = header, 'row' = alternating row, 'row_off'+'row_on' rows"/>
 						<menulist>
 							<menupopup label="Valign" id="grid_row[valign]" statustext="vertical alignment of row"/>
 						</menulist>
+						<menulist>
+							<menupopup label="Part" id="grid_row[part]" statustext="part of the table (header and footer have to be before body!)"/>
+						</menulist>
 					</groupbox>
 				</row>
 				<row disabled="!@grid_column">
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 1e32984b12..435bcb0582 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -733,11 +733,24 @@ class html
 		return self::form(self::submit_button($name,$label),$hidden_vars,$url,$url_vars,$form_name,'',$method);
 	}
 
+	const THEAD = 1;
+	const TFOOT = 2;
+	const TBODY = 3;
+	static $part2tag = array(
+		self::THEAD => 'thead',
+		self::TFOOT => 'tfoot',
+		self::TBODY => 'tbody',
+	);
+
 	/**
 	 * creates table from array of rows
 	 *
 	 * abstracts the html stuff for the table creation
 	 * Example: $rows = array (
+	 *  'h1' => array(	// optional header row(s)
+	 *  ),
+	 *  'f1' => array(	// optional footer row(s)
+	 *  ),
 	 *	'1'  => array(
 	 *		1 => 'cell1', '.1' => 'colspan=3',
 	 *		2 => 'cell2',
@@ -754,12 +767,20 @@ class html
 	{
 		$html = $no_table_tr ? '' : "<table $options>\n";
 
+		$part = 0;
 		foreach($rows as $key => $row)
 		{
 			if (!is_array($row))
 			{
 				continue;					// parameter
 			}
+			// get the current part from the optional 'h' or 'f' prefix of the key
+			$p = $key[0] == 'h' ? html::THEAD : ($key[0] == 'f' ? html::TFOOT : html::TBODY);
+			if ($part < $p && ($part || $p < self::TBODY))	// add only allowed and neccessary transitions
+			{
+				if ($part) $html .= '</'.self::$part2tag[$part].">\n";
+				$html .= '<'.self::$part2tag[$part=$p].">\n";
+			}
 			$html .= $no_table_tr && $key == 1 ? '' : "\t<tr ".$rows['.'.$key].">\n";
 
 			foreach($row as $key => $cell)
@@ -785,6 +806,10 @@ class html
 		{
 			echo "<p>".function_backtrace()."</p>\n";
 		}
+		if ($part)	// close current part
+		{
+			$html .= "</".self::$part2tag[$part].">\n";
+		}
 		$html .= "</table>\n";
 
 		if ($no_table_tr)
diff --git a/phpgwapi/templates/idots/print.css b/phpgwapi/templates/idots/print.css
index 1e781ae45c..720ebf3323 100644
--- a/phpgwapi/templates/idots/print.css
+++ b/phpgwapi/templates/idots/print.css
@@ -1,6 +1,6 @@
 /*
 	The styles in this file are used for printing only!
-	
+
 	Additional UI Elements can be disabled for printing by adding their Id here or adding the noPrint class to them.
 */
 /* $Id$ */
@@ -66,4 +66,8 @@ a,a:link,a:visited,a:hover {
 /* hide background-image to save print costs and spool time */
 body {
 	background-image: none;
-}
\ No newline at end of file
+}
+
+/* MSIE needs these styles to repeat table header and footer part on each page */
+thead { display: table-header-group; }
+tfoot { display: table-footer-group; }

From b3b7487ad1eb4ebec11837f9666e8838520e8cec Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Mon, 23 Feb 2009 20:45:31 +0000
Subject: [PATCH 049/510] eGroupWare popup: Complete re-style of css and markup
 (nearly no visible changes but a lot of cleanup). eGWpopup now has a
 scrollbar for long messages. Changed non-validating color lightgray of idots
 to its numeric value. Renamed notificationwindow completely to egwpopup.

---
 .../inc/class.ajaxnotifications.inc.php       |  6 +-
 .../inc/class.notifications_popup.inc.php     |  3 +-
 notifications/inc/hook_after_navbar.inc.php   | 14 ++---
 notifications/js/notificationajaxpopup.js     | 62 +++++++++----------
 phpgwapi/templates/idots/css/idots.css        | 10 +--
 phpgwapi/templates/idots/css/traditional.css  | 49 +++++++++++----
 .../templates/jerryr/css/brushed-metal.css    | 50 +++++++++++----
 phpgwapi/templates/jerryr/css/jerryr.css      | 52 ++++++++++++----
 8 files changed, 163 insertions(+), 83 deletions(-)

diff --git a/notifications/inc/class.ajaxnotifications.inc.php b/notifications/inc/class.ajaxnotifications.inc.php
index 6864105b61..f78ed059cd 100644
--- a/notifications/inc/class.ajaxnotifications.inc.php
+++ b/notifications/inc/class.ajaxnotifications.inc.php
@@ -109,7 +109,7 @@ class ajaxnotifications {
 	 * 
 	 * @return xajax response
 	 */
-	public function get_popup_notifications() {
+	public function get_egwpopup_notifications() {
 		$session_id = $GLOBALS['egw_info']['user']['sessionid'];
 		$message = '';
 		$rs = $this->db->select(self::_notification_table, 
@@ -133,11 +133,11 @@ class ajaxnotifications {
 					break;
 				case 'high':
 					$this->response->addAlert(lang('eGroupWare has notifications for you'));
-					$this->response->addScript('notificationwindow_display();');
+					$this->response->addScript('egwpopup_display();');
 					break;
 				case 'medium':
 				default:
-					$this->response->addScript('notificationwindow_display();');
+					$this->response->addScript('egwpopup_display();');
 					break;
 			}
 		}
diff --git a/notifications/inc/class.notifications_popup.inc.php b/notifications/inc/class.notifications_popup.inc.php
index 67918ea12f..0b621a1fcd 100644
--- a/notifications/inc/class.notifications_popup.inc.php
+++ b/notifications/inc/class.notifications_popup.inc.php
@@ -116,7 +116,6 @@ class notifications_popup implements notifications_iface {
 		$message = 	$this->render_infos($_subject)
 					.html::hr()
 					.$_messages['html']
-					.html::hr()
 					.$this->render_links($_links);
 
 		$this->save( $message, $user_sessions );
@@ -174,7 +173,7 @@ class notifications_popup implements notifications_iface {
 
 		}
 		if(count($rendered_links) > 0) {
-			return html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
+			return html::hr().html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
 		}
 	}
 
diff --git a/notifications/inc/hook_after_navbar.inc.php b/notifications/inc/hook_after_navbar.inc.php
index 1d749d94ee..68a9b47619 100644
--- a/notifications/inc/hook_after_navbar.inc.php
+++ b/notifications/inc/hook_after_navbar.inc.php
@@ -16,15 +16,13 @@ $notification_config = config::read('notifications');
 if ($notification_config['popup_enable']) {
 	$GLOBALS['egw']->translation->add_app('notifications');
 	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup.js'. '" type="text/javascript"></script>';
-	echo '<script type="text/javascript">notificationwindow_init();</script>';
+	echo '<script type="text/javascript">egwpopup_init();</script>';
 	echo '
-		<div id="notificationwindow" style="display: none; z-index: 999;">
-			<div id="divAppboxHeader">'. lang('Notification'). '</div>
-				<div id="divAppbox">
-				<div id="notificationwindow_message"></div>
-				<center>
-					<input id="notificationwindow_ok_button" type="submit" value="'. lang('ok'). '" onClick="notificationwindow_button_ok();">
-				</center>
+		<div id="egwpopup" style="display: none; z-index: 999;">
+			<div id="egwpopup_header">'.lang('Notification').'</div>
+			<div id="egwpopup_message"></div>
+			<div id="egwpopup_footer">	
+				<input id="egwpopup_ok_button" type="submit" value="'. lang('ok'). '" onClick="egwpopup_button_ok();">
 			</div>
 		</div>
 	';
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index 4437a6d0fc..10cc0d13bd 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -10,41 +10,41 @@
 
 var notifymessages = new Array();
 
-function notificationwindow_init() {
-	window.setTimeout("notificationwindow_refresh();", 1000);
+function egwpopup_init() {
+	window.setTimeout("egwpopup_refresh();", 1000);
 }
 
-function notificationwindow_setTimeout() {
-	window.setTimeout("notificationwindow_refresh();", 60000);
+function egwpopup_setTimeout() {
+	window.setTimeout("egwpopup_refresh();", 60000);
 }
-function notificationwindow_refresh() {
+function egwpopup_refresh() {
 	xajax_doXMLHTTP("notifications.ajaxnotifications.check_mailbox");
-	xajax_doXMLHTTP("notifications.ajaxnotifications.get_popup_notifications");
-	notificationwindow_setTimeout();
+	xajax_doXMLHTTP("notifications.ajaxnotifications.get_egwpopup_notifications");
+	egwpopup_setTimeout();
 }
 
-function notificationwindow_display() {
-	var notificationwindow;
-	var notificationwindow_message;
+function egwpopup_display() {
+	var egwpopup;
+	var egwpopup_message;
 	var Browserwidth;
 	var Browserheight;
-	var notificationwindow_ok_button;
-	notificationwindow_ok_button = document.getElementById("notificationwindow_ok_button");
-	notificationwindow = document.getElementById("notificationwindow");
-	notificationwindow_message = document.getElementById("notificationwindow_message");
-	notificationwindow.style.display = "inline";
-	notificationwindow.style.position = "absolute";
-	notificationwindow.style.width = "500px";
+	var egwpopup_ok_button;
+	egwpopup_ok_button = document.getElementById("egwpopup_ok_button");
+	egwpopup = document.getElementById("egwpopup");
+	egwpopup_message = document.getElementById("egwpopup_message");
+	egwpopup.style.display = "inline";
+	egwpopup.style.position = "absolute";
+	egwpopup.style.width = "500px";
 	Browserwidth = (window.innerWidth || document.body.clientWidth || 640)
 	Browserheight = (window.innerHeight || document.body.clientHeight || 480)
-	notificationwindow.style.left = (Browserwidth/2 - 250) + "px";
-	notificationwindow.style.top = (Browserheight/4) + "px";
-	notificationwindow.style.height = "100%";
-	notificationwindow_message.innerHTML = notifymessages[0];
+	egwpopup.style.left = (Browserwidth/2 - 250) + "px";
+	egwpopup.style.top = (Browserheight/4) + "px";
+	egwpopup_message.style.maxHeight = (Browserheight/2) + "px";
+	egwpopup_message.innerHTML = notifymessages[0];
 	if(notifymessages.length-1 > 0 ) {
-		notificationwindow_ok_button.value = "OK (" + (notifymessages.length-1) + ")";
+		egwpopup_ok_button.value = "OK (" + (notifymessages.length-1) + ")";
 	} else {
-		notificationwindow_ok_button.value = "OK";
+		egwpopup_ok_button.value = "OK";
 	}
 
 }
@@ -59,17 +59,17 @@ function notificationbell_switch(mode) {
 	}
 }
 
-function notificationwindow_button_ok() {
-	var notificationwindow;
-	var notificationwindow_message;
-	notificationwindow = document.getElementById("notificationwindow");
-	notificationwindow_message = document.getElementById("notificationwindow_message");
+function egwpopup_button_ok() {
+	var egwpopup;
+	var egwpopup_message;
+	egwpopup = document.getElementById("egwpopup");
+	egwpopup_message = document.getElementById("egwpopup_message");
 	notifymessages.shift();
 	if(notifymessages.length > 0) {
-		notificationwindow_display();
+		egwpopup_display();
 	} else {
-		notificationwindow.style.display = "none";
-		notificationwindow_message.innerHTML = "";
+		egwpopup.style.display = "none";
+		egwpopup_message.innerHTML = "";
 		notificationbell_switch("inactive");
 	}
 }
diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css
index 28dcb79241..25b01865d8 100644
--- a/phpgwapi/templates/idots/css/idots.css
+++ b/phpgwapi/templates/idots/css/idots.css
@@ -27,11 +27,11 @@
 }
 
 .textSidebox {
-	border-top: 1px solid lightgray;
+	border-top: 1px solid #d3d3d3;
 }
 
 .divSidebox table {
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 	border-top: none;
 }
 
@@ -46,7 +46,7 @@
 #divAppbox {
 	padding-left: 15px;
 	padding-right: 10px;
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 }
 
 #divMain {
@@ -66,7 +66,7 @@
 }
 #divUpperTabs li
 {
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 	border-top: none;
 }
 
@@ -121,7 +121,7 @@ a:link, a:visited, select, input, textarea {
 }
 
 .divLoginbox {
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 	border-top: none;
 }
 .divLoginbox td {
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index a2185a594a..666ba948ac 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -458,26 +458,53 @@ Preferences tabs
 	padding-right: 15px;
 }
 
-/*
-	notification window
-*/
-#notificationwindow_message > table
-{
-	font-size: 95%;
+/* eGroupWare popup */
+#egwpopup {
+	background-color: #ffffff;
+	border: 1px solid #d3d3d3;
 }
 
-#notificationwindow_message hr
-{
+#egwpopup hr {
 	border: none;
-	border-top: 1px solid black;
+	border-top: 1px solid #d3d3d3;
 	height: 1px;
 }
 
-#notificationwindow_message .link
-{
+#egwpopup_header {
+	background-image: url(../images/gradient22.png);
+	height: 18px;
+	line-height: 18px;
+	margin: 0;
+	padding: 0;
+	font-size:12px;
+	font-weight: bold;
+	color: #666666;
+	text-align: center;
+	border-bottom: 1px solid #d3d3d3;
+}
+
+#egwpopup_message {
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+}
+
+#egwpopup_message > table {
+	font-size: 95%;
+}
+
+#egwpopup_message .link {
 	cursor: pointer;
 }
 
+#egwpopup_footer {
+	margin: 0;
+	padding: 7px;
+	border: none;
+	border-top: 1px solid #d3d3d3;
+	text-align: center;
+}
+
 .selectbg
 {
 	position:absolute;
diff --git a/phpgwapi/templates/jerryr/css/brushed-metal.css b/phpgwapi/templates/jerryr/css/brushed-metal.css
index 67d4631d6f..5e0c355285 100644
--- a/phpgwapi/templates/jerryr/css/brushed-metal.css
+++ b/phpgwapi/templates/jerryr/css/brushed-metal.css
@@ -717,22 +717,50 @@ body {
 	padding-right: 15px;
 }
 
-/*
-	notification window
-*/
-#notificationwindow_message > table
-{
-	font-size: 95%;
+/* eGroupWare popup */
+#egwpopup {
+	background-image: url(../images/bmback2.jpg);
+	background-color: #ffffff;
+	border: 1px solid #9f9f9f;
+	border-top-style: none;
 }
 
-#notificationwindow_message hr
-{
+#egwpopup hr {
 	border: none;
-	border-top: 1px solid black;
+	border-top: 1px solid #9f9f9f;
 	height: 1px;
 }
 
-#notificationwindow_message .link
-{
+#egwpopup_header {
+	background-image: url(../images/menuTitleMid-bm.png);
+	height: 24px;
+	line-height: 24px;
+	margin: 0;
+	padding: 0;
+	font-size:12px;
+	font-weight: bold;
+	color: #666666;
+	text-align: center;
+}
+
+#egwpopup_message {
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+}
+
+#egwpopup_message > table {
+	font-size: 95%;
+}
+
+#egwpopup_message .link {
 	cursor: pointer;
 }
+
+#egwpopup_footer {
+	margin: 0;
+	padding: 7px;
+	border: none;
+	border-top: 1px solid #9f9f9f;
+	text-align: center;
+}
diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css
index 5c4e2adf40..6e428c3142 100644
--- a/phpgwapi/templates/jerryr/css/jerryr.css
+++ b/phpgwapi/templates/jerryr/css/jerryr.css
@@ -392,6 +392,7 @@ body {
 	padding:9px;
 	padding-top: 0px;	/* CHANGED RALF */
 	border:solid 1px #17202b;
+	border-bottom-style:none;
 }
 
 #divLogo
@@ -641,31 +642,58 @@ body {
 	padding-right: 15px;
 }
 
-/*
-	notification window
-*/
-#notificationwindow_message > table
-{
-	font-size: 95%;
+/* eGroupWare popup */
+#egwpopup {
+	background-color: #fbf8f1;
+	border: 1px solid #17202b;
 }
 
-#notificationwindow_message hr
-{
+#egwpopup hr {
 	border: none;
-	border-top: 1px solid black;
+	border-top: 1px solid #17202b;
 	height: 1px;
 }
 
-#notificationwindow_message .link
-{
+#egwpopup_header {
+	background-image: url(../images/appTitleBar.png);
+	height: 18px;
+	line-height: 18px;
+	margin: 0;
+	padding: 0;
+	font-size:12px;
+	font-weight: bold;
+	color: #17202b;
+	text-align: center;
+	border-bottom: 1px solid #17202b;
+}
+
+#egwpopup_message {
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+}
+
+#egwpopup_message > table {
+	font-size: 95%;
+}
+
+#egwpopup_message .link {
 	cursor: pointer;
 }
 
+#egwpopup_footer {
+	margin: 0;
+	padding: 7px;
+	border: none;
+	border-top: 1px solid #17202b;
+	text-align: center;
+}
+
 .selectbg
 {
 	position:absolute;
 	z-index:10;
-	overflow:hidden;/
+	overflow:hidden;
 	width:250px;
 }
 .iframeforselectbox

From 587a3b92bcf9421a1eadadba0eaf91c66949f23b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Feb 2009 07:42:12 +0000
Subject: [PATCH 050/510] automatic fix / pad 0 based arrays with the required
 number of false values, to match the number of header lines in the rows
 template --> allows to customize the template (number of header lines)
 without the need to patch the code (fixed pm's element list with uses 2
 header lines, but required exactly one pad done by the old code)

---
 etemplate/inc/class.nextmatch_widget.inc.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index d7e5311ea1..488f18cac1 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -331,10 +331,6 @@ class nextmatch_widget
 			$tmpl->sel_options = array_merge($tmpl->sel_options,$rows['sel_options']);
 			unset($rows['sel_options']);
 		}
-		if (is_array($rows[0]))	// fixed 0 based arrays
-		{
-			array_unshift($rows,false);
-		}
 		$value['rows'] =& $rows;
 		unset($rows);
 
@@ -347,6 +343,13 @@ class nextmatch_widget
 		{
 			$value['template'] =& new etemplate($value['template'],$tmpl->as_array());
 		}
+		if (is_array($value['rows'][0]))	// pad 0 based arrays with rows-1 false values
+		{
+			for($i = 1; $i < $value['template']->rows; $i++)
+			{
+				array_unshift($value['rows'],false);
+			}
+		}
 		$extension_data['template'] = $value['template']->name;	// used for the column-selection, and might be set in get_rows()
 		$extension_data['columnselection_pref'] = $value['columnselection_pref'];
 

From 0977164c373f36236eee456e83a6b68abb41a32b Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 25 Feb 2009 09:00:58 +0000
Subject: [PATCH 051/510] fixed a bug connected to ralfs category patch

---
 resources/inc/class.bo_acl.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/inc/class.bo_acl.inc.php b/resources/inc/class.bo_acl.inc.php
index 38a8092486..1154c5af9d 100755
--- a/resources/inc/class.bo_acl.inc.php
+++ b/resources/inc/class.bo_acl.inc.php
@@ -72,8 +72,11 @@ class bo_acl
 	function get_cats($perm_type)
 	{
 		$cats = $this->egw_cats->return_sorted_array(0,false,'','','',true);
-		while (list(,$cat) = @each($cats))
-		{
+		#_debug_array($cats);
+		if (!is_array($cats)) $cats = array();
+		foreach($cats as $key=>$cat) {
+			#echo "key:$key"._debug_array($value)."<br>";
+			#_debug_array($cat)."hier<br>";
 			if($this->is_permitted($cat['id'],$perm_type))
 			{
 				for ($j=0,$s=''; $j < $cat['level']; $j++)

From 8b4932dd11df4209af7c9a975bd7adc9eed95ddd Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 25 Feb 2009 10:55:38 +0000
Subject: [PATCH 052/510] handling/improving bookability of resources and their
 availability

---
 calendar/inc/class.calendar_uiforms.inc.php | 31 ++++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index cfd0ed0870..914f4d6019 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -285,8 +285,27 @@ class calendar_uiforms extends calendar_ui
 						// check if new entry is no contact or no account
 						if ($app != 'addressbook' || !($data = $GLOBALS['egw']->accounts->name2id($id,'person_id')))
 						{
-							$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
 							$quantity = $content['participants']['quantity'] ? $content['participants']['quantity'] : 1;
+							if ($app == "resources" && $id) {
+								$bores =& CreateObject('resources.bo_resources');
+								$selectedres = $bores->read($id);
+								$cats = $bores->acl->get_cats(EGW_ACL_DIRECT_BOOKING);
+								if (is_array($cats) && $selectedres['bookable'] == 1 && 
+									$selectedres['cat_id'] && array_key_exists($selectedres['cat_id'],$cats))
+								{
+									if ($selectedres['quantity'] && $selectedres['quantity'] < $quantity) {
+										$msg .= lang('You requested more than available for the selected resource:').$selectedres['name']." ".lang('quantity').":".$selectedres['quantity']." < $quantity";
+										break;
+									}
+									// to do: Test for overbooking/maybe this is handled sufficient by the conflict handling of dates
+									#$msg = lang('The resource you selected is already overbooked:').$selectedres['name'];
+								} else {
+									// you are not allowed to book, or the resource is overbooked already
+									$msg = .lang('You are not allowed to book the resource selected:').$selectedres['name'];
+									break;
+								}
+							}
+							$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
 							if ($uid) $event['participants'][$uid] = $event['participant_types'][$type][$id] =
 								$status.((int) $quantity > 1 ? (int)$quantity : '');
 							break;
@@ -655,7 +674,7 @@ class calendar_uiforms extends calendar_ui
 			}
 		}
 		list($subject,$body) = $this->bo->get_update_message($event,$added ? MSG_ADDED : MSG_MODIFIED);	// update-message is in TZ of the user
-
+		#error_log(__METHOD__.print_r($event,true));
 		$boical = new calendar_ical();
 		$ics = $boical->exportVCal(array($event),'2.0','request',false);
 
@@ -1412,9 +1431,12 @@ class calendar_uiforms extends calendar_ui
 	 */
 	function export($content=0,$return_error=false)
 	{
+        $boical = new calendar_ical();
+		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
 		{
-			if (!($ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$cal_id,'2.0','PUBLISH',false)))
+			#if (!($ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$cal_id,'2.0','PUBLISH',false)))
+			if (!($ical =& $boical->exportVCal(array($cal_id),'2.0','PUBLISH',false)))
 			{
 				$msg = lang('Permission denied');
 
@@ -1443,7 +1465,8 @@ class calendar_uiforms extends calendar_ui
 			}
 			else
 			{
-				$ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$events,'2.0'/*$content['version']*/,'PUBLISH',false);
+				$ical =& $boical->exportVCal($events,'2.0','PUBLISH',false);
+				#$ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$events,'2.0'/*$content['version']*/,'PUBLISH',false);
 				$GLOBALS['egw']->browser->content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical));
 				echo $ical;
 				$GLOBALS['egw']->common->egw_exit();

From 7f49b31963489ba5cec1cf102795fd9ad15cdc4c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 25 Feb 2009 12:25:10 +0000
Subject: [PATCH 053/510] fixing a misplaced . that prevented the creating of
 new events

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

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 914f4d6019..e347f747fc 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -301,7 +301,7 @@ class calendar_uiforms extends calendar_ui
 									#$msg = lang('The resource you selected is already overbooked:').$selectedres['name'];
 								} else {
 									// you are not allowed to book, or the resource is overbooked already
-									$msg = .lang('You are not allowed to book the resource selected:').$selectedres['name'];
+									$msg .= lang('You are not allowed to book the resource selected:').$selectedres['name'];
 									break;
 								}
 							}

From 8ff202505156c5be64759eb69c0aabfad17f1795 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 25 Feb 2009 12:59:28 +0000
Subject: [PATCH 054/510] "resetting array pointer for old code relying on it"

---
 phpgwapi/inc/class.categories.inc.php | 39 ++++++++++++++-------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index 997fe843e2..f50092ea37 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -19,11 +19,11 @@
 
 /**
  * class to manage categories in eGroupWare
- * 
+ *
  * Categories are read now once from the database into a static cache variable (by the static init_cache method).
  * The egw object fills that cache ones per session, stores it in a private var, from which it restores it for each
  * request of that session.
- * 
+ *
  * @ToDo The cache now contains a backlink from the parent to it's children. Use that link to simplyfy return_all_children
  * 	and other functions needing to know if a cat has children. Be aware a user might not see all children, as they can
  * 	belong to other users.
@@ -65,10 +65,10 @@ class categories
 	/**
 	 * Cache holding all categories, set via init_cache() method
 	 *
-	 * @var array cat_id => array of data 
+	 * @var array cat_id => array of data
 	 */
 	private static $cache;
-	
+
 
 	/**
 	 * constructor for categories class
@@ -135,7 +135,7 @@ class categories
 		{
 			// resolving the group members/grants is very slow with ldap accounts backend
 			// let's skip it for the addressbook, if we are using the ldap accounts backend
-			$this->grants = $GLOBALS['egw']->acl->get_grants($app_name, 
+			$this->grants = $GLOBALS['egw']->acl->get_grants($app_name,
 				$app_name != 'addressbook' || $GLOBALS['egw_info']['server']['account_repository'] != 'ldap');
 		}
 		$cats = array();
@@ -158,8 +158,8 @@ class categories
 			}
 			// check if certain parent required
 			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
-			
-			// apply standard acl / grants: return only application global cats (if $globals) or 
+
+			// apply standard acl / grants: return only application global cats (if $globals) or
 			if (!($globals && $cat['appname'] == 'phpgw' ||
 				  $cat['appname'] == $this->app_name && ($cat['owner'] == -1 || $cat['owner'] == $this->account_id ||
 				  	$this->account_id != -1 && $cat['access'] == 'public' && $this->grants && isset($this->grants[$cat['owner']]))))
@@ -188,13 +188,13 @@ class categories
 					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id) continue 2;
 					break;
 			}
-			
+
 			// check name and description for $query
 			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
-			
+
 			// check if last modified since
 			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
-			
+
 			$cats[] = $cat;
 		}
 		if (!($this->total_records = count($cats)))
@@ -228,7 +228,7 @@ class categories
 			}
 		}
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = ".array2string($cats));
-		
+
 		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
@@ -300,6 +300,7 @@ class categories
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
+		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -640,9 +641,9 @@ class categories
 	{
 		if(!$cat_id) return '--';
 		if (!$item) $item = 'parent';
-		
+
 		if (is_null(self::$cache)) self::init_cache();
-		
+
 		$cat = self::$cache[$cat_id];
 		if ($item == 'path')
 		{
@@ -706,7 +707,7 @@ class categories
 		//error_log(__METHOD__."($type,$cat_name,$cat_id,$parent) = ".$ret);
 		return $ret;
 	}
-	
+
 	/**
 	 * Change the owner of all cats owned by $owner to $to OR deletes them if !$to
 	 *
@@ -731,12 +732,12 @@ class categories
 		// update cache accordingly
 		self::invalidate_cache();
 	}
-	
+
 	/**
 	 * Initialise or restore the categories cache
-	 * 
+	 *
 	 * We use the default ordering of return_array to avoid doing it again there
-	 * 
+	 *
 	 * @param array &$cache=null cache content to restore it (from the egw-object)
 	 */
 	public static function &init_cache(&$cache=null)
@@ -768,10 +769,10 @@ class categories
 		//error_log(__METHOD__."() cache initialised: ".function_backtrace());
 		return self::$cache;
 	}
-	
+
 	/**
 	 * Invalidate the cache
-	 * 
+	 *
 	 * Currently we dont care for $cat_id, as changing cats happens very infrequently and
 	 * also changes child categories (!)
 	 *

From b413a39b49fea2e2a84da6e924cb36668fe35cf9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 25 Feb 2009 14:35:43 +0000
Subject: [PATCH 055/510] "some more compatibility stuff (table-name as
 variable)"

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

diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index f50092ea37..8c2a7f7adc 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -62,6 +62,11 @@ class categories
 	 * Name of the categories table
 	 */
 	const TABLE = 'egw_categories';
+	/**
+	 * @deprecated use categoris::TABLE
+	 * @var string
+	 */
+	var $table = self::TABLE;
 	/**
 	 * Cache holding all categories, set via init_cache() method
 	 *

From a80c2f92c808df8e065df390e9d43ac3c2fb3b07 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 25 Feb 2009 15:54:24 +0000
Subject: [PATCH 056/510] "vfs-mime: fixed empty filename always showed
 directory logo, now empty filename shows an empty cell"

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

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index a006cce1ce..f9355fbb97 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -157,6 +157,11 @@ class vfs_widget
 				break;
 
 			case 'vfs-mime':
+				if (!$value)
+				{
+					$cell = etemplate::empty_cell();
+					return true;
+				}
 				if (!is_array($value))
 				{
 					if ($value[0] == '/' || count(explode('/',$value)) != 2)

From 684ad891b8f5ae511b7a433e8c66210e69bc746d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 25 Feb 2009 15:55:53 +0000
Subject: [PATCH 057/510] "fixed wrong template-name in export, if name
 contains variables"

---
 etemplate/inc/class.xul_io.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index 38c4cf9ca0..374367194b 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -270,7 +270,6 @@
 					{
 						$this->add_etempl($templ,$embeded_too);
 					}
-					$cell['name'] = $templ->name;
 					unset($templ);
 				}
 				break;

From a5a28ad70844e735aa235ad6b9ce2659790aa44f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Feb 2009 13:51:25 +0000
Subject: [PATCH 058/510] Enhanced file upload to allow user to upload multiple
 files by appending [] to the name of the widget, eg. "upload[]". In that case
 attaching a file adds an other file upload via javascript direct under the
 current upload and etemplate returns an array of files (each with keys
 'tmp_name', 'name', etc.).

---
 etemplate/inc/class.etemplate.inc.php | 57 +++++++++++++++++++++------
 etemplate/js/etemplate.js             | 20 ++++++++--
 2 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 6234708b6f..39f0375c51 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1525,10 +1525,25 @@ class etemplate extends boetemplate
 				if (!$readonly)
 				{
 					if ((int) $cell_options) $options .= ' size="'.(int)$cell_options.'"';
-					$html .= html::input_hidden($path_name = str_replace($name,$name.'_path',$form_name),'.');
+					if (substr($name,-2) == '[]')
+					{
+						$GLOBALS['egw_info']['etemplate']['form_options'] .= ' enctype="multipart/form-data"';
+						if (strpos($options,'onChange="') !== false)
+						{
+							$options = preg_replace('/onChange="([^"]+)"/i','onChange="\\1; add_upload(this);"',$options);
+						}
+						else
+						{
+							$options .= ' onChange="add_upload(this);"';
+						}
+					}
+					else
+					{
+						$html .= html::input_hidden($path_name = str_replace($name,$name.'_path',$form_name),'.');
+						$GLOBALS['egw_info']['etemplate']['form_options'] .=
+							" enctype=\"multipart/form-data\" onsubmit=\"set_element2(this,'$path_name','$form_name')\"";
+					}
 					$html .= html::input($form_name,'','file',$options);
-					$GLOBALS['egw_info']['etemplate']['form_options'] =
-						"enctype=\"multipart/form-data\" onsubmit=\"set_element2(this,'$path_name','$form_name')\"";
 					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 				}
 				break;
@@ -2071,21 +2086,39 @@ class etemplate extends boetemplate
 					}
 					break;
 				case 'file':
+					if (($multiple = substr($form_name,-2) == '[]'))
+					{
+						$form_name = substr($form_name,0,-2);
+					}
 					$parts = explode('[',str_replace(']','',$form_name));
 					$name = array_shift($parts);
 					$index  = count($parts) ? '['.implode('][',$parts).']' : '';
 					$value = array();
-					foreach(array('tmp_name','type','size','name') as $part)
+					for($i=0; $i < 100; ++$i)
 					{
-						$value[$part] = is_array($_FILES[$name]) ? $this->get_array($_FILES[$name],$part.$index) : False;
+						$file = array();
+						foreach(array('tmp_name','type','size','name','error') as $part)
+						{
+							$file[$part] = $this->get_array($_FILES[$name],$part.$index.($multiple ? "[$i]" : ''));
+						}
+						if (!$multiple) $file['path'] = $this->get_array($content_in,substr($form_name,0,-1).'_path]');
+						$file['ip'] = get_var('REMOTE_ADDR',Array('SERVER'));
+						if ((string)$file['tmp_name'] === '' || function_exists('is_uploaded_file') && !is_uploaded_file($file['tmp_name']))
+						{
+							if ($multiple && ($file['tmp_name'] === '' || $file['error']))
+							{
+								continue;	// ignore empty upload box
+							}
+							break;
+						}
+						if (!$multiple)
+						{
+							$value = $file;
+							break;
+						}
+						$value[] = $file;
 					}
-					$value['path'] = $this->get_array($content_in,substr($form_name,0,-1).'_path]');
-					$value['ip'] = get_var('REMOTE_ADDR',Array('SERVER'));
-					if (function_exists('is_uploaded_file') && !is_uploaded_file($value['tmp_name']))
-					{
-						$value = array();	// to be on the save side
-					}
-					//_debug_array($value);
+					//echo $form_name; _debug_array($value);
 					// fall-throught
 				default:
 					$this->set_array($content,$form_name,$value);
diff --git a/etemplate/js/etemplate.js b/etemplate/js/etemplate.js
index 8fc6c171a2..8d55d8f353 100644
--- a/etemplate/js/etemplate.js
+++ b/etemplate/js/etemplate.js
@@ -6,7 +6,7 @@
  * @subpackage api
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @version $Id$ 
+ * @version $Id$
  */
 
 function submitit(form,name)
@@ -57,12 +57,12 @@ function activate_tab(tab,all_tabs,name)
 	var tabs = all_tabs.split('|');
 	var parts = tab.split('.');
 	var last_part = parts.length-1;
-	
+
 	for (n = 0; n < tabs.length; n++)
 	{
 		var t = tabs[n];
 
-		if (t.indexOf('.') < 0 && parts.length > 1) 
+		if (t.indexOf('.') < 0 && parts.length > 1)
 		{
 			parts[last_part] = t;
 			t = parts.join('.');
@@ -116,7 +116,7 @@ function selectbox_add_option(id,label,value,do_onchange)
 function toggle_all(form,name)
 {
 	var all_set = true;
-	
+
 	/* this is for use with a sub-grid. To use it pass "true" as third parameter */
 	if(toggle_all.arguments.length > 2 && toggle_all.arguments[2] == true)
 	{
@@ -277,3 +277,15 @@ function set_multiselection(name,values,reset)
 		}
 	}
 }
+
+// add an other upload
+function add_upload(upload)
+{
+	var parent = upload.parentNode;
+	var newUpload = upload.cloneNode(true);
+	parent.insertBefore(newUpload,upload);
+	var br = document.createElement('br');
+	parent.insertBefore(br,upload);
+	upload.id += parent.childNodes.length;
+	upload.value = '';
+}

From 8abb78f918ccc32601596531b532554a49a2b9fd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Feb 2009 14:42:50 +0000
Subject: [PATCH 059/510] "small change on the upload to be still able to
 detect failed uploads caused by to small upload_max_filesize -->
 !empty($file['name]) && empty($file['tmp_name'])"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 39f0375c51..ce0986ee55 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -2102,10 +2102,10 @@ class etemplate extends boetemplate
 							$file[$part] = $this->get_array($_FILES[$name],$part.$index.($multiple ? "[$i]" : ''));
 						}
 						if (!$multiple) $file['path'] = $this->get_array($content_in,substr($form_name,0,-1).'_path]');
-						$file['ip'] = get_var('REMOTE_ADDR',Array('SERVER'));
-						if ((string)$file['tmp_name'] === '' || function_exists('is_uploaded_file') && !is_uploaded_file($file['tmp_name']))
+						$file['ip'] = $_SERVER['REMOTE_ADDR'];
+						if ((string)$file['name'] === '' || $file['tmp_name'] && function_exists('is_uploaded_file') && !is_uploaded_file($file['tmp_name']))
 						{
-							if ($multiple && ($file['tmp_name'] === '' || $file['error']))
+							if ($multiple && ($file['name'] === '' || $file['error']))
 							{
 								continue;	// ignore empty upload box
 							}

From 1d5146474627b28b7307056c32c250f878c6f594 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Feb 2009 14:48:53 +0000
Subject: [PATCH 060/510] Fixed silent overwrite of existing files by new
 uploads. Added multiple uploads.

---
 filemanager/inc/class.filemanager_ui.inc.php | 81 ++++++++++++++++----
 filemanager/setup/egw_de.lang                |  3 +
 filemanager/setup/egw_en.lang                |  3 +
 filemanager/setup/etemplates.inc.php         | 22 +-----
 filemanager/templates/default/index.xet      |  4 +-
 5 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index ded526f13b..28fd635d11 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -74,8 +74,6 @@ class filemanager_ui
 	{
 		$tpl = new etemplate('filemanager.index');
 
-		//_debug_array($content);
-
 		if (!is_array($content))
 		{
 			$content = array(
@@ -113,12 +111,9 @@ class filemanager_ui
 			}
 		}
 		// check if we have a failed upload AND upload_max_filesize >= post_max_size --> no $_POST array
-		if ($_GET['post_empty'] && self::km2int(ini_get('upload_max_filesize')) >= self::km2int(ini_get('post_max_size')) ||
-			// or size bigger as upload_max_filesize
-			$content['button']['upload'] && (!is_array($content['upload']) || !is_uploaded_file($content['upload']['tmp_name'])))
+		if ($_GET['post_empty'] && self::km2int(ini_get('upload_max_filesize')) >= self::km2int(ini_get('post_max_size')))
 		{
 			$msg = lang('Error uploading file!')."\n".self::max_upload_size_message();
-			unset($content['button']);
 		}
 		$content['nm']['msg'] = $msg;
 
@@ -179,17 +174,36 @@ class filemanager_ui
 					$content['nm']['msg'] = self::action($clipboard_type.'_paste',$clipboard_files,$content['nm']['path']);
 					break;
 				case 'upload':
-					// strip '?', '/' and '#' from filenames, as they are forbidden for sqlfs / make problems
-					$to = egw_vfs::concat($content['nm']['path'],str_replace(array('?','/','#'),'',$content['upload']['name']));
-					if ($content['upload'] && is_uploaded_file($content['upload']['tmp_name']) &&
-						(egw_vfs::is_writable($content['nm']['path']) || egw_vfs::is_writable($to)) &&
-						copy($content['upload']['tmp_name'],egw_vfs::PREFIX.$to))
+					if (!$content['upload'])
 					{
-						$content['nm']['msg'] = lang('File successful uploaded.');
+						$content['nm']['msg'] = lang('You need to select some files first!');
+						break;
 					}
-					else
+					$upload_success = $upload_failure = array();
+					foreach(isset($content['upload'][0]) ? $content['upload'] : array($content['upload']) as $upload)
 					{
-						$content['nm']['msg'] = lang('Error uploading file!');
+						// strip '?', '/' and '#' from filenames, as they are forbidden for sqlfs / make problems
+						$to = egw_vfs::concat($content['nm']['path'],str_replace(array('?','/','#'),'',$upload['name']));
+						if ($upload && is_uploaded_file($upload['tmp_name']) &&
+							(egw_vfs::is_writable($content['nm']['path']) || egw_vfs::is_writable($to)) &&
+							copy($upload['tmp_name'],egw_vfs::PREFIX.$to))
+						{
+							$upload_success[] = $upload['name'];
+						}
+						else
+						{
+							$upload_failure[] = $upload['name'];
+						}
+					}
+					$content['nm']['msg'] = '';
+					if ($upload_success)
+					{
+						$content['nm']['msg'] = count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') :
+							lang('%1 successful uploaded.',implode(', ',$upload_success));
+					}
+					if ($upload_failure)
+					{
+						$content['nm']['msg'] .= ($upload_success ? "\n" : '').lang('Error uploading file!')."\n".self::max_upload_size_message();
 					}
 					break;
 			}
@@ -223,6 +237,45 @@ class filemanager_ui
 		$tpl->exec('filemanager.filemanager_ui.index',$content,$sel_options,$readonlys,array('nm' => $content['nm']));
 	}
 
+	/**
+	 * Check if a file upload would overwrite an existing file and get a user confirmation in that case
+	 *
+	 * @param string $id id of the input
+	 * @param string $name name (incl. client-path) of the file to upload
+	 * @param string $dir current vfs directory
+	 * @return string xajax output
+	 */
+	static function ajax_check_upload_target($id,$name,$dir)
+	{
+		$response = new xajaxResponse();
+
+		//$response->addAlert(__METHOD__."('$id','$name','$dir')");
+
+		$name = explode('/',str_replace('\\','/',$name));	// in case of win clients
+		$name = array_pop($name);
+
+		// strip '?', '/' and '#' from filenames, as they are forbidden for sqlfs / make problems
+		$path = egw_vfs::concat($dir,str_replace(array('?','/','#'),'',$name));
+
+		if (egw_vfs::stat($path))
+		{
+			if (egw_vfs::is_dir($path))
+			{
+				$response->addAlert(lang("There's already a directory with that name!"));
+				$response->addScript("document.getElementById('$id').value='';");
+			}
+			else
+			{
+				$response->addScript("if (!confirm('".addslashes(lang('Do you want to overwrite the existing file %1?',$path))."')) document.getElementById('$id').value='';");
+			}
+		}
+		else
+		{
+			// do nothing new file
+		}
+		return $response->getXML();
+	}
+
 	/**
 	 * Get the configured start directory for the current user
 	 *
diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index 3e627a9f24..37ae0b674f 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -9,6 +9,7 @@
 %1 files deleted.	filemanager	de	%1 Dateien gelöscht.
 %1 files moved.	filemanager	de	%1 Dateien verschoben.
 %1 starts with '%2'	filemanager	de	%1 beginnt mit '%2'
+%1 successful uploaded.	filemanager	de	%1 erfolgreich hochgeladen.
 %1 the following files into current directory	filemanager	de	Die foldenden Dateien in das aktuelle Verzeichnis %1
 %1 urls %2 to clipboard.	filemanager	de	%1 Adressen in die Zwischenablage %2.
 accessrights	filemanager	de	Zugangsberechtigungen
@@ -57,6 +58,7 @@ directory names cannot contain "%1"	filemanager	de	Verzeichnisnamen düefen kein
 directory not found or no permission to access it!	filemanager	de	Verzeichnis nicht gefunden oder keine Rechte darauf zuzugreifen!
 display and modification of content	filemanager	de	Anzeigen und Verändern des Inhaltes
 display of content	filemanager	de	Anzeigen des Inhaltes
+do you want to overwrite the existing file %1?	filemanager	de	Wollen Sie die existierende Datei %1 überschreiben?
 download	filemanager	de	Herunterladen
 edit comments	filemanager	de	Kommentare bearbeiten
 edit settings	filemanager	de	Einstellungen bearbeiten
@@ -146,6 +148,7 @@ start search	filemanager	de	Suche starten
 superuser	filemanager	de	Superuser
 the default start folder is your personal folder. the default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.	filemanager	de	Die Vorgabe für das Anfangsverzeichnis ist Ihr perönlicher Ordner. Die Vorgabe wird benutzt, wenn Sie hier nichts eintragen, der Pfad nicht existiert oder Ihnen die notwending Zugriffsrechte fehlen.
 the requested path %1 is not available.	filemanager	de	Der angeforderte Verzeichnispfad %1 steht nicht zur Verfügung.
+there's already a directory with that name!	filemanager	de	Es gibt bereits ein Verzeichnis mit diesem Namen!
 there's already a file with that name!	filemanager	de	Es gibt bereits eine Datei mit diesem Namen!
 to overwrite the existing file store again.	filemanager	de	Zum Ãœberschreiben der Datei nochmal speichern.
 total files	filemanager	de	Gesamtanzahl Dateien
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index 6612a3a001..78e3d3e9ed 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -9,6 +9,7 @@
 %1 files deleted.	filemanager	en	%1 files deleted.
 %1 files moved.	filemanager	en	%1 files moved.
 %1 starts with '%2'	filemanager	en	%1 starts with '%2'
+%1 successful uploaded.	filemanager	en	%1 successful uploaded.
 %1 the following files into current directory	filemanager	en	%1 the following files into current directory
 %1 urls %2 to clipboard.	filemanager	en	%1 URLs %2 to clipboard.
 accessrights	filemanager	en	Accessrights
@@ -57,6 +58,7 @@ directory names cannot contain "%1"	filemanager	en	Directory names cannot contai
 directory not found or no permission to access it!	filemanager	en	Directory not found or no permission to access it!
 display and modification of content	filemanager	en	Display and modification of content
 display of content	filemanager	en	Display of content
+do you want to overwrite the existing file %1?	filemanager	en	Do you want to overwrite the existing file %1?
 download	filemanager	en	Download
 edit comments	filemanager	en	Edit comments
 edit settings	filemanager	en	Edit settings
@@ -146,6 +148,7 @@ start search	filemanager	en	start search
 superuser	filemanager	en	Superuser
 the default start folder is your personal folder. the default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.	filemanager	en	The default start folder is your personal Folder. The default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.
 the requested path %1 is not available.	filemanager	en	The requested path %1 is not available.
+there's already a directory with that name!	filemanager	en	There's already a directory with that name!
 there's already a file with that name!	filemanager	en	There's already a file with that name!
 to overwrite the existing file store again.	filemanager	en	To overwrite the existing file store again.
 total files	filemanager	en	Total Files
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index a2607665a3..f9b5a62a10 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-11-16 11:25
+	* generated by soetemplate::dump4setup() 2009-02-26 16:26
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -12,10 +12,6 @@
 
 $templ_version=1;
 
-$templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:27:"General|Permissions|Preview";s:4:"name";s:21:"general|perms|preview";s:4:"span";s:3:"all";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:15:"window.close();";}}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1204554434',);
-
-$templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:40:"General|Permissions|Extended ACL|Preview";s:4:"name";s:26:"general|perms|eacl|preview";s:4:"span";s:3:"all";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:15:"window.close();";}}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '.eaclAccount select,.eaclRights select { width: 160px; }','modified' => '1207725030',);
-
 $templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:54:"General|Permissions|Extended ACL|Preview|Custom fields";s:4:"name";s:33:"general|perms|eacl|preview|custom";s:4:"span";s:3:"all";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:15:"window.close();";}}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '.eaclAccount select,.eaclRights select { width: 160px; }','modified' => '1223224423',);
 
 $templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:54:"General|Permissions|Extended ACL|Preview|Custom fields";s:4:"name";s:33:"general|perms|eacl|preview|custom";s:4:"span";s:3:"all";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:15:"window.close();";}}i:2;a:6:{s:4:"type";s:10:"buttononly";s:5:"label";s:9:"Superuser";s:5:"align";s:5:"right";s:4:"help";s:48:"Enter setup user and password to get root rights";s:7:"onclick";s:121:"set_style_by_class(\'fieldset\',\'superuser\',\'display\',\'inline\'); document.getElementById(form::name(\'sudo[user]\')).focus();";s:4:"name";s:4:"sudo";}}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:29:"Enter setup user and password";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"User";s:4:"size";s:13:",,,sudo[user]";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"sudo[user]";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Password";s:4:"size";s:15:",,,sudo[passwd]";}s:1:"B";a:2:{s:4:"type";s:6:"passwd";s:4:"name";s:12:"sudo[passwd]";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Submit";s:4:"name";s:13:"button[setup]";}}}s:7:"options";a:0:{}s:4:"rows";i:3;s:4:"cols";i:2;}s:4:"span";s:10:",superuser";}}}s:4:"rows";i:4;s:4:"cols";i:1;}}','size' => '','style' => '.eaclAccount select,.eaclRights select { width: 160px; }
@@ -33,8 +29,6 @@ $templ_data[] = array('name' => 'filemanager.file.custom','template' => '','lang
 
 $templ_data[] = array('name' => 'filemanager.file.eacl','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:4:",top";s:2:"c2";s:7:",bottom";s:2:"h2";s:11:",!@is_owner";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:4:"span";s:3:"all";s:5:"label";s:28:"Extended access control list";i:1;a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,200,,,,,auto";s:4:"data";a:3:{i:0;a:7:{s:1:"A";s:2:"80";s:1:"B";s:2:"80";s:1:"D";s:2:"16";s:2:"h2";s:4:",!@1";s:1:"C";s:3:"20%";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Rights";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Inherited";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[rights]";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[path]";}s:1:"D";a:5:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:39:"delete[$row_cont[ino]-$row_cont[owner]]";s:7:"onclick";s:43:"return confirm(\'Delete this extended ACL\');";}}}s:4:"name";s:4:"eacl";s:4:"rows";i:2;s:4:"cols";i:4;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:15:"select one,both";s:4:"name";s:11:"eacl[owner]";s:4:"span";s:12:",eaclAccount";s:5:"label";s:5:"Owner";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:12:"eacl[rights]";s:4:"span";s:11:",eaclRights";s:5:"label";s:6:"Rights";}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:12:"button[eacl]";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1207724932',);
 
-$templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:2:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:5:"hsize";s:5:"label";s:17:"%s ($cont[size]b)";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
-
 $templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:2:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";s:8:"onchange";s:94:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_rename_target\',document.location.href,this.value);";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:5:"hsize";s:5:"label";s:17:"%s ($cont[size]b)";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
 
 $templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:2:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:4:"size";s:4:"size";s:1:"1";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,comment";s:5:"label";s:7:"Comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:7:"comment";s:4:"span";s:8:",comment";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
@@ -43,21 +37,11 @@ $templ_data[] = array('name' => 'filemanager.file.perms','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.file.preview','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2:"c1";s:4:",top";s:2:"h1";s:16:",!@mime=/^image/";s:2:"h3";s:22:",@mime=/^(image|text)/";s:2:"h2";s:18:"280,!@text_content";s:2:"c2";s:4:",top";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:4:"link";s:4:"span";s:13:",previewImage";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:12:"text_content";s:4:"span";s:12:",previewText";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"No preview available";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:18:"450,300,,,10,,auto";s:7:"options";a:4:{i:0;s:3:"450";i:1;s:3:"300";i:6;s:4:"auto";i:4;s:2:"10";}}}','size' => '450,300,,,10,,auto','style' => '','modified' => '1204567479',);
 
-$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"7";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:7;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:4:"file";s:4:"name";s:6:"upload";s:4:"help";s:42:"Select file to upload in current directory";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1204374710',);
-
-$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:4:"file";s:4:"name";s:6:"upload";s:4:"help";s:42:"Select file to upload in current directory";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1223226240',);
-
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:4:"file";s:4:"name";s:6:"upload";s:4:"help";s:42:"Select file to upload in current directory";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1223226240',);
 
+$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1235658193',);
+
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:5:"label";s:15:"$row_cont[mime]";s:4:"name";s:12:"${row}[icon]";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"size";s:14:",@${row}[link]";s:4:"name";s:12:"${row}[name]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[hsize]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:5:"label";s:16:"$row_cont[perms]";s:4:"span";s:6:",perms";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[user]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[group]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=400,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:15:"$row_cont[path]";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:15:"$row_cont[path]";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
-$templ_data[] = array('name' => 'filemanager.search','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:4:{i:0;a:9:{s:4:"type";s:8:"groupbox";s:4:"name";s:10:"debuginfos";s:4:"size";s:1:"4";s:5:"label";s:10:"Debuginfos";s:8:"disabled";s:1:"1";i:1;a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:7:"message";s:8:"readonly";s:1:"1";}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:2:{s:1:"C";s:3:"120";s:1:"D";s:3:"120";}i:1;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"searchstring";s:4:"name";s:17:"searchstringlabel";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:4:"name";s:12:"searchstring";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:3:{s:4:"type";s:6:"button";s:5:"label";s:12:"start search";s:4:"name";s:12:"start_search";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}i:2;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"mime type";}s:1:"B";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:8:"checkall";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"All";s:4:"name";s:8:"alllabel";}s:1:"D";a:4:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:5:"files";s:4:"name";s:14:"checkonlyfiles";}}}s:4:"rows";i:1;s:4:"cols";i:1;}s:1:"E";a:1:{s:4:"type";s:5:"label";}}i:3;a:5:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:14:"checkonlyfiles";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"files";s:4:"name";s:9:"filelabel";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"clear search";s:4:"name";s:12:"clear_search";s:7:"onclick";s:71:"menuaction=filemanager.uifilemanager.index&action=search&actioncd=clear";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}i:4;a:5:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:13:"checkonlydirs";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"directory";s:4:"name";s:8:"dirlabel";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:5:"label";s:5:"Debug";s:4:"name";s:5:"debug";s:8:"disabled";s:1:"1";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}i:5;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:15:"created between";s:4:"name";s:12:"createdlabel";}s:1:"B";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:13:"searchcreated";}s:1:"C";a:3:{s:4:"type";s:4:"date";s:4:"name";s:15:"datecreatedfrom";s:4:"size";s:2:",8";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:13:"datecreatedto";s:4:"size";s:2:",8";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:17:"searchcreatedtext";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}}i:6;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:16:"modified between";s:4:"name";s:13:"modifiedlabel";}s:1:"B";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:14:"searchmodified";}s:1:"C";a:3:{s:4:"type";s:4:"date";s:4:"name";s:16:"datemodifiedfrom";s:4:"size";s:2:",8";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:14:"datemodifiedto";s:4:"size";s:2:",8";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:18:"searchmodifiedtext";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:6;s:4:"cols";i:5;}i:2;a:1:{s:4:"type";s:5:"hrule";}i:3;a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:4:"rows";s:4:"name";s:2:"nm";}}','size' => '','style' => '','modified' => '1173101430',);
-
-$templ_data[] = array('name' => 'filemanager.search.rows','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{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:3:"row";}i:1;a:8:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:2:"Id";s:4:"name";s:11:"vfs_file_id";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"file";s:4:"name";s:7:"fulldir";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Directory";s:4:"name";s:13:"vfs_directory";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"name";s:4:"name";s:8:"vfs_name";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"comment";s:4:"name";s:11:"vfs_comment";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"mime type";s:4:"name";s:13:"vfs_mime_type";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"created";s:4:"name";s:11:"vfs_created";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"modified";s:4:"name";s:12:"vfs_modified";}}i:2;a:8:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_file_id]";s:7:"no_lang";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:4:"html";s:4:"name";s:15:"${row}[fulldir]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:4:"html";s:4:"name";s:21:"${row}[vfs_directory]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[vfs_name]";s:7:"no_lang";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_comment]";s:7:"no_lang";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[vfs_mime_type]";s:7:"no_lang";s:1:"1";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_created]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[vfs_modified]";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:8;s:4:"size";s:9:"100%,auto";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:4:"auto";}}}','size' => '100%,auto','style' => '','modified' => '1173104345',);
-
-$templ_data[] = array('name' => 'filemanager.search.rows','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"A";s:2:"20";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:13:"vfs_mime_type";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:2:"Id";s:4:"name";s:11:"vfs_file_id";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"File";s:4:"name";s:7:"fulldir";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Directory";s:4:"name";s:13:"vfs_directory";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"name";s:4:"name";s:8:"vfs_name";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"mime type";s:4:"name";s:9:"mime_type";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:8:"vfs_size";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"comment";s:4:"name";s:11:"vfs_comment";}s:1:"I";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"created";s:4:"name";s:11:"vfs_created";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"modified";s:4:"name";s:12:"vfs_modified";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[vfs_mime_type]";s:4:"name";s:12:"${row}[icon]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_file_id]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[file]";s:7:"no_lang";s:1:"1";s:4:"size";s:21:",$row_cont[file_link]";}s:1:"D";a:4:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[vfs_directory]";s:7:"no_lang";s:1:"1";s:4:"size";s:20:",$row_cont[dir_link]";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[vfs_name]";s:7:"no_lang";s:1:"1";s:4:"size";s:21:",$row_cont[file_link]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[vfs_mime_type]";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[vfs_size]";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_comment]";s:7:"no_lang";s:1:"1";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_created]";s:7:"no_lang";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[vfs_modified]";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:9:"100%,auto";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:4:"auto";}}}','size' => '100%,auto','style' => '','modified' => '1173104345',);
-
-$templ_data[] = array('name' => 'filemanager.search.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"A";s:2:"20";}i:1;a:12:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:13:"vfs_mime_type";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:2:"Id";s:4:"name";s:11:"vfs_file_id";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"File";s:4:"name";s:7:"fulldir";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Directory";s:4:"name";s:13:"vfs_directory";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"name";s:4:"name";s:8:"vfs_name";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"mime type";s:4:"name";s:9:"mime_type";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:8:"vfs_size";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"comment";s:4:"name";s:11:"vfs_comment";}s:1:"I";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"created";s:4:"name";s:11:"vfs_created";}s:1:"J";a:3:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"size";s:10:"Created by";s:4:"name";s:16:"vfs_createdby_id";}s:1:"K";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"modified";s:4:"name";s:12:"vfs_modified";}s:1:"L";a:3:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"size";s:11:"Modified by";s:4:"name";s:17:"vfs_modifiedby_id";}}i:2;a:12:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[vfs_mime_type]";s:4:"name";s:12:"${row}[icon]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_file_id]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[file]";s:7:"no_lang";s:1:"1";s:4:"size";s:21:",$row_cont[file_link]";}s:1:"D";a:4:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[vfs_directory]";s:7:"no_lang";s:1:"1";s:4:"size";s:20:",$row_cont[dir_link]";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[vfs_name]";s:7:"no_lang";s:1:"1";s:4:"size";s:21:",$row_cont[file_link]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[vfs_mime_type]";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[vfs_size]";s:5:"align";s:5:"right";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[vfs_comment]";s:7:"no_lang";s:1:"1";}s:1:"I";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:19:"${row}[vfs_created]";s:4:"size";s:11:"Y-m-d H:i:s";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[vfs_createdby_id]";s:8:"readonly";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:20:"${row}[vfs_modified]";s:4:"size";s:11:"Y-m-d H:i:s";s:8:"readonly";s:1:"1";}s:1:"L";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:25:"${row}[vfs_modifiedby_id]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:12;s:4:"size";s:9:"100%,auto";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:4:"auto";}}}','size' => '100%,auto','style' => '','modified' => '1173104345',);
-
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index f5dee64635..3d7a758af1 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -53,7 +53,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="filemanager.index" template="" lang="" group="0" version="1.5.003">
+	<template id="filemanager.index" template="" lang="" group="0" version="1.6.001">
 		<grid width="100%">
 			<columns>
 				<column width="250"/>
@@ -81,7 +81,7 @@
 				</row>
 				<row>
 					<hbox>
-						<file id="upload" statustext="Select file to upload in current directory"/>
+						<file id="upload[]" statustext="Select file to upload in current directory" onchange="xajax_doXMLHTTP('filemanager_ui::ajax_check_upload_target',this.id,this.value,'{$cont[nm][path]}');"/>
 						<button label="Upload" id="button[upload]"/>
 					</hbox>
 					<hbox align="right">

From 9083041e37686021d3703e0e55a93b485e1dbd31 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Feb 2009 14:58:55 +0000
Subject: [PATCH 061/510] "show only active account in the addressbook (only
 for sql account repository)"

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

diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index a031ce8c47..654ec1e8cd 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -30,6 +30,16 @@ class addressbook_sql extends so_sql
 	var $contact_repository = 'sql';
 	var $grants;
 
+	/**
+	 * join to show only active account (and not already expired ones)
+	 */
+	const ACOUNT_ACTIVE_JOIN = ' LEFT JOIN egw_accounts ON egw_addressbook.account_id=egw_accounts.account_id';
+	/**
+	 * filter to show only active account (and not already expired ones)
+	 * UNIX_TIMESTAMP(NOW()) gets replaced with value of time() in the code!
+	 */
+	const ACOUNT_ACTIVE_FILTER = '(account_expires IS NULL OR account_expires = -1 OR account_expires > UNIX_TIMESTAMP(NOW()))';
+
 	/**
 	 * internal name of the id, gets mapped to uid
 	 *
@@ -396,6 +406,12 @@ class addressbook_sql extends so_sql
 				$extra_cols[] = $matches[1];
 			}
 		}
+		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)
+		if (!$owner && substr($this->account_repository,0,3) == 'sql' && strpos($join,$GLOBALS['egw']->accounts->backend->table) === false)
+		{
+			$join .= self::ACOUNT_ACTIVE_JOIN;
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+		}
 		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 
 		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!

From 5e2ff3b54f3f2b59bc0318a945ff9210309f3cfd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 27 Feb 2009 08:47:10 +0000
Subject: [PATCH 062/510] "fixed SQL error introduced by r26581: Column
 'account_id' in where clause is ambiguous --> happens if account-repository
 is in ldap"

---
 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 654ec1e8cd..6a6213de3a 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -407,7 +407,8 @@ class addressbook_sql extends so_sql
 			}
 		}
 		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)
-		if (!$owner && substr($this->account_repository,0,3) == 'sql' && strpos($join,$GLOBALS['egw']->accounts->backend->table) === false)
+		if (!$owner && substr($this->account_repository,0,3) == 'sql' &&
+			strpos($join,$GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id',$filter))
 		{
 			$join .= self::ACOUNT_ACTIVE_JOIN;
 			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);

From 3850ce1a63e02a63061eda52b3f95f5560ac8559 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 27 Feb 2009 10:05:15 +0000
Subject: [PATCH 063/510] giving a valid responsehaeder back if we get al
 malformed or missing url (PATH_INFO)

---
 webdav.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webdav.php b/webdav.php
index cf99437b07..516dcd1502 100644
--- a/webdav.php
+++ b/webdav.php
@@ -46,7 +46,11 @@ function check_access(&$account)
 $parts = explode('/',$_SERVER['PATH_INFO']);
 //error_log("webdav: explode".print_r($parts,true));
 if(count($parts)== 1){
-	echo "Malformed Url: missing slash" ;
+	error_log(__METHOD__. "Malformed Url: missing slash:\n".$_SERVER['SERVER_NAME']."\n PATH_INFO:".$_SERVER['PATH_INFO'].
+		"\n REQUEST_URI".$_SERVER['REQUEST_URI']."\n ORIG_SCRIPT_NAME:".$_SERVER['ORIG_SCRIPT_NAME'].
+		"\n REMOTE_ADDR:".$_SERVER['REMOTE_ADDR']."\n PATH_INFO:".$_SERVER['PATH_INFO']."\n HTTP_USER_AGENT:".$_SERVER['HTTP_USER_AGENT']) ;
+	header("HTTP/1.1 501  Not implemented");
+	header("X-WebDAV-Status: 501  Not implemented", true);
 	exit;
 }
 

From 44531c0e45f596a84930b7a9c088ce1f2b11dbde Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 27 Feb 2009 10:22:28 +0000
Subject: [PATCH 064/510] handling an error on unset props-array

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

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 28fd635d11..bf1d183d54 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -532,6 +532,7 @@ class filemanager_ui
 			{
 				unset($row);	// fixes a weird problem with php5.1, does NOT happen with php5.2
 				$row =& $rows[$path2n[$path]];
+				if ( !is_array($props) ) continue;
 				foreach($props as $prop)
 				{
 					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show)) continue;

From fd1109612cbf6de641c3ef4568ad91d81882f917 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Fri, 27 Feb 2009 18:51:17 +0000
Subject: [PATCH 065/510] fixed typo

---
 notifications/inc/hook_settings.inc.php    | 2 +-
 notifications/templates/default/config.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/notifications/inc/hook_settings.inc.php b/notifications/inc/hook_settings.inc.php
index faed19e58d..be86a63fd1 100644
--- a/notifications/inc/hook_settings.inc.php
+++ b/notifications/inc/hook_settings.inc.php
@@ -35,7 +35,7 @@ $GLOBALS['settings'] = array(
 		'name'   => 'egwpopup_verbosity',
 		'values' => $verbosity_values,
 		'help'   => 'How verbose should the eGroupware-Popup behave if a notification is sent to the user:<br />'
-					.'low: just display the notification bell in the topmenu - topmenu must be enabled !<br />'
+					.'low: just display the notification bell in the topmenu - topmenu must be enabled!<br />'
 					.'medium: bring notification window to front<br />'
 					.'high: bring notification window to front and let the browser do something to announce itself',
 		'xmlrpc' => True,
diff --git a/notifications/templates/default/config.tpl b/notifications/templates/default/config.tpl
index 0728f68e7d..08d026ebc2 100644
--- a/notifications/templates/default/config.tpl
+++ b/notifications/templates/default/config.tpl
@@ -11,7 +11,7 @@
 <!-- END header -->
 <!-- BEGIN body -->
    <tr class="th">
-    <td colspan="2">&nbsp;<b>{lang_eGroupware-Popup_backend}</b></td>
+    <td colspan="2">&nbsp;<b>{lang_eGroupWare-Popup_backend}</b></td>
    </tr>
    <tr bgcolor="{row_on}">
     <td>{lang_Enable_eGroupWare-Popup_backend}</td>

From 77a80c0a930ed4e536aa0d020e01042b347ee48c Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Fri, 27 Feb 2009 18:52:01 +0000
Subject: [PATCH 066/510] german translation for notifications

---
 notifications/setup/egw_de.lang | 33 ++++++++++++++++++++++++++++++++-
 notifications/setup/egw_en.lang | 20 ++++++++++++++++----
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/notifications/setup/egw_de.lang b/notifications/setup/egw_de.lang
index 5ad0311cae..d6e50cabf0 100644
--- a/notifications/setup/egw_de.lang
+++ b/notifications/setup/egw_de.lang
@@ -1,8 +1,39 @@
-don't notify me via popups in egroupware	notifications	de	Benachrichtigungen durch Popups unterdrücken.
+all possible notification backends	notifications	de	alle verfügbaren Benachrichtigungs-Backends
+choose a notification-chain. you will be notified over the backends included in the chain.<br />note: if a notification-chain is marked as "disabled", your administrator does not allow one or more of the backends included in the chain and notifications falls back to "e-mail" while notifying you.	notifications	de	Wählen Sie eine Benachrichtigungskette. Sie werden über die Backends benachrichtigt, die in der Kette enthalten sind.<br />Bitte beachten: Wenn eine Benachrichtigungskette als "deaktiviert" markiert ist, erlaubt Ihr Administrator ein oder mehrere Backends nicht, die in der Kette enthalten sind und die Anwendung "Benachrichtigungen" weicht dann auf die Methode "E-Mail" aus während Sie benachrichtigt werden.
+common chains	notifications	de	Einfache Ketten
+disabled chains	notifications	de	Deaktivierte Ketten
+do not notify me at all	notifications	de	benachrichtige mich niemals
+e-mail only	notifications	de	nur E-Mail
+egroupware has notifications for you	notifications	de	eGroupWare hat Benachrichtigungen für Sie
+egroupware-popup and e-mail	notifications	de	eGroupWare-Popup und E-Mail
+egroupware-popup and windows-popup	notifications	de	eGroupWare-Popup und Windows-Popup
+egroupware-popup backend	admin	de	eGroupWare-Popup Backend
+egroupware-popup first, if that fails notify me by e-mail	notifications	de	zuerst eGroupWare-Popup, wenn das misslingt benachrichtige mich per E-Mail
+egroupware-popup first, if that fails notify me by sms	notifications	de	zuerst eGroupware-Popup, wenn das misslingt benachrichtige mich per SMS
+egroupware-popup only	notifications	de	nur eGroupWare-Popup
+egroupware-popup verbosity	notifications	de	eGroupWare-Popup Mitteilungspriorität
+enable egroupware-popup backend	admin	de	eGroupWare-Popup Backend aktivieren
+enable sms backend	admin	de	SMS Backend aktivieren
+enable windows-popup backend	admin	de	Windows-Popup Backend aktivieren
+enabled chains	notifications	de	Aktivierte Ketten
 folder	notifications	de	Ordner
 from	notifications	de	Von
+how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled!<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	de	Wie hoch soll das eGroupWare-Popup die Priorität setzen wenn eine Benachrichtigung an den Benutzer geschickt wird:<br />Niedrig: es wird nur die Benachrichtigungsglocke im Topmenü angezeigt - das Topmenü muss hierfür eingeschaltet sein!<br />Mittel: Holt das Benachrichtigungsfenster in den Vordergrund<br />Hoch: Holt das Benachrichtigungsfenster in den Vordergrund und lässt den Browser etwas tun um sich bemerkbar zu machen
+if set, embedded links get rendered special for external clients	notifications	de	Eingebettete Links werden besonders behandelt für externe Clients wenn diese Option gesetzt ist
+linked entries:	notifications	de	Verknüpfte Einträge:
+maximum sms messages per notification	admin	de	Maximale Anzahl an SMS Nachrichten pro Benachrichtigung
 message from	notifications	de	Nachricht von
 notification	common	de	Benachrichtigung
+notify me by	notifications	de	Benachrichtige mich per
+optimize e-mails for external mail client	notifications	de	Optimiere E-Mails für externe Mailclients
 preferences for notification	notifications	de	Benachrichtigungs-Einstellungen
 received	notifications	de	Erhalten
+sms backend	admin	de	SMS Backend
+sms only	notifications	de	nur SMS
+this egroupware notification has been sent to you by mail because your chosen notification-chain has been disabled by the administrator. please choose another notification-chain in your preferences!	notifications	de	Diese eGroupWare-Benachrichtigung wurde Ihnen per Mail zugesandt weil Ihre gewählte Benachrichtigungskette vom Administrator deaktiviert wurde. Bitte wählen Sie eine andere Benachrichtigungskette in Ihren Einstellungen!
+windows-popup and e-mail	notifications	de	Windows-Popup und E-Mail
+windows-popup backend	admin	de	Windows-Popup Backend
+windows-popup first, if that fails notify me by e-mail	notifications	de	zuerst Windows-Popup, wenn das misslingt benachrichtige mich per E-Mail
+windows-popup first, if that fails notify me by sms	notifications	de	zuerst Windows-Popup, wenn das misslingt benachrichtige mich per SMS
+windows-popup only	notifications	de	nur Windows-Popup
 you've got new mail	notifications	de	Sie haben neue E-Mails
diff --git a/notifications/setup/egw_en.lang b/notifications/setup/egw_en.lang
index 2eb8b79500..4d13809c3f 100644
--- a/notifications/setup/egw_en.lang
+++ b/notifications/setup/egw_en.lang
@@ -1,9 +1,16 @@
+all possible notification backends	notifications	en	all possible notification backends
 choose a notification-chain. you will be notified over the backends included in the chain.<br />note: if a notification-chain is marked as "disabled", your administrator does not allow one or more of the backends included in the chain and notifications falls back to "e-mail" while notifying you.	notifications	en	Choose a notification-chain. You will be notified over the backends included in the chain.<br />Note: If a notification-chain is marked as "disabled", your Administrator does not allow one or more of the backends included in the chain and notifications falls back to "E-Mail" while notifying you.
 common chains	notifications	en	Common chains
 disabled chains	notifications	en	Disabled chains
-don't notify me via popups in egroupware	notifications	en	Don't notify me via popups in eGroupWare
+do not notify me at all	notifications	en	do not notify me at all
+e-mail only	notifications	en	E-Mail only
 egroupware has notifications for you	notifications	en	eGroupWare has notifications for you
-egroupware-popup backend	admin	en	eGroupware-Popup backend
+egroupware-popup and e-mail	notifications	en	eGroupWare-Popup and E-Mail
+egroupware-popup and windows-popup	notifications	en	eGroupWare-Popup and Windows-Popup
+egroupware-popup backend	admin	en	eGroupWare-Popup backend
+egroupware-popup first, if that fails notify me by e-mail	notifications	en	eGroupWare-Popup first, if that fails notify me by E-Mail
+egroupware-popup first, if that fails notify me by sms	notifications	en	eGroupware-Popup first, if that fails notify me by SMS
+egroupware-popup only	notifications	en	eGroupWare-Popup only
 egroupware-popup verbosity	notifications	en	eGroupware-Popup verbosity
 enable egroupware-popup backend	admin	en	Enable eGroupWare-Popup backend
 enable sms backend	admin	en	Enable SMS backend
@@ -11,7 +18,7 @@ enable windows-popup backend	admin	en	Enable Windows-Popup backend
 enabled chains	notifications	en	Enabled chains
 folder	notifications	en	Folder
 from	notifications	en	From
-how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled !<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	en	How verbose should the eGroupware-Popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled !<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself
+how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled!<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	en	How verbose should the eGroupware-Popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled!<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself
 if set, embedded links get rendered special for external clients	notifications	en	If set, embedded links get rendered special for external clients
 linked entries:	notifications	en	Linked entries:
 maximum sms messages per notification	admin	en	Maximum SMS messages per notification
@@ -22,6 +29,11 @@ optimize e-mails for external mail client	notifications	en	Optimize E-Mails for
 preferences for notification	notifications	en	Preferences for notification
 received	notifications	en	Received
 sms backend	admin	en	SMS backend
-this egroupware notification has been sent to you by mail because your	notifications	en	This eGroupWare notification has been sent to you by mail because your
+sms only	notifications	en	SMS only
+this egroupware notification has been sent to you by mail because your chosen notification-chain has been disabled by the administrator. please choose another notification-chain in your preferences!	notifications	en	This eGroupWare notification has been sent to you by mail because your chosen notification-chain has been disabled by the administrator. Please choose another notification-chain in your preferences!
+windows-popup and e-mail	notifications	en	Windows-Popup and E-Mail
 windows-popup backend	admin	en	Windows-Popup backend
+windows-popup first, if that fails notify me by e-mail	notifications	en	Windows-Popup first, if that fails notify me by E-Mail
+windows-popup first, if that fails notify me by sms	notifications	en	Windows-Popup first, if that fails notify me by SMS
+windows-popup only	notifications	en	Windows-Popup only
 you've got new mail	notifications	en	You've got new mail

From cfcbdc93f4022de162f3d475fa26ed3db0590451 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 2 Mar 2009 11:40:28 +0000
Subject: [PATCH 067/510] "query account_lid (via accounts::id2name) only if
 it's not already in the data without that accounts_sql::get_list without
 limit requires quite a lot more time and memory"

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

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index dbdf580022..a7d8afe997 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -368,7 +368,8 @@ class addressbook_bo extends addressbook_so
 		{
 			static $fb_url;
 			if (!$fb_url && @is_dir(EGW_SERVER_ROOT.'/calendar/inc')) $fb_url = calendar_bo::freebusy_url('');
-			if ($fb_url) $data['freebusy_uri'] = $fb_url.urlencode($GLOBALS['egw']->accounts->id2name($data['account_id']));
+			if ($fb_url) $data['freebusy_uri'] = $fb_url.urlencode(
+				isset($data['account_lid']) ? $data['account_lid'] : $GLOBALS['egw']->accounts->id2name($data['account_id']));
 		}
 		return $data;
 	}

From ca46d97abd6a1c87267b86e660068ba05610e0a8 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Wed, 4 Mar 2009 20:50:06 +0000
Subject: [PATCH 068/510] reset scroll position of egwpopup after OK

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

diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index 10cc0d13bd..360f589da6 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -29,10 +29,10 @@ function egwpopup_display() {
 	var Browserwidth;
 	var Browserheight;
 	var egwpopup_ok_button;
-	egwpopup_ok_button = document.getElementById("egwpopup_ok_button");
 	egwpopup = document.getElementById("egwpopup");
 	egwpopup_message = document.getElementById("egwpopup_message");
-	egwpopup.style.display = "inline";
+	egwpopup_ok_button = document.getElementById("egwpopup_ok_button");
+	egwpopup.style.display = "block";
 	egwpopup.style.position = "absolute";
 	egwpopup.style.width = "500px";
 	Browserwidth = (window.innerWidth || document.body.clientWidth || 640)
@@ -64,6 +64,7 @@ function egwpopup_button_ok() {
 	var egwpopup_message;
 	egwpopup = document.getElementById("egwpopup");
 	egwpopup_message = document.getElementById("egwpopup_message");
+	egwpopup_message.scrollTop = 0;
 	notifymessages.shift();
 	if(notifymessages.length > 0) {
 		egwpopup_display();

From dd41d422e9da3d37cbdb626185f3b0b6ee4cc0f1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 5 Mar 2009 15:17:45 +0000
Subject: [PATCH 069/510] "fixing high minimize memory usage (important for
 huge number of accounts)"

---
 phpgwapi/inc/class.accounts_sql.inc.php | 73 +++++++++++++------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 41f3df74b1..5f506346e3 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -1,22 +1,22 @@
 <?php
 /**
  * API - accounts SQL backend
- * 
+ *
  * The SQL backend stores the group memberships via the ACL class (location 'phpgw_group')
- * 
- * The (positive) account_id's of groups are mapped in this class to negative numeric 
+ *
+ * The (positive) account_id's of groups are mapped in this class to negative numeric
  * account_id's, to conform with the way we handle groups in LDAP!
- * 
+ *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de> complete rewrite in 6/2006 and
  * 	earlier to use the new DB functions
- * 
- * This class replaces the former accounts_sql class written by 
- * Joseph Engo <jengo@phpgroupware.org>, Dan Kuykendall <seek3r@phpgroupware.org> 
+ *
+ * This class replaces the former accounts_sql class written by
+ * Joseph Engo <jengo@phpgroupware.org>, Dan Kuykendall <seek3r@phpgroupware.org>
  * and Bettina Gille <ceb@phpgroupware.org>.
  * Copyright (C) 2000 - 2002 Joseph Engo
  * Copyright (C) 2003 Lars Kneschke, Bettina Gille
- * 
+ *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package api
  * @subpackage accounts
@@ -25,7 +25,7 @@
 
 /**
  * SQL Backend for accounts
- * 
+ *
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package api
@@ -51,7 +51,7 @@ class accounts_sql
 	 *
 	 * @var string
 	 */
-	var $contacts_table = 'egw_addressbook';			
+	var $contacts_table = 'egw_addressbook';
 	/**
 	 * Join with the accounts-table used in contacts::search
 	 *
@@ -94,7 +94,7 @@ class accounts_sql
 
 	/**
 	 * Reads the data of one account
-	 * 
+	 *
 	 * For performance reasons and because the contacts-object itself depends on the accounts-object,
 	 * we directly join with the contacts table for reading!
 	 *
@@ -104,7 +104,7 @@ class accounts_sql
 	function read($account_id)
 	{
 		if (!(int)$account_id) return false;
-		
+
 		$join = $extra_cols = '';
 		if ($account_id > 0)
 		{
@@ -145,7 +145,7 @@ class accounts_sql
 
 	/**
 	 * Saves / adds the data of one account
-	 * 
+	 *
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
@@ -156,12 +156,12 @@ class accounts_sql
 		//echo "<p>accounts_sql::save(".print_r($data,true).")</p>\n";
 		$to_write = $data;
 		unset($to_write['account_passwd']);
-		
+
 		// encrypt password if given or unset it if not
 		if ($data['account_passwd'])
 		{
 			// if password it's not already entcrypted, do so now
-			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) && 
+			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) &&
 				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))	// md5 hash
 			{
 				$data['account_passwd'] = $GLOBALS['egw']->auth->encrypt_sql($data['account_passwd']);
@@ -180,7 +180,7 @@ class accounts_sql
 
 			if (!in_array($to_write['account_type'],array('u','g')) ||
 				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;
-				
+
 			if (!(int)$data['account_id'])
 			{
 				$data['account_id'] = $this->db->get_last_insert_id($this->table,'account_id');
@@ -197,7 +197,7 @@ class accounts_sql
 		}
 		return $data['account_id'];
 	}
-	
+
 	/**
 	 * Delete one account, deletes also all acl-entries for that account
 	 *
@@ -207,7 +207,7 @@ class accounts_sql
 	function delete($account_id)
 	{
 		if (!(int)$account_id) return false;
-		
+
 		$contact_id = $this->id2name($account_id,'person_id');
 
 		if (!$this->db->delete($this->table,array('account_id' => abs($account_id)),__LINE__,__FILE__))
@@ -252,7 +252,7 @@ class accounts_sql
 	function set_memberships($groups,$account_id)
 	{
 		if (!(int)$account_id) return;
-		
+
 		$acl =& CreateObject('phpgwapi.acl',$account_id);
 		$acl->read_repository();
 		$acl->delete('phpgw_group',false);
@@ -287,7 +287,7 @@ class accounts_sql
 
 	/**
 	 * Set the members of a group
-	 * 
+	 *
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
@@ -295,7 +295,7 @@ class accounts_sql
 	{
 		//echo "<p align=right>accounts::set_members(".print_r($members,true).",$gid)</p>\n";
 		$GLOBALS['egw']->acl->delete_repository('phpgw_group',$gid,false);
-		
+
 		if (is_array($members))
 		{
 			foreach($members as $id)
@@ -307,11 +307,11 @@ class accounts_sql
 
 	/**
 	 * Searches users and/or groups
-	 * 
+	 *
 	 * ToDo: implement a search like accounts::search
 	 *
 	 * @param string $_type='both', 'accounts', 'groups'
-	 * @param int $start=null 
+	 * @param int $start=null
 	 * @param string $sort='' ASC or DESC
 	 * @param string $order=''
 	 * @param string $query=''
@@ -329,7 +329,7 @@ class accounts_sql
 		);
 		if (isset($order2contact[$order])) $order = $order2contact[$order];
 		if ($sort) $order .= ' '.$sort;
-		
+
 		switch($_type)
 		{
 			case 'accounts':
@@ -379,13 +379,16 @@ class accounts_sql
 			}
 		}
 		$criteria[] = "egw_addressbook.account_id is not null ";
-		$accounts = array();
+
 		if (!is_object($GLOBALS['egw']->contacts)) throw new exception('No $GLOBALS[egw]->contacts!');
-		if (($contacts =& $GLOBALS['egw']->contacts->search($criteria,false,$order,"account_lid,account_type,account_status,$this->table.account_id",
+
+		$accounts = array();
+		foreach((array) $GLOBALS['egw']->contacts->search($criteria,"1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id",
+			$order,"account_lid,account_type,account_status",
 			$wildcard,false,'OR',$offset ? array($start,$offset) : is_null($start) ? false : $start,
-			$filter,$this->contacts_join)))
+			$filter,$this->contacts_join) as $contact)
 		{
-			foreach($contacts as $contact)
+			if ($contact)
 			{
 				$accounts[] = array(
 					'account_id'        => ($contact['account_type'] == 'g' ? -1 : 1) * $contact['account_id'],
@@ -412,7 +415,7 @@ class accounts_sql
 	 * Please note:
 	 * - if a group and an user have the same account_lid the group will be returned (LDAP only)
 	 * - if multiple user have the same email address, the returned user is undefined
-	 * 
+	 *
 	 * @param string $name value to convert
 	 * @param string $which='account_lid' type of $name: account_lid (default), account_email, person_id, account_fullname
 	 * @param string $account_type u = user, g = group, default null = try both
@@ -437,7 +440,7 @@ class accounts_sql
 			case 'person_id':
 				$table = $this->contacts_table;
 				$where['contact_id'] = $name;
-				break;	
+				break;
 			default:
 				$table = $this->table;
 				$cols .= ',account_type';
@@ -449,16 +452,16 @@ class accounts_sql
 		}
 		else
 		{
-			$where[] = 'account_id IS NOT NULL';	// otherwise contacts with eg. the same email hide the accounts!	
+			$where[] = 'account_id IS NOT NULL';	// otherwise contacts with eg. the same email hide the accounts!
 		}
 		if (!($row = $this->db->select($table,$cols,$where,__LINE__,__FILE__)->fetch())) return false;
-		
+
 		return ($row['account_type'] == 'g' ? -1 : 1) * $row['account_id'];
 	}
-	
+
 	/**
 	 * Convert an numeric account_id to any other value of that account (account_lid, account_email, ...)
-	 * 
+	 *
 	 * Uses the read method to fetch all data.
 	 *
 	 * @param int $account_id numerica account_id
@@ -487,7 +490,7 @@ class accounts_sql
 		),array(
 			'account_id' => abs($account_id),
 		),__LINE__,__FILE__);
-		
+
 		return $previous_login;
 	}
 }

From 6e0d963eb7b52d4ae80d8f0ab0b6da9996d057ab Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 5 Mar 2009 15:18:40 +0000
Subject: [PATCH 070/510] handling double-mailing to participants by checking
 the mailadress list before adding

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

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index e347f747fc..1be17fa2cd 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -647,6 +647,7 @@ class calendar_uiforms extends calendar_ui
 
 		foreach($event['participants'] as $uid => $status)
 		{
+			$toadd = '';
 			if ($status == 'R' || $uid == $this->user) continue;
 
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
@@ -655,7 +656,8 @@ class calendar_uiforms extends calendar_ui
 
 				$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
 
-				$to[] = $firstname.' '.$lastname.' <'.$email.'>';
+				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
+				if (!in_array($toadd,$to)) $to[] = $toadd;
 			}
 			elseif ($uid < 0)
 			{
@@ -665,7 +667,8 @@ class calendar_uiforms extends calendar_ui
 
 					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
 
-					$to[] = $firstname.' '.$lastname.' <'.$email.'>';
+					$toadd = $firstname.' '.$lastname.' <'.$email.'>';
+					if (!in_array($toadd,$to)) $to[] = $toadd;
 				}
 			}
 			elseif(($info = $this->bo->resource_info($uid)))

From 29a622e6411c51615b0bd4e73b4e6d04a2faacd0 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 5 Mar 2009 15:52:57 +0000
Subject: [PATCH 071/510] handling mailing events: dont add groupmembers if
 they already rejected the event, or are the current user

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

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 1be17fa2cd..dbbebdc198 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -668,7 +668,8 @@ class calendar_uiforms extends calendar_ui
 					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
 
 					$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-					if (!in_array($toadd,$to)) $to[] = $toadd;
+					// dont add groupmembers if they already rejected the event, or are the current user
+					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
 				}
 			}
 			elseif(($info = $this->bo->resource_info($uid)))

From 1f8068eb52a1dd68900f3e9548bc2843959ade51 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 6 Mar 2009 12:28:39 +0000
Subject: [PATCH 072/510] dont use the titlecache if id is an array

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

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index cf95f8431a..121fdf1d0d 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -545,7 +545,7 @@ class egw_link extends solink
 		if (!$id) return '';
 
 		$title =& self::get_cache($app,$id);
-		if (isset($title))
+		if (isset($title) && !is_array($id))
 		{
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
 			return $title;
@@ -1089,4 +1089,4 @@ class egw_link extends solink
 		return !!($cache & $required);
 	}
 }
-egw_link::init_static();
\ No newline at end of file
+egw_link::init_static();

From 023f3b632682761494c24231e42705f31edeaed0 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 6 Mar 2009 14:39:34 +0000
Subject: [PATCH 073/510] handling a problem while importing mails as infolog,
 if they contain no text/plain part; this implied the move of some
 functionality from bocompose to bofelamimail

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

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index c9bce8e8bf..10b6888bbe 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -1376,7 +1376,8 @@ class infolog_ui
 			$bofelamimail->reopen($mailbox);
 
 			$headers = $bofelamimail->getMessageHeader($uid,$partid);
-			$bodyParts = $bofelamimail->getMessageBody($uid,'text/plain',$partid);
+			// dont force retrieval of the textpart, let felamimail preferences decide
+			$bodyParts = $bofelamimail->getMessageBody($uid,'',$partid);
 			$attachments = $bofelamimail->getMessageAttachments($uid,$partid);
 
 			if ($bofelamimail->isSentFolder($mailbox)) $mailaddress = $bofelamimail->decode_header($headers['TO']);
@@ -1389,6 +1390,13 @@ class infolog_ui
 			{
 				// add line breaks to $bodyParts
 				$newBody  = $GLOBALS['egw']->translation->convert($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
+				if ($bodyParts[$i]['mimeType'] == 'text/html') {
+					// convert HTML to text, as we dont want HTML in infologs
+					$newBody = $bofelamimail->convertHTMLToText($newBody);
+					$bofelamimail->getCleanHTML($newBody); // new Body passed by reference
+					$message .= $newBody;
+					continue;
+				}
 				$newBody = strip_tags($newBody);
 				$newBody  = explode("\n",$newBody);
 				// create it new, with good line breaks
@@ -1401,8 +1409,8 @@ class infolog_ui
 						// if you want to strip all empty lines uncomment the following
 						#continue;
 					}
-					$bodyAppend = $bofelamimail->wordwrap($value,75,"\n");
-					$message .= $bodyAppend;
+					$message .= $bofelamimail->wordwrap($value,75,"\n");
+					#$message .= $bodyAppend;
 				}
 			}
 
@@ -1422,7 +1430,6 @@ class infolog_ui
 					unset($attachments[$num]['attachment']);
 				}
 			}
-
 			return $this->edit($this->bo->import_mail(
 				$mailaddress,
 				$subject,

From 10e7a6ba21d8e1de14531b5f99e34cea8a7c20a0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 7 Mar 2009 11:05:59 +0000
Subject: [PATCH 074/510] "get default for query parameter of 'link-entry'
 working again and documented it (stoped working with patch fromRegis Leroy) "

---
 etemplate/inc/class.link_widget.inc.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/etemplate/inc/class.link_widget.inc.php b/etemplate/inc/class.link_widget.inc.php
index a1af4459e9..02e69e0979 100644
--- a/etemplate/inc/class.link_widget.inc.php
+++ b/etemplate/inc/class.link_widget.inc.php
@@ -43,7 +43,9 @@
  *   'link_label'   => // I  string label for the link button, default 'Link'
  *  // optional only for the link-add widget and link-entry widget
  *   'extra'        => // I  array with extra parameters, eg. array('cat_id' => 15), or string to add in onclick search for link-entry
- *   			//eg. ",values2url(this.form,'start,end,duration,participants,recur_type,whole_day')"
+ *   			       //eg. ",values2url(this.form,'start,end,duration,participants,recur_type,whole_day')"
+ *   'query'        => // I  preset for the query
+ *   'current'      => // I  currently select id
  *  // optional for link-string:
  *   'only_app'     => // I  string with appname, eg. 'projectmananager' to list only linked projects
  * );
@@ -384,14 +386,11 @@ class link_widget
 			$extension_data['default'] = $value;
 
 			// adding possibility to get a default selection on app select, use for resource in calendar edit.participant
-			if (isset($value) && is_array($value) && isset($value['default_sel']))
-			{
-				$selected=$value['default_sel'];
-			}
 			$value = array(
-				'app'        => isset($selected)? $selected : $app,
+				'app'        => is_array($value) && isset($value['default_sel']) ? $value['default_sel'] : $app,
 				'no_app_sel' => !!$extension_data['app'],
-				'id'         => $value,
+				'id'         => is_array($value) ? $value['current'] : $value,
+				'query'      => is_array($value) ? $value['query'] : '',
 			);
 			if ($options)	// limit the app-selectbox to the given apps
 			{

From e4f6c3c488a49d1f3c7512c4dfa182bd42eeb082 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 9 Mar 2009 10:43:25 +0000
Subject: [PATCH 075/510] conditional replace of all CarriageReturnLinefeeds,
 since, if it is done always, a sendmail looses its linebreaks

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

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 10b6888bbe..e8444bd6df 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -1392,7 +1392,7 @@ class infolog_ui
 				$newBody  = $GLOBALS['egw']->translation->convert($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				if ($bodyParts[$i]['mimeType'] == 'text/html') {
 					// convert HTML to text, as we dont want HTML in infologs
-					$newBody = $bofelamimail->convertHTMLToText($newBody);
+					$newBody = $bofelamimail->convertHTMLToText($newBody,true);
 					$bofelamimail->getCleanHTML($newBody); // new Body passed by reference
 					$message .= $newBody;
 					continue;

From f61ffc2e5e4dc51bd81c26a2cce42302e7aa2409 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 11 Mar 2009 12:14:15 +0000
Subject: [PATCH 076/510] allow to pass $extra_cols parameter from get_rows to
 search

---
 etemplate/inc/class.so_sql.inc.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index c3077b374d..1ced670ae6 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -624,7 +624,7 @@ class so_sql
 			$query[$db_col] = $data[$col];
 		}
 		if ($only_return_query) return $query;
-		
+
 		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
 
 		return $this->db->affected_rows();
@@ -940,9 +940,10 @@ class so_sql
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
 	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
 	 * @param mixed $only_keys=false, see search
+	 * @param string|array $extra_cols
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false)
+	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
 	{
 		if ((int) $this->debug >= 4)
 		{
@@ -956,8 +957,8 @@ class so_sql
 				$criteria[$col] = $query['search'];
 			}
 		}
-		$rows = $this->search($criteria,$only_keys,$query['order']?$query['order'].' '.$query['sort']:'',
-			'','%',false,'OR',$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
+		$rows = $this->search($criteria,$only_keys,$query['order']?$query['order'].' '.$query['sort']:'',$extra_cols,
+			'%',false,'OR',$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
 			$query['col_filter'],$join,$need_full_no_count);
 
 		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)

From 9ba0957ba53a3d205b2b69a1c079ed7633ab19ac Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 12 Mar 2009 09:06:10 +0000
Subject: [PATCH 077/510] improving speed for the retrieval ov the
 distributionlists

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

diff --git a/addressbook/inc/class.addressbook_so.inc.php b/addressbook/inc/class.addressbook_so.inc.php
index f6a092ebe7..14514fdec1 100755
--- a/addressbook/inc/class.addressbook_so.inc.php
+++ b/addressbook/inc/class.addressbook_so.inc.php
@@ -361,6 +361,7 @@ class addressbook_so
 		$fields = array();
 		$filter[$this->distri_id]=$ids;
 		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
+		$this->distributionlist_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
 		foreach($this->db->select($this->distributionlist_view,'*',$filter,__LINE__,__FILE__) as $row)
 		{
 			if ((isset($row[$this->distri_id])&&strlen($row[$this->distri_value])>0))

From df134f358872ce18869737724ba1e37f4efee223 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 12 Mar 2009 11:41:58 +0000
Subject: [PATCH 078/510] "removed prefered phone marker \"&#9829;\" from url,
 causing 9829 to be appended to the phone-number otherwise"

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

diff --git a/etemplate/inc/class.url_widget.inc.php b/etemplate/inc/class.url_widget.inc.php
index 16bdb7d5dd..02854bf693 100644
--- a/etemplate/inc/class.url_widget.inc.php
+++ b/etemplate/inc/class.url_widget.inc.php
@@ -231,7 +231,7 @@ class url_widget
 			$user = $GLOBALS['egw']->contacts->read('account:'.$GLOBALS['egw_info']['user']['account_id']);
 			$userphone = is_array($user) ? ($user['tel_work'] ? $user['tel_work'] : $user['tel_home']) : false;
 		}
-		$number = preg_replace('/[^0-9+]+/','',$number);	// remove number formatting chars messing up the links
+		$number = preg_replace('/[^0-9+]+/','',str_replace('&#9829;','',$number));	// remove number formatting chars messing up the links
 
 		return str_replace(array('%1','%u','%t'),array(urlencode($number),$GLOBALS['egw_info']['user']['account_lid'],$userphone),
 			$GLOBALS['egw_info']['server']['call_link']);

From efb3189b497d254827f11e5d0e13e00111f726a5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 13 Mar 2009 12:47:53 +0000
Subject: [PATCH 079/510] "fixed CreateObject to not suppress the error, if it
 cant find a class file or there are eg. syntax errors in it --> now you can
 find the error in the error_log and dont get only a blank page (also
 optimized it so far, that we first try to autoload the class and use the
 diverse \"magic\" only if that fails)"

---
 phpgwapi/inc/common_functions.inc.php | 87 ++++++++++++++-------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 33b732be36..06e36f981c 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -675,56 +675,57 @@ function &CreateObject($class)
 {
 	list($appname,$classname) = explode('.',$class);
 
-	if (!@include_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
+	if (!class_exists($classname))
 	{
-		static $replace = array(
-			'datetime'    => 'egw_datetime',
-			'uitimesheet' => 'timesheet_ui',
-			'uiinfolog'   => 'infolog_ui',
-			'uiprojectmanager'  => 'projectmanager_ui',
-			'uiprojectelements' => 'projectmanager_elements_ui',
-			'uiroles'           => 'projectmanager_roles_ui',
-			'uimilestones'      => 'projectmanager_milestones_ui',
-			'uipricelist'       => 'projectmanager_pricelist_ui',
-		);
-		if (isset($replace[$classname]))
+		if (!file_exists(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
 		{
-			//throw new Exception(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
-			error_log(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
-			$classname = $replace[$classname];
-			include_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
+			static $replace = array(
+				'datetime'    => 'egw_datetime',
+				'uitimesheet' => 'timesheet_ui',
+				'uiinfolog'   => 'infolog_ui',
+				'uiprojectmanager'  => 'projectmanager_ui',
+				'uiprojectelements' => 'projectmanager_elements_ui',
+				'uiroles'           => 'projectmanager_roles_ui',
+				'uimilestones'      => 'projectmanager_milestones_ui',
+				'uipricelist'       => 'projectmanager_pricelist_ui',
+			);
+			if (isset($replace[$classname]))
+			{
+				//throw new Exception(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
+				error_log(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
+				$classname = $replace[$classname];
+			}
 		}
+		// this will stop php with a 500, if the class does not exist or there are errors in it (syntax error go into the error_log)
+		require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
 	}
-	if (class_exists($classname))
+	$args = func_get_args();
+	switch(count($args))
 	{
-		$args = func_get_args();
-		switch(count($args))
-		{
-			case 1:
-				$obj =& new $classname;
-				break;
-			case 2:
-				$obj =& new $classname($args[1]);
-				break;
-			case 3:
-				$obj =& new $classname($args[1],$args[2]);
-				break;
-			case 4:
-				$obj =& new $classname($args[1],$args[2],$args[3]);
-				break;
-			default:
-				$code = '$obj =& new ' . $classname . '(';
-				foreach($args as $n => $arg)
+		case 1:
+			$obj =& new $classname;
+			break;
+		case 2:
+			$obj =& new $classname($args[1]);
+			break;
+		case 3:
+			$obj =& new $classname($args[1],$args[2]);
+			break;
+		case 4:
+			$obj =& new $classname($args[1],$args[2],$args[3]);
+			break;
+		default:
+			$code = '$obj =& new ' . $classname . '(';
+			foreach($args as $n => $arg)
+			{
+				if ($n)
 				{
-					if ($n)
-					{
-						$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
-					}
+					$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
 				}
-				$code .= ');';
-				eval($code);
-				break;
-		}
+			}
+			$code .= ');';
+			eval($code);
+			break;
 	}
 	if (!is_object($obj))
 	{

From 01e2e1fa72582ec034ff60828f77674b8345f8b4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 13 Mar 2009 12:55:40 +0000
Subject: [PATCH 080/510] "removed extension of the accounts class, which is
 not used since r24948"

---
 phpgwapi/inc/class.uiaccountsel.inc.php | 34 ++++++++++---------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/phpgwapi/inc/class.uiaccountsel.inc.php b/phpgwapi/inc/class.uiaccountsel.inc.php
index ea853ab177..f10571dc60 100644
--- a/phpgwapi/inc/class.uiaccountsel.inc.php
+++ b/phpgwapi/inc/class.uiaccountsel.inc.php
@@ -1,13 +1,13 @@
 <?php
 /**
  * API - accounts selection
- * 
+ *
  * @link http://www.egroupware.org
- * @author Ralf Becker <RalfBecker-AT-outdoor-training.de> 
- * 
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ *
  * The original version of the acount-selection popup was written and
  * (c) 2003 by Bettina Gille [ceb@phpgroupware.org]
- * 
+ *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package api
  * @subpackage html
@@ -15,18 +15,10 @@
  * @version $Id$
  */
 
-include_once(EGW_API_INC . '/class.accounts.inc.php');
-
 /**
  * User Interface for account and/or group selection
- *
- * @author Ralf Becker <RalfBecker-AT-outdoor-training.de> 
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package api
- * @subpackage html
- * @access public
  */
-class uiaccountsel extends accounts
+class uiaccountsel
 {
 	var $public_functions = array(
 		'popup' => True,
@@ -49,13 +41,13 @@ class uiaccountsel extends accounts
 	 *
 	 * @return uiaccountsel
 	 */
-	function uiaccountsel()
+	function __construct()
 	{
 		$this->accounts = $GLOBALS['egw']->accounts;
 
 		$this->account_selection = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
 		// admin group should NOT get limited by none or groupmembers, we use primary_group instead
-		if (isset($GLOBALS['egw_info']['user']['apps']['admin']) && 
+		if (isset($GLOBALS['egw_info']['user']['apps']['admin']) &&
 			($this->account_selection == 'none' || $this->account_selection == 'groupmembers'))
 		{
 			$this->account_selection = 'primary_group';
@@ -77,7 +69,7 @@ class uiaccountsel extends accounts
 	 * @param array/int $selected user-id or array of user-id's which are already selected
 	 * @param string $use 'accounts', 'groups', 'owngroups', 'both' or app-name for all accounts with run-rights.
 	 *	If an '+' is appended to the app-name, one can also select groups with run-rights for that app.
-	 * @param int $lines > 1 number of lines for multiselection, 0 for a single selection, 
+	 * @param int $lines > 1 number of lines for multiselection, 0 for a single selection,
 	 * 	< 0 or 1(=-4) single selection which can be switched to a multiselection by js abs($lines) is size
 	 *	(in that case accounts should be an int or contain only 1 user-id)
 	 * @param int/array $not user-id or array of user-id's not to display in selection, default False = display all
@@ -164,7 +156,7 @@ class uiaccountsel extends accounts
 				{
 					foreach($this->accounts->members($gid,true) as $member)
 					{
-						if (!in_array($member,$select)) $select[] = $member;			
+						if (!in_array($member,$select)) $select[] = $member;
 					}
 				}
 				if ($use == 'both')	// show all memberships
@@ -264,13 +256,13 @@ class uiaccountsel extends accounts
 			$select2 += $select;
 			$select =& $select2; unset($select2);
 		}
-		
+
 		if ($nohtml)
 		{
 			return array(
 				'selected' => $selected,
 				'participants' => $select
-			);	
+			);
 		}
 		//echo "<p>html::select('$name',".print_r($selected,True).",".print_r($select,True).",True,'$options')</p>\n";
 		$html = html::select($name,$selected,$select,True,$options.' id="'.$element_id.'"',$lines > 1 ? $lines : 0);
@@ -540,7 +532,7 @@ function addOption(id,label,value,do_onchange)
 			'lang_close' => lang('close'),
 			'close_action' => 'window.close();',
 		));
-		
+
 		if ($multiple >= 1)
 		{
 			$GLOBALS['egw']->template->set_var(array(
@@ -549,7 +541,7 @@ function addOption(id,label,value,do_onchange)
 				'close_action' => "oneLineSubmit('$element_id');",
 			));
 		}
-			
+
 
 		if ($multiple)
 		{

From b8f6481688614168a6ed5a44b794b3d88415285b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 15 Mar 2009 15:08:21 +0000
Subject: [PATCH 081/510] not longer used

---
 etemplate/inc/class.xslt_widget.inc.php | 103 ------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 etemplate/inc/class.xslt_widget.inc.php

diff --git a/etemplate/inc/class.xslt_widget.inc.php b/etemplate/inc/class.xslt_widget.inc.php
deleted file mode 100644
index 3006ab5f23..0000000000
--- a/etemplate/inc/class.xslt_widget.inc.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-	/**
-	 * eGroupWare - eTemplate Extension - XSLT Widget
-	 * Originaly from the phpGW XSLT API
-	 *
-	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	 * @package etemplate
-	 * @link http://www.egroupware.org
-	 * @author Ralf Becker <RalfBecker@outdoor-training.de>
-	 * @version $Id$
-	 */
-
-	/**
-	 * @author ralfbecker
-	 * widget that generates its html-output via a xslt file with its in $options and the content as xml
-	 *
-	 * The following data is placed in the xml: value,name,label(translated),statustext(translated),readonly
-	 * and all widget-attributes as descript in the referenz, using there xml-names.
-	 * This widget is generating html, so it does not work (without an extra implementation) in an other UI
-	 */
-	class xslt_widget
-	{
-		var $public_functions = array(
-			'pre_process' => True,
-			'render' => True,
-			'post_process' => True
-		);
-		var $human_name = 'XSLT Template';	// this is the name for the editor
-
-		function xslt_widget($ui='')
-		{
-			$this->xslttemplates =& CreateObject('phpgwapi.xslttemplates',EGW_INCLUDE_ROOT);
-
-			switch($ui)
-			{
-				case '':
-				case 'html':
-					$this->ui = 'html';
-					break;
-				default:
-					echo "UI='$ui' not implemented";
-			}
-			return 0;
-		}
-
-		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
-		{
-			return False;	// no extra label
-		}
-
-		function render(&$cell,$form_name,&$value,$readonly,&$extension_data,&$tmpl)
-		{
-			//echo "<p>xslt_widget::render: name='$cell[name]', name='$form_name', value='$value'</p>";
-			$func = 'render_'.$this->ui;
-
-			if (!method_exists($this,$func))
-				return False;
-
-			return $this->$func($cell,$form_name,$value,$readonly,$tmpl);
-		}
-
-		function render_html($cell,$form_name,$value,$readonly,&$tmpl)
-		{
-			list($app,$file) = split('\\.',$cell['size'],2);
-			$pref_templ = $GLOBALS['egw_info']['server']['template_set'];
-			$path = "$app/templates/$pref_templ/$file";
-			if (!file_exists(EGW_SERVER_ROOT.'/'.$path.'.xsl'))
-			{
-				$path = "$app/templates/default/$file";
-			}
-			$this->xslttemplates->add_file($path);
-
-			$this->xslttemplates->set_var('value',$value);
-			$this->xslttemplates->set_var('name',$form_name);
-			$this->xslttemplates->set_var('readonly',$readonly);
-			$this->xslttemplates->set_var('label',$cell['no_lang'] ? $cell['label'] : lang($cell['label']));
-			$this->xslttemplates->set_var('statustext',lang($cell['help']));
-			list($span,$class) = explode(',',$cell['span']);
-			list($src,$options) = explode(',',$cell['size']);
-			$this->xslttemplates->set_var('attr',array(
-				'id'       => $cell['name'],
-				'label'    => $cell['label'],
-				'statustext' => $cell['help'],
-				'no_lang'  => $cell['no_lang'],
-				'needed'   => $cell['needed'],
-				'readonly' => $cell['readonly'],
-				'onchange' => $cell['onchange'],
-				'span'     => $span,
-				'class'    => $class,
-				'src'      => $src,
-				'options'  => $options,
-				'align'  => $cell['align']
-			));
-			return $this->xslttemplates->parse();
-		}
-
-		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
-		{
-			//echo "<p>xslt_widget.post_process: $name = "; _debug_array($value_in);
-
-			$value = $value_in;
-		}
-	}

From 97126e417f3db1c21b240e683384c9a473cac5fc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Mar 2009 12:49:31 +0000
Subject: [PATCH 082/510] Make all methods of common class static, to allow an
 easiert use. eg: $owner_label = common::grab_owner_name($uid);

---
 phpgwapi/inc/class.common.inc.php | 3104 ++++++++++++++---------------
 1 file changed, 1457 insertions(+), 1647 deletions(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index fa6fc06c76..122150857d 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1,1807 +1,1617 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare API - Commononly used functions                               *
-	* This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
-	* and Joseph Engo <jengo@phpgroupware.org>                                 *
-	* and Mark Peters <skeeter@phpgroupware.org>                               *
-	* and Lars Kneschke <lkneschke@linux-at-work.de>                           *
-	* Functions commonly used by eGroupWare developers                         *
-	* Copyright (C) 2000, 2001 Dan Kuykendall                                  *
-	* Copyright (C) 2003 Lars Kneschke                                         *
-	* -------------------------------------------------------------------------*
-	* This library is part of the eGroupWare API                               *
-	* http://www.egroupware.org                                                *
-	* ------------------------------------------------------------------------ *
-	* This library is free software; you can redistribute it and/or modify it  *
-	* under the terms of the GNU Lesser General Public License as published by *
-	* the Free Software Foundation; either version 2.1 of the License,         *
-	* or any later version.                                                    *
-	* This library is distributed in the hope that it will be useful, but      *
-	* WITHOUT ANY WARRANTY; without even the implied warranty of               *
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
-	* See the GNU Lesser General Public License for more details.              *
-	* You should have received a copy of the GNU Lesser General Public License *
-	* along with this library; if not, write to the Free Software Foundation,  *
-	* Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
-	\**************************************************************************/
+/**
+ * eGroupWare API: Commononly used (static) functions
+ *
+ * This file written by Dan Kuykendall <seek3r@phpgroupware.org>
+ * and Joseph Engo <jengo@phpgroupware.org>
+ * and Mark Peters <skeeter@phpgroupware.org>
+ * and Lars Kneschke <lkneschke@linux-at-work.de>
+ * Functions commonly used by eGroupWare developers
+ * Copyright (C) 2000, 2001 Dan Kuykendall
+ * Copyright (C) 2003 Lars Kneschke
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @version $Id$
+ */
 
-	/* $Id$ */
-
-	$d1 = strtolower(@substr(EGW_API_INC,0,3));
-	$d2 = strtolower(@substr(EGW_SERVER_ROOT,0,3));
-	$d3 = strtolower(@substr(EGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3 == 'htt' || $d3 == 'ftp')
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		exit;
-	}
-	unset($d1);unset($d2);unset($d3);
+/**
+ * common class containing commonly used static functions
+ */
+class common
+{
+	static $debug_info; // An array with debugging info from the API
+	static $found_files;
 
 	/**
-	 * common class that contains commonly used functions
+	 * Compares two Version strings and return 1 if str2 is newest (bigger version number) than str1
 	 *
+	 * This function checks for major version only.
+	 * @param $str1
+	 * @param $str2
 	 */
-	class common
+	static function cmp_version($str1,$str2,$debug=False)
 	{
-		var $debug_info; // An array with debugging info from the API
-		var $found_files;
+		ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)",$str1,$regs);
+		ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)",$str2,$regs2);
+		if($debug) { echo "<br>$regs[0] - $regs2[0]"; }
 
-		/**
-		 * Compares two Version strings and return 1 if str2 is newest (bigger version number) than str1
-		 *
-		 * This function checks for major version only.
-		 * @param $str1
-		 * @param $str2
-		 */
-		static function cmp_version($str1,$str2,$debug=False)
+		for($i=1;$i<5;$i++)
 		{
-			ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)",$str1,$regs);
-			ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)",$str2,$regs2);
-			if($debug) { echo "<br>$regs[0] - $regs2[0]"; }
-
-			for($i=1;$i<5;$i++)
+			if($debug) { echo "<br>$i: $regs[$i] - $regs2[$i]"; }
+			if($regs2[$i] == $regs[$i])
 			{
-				if($debug) { echo "<br>$i: $regs[$i] - $regs2[$i]"; }
-				if($regs2[$i] == $regs[$i])
+				continue;
+			}
+			if($regs2[$i] > $regs[$i])
+			{
+				return 1;
+			}
+			elseif($regs2[$i] < $regs[$i])
+			{
+				return 0;
+			}
+		}
+	}
+
+	/**
+	 * Compares two Version strings and return 1 if str2 is newest (bigger version number) than str1
+	 *
+	 * This function checks all fields. cmp_version() checks release version only.
+	 * @param $str1
+	 * @param $str2
+	 */
+	static function cmp_version_long($str1,$str2,$debug=False)
+	{
+		ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)\.([0-9]*)",$str1,$regs);
+		ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)\.([0-9]*)",$str2,$regs2);
+		if($debug) { echo "<br>$regs[0] - $regs2[0]"; }
+
+		for($i=1;$i<6;$i++)
+		{
+			if($debug) { echo "<br>$i: $regs[$i] - $regs2[$i]"; }
+
+			if($regs2[$i] == $regs[$i])
+			{
+				if($debug) { echo ' are equal...'; }
+				continue;
+			}
+			if($regs2[$i] > $regs[$i])
+			{
+				if($debug) { echo ', and a > b'; }
+				return 1;
+			}
+			elseif($regs2[$i] < $regs[$i])
+			{
+				if($debug) { echo ', and a < b'; }
+				return 0;
+			}
+		}
+		if($debug) { echo ' - all equal.'; }
+	}
+
+	/**
+	* generate a unique id, which can be used for syncronisation
+	*
+	* @param string $_appName the appname
+	* @param string $_eventID the id of the content
+	* @return string the unique id
+	*/
+	static function generate_uid($_appName, $_eventID)
+	{
+		if(empty($_appName) || empty($_eventID)) return false;
+
+		$suffix = $GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : 'local';
+		$prefix = $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
+
+		return $prefix;
+	}
+
+	/**
+	* get the local content id from a global UID
+	*
+	* @param sting $_globalUid the global UID
+	* @return int local egw content id
+	*/
+	static function get_egwId($_globalUid)
+	{
+		if(empty($_globalUid)) return false;
+
+		$globalUidParts = explode('-',$_globalUid);
+		array_shift($globalUidParts);	// remove the app name
+		array_pop($globalUidParts);		// remove the install_id
+
+		return implode('-',$globalUidParts);	// return the rest, allowing to have dashs in the id, can happen with LDAP!
+	}
+
+	/**
+	 * return an array of installed languages
+	 *
+	 * @return $installedLanguages; an array containing the installed languages
+	 */
+	static function getInstalledLanguages()
+	{
+		$GLOBALS['egw']->db->query('SELECT DISTINCT lang FROM egw_lang');
+		while (@$GLOBALS['egw']->db->next_record())
+		{
+			$installedLanguages[$GLOBALS['egw']->db->f('lang')] = $GLOBALS['egw']->db->f('lang');
+		}
+
+		return $installedLanguages;
+	}
+
+	/**
+	 * get preferred language of the users
+	 *
+	 * Uses HTTP_ACCEPT_LANGUAGE (from the browser) and getInstalledLanguages to find out which languages are installed
+	 *
+	 * @return string
+	 */
+	static function getPreferredLanguage()
+	{
+		// create a array of languages the user is accepting
+		$userLanguages = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+		$supportedLanguages = self::getInstalledLanguages();
+
+		// find usersupported language
+		foreach($userLanguages as $key => $value)
+		{
+			// remove everything behind '-' example: de-de
+			$value = trim($value);
+			$pieces = explode('-', $value);
+			$value = $pieces[0];
+			# print 'current lang $value<br>';
+			if ($supportedLanguages[$value])
+			{
+				$retValue=$value;
+				break;
+			}
+		}
+
+		// no usersupported language found -> return english
+		if (empty($retValue))
+		{
+			$retValue='en';
+		}
+
+		return $retValue;
+	}
+
+	/**
+	 * escapes a string for use in searchfilters meant for ldap_search.
+	 *
+	 * Escaped Characters are: '*', '(', ')', ' ', '\', NUL
+	 * It's actually a PHP-Bug, that we have to escape space.
+	 * For all other Characters, refer to RFC2254.
+	 *
+	 * @deprecated use ldap::quote()
+	 * @param $string either a string to be escaped, or an array of values to be escaped
+	 * @return string
+	 */
+	static function ldap_addslashes($string='')
+	{
+		return ldap::quote($string);
+	}
+
+	/**
+	 * connect to the ldap server and return a handle
+	 *
+	 * @deprecated use ldap::ldapConnect()
+	 * @param $host ldap host
+	 * @param $dn ldap_root_dn
+	 * @param $passwd ldap_root_pw
+	 * @return resource
+	 */
+	static function ldapConnect($host='', $dn='', $passwd='')
+	{
+		// use Lars new ldap class
+		return $GLOBALS['egw']->ldap->ldapConnect($host,$dn,$passwd);
+	}
+
+	/**
+	 * function to stop running an app
+	 *
+	 * used to stop running an app in the middle of execution <br>
+	 * There may need to be some cleanup before hand
+	 * @param $call_footer boolean value to if true then call footer else exit
+	 */
+	static function egw_exit($call_footer = False)
+	{
+		if (!defined('EGW_EXIT'))
+		{
+			define('EGW_EXIT',True);
+
+			if ($call_footer)
+			{
+				self::egw_footer();
+			}
+		}
+		exit;
+	}
+
+	/**
+	 * return a random string of size $size
+	 *
+	 * @param $size int-size of random string to return
+	 */
+	static function randomstring($size)
+	{
+		$s = '';
+		srand((double)microtime()*1000000);
+		$random_char = array(
+			'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
+			'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
+			'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
+			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+		);
+
+		for ($i=0; $i<$size; $i++)
+		{
+			$s .= $random_char[rand(1,61)];
+		}
+		return $s;
+	}
+
+	// Look at the note towards the top of this file (jengo)
+	static function filesystem_separator()
+	{
+		return filesystem_separator();
+	}
+
+	/**
+	 * This is used for reporting errors in a nice format.
+	 *
+	 * @param $error - array of errors
+	 */
+	static function error_list($errors,$text='Error')
+	{
+		if (!is_array($errors))
+		{
+			return False;
+		}
+
+		$html_error = '<table border="0" width="100%"><tr><td align="right"><b>' . lang($text)
+			. '</b>: </td><td align="left">' . $errors[0] . '</td></tr>';
+		for ($i=1; $i<count($errors); $i++)
+		{
+			$html_error .= '<tr><td>&nbsp;</td><td align="left">' . $errors[$i] . '</td></tr>';
+		}
+		return $html_error . '</table>';
+	}
+
+	/**
+	 * @deprecated use ACL instead
+	 */
+	function check_owner($record,$link,$label,$extravars = '')
+	{
+		self::$debug_info[] = 'check_owner() is a depreciated function - use ACL instead';
+	}
+
+	/**
+	 * return the fullname of a user
+	 *
+	 * @param $lid='' account loginid
+	 * @param $firstname='' firstname
+	 * @param $lastname='' lastname
+	 * @param $accountid=0 id, to check if it's a user or group, otherwise the lid will be used
+	 */
+	static function display_fullname($lid = '', $firstname = '', $lastname = '',$accountid=0)
+	{
+		if (! $lid && ! $firstname && ! $lastname)
+		{
+			$lid       = $GLOBALS['egw_info']['user']['account_lid'];
+			$firstname = $GLOBALS['egw_info']['user']['firstname'];
+			$lastname  = $GLOBALS['egw_info']['user']['lastname'];
+		}
+		$is_group = $GLOBALS['egw']->accounts->get_type($accountid ? $accountid : $lid) == 'g';
+
+		if (empty($firstname)) $firstname = $lid;
+		if (empty($lastname) || $is_group)
+		{
+			$lastname  = $is_group ? lang('Group') : lang('User');
+		}
+		$display = $GLOBALS['egw_info']['user']['preferences']['common']['account_display'];
+
+		if ($firstname && $lastname)
+		{
+			$delimiter = ', ';
+		}
+		else
+		{
+			$delimiter = '';
+		}
+
+		$name = '';
+		switch($display)
+		{
+			case 'firstname':
+				$name = $firstname . ' ' . $lastname;
+				break;
+			case 'lastname':
+				$name = $lastname . $delimiter . $firstname;
+				break;
+			case 'username':
+				$name = $lid;
+				break;
+			case 'firstall':
+				$name = $firstname . ' ' . $lastname . ' ['.$lid.']';
+				break;
+			case 'lastall':
+				$name = $lastname . $delimiter . $firstname . ' ['.$lid.']';
+				break;
+			case 'all':
+				/* fall through */
+			default:
+				$name = '['.$lid.'] ' . $firstname . ' ' . $lastname;
+		}
+		return $name;
+	}
+
+	/**
+	 * grab the owner name
+	 *
+	 * @param $id account id
+	 */
+	static function grab_owner_name($accountid = '')
+	{
+		$GLOBALS['egw']->accounts->get_account_name($accountid,$lid,$fname,$lname);
+
+		return self::display_fullname($lid,$fname,$lname,$accountid);
+	}
+
+	/**
+	 * create tabs
+	 *
+	 * @param array $tabs an array repersenting the tabs you wish to display, each element
+	 * 		 * 		 * 	 in the array is an array of 3 elements, 'label' which is the
+	 * 		 * 		 * 	 text displaed on the tab (you should pass translated string,
+	 * 		 * 		 * 	 create_tabs will not do <code>lang()</code> for you), 'link'
+	 * 		 * 		 * 	 which is the uri, 'target', the frame name or '_blank' to show
+	 * 		 * 		 * 	 page in a new browser window.
+	 * @param mixed $selected the tab whos key is $selected will be displayed as current tab
+	 * @param $fontsize optional
+	 * @return string return html that displays the tabs
+	 */
+	static function create_tabs($tabs, $selected, $fontsize = '')
+	{
+		$output_text = '<table border="0" cellspacing="0" cellpadding="0"><tr>';
+
+		/* This is a php3 workaround */
+		if(EGW_IMAGES_DIR == 'EGW_IMAGES_DIR')
+		{
+			$ir = ExecMethod('phpgwapi.phpgw.common.get_image_path', 'phpgwapi');
+		}
+		else
+		{
+			$ir = EGW_IMAGES_DIR;
+		}
+
+		if ($fontsize)
+		{
+			$fs  = '<font size="' . $fontsize . '">';
+			$fse = '</font>';
+		}
+
+		$i = 1;
+		while ($tab = each($tabs))
+		{
+			if ($tab[0] == $selected)
+			{
+				if ($i == 1)
 				{
-					continue;
+					$output_text .= '<td align="right"><img src="' . $ir . '/tabs-start1.gif"></td>';
 				}
-				if($regs2[$i] > $regs[$i])
+
+				$output_text .= '<td align="left" background="' . $ir . '/tabs-bg1.gif">&nbsp;<b><a href="'
+					. $tab[1]['link'] . '" class="tablink" '.$tab[1]['target'].'>' . $fs . $tab[1]['label']
+					. $fse . '</a></b>&nbsp;</td>';
+				if ($i == count($tabs))
 				{
-					return 1;
+					$output_text .= '<td align="left"><img src="' . $ir . '/tabs-end1.gif"></td>';
 				}
-				elseif($regs2[$i] < $regs[$i])
+				else
 				{
-					return 0;
+					$output_text .= '<td align="left"><img src="' . $ir . '/tabs-sepr.gif"></td>';
 				}
 			}
-		}
-
-		/**
-		 * Compares two Version strings and return 1 if str2 is newest (bigger version number) than str1
-		 *
-		 * This function checks all fields. cmp_version() checks release version only.
-		 * @param $str1
-		 * @param $str2
-		 */
-		static function cmp_version_long($str1,$str2,$debug=False)
-		{
-			ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)\.([0-9]*)",$str1,$regs);
-			ereg("([0-9]+)\.([0-9]+)\.([0-9]+)[a-zA-Z]*([0-9]*)\.([0-9]*)",$str2,$regs2);
-			if($debug) { echo "<br>$regs[0] - $regs2[0]"; }
-
-			for($i=1;$i<6;$i++)
-			{
-				if($debug) { echo "<br>$i: $regs[$i] - $regs2[$i]"; }
-
-				if($regs2[$i] == $regs[$i])
-				{
-					if($debug) { echo ' are equal...'; }
-					continue;
-				}
-				if($regs2[$i] > $regs[$i])
-				{
-					if($debug) { echo ', and a > b'; }
-					return 1;
-				}
-				elseif($regs2[$i] < $regs[$i])
-				{
-					if($debug) { echo ', and a < b'; }
-					return 0;
-				}
-			}
-			if($debug) { echo ' - all equal.'; }
-		}
-
-		/**
-		* generate a unique id, which can be used for syncronisation
-		*
-		* @param string $_appName the appname
-		* @param string $_eventID the id of the content
-		* @return string the unique id
-		*/
-		static function generate_uid($_appName, $_eventID)
-		{
-			if(empty($_appName) || empty($_eventID)) return false;
-
-			$suffix = $GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : 'local';
-			$prefix = $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
-
-			return $prefix;
-		}
-
-		/**
-		* get the local content id from a global UID
-		*
-		* @param sting $_globalUid the global UID
-		* @return int local egw content id
-		*/
-		static function get_egwId($_globalUid)
-		{
-			if(empty($_globalUid)) return false;
-
-			$globalUidParts = explode('-',$_globalUid);
-			array_shift($globalUidParts);	// remove the app name
-			array_pop($globalUidParts);		// remove the install_id
-
-			return implode('-',$globalUidParts);	// return the rest, allowing to have dashs in the id, can happen with LDAP!
-		}
-
-		/**
-		 * return an array of installed languages
-		 *
-		 * @return $installedLanguages; an array containing the installed languages
-		 */
-		static function getInstalledLanguages()
-		{
-			$GLOBALS['egw']->db->query('SELECT DISTINCT lang FROM egw_lang');
-			while (@$GLOBALS['egw']->db->next_record())
-			{
-				$installedLanguages[$GLOBALS['egw']->db->f('lang')] = $GLOBALS['egw']->db->f('lang');
-			}
-
-			return $installedLanguages;
-		}
-
-		/**
-		 * get preferred language of the users
-		 *
-		 * Uses HTTP_ACCEPT_LANGUAGE (from the browser) and getInstalledLanguages to find out which languages are installed
-		 *
-		 * @return string
-		 */
-		static function getPreferredLanguage()
-		{
-			// create a array of languages the user is accepting
-			$userLanguages = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
-			$supportedLanguages = self::getInstalledLanguages();
-
-			// find usersupported language
-			foreach($userLanguages as $key => $value)
-			{
-				// remove everything behind '-' example: de-de
-				$value = trim($value);
-				$pieces = explode('-', $value);
-				$value = $pieces[0];
-				# print 'current lang $value<br>';
-				if ($supportedLanguages[$value])
-				{
-					$retValue=$value;
-					break;
-				}
-			}
-
-			// no usersupported language found -> return english
-			if (empty($retValue))
-			{
-				$retValue='en';
-			}
-
-			return $retValue;
-		}
-
-		/**
-		 * escapes a string for use in searchfilters meant for ldap_search.
-		 *
-		 * Escaped Characters are: '*', '(', ')', ' ', '\', NUL
-		 * It's actually a PHP-Bug, that we have to escape space.
-		 * For all other Characters, refer to RFC2254.
-		 *
-		 * @deprecated use ldap::quote()
-		 * @param $string either a string to be escaped, or an array of values to be escaped
-		 * @return string
-		 */
-		static function ldap_addslashes($string='')
-		{
-			return ldap::quote($string);
-		}
-
-		/**
-		 * connect to the ldap server and return a handle
-		 *
-		 * @deprecated use ldap::ldapConnect()
-		 * @param $host ldap host
-		 * @param $dn ldap_root_dn
-		 * @param $passwd ldap_root_pw
-		 * @return resource
-		 */
-		static function ldapConnect($host='', $dn='', $passwd='')
-		{
-			// use Lars new ldap class
-			return $GLOBALS['egw']->ldap->ldapConnect($host,$dn,$passwd);
-		}
-
-		/**
-		 * function to stop running an app
-		 *
-		 * used to stop running an app in the middle of execution <br>
-		 * There may need to be some cleanup before hand
-		 * @param $call_footer boolean value to if true then call footer else exit
-		 */
-		function egw_exit($call_footer = False)
-		{
-			if (!defined('EGW_EXIT'))
-			{
-				define('EGW_EXIT',True);
-
-				if ($call_footer)
-				{
-					$this->egw_footer();
-				}
-			}
-			exit;
-		}
-
-		/**
-		 * return a random string of size $size
-		 *
-		 * @param $size int-size of random string to return
-		 */
-		static function randomstring($size)
-		{
-			$s = '';
-			srand((double)microtime()*1000000);
-			$random_char = array(
-				'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-				'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-				'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-				'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
-			);
-
-			for ($i=0; $i<$size; $i++)
-			{
-				$s .= $random_char[rand(1,61)];
-			}
-			return $s;
-		}
-
-		// Look at the note towards the top of this file (jengo)
-		function filesystem_separator()
-		{
-			return filesystem_separator();
-		}
-
-		/**
-		 * This is used for reporting errors in a nice format.
-		 *
-		 * @param $error - array of errors
-		 */
-		function error_list($errors,$text='Error')
-		{
-			if (! is_array($errors))
-			{
-				return False;
-			}
-
-			$html_error = '<table border="0" width="100%"><tr><td align="right"><b>' . lang($text)
-				. '</b>: </td><td align="left">' . $errors[0] . '</td></tr>';
-			for ($i=1; $i<count($errors); $i++)
-			{
-				$html_error .= '<tr><td>&nbsp;</td><td align="left">' . $errors[$i] . '</td></tr>';
-			}
-			return $html_error . '</table>';
-		}
-
-		/**
-		 * @deprecated use ACL instead
-		 */
-		function check_owner($record,$link,$label,$extravars = '')
-		{
-			$this->debug_info[] = 'check_owner() is a depreciated function - use ACL instead';
-		}
-
-		/**
-		 * return the fullname of a user
-		 *
-		 * @param $lid='' account loginid
-		 * @param $firstname='' firstname
-		 * @param $lastname='' lastname
-		 * @param $accountid=0 id, to check if it's a user or group, otherwise the lid will be used
-		 */
-		function display_fullname($lid = '', $firstname = '', $lastname = '',$accountid=0)
-		{
-			if (! $lid && ! $firstname && ! $lastname)
-			{
-				$lid       = $GLOBALS['egw_info']['user']['account_lid'];
-				$firstname = $GLOBALS['egw_info']['user']['firstname'];
-				$lastname  = $GLOBALS['egw_info']['user']['lastname'];
-			}
-			$is_group = $GLOBALS['egw']->accounts->get_type($accountid ? $accountid : $lid) == 'g';
-
-			if (empty($firstname)) $firstname = $lid;
-			if (empty($lastname) || $is_group)
-			{
-				$lastname  = $is_group ? lang('Group') : lang('User');
-			}
-			$display = $GLOBALS['egw_info']['user']['preferences']['common']['account_display'];
-
-			if ($firstname && $lastname)
-			{
-				$delimiter = ', ';
-			}
 			else
 			{
-				$delimiter = '';
-			}
-
-			$name = '';
-			switch($display)
-			{
-				case 'firstname':
-					$name = $firstname . ' ' . $lastname;
-					break;
-				case 'lastname':
-					$name = $lastname . $delimiter . $firstname;
-					break;
-				case 'username':
-					$name = $lid;
-					break;
-				case 'firstall':
-					$name = $firstname . ' ' . $lastname . ' ['.$lid.']';
-					break;
-				case 'lastall':
-					$name = $lastname . $delimiter . $firstname . ' ['.$lid.']';
-					break;
-				case 'all':
-					/* fall through */
-				default:
-					$name = '['.$lid.'] ' . $firstname . ' ' . $lastname;
-			}
-			return $name;
-		}
-
-		/**
-		 * grab the owner name
-		 *
-		 * @param $id account id
-		 */
-		function grab_owner_name($accountid = '')
-		{
-			$GLOBALS['egw']->accounts->get_account_name($accountid,$lid,$fname,$lname);
-
-			return $this->display_fullname($lid,$fname,$lname,$accountid);
-		}
-
-		/**
-		 * create tabs
-		 *
-		 * @param array $tabs an array repersenting the tabs you wish to display, each element
-		 * 		 * 		 * 	 in the array is an array of 3 elements, 'label' which is the
-		 * 		 * 		 * 	 text displaed on the tab (you should pass translated string,
-		 * 		 * 		 * 	 create_tabs will not do <code>lang()</code> for you), 'link'
-		 * 		 * 		 * 	 which is the uri, 'target', the frame name or '_blank' to show
-		 * 		 * 		 * 	 page in a new browser window.
-		 * @param mixed $selected the tab whos key is $selected will be displayed as current tab
-		 * @param $fontsize optional
-		 * @return string return html that displays the tabs
-		 */
-		function create_tabs($tabs, $selected, $fontsize = '')
-		{
-			$output_text = '<table border="0" cellspacing="0" cellpadding="0"><tr>';
-
-			/* This is a php3 workaround */
-			if(EGW_IMAGES_DIR == 'EGW_IMAGES_DIR')
-			{
-				$ir = ExecMethod('phpgwapi.phpgw.common.get_image_path', 'phpgwapi');
-			}
-			else
-			{
-				$ir = EGW_IMAGES_DIR;
-			}
-
-			if ($fontsize)
-			{
-				$fs  = '<font size="' . $fontsize . '">';
-				$fse = '</font>';
-			}
-
-			$i = 1;
-			while ($tab = each($tabs))
-			{
-				if ($tab[0] == $selected)
+				if ($i == 1)
 				{
-					if ($i == 1)
-					{
-						$output_text .= '<td align="right"><img src="' . $ir . '/tabs-start1.gif"></td>';
-					}
-
-					$output_text .= '<td align="left" background="' . $ir . '/tabs-bg1.gif">&nbsp;<b><a href="'
-						. $tab[1]['link'] . '" class="tablink" '.$tab[1]['target'].'>' . $fs . $tab[1]['label']
-						. $fse . '</a></b>&nbsp;</td>';
-					if ($i == count($tabs))
+					$output_text .= '<td align="right"><img src="' . $ir . '/tabs-start0.gif"></td>';
+				}
+				$output_text .= '<td align="left" background="' . $ir . '/tabs-bg0.gif">&nbsp;<b><a href="'
+					. $tab[1]['link'] . '" class="tablink" '.$tab[1]['target'].'>' . $fs . $tab[1]['label'] . $fse
+					. '</a></b>&nbsp;</td>';
+				if (($i + 1) == $selected)
+				{
+					$output_text .= '<td align="left"><img src="' . $ir . '/tabs-sepl.gif"></td>';
+				}
+				elseif ($i == $selected || $i != count($tabs))
+				{
+					$output_text .= '<td align="left"><img src="' . $ir . '/tabs-sepm.gif"></td>';
+				}
+				elseif ($i == count($tabs))
+				{
+					if ($i == $selected)
 					{
 						$output_text .= '<td align="left"><img src="' . $ir . '/tabs-end1.gif"></td>';
 					}
 					else
+					{
+						$output_text .= '<td align="left"><img src="' . $ir . '/tabs-end0.gif"></td>';
+					}
+				}
+				else
+				{
+					if ($i != count($tabs))
 					{
 						$output_text .= '<td align="left"><img src="' . $ir . '/tabs-sepr.gif"></td>';
 					}
 				}
-				else
-				{
-					if ($i == 1)
-					{
-						$output_text .= '<td align="right"><img src="' . $ir . '/tabs-start0.gif"></td>';
-					}
-					$output_text .= '<td align="left" background="' . $ir . '/tabs-bg0.gif">&nbsp;<b><a href="'
-						. $tab[1]['link'] . '" class="tablink" '.$tab[1]['target'].'>' . $fs . $tab[1]['label'] . $fse
-						. '</a></b>&nbsp;</td>';
-					if (($i + 1) == $selected)
-					{
-						$output_text .= '<td align="left"><img src="' . $ir . '/tabs-sepl.gif"></td>';
-					}
-					elseif ($i == $selected || $i != count($tabs))
-					{
-						$output_text .= '<td align="left"><img src="' . $ir . '/tabs-sepm.gif"></td>';
-					}
-					elseif ($i == count($tabs))
-					{
-						if ($i == $selected)
-						{
-							$output_text .= '<td align="left"><img src="' . $ir . '/tabs-end1.gif"></td>';
-						}
-						else
-						{
-							$output_text .= '<td align="left"><img src="' . $ir . '/tabs-end0.gif"></td>';
-						}
-					}
-					else
-					{
-						if ($i != count($tabs))
-						{
-							$output_text .= '<td align="left"><img src="' . $ir . '/tabs-sepr.gif"></td>';
-						}
-					}
-				}
-				$i++;
-				$output_text .= "\n";
 			}
-			$output_text .= "</table>\n";
-			return $output_text;
+			$i++;
+			$output_text .= "\n";
+		}
+		$output_text .= "</table>\n";
+		return $output_text;
+	}
+
+	/**
+	 * get directory of application
+	 *
+	 * $appname can either be passed or derived from $GLOBALS['egw_info']['flags']['currentapp'];
+	 * @param $appname name of application
+	 */
+	static function get_app_dir($appname = '')
+	{
+		if ($appname == '')
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if ($appname == 'logout' || $appname == 'login')
+		{
+			$appname = 'phpgwapi';
 		}
 
-		/**
-		 * get directory of application
-		 *
-		 * $appname can either be passed or derived from $GLOBALS['egw_info']['flags']['currentapp'];
-		 * @param $appname name of application
-		 */
-		function get_app_dir($appname = '')
+		$appdir         = EGW_INCLUDE_ROOT . '/'.$appname;
+		$appdir_default = EGW_SERVER_ROOT . '/'.$appname;
+
+		if (@is_dir($appdir))
 		{
-			if ($appname == '')
-			{
-				$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-			}
-			if ($appname == 'logout' || $appname == 'login')
-			{
-				$appname = 'phpgwapi';
-			}
-
-			$appdir         = EGW_INCLUDE_ROOT . '/'.$appname;
-			$appdir_default = EGW_SERVER_ROOT . '/'.$appname;
-
-			if (@is_dir ($appdir))
-			{
-				return $appdir;
-			}
-			elseif (@is_dir ($appdir_default))
-			{
-				return $appdir_default;
-			}
-			else
-			{
-				return False;
-			}
+			return $appdir;
 		}
-
-		/**
-		 * get inc (include dir) of application
-		 *
-		 * $appname can either be passed or derived from $GLOBALS['egw_info']['flags']['currentapp'];
-		 * @param $appname name of application
-		 */
-		function get_inc_dir($appname = '')
+		elseif (@is_dir($appdir_default))
 		{
-			if (! $appname)
-			{
-				$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-			}
-			if ($appname == 'logout' || $appname == 'login' || $appname == 'about')
-			{
-				$appname = 'phpgwapi';
-			}
-
-			$incdir         = EGW_INCLUDE_ROOT . '/' . $appname . '/inc';
-			$incdir_default = EGW_SERVER_ROOT . '/' . $appname . '/inc';
-
-			if (@is_dir ($incdir))
-			{
-				return $incdir;
-			}
-			elseif (@is_dir ($incdir_default))
-			{
-				return $incdir_default;
-			}
-			else
-			{
-				return False;
-			}
+			return $appdir_default;
 		}
-
-		/**
-		 * list themes available
-		 *
-		 * themes can either be css file like in HEAD (if the template has a css-dir and has css-files in is) \
-		 * 	or ordinary .14 themes-files
-		 */
-		function list_themes()
+		else
 		{
-			$tpl_dir = $this->get_tpl_dir('phpgwapi');
-
-			if ($dh = @opendir($tpl_dir . SEP . 'css'))
-			{
-				while ($file = readdir($dh))
-				{
-					if (eregi("\.css$", $file) && $file != 'phpgw.css')
-					{
-						$list[] = substr($file,0,strpos($file,'.'));
-					}
-				}
-                                closedir($dh);
-			}
-			if(!is_array($list))
-			{
-				$dh = opendir(EGW_SERVER_ROOT . '/phpgwapi/themes');
-				while ($file = readdir($dh))
-				{
-					if (eregi("\.theme$", $file))
-					{
-						$list[] = substr($file,0,strpos($file,'.'));
-					}
-				}
-				closedir($dh);
-			}
-			reset ($list);
-			return $list;
-		}
-
-		/**
-		* List available templates
-		*
-		* @returns array alphabetically sorted list of templates
-		*/
-		function list_templates()
-		{
-			$list = array();
-			$d = dir(EGW_SERVER_ROOT . '/phpgwapi/templates');
-			while (($entry=$d->read()))
-			{
-				if ($entry != '..' && file_exists(EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry .'/class.'.$entry.'_framework.inc.php'))
-				{
-					$list[$entry]['name'] = $entry;
-					if (file_exists ($f = EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/setup/setup.inc.php'))
-					{
-						include($f);
-						$list[$entry]['title'] = $GLOBALS['egw_info']['template'][$entry]['title'];
-					}
-					else
-					{
-						$list[$entry]['title'] = $entry;
-					}
-				}
-			}
-			$d->close();
-			ksort($list);
-
-			return $list;
-		}
-
-		/**
-		 * get template dir of an application
-		 *
-		 * @param $appname appication name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
-		 * @static
-		 * @return string/boolean dir or false if no dir is found
-		 */
-		static function get_tpl_dir($appname = '')
-		{
-			if (!$appname)
-			{
-				$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-			}
-			if ($appname == 'logout' || $appname == 'login')
-			{
-				$appname = 'phpgwapi';
-			}
-
-			if (!isset($GLOBALS['egw_info']['server']['template_set']) && isset($GLOBALS['egw_info']['user']['preferences']['common']['template_set']))
-			{
-				$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw_info']['user']['preferences']['common']['template_set'];
-			}
-
-			// Setting this for display of template choices in user preferences
-			if ($GLOBALS['egw_info']['server']['template_set'] == 'user_choice')
-			{
-				$GLOBALS['egw_info']['server']['usrtplchoice'] = 'user_choice';
-			}
-
-			if (($GLOBALS['egw_info']['server']['template_set'] == 'user_choice' ||
-				!isset($GLOBALS['egw_info']['server']['template_set'])) &&
-				isset($GLOBALS['egw_info']['user']['preferences']['common']['template_set']))
-			{
-				$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw_info']['user']['preferences']['common']['template_set'];
-			}
-			if (!file_exists(EGW_SERVER_ROOT.'/phpgwapi/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/class.'.
-				$GLOBALS['egw_info']['server']['template_set'].'_framework.inc.php'))
-			{
-				$GLOBALS['egw_info']['server']['template_set'] = 'idots';
-			}
-			$tpldir         = EGW_SERVER_ROOT . '/' . $appname . '/templates/' . $GLOBALS['egw_info']['server']['template_set'];
-			$tpldir_default = EGW_SERVER_ROOT . '/' . $appname . '/templates/default';
-
-			if (@is_dir($tpldir))
-			{
-				return $tpldir;
-			}
-			elseif (@is_dir($tpldir_default))
-			{
-				return $tpldir_default;
-			}
-			else
-			{
-				return False;
-			}
-		}
-
-		/**
-		 * checks if image_dir exists and has more than just a navbar-icon
-		 *
-		 * this is just a workaround for idots, better to use find_image, which has a fallback \
-		 * 	on a per image basis to the default dir
-		 */
-		function is_image_dir($dir)
-		{
-			if (!@is_dir($dir))
-			{
-				return False;
-			}
-			if ($d = opendir($dir))
-			{
-				while ($f = readdir($d))
-				{
-					$ext = strtolower(strrchr($f,'.'));
-					if (($ext == '.gif' || $ext == '.png') && strpos($f,'navbar') === False)
-					{
-						closedir($d);
-						return True;
-					}
-				}
-				closedir($d);
-			}
 			return False;
 		}
+	}
 
-		/**
-		 * get image dir of an application
-		 *
-		 * @param $appname application name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
-		 */
-		function get_image_dir($appname = '')
+	/**
+	 * get inc (include dir) of application
+	 *
+	 * $appname can either be passed or derived from $GLOBALS['egw_info']['flags']['currentapp'];
+	 * @param $appname name of application
+	 */
+	static function get_inc_dir($appname = '')
+	{
+		if (!$appname)
 		{
-			if ($appname == '')
-			{
-				$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-			}
-			if (empty($GLOBALS['egw_info']['server']['template_set']))
-			{
-				$GLOBALS['egw_info']['server']['template_set'] = 'idots';
-			}
-
-			$imagedir            = EGW_SERVER_ROOT . '/' . $appname . '/templates/'
-				. $GLOBALS['egw_info']['server']['template_set'] . '/images';
-			$imagedir_default    = EGW_SERVER_ROOT . '/' . $appname . '/templates/idots/images';
-			$imagedir_olddefault = EGW_SERVER_ROOT . '/' . $appname . '/images';
-
-			if ($this->is_image_dir ($imagedir))
-			{
-				return $imagedir;
-			}
-			elseif ($this->is_image_dir ($imagedir_default))
-			{
-				return $imagedir_default;
-			}
-			elseif ($this->is_image_dir ($imagedir_olddefault))
-			{
-				return $imagedir_olddefault;
-			}
-			else
-			{
-				return False;
-			}
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if ($appname == 'logout' || $appname == 'login' || $appname == 'about')
+		{
+			$appname = 'phpgwapi';
 		}
 
-		/**
-		 * get image path of an application
-		 *
-		 * @param $appname appication name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
-		 */
-		function get_image_path($appname = '')
+		$incdir         = EGW_INCLUDE_ROOT . '/' . $appname . '/inc';
+		$incdir_default = EGW_SERVER_ROOT . '/' . $appname . '/inc';
+
+		if (@is_dir ($incdir))
 		{
-			if ($appname == '')
-			{
-				$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-			}
-
-			if (empty($GLOBALS['egw_info']['server']['template_set']))
-			{
-				$GLOBALS['egw_info']['server']['template_set'] = 'idots';
-			}
-
-			$imagedir            = EGW_SERVER_ROOT . '/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/images';
-			$imagedir_default    = EGW_SERVER_ROOT . '/'.$appname.'/templates/idots/images';
-			$imagedir_olddefault = EGW_SERVER_ROOT . '/'.$appname.'/templates/default/images';
-
-			if ($this->is_image_dir ($imagedir))
-			{
-				return $GLOBALS['egw_info']['server']['webserver_url'].'/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/images';
-			}
-			elseif ($this->is_image_dir ($imagedir_default))
-			{
-				return $GLOBALS['egw_info']['server']['webserver_url'].'/'.$appname.'/templates/idots/images';
-			}
-			elseif ($this->is_image_dir ($imagedir_olddefault))
-			{
-				return $GLOBALS['egw_info']['server']['webserver_url'].'/'.$appname.'/templates/default/images';
-			}
-			else
-			{
-				return False;
-			}
+			return $incdir;
 		}
-
-		/**
-		 * Searches and image by a given search order (it maintains a cache of the existing images):
-		 * - image dir of the application for the given template
-		 * - image dir of the application for the default template
-		 * - image dir of the API for the given template
-		 * - image dir of the API for the default template
-		 *
-		 * @param string $appname
-		 * @param string $image
-		 * @return string url of the image
-		 */
-		function find_image($appname,$image)
+		elseif (@is_dir ($incdir_default))
 		{
-			$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
+			return $incdir_default;
+		}
+		else
+		{
+			return False;
+		}
+	}
 
-			if (!@is_array($this->found_files[$appname]))
+	/**
+	 * list themes available
+	 *
+	 * themes can either be css file like in HEAD (if the template has a css-dir and has css-files in is) \
+	 * 	or ordinary .14 themes-files
+	 */
+	function list_themes()
+	{
+		$tpl_dir = self::get_tpl_dir('phpgwapi');
+
+		if ($dh = @opendir($tpl_dir . SEP . 'css'))
+		{
+			while ($file = readdir($dh))
 			{
-				$imagedir_olddefault = '/'.$appname.'/templates/default/images';
-				$imagedir_default    = '/'.$appname.'/templates/idots/images';
-
-				if (@is_dir(EGW_INCLUDE_ROOT.$imagedir_olddefault))
+				if (eregi("\.css$", $file) && $file != 'phpgw.css')
 				{
-					$d = dir(EGW_INCLUDE_ROOT.$imagedir_olddefault);
-					while (false != ($entry = $d->read()))
-					{
-						if ($entry != '.' && $entry != '..')
-						{
-							$this->found_files[$appname][$entry] = $imagedir_olddefault;
-						}
-					}
-					$d->close();
-				}
-
-				if (@is_dir(EGW_INCLUDE_ROOT.$imagedir_default))
-				{
-					$d = dir(EGW_INCLUDE_ROOT.$imagedir_default);
-					while (false != ($entry = $d->read()))
-					{
-						if ($entry != '.' && $entry != '..')
-						{
-							$this->found_files[$appname][$entry] = $imagedir_default;
-						}
-					}
-					$d->close();
-				}
-
-				if (@is_dir(EGW_INCLUDE_ROOT.$imagedir))
-				{
-					$d = dir(EGW_INCLUDE_ROOT.$imagedir);
-					while (false != ($entry = $d->read()))
-					{
-						if ($entry != '.' && $entry != '..')
-						{
-							$this->found_files[$appname][$entry] = $imagedir;
-						}
-					}
-					$d->close();
+					$list[] = substr($file,0,strpos($file,'.'));
 				}
 			}
+                            closedir($dh);
+		}
+		if(!is_array($list))
+		{
+			$dh = opendir(EGW_SERVER_ROOT . '/phpgwapi/themes');
+			while ($file = readdir($dh))
+			{
+				if (eregi("\.theme$", $file))
+				{
+					$list[] = substr($file,0,strpos($file,'.'));
+				}
+			}
+			closedir($dh);
+		}
+		reset ($list);
+		return $list;
+	}
 
-			if (!$GLOBALS['egw_info']['server']['image_type'])
+	/**
+	* List available templates
+	*
+	* @returns array alphabetically sorted list of templates
+	*/
+	function list_templates()
+	{
+		$list = array();
+		$d = dir(EGW_SERVER_ROOT . '/phpgwapi/templates');
+		while (($entry=$d->read()))
+		{
+			if ($entry != '..' && file_exists(EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry .'/class.'.$entry.'_framework.inc.php'))
 			{
-				// priority: GIF->JPG->PNG
-				$img_type=array('.gif','.jpg','.png');
-			}
-			else
-			{
-				// priority: : PNG->JPG->GIF
-				$img_type=array('.png','.jpg','.gif');
-			}
-
-			// first look in the selected template dir
-			if(@$this->found_files[$appname][$image.$img_type[0]]==$imagedir)
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
-			}
-			elseif(@$this->found_files[$appname][$image.$img_type[1]]==$imagedir)
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[1]].'/'.$image.$img_type[1];
-			}
-			elseif(@$this->found_files[$appname][$image.$img_type[2]]==$imagedir)
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[2]].'/'.$image.$img_type[2];
-			}
-			// then look everywhere else
-			elseif(isset($this->found_files[$appname][$image.$img_type[0]]))
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
-			}
-			elseif(isset($this->found_files[$appname][$image.$img_type[1]]))
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[1]].'/'.$image.$img_type[1];
-			}
-			elseif(isset($this->found_files[$appname][$image.$img_type[2]]))
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$img_type[2]].'/'.$image.$img_type[2];
-			}
-			elseif(isset($this->found_files[$appname][$image]))
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$image].'/'.$image;
-			}
-			else
-			{
-				// searching the image in the api-dirs
-				if (!isset($this->found_files['phpgwapi']))
+				$list[$entry]['name'] = $entry;
+				if (file_exists ($f = EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/setup/setup.inc.php'))
 				{
-					$this->find_image('phpgwapi','');
-				}
-
-				if(isset($this->found_files['phpgwapi'][$image.$img_type[0]]))
-				{
-					$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.$img_type[0]].'/'.$image.$img_type[0];
-				}
-				elseif(isset($this->found_files['phpgwapi'][$image.$img_type[1]]))
-				{
-					$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.$img_type[1]].'/'.$image.$img_type[1];
-				}
-				elseif(isset($this->found_files['phpgwapi'][$image.$img_type[2]]))
-				{
-					$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.$img_type[2]].'/'.$image.$img_type[2];
-				}
-				elseif(isset($this->found_files['phpgwapi'][$image]))
-				{
-					$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image].'/'.$image;
+					include($f);
+					$list[$entry]['title'] = $GLOBALS['egw_info']['template'][$entry]['title'];
 				}
 				else
 				{
-					$imgfile = '';
+					$list[$entry]['title'] = $entry;
 				}
 			}
-			return $imgfile;
+		}
+		$d->close();
+		ksort($list);
+
+		return $list;
+	}
+
+	/**
+	 * get template dir of an application
+	 *
+	 * @param $appname appication name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
+	 * @static
+	 * @return string/boolean dir or false if no dir is found
+	 */
+	static function get_tpl_dir($appname = '')
+	{
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if ($appname == 'logout' || $appname == 'login')
+		{
+			$appname = 'phpgwapi';
 		}
 
-		/**
-		 * Searches a appname, template and maybe language and type-specific image
-		 *
-		 * @param string $appname
-		 * @param string $image
-		 * @param string $ext
-		 * @param boolean $use_lang
-		 * @return string url of the image
-		 */
-		function image($appname,$image='',$ext='',$use_lang=True)
+		if (!isset($GLOBALS['egw_info']['server']['template_set']) && isset($GLOBALS['egw_info']['user']['preferences']['common']['template_set']))
 		{
-			if (!is_array($image))
+			$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw_info']['user']['preferences']['common']['template_set'];
+		}
+
+		// Setting this for display of template choices in user preferences
+		if ($GLOBALS['egw_info']['server']['template_set'] == 'user_choice')
+		{
+			$GLOBALS['egw_info']['server']['usrtplchoice'] = 'user_choice';
+		}
+
+		if (($GLOBALS['egw_info']['server']['template_set'] == 'user_choice' ||
+			!isset($GLOBALS['egw_info']['server']['template_set'])) &&
+			isset($GLOBALS['egw_info']['user']['preferences']['common']['template_set']))
+		{
+			$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw_info']['user']['preferences']['common']['template_set'];
+		}
+		if (!file_exists(EGW_SERVER_ROOT.'/phpgwapi/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/class.'.
+			$GLOBALS['egw_info']['server']['template_set'].'_framework.inc.php'))
+		{
+			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
+		}
+		$tpldir         = EGW_SERVER_ROOT . '/' . $appname . '/templates/' . $GLOBALS['egw_info']['server']['template_set'];
+		$tpldir_default = EGW_SERVER_ROOT . '/' . $appname . '/templates/default';
+
+		if (@is_dir($tpldir))
+		{
+			return $tpldir;
+		}
+		elseif (@is_dir($tpldir_default))
+		{
+			return $tpldir_default;
+		}
+		else
+		{
+			return False;
+		}
+	}
+
+	/**
+	 * checks if image_dir exists and has more than just a navbar-icon
+	 *
+	 * this is just a workaround for idots, better to use find_image, which has a fallback \
+	 * 	on a per image basis to the default dir
+	 */
+	static function is_image_dir($dir)
+	{
+		if (!@is_dir($dir))
+		{
+			return False;
+		}
+		if ($d = opendir($dir))
+		{
+			while ($f = readdir($d))
 			{
-				if (empty($image))
+				$ext = strtolower(strrchr($f,'.'));
+				if (($ext == '.gif' || $ext == '.png') && strpos($f,'navbar') === False)
 				{
-					return '';
+					closedir($d);
+					return True;
 				}
-				$image = array($image);
 			}
-			if ($use_lang)
+			closedir($d);
+		}
+		return False;
+	}
+
+	/**
+	 * get image dir of an application
+	 *
+	 * @param $appname application name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
+	 */
+	static function get_image_dir($appname = '')
+	{
+		if ($appname == '')
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if (empty($GLOBALS['egw_info']['server']['template_set']))
+		{
+			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
+		}
+
+		$imagedir            = EGW_SERVER_ROOT . '/' . $appname . '/templates/'
+			. $GLOBALS['egw_info']['server']['template_set'] . '/images';
+		$imagedir_default    = EGW_SERVER_ROOT . '/' . $appname . '/templates/idots/images';
+		$imagedir_olddefault = EGW_SERVER_ROOT . '/' . $appname . '/images';
+
+		if (self::is_image_dir ($imagedir))
+		{
+			return $imagedir;
+		}
+		elseif (self::is_image_dir ($imagedir_default))
+		{
+			return $imagedir_default;
+		}
+		elseif (self::is_image_dir ($imagedir_olddefault))
+		{
+			return $imagedir_olddefault;
+		}
+		else
+		{
+			return False;
+		}
+	}
+
+	/**
+	 * get image path of an application
+	 *
+	 * @param $appname appication name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
+	 */
+	static function get_image_path($appname = '')
+	{
+		if ($appname == '')
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+
+		if (empty($GLOBALS['egw_info']['server']['template_set']))
+		{
+			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
+		}
+
+		$imagedir            = EGW_SERVER_ROOT . '/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/images';
+		$imagedir_default    = EGW_SERVER_ROOT . '/'.$appname.'/templates/idots/images';
+		$imagedir_olddefault = EGW_SERVER_ROOT . '/'.$appname.'/templates/default/images';
+
+		if (self::is_image_dir($imagedir))
+		{
+			return $GLOBALS['egw_info']['server']['webserver_url'].'/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/images';
+		}
+		elseif (self::is_image_dir($imagedir_default))
+		{
+			return $GLOBALS['egw_info']['server']['webserver_url'].'/'.$appname.'/templates/idots/images';
+		}
+		elseif (self::is_image_dir($imagedir_olddefault))
+		{
+			return $GLOBALS['egw_info']['server']['webserver_url'].'/'.$appname.'/templates/default/images';
+		}
+		return False;
+	}
+
+	/**
+	 * Searches and image by a given search order (it maintains a cache of the existing images):
+	 * - image dir of the application for the given template
+	 * - image dir of the application for the default template
+	 * - image dir of the API for the given template
+	 * - image dir of the API for the default template
+	 *
+	 * @param string $appname
+	 * @param string $image
+	 * @return string url of the image
+	 */
+	function find_image($appname,$image)
+	{
+		$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
+
+		if (!@is_array(self::$found_files[$appname]))
+		{
+			$imagedir_olddefault = '/'.$appname.'/templates/default/images';
+			$imagedir_default    = '/'.$appname.'/templates/idots/images';
+
+			if (@is_dir(EGW_INCLUDE_ROOT.$imagedir_olddefault))
 			{
-				while (list(,$img) = each($image))
+				$d = dir(EGW_INCLUDE_ROOT.$imagedir_olddefault);
+				while (false != ($entry = $d->read()))
 				{
-					$lang_images[] = $img . '_' . $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
-					$lang_images[] = $img;
+					if ($entry != '.' && $entry != '..')
+					{
+						self::$found_files[$appname][$entry] = $imagedir_olddefault;
+					}
 				}
-				$image = $lang_images;
+				$d->close();
 			}
-			while (empty($image_found) && list(,$img) = each($image))
+
+			if (@is_dir(EGW_INCLUDE_ROOT.$imagedir_default))
 			{
-				if(isset($this->found_files[$appname][$img.$ext]))
+				$d = dir(EGW_INCLUDE_ROOT.$imagedir_default);
+				while (false != ($entry = $d->read()))
 				{
-					$image_found = $GLOBALS['egw_info']['server']['webserver_url'].$this->found_files[$appname][$img.$ext].'/'.$img.$ext;
+					if ($entry != '.' && $entry != '..')
+					{
+						self::$found_files[$appname][$entry] = $imagedir_default;
+					}
 				}
-				else
+				$d->close();
+			}
+
+			if (@is_dir(EGW_INCLUDE_ROOT.$imagedir))
+			{
+				$d = dir(EGW_INCLUDE_ROOT.$imagedir);
+				while (false != ($entry = $d->read()))
 				{
-					$image_found = $this->find_image($appname,$img.$ext);
+					if ($entry != '.' && $entry != '..')
+					{
+						self::$found_files[$appname][$entry] = $imagedir;
+					}
 				}
+				$d->close();
 			}
-			return $image_found;
 		}
 
-		/**
-		 * Searches an image of a given type, if not found also without type/extension
-		 *
-		 * @param string $appname
-		 * @param string $image
-		 * @param string $extension
-		 * @return string url of the image
-		 */
-		function image_on($appname,$image,$extension='_on')
+		if (!$GLOBALS['egw_info']['server']['image_type'])
 		{
-			if (($with_extension = $this->image($appname,$image,$extension)))
+			// priority: GIF->JPG->PNG
+			$img_type=array('.gif','.jpg','.png');
+		}
+		else
+		{
+			// priority: : PNG->JPG->GIF
+			$img_type=array('.png','.jpg','.gif');
+		}
+
+		// first look in the selected template dir
+		if(@self::$found_files[$appname][$image.$img_type[0]]==$imagedir)
+		{
+			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
+		}
+		elseif(@self::$found_files[$appname][$image.$img_type[1]]==$imagedir)
+		{
+			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[1]].'/'.$image.$img_type[1];
+		}
+		elseif(@self::$found_files[$appname][$image.$img_type[2]]==$imagedir)
+		{
+			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[2]].'/'.$image.$img_type[2];
+		}
+		// then look everywhere else
+		elseif(isset(self::$found_files[$appname][$image.$img_type[0]]))
+		{
+			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
+		}
+		elseif(isset(self::$found_files[$appname][$image.$img_type[1]]))
+		{
+			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[1]].'/'.$image.$img_type[1];
+		}
+		elseif(isset(self::$found_files[$appname][$image.$img_type[2]]))
+		{
+			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[2]].'/'.$image.$img_type[2];
+		}
+		elseif(isset(self::$found_files[$appname][$image]))
+		{
+			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image].'/'.$image;
+		}
+		else
+		{
+			// searching the image in the api-dirs
+			if (!isset(self::$found_files['phpgwapi']))
 			{
-				return $with_extension;
+				$this->find_image('phpgwapi','');
 			}
-			if(($without_extension = $this->image($appname,$image)))
+
+			if(isset(self::$found_files['phpgwapi'][$image.$img_type[0]]))
 			{
-				return $without_extension;
+				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image.$img_type[0]].'/'.$image.$img_type[0];
 			}
-			return '';
-		}
-
-		/**
-	 	 * prepare an array with variables used to render the navbar
-		 *
-		 * @deprecated inherit from egw_framework class in your template and use egw_framework::_navbar_vars()
-		 */
-		function navbar()
-		{
-			$GLOBALS['egw_info']['navbar'] = $GLOBALS['egw']->framework->_get_navbar_vars();
-		}
-
-		/**
-		 * load header.inc.php for an application
-		 *
-		 * @deprecated
-		 */
-		function app_header()
-		{
-			if (file_exists(EGW_APP_INC . '/header.inc.php'))
+			elseif(isset(self::$found_files['phpgwapi'][$image.$img_type[1]]))
 			{
-				include(EGW_APP_INC . '/header.inc.php');
+				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image.$img_type[1]].'/'.$image.$img_type[1];
 			}
-		}
-
-		/**
-		 * load the eGW header
-		 *
-		 * @deprecated use egw_framework::header(), $GLOBALS['egw']->framework->navbar() or better egw_framework::render($content)
-		 */
-		function egw_header()
-		{
-			echo $GLOBALS['egw']->framework->header();
-
-			if (!$GLOBALS['egw_info']['flags']['nonavbar'])
+			elseif(isset(self::$found_files['phpgwapi'][$image.$img_type[2]]))
 			{
-			   echo $GLOBALS['egw']->framework->navbar();
+				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image.$img_type[2]].'/'.$image.$img_type[2];
 			}
-		 }
-
-		/**
-		 * load the eGW footer
-		 *
-		 * @deprecated use egw_framework::footer() or egw_framework::render($content)
-		 */
-		function egw_footer()
-		{
-			if(is_object($GLOBALS['egw']->framework)) {
-				echo $GLOBALS['egw']->framework->footer();
-			}
-		}
-
-		/**
-		* Used by template headers for including CSS in the header
-		*
-		* @deprecated use framework::_get_css()
-		* @return string
-		*/
-		function get_css()
-		{
-			return $GLOBALS['egw']->framework->_get_css();
-		}
-
-		/**
-		* Used by the template headers for including javascript in the header
-		*
-		* @deprecated use framework::_get_js()
-		* @return string the javascript to be included
-		*/
-		function get_java_script()
-		{
-			return $GLOBALS['egw']->framework->_get_js();
-		}
-
-		/**
-		* Returns on(Un)Load attributes from js class
-		*
-		* @deprecated use framework::_get_js()
-		* @returns string body attributes
-		*/
-		function get_body_attribs()
-		{
-			return $GLOBALS['egw']->framework->_get_body_attribs();
-		}
-
-		function hex2bin($data)
-		{
-			$len = strlen($data);
-			return @pack('H' . $len, $data);
-		}
-
-		/**
-		 * encrypt data passed to the function
-		 *
-		 * @param $data data (string?) to be encrypted
-		 */
-		function encrypt($data)
-		{
-			return $GLOBALS['egw']->crypto->encrypt($data);
-		}
-
-		/**
-		 * decrypt $data
-		 *
-		 * @param $data data to be decrypted
-		 */
-		function decrypt($data)
-		{
-			return $GLOBALS['egw']->crypto->decrypt($data);
-		}
-
-		/**
-		 * legacy wrapper for newer auth class function, encrypt_password
-		 *
-		 * uses the encryption type set in setup and calls the appropriate encryption functions
-		 *
-		 * @deprecated use auth::encrypt_password()
-		 * @param $password password to encrypt
-		 */
-		function encrypt_password($password,$sql=False)
-		{
-			return auth::encrypt_password($password,$sql);
-		}
-
-		/**
-		 * find the current position of the app is the users portal_order preference
-		 *
-		 * @param $app application id to find current position - required
-		 * No discussion
-		 */
-		function find_portal_order($app)
-		{
-			if(!is_array($GLOBALS['egw_info']['user']['preferences']['portal_order']))
+			elseif(isset(self::$found_files['phpgwapi'][$image]))
 			{
-				return -1;
+				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image].'/'.$image;
 			}
-			@reset($GLOBALS['egw_info']['user']['preferences']['portal_order']);
-			while(list($seq,$appid) = each($GLOBALS['egw_info']['user']['preferences']['portal_order']))
+			else
 			{
-				if($appid == $app)
-				{
-					@reset($GLOBALS['egw_info']['user']['preferences']['portal_order']);
-					return $seq;
-				}
+				$imgfile = '';
 			}
-			@reset($GLOBALS['egw_info']['user']['preferences']['portal_order']);
+		}
+		return $imgfile;
+	}
+
+	/**
+	 * Searches a appname, template and maybe language and type-specific image
+	 *
+	 * @param string $appname
+	 * @param string $image
+	 * @param string $ext
+	 * @param boolean $use_lang
+	 * @return string url of the image
+	 */
+	function image($appname,$image='',$ext='',$use_lang=True)
+	{
+		if (!is_array($image))
+		{
+			if (empty($image))
+			{
+				return '';
+			}
+			$image = array($image);
+		}
+		if ($use_lang)
+		{
+			while (list(,$img) = each($image))
+			{
+				$lang_images[] = $img . '_' . $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
+				$lang_images[] = $img;
+			}
+			$image = $lang_images;
+		}
+		while (empty($image_found) && list(,$img) = each($image))
+		{
+			if(isset(self::$found_files[$appname][$img.$ext]))
+			{
+				$image_found = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$img.$ext].'/'.$img.$ext;
+			}
+			else
+			{
+				$image_found = $this->find_image($appname,$img.$ext);
+			}
+		}
+		return $image_found;
+	}
+
+	/**
+	 * Searches an image of a given type, if not found also without type/extension
+	 *
+	 * @param string $appname
+	 * @param string $image
+	 * @param string $extension
+	 * @return string url of the image
+	 */
+	function image_on($appname,$image,$extension='_on')
+	{
+		if (($with_extension = $this->image($appname,$image,$extension)))
+		{
+			return $with_extension;
+		}
+		if(($without_extension = $this->image($appname,$image)))
+		{
+			return $without_extension;
+		}
+		return '';
+	}
+
+	/**
+ 	 * prepare an array with variables used to render the navbar
+	 *
+	 * @deprecated inherit from egw_framework class in your template and use egw_framework::_navbar_vars()
+	 */
+	static function navbar()
+	{
+		$GLOBALS['egw_info']['navbar'] = $GLOBALS['egw']->framework->_get_navbar_vars();
+	}
+
+	/**
+	 * load header.inc.php for an application
+	 *
+	 * @deprecated
+	 */
+	static function app_header()
+	{
+		if (file_exists(EGW_APP_INC . '/header.inc.php'))
+		{
+			include(EGW_APP_INC . '/header.inc.php');
+		}
+	}
+
+	/**
+	 * load the eGW header
+	 *
+	 * @deprecated use egw_framework::header(), $GLOBALS['egw']->framework->navbar() or better egw_framework::render($content)
+	 */
+	static function egw_header()
+	{
+		echo $GLOBALS['egw']->framework->header();
+
+		if (!$GLOBALS['egw_info']['flags']['nonavbar'])
+		{
+		   echo $GLOBALS['egw']->framework->navbar();
+		}
+	 }
+
+	/**
+	 * load the eGW footer
+	 *
+	 * @deprecated use egw_framework::footer() or egw_framework::render($content)
+	 */
+	static function egw_footer()
+	{
+		if(is_object($GLOBALS['egw']->framework)) {
+			echo $GLOBALS['egw']->framework->footer();
+		}
+	}
+
+	/**
+	* Used by template headers for including CSS in the header
+	*
+	* @deprecated use framework::_get_css()
+	* @return string
+	*/
+	static function get_css()
+	{
+		return $GLOBALS['egw']->framework->_get_css();
+	}
+
+	/**
+	* Used by the template headers for including javascript in the header
+	*
+	* @deprecated use framework::_get_js()
+	* @return string the javascript to be included
+	*/
+	static function get_java_script()
+	{
+		return $GLOBALS['egw']->framework->_get_js();
+	}
+
+	/**
+	* Returns on(Un)Load attributes from js class
+	*
+	* @deprecated use framework::_get_js()
+	* @returns string body attributes
+	*/
+	static function get_body_attribs()
+	{
+		return $GLOBALS['egw']->framework->_get_body_attribs();
+	}
+
+	static function hex2bin($data)
+	{
+		$len = strlen($data);
+		return @pack('H' . $len, $data);
+	}
+
+	/**
+	 * encrypt data passed to the function
+	 *
+	 * @param $data data (string?) to be encrypted
+	 */
+	static function encrypt($data)
+	{
+		return $GLOBALS['egw']->crypto->encrypt($data);
+	}
+
+	/**
+	 * decrypt $data
+	 *
+	 * @param $data data to be decrypted
+	 */
+	static function decrypt($data)
+	{
+		return $GLOBALS['egw']->crypto->decrypt($data);
+	}
+
+	/**
+	 * legacy wrapper for newer auth class function, encrypt_password
+	 *
+	 * uses the encryption type set in setup and calls the appropriate encryption functions
+	 *
+	 * @deprecated use auth::encrypt_password()
+	 * @param $password password to encrypt
+	 */
+	static function encrypt_password($password,$sql=False)
+	{
+		return auth::encrypt_password($password,$sql);
+	}
+
+	/**
+	 * find the current position of the app is the users portal_order preference
+	 *
+	 * @param $app application id to find current position - required
+	 * No discussion
+	 */
+	function find_portal_order($app)
+	{
+		if(!is_array($GLOBALS['egw_info']['user']['preferences']['portal_order']))
+		{
 			return -1;
 		}
-
-		/**
-		 * temp wrapper to new hooks class
-		 *
-		 */
-		function hook($location, $appname = '', $no_permission_check = False)
+		@reset($GLOBALS['egw_info']['user']['preferences']['portal_order']);
+		while(list($seq,$appid) = each($GLOBALS['egw_info']['user']['preferences']['portal_order']))
 		{
-			echo '$'."GLOBALS['phpgw']common->hook()".' has been replaced. Please change to the new $'."GLOBALS['phpgw']hooks->process()".'. For now this will act as a wrapper<br>';
-			return $GLOBALS['egw']->hooks->process($location, $order, $no_permission_check);
-		}
-
-		/**
-		 * temp wrapper to new hooks class
-		 *
-		 */
-		// Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo)
-		function hook_single($location, $appname = '', $no_permission_check = False)
-		{
-			echo '$'."GLOBALS['phpgw']common->hook_single()".' has been replaced. Please change to the new $'."GLOBALS['phpgw']hooks->single()".'. For now this will act as a wrapper<br>';
-			return $GLOBALS['egw']->hooks->single($location, $order, $no_permission_check);
-		}
-
-		/**
-		 * temp wrapper to new hooks class
-		 *
-		 */
-		function hook_count($location)
-		{
-			echo '$'."GLOBALS['phpgw']common->hook_count()".' has been replaced. Please change to the new $'."GLOBALS['phpgw']hooks->count()".'. For now this will act as a wrapper<br>';
-			return $GLOBALS['egw']->hooks->count($location);
-		}
-
-		/* Wrapper to the session->appsession() */
-		function appsession($data = '##NOTHING##')
-		{
-			$this->debug_info[] = "\$GLOBALS['egw']->common->appsession() is a depreciated function"
-				. " - use \$GLOBALS['egw']->session->appsession() instead";
-
-			return $GLOBALS['egw']->session->appsession('default','',$data);
-		}
-
-		/**
-		 * return a formatted timestamp or current time
-		 *
-		 * @param int $t=0 timestamp, default current time
-		 * @param string $format='' timeformat, default '' = read from the user prefernces
-		 * @param boolean $adjust_to_usertime=true should datetime::tz_offset be added to $t or not, default true
-		 * @return string the formated date/time
-		 */
-		function show_date($t = 0, $format = '', $adjust_to_usertime=true)
-		{
-			if (!$t)
+			if($appid == $app)
 			{
-				$t = $GLOBALS['egw']->datetime->gmtnow;
+				@reset($GLOBALS['egw_info']['user']['preferences']['portal_order']);
+				return $seq;
 			}
+		}
+		@reset($GLOBALS['egw_info']['user']['preferences']['portal_order']);
+		return -1;
+	}
 
-			if ($adjust_to_usertime)
-			{
-				$t += $GLOBALS['egw']->datetime->tz_offset;
-			}
-
-			if (!$format)
-			{
-				$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ' - ';
-				if ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '12')
-				{
-					$format .= 'h:i a';
-				}
-				else
-				{
-					$format .= 'H:i';
-				}
-			}
-			return adodb_date($format,$t);
+	/**
+	 * return a formatted timestamp or current time
+	 *
+	 * @param int $t=0 timestamp, default current time
+	 * @param string $format='' timeformat, default '' = read from the user prefernces
+	 * @param boolean $adjust_to_usertime=true should datetime::tz_offset be added to $t or not, default true
+	 * @return string the formated date/time
+	 */
+	static function show_date($t = 0, $format = '', $adjust_to_usertime=true)
+	{
+		if (!$t)
+		{
+			$t = $GLOBALS['egw']->datetime->gmtnow;
 		}
 
-		/**
-		 * Format a date according to the user preferences
-		 *
-		 * @param string $yearstr year
-		 * @param string $monthstr month
-		 * @param string $day day
-		 * @param boolean $add_seperator=false add the separator specifed in the prefs or not, default no
-		 * @return string
-		 */
-		function dateformatorder($yearstr,$monthstr,$daystr,$add_seperator = False)
+		if ($adjust_to_usertime)
 		{
-			$dateformat = strtolower($GLOBALS['egw_info']['user']['preferences']['common']['dateformat']);
-			$sep = substr($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],1,1);
-
-			$dlarr[strpos($dateformat,'y')] = $yearstr;
-			$dlarr[strpos($dateformat,'m')] = $monthstr;
-			$dlarr[strpos($dateformat,'d')] = $daystr;
-			ksort($dlarr);
-
-			if ($add_seperator)
-			{
-				return implode($sep,$dlarr);
-			}
-			return implode(' ',$dlarr);
+			$t += $GLOBALS['egw']->datetime->tz_offset;
 		}
 
-		/**
-		 * format the time takes settings from user preferences
-		 *
-		 * @param int $hour hour
-		 * @param int $min minutes
-		 * @param int/string $sec='' defaults to ''
-		 * @return string formated time
-		 */
-		function formattime($hour,$min,$sec='')
+		if (!$format)
 		{
-			$h12 = $hour;
+			$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ' - ';
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '12')
 			{
-				if ($hour >= 12)
-				{
-					$ampm = ' pm';
-				}
-				else
-				{
-					$ampm = ' am';
-				}
-
-				$h12 %= 12;
-
-				if ($h12 == 0 && $hour)
-				{
-					$h12 = 12;
-				}
-				if ($h12 == 0 && !$hour)
-				{
-					$h12 = 0;
-				}
+				$format .= 'h:i a';
 			}
 			else
 			{
-				$h12 = $hour;
+				$format .= 'H:i';
 			}
-
-			if ($sec !== '')
-			{
-				$sec = ':'.$sec;
-			}
-
-			return $h12.':'.$min.$sec.$ampm;
 		}
+		return adodb_date($format,$t);
+	}
 
-		/**
-		 * Format an email address according to the system standard
-		 *
-		 * Convert all european special chars to ascii and fallback to the accountname, if nothing left eg. chiniese
-		 *
-		 * @param string $first firstname
-		 * @param string $last lastname
-		 * @param string $account account-name (lid)
-		 * @param string $domain=null domain-name or null to use eGW's default domain $GLOBALS['egw_info']['server']['mail_suffix]
-		 * @return string with email address
-		 */
-		function email_address($first,$last,$account,$domain=null)
+	/**
+	 * Format a date according to the user preferences
+	 *
+	 * @param string $yearstr year
+	 * @param string $monthstr month
+	 * @param string $day day
+	 * @param boolean $add_seperator=false add the separator specifed in the prefs or not, default no
+	 * @return string
+	 */
+	static function dateformatorder($yearstr,$monthstr,$daystr,$add_seperator = False)
+	{
+		$dateformat = strtolower($GLOBALS['egw_info']['user']['preferences']['common']['dateformat']);
+		$sep = substr($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],1,1);
+
+		$dlarr[strpos($dateformat,'y')] = $yearstr;
+		$dlarr[strpos($dateformat,'m')] = $monthstr;
+		$dlarr[strpos($dateformat,'d')] = $daystr;
+		ksort($dlarr);
+
+		if ($add_seperator)
 		{
-			//echo "<p align=right>common::email_address('$first','$last','$account')";
-			// convert all european special chars to ascii, (c) RalfBecker-AT-egroupware.org ;-)
-			static $extra = array(
-				'&szlig;' => 'ss',
-				' ' => '',
-			);
-			foreach (array('first','last','account') as $name)
+			return implode($sep,$dlarr);
+		}
+		return implode(' ',$dlarr);
+	}
+
+	/**
+	 * format the time takes settings from user preferences
+	 *
+	 * @param int $hour hour
+	 * @param int $min minutes
+	 * @param int/string $sec='' defaults to ''
+	 * @return string formated time
+	 */
+	static function formattime($hour,$min,$sec='')
+	{
+		$h12 = $hour;
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '12')
+		{
+			if ($hour >= 12)
 			{
-				$$name = htmlentities($$name,ENT_QUOTES,$GLOBALS['egw']->translation->charset());
-				$$name = str_replace(array_keys($extra),array_values($extra),$$name);
-				$$name = preg_replace('/&([aAuUoO])uml;/','\\1e',$$name);	// replace german umlauts with the letter plus one 'e'
-				$$name = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/','\\1',$$name);	// remove all types of acents
-				$$name = preg_replace('/&([a-zA-Z]+|#[0-9]+|);/','',$$name);	// remove all other entities
-			}
-			//echo " --> ('$first', '$last', '$account')";
-			if (!$first && !$last)	// fallback to the account-name, if real names contain only special chars
-			{
-				$first = '';
-				$last = $account;
-			}
-			if (!$first || !$last)
-			{
-				$dot = $underscore = '';
+				$ampm = ' pm';
 			}
 			else
 			{
-				$dot = '.';
-				$underscore = '_';
-			}
-			if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
-
-			$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
-				array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
-				$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
-				($domain ? '@'.$domain : '');
-			//echo " = '$email'</p>\n";
-			return $email;
-		}
-
-		// This is not the best place for it, but it needs to be shared bewteen Aeromail and SM
-		/**
-		 * uses code in /email class msg to obtain the appropriate password for email
-		 *
-		 * @param  (none - it will abtain the info it needs on its own)
-		 */
-		/*
-		function get_email_passwd_ex()
-		{
-			// ----  Create the email Message Class  if needed  -----
-			if (is_object($GLOBALS['egw']->msg))
-			{
-				$do_free_me = False;
-			}
-			else
-			{
-				$GLOBALS['egw']->msg =& CreateObject('email.mail_msg');
-				$do_free_me = True;
-			}
-			// use the Msg class to obtain the appropriate password
-			$tmp_prefs = $GLOBALS['egw']->preferences->read();
-			if (!isset($tmp_prefs['email']['passwd']))
-			{
-				$email_passwd = $GLOBALS['egw_info']['user']['passwd'];
-			}
-			else
-			{
-				$email_passwd = $GLOBALS['egw']->msg->decrypt_email_passwd($tmp_prefs['email']['passwd']);
-			}
-			// cleanup and return
-			if ($do_free_me)
-			{
-				unset ($GLOBALS['egw']->msg);
-			}
-			return $email_passwd;
-		}
-		*/
-
-		// This is not the best place for it, but it needs to be shared bewteen Aeromail and SM
-		/**
-		 * create email preferences
-		 *
-		 * This is not the best place for it, but it needs to be shared between Aeromail and SM
-		 * @param $prefs
-		 * @param $account_id -optional defaults to : phpgw_info['user']['account_id']
-		 */
-		function create_emailpreferences($prefs='',$accountid='')
-		{
-			return $GLOBALS['egw']->preferences->create_email_preferences($accountid);
-			// ----  Create the email Message Class  if needed  -----
-			if (is_object($GLOBALS['egw']->msg))
-			{
-				$do_free_me = False;
-			}
-			else
-			{
-				$GLOBALS['egw']->msg =& CreateObject('email.mail_msg');
-				$do_free_me = True;
+				$ampm = ' am';
 			}
 
-			// this sets the preferences into the phpgw_info structure
-			$GLOBALS['egw']->msg->create_email_preferences();
+			$h12 %= 12;
 
-			// cleanup and return
-			if ($do_free_me)
+			if ($h12 == 0 && $hour)
 			{
-				unset ($GLOBALS['egw']->msg);
+				$h12 = 12;
+			}
+			if ($h12 == 0 && !$hour)
+			{
+				$h12 = 0;
 			}
 		}
-
-		/*
-		function create_emailpreferences($prefs,$accountid='')
+		else
 		{
-			$account_id = get_account_id($accountid);
+			$h12 = $hour;
+		}
 
-			// NEW EMAIL PASSWD METHOD (shared between SM and aeromail)
-			$prefs['email']['passwd'] = $this->get_email_passwd_ex();
+		if ($sec !== '')
+		{
+			$sec = ':'.$sec;
+		}
 
-			// Add default preferences info
-			if (!isset($prefs['email']['userid']))
+		return $h12.':'.$min.$sec.$ampm;
+	}
+
+	/**
+	 * Format an email address according to the system standard
+	 *
+	 * Convert all european special chars to ascii and fallback to the accountname, if nothing left eg. chiniese
+	 *
+	 * @param string $first firstname
+	 * @param string $last lastname
+	 * @param string $account account-name (lid)
+	 * @param string $domain=null domain-name or null to use eGW's default domain $GLOBALS['egw_info']['server']['mail_suffix]
+	 * @return string with email address
+	 */
+	static function email_address($first,$last,$account,$domain=null)
+	{
+		//echo "<p align=right>common::email_address('$first','$last','$account')";
+		// convert all european special chars to ascii, (c) RalfBecker-AT-egroupware.org ;-)
+		static $extra = array(
+			'&szlig;' => 'ss',
+			' ' => '',
+		);
+		foreach (array('first','last','account') as $name)
+		{
+			$$name = htmlentities($$name,ENT_QUOTES,$GLOBALS['egw']->translation->charset());
+			$$name = str_replace(array_keys($extra),array_values($extra),$$name);
+			$$name = preg_replace('/&([aAuUoO])uml;/','\\1e',$$name);	// replace german umlauts with the letter plus one 'e'
+			$$name = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/','\\1',$$name);	// remove all types of acents
+			$$name = preg_replace('/&([a-zA-Z]+|#[0-9]+|);/','',$$name);	// remove all other entities
+		}
+		//echo " --> ('$first', '$last', '$account')";
+		if (!$first && !$last)	// fallback to the account-name, if real names contain only special chars
+		{
+			$first = '';
+			$last = $account;
+		}
+		if (!$first || !$last)
+		{
+			$dot = $underscore = '';
+		}
+		else
+		{
+			$dot = '.';
+			$underscore = '_';
+		}
+		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
+
+		$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
+			array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
+			$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
+			($domain ? '@'.$domain : '');
+		//echo " = '$email'</p>\n";
+		return $email;
+	}
+
+	/**
+	 * create email preferences
+	 *
+	 * This is not the best place for it, but it needs to be shared between Aeromail and SM
+	 * @param $prefs
+	 * @param $account_id -optional defaults to : phpgw_info['user']['account_id']
+	 */
+	function create_emailpreferences($prefs='',$accountid='')
+	{
+		return $GLOBALS['egw']->preferences->create_email_preferences($accountid);
+		// ----  Create the email Message Class  if needed  -----
+		if (is_object($GLOBALS['egw']->msg))
+		{
+			$do_free_me = False;
+		}
+		else
+		{
+			$GLOBALS['egw']->msg =& CreateObject('email.mail_msg');
+			$do_free_me = True;
+		}
+
+		// this sets the preferences into the phpgw_info structure
+		$GLOBALS['egw']->msg->create_email_preferences();
+
+		// cleanup and return
+		if ($do_free_me)
+		{
+			unset ($GLOBALS['egw']->msg);
+		}
+	}
+
+	/**
+	 * ?
+	 *
+	 * This will be moved into the applications area
+	 */
+	static function check_code($code)
+	{
+		$s = '<br>';
+		switch ($code)
+		{
+			case 13:	$s .= lang('Your message has been sent');break;
+			case 14:	$s .= lang('New entry added sucessfully');break;
+			case 15:	$s .= lang('Entry updated sucessfully');	break;
+			case 16:	$s .= lang('Entry has been deleted sucessfully'); break;
+			case 18:	$s .= lang('Password has been updated');	break;
+			case 38:	$s .= lang('Password could not be changed');	break;
+			case 19:	$s .= lang('Session has been killed');	break;
+			case 27:	$s .= lang('Account has been updated');	break;
+			case 28:	$s .= lang('Account has been created');	break;
+			case 29:	$s .= lang('Account has been deleted');	break;
+			case 30:	$s .= lang('Your settings have been updated'); break;
+			case 31:	$s .= lang('Group has been added');	break;
+			case 32:	$s .= lang('Group has been deleted');	break;
+			case 33:	$s .= lang('Group has been updated');	break;
+			case 34:	$s .= lang('Account has been deleted') . '<p>'
+					. lang('Error deleting %1 %2 directory',lang('users'),' '.lang('private').' ')
+					. ',<br>' . lang('Please %1 by hand',lang('delete')) . '<br><br>'
+					. lang('To correct this error for the future you will need to properly set the')
+					. '<br>' . lang('permissions to the files/users directory')
+					. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
+					. $GLOBALS['egw_info']['server']['files_dir'] . '/users/');
+				break;
+			case 35:	$s .= lang('Account has been updated') . '<p>'
+					. lang('Error renaming %1 %2 directory',lang('users'),
+					' '.lang('private').' ')
+					. ',<br>' . lang('Please %1 by hand',
+					lang('rename')) . '<br><br>'
+					. lang('To correct this error for the future you will need to properly set the')
+					. '<br>' . lang('permissions to the files/users directory')
+					. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
+					. $GLOBALS['egw_info']['server']['files_dir'] . '/users/');
+				break;
+			case 36:	$s .= lang('Account has been created') . '<p>'
+					. lang('Error creating %1 %2 directory',lang('users'),
+					' '.lang('private').' ')
+					. ',<br>' . lang('Please %1 by hand',
+					lang('create')) . '<br><br>'
+					. lang('To correct this error for the future you will need to properly set the')
+					. '<br>' . lang('permissions to the files/users directory')
+					. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
+					. $GLOBALS['egw_info']['server']['files_dir'] . '/users/');
+				break;
+			case 37:	$s .= lang('Group has been added') . '<p>'
+					. lang('Error creating %1 %2 directory',lang('groups'),' ')
+					. ',<br>' . lang('Please %1 by hand',
+					lang('create')) . '<br><br>'
+					. lang('To correct this error for the future you will need to properly set the')
+					. '<br>' . lang('permissions to the files/users directory')
+					. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
+					. $GLOBALS['egw_info']['server']['files_dir'] . '/groups/');
+				break;
+			case 38:	$s .= lang('Group has been deleted') . '<p>'
+					. lang('Error deleting %1 %2 directory',lang('groups'),' ')
+					. ',<br>' . lang('Please %1 by hand',
+					lang('delete')) . '<br><br>'
+					. lang('To correct this error for the future you will need to properly set the')
+					. '<br>' . lang('permissions to the files/users directory')
+					. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
+					. $GLOBALS['egw_info']['server']['files_dir'] . '/groups/');
+				break;
+			case 39:	$s .= lang('Group has been updated') . '<p>'
+					. lang('Error renaming %1 %2 directory',lang('groups'),' ')
+					. ',<br>' . lang('Please %1 by hand',
+					lang('rename')) . '<br><br>'
+					. lang('To correct this error for the future you will need to properly set the')
+					. '<br>' . lang('permissions to the files/users directory')
+					. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
+					. $GLOBALS['egw_info']['server']['files_dir'] . '/groups/');
+				break;
+			case 40: $s .= lang('You have not entered a title').'.';
+				break;
+			case 41: $s .= lang('You have not entered a valid time of day').'.';
+				break;
+			case 42: $s .= lang('You have not entered a valid date').'.';
+				break;
+			case 43: $s .= lang('You have not entered participants').'.';
+				break;
+			default:	return '';
+		}
+		return $s;
+	}
+
+	/**
+	 * process error message
+	 *
+	 * @param $error error
+	 * @param $line line
+	 * @param $file file
+	 */
+	static function phpgw_error($error,$line = '', $file = '')
+	{
+		echo '<p><b>eGroupWare internal error:</b><p>'.$error;
+		if ($line)
+		{
+			echo 'Line: '.$line;
+		}
+		if ($file)
+		{
+			echo 'File: '.$file;
+		}
+		echo '<p>Your session has been halted.';
+		exit;
+	}
+
+	/**
+	 * create phpcode from array
+	 *
+	 * @param $array - array
+	 */
+	static function create_phpcode_from_array($array)
+	{
+		while (list($key, $val) = each($array))
+		{
+			if (is_array($val))
 			{
-				if ($GLOBALS['egw_info']['server']['mail_login_type'] == 'vmailmgr')
+				while (list($key2, $val2) = each($val))
 				{
-					$prefs['email']['userid'] = $GLOBALS['egw']->accounts->id2name($account_id)
-						. '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
-				}
-				else
-				{
-					$prefs['email']['userid'] = $GLOBALS['egw']->accounts->id2name($account_id);
-				}
-			}
-			// Set Server Mail Type if not defined
-			if (empty($GLOBALS['egw_info']['server']['mail_server_type']))
-			{
-				$GLOBALS['egw_info']['server']['mail_server_type'] = 'imap';
-			}
-
-			// OLD EMAIL PASSWD METHOD
-			if (!isset($prefs['email']['passwd']))
-			{
-				$prefs['email']['passwd'] = $GLOBALS['egw_info']['user']['passwd'];
-			}
-			else
-			{
-				$prefs['email']['passwd'] = $this->decrypt($prefs['email']['passwd']);
-			}
-			// NEW EMAIL PASSWD METHOD Located at the begining of this function
-
-			if (!isset($prefs['email']['address']))
-			{
-				$prefs['email']['address'] = $GLOBALS['egw']->accounts->id2name($account_id)
-					. '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
-			}
-			if (!isset($prefs['email']['mail_server']))
-			{
-				$prefs['email']['mail_server'] = $GLOBALS['egw_info']['server']['mail_server'];
-			}
-			if (!isset($prefs['email']['mail_server_type']))
-			{
-				$prefs['email']['mail_server_type'] = $GLOBALS['egw_info']['server']['mail_server_type'];
-			}
-			if (!isset($prefs['email']['imap_server_type']))
-			{
-				$prefs['email']['imap_server_type'] = $GLOBALS['egw_info']['server']['imap_server_type'];
-			}
-			// These sets the mail_port server variable
-			if ($prefs['email']['mail_server_type']=='imap')
-			{
-				$prefs['email']['mail_port'] = '143';
-			}
-			elseif ($prefs['email']['mail_server_type']=='pop3')
-			{
-				$prefs['email']['mail_port'] = '110';
-			}
-			elseif ($prefs['email']['mail_server_type']=='imaps')
-			{
-				$prefs['email']['mail_port'] = '993';
-			}
-			elseif ($prefs['email']['mail_server_type']=='pop3s')
-			{
-				$prefs['email']['mail_port'] = '995';
-			}
-			// This is going to be used to switch to the nntp class
-			if (isset($GLOBALS['egw_info']['flags']['newsmode']) &&
-				$GLOBALS['egw_info']['flags']['newsmode'])
-			{
-				$prefs['email']['mail_server_type'] = 'nntp';
-			}
-			// DEBUG
-			//echo "<br>prefs['email']['passwd']: " .$prefs['email']['passwd'] .'<br>';
-			return $prefs;
-		}
-		*/
-
-		// This will be moved into the applications area.
-		/**
-		 * ?
-		 *
-		 * This will be moved into the applications area
-		 */
-		function check_code($code)
-		{
-			$s = '<br>';
-			switch ($code)
-			{
-				case 13:	$s .= lang('Your message has been sent');break;
-				case 14:	$s .= lang('New entry added sucessfully');break;
-				case 15:	$s .= lang('Entry updated sucessfully');	break;
-				case 16:	$s .= lang('Entry has been deleted sucessfully'); break;
-				case 18:	$s .= lang('Password has been updated');	break;
-				case 38:	$s .= lang('Password could not be changed');	break;
-				case 19:	$s .= lang('Session has been killed');	break;
-				case 27:	$s .= lang('Account has been updated');	break;
-				case 28:	$s .= lang('Account has been created');	break;
-				case 29:	$s .= lang('Account has been deleted');	break;
-				case 30:	$s .= lang('Your settings have been updated'); break;
-				case 31:	$s .= lang('Group has been added');	break;
-				case 32:	$s .= lang('Group has been deleted');	break;
-				case 33:	$s .= lang('Group has been updated');	break;
-				case 34:	$s .= lang('Account has been deleted') . '<p>'
-						. lang('Error deleting %1 %2 directory',lang('users'),' '.lang('private').' ')
-						. ',<br>' . lang('Please %1 by hand',lang('delete')) . '<br><br>'
-						. lang('To correct this error for the future you will need to properly set the')
-						. '<br>' . lang('permissions to the files/users directory')
-						. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
-						. $GLOBALS['egw_info']['server']['files_dir'] . '/users/');
-					break;
-				case 35:	$s .= lang('Account has been updated') . '<p>'
-						. lang('Error renaming %1 %2 directory',lang('users'),
-						' '.lang('private').' ')
-						. ',<br>' . lang('Please %1 by hand',
-						lang('rename')) . '<br><br>'
-						. lang('To correct this error for the future you will need to properly set the')
-						. '<br>' . lang('permissions to the files/users directory')
-						. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
-						. $GLOBALS['egw_info']['server']['files_dir'] . '/users/');
-					break;
-				case 36:	$s .= lang('Account has been created') . '<p>'
-						. lang('Error creating %1 %2 directory',lang('users'),
-						' '.lang('private').' ')
-						. ',<br>' . lang('Please %1 by hand',
-						lang('create')) . '<br><br>'
-						. lang('To correct this error for the future you will need to properly set the')
-						. '<br>' . lang('permissions to the files/users directory')
-						. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
-						. $GLOBALS['egw_info']['server']['files_dir'] . '/users/');
-					break;
-				case 37:	$s .= lang('Group has been added') . '<p>'
-						. lang('Error creating %1 %2 directory',lang('groups'),' ')
-						. ',<br>' . lang('Please %1 by hand',
-						lang('create')) . '<br><br>'
-						. lang('To correct this error for the future you will need to properly set the')
-						. '<br>' . lang('permissions to the files/users directory')
-						. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
-						. $GLOBALS['egw_info']['server']['files_dir'] . '/groups/');
-					break;
-				case 38:	$s .= lang('Group has been deleted') . '<p>'
-						. lang('Error deleting %1 %2 directory',lang('groups'),' ')
-						. ',<br>' . lang('Please %1 by hand',
-						lang('delete')) . '<br><br>'
-						. lang('To correct this error for the future you will need to properly set the')
-						. '<br>' . lang('permissions to the files/users directory')
-						. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
-						. $GLOBALS['egw_info']['server']['files_dir'] . '/groups/');
-					break;
-				case 39:	$s .= lang('Group has been updated') . '<p>'
-						. lang('Error renaming %1 %2 directory',lang('groups'),' ')
-						. ',<br>' . lang('Please %1 by hand',
-						lang('rename')) . '<br><br>'
-						. lang('To correct this error for the future you will need to properly set the')
-						. '<br>' . lang('permissions to the files/users directory')
-						. '<br>' . lang('On *nix systems please type: %1','chmod 770 '
-						. $GLOBALS['egw_info']['server']['files_dir'] . '/groups/');
-					break;
-				case 40: $s .= lang('You have not entered a title').'.';
-					break;
-				case 41: $s .= lang('You have not entered a valid time of day').'.';
-					break;
-				case 42: $s .= lang('You have not entered a valid date').'.';
-					break;
-				case 43: $s .= lang('You have not entered participants').'.';
-					break;
-				default:	return '';
-			}
-			return $s;
-		}
-		/**
-		 * process error message
-		 *
-		 * @param $error error
-		 * @param $line line
-		 * @param $file file
-		 */
-		function phpgw_error($error,$line = '', $file = '')
-		{
-			echo '<p><b>eGroupWare internal error:</b><p>'.$error;
-			if ($line)
-			{
-				echo 'Line: '.$line;
-			}
-			if ($file)
-			{
-				echo 'File: '.$file;
-			}
-			echo '<p>Your session has been halted.';
-			exit;
-		}
-
-		/**
-		 * create phpcode from array
-		 *
-		 * @param $array - array
-		 */
-		function create_phpcode_from_array($array)
-		{
-			while (list($key, $val) = each($array))
-			{
-				if (is_array($val))
-				{
-					while (list($key2, $val2) = each($val))
+					if (is_array($val2))
 					{
-						if (is_array($val2))
+						while (list($key3, $val3) = each ($val2))
 						{
-							while (list($key3, $val3) = each ($val2))
+							if (is_array($val3))
 							{
-								if (is_array($val3))
+								while (list($key4, $val4) = each ($val3))
 								{
-									while (list($key4, $val4) = each ($val3))
-									{
-										$s .= "\$GLOBALS['egw_info']['" . $key . "']['" . $key2 . "']['" . $key3 . "']['" .$key4 . "']='" . $val4 . "';";
-										$s .= "\n";
-									}
-								}
-								else
-								{
-									$s .= "\$GLOBALS['egw_info']['" . $key . "']['" . $key2 . "']['" . $key3 . "']='" . $val3 . "';";
+									$s .= "\$GLOBALS['egw_info']['" . $key . "']['" . $key2 . "']['" . $key3 . "']['" .$key4 . "']='" . $val4 . "';";
 									$s .= "\n";
 								}
 							}
-						}
-						else
-						{
-							$s .= "\$GLOBALS['egw_info']['" . $key ."']['" . $key2 . "']='" . $val2 . "';";
-							$s .= "\n";
-						}
-					}
-				}
-				else
-				{
-					$s .= "\$GLOBALS['egw_info']['" . $key . "']='" . $val . "';";
-					$s .= "\n";
-				}
-			}
-			return $s;
-		}
-
-		// This will return the full phpgw_info array, used for debugging
-		/**
-		 * return the full phpgw_info array for debugging
-		 *
-		 * @param array - array
-		 */
-		function debug_list_array_contents($array)
-		{
-			while (list($key, $val) = each($array))
-			{
-				if (is_array($val))
-				{
-					while (list($key2, $val2) = each($val))
-					{
-						if (is_array($val2))
-						{
-							while (list($key3, $val3) = each ($val2))
+							else
 							{
-								if (is_array($val3))
-								{
-									while (list($key4, $val4) = each ($val3))
-									{
-										echo $$array . "[$key][$key2][$key3][$key4]=$val4<br>";
-									}
-								}
-								else
-								{
-									echo $$array . "[$key][$key2][$key3]=$val3<br>";
-								}
+								$s .= "\$GLOBALS['egw_info']['" . $key . "']['" . $key2 . "']['" . $key3 . "']='" . $val3 . "';";
+								$s .= "\n";
 							}
 						}
-						else
-						{
-							echo $$array . "[$key][$key2]=$val2<br>";
-						}
+					}
+					else
+					{
+						$s .= "\$GLOBALS['egw_info']['" . $key ."']['" . $key2 . "']='" . $val2 . "';";
+						$s .= "\n";
 					}
 				}
-				else
+			}
+			else
+			{
+				$s .= "\$GLOBALS['egw_info']['" . $key . "']='" . $val . "';";
+				$s .= "\n";
+			}
+		}
+		return $s;
+	}
+
+	// This will return the full phpgw_info array, used for debugging
+	/**
+	 * return the full phpgw_info array for debugging
+	 *
+	 * @param array - array
+	 */
+	static function debug_list_array_contents($array)
+	{
+		while (list($key, $val) = each($array))
+		{
+			if (is_array($val))
+			{
+				while (list($key2, $val2) = each($val))
 				{
-					echo $$array . "[$key]=$val<br>";
+					if (is_array($val2))
+					{
+						while (list($key3, $val3) = each ($val2))
+						{
+							if (is_array($val3))
+							{
+								while (list($key4, $val4) = each ($val3))
+								{
+									echo $$array . "[$key][$key2][$key3][$key4]=$val4<br>";
+								}
+							}
+							else
+							{
+								echo $$array . "[$key][$key2][$key3]=$val3<br>";
+							}
+						}
+					}
+					else
+					{
+						echo $$array . "[$key][$key2]=$val2<br>";
+					}
 				}
 			}
-		}
-
-		// This will return a list of functions in the API
-		/**
-		 * return a list of functionsin the API
-		 *
-		 */
-		function debug_list_core_functions()
-		{
-			echo '<br><b>core functions</b><br>';
-			echo '<pre>';
-			chdir(EGW_INCLUDE_ROOT . '/phpgwapi');
-			system("grep -r '^[ \t]*function' *");
-			echo '</pre>';
-		}
-
-		var $nextid_table = 'egw_nextid';
-
-		/**
-		 * Return a value for the next id an app/class may need to insert values into LDAP
-		 *
-		 * @param string $appname app-name
-		 * @param int $min=0 if != 0 minimum id
-		 * @param int $max=0 if != 0 maximum id allowed, if it would be exceeded we return false
-		 * @return int/boolean the next id or false if $max given and exceeded
-		 */
-		function next_id($appname,$min=0,$max=0)
-		{
-			if (!$appname)
+			else
 			{
-				return -1;
+				echo $$array . "[$key]=$val<br>";
 			}
-
-			$GLOBALS['egw']->db->select($this->nextid_table,'id',array('appname' => $appname),__LINE__,__FILE__);
-			$id = $GLOBALS['egw']->db->next_record() ? $GLOBALS['egw']->db->f('id') : 0;
-
-			if ($max && $id >= $max)
-			{
-				return False;
-			}
-			++$id;
-
-			if($id < $min) $id = $min;
-
-			$GLOBALS['egw']->db->insert($this->nextid_table,array('id' => $id),array('appname' => $appname),__LINE__,__FILE__);
-
-			return (int)$id;
 		}
+	}
 
-		/**
-		 * Return a value for the last id entered, which an app may need to check values for LDAP
-		 *
-		 * @param string $appname app-name
-		 * @param int $min=0 if != 0 minimum id
-		 * @param int $max=0 if != 0 maximum id allowed, if it would be exceeded we return false
-		 * @return int current id in the next_id table for a particular app/class or -1 for no app and false if $max is exceeded.
-		 */
-		function last_id($appname,$min=0,$max=0)
+	// This will return a list of functions in the API
+	/**
+	 * return a list of functionsin the API
+	 *
+	 */
+	static function debug_list_core_functions()
+	{
+		echo '<br><b>core functions</b><br>';
+		echo '<pre>';
+		chdir(EGW_INCLUDE_ROOT . '/phpgwapi');
+		system("grep -r '^[ \t]*function' *");
+		echo '</pre>';
+	}
+
+	const NEXTID_TABLE = 'egw_nextid';
+
+	/**
+	 * Return a value for the next id an app/class may need to insert values into LDAP
+	 *
+	 * @param string $appname app-name
+	 * @param int $min=0 if != 0 minimum id
+	 * @param int $max=0 if != 0 maximum id allowed, if it would be exceeded we return false
+	 * @return int/boolean the next id or false if $max given and exceeded
+	 */
+	static function next_id($appname,$min=0,$max=0)
+	{
+		if (!$appname)
 		{
-			if (!$appname)
-			{
-				return -1;
-			}
-
-			$GLOBALS['egw']->db->select($this->nextid_table,'id',array('appname' => $appname),__LINE__,__FILE__);
-			$id = $GLOBALS['egw']->db->next_record() ? $GLOBALS['egw']->db->f('id') : 0;
-
-			if (!$id || $id < $min)
-			{
-				return $this->next_id($appname,$min,$max);
-			}
-			if ($max && $id > $max)
-			{
-				return False;
-			}
-			return (int)$id;
+			return -1;
 		}
 
-		/**
-		 * gets an eGW conformat referer from $_SERVER['HTTP_REFERER'], suitable for direct use in the link function
-		 *
-		 * @param string $default='' default to use if referer is not set by webserver or not determinable
-		 * @param string $referer='' referer string to use, default ('') use $_SERVER['HTTP_REFERER']
-		 * @return string
-		 */
-		function get_referer($default='',$referer='')
+		$id = (int) $GLOBALS['egw']->db->select(self::NEXTID_TABLE,'id',array('appname' => $appname),__LINE__,__FILE__)->fetchSingle();
+
+		if ($max && $id >= $max)
 		{
-			if (!$referer) $referer = $_SERVER['HTTP_REFERER'];
-
-			$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
-			if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
-			{
-				$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
-			}
-			if (strlen($webserver_url) > 1)
-			{
-				list(,$referer) = explode($webserver_url,$referer,2);
-			}
-			$referer = str_replace('/etemplate/process_exec.php','/index.php',$referer);
-
-			if (empty($referer)) $referer = $default;
-
-			return $referer;
+			return False;
 		}
+		++$id;
 
-		// some depricated functions for the migration
-		function phpgw_exit($call_footer = False)
+		if($id < $min) $id = $min;
+
+		$GLOBALS['egw']->db->insert(self::NEXTID_TABLE,array('id' => $id),array('appname' => $appname),__LINE__,__FILE__);
+
+		return (int)$id;
+	}
+
+	/**
+	 * Return a value for the last id entered, which an app may need to check values for LDAP
+	 *
+	 * @param string $appname app-name
+	 * @param int $min=0 if != 0 minimum id
+	 * @param int $max=0 if != 0 maximum id allowed, if it would be exceeded we return false
+	 * @return int current id in the next_id table for a particular app/class or -1 for no app and false if $max is exceeded.
+	 */
+	static function last_id($appname,$min=0,$max=0)
+	{
+		if (!$appname)
 		{
-			$this->egw_exit($call_footer);
+			return -1;
 		}
 
-		function phpgw_final()
-		{
-			$this->egw_final();
-		}
+		$id = (int)$GLOBALS['egw']->db->select(self::NEXTID_TABLE,'id',array('appname' => $appname),__LINE__,__FILE__)->fetchSingle();
 
-		function phpgw_header()
+		if (!$id || $id < $min)
 		{
-			$this->egw_header();
+			return self::next_id($appname,$min,$max);
 		}
+		if ($max && $id > $max)
+		{
+			return False;
+		}
+		return $id;
+	}
 
-		function phpgw_footer()
+	/**
+	 * gets an eGW conformat referer from $_SERVER['HTTP_REFERER'], suitable for direct use in the link function
+	 *
+	 * @param string $default='' default to use if referer is not set by webserver or not determinable
+	 * @param string $referer='' referer string to use, default ('') use $_SERVER['HTTP_REFERER']
+	 * @return string
+	 */
+	static function get_referer($default='',$referer='')
+	{
+		if (!$referer) $referer = $_SERVER['HTTP_REFERER'];
+
+		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
+		if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
 		{
-			$this->egw_footer();
+			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
 		}
-	}//end common class
+		if (strlen($webserver_url) > 1)
+		{
+			list(,$referer) = explode($webserver_url,$referer,2);
+		}
+		$referer = str_replace('/etemplate/process_exec.php','/index.php',$referer);
+
+		if (empty($referer)) $referer = $default;
+
+		return $referer;
+	}
+
+	// some depricated functions for the migration
+	static function phpgw_exit($call_footer = False)
+	{
+		self::egw_exit($call_footer);
+	}
+
+	static function phpgw_final()
+	{
+		self::egw_final();
+	}
+
+	static function phpgw_header()
+	{
+		self::egw_header();
+	}
+
+	static function phpgw_footer()
+	{
+		self::egw_footer();
+	}
+}

From 486a32e86db4ecd706e4e9e73ffb05fcea58c2c2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Mar 2009 12:58:24 +0000
Subject: [PATCH 083/510] Refractured eTemplate to use: - the etemplate_request
 object which stores the request data in the   a) session (as before) or   b)
 compressed and encrypted in the form transmitted to the user   Benefit of b)
 is that the session does not grow and the form can   be submitted as long as
 the session exists, as we need no garbadge   collection. Of cause more data
 needs to be submitt between   browser and webserver. b) is choosen automatic
 if mcrypt and   gzcompress are available, but can be turned off via setting  
 etemplate_request::$request_class = 'etemplate_request_session'; - static
 class variables instead of the before used global ones --> This new version
 of eTemplate is fully backward compatible with 1.6!

---
 .../inc/class.ajax_select_widget.inc.php      |  582 +++++-----
 etemplate/inc/class.boetemplate.inc.php       |  187 +--
 etemplate/inc/class.date_widget.inc.php       |   13 +-
 etemplate/inc/class.editor.inc.php            |    4 +-
 etemplate/inc/class.etemplate.inc.php         |  577 +++++-----
 etemplate/inc/class.etemplate_request.inc.php |  372 ++++--
 .../class.etemplate_request_session.inc.php   |  171 +++
 etemplate/inc/class.link_widget.inc.php       |   22 +-
 etemplate/inc/class.nextmatch_widget.inc.php  |   16 +-
 etemplate/inc/class.select_widget.inc.php     | 1013 ++++++++---------
 etemplate/inc/class.soetemplate.inc.php       |   42 +-
 etemplate/inc/class.tab_widget.inc.php        |   34 +-
 etemplate/inc/class.uietemplate_gtk.inc.php   |    2 +-
 etemplate/inc/class.xul_io.inc.php            |    2 +-
 14 files changed, 1609 insertions(+), 1428 deletions(-)
 create mode 100644 etemplate/inc/class.etemplate_request_session.inc.php

diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php
index f8d0476953..f2d6403734 100644
--- a/etemplate/inc/class.ajax_select_widget.inc.php
+++ b/etemplate/inc/class.ajax_select_widget.inc.php
@@ -1,134 +1,208 @@
 <?php
-	/**
-	 * eGroupWare eTemplate Extension - AJAX Select Widget
-	 *
-	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	 * @package etemplate
-	 * @subpackage extensions
-	 * @link http://www.egroupware.org
-	 * @author Nathan Gray <nathangray@sourceforge.net>
-	 * @version $Id$
-	 */
+/**
+ * eGroupWare eTemplate Extension - AJAX Select Widget
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage extensions
+ * @link http://www.egroupware.org
+ * @author Nathan Gray <nathangray@sourceforge.net>
+ * @version $Id$
+ */
 
-    /**
-	 * AJAX Select Widget
-	 *
-	 * Using AJAX, this widget allows a type-ahead find similar to a ComboBox, where as the user enters information,
-	 * a drop-down box is populated with the n closest matches.  If the user clicks on an item in the drop-down, that
-	 * value is selected.  
-	 * n is the maximum number of results set in the user's preferences.
-	 * The user is restricted to selecting values in the list.
-	 * This widget can get data from any function that can provide data to a nextmatch widget.
-	 * This widget is generating html, so it does not work (without an extra implementation) in an other UI
-	 */
-	class ajax_select_widget
+/**
+ * AJAX Select Widget
+ *
+ * Using AJAX, this widget allows a type-ahead find similar to a ComboBox, where as the user enters information,
+ * a drop-down box is populated with the n closest matches.  If the user clicks on an item in the drop-down, that
+ * value is selected.
+ * n is the maximum number of results set in the user's preferences.
+ * The user is restricted to selecting values in the list.
+ * This widget can get data from any function that can provide data to a nextmatch widget.
+ * This widget is generating html, so it does not work (without an extra implementation) in an other UI
+ */
+class ajax_select_widget
+{
+	var $public_functions = array(
+		'pre_process' => True,
+		'post_process' => True,
+		'ajax_search'	=>	True,
+	);
+	var $human_name = 'AJAX Select';	// this is the name for the editor
+
+	private $debug = false;
+
+	function ajax_select_widget($ui='')
 	{
-		var $public_functions = array(
-			'pre_process' => True,
-			'post_process' => True,
-			'ajax_search'	=>	True,
-		);
-		var $human_name = 'AJAX Select';	// this is the name for the editor
 
-		private $debug = false;
-
-		function ajax_select_widget($ui='')
+		switch($ui)
 		{
+			case '':
+			case 'html':
+				$this->ui = 'html';
+				break;
+			default:
+				echo "UI='$ui' not implemented";
+		}
+		return 0;
+	}
+
+	/**
+	* pre-processing of the extension
+	*
+	* This function is called before the extension gets rendered
+	*
+	* @param string $name form-name of the control
+	* @param mixed &$value value / existing content, can be modified
+	* @param array &$cell array with the widget, can be modified for ui-independent widgets
+	* @param array &$readonlys names of widgets as key, to be made readonly
+	* @param mixed &$extension_data data the extension can store persisten between pre- and post-process
+	* @param object &$tmpl reference to the template we belong too
+	* @return boolean true if extra label is allowed, false otherwise
+	*/
+	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+	{
+		if($this->debug) {
+			echo __METHOD__ . '<br />';
+			printf("Name:%20s<br />", $name);
+			echo 'Value:';
+			_debug_array($value);
+			echo 'Cell:';
+			_debug_array($cell);
+
+			echo 'Readonlys:';
+			_debug_array($readonlys);
+
+			echo 'Extension_data:';
+			_debug_array($extension_data);
 
-			switch($ui)
-			{
-				case '':
-				case 'html':
-					$this->ui = 'html';
-					break;
-				default:
-					echo "UI='$ui' not implemented";
-			}
-			return 0;
 		}
 
-		/**
-		* pre-processing of the extension
-		*
-		* This function is called before the extension gets rendered
-		*
-		* @param string $name form-name of the control
-		* @param mixed &$value value / existing content, can be modified
-		* @param array &$cell array with the widget, can be modified for ui-independent widgets 
-		* @param array &$readonlys names of widgets as key, to be made readonly
-		* @param mixed &$extension_data data the extension can store persisten between pre- and post-process
-		* @param object &$tmpl reference to the template we belong too
-		* @return boolean true if extra label is allowed, false otherwise
-		*/
-		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
-		{
-			if($this->debug) {
-				echo __METHOD__ . '<br />';
-				printf("Name:%20s<br />", $name);
-				echo 'Value:';
-				_debug_array($value);
-				echo 'Cell:';
-				_debug_array($cell);
+		// Get Options
+		$options = array();
+		if(!is_array($cell['size'])) {
+			list(
+				$options['get_rows'],
+				$options['get_title'],
+				$options['id_field'],
+				$options['template'],
+				$options['filter'],
+				$options['filter2'],
+				$options['link'],
+				$options['icon']
+			) = explode(',', $cell['size']);
+		} else {
+			$options = $cell['size'];
+		}
 
-				echo 'Readonlys:';
-				_debug_array($readonlys);
+		if(is_array($value)) {
+			$options = array_merge($options, $value);
+		}
 
-				echo 'Extension_data:';
-				_debug_array($extension_data);
+		if(!$options['template']) {
+			$options['template'] = 'etemplate.ajax_select_widget.row';
+		}
 
-			}
+		$onchange = ($cell['onchange'] ? $cell['onchange'] : 'false');
 
-			// Get Options
-			$options = array();
-			if(!is_array($cell['size'])) {
-				list(
-					$options['get_rows'],
-					$options['get_title'],
-					$options['id_field'],
-					$options['template'],
-					$options['filter'], 
-					$options['filter2'],
-					$options['link'],
-					$options['icon']
-				) = explode(',', $cell['size']);
+		// Set current value
+		if(!is_array($value)) {
+			$current_value = $value;
+		} elseif($value[$options['id_field']]) {
+			$current_value = $value[$options['id_field']];
+		}
+		$extension_data['old_value'] = $value;
+
+		list($title_app, $title_class, $title_method) = explode('.', $options['get_title']);
+		if($title_app && $title_class) {
+			if (is_object($GLOBALS[$title_class])) {       // use existing instance (put there by a previous CreateObject)
+				$title_obj =& $GLOBALS[$title_class];
 			} else {
-				$options = $cell['size'];
+				$title_obj =& CreateObject($title_app . '.' . $title_class);
+			}
+		}
+		if(!is_object($title_obj) || !method_exists($title_obj,$title_method)) {
+			echo "$entry_app.$entry_class.$entry_method is not a valid method for getting the title";
+		} elseif($current_value) {
+			$title = $title_obj->$title_method($current_value);
+		}
+
+		// Check get_rows method
+		list($get_rows_app, $get_rows_class, $get_rows_method) = explode('.', $options['get_rows']);
+		if($get_rows_app && $get_rows_class) {
+			if (is_object($GLOBALS[$get_rows_class])) {       // use existing instance (put there by a previous CreateObject)
+				$get_rows_obj =& $GLOBALS[$get_rows_class];
+			} else {
+				$get_rows_obj =& CreateObject($get_rows_app . '.' . $get_rows_class);
 			}
 
-			if(is_array($value)) {
-				$options = array_merge($options, $value);
+			if(!is_object($get_rows_obj) || !method_exists($get_rows_obj, $get_rows_method)) {
+				echo "$get_rows_app.$get_rows_class.$get_rows_method is not a valid method for getting the rows";
 			}
+		}
 
-			if(!$options['template']) {
-				$options['template'] = 'etemplate.ajax_select_widget.row';
+
+		// Set up widget
+		$cell['type'] = 'template';
+		$cell['size'] = $cell['name'];
+		$value = array('value' => $current_value, 'search' => $title);
+		$widget =& new etemplate('etemplate.ajax_select_widget');
+		$widget->no_onclick = True;
+
+		// Link if readonly & link is set
+		$search =& $widget->get_widget_by_name('search');
+		if(($cell['readonly'] || $readonlys['search']) && $options['link']) {
+			$cell['readonly'] = false;
+			if(!is_array($readonlys)) {
+				$readonlys = array('search' => true);
+			} else {
+				$readonlys['search'] = true;
 			}
+			$search['type'] = 'label';
+			$search['no_lang'] = 1;
+			$search['size'] = ',' . $options['link'];
+			$extension_data['readonly'] = true;
+		} else {
+			$search['type'] = 'text';
+			$search['size'] = '';
+		}
 
-			$onchange = ($cell['onchange'] ? $cell['onchange'] : 'false');
+		// Icon
+		$icon =& $widget->get_widget_by_path('/0/1A');
+		$icon['name'] = $options['icon'];
 
-			// Set current value
-			if(!is_array($value)) {
-				$current_value = $value;
-			} elseif($value[$options['id_field']]) {
-				$current_value = $value[$options['id_field']];
-			}
-			$extension_data['old_value'] = $value;
+		$cell['obj'] = &$widget;
 
-			list($title_app, $title_class, $title_method) = explode('.', $options['get_title']);
-			if($title_app && $title_class) {
-				if (is_object($GLOBALS[$title_class])) {       // use existing instance (put there by a previous CreateObject)
-					$title_obj =& $GLOBALS[$title_class];
-				} else {
-					$title_obj =& CreateObject($title_app . '.' . $title_class);
-				}
-			}
-			if(!is_object($title_obj) || !method_exists($title_obj,$title_method)) {
-				echo "$entry_app.$entry_class.$entry_method is not a valid method for getting the title";
-			} elseif($current_value) {
-				$title = $title_obj->$title_method($current_value);
-			}
+		// Save options for post_processing
+		$extension_data['options'] = $options;
+		$extension_data['needed'] = $cell['needed'];
 
-			// Check get_rows method
-			list($get_rows_app, $get_rows_class, $get_rows_method) = explode('.', $options['get_rows']);
+		// xajax
+		$GLOBALS['egw_info']['flags']['include_xajax'] = True;
+
+		// JavaScript
+		$options = $GLOBALS['egw']->js->convert_phparray_jsarray("options['$name']", $options, true);
+		$GLOBALS['egw']->js->set_onload("if(!options) {
+				var options = new Object();
+			}\n
+			$options;\n
+			ajax_select_widget_setup('$name', '$onchange', options['$name'], '" . $GLOBALS['egw_info']['flags']['currentapp'] . "');
+		");
+		$GLOBALS['egw']->js->validate_file('', 'ajax_select', 'etemplate');
+
+		return True;	// no extra label
+	}
+
+	function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	{
+		//echo "<p>ajax_select_widget.post_process: $name = "; _debug_array($value_in);_debug_array($extension_data);
+		if(!is_array($value_in)) {
+			$value_in = $extension_data['old_value'];
+		}
+
+		// They typed something in, but didn't choose a result
+		if(!$value_in['value'] && $value_in['search']) {
+			list($get_rows_app, $get_rows_class, $get_rows_method) = explode('.', $extension_data['options']['get_rows']);
 			if($get_rows_app && $get_rows_class) {
 				if (is_object($GLOBALS[$get_rows_class])) {       // use existing instance (put there by a previous CreateObject)
 					$get_rows_obj =& $GLOBALS[$get_rows_class];
@@ -138,198 +212,120 @@
 
 				if(!is_object($get_rows_obj) || !method_exists($get_rows_obj, $get_rows_method)) {
 					echo "$get_rows_app.$get_rows_class.$get_rows_method is not a valid method for getting the rows";
-				}
-			}
-
-
-			// Set up widget
-			$cell['type'] = 'template';
-			$cell['size'] = $cell['name'];
-			$value = array('value' => $current_value, 'search' => $title);
-			$widget =& new etemplate('etemplate.ajax_select_widget');
-			$widget->no_onclick = True;
-
-			// Link if readonly & link is set
-			$search =& $widget->get_widget_by_name('search');
-			if(($cell['readonly'] || $readonlys['search']) && $options['link']) {
-				$cell['readonly'] = false;
-				if(!is_array($readonlys)) {
-					$readonlys = array('search' => true);
 				} else {
-					$readonlys['search'] = true;
-				}
-				$search['type'] = 'label';
-				$search['no_lang'] = 1;
-				$search['size'] = ',' . $options['link'];
-				$extension_data['readonly'] = true;
-			} else {
-				$search['type'] = 'text';
-				$search['size'] = '';
-			}
+					$query = array_merge($extension_data['options'], $value_in);
+					$count = $get_rows_obj->$get_rows_method($query, $results);
 
-			// Icon
-			$icon =& $widget->get_widget_by_path('/0/1A');
-			$icon['name'] = $options['icon'];
-			
-			$cell['obj'] = &$widget;
-
-			// Save options for post_processing
-			$extension_data['options'] = $options;
-			$extension_data['needed'] = $cell['needed'];
-
-			// xajax
-			$GLOBALS['egw_info']['flags']['include_xajax'] = True;
-			
-			// JavaScript
-			$options = $GLOBALS['egw']->js->convert_phparray_jsarray("options['$name']", $options, true);
-			$GLOBALS['egw']->js->set_onload("if(!options) { 
-					var options = new Object();
-				}\n 
-				$options;\n 
-				ajax_select_widget_setup('$name', '$onchange', options['$name'], '" . $GLOBALS['egw_info']['flags']['currentapp'] . "'); 
-			");
-			$GLOBALS['egw']->js->validate_file('', 'ajax_select', 'etemplate');
-
-			return True;	// no extra label
-		}
-
-		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
-		{
-			//echo "<p>ajax_select_widget.post_process: $name = "; _debug_array($value_in);_debug_array($extension_data);
-			if(!is_array($value_in)) {
-				$value_in = $extension_data['old_value'];
-			}
-
-			// They typed something in, but didn't choose a result
-			if(!$value_in['value'] && $value_in['search']) {
-				list($get_rows_app, $get_rows_class, $get_rows_method) = explode('.', $extension_data['options']['get_rows']);
-				if($get_rows_app && $get_rows_class) {
-					if (is_object($GLOBALS[$get_rows_class])) {       // use existing instance (put there by a previous CreateObject)
-						$get_rows_obj =& $GLOBALS[$get_rows_class];
+					if($count == 1) {
+						$value = $results[0][$extension_data['options']['id_field']];
+						return true;
+					} elseif ($count > 1) {
+						etemplate::set_validation_error($name,lang("More than 1 match for '%1'",$value_in['search']));
+						$loop = true;
+						return false;
 					} else {
-						$get_rows_obj =& CreateObject($get_rows_app . '.' . $get_rows_class);
-					}
-
-					if(!is_object($get_rows_obj) || !method_exists($get_rows_obj, $get_rows_method)) {
-						echo "$get_rows_app.$get_rows_class.$get_rows_method is not a valid method for getting the rows";
-					} else {
-						$query = array_merge($extension_data['options'], $value_in);
-						$count = $get_rows_obj->$get_rows_method($query, $results);
-
-						if($count == 1) {
-							$value = $results[0][$extension_data['options']['id_field']];
-							return true;
-						} elseif ($count > 1) {
-							$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] = lang("More than 1 match for '%1'",$value_in['search']);
-							$loop = true;
-							return false;
-						} else {
-							$value = $value_in['search'];
-							return true;
-						}
+						$value = $value_in['search'];
+						return true;
 					}
 				}
-			} elseif ($extension_data['readonly']) {
+			}
+		} elseif ($extension_data['readonly']) {
+			$value = $extension_data['old_value'];
+			return true;
+		} elseif ($value_in['search'] == '') {
+			// They're trying to clear the form
+			$value = null;
+
+			// True if not needed, false if needed and they gave no value
+			$return = !($extension_data['needed'] && trim($value_in['value']) == '');
+
+			if(!$return) {
 				$value = $extension_data['old_value'];
-				return true;
-			} elseif ($value_in['search'] == '') {
-				// They're trying to clear the form
-				$value = null;
-
-				// True if not needed, false if needed and they gave no value
-				$return = !($extension_data['needed'] && trim($value_in['value']) == '');
-
-				if(!$return) {
-					$value = $extension_data['old_value'];
-					$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] = lang('Required');
-				}
-
-				// Loop if some other widget wants to loop, or if this is required and they gave no value
-				$loop = $GLOBALS['egw_info']['etemplate']['loop'] || !$return;
-
-				if($this->debug && $loop) {
-					echo 'Looping...<br />Returning ' . $return . '<br />';
-				}
-				return $return;
-			} else {
-				$value = $value_in['value'];
-				$loop = $GLOBALS['egw_info']['etemplate']['loop'] ||  false;
-				return true;
-			}
-		}
-
-		function ajax_search($id, $value, $set_id, $query) {
-			$base_id = substr($id, 0, strrpos($id, '['));
-			$result_id = ($set_id ? $set_id : $base_id . '[results]');
-			$response = new xajaxResponse();
-			if($query['get_rows']) {
-				list($app, $class, $method) = explode('.', $query['get_rows']);
-				$this->bo = CreateObject($app . '.' . $class);
-				unset($query['get_rows']);
-			} else {
-				return $response->getXML();
+				etemplate::set_validation_error($name,lang('Required'));
+				$loop = true;
 			}
 
-			// Expand lists
-			foreach($query as $key => &$row) {
-				if(strpos($row, ',')) {
-					$query[$key] = explode(',', $row);
-				}
-
-				// sometimes it sends 'null' (not null)
-				if($row == 'null') {
-					unset($query[$key]);
-				} elseif (is_string($row) && strtolower($row) == 'false') {
-					$row = false;
-				}
+			if($this->debug && $loop) {
+				echo 'Looping...<br />Returning ' . $return . '<br />';
 			}
-			$query['search'] = $value;
-
-			$result_list = array();
-			$readonlys = array();
-			if(is_object($this->bo)) {
-				$count = $this->bo->$method($query, $result_list, $readonlys);
-			}
-			if(is_array($count)) {
-				$count = count($result_list);
-			}
-
-			$response->addScript("remove_ajax_results('$result_id')");
-			if($count > 0) {
-				$response->addScript("add_ajax_result('$result_id', '', '', '" . lang('Select') ."');");
-				$count = 0;
-
-				if(!$query['template'] || $query['template'] == 'etemplate.ajax_select_widget.row') {
-					$query['template'] = 'etemplate.ajax_select_widget.row';
-				}
-				foreach($result_list as $key => &$row) {
-					if(!is_array($row)) {
-						continue;
-					}
-					if($query['id_field'] && $query['get_title']) {
-						if($row[$query['id_field']]) {
-							$row['title'] = ExecMethod($query['get_title'], $row[$query['id_field']]);
-						} 
-					}
-
-					$data = ($query['nextmatch_template']) ? array(1=>$row) : $row;
-					$widget =& CreateObject('etemplate.etemplate', $query['template']);
-					$html = addslashes(str_replace("\n", '', $widget->show($data, '', $readonlys)));
-					
-					// If we use htmlspecialchars, it causes issues with mixed quotes.  addslashes() seems to handle it.
-					$row['id_field'] = addslashes($row[$query['id_field']]);
-					$row['title'] = addslashes($row['title']);
-					$response->addScript("add_ajax_result('$result_id', '${row['id_field']}', '" . $row['title'] . "', '$html');");
-					$count++;
-					if($count > $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) {
-						$response->addScript("add_ajax_result('$result_id', '', '', '" . lang("%1 more...", (count($result_list) - $count)) . "');");
-						break;
-					}
-				}
-			} else {
-				$response->addScript("add_ajax_result('$result_id', '', '', '" . lang('No matches found') ."');");
-			}
-			return $response->getXML();
+			return $return;
+		} else {
+			$value = $value_in['value'];
+			return true;
 		}
 	}
-?>
+
+	function ajax_search($id, $value, $set_id, $query) {
+		$base_id = substr($id, 0, strrpos($id, '['));
+		$result_id = ($set_id ? $set_id : $base_id . '[results]');
+		$response = new xajaxResponse();
+		if($query['get_rows']) {
+			list($app, $class, $method) = explode('.', $query['get_rows']);
+			$this->bo = CreateObject($app . '.' . $class);
+			unset($query['get_rows']);
+		} else {
+			return $response->getXML();
+		}
+
+		// Expand lists
+		foreach($query as $key => &$row) {
+			if(strpos($row, ',')) {
+				$query[$key] = explode(',', $row);
+			}
+
+			// sometimes it sends 'null' (not null)
+			if($row == 'null') {
+				unset($query[$key]);
+			} elseif (is_string($row) && strtolower($row) == 'false') {
+				$row = false;
+			}
+		}
+		$query['search'] = $value;
+
+		$result_list = array();
+		$readonlys = array();
+		if(is_object($this->bo)) {
+			$count = $this->bo->$method($query, $result_list, $readonlys);
+		}
+		if(is_array($count)) {
+			$count = count($result_list);
+		}
+
+		$response->addScript("remove_ajax_results('$result_id')");
+		if($count > 0) {
+			$response->addScript("add_ajax_result('$result_id', '', '', '" . lang('Select') ."');");
+			$count = 0;
+
+			if(!$query['template'] || $query['template'] == 'etemplate.ajax_select_widget.row') {
+				$query['template'] = 'etemplate.ajax_select_widget.row';
+			}
+			foreach($result_list as $key => &$row) {
+				if(!is_array($row)) {
+					continue;
+				}
+				if($query['id_field'] && $query['get_title']) {
+					if($row[$query['id_field']]) {
+						$row['title'] = ExecMethod($query['get_title'], $row[$query['id_field']]);
+					}
+				}
+
+				$data = ($query['nextmatch_template']) ? array(1=>$row) : $row;
+				$widget =& CreateObject('etemplate.etemplate', $query['template']);
+				$html = addslashes(str_replace("\n", '', $widget->show($data, '', $readonlys)));
+
+				// If we use htmlspecialchars, it causes issues with mixed quotes.  addslashes() seems to handle it.
+				$row['id_field'] = addslashes($row[$query['id_field']]);
+				$row['title'] = addslashes($row['title']);
+				$response->addScript("add_ajax_result('$result_id', '${row['id_field']}', '" . $row['title'] . "', '$html');");
+				$count++;
+				if($count > $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) {
+					$response->addScript("add_ajax_result('$result_id', '', '', '" . lang("%1 more...", (count($result_list) - $count)) . "');");
+					break;
+				}
+			}
+		} else {
+			$response->addScript("add_ajax_result('$result_id', '', '', '" . lang('No matches found') ."');");
+		}
+		return $response->getXML();
+	}
+}
diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index b342a2e4de..207256fca4 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -4,7 +4,7 @@
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright 2002-8 by RalfBecker@outdoor-training.de
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package etemplate
  * @subpackage api
@@ -12,13 +12,11 @@
  */
 
 /**
-	* Business Object for eTemplates, extending the Storage Object
-	*
-	* Not so much so far, as the most logic is still in the UI-class
-	*/
+ * Business Object for eTemplates, extending the Storage Object
+ */
 class boetemplate extends soetemplate
 {
-	var $types = array(
+	static public $types = array(
 		'label'	=> 'Label',			// Label $cell['label'] is (to be translated) textual content
 		'text'	=> 'Text',			// Textfield 1 Line (size = [length][,maxlength])
 		'int'	=> 'Integer',		// like text, but only numbers (size = [min][,max])
@@ -45,7 +43,22 @@ class boetemplate extends soetemplate
 		'deck'	=> 'Deck',			// a container of elements where only one is visible, size = # of elem.
 		'passwd' => 'Password'		// a text of type password
 	);
-	private static $garbage_collection_done;
+
+	/**
+	 * Flag if form validation requires to loop
+	 *
+	 * @var boolean
+	 */
+	static public $loop = false;
+
+	/**
+	 * Request object of the currecntly created request
+	 *
+	 * It's a static variable as etemplates can contain further etemplates (rendered by a different object)
+	 *
+	 * @var etemplate_request
+	 */
+	static public $request;
 
 	/**
 	 * constructor of class
@@ -55,9 +68,9 @@ class boetemplate extends soetemplate
 	 * @param string/array $name name of etemplate or array with name and other keys
 	 * @param string/array $load_via name or array with keys of other etemplate to load in order to get $name
 	 */
-	function boetemplate($name='',$load_via='')
+	function __construct($name='',$load_via='')
 	{
-		$this->soetemplate();
+		parent::__construct();
 
 		$tname = &$name;
 		if (is_array($name))
@@ -223,107 +236,6 @@ class boetemplate extends soetemplate
 		return $Ok;
 	}
 
-	/**
-	 *  creates a new appsession-id via microtime()
-	 * @return string
-	 */
-	protected static function appsession_id()
-	{
-		list($msec,$sec) = explode(' ',microtime());
-		$time = 100 * $sec + (int)(100 * $msec);	// gives precision of 1/100 sec
-		$id = $GLOBALS['egw_info']['flags']['currentapp'] .':'. $time;
-		//echo "<p>microtime()=".microtime().", sec=$sec, msec=$msec, id=$id</p>\n";
-		return $id;
-	}
-
-	/**
-	 * saves content,readonlys,template-keys, ... via the appsession function
-	 *
-	 * As a user may open several windows with the same content/template wie generate a location-id from microtime
-	 * which is used as location for appsession to descriminate between the different windows. This location-id
-	 * is then saved as a hidden-var in the form. The above mentions session-id has nothing to do / is different
-	 * from the session-id which is constant for all windows opened in one session.
-	 *
-	 * @param array $data the data to save
-	 * @param string $id the id to use or '' to generate a new id
-	 * @return string location-id
-	 */
-	protected static function save_appsession($data,$id='')
-	{
-		if (!$id)
-		{
-			$id = self::appsession_id();
-		}
-		$GLOBALS['egw']->session->appsession($id,'etemplate',$data);
-
-		if (substr($GLOBALS['egw_info']['server']['sessions_type'],0,4) == 'php4' && !self::$garbage_collection_done)
-		{
-			return self::php_session_garbage_collection();
-		}
-		return $id;
-	}
-
-	/**
-	 * gets content,readonlys,template-keys, ... back from the appsession function
-	 *
-	 * @param string $id the location-id
-	 * @return array with session-data
-	 */
-	protected function get_appsession($id)
-	{
-		$data = egw_session::appsession($id,'etemplate');
-		//echo "boetemplate::get_appsession('$id')"; _debug_array($data);
-
-		self::php_session_garbage_collection($id);
-
-		return $data;
-	}
-
-	/**
-	 * a little bit of garbage collection for php4 sessions (their size is limited by memory_limit)
-	 *
-	 * With constant eTemplate use it can grow quite big and lead to unusable sessions (php terminates
-	 * before any output with "Allowed memory size of ... exhausted").
-	 * We delete now sessions once used after 10min and sessions never or multiple used after 60min.
-	 *
-	 * @param string $id_used id of session just read by get_appsession to increment the usage counter
-	 */
-	static private function php_session_garbage_collection($id_used='')
-	{
-		// now we are on php4 sessions and do a bit of garbage collection
-		$app_sessions =& $_SESSION[egw_session::EGW_APPSESSION_VAR]['etemplate'];
-		$session_used =& $app_sessions['session_used'];
-
-		if ($id_used)
-		{
-			//echo "session_used[$id_used]='".$session_used[$id_used]."'<br/>\n";
-			++$session_used[$id_used];	// count the number of times a session got used
-		}
-		self::$garbage_collection_done = true;
-
-		if (count($app_sessions) < 20) return $data;	// we dont need to care
-
-		list($msec,$sec) = explode(' ',microtime());
-		$now = 	100 * $sec + (int)(100 * $msec);	// gives precision of 1/100 sec
-
-		foreach(array_keys($app_sessions) as $id)
-		{
-			list($app,$time) = explode(':',$id);
-
-			if (!$time) continue;	// other data, no session
-
-			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".egw_vfs::hsize(strlen(serialize($app_sessions[$id])))."<br>\n";
-
-			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 30*6000)	// session not used and older then 30min
-			{
-				//echo "<p>boetemplate::php_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
-				unset($app_sessions[$id]);
-				unset($session_used[$id]);
-			}
-		}
-	}
-
 	/**
 	 * gets an attribute in a named cell
 	 *
@@ -453,6 +365,13 @@ class boetemplate extends soetemplate
 		$this->set_column_attributes($c,0,!$enable,$path);
 	}
 
+	/**
+	 * Cache for extension objects
+	 *
+	 * @var array
+	 */
+	static private $extensions = array();
+
 	/**
 	 * trys to load the Extension / Widget-class from the app or etemplate
 	 *
@@ -482,12 +401,12 @@ class boetemplate extends soetemplate
 		if (!file_exists(EGW_SERVER_ROOT."/$app/inc/class.$class.inc.php"))
 		{
 			//echo "<p>boetemplate::loadExtension($type) extension not found</p>\n";
-			return $GLOBALS['egw_info']['etemplate']['extension'][$type] = False;
+			return self::$extensions[$type] = False;
 		}
-		$GLOBALS['egw_info']['etemplate']['extension'][$type] =& CreateObject($app.'.'.$class,$ui='html');
+		self::$extensions[$type] =& CreateObject($app.'.'.$class,$ui='html');
 
 		//echo "<p>boetemplate::loadExtension($type) extension found in App. $app</p>\n";
-		return $GLOBALS['egw_info']['etemplate']['extension'][$type]->human_name;
+		return self::$extensions[$type]->human_name;
 	}
 
 	/**
@@ -500,8 +419,8 @@ class boetemplate extends soetemplate
 	 */
 	protected function haveExtension($type,$function='')
 	{
-		return ($GLOBALS['egw_info']['etemplate']['extension'][$type] || $this->loadExtension($type,$ui)) &&
-						($function == '' || $GLOBALS['egw_info']['etemplate']['extension'][$type]->public_functions[$function]);
+		return (self::$extensions[$type] || $this->loadExtension($type,$ui)) &&
+						($function == '' || self::$extensions[$type]->public_functions[$function]);
 	}
 
 	/**
@@ -522,11 +441,11 @@ class boetemplate extends soetemplate
 		}
 		// only supply extension data for non-readonly widgets or if it's already set
 		// otherwise lists store >10k unnecessary data in each etemplate-session
-		if (!($cell['readonly'] || $readonlys && !is_array($readonlys)) || isset($GLOBALS['egw_info']['etemplate']['extension_data'][$name]))
+		if (!($cell['readonly'] || $readonlys && !is_array($readonlys)) || isset(self::$request->extension_data[$name]))
 		{
-			$extension_data =& $GLOBALS['egw_info']['etemplate']['extension_data'][$name];
+			$extension_data =& self::$request->extension_data[$name];
 		}
-		return $GLOBALS['egw_info']['etemplate']['extension'][$type]->pre_process($name,$value,$cell,$readonlys,$extension_data,$this);
+		return self::$extensions[$type]->pre_process($name,$value,$cell,$readonlys,$extension_data,$this);
 	}
 
 	/**
@@ -544,9 +463,9 @@ class boetemplate extends soetemplate
 		{
 			return True;
 		}
-		return $GLOBALS['egw_info']['etemplate']['extension'][$type]->post_process($name,$value,
-			$GLOBALS['egw_info']['etemplate']['extension_data'][$name],
-			$GLOBALS['egw_info']['etemplate']['loop'],$this,$value_in);
+		return self::$extensions[$type]->post_process($name,$value,
+			self::$request->extension_data[$name],
+			self::$loop,$this,$value_in);
 	}
 
 	/**
@@ -565,8 +484,8 @@ class boetemplate extends soetemplate
 		{
 			return False;
 		}
-		return $GLOBALS['egw_info']['etemplate']['extension'][$type]->render($cell,$name,$value,$readonly,
-			$GLOBALS['egw_info']['etemplate']['extension_data'][$name],$this);
+		return self::$extensions[$type]->render($cell,$name,$value,$readonly,
+			self::$request->extension_data[$name],$this);
 	}
 
 	/**
@@ -798,12 +717,19 @@ class boetemplate extends soetemplate
 	}
 
 	/**
-	 * stores the etemplate in the cache in phpgw_info
+	 * Cache for already read etemplates
+	 *
+	 * @var array
+	 */
+	private static $template_cache = array();
+
+	/**
+	 * stores the etemplate in the cache in egw_info
 	 */
 	private function store_in_cache()
 	{
 		//echo "<p>store_in_cache('$this->name','$this->template','$this->lang','$this->version')</p>\n";
-		$GLOBALS['egw_info']['etemplate']['cache'][$this->cache_name()] = $this->as_array(1);
+		self::$template_cache[$this->cache_name()] = $this->as_array(1);
 	}
 
 	/**
@@ -812,7 +738,7 @@ class boetemplate extends soetemplate
 	private function delete_in_cache()
 	{
 		//echo "<p>delete_in_cache('$this->name','$this->template','$this->lang','$this->version')</p>\n";
-		unset($GLOBALS['egw_info']['etemplate']['cache'][$this->cache_name()]);
+		unset(self::$template_cache[$this->cache_name()]);
 	}
 
 	/**
@@ -833,8 +759,8 @@ class boetemplate extends soetemplate
 			$version = $name['version'];
 			$name    = $name['name'];
 		}
-		if (!isset($GLOBALS['egw_info']['etemplate']['cache'][$cname]) ||
-				!empty($version) && $GLOBALS['egw_info']['etemplate']['cache'][$cname]['version'] != $version)
+		if (!isset(self::$template_cache[$cname]) ||
+				!empty($version) && self::$template_cache[$cname]['version'] != $version)
 		{
 			//echo " NOT found in cache</p>\n";
 			return False;
@@ -860,7 +786,7 @@ class boetemplate extends soetemplate
 		//if (is_array($name)) $version = $name['version']; echo "<p>read_from_cache(,,,version='$version'): ";
 		if ($cname = $this->in_cache($name,$template,$lang,$group))
 		{
-			$this->init($GLOBALS['egw_info']['etemplate']['cache'][$cname]);
+			$this->init(self::$template_cache[$cname]);
 
 			return True;
 		}
@@ -956,7 +882,6 @@ class boetemplate extends soetemplate
 	 */
 	static function _init_static()
 	{
-		self::$garbage_collection_done =& $GLOBALS['egw_info']['etemplate']['garbage_collection_done'];
 	}
 }
 boetemplate::_init_static();
@@ -997,3 +922,5 @@ if (!function_exists('set_cell_attribute_helper'))
 		}
 	}
 }
+// just in case someone still uses the old var
+$GLOBALS['egw_info']['flags']['etemplate']['loop'] =& boetemplate::$loop;
\ No newline at end of file
diff --git a/etemplate/inc/class.date_widget.inc.php b/etemplate/inc/class.date_widget.inc.php
index 3710d3da0d..cd8f0d9a79 100644
--- a/etemplate/inc/class.date_widget.inc.php
+++ b/etemplate/inc/class.date_widget.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @copyright 2002-8 by RalfBecker@outdoor-training.de
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
  * @package etemplate
  * @subpackage extensions
  * @version $Id$
@@ -231,10 +231,9 @@ class date_widget
 		}
 		if ($cell['needed'])
 		{
-			$GLOBALS['egw_info']['etemplate']['to_process'][$name] = array(
-				'type' => 'ext-'.$type,
+			etemplate::$request->set_to_process($name,'ext-'.$type,array(
 				'needed' => $cell['needed'],
-			);
+			));
 		}
 		$tpl =& new etemplate;
 		$tpl->init('*** generated fields for date','','',0,'',0,0);	// make an empty template
@@ -539,7 +538,7 @@ class date_widget
 			}
 			elseif (!preg_match('/^-?[0-9]*[,.]?[0-9]*'.($extension_data['percent_allowed'] ? '%?' : '').'$/',$value_in))
 			{
-				$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] = lang("'%1' is not a valid floatingpoint number !!!",$value_in);
+				etemplate::set_validation_error($name,lang("'%1' is not a valid floatingpoint number !!!",$value_in));
 				return false;
 			}
 			else
@@ -613,8 +612,8 @@ class date_widget
 			// checking the date is a correct one
 			if (!checkdate($value['m'],$value['d'],$value['Y']))
 			{
-				$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] .= lang("'%1' is not a valid date !!!",
-					$GLOBALS['egw']->common->dateformatorder($value['Y'],$value['m'],$value['d'],true));
+				etemplate::set_validation_error($name,lang("'%1' is not a valid date !!!",
+					common::dateformatorder($value['Y'],$value['m'],$value['d'],true)));
 			}
 			$data_format = $extension_data['data_format'];
 			if (empty($data_format))
diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index da148b4a65..2274adf02c 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -430,7 +430,7 @@ class editor
 				$additional = array();
 				if ($app == 'etemplate')
 				{
-					$additional = $this->etemplate->types + $this->extensions + $this->aligns + $this->valigns +
+					$additional = etemplate::$types + $this->extensions + $this->aligns + $this->valigns +
 						$this->edit_menu + $this->box_menu + $this->row_menu + $this->column_menu + $this->onclick_types + $this->onchange_types;
 				}
 				else	// try to call the writeLangFile function of the app's ui-layer
@@ -1360,7 +1360,7 @@ class editor
 		$GLOBALS['egw_info']['flags']['java_script'] = "<script>window.focus();</script>\n";
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Editable Templates - Editor');
 		$editor->exec('etemplate.editor.widget',$content,array(
-				'type'       => array_merge($this->etemplate->types,$this->extensions),
+				'type'       => array_merge(etemplate::$types,$this->extensions),
 				'align'      => &$this->aligns,
 				'valign'     => &$this->valigns,
 				'part'       => $allowed_parts,
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index ce0986ee55..0b147ab68a 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -5,7 +5,7 @@
 * @link http://www.egroupware.org
 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 * @author Ralf Becker <RalfBecker@outdoor-training.de>
-* @copyright 2002-8 by RalfBecker@outdoor-training.de
+* @copyright 2002-9 by RalfBecker@outdoor-training.de
 * @package etemplate
 * @subpackage api
 * @version $Id$
@@ -32,62 +32,96 @@ class etemplate extends boetemplate
 	* 1=calls to show and process_show, 2=content after process_show,
 	* 3=calls to show_cell and process_show_cell
 	*
-	* @var int/string
+	* @public int/string
 	*/
-	var $debug;
-	var $xslt = false;	/* do we run in the xslt framework (true) or the regular eGW one (false) */
-	var $class_conf = array('nmh' => 'th','nmr0' => 'row_on','nmr1' => 'row_off');
-	var $public_functions = array('process_exec' => True);
+	public $debug;
 	/**
 	* Inner width of browser window
 	*
-	* @var int
+	* @public int
 	*/
-	var $innerWidth;
+	public $innerWidth;
 	/**
 	* Reference to the content-param of the last call to show, for extensions to use
 	*
-	* @var array
+	* @public array
 	*/
-	var $content;
+	public $content;
 	/**
 	* Reference to the sel_options-param of the last call to show, for extensions to use
 	*
-	* @var array
+	* @public array
 	*/
-	var $sel_options;
+	public $sel_options;
 	/**
-	* Name of the currently processed etemplate, reference to $GLOBALS['egw_info']['etemplate']['name_form']
+	* Name of the form of the currently processed etemplate
 	*
-	* @var string
+	* @public string
 	*/
-	var $name_form;
+	static $name_form='eTemplate';
 	/**
-	* Used form-names in this request, reference to $GLOBALS['egw_info']['etemplate']['name_forms']
+	* Used form-names in this request
 	*
-	* @var array
+	* @public array
 	*/
-	var $name_forms;
+	static $name_forms=array();
 	/**
 	* Basename of the variables (content) in $_POST and id's, usually 'exec',
 	* if there's not more then one eTemplate on the page (then it will be exec, exec2, exec3, ...
 	*
-	* @var string
+	* @public string
 	*/
-	var $name_vars='exec';
+	static $name_vars='exec';
 	/**
 	* Are we running as sitemgr module or not
 	*
-	* @var boolean
+	* @public boolean
 	*/
-	var $sitemgr=false;
+	public $sitemgr=false;
 	/**
 	 * Javascript to be called, when a widget get's double-clicked (used only by the editor)
 	 * A '%p' gets replace with the colon ':' separated template-name, -version and path of the clicked widget.
 	 *
-	 * @var string
+	 * @public string
 	 */
-	var $onclick_handler;
+	public $onclick_handler;
+
+	/**
+	 * Extra options for forms, eg. enctype="multipart/form-data"
+	 *
+	 * @public string
+	 */
+	static protected $form_options = '';
+
+	/**
+	 * Validation errors from process_show and the extensions, should be set via etemplate::set_validation_error
+	 *
+	 * @public array form_name => message pairs
+	 */
+	static protected $validation_errors = array();
+
+	/**
+	 * Flag if the browser has javascript enabled
+	 *
+	 * @var boolean
+	 */
+	static public $java_script;
+
+	/**
+	 * Flag if exec() is called as part of a hook, replaces the 1.6 and earlier $GLOBALS['egw_info']['etemplate']['hooked'] global variable
+	 *
+	 * @var boolean
+	 */
+	static public $hooked;
+
+	/**
+	 * The following 3 static vars are used to allow eTemplate apps to hook into each other
+	 *
+	 * @var mixed
+	 */
+	static private $previous_content;
+	static private $hook_content;
+	static private $hook_app;
 
 	/**
 	* constructor of etemplate class, reads an eTemplate if $name is given
@@ -95,11 +129,9 @@ class etemplate extends boetemplate
 	* @param string $name of etemplate or array with name and other keys
 	* @param string/array $load_via with keys of other etemplate to load in order to get $name
 	*/
-	function etemplate($name='',$load_via='')
+	function __construct($name='',$load_via='')
 	{
-		$this->boetemplate($name,$load_via);
-
-		//$this->xslt = is_object($GLOBALS['egw']->xslttpl);
+		parent::__construct($name,$load_via);
 
 		$this->sitemgr = isset($GLOBALS['Common_BO']) && is_object($GLOBALS['Common_BO']);
 
@@ -112,9 +144,6 @@ class etemplate extends boetemplate
 			$this->innerWidth = 1018;	// default width for an assumed screen-resolution of 1024x768
 		}
 		//echo "<p>_POST[innerWidth]='$_POST[innerWidth]', innerWidth=$this->innerWidth</p>\n";
-		$this->name_form =& $GLOBALS['egw_info']['etemplate']['name_form'];
-		$this->name_forms =& $GLOBALS['egw_info']['etemplate']['name_forms'];
-		if (!is_array($this->name_forms)) $this->name_forms = array();
 	}
 
 	/**
@@ -127,7 +156,7 @@ class etemplate extends boetemplate
 	*/
 	static function location($params='')
 	{
-		$GLOBALS['egw']->redirect_link(is_array($params) ? '/index.php' : $params,
+		egw::redirect_link(is_array($params) ? '/index.php' : $params,
 			is_array($params) ? $params : '');
 	}
 
@@ -157,7 +186,7 @@ class etemplate extends boetemplate
 	*/
 	function exec($method,$content,$sel_options='',$readonlys='',$preserv='',$output_mode=0,$ignore_validation='',$changes='')
 	{
-		//echo "<br>globals[java_script] = '".$GLOBALS['egw_info']['etemplate']['java_script']."', this->java_script() = '".$this->java_script()."'\n";
+		//echo "<br>globals[java_script] = '".self::$java_script."', this->java_script() = '".$this->java_script()."'\n";
 		if (!$sel_options)
 		{
 			$sel_options = array();
@@ -182,59 +211,66 @@ class etemplate extends boetemplate
 		{
 			$GLOBALS['egw']->translation->add_app('etemplate');	// some extensions have own texts
 		}
-		$id = $this->appsession_id();
-		//echo "<p>unsetting existing egw_info[etemplate] which had keys=".implode(',',array_keys($GLOBALS['egw_info']['etemplate']))."</p>\n";
-		// initialise $GLOBALS['egw_info']['etemplate'], in case there are multiple eTemplates on a page
-		$GLOBALS['egw_info']['etemplate'] = array(
-			'name_forms' => $GLOBALS['egw_info']['etemplate']['name_forms'],
-			'validation_errors' => $GLOBALS['egw_info']['etemplate']['validation_errors'],
-			'hooked' => $GLOBALS['egw_info']['etemplate']['hooked'],
-			'content' => $GLOBALS['egw_info']['etemplate']['content'],
-			'hook_content' => $GLOBALS['egw_info']['etemplate']['hook_content'],
-			'hook_app' => $GLOBALS['egw_info']['etemplate']['hook_app'],
-			'extension_data' => $GLOBALS['egw_info']['etemplate']['extension_data'],
-		);
-		//echo "<p>hooked=".(int)!!$GLOBALS['egw_info']['etemplate']['hooked'].", content=".(int)!!$GLOBALS['egw_info']['etemplate']['content'].", hook_content=".(int)!!$GLOBALS['egw_info']['etemplate']['hook_content'].", hook_app={$GLOBALS['egw_info']['etemplate']['hook_app']}</p>\n";
-		$this->name_form =& $GLOBALS['egw_info']['etemplate']['name_form'];
-		$this->name_forms =& $GLOBALS['egw_info']['etemplate']['name_forms'];
-		if (!is_array($this->name_forms)) $this->name_forms = array();
-
 		// use different form-names to allows multiple eTemplates in one page, eg. addressbook-view
-		$this->name_form = 'eTemplate';
-		if (in_array($this->name_form,$this->name_forms))
+		self::$name_form = 'eTemplate';
+		if (in_array(self::$name_form,self::$name_forms))
 		{
-			$this->name_form .= 1+count($this->name_forms);
-			$this->name_vars .= 1+count($this->name_forms);
+			self::$name_form .= 1+count(self::$name_forms);
+			self::$name_vars .= 1+count(self::$name_forms);
 		}
-		$this->name_forms[] = $this->name_form;
+		self::$name_forms[] = self::$name_form;
 
-		$GLOBALS['egw_info']['etemplate']['output_mode'] = $output_mode;	// let extensions "know" they are run eg. in a popup
-		$GLOBALS['egw_info']['etemplate']['form_options'] = '';	// might be set in show
-		$GLOBALS['egw_info']['etemplate']['to_process'] = array();
+		self::$request = etemplate_request::read();
+		self::$request->output_mode = $output_mode;	// let extensions "know" they are run eg. in a popup
+		self::$request->readonlys = $readonlys;
+		self::$request->content = $content;
+		self::$request->changes = $changes;
+		self::$request->sel_options = $sel_options;
+		self::$request->preserv = $preserv;
+		self::$request->method = $method;
+		self::$request->ignore_validation = $ignore_validation;
+		self::$request->name_vars = self::$name_vars;
 
-		$html = html::form($this->include_java_script(1).
-				html::input_hidden(array(
-					'submit_button' => '',
-					'innerWidth'    => '',
-				),'',False).
-				$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,$this->name_vars),array(
-					'etemplate_exec_id' => $id
-				),$this->sitemgr ? '' : '/etemplate/process_exec.php?menuaction='.$method,
-				'',$this->name_form,$GLOBALS['egw_info']['etemplate']['form_options'].
-				// dont set the width of popups!
-				($output_mode != 0 ? '' : ' onsubmit="this.innerWidth.value=window.innerWidth ? window.innerWidth : document.body.clientWidth;"'));
-				//echo "to_process="; _debug_array($GLOBALS['egw_info']['etemplate']['to_process']);
+		$html = $this->include_java_script(1).
+				$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,self::$name_vars);
 
+		self::$request->java_script = self::$java_script;
+		self::$request->java_script_from_flags = $GLOBALS['egw_info']['flags']['java_script'];
+		self::$request->java_script_body_tags = $GLOBALS['egw']->js->body;
+		self::$request->java_script_files = $GLOBALS['egw']->js->files;
+		self::$request->include_xajax = $GLOBALS['egw_info']['flags']['include_xajax'];
+		if (!$this->sitemgr)
+		{
+			$hooked = isset(self::$previous_content) || !isset($GLOBALS['egw']->template) ?
+				self::$previous_content : $GLOBALS['egw']->template->get_var('phpgw_body');
+		}
+		self::$request->hooked = $hooked ? $hooked : self::$hook_content;
+		self::$request->hook_app = $hooked ? $GLOBALS['egw_info']['flags']['currentapp'] : self::$hook_app;
+		self::$request->app_header = $GLOBALS['egw_info']['flags']['app_header'];
+		if (self::$request->output_mode == -1) self::$request->output_mode = 0;
+		self::$request->template = $this->as_array(2);
+
+		$html = html::form(html::input('etemplate_exec_id',self::$request->id(),'hidden',' id="etemplate_exec_id"').$html.
+			html::input_hidden(array(
+				'submit_button' => '',
+				'innerWidth'    => '',
+			),'',false),array(),$this->sitemgr ? '' : '/etemplate/process_exec.php?menuaction='.$method,
+			'',self::$name_form,self::$form_options.
+			// dont set the width of popups!
+			($output_mode != 0 ? '' : ' onsubmit="this.innerWidth.value=window.innerWidth ? window.innerWidth : document.body.clientWidth;"'));
+		//echo "to_process="; _debug_array(self::$request->to_process);
+
+		//echo '<p>'.__METHOD__."($method,...) etemplate[hooked]=".(int)self::$hooked.", etemplate[hook_app]='".self::$hook_app."', isset(etemplate[content])=".(int)isset(self::$previous_content)."</p>\n";
 		if ($this->sitemgr)
 		{
 			$GLOBALS['egw_info']['flags']['java_script'] .= $this->include_java_script(2);
 		}
-		elseif (!$this->xslt)
+		else
 		{
-			$hooked = isset($GLOBALS['egw_info']['etemplate']['content']) || !isset($GLOBALS['egw']->template) ?
-				$GLOBALS['egw_info']['etemplate']['content'] : $GLOBALS['egw']->template->get_var('phpgw_body');
+			// support the old global var, in case old apps like 1.6 infolog use it
+			if (isset($GLOBALS['egw_info']['etemplate']['hooked'])) self::$hooked = $GLOBALS['egw_info']['etemplate']['hooked'];
 
-			if (!@$GLOBALS['egw_info']['etemplate']['hooked'] && (int) $output_mode != 1 && (int) $output_mode != -1)	// not just returning the html
+			if (!@self::$hooked && (int) $output_mode != 1 && (int) $output_mode != -1)	// not just returning the html
 			{
 				$GLOBALS['egw_info']['flags']['java_script'] .= $this->include_java_script(2);
 
@@ -251,109 +287,47 @@ class etemplate extends boetemplate
 
 				$GLOBALS['egw']->common->egw_header();
 			}
-			elseif (!isset($GLOBALS['egw_info']['etemplate']['content']))
+			elseif (!isset(self::$previous_content))
 			{
 				$html = $this->include_java_script(2).$html;	// better than nothing
 			}
 			// saving the etemplate content for other hooked etemplate apps (atm. infolog hooked into addressbook)
-			$GLOBALS['egw_info']['etemplate']['content'] =& $html;
+			self::$previous_content =& $html;
 		}
-		else
-		{
-			$hooked = $GLOBALS['egw']->xslttpl->get_var('phpgw');
-			$hooked = $hooked['body_data'];
-			$GLOBALS['egw']->xslttpl->set_var('phpgw',array('java_script' => $GLOBALS['egw_info']['flags']['java_script'].$this->include_java_script(2)));
-		}
-		//echo "<p>uietemplate::exec($method,...) after show: sitemgr=$this->sitemgr, xslt=$this->xslt, hooked=$hooked, output_mode=$output_mode</p>\n";
+		//echo '<p>'.__METHOD__."($method,...) after show: sitemgr=$this->sitemgr, hooked=".(int)$hooked.", output_mode=$output_mode</p>\n";
 
 		if (!$this->sitemgr && (int) $output_mode != 1 && (int) $output_mode != -1)	// NOT returning html
 		{
-			if (!$this->xslt)
+			if (!@self::$hooked)
 			{
-				if (!@$GLOBALS['egw_info']['etemplate']['hooked'])
+				if((int) $output_mode != 2)
 				{
-					if((int) $output_mode != 2)
+					echo parse_navbar();
+				}
+				else
+				{
+					echo '<div id="popupMainDiv">'."\n";
+					if ($GLOBALS['egw_info']['user']['apps']['manual'])	// adding a manual icon to every popup
 					{
-						echo parse_navbar();
-					}
-					else
-					{
-						echo '<div id="popupMainDiv">'."\n";
-						if ($GLOBALS['egw_info']['user']['apps']['manual'])	// adding a manual icon to every popup
-						{
-							$manual =& new etemplate('etemplate.popup.manual');
-							echo $manual->show(array());
-							unset($manual);
-							echo '<style type="text/css">.ajax-loader { position: absolute; right: 27px; top: 24px; display: none; }</style>'."\n";
-							echo '<div class="ajax-loader">'.html::image('phpgwapi','ajax-loader') . '</div>';
-						}
+						$manual =& new etemplate('etemplate.popup.manual');
+						echo $manual->show(array());
+						unset($manual);
+						echo '<style type="text/css">.ajax-loader { position: absolute; right: 27px; top: 24px; display: none; }</style>'."\n";
+						echo '<div class="ajax-loader">'.html::image('phpgwapi','ajax-loader') . '</div>';
 					}
 				}
-				echo $GLOBALS['egw_info']['etemplate']['hook_content'].$html;
+			}
+			echo self::$hook_content.$html;
 
-				if (!$GLOBALS['egw_info']['etemplate']['hooked'] &&
-						(!isset($_GET['menuaction']) ||
-								strpos($_SERVER['PHP_SELF'],'process_exec.php')!==false))
-				{
-					if((int) $output_mode == 2)
-					{
-						echo "</div>\n";
-					}
-					$GLOBALS['egw']->common->egw_footer();
-				}
-			}
-			else
+			if (!self::$hooked && (!isset($_GET['menuaction']) || strpos($_SERVER['PHP_SELF'],'process_exec.php') !== false))
 			{
-				// need to add some logic here to support popups (output_mode==2) for xslt, but who cares ...
-				$GLOBALS['egw']->xslttpl->set_var('phpgw',array('body_data' => $html));
+				if((int) $output_mode == 2)
+				{
+					echo "</div>\n";
+				}
+				$GLOBALS['egw']->common->egw_footer();
 			}
 		}
-		$this->save_appsession($sess = $this->as_array(2) + array(
-			'readonlys' => $readonlys,
-			'content' => $content,
-			'changes' => $changes,
-			'sel_options' => $sel_options,
-			'preserv' => $preserv,
-			'extension_data' => $GLOBALS['egw_info']['etemplate']['extension_data'],
-			'to_process' => $GLOBALS['egw_info']['etemplate']['to_process'],
-			'java_script' => $GLOBALS['egw_info']['etemplate']['java_script'],
-			'java_script_from_flags' => $GLOBALS['egw_info']['flags']['java_script'],
-			'java_script_body_tags' => $GLOBALS['egw']->js->body,
-			'java_script_files' => $GLOBALS['egw']->js->files,
-			'include_xajax' => $GLOBALS['egw_info']['flags']['include_xajax'],
-			'dom_enabled' => $GLOBALS['egw_info']['etemplate']['dom_enabled'],
-			'hooked' => $hooked ? $hooked : $GLOBALS['egw_info']['etemplate']['hook_content'],
-			'hook_app' => $hooked ? $GLOBALS['egw_info']['flags']['currentapp'] : $GLOBALS['egw_info']['etemplate']['hook_app'],
-			'app_header' => $GLOBALS['egw_info']['flags']['app_header'],
-			'output_mode' => $output_mode != -1 ? $output_mode : 0,
-			'session_used' => 0,
-			'ignore_validation' => $ignore_validation,
-			'method' => $method,
-			'name_vars' => $this->name_vars,
-		),$id);
-		//echo "<p>hooked=".(int)!!$hooked.", content=".(int)!!$GLOBALS['egw_info']['etemplate']['content'].", hook_content=".(int)!!$GLOBALS['egw_info']['etemplate']['hook_content'].", hook_app={$GLOBALS['egw_info']['etemplate']['hook_app']}</p>\n";
-		//echo "<p>session: "; foreach($sess as $key => $val) echo "$key=$val, "; echo "</p>\n";
-		/*
-		echo "<p><b>total size session data = ".($total=strlen(serialize($sess)))."</b></p>\n";
-		echo "<p>shares bigger then 1.0% percent of it:</p>\n";
-		foreach($sess as $key => $val)
-		{
-			$len = strlen(is_array($val) ? serialize($val) : $val);
-			$len .= ' ('.sprintf('%2.1lf',($percent = 100.0 * $len / $total)).'%)';
-			if ($percent < 1.0) continue;
-			echo "<p><b>$key</b>: strlen(\$val)=$len</p>\n";
-			if (is_array($val) && $len > 2000)
-			{
-				foreach($val as $k => $v)
-				{
-					$l = strlen(is_array($v) ? serialize($v) : $v);
-					$l .= ' ('.sprintf('%2.1lf',($p = 100.0 * $l / $total)).'%)';
-					if ($p < 1.0) continue;
-					echo "<p>&nbsp;- {$key}[$k]: strlen(\$v)=$l</p>\n";
-				}
-			}
-		}
-		*/
 		if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1)	// return html
 		{
 			return $html;
@@ -364,16 +338,16 @@ class etemplate extends boetemplate
 	* Check if we have not ignored validation errors
 	*
 	* @param string $ignore_validation='' if not empty regular expression for validation-errors to ignore
-	* @param string $cname=null name-prefix, which need to be ignored, default $this->name_vars
+	* @param string $cname=null name-prefix, which need to be ignored, default self::$name_vars
 	* @return boolean true if there are not ignored validation errors, false otherwise
 	*/
 	function validation_errors($ignore_validation='',$cname=null)
 	{
-		if (is_null($cname)) $cname = $this->name_vars;
-		//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array($GLOBALS['egw_info']['etemplate']['validation_errors']);
-		if (!$ignore_validation) return count($GLOBALS['egw_info']['etemplate']['validation_errors']) > 0;
+		if (is_null($cname)) $cname = self::$name_vars;
+		//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array(self::$validation_errors);
+		if (!$ignore_validation) return count(self::$validation_errors) > 0;
 
-		foreach($GLOBALS['egw_info']['etemplate']['validation_errors'] as $name => $error)
+		foreach(self::$validation_errors as $name => $error)
 		{
 			if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
 
@@ -408,43 +382,38 @@ class etemplate extends boetemplate
 		if(!$exec) $exec = $_POST;
 
 		//echo "process_exec: _POST ="; _debug_array($_POST);
-		$session_data = $this->get_appsession($etemplate_exec_id);
-		//echo "<p>process_exec: session_data ="; _debug_array($session_data);
-
-		if (!$etemplate_exec_id || !is_array($session_data) || count($session_data) < 10)
+		if (!$etemplate_exec_id || !(self::$request = etemplate_request::read($etemplate_exec_id)))
 		{
 			if ($this->sitemgr) return false;
 			//echo "uitemplate::process_exec() id='$_POST[etemplate_exec_id]' invalid session-data !!!"; _debug_array($_SESSION);
 			// this prevents an empty screen, if the sessiondata gets lost somehow
 			$this->location(array('menuaction' => $_GET['menuaction'],'post_empty' => (int)!$_POST));
 		}
-		$this->name_vars = $session_data['name_vars'];
+		self::$name_vars = self::$request->name_vars;
 		if (isset($submit_button) && !empty($submit_button))
 		{
-			$this->set_array($exec,$submit_button,'pressed');
+			self::set_array($exec,$submit_button,'pressed');
 		}
-		$content = $exec[$this->name_vars];
+		$content = $exec[self::$name_vars];
 		if (!is_array($content))
 		{
 			$content = array();
 		}
-		$this->init($session_data);
-		$GLOBALS['egw_info']['etemplate']['extension_data'] = $session_data['extension_data'];
-		$GLOBALS['egw_info']['etemplate']['java_script'] = $session_data['java_script'] || $_POST['java_script'];
-		$GLOBALS['egw_info']['etemplate']['dom_enabled'] = $session_data['dom_enabled'] || $_POST['dom_enabled'];
-		//echo "globals[java_script] = '".$GLOBALS['egw_info']['etemplate']['java_script']."', session_data[java_script] = '".$session_data['java_script']."', _POST[java_script] = '".$_POST['java_script']."'\n";
+		$this->init(self::$request->template);
+		self::$java_script = self::$request->java_script || $_POST['java_script'];
+		//echo "globals[java_script] = '".self::$java_script."', session_data[java_script] = '".self::$request->java_script."', _POST[java_script] = '".$_POST['java_script']."'\n";
 		//echo "process_exec($this->name) content ="; _debug_array($content);
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
 		{
 			$GLOBALS['egw']->translation->add_app('etemplate');	// some extensions have own texts
 		}
-		$this->process_show($content,$session_data['to_process'],$this->name_vars,$type);
+		$this->process_show($content,self::$request->to_process,self::$name_vars,$type);
 
-		$GLOBALS['egw_info']['etemplate']['loop'] |= !$this->canceled && $this->button_pressed &&
-			$this->validation_errors($session_data['ignore_validation']);	// set by process_show
+		self::$loop |= !$this->canceled && $this->button_pressed &&
+			$this->validation_errors(self::$request->ignore_validation);	// set by process_show
 
 		// If a tab has an error on it, change to that tab
-		foreach($GLOBALS['egw_info']['etemplate']['validation_errors'] as $form_name => $msg)
+		foreach(self::$validation_errors as $form_name => $msg)
 		{
 			$name = $this->template_name($form_name);
 			if (!$this->get_widget_by_name($name))
@@ -466,55 +435,48 @@ class etemplate extends boetemplate
 		}
 
 		//echo "process_exec($this->name) process_show(content) ="; _debug_array($content);
-		//echo "process_exec($this->name) session_data[changes] ="; _debug_array($session_data['changes']);
-		$content = $this->complete_array_merge($session_data['changes'],$content);
+		//echo "process_exec($this->name) session_data[changes] ="; _debug_array(self::$request->changes']);
+		$content = $this->complete_array_merge(self::$request->changes,$content);
 		//echo "process_exec($this->name) merge(changes,content) ="; _debug_array($content);
 
-		if ($GLOBALS['egw_info']['etemplate']['loop'])
+		if (self::$loop)
 		{
-			if ($session_data['hooked'] != '')	// set previous phpgw_body if we are called as hook
+			if (self::$request->hooked != '')	// set previous phpgw_body if we are called as hook
 			{
-				if (!$this->xslt)
-				{
-					$GLOBALS['egw_info']['etemplate']['hook_content'] = $session_data['hooked'];
-					$GLOBALS['egw_info']['flags']['currentapp'] = $GLOBALS['egw_info']['etemplate']['hook_app'] = $session_data['hook_app'];
-				}
-				else
-				{
-					$GLOBALS['egw']->xslttpl->set_var('phpgw',array('body_data' => $session_data['hooked']));
-				}
+				self::$hook_content = self::$request->hooked;
+				$GLOBALS['egw_info']['flags']['currentapp'] = self::$hook_app = self::$request->hook_app;
 			}
-			if($session_data['include_xajax']) $GLOBALS['egw_info']['flags']['include_xajax'] = true;
+			if(self::$request->include_xajax) $GLOBALS['egw_info']['flags']['include_xajax'] = true;
 
-			if (!empty($session_data['app_header']))
+			if (!empty(self::$request->app_header))
 			{
-				$GLOBALS['egw_info']['flags']['app_header'] = $session_data['app_header'];
+				$GLOBALS['egw_info']['flags']['app_header'] = self::$request->app_header;
 			}
 
-			$GLOBALS['egw_info']['flags']['java_script'] .= $session_data['java_script_from_flags'];
-			if (!empty($session_data['java_script_body_tags']))
+			$GLOBALS['egw_info']['flags']['java_script'] .= self::$request->java_script_from_flags;
+			if (!empty(self::$request->java_script_body_tags))
 			{
-				foreach ($session_data['java_script_body_tags'] as $tag => $code)
+				foreach (self::$request->java_script_body_tags as $tag => $code)
 				{
 					//error_log($GLOBALS['egw']->js->body[$tag]);
 					$GLOBALS['egw']->js->body[$tag] .= $code;
 				}
 			}
-			if (is_array($session_data['java_script_files']))
+			if (is_array(self::$request->java_script_files))
 			{
-				$GLOBALS['egw']->js->files = !is_array($GLOBALS['egw']->js->files) ? $session_data['java_script_files'] :
-					$this->complete_array_merge($GLOBALS['egw']->js->files,$session_data['java_script_files']);
+				$GLOBALS['egw']->js->files = !is_array($GLOBALS['egw']->js->files) ? self::$request->java_script_files :
+					$this->complete_array_merge($GLOBALS['egw']->js->files,self::$request->java_script_files);
 			}
 
 			//echo "<p>process_exec($this->name): <font color=red>loop is set</font>, content=</p>\n"; _debug_array($content);
-			return $this->exec($session_data['method'],$session_data['content'],$session_data['sel_options'],
-				$session_data['readonlys'],$session_data['preserv'],$session_data['output_mode'],
-				$session_data['ignore_validation'],$content);
+			return $this->exec(self::$request->method,self::$request->content,self::$request->sel_options,
+				self::$request->readonlys,self::$request->preserv,self::$request->output_mode,
+				self::$request->ignore_validation,$content);
 		}
 		else
 		{
 			//echo "<p>process_exec($this->name): calling $session_data[method]</p>\n";
-			return ExecMethod($session_data['method'],$this->complete_array_merge($session_data['preserv'],$content));
+			return ExecMethod(self::$request->method,$this->complete_array_merge(self::$request->preserv,$content));
 		}
 	}
 
@@ -528,26 +490,29 @@ class etemplate extends boetemplate
 	function process_values2url()
 	{
 		//echo "process_exec: _GET ="; _debug_array($_GET);
-		$session_data = $this->get_appsession($_GET['etemplate_exec_id']);
-		//echo "<p>process_exec: session_data ="; _debug_array($session_data);
-
-		if (!$_GET['etemplate_exec_id'] || !is_array($session_data) || count($session_data) < 10)
+		if (!$_GET['etemplate_exec_id'] || !($request = etemplate_request::read($_GET['etemplate_exec_id'])))
 		{
 			return false;
 		}
-		$this->name_vars = $session_data['name_vars'];
-		$GLOBALS['egw_info']['etemplate']['extension_data'] = $session_data['extension_data'];
+		self::$name_vars = $request->name_vars;
 
-		$content = $_GET[$this->name_vars];
+		$content = $_GET[self::$name_vars];
 		if (!is_array($content))
 		{
 			$content = array();
 		}
-		$this->process_show($content,$session_data['to_process'],$this->name_vars);
+		$this->process_show($content,$request->to_process,self::$name_vars);
 
-		return $this->complete_array_merge($session_data['preserv'],$content);
+		return $this->complete_array_merge($request->preserv,$content);
 	}
 
+	/**
+	 * Flag if the styles of a certain template are already included
+	 *
+	 * @var array template-name => boolean
+	 */
+	static private $styles_included = array();
+
 	/**
 	* creates HTML from an eTemplate
 	*
@@ -592,13 +557,13 @@ class etemplate extends boetemplate
 		{
 			$content = array();	// happens if incl. template has no content
 		}
-		// make the content availible as class-var for extensions
+		// make the content availible as class-public for extensions
 		$this->content =& $content;
 
 		$html = "\n\n<!-- BEGIN eTemplate $this->name -->\n<div id=\"$this->name\">\n\n";
-		if (!$GLOBALS['egw_info']['etemplate']['styles_included'][$this->name])
+		if (!self::$styles_included[$this->name])
 		{
-			$GLOBALS['egw_info']['etemplate']['styles_included'][$this->name] = True;
+			self::$styles_included[$this->name] = True;
 			$html .= html::style($this->style)."\n\n";
 		}
 		$path = '/';
@@ -746,7 +711,7 @@ class etemplate extends boetemplate
 			{
 				$cl = 'row_'.($nmr_alternate++ & 1 ? 'off' : 'on').substr($cl,3); // alternate color
 			}
-			$cl = isset($this->class_conf[$cl]) ? $this->class_conf[$cl] : $cl;
+			$cl = isset(self::$class_conf[$cl]) ? self::$class_conf[$cl] : $cl;
 			$rows[".$row"] .= html::formatOptions($cl,'class');
 			$rows[".$row"] .= html::formatOptions($class,',valign');
 			reset ($cols);
@@ -848,7 +813,7 @@ class etemplate extends boetemplate
 					}
 					$cl = $cl['class'];
 				}
-				$cl = $this->expand_name(isset($this->class_conf[$cl]) ? $this->class_conf[$cl] : $cl,
+				$cl = $this->expand_name(isset(self::$class_conf[$cl]) ? self::$class_conf[$cl] : $cl,
 					$c,$r,$show_c,$show_row,$content);
 				// else the class is set twice, in the table and the table-cell, which is not good for borders
 				if ($cl && $cell['type'] != 'template' && $cell['type'] != 'grid')
@@ -867,7 +832,7 @@ class etemplate extends boetemplate
 		}
 		$html = html::table($rows,html::formatOptions($options,'width,height,border,class,cellspacing,cellpadding').
 			html::formatOptions($grid['span'],',class').
-			html::formatOptions($grid['name']?$this->form_name($cname,$grid['name']):'','id'));
+			html::formatOptions($grid['name']?self::form_name($cname,$grid['name']):'','id'));
 
 		if (!empty($overflow)) {
 			if (is_numeric($height)) $height .= 'px';
@@ -926,6 +891,8 @@ class etemplate extends boetemplate
 		return $name;
 	}
 
+	static private $class_conf = array('nmh' => 'th','nmr0' => 'row_on','nmr1' => 'row_off');
+
 	/**
 	* generates HTML for one widget (input-field / cell)
 	*
@@ -965,7 +932,7 @@ class etemplate extends boetemplate
 		{
 			list($name) = explode('=',$name);
 		}
-		$form_name = $this->form_name($cname,$name);
+		$form_name = self::form_name($cname,$name);
 
 		$value = $this->get_array($content,$name);
 
@@ -1000,7 +967,7 @@ class etemplate extends boetemplate
 		// the while loop allows to build extensions from other extensions
 		// please note: only the first extension's post_process function is called !!!
 		list($type,$sub_type) = explode('-',$cell['type']);
-		while ((!$this->types[$cell['type']] || !empty($sub_type)) && $this->haveExtension($type,'pre_process'))
+		while ((!self::$types[$cell['type']] || !empty($sub_type)) && $this->haveExtension($type,'pre_process'))
 		{
 			//echo "<p>pre_process($cell[name]/$cell[type])</p>\n";
 			if (strchr($cell['size'],'$') || $cell['size'][0] == '@')
@@ -1018,7 +985,7 @@ class etemplate extends boetemplate
 
 			$readonly = $cell['readonly'] !== false && ($readonly || $cell['readonly']);	// might be set or unset (===false) by extension
 
-			$this->set_array($content,$name,$value);
+			self::set_array($content,$name,$value);
 
 			if ($cell['type'] == $type.'-'.$sub_type) break;	// stop if no further type-change
 
@@ -1153,14 +1120,13 @@ class etemplate extends boetemplate
 
 					if (!$readonly)
 					{
-						$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] =  array(
-							'type'      => $cell['type'],
+						self::$request->set_to_process($form_name,$cell['type'],array(
 							'maxlength' => $cell_opts[1],
 							'needed'    => $cell['needed'],
 							'preg'      => $cell_opts[2],
 							'min'       => $min,	// int and float only
 							'max'       => $max,
-						);
+						));
 					}
 				}
 				unset($cell_opts);
@@ -1177,10 +1143,9 @@ class etemplate extends boetemplate
 				}
 				if (!$readonly)
 				{
-					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] =  array(
-						'type'      => $cell['type'],
+					self::$request->set_to_process($form_name,$cell['type'],array(
 						'needed'    => $cell['needed'],
-					);
+					));
 				}
 				break;
 			case 'htmlarea':	// Multiline formatted Text Input, size: {simple|extended|advanced},height,width,toolbar-expanded,upload-path
@@ -1198,10 +1163,9 @@ class etemplate extends boetemplate
 					);
 					$html .= html::fckEditor($form_name,$value,$mode,$fckoptions,$height,$width,$baseref);
 
-					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] =  array(
-						'type'      => $cell['type'],
+					self::$request->set_to_process($form_name,$cell['type'],array(
 						'needed'    => $cell['needed'],
-					);
+					));
 				}
 				else
 				{
@@ -1238,17 +1202,16 @@ class etemplate extends boetemplate
 					}
 					$html .= html::input($form_name,$set_val,'checkbox',$options);
 
-					if ($multiple) $form_name = $this->form_name($cname,substr($cell['name'],0,-2));
+					if ($multiple) $form_name = self::form_name($cname,substr($cell['name'],0,-2));
 
-					if (!isset($GLOBALS['egw_info']['etemplate']['to_process'][$form_name]))
+					if (!self::$request->isset_to_process($form_name))
 					{
-						$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = array(
-							'type'        => $cell['type'],
+						self::$request->set_to_process($form_name,$cell['type'],array(
 							'unset_value' => $unset_val,
 							'multiple'    => $multiple,
-						);
+						));
 					}
-					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name]['values'][] = $set_val;
+					self::$request->set_to_process_attribute($form_name,'values',$set_val,true);
 					if (!$multiple) unset($set_val);	// otherwise it will be added to the label
 				}
 				break;
@@ -1271,7 +1234,7 @@ class etemplate extends boetemplate
 				else
 				{
 					$html .= html::input($form_name,$set_val,'RADIO',$options);
-					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
+					self::$request->set_to_process($form_name,$cell['type']);
 				}
 				break;
 			case 'button':
@@ -1290,7 +1253,7 @@ class etemplate extends boetemplate
 				{
 					$onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : '').
 						(((string)$cell['onchange'] === '1' || $img) ?
-						"return submitit($this->name_form,'".addslashes($form_name)."');" : $cell['onchange']).'; return false;';
+						'return submitit('.self::$name_form.",'".addslashes($form_name)."');" : $cell['onchange']).'; return false;';
 
 					if (!html::$netscape4 && substr($img,-1) == '%' && is_numeric($percent = substr($img,0,-1)))
 					{
@@ -1319,10 +1282,10 @@ class etemplate extends boetemplate
 				$extra_label = False;
 				if (!$readonly && $type != 'buttononly')	// input button, are never submitted back!
 				{
-					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
+					self::$request->set_to_process($form_name,$cell['type']);
 					if ($name == 'cancel' || stripos($name,'[cancel]') !== false)
 					{
-						$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = 'cancel';
+						self::$request->set_to_process($form_name,'cancel');
 					}
 				}
 				break;
@@ -1478,7 +1441,7 @@ class etemplate extends boetemplate
 						$html .= html::select($form_name.($multiple > 1 ? '[]' : ''),$value,$sels,
 							$cell['no_lang'],$options,$multiple);
 					}
-					if (!isset($GLOBALS['egw_info']['etemplate']['to_process'][$form_name]))
+					if (!self::$request->isset_to_process($form_name))
 					{
 						// fix for optgroup's
 						$options=array();
@@ -1495,12 +1458,11 @@ class etemplate extends boetemplate
 								}
 							}
 						}
-						$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = array(
-							'type'    => $cell['type'],
+						self::$request->set_to_process($form_name,$cell['type'],array(
 							'needed'  => $cell['needed'],
 							'allowed' => array_keys($options),
 							'multiple'=> $multiple,
-						);
+						));
 					}
 				}
 				break;
@@ -1527,7 +1489,7 @@ class etemplate extends boetemplate
 					if ((int) $cell_options) $options .= ' size="'.(int)$cell_options.'"';
 					if (substr($name,-2) == '[]')
 					{
-						$GLOBALS['egw_info']['etemplate']['form_options'] .= ' enctype="multipart/form-data"';
+						self::$form_options .= ' enctype="multipart/form-data"';
 						if (strpos($options,'onChange="') !== false)
 						{
 							$options = preg_replace('/onChange="([^"]+)"/i','onChange="\\1; add_upload(this);"',$options);
@@ -1540,11 +1502,10 @@ class etemplate extends boetemplate
 					else
 					{
 						$html .= html::input_hidden($path_name = str_replace($name,$name.'_path',$form_name),'.');
-						$GLOBALS['egw_info']['etemplate']['form_options'] .=
-							" enctype=\"multipart/form-data\" onsubmit=\"set_element2(this,'$path_name','$form_name')\"";
+						self::$form_options = " enctype=\"multipart/form-data\" onsubmit=\"set_element2(this,'$path_name','$form_name')\"";
 					}
 					$html .= html::input($form_name,'','file',$options);
-					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
+					self::$request->set_to_process($form_name,$cell['type']);
 				}
 				break;
 			case 'vbox':
@@ -1602,7 +1563,7 @@ class etemplate extends boetemplate
 							}
 							$cl = $cl['class'];
 						}
-						$box_item_class = $this->expand_name(isset($this->class_conf[$cl]) ? $this->class_conf[$cl] : $cl,
+						$box_item_class = $this->expand_name(isset(self::$class_conf[$cl]) ? self::$class_conf[$cl] : $cl,
 							$show_c,$show_row,$content['.c'],$content['.row'],$content);
 						$rows[$box_row]['.'.$box_col] .= html::formatOptions($box_item_class,'class');
 					}
@@ -1661,7 +1622,7 @@ class etemplate extends boetemplate
 					$s_height = "height: $s_height".(substr($s_height,-1) != '%' ? 'px' : '').';';
 				}
 				$html = html::input_hidden($form_name,$value);
-				$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] =  $cell['type'];
+				self::$request->set_to_process($form_name,$cell['type']);
 
 				for ($n = 1; $n <= $cell_options; ++$n)
 				{
@@ -1687,25 +1648,14 @@ class etemplate extends boetemplate
 		// extension-processing need to be after all other and only with diff. name
 		if ($ext_type && !$readonly && $this->haveExtension($ext_type,'post_process'))
 		{	// unset it first, if it is already set, to be after the other widgets of the ext.
-			$to_process = 'ext-'.$ext_type;
-			if (is_array($GLOBALS['egw_info']['etemplate']['to_process'][$form_name]))
-			{
-				$to_process = $GLOBALS['egw_info']['etemplate']['to_process'][$form_name];
-				$to_process['type'] = 'ext-'.$ext_type;
-			}
-			unset($GLOBALS['egw_info']['etemplate']['to_process'][$form_name]);
-			$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = $to_process;
+			$to_process = self::$request->get_to_process($form_name);
+			self::$request->unset_to_process($form_name);
+			self::$request->set_to_process($form_name,'ext-'.$ext_type,$to_process);
 		}
 		// save blur-value to strip it in process_exec
-		if (!empty($blur) && isset($GLOBALS['egw_info']['etemplate']['to_process'][$form_name]))
+		if (!empty($blur) && self::$request->isset_to_process($form_name))
 		{
-			if (!is_array($GLOBALS['egw_info']['etemplate']['to_process'][$form_name]))
-			{
-				$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = array(
-					'type' => $GLOBALS['egw_info']['etemplate']['to_process'][$form_name]
-				);
-			}
-			$GLOBALS['egw_info']['etemplate']['to_process'][$form_name]['blur'] = $blur;
+			self::$request->set_to_process_attribute($form_name,'blur',$blur);
 		}
 		if ($extra_label && ($label != '' || $html == ''))
 		{
@@ -1722,7 +1672,7 @@ class etemplate extends boetemplate
 			}
 			if ($label && !$readonly && ($accesskey || $label_for || $type != 'label' && $cell['name']))
 			{
-				$label = html::label($label,$label_for ? $this->form_name($cname,$label_for) :
+				$label = html::label($label,$label_for ? self::form_name($cname,$label_for) :
 					$form_name.($set_val?"[$set_val]":''),$accesskey);
 			}
 			if ($type == 'radio' || $type == 'checkbox' || $label && strpos($label,'%s')!==false)	// default for radio is label after the button
@@ -1755,9 +1705,9 @@ class etemplate extends boetemplate
 			return html::a_href($html,$extra_link,'',$options);
 		}
 		// if necessary show validation-error behind field
-		if (isset($GLOBALS['egw_info']['etemplate']['validation_errors'][$form_name]))
+		if (isset(self::$validation_errors[$form_name]))
 		{
-			$html .= ' <span style="color: red; white-space: nowrap;">'.$GLOBALS['egw_info']['etemplate']['validation_errors'][$form_name].'</span>';
+			$html .= ' <span style="color: red; white-space: nowrap;">'.self::$validation_errors[$form_name].'</span>';
 		}
 		// generate an extra div, if we have an onclick handler and NO children or it's an extension
 		//echo "<p>$this->name($this->onclick_handler:$this->no_onclick:$this->onclick_proxy): $cell[type]/$cell[name]</p>\n";
@@ -1857,7 +1807,7 @@ class etemplate extends boetemplate
 
 			if (preg_match_all("/form::name\\('([^']+)'\\)/",$on,$matches)) {
 				foreach($matches[1] as $n => $matche_name) {
-					$matches[1][$n] = '\''.$this->form_name($cname,$matche_name).'\'';
+					$matches[1][$n] = '\''.self::form_name($cname,$matche_name).'\'';
 				}
 				$on = str_replace($matches[0],$matches[1],$on);
 			}
@@ -1905,7 +1855,7 @@ class etemplate extends boetemplate
 		{
 			return stripslashes($var);
 		}
-		foreach($var as $key => $val)
+		foreach($public as $key => $val)
 		{
 			$var[$key] = is_array($val) ? self::array_stripslashes($val) : stripslashes($val);
 		}
@@ -1941,7 +1891,7 @@ class etemplate extends boetemplate
 		{
 			$content_in = etemplate::array_stripslashes($content_in);
 		}
-		$GLOBALS['egw_info']['etemplate']['validation_errors'] = array();
+		self::$validation_errors = array();
 		$this->canceled = $this->button_pressed = False;
 
 		foreach($to_process as $form_name => $type)
@@ -1964,7 +1914,7 @@ class etemplate extends boetemplate
 			{
 				$value = '';	// blur-values is equal to emtpy
 			}
-			//echo "<p>process_show($this->name) loop was {$GLOBALS['egw_info']['etemplate']['loop']}, $type: $form_name = '$value'</p>\n";
+			//echo "<p>process_show($this->name) loop was ".self::$loop.", $type: $form_name = '$value'</p>\n";
 			list($type,$sub) = explode('-',$type);
 			switch ($type)
 			{
@@ -1982,15 +1932,15 @@ class etemplate extends boetemplate
 					elseif (!etemplate::isset_array($content,$form_name))
 					{
 						//echo "<p>setting content[$form_name]='$_cont' because is was unset !!!</p>\n";
-						$this->set_array($content,$form_name,$_cont);
+						self::set_array($content,$form_name,$_cont);
 					}
 					if ($_cont === '' && $attr['needed'] && !$attr['blur'])
 					{
-						$this->set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+						self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
 					}
 					break;
 				case 'htmlarea':
-					$this->set_array($content,$form_name,$value);
+					self::set_array($content,$form_name,$value);
 					break;
 				case 'int':
 				case 'float':
@@ -1999,7 +1949,7 @@ class etemplate extends boetemplate
 				case 'textarea':
 					if ($value === '' && $attr['needed'] && !$attr['blur'])
 					{
-						$this->set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+						self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
 					}
 					if ((int) $attr['maxlength'] > 0 && strlen($value) > (int) $attr['maxlength'])
 					{
@@ -2010,13 +1960,13 @@ class etemplate extends boetemplate
 						switch($type)
 						{
 							case 'int':
-								$this->set_validation_error($form_name,lang("'%1' is not a valid integer !!!",$value),'');
+								self::set_validation_error($form_name,lang("'%1' is not a valid integer !!!",$value),'');
 								break;
 							case 'float':
-								$this->set_validation_error($form_name,lang("'%1' is not a valid floatingpoint number !!!",$value),'');
+								self::set_validation_error($form_name,lang("'%1' is not a valid floatingpoint number !!!",$value),'');
 								break;
 							default:
-								$this->set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value),'');
+								self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value),'');
 								break;
 						}
 					}
@@ -2028,30 +1978,30 @@ class etemplate extends boetemplate
 
 							if (!empty($attr['min']) && $value < $attr['min'])
 							{
-								$this->set_validation_error($form_name,lang("Value has to be at least '%1' !!!",$attr['min']),'');
+								self::set_validation_error($form_name,lang("Value has to be at least '%1' !!!",$attr['min']),'');
 								$value = $type == 'int' ? (int) $attr['min'] : (float) $attr['min'];
 							}
 							if (!empty($attr['max']) && $value > $attr['max'])
 							{
-								$this->set_validation_error($form_name,lang("Value has to be at maximum '%1' !!!",$attr['max']),'');
+								self::set_validation_error($form_name,lang("Value has to be at maximum '%1' !!!",$attr['max']),'');
 								$value = $type == 'int' ? (int) $attr['max'] : (float) $attr['max'];
 							}
 						}
 					}
-					$this->set_array($content,$form_name,$value);
+					self::set_array($content,$form_name,$value);
 					break;
 				case 'cancel':	// cancel button ==> dont care for validation errors
 					if ($value)
 					{
 						$this->canceled = True;
-						$this->set_array($content,$form_name,$value);
+						self::set_array($content,$form_name,$value);
 					}
 					break;
 				case 'button':
 					if ($value)
 					{
 						$this->button_pressed = True;
-						$this->set_array($content,$form_name,$value);
+						self::set_array($content,$form_name,$value);
 					}
 					break;
 				case 'select':
@@ -2061,7 +2011,7 @@ class etemplate extends boetemplate
 						{
 							if (!($attr['multiple'] && !$val) && !in_array($val,$attr['allowed']))
 							{
-								$this->set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",$attr['allowed'])),'');
+								self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",$attr['allowed'])),'');
 								$value = '';
 								break;
 							}
@@ -2070,19 +2020,19 @@ class etemplate extends boetemplate
 					if (is_array($value)) $value = implode(',',$value);
 					if ($value === '' && $attr['needed'])
 					{
-						$this->set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+						self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
 					}
-					$this->set_array($content,$form_name,$value);
+					self::set_array($content,$form_name,$value);
 					break;
 				case 'checkbox':
 					if ($value === false)	// get_array() returns false for not set
 					{
-						$this->set_array($content,$form_name,$attr['multiple'] ? array() : $attr['unset_value']);	// need to be reported too
+						self::set_array($content,$form_name,$attr['multiple'] ? array() : $attr['unset_value']);	// need to be reported too
 					}
 					else
 					{
 						$value = array_intersect(is_array($value) ? $value : array($value),$attr['values']); // return only allowed values
-						$this->set_array($content,$form_name,$attr['multiple'] ? $value : $value[0]);
+						self::set_array($content,$form_name,$attr['multiple'] ? $value : $value[0]);
 					}
 					break;
 				case 'file':
@@ -2121,7 +2071,7 @@ class etemplate extends boetemplate
 					//echo $form_name; _debug_array($value);
 					// fall-throught
 				default:
-					$this->set_array($content,$form_name,$value);
+					self::set_array($content,$form_name,$value);
 					break;
 			}
 		}
@@ -2132,12 +2082,12 @@ class etemplate extends boetemplate
 		if (is_int($this->debug) && $this->debug >= 2 || $this->debug == $this->name && $this->name)
 		{
 			echo "<p>process_show($this->name) end: content ="; _debug_array($content);
-			if (count($GLOBALS['egw_info']['etemplate']['validation_errors']))
+			if (count(self::$validation_errors))
 			{
-				echo "<p>validation_errors = "; _debug_array($GLOBALS['egw_info']['etemplate']['validation_errors']);
+				echo "<p>validation_errors = "; _debug_array(self::$validation_errors);
 			}
 		}
-		return count($GLOBALS['egw_info']['etemplate']['validation_errors']);
+		return count(self::$validation_errors);
 	}
 
 	/**
@@ -2145,19 +2095,19 @@ class etemplate extends boetemplate
 	*
 	* @param string $name (complete) name of the widget causing the error
 	* @param string $error error-message already translated
-	* @param string $cname=null set it to '', if the name is already a form-name, defaults to $this->name_vars
+	* @param string $cname=null set it to '', if the name is already a form-name, defaults to self::$name_vars
 	*/
-	function set_validation_error($name,$error,$cname=null)
+	static function set_validation_error($name,$error,$cname=null)
 	{
-		if (is_null($cname)) $cname = $this->name_vars;
+		if (is_null($cname)) $cname = self::$name_vars;
 		//echo "<p>etemplate::set_validation_error('$name','$error','$cname');</p>\n";
-		if ($cname) $name = $this->form_name($cname,$name);
+		if ($cname) $name = self::form_name($cname,$name);
 
-		if ($GLOBALS['egw_info']['etemplate']['validation_errors'][$name])
+		if (self::$validation_errors[$name])
 		{
-			$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] .= ', ';
+			self::$validation_errors[$name] .= ', ';
 		}
-		$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] .= $error;
+		self::$validation_errors[$name] .= $error;
 	}
 
 	/**
@@ -2169,15 +2119,11 @@ class etemplate extends boetemplate
 	*/
 	function java_script($consider_not_tested_as_enabled = True)
 	{
-		$ret = !!$GLOBALS['egw_info']['etemplate']['java_script'] ||
-			$consider_not_tested_as_enabled && !isset($GLOBALS['egw_info']['etemplate']['java_script']);
-		//echo "<p>java_script($consider_not_tested_as_enabled)='$ret', java_script='".$GLOBALS['egw_info']['etemplate']['java_script']."', isset(java_script)=".isset($GLOBALS['egw_info']['etemplate']['java_script'])."</p>\n";
+		$ret = !!self::$java_script ||
+			$consider_not_tested_as_enabled && !isset(self::$java_script);
+		//echo "<p>java_script($consider_not_tested_as_enabled)='$ret', java_script='".self::$java_script."', isset(java_script)=".isset(self::$java_script)."</p>\n";
 
 		return $ret;
-		return !!$GLOBALS['egw_info']['etemplate']['java_script'] ||
-			$consider_not_tested_as_enabled &&
-			(!isset($GLOBALS['egw_info']['etemplate']['java_script']) ||
-			$GLOBALS['egw_info']['etemplate']['java_script'].'' == '');
 	}
 
 	/**
@@ -2190,13 +2136,10 @@ class etemplate extends boetemplate
 	private function include_java_script($what = 3)
 	{
 		// this is to test if javascript is enabled
-		if ($what & 1 && !isset($GLOBALS['egw_info']['etemplate']['java_script']))
+		if ($what & 1 && !isset(self::$java_script))
 		{
 			$js = '<script language="javascript">
 document.write(\''.str_replace("\n",'',html::input_hidden('java_script','1')).'\');
-if (document.getElementById) {
-	document.write(\''.str_replace("\n",'',html::input_hidden('dom_enabled','1')).'\');
-}
 </script>
 ';
 		}
@@ -2209,4 +2152,4 @@ if (document.getElementById) {
 		}
 		return $js;
 	}
-};
+}
diff --git a/etemplate/inc/class.etemplate_request.inc.php b/etemplate/inc/class.etemplate_request.inc.php
index c07eb69477..4221d3a8b5 100644
--- a/etemplate/inc/class.etemplate_request.inc.php
+++ b/etemplate/inc/class.etemplate_request.inc.php
@@ -1,36 +1,54 @@
 <?php
 /**
- * eGroupWare - eTemplate request object
+ * eGroupWare - eTemplate request object storing request-data directly in the form itself
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package etemplate
+ * @subpackage api
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright (c) 2007 by Ralf Becker <RalfBecker@outdoor-training.de>
+ * @copyright (c) 2007-9 by Ralf Becker <RalfBecker@outdoor-training.de>
  * @version $Id$
  */
 
 /**
- * Class to represent the persitent information stored on the server for each eTemplate request
- * 
- * The information is stored in the users session
- * 
- * There are two ways to instanciate a request object:
- * 
- * a) a new request: 
- * 
- * $request = new etemplate_request(); $id = $request->id();
- * 
- * b) open or modify an existing request: 
- * 
- * if (!($request = etemplate_request::read($id)))
+ * Class to represent the persitent information of an eTemplate request
+ *
+ * This class stores the request-data direct in a hidden var in the form.
+ * As this would allow an evil user to manipulate it and therefore compromise the security
+ * of an EGroupware instance, this class should only be used, if mcrypt is available
+ * to encrypt that data. The factory method etemplate_request::read() ensures that,
+ * by using etemplate_request_session instead.
+ *
+ * The key used to encrypt the request can be set in header.inc.php by setting
+ *
+ *		$GLOBALS['egw_info']['server']['etemplate_form_key'] = 'something secret';
+ *
+ * if this var is not set, the db_pass and EGW_SERVER_ROOT is used instead.
+ *
+ * The request object should be instancated only via the factory method etemplate::request($id=null)
+ *
+ * $request = etemplate::request();
+ *
+ * // add request data
+ *
+ * $id = $request->id();
+ *
+ * b) open or modify an existing request:
+ *
+ * if (!($request = etemplate::request($id)))
  * {
  * 		// request not found
  * }
- * 
- * Ajax request can use this object to open the original request by using the id, they have to transmitt back, 
- * and register further variables, modify the registered ones or delete them.
- * 
+ *
+ * Ajax requests can use this object to open the original request by using the id, they have to transmitt back,
+ * and register further variables, modify the registered ones or delete them AND then update the id, if it changed:
+ *
+ *	if (($new_id = $request->id()) != $id)
+ *	{
+ *		$response->addAssign('etemplate_exec_id','value',$new_id);
+ *	}
+ *
  * For an example look in link_widget::ajax_search()
  */
 class etemplate_request
@@ -40,61 +58,132 @@ class etemplate_request
 	 *
 	 * @var array
 	 */
-	private $data=array();
+	protected $data=array();
 	/**
 	 * Flag if data has been modified and therefor need to be stored again in the session
 	 *
 	 * @var boolean
 	 */
-	private $data_modified=false;
+	protected $data_modified=false;
 	/**
-	 * request id
+	 * mcrypt resource
+	 *
+	 * @var resource
+	 */
+	static protected $mcrypt;
+
+	/**
+	 * See gzcompress, set it to 0 to not compress
+	 *
+	 * @var int
+	 */
+	static public $compression_level = 6;
+
+	/**
+	 * Name of request class used
+	 *
+	 * Can be set here to force a certain class, otherwise the factory method chooses one
 	 *
 	 * @var string
 	 */
-	private $id;
-	
+	static public $request_class;// = 'etemplate_request_session';
+
 	/**
-	 * Enter description here...
+	 * Factory method to get a new request object or the one for an existing request
 	 *
-	 * @param array $id_data
+	 * If mcrypt AND gzcompress is available this factory method chooses etemplate_request,
+	 * which stores the request data encrypted in a hidden var directly in the form,
+	 * over etemplate_request_session, which stores the data in the session (and causing
+	 * the sesison to constantly grow).
+	 *
+	 * @param string $id=null
 	 * @return etemplate_request
 	 */
-	function __construct($id=null)
+	public static function read($id=null)
 	{
-		if (!$id) $id = self::request_id();
-		
-		$this->id = $id;
+		if (is_null(self::$request_class))
+		{
+			self::$request_class = extension_loaded('mcrypt') && function_exists('gzcompress') &&
+				self::init_crypt() ? __CLASS__ : 'etemplate_request_session';
+		}
+		if (self::$request_class != __CLASS__)
+		{
+			return call_user_method('read',self::$request_class,$id);
+		}
+		$request = new etemplate_request();
+
+		if (!is_null($id))
+		{
+			$id = base64_decode($id);
+
+			// decrypt the data if available
+			if (self::init_crypt())
+			{
+				$id = trim(mdecrypt_generic(self::$mcrypt,$id));
+			}
+			// uncompress the data if available
+			if (self::$compression_level && function_exists('gzcompress'))
+			{
+				//$len_compressed = bytes($id);
+				//$time = microtime(true);
+				$id = gzuncompress($id);
+				//$time = number_format(1000.0 * (microtime(true) - $time),1);
+				//$len_uncompressed = bytes($id);
+				//error_log(__METHOD__."() uncompressed from $len_compressed to $len_uncompressed bytes $time ms");
+			}
+			$request->data = unserialize($id);
+
+			if (!$request->data)
+			{
+				error_log(__METHOD__."() id not valid!");
+				return false;
+			}
+			//error_log(__METHOD__."() size of request = ".bytes($id));
+		}
+		return $request;
 	}
-	
+
+	/**
+	 * Private constructor to force the instancation of this class only via it's static factory method read
+	 *
+	 * @param string $id=null
+	 */
+	private function __construct($id=null)
+	{
+
+	}
+
 	/**
 	 * return the id of this request
 	 *
 	 * @return string
 	 */
-	function id()
+	public function &id()
 	{
-		return $this->id;
-	}
-	
-	/**
-	 * Read the request via it's id, returns a request_object or false
-	 *
-	 * @param string $id
-	 * @return etempalte_request|boolean the object or false if $id is not found
-	 */
-	static function read($id)
-	{
-		if (!($data = $GLOBALS['egw']->session->appsession($id,'etemplate')))
+		$id = serialize($this->data);
+
+		// compress the data if available
+		if (self::$compression_level && function_exists('gzcompress'))
 		{
-			return false;	// request not found
+			//$len_uncompressed = bytes($id);
+			//$time = microtime(true);
+			$id = gzcompress($id,self::$compression_level);
+			//$time = number_format(1000.0 * (microtime(true) - $time),1);
+			//$len_compressed = bytes($id);
+			//error_log(__METHOD__."() compressed from $len_uncompressed to $len_compressed bytes in $time ms");
 		}
-		$request = new etemplate_request($id);
-		$request->data = $data;
-		
-		return $request;
+		// encrypt the data if available
+		if (self::init_crypt())
+		{
+			$id = mcrypt_generic(self::$mcrypt,$id);
+		}
+		$id = base64_encode($id);
+
+		//error_log(__METHOD__."() #$this->id: size of request = ".bytes($id));//.", id='$id'");
+		//self::debug();
+		return $id;
 	}
-	
+
 	/**
 	 * Register a form-variable to be processed
 	 *
@@ -105,13 +194,36 @@ class etemplate_request
 	public function set_to_process($form_name,$type,$data=array())
 	{
 		if (!$form_name || !$type) return;
-		
+
 		$data['type'] = $type;
-		
+
 		$this->data['to_process'][$form_name] = $data;
 		$this->data_modified = true;
 	}
-	
+
+	/**
+	 * Set an attribute of a to-process record
+	 *
+	 * @param string $form_name form-name
+	 * @param string $attribute etemplate type
+	 * @param array $value
+	 * @param boolean $add_to_array=false should $value be added to the attribute array
+	 */
+	public function set_to_process_attribute($form_name,$attribute,$value,$add_to_array=false)
+	{
+		if (!$form_name) return;
+
+		if ($add_to_array)
+		{
+			$this->data['to_process'][$form_name][$attribute][] = $value;
+		}
+		else
+		{
+			$this->data['to_process'][$form_name][$attribute] = $value;
+		}
+		$this->data_modified = true;
+	}
+
 	/**
 	 * Unregister a form-variable to be no longer processed
 	 *
@@ -122,7 +234,7 @@ class etemplate_request
 		unset($this->data['to_process'][$form_name]);
 		$this->data_modified = true;
 	}
-	
+
 	/**
 	 * return the data of a form-var to process or the whole array
 	 *
@@ -133,7 +245,7 @@ class etemplate_request
 	{
 		return $form_name ? $this->data['to_process'][$form_name] : $this->data['to_process'];
 	}
-	
+
 	/**
 	 * check if something set for a given $form_name
 	 *
@@ -144,14 +256,14 @@ class etemplate_request
 	{
 		return isset($this->data['to_process'][$form_name]);
 	}
-	
+
 	/**
 	 * magic function to set all request-vars, used eg. as $request->method = 'app.class.method';
 	 *
 	 * @param string $var
 	 * @param mixed $val
 	 */
-	function __set($var,$val)
+	public function __set($var,$val)
 	{
 		if ($this->data[$var] !== $val)
 		{
@@ -159,90 +271,112 @@ class etemplate_request
 			$this->data_modified = true;
 		}
 	}
-	
+
 	/**
 	 * magic function to access the request-vars, used eg. as $method = $request->method;
 	 *
 	 * @param string $var
 	 * @return mixed
 	 */
-	function __get($var)
+	public function &__get($var)
 	{
 		return $this->data[$var];
 	}
 
 	/**
-	 * creates a new request-id via microtime()
-	 * 
-	 * @return string
+	 * Get the names / keys of existing variables
+	 *
+	 * @return array
 	 */
-	static function request_id()
+	public function names()
 	{
-		list($msec,$sec) = explode(' ',microtime());
-		$time = 100 * $sec + (int)(100 * $msec);	// gives precision of 1/100 sec
-		$id = $GLOBALS['egw_info']['flags']['currentapp'] .':'. $time;
-
-		return $id;
+		return array_keys($this->data);
 	}
 
 	/**
-	 * saves content,readonlys,template-keys, ... via eGW's appsession function
+	 * Output the size-wise important parts of a request
 	 *
-	 * As a user may open several windows with the same content/template wie generate a location-id from microtime
-	 * which is used as location for request to descriminate between the different windows. This location-id
-	 * is then saved as a hidden-var in the form. The above mentions session-id has nothing to do / is different
-	 * from the session-id which is constant for all windows opened in one session.
+	 * @param double $min_share minimum share to be reported (in percent of the whole request)
+	 * @param double $dump_share minimum share from which on a variable get output
 	 */
-	function __destruct()
+	public function debug($min_share=1.0,$dump_share=25.0)
 	{
-		if ($this->data_modified) $GLOBALS['egw']->session->appsession($this->id,'etemplate',$this->data);
-
-		if (substr($GLOBALS['egw_info']['server']['sessions_type'],0,4) == 'php4' && !$this->garbage_collection_done)
+		echo "<p><b>total size request data = ".($total=strlen(serialize($this->data)))."</b></p>\n";
+		echo "<p>shares bigger then $min_share% percent of it:</p>\n";
+		foreach($this->data as $key => $val)
 		{
-			$this->_php4_request_garbage_collection();
-		}
-	}
-
-	/**
-	 * a little bit of garbage collection for php4 sessions (their size is limited by memory_limit)
-	 *
-	 * With constant eTemplate use it can grow quite big and lead to unusable sessions (php terminates
-	 * before any output with "Allowed memory size of ... exhausted").
-	 * We delete now sessions once used after 10min and sessions never or multiple used after 60min.
-	 */
-	private function _php4_request_garbage_collection()
-	{
-		// now we are on php4 sessions and do a bit of garbage collection
-		$appsessions =& $_SESSION[EGW_SESSION_VAR]['appsessions']['etemplate'];
-		$session_used =& $appsessions['session_used'];
-		
-		if ($this->id)
-		{
-			//echo "session_used[$id_used]='".$session_used[$id_used]."'<br/>\n";
-			++$session_used[$this->id];	// count the number of times a session got used
-		}
-		$this->garbage_collection_done = true;
-
-		if (count($appsessions) < 20) return;	// we dont need to care
-
-		list($msec,$sec) = explode(' ',microtime());
-		$now = 	100 * $sec + (int)(100 * $msec);	// gives precision of 1/100 sec
-
-		foreach(array_keys($appsessions) as $id)
-		{
-			list(,$time) = explode(':',$id);
-			
-			if (!$time) continue;	// other data, no session
-			
-			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
-
-			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 60*6000)	// session not used and older then 1h
+			$len = strlen(is_array($val) ? serialize($val) : $val);
+			$len .= ' ('.sprintf('%2.1lf',($percent = 100.0 * $len / $total)).'%)';
+			if ($percent < $min_share) continue;
+			echo "<p><b>$key</b>: strlen(\$val)=$len</p>\n";
+			if ($percent >= $dump_share) _debug_array($val);
+			if (is_array($val) && $len > 2000)
 			{
-				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
-				unset($appsessions[$id]);
-				unset($session_used[$id]);
+				foreach($val as $k => $v)
+				{
+					$l = strlen(is_array($v) ? serialize($v) : $v);
+					$l .= ' ('.sprintf('%2.1lf',($p = 100.0 * $l / $total)).'%)';
+					if ($p < $min_share) continue;
+					echo "<p>&nbsp;- {$key}[$k]: strlen(\$v)=$l</p>\n";
+				}
 			}
 		}
 	}
+
+	/**
+	 * Check if session encryption is configured, possible and initialise it
+	 *
+	 * @param string $algo='tripledes'
+	 * @param string $mode='ecb'
+	 * @return boolean true if encryption is used, false otherwise
+	 */
+	static public function init_crypt($algo='tripledes',$mode='ecb')
+	{
+		if (is_null(self::$mcrypt))
+		{
+			if (isset($GLOBALS['egw_info']['server']['etemplate_form_key']))
+			{
+				$key = $GLOBALS['egw_info']['server']['etemplate_form_key'];
+			}
+			else
+			{
+				$key = $GLOBALS['egw_info']['server']['db_pass'].EGW_SERVER_ROOT;
+			}
+			if (!extension_loaded('mcrypt') && (!function_exists('dl') || !@dl(PHP_SHLIB_PREFIX.'mcrypt'.'.'.PHP_SHLIB_SUFFIX)))
+			{
+				error_log(__METHOD__."() required PHP extension mcrypt not loaded and can not be loaded, eTemplate requests get NOT encrypted!");
+				return false;
+			}
+			if (!(self::$mcrypt = mcrypt_module_open($algo, '', $mode, '')))
+			{
+				error_log(__METHOD__."() could not mcrypt_module_open(algo='$algo','',mode='$mode',''), eTemplate requests get NOT encrypted!");
+				return false;
+			}
+			$iv_size = mcrypt_enc_get_iv_size(self::$mcrypt);
+			$iv = !isset($GLOBALS['egw_info']['server']['mcrypt_iv']) || strlen($GLOBALS['egw_info']['server']['mcrypt_iv']) < $iv_size ?
+				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
+
+			$key_size = mcrypt_enc_get_key_size(self::$mcrypt);
+			if (strlen($key) > $key_size) $key = substr($key,0,$key_size);
+
+			if (mcrypt_generic_init(self::$mcrypt,$key, $iv) < 0)
+			{
+				error_log(__METHOD__."() could not initialise mcrypt, sessions get NOT encrypted!");
+				return self::$mcrypt = false;
+			}
+		}
+		return is_resource(self::$mcrypt);
+	}
+
+	/**
+	 * Destructor
+	 */
+	function __destruct()
+	{
+		if (self::$mcrypt)
+		{
+			mcrypt_generic_deinit(self::$mcrypt);
+			self::$mcrypt = null;
+		}
+	}
 }
\ No newline at end of file
diff --git a/etemplate/inc/class.etemplate_request_session.inc.php b/etemplate/inc/class.etemplate_request_session.inc.php
new file mode 100644
index 0000000000..2db57d3cc6
--- /dev/null
+++ b/etemplate/inc/class.etemplate_request_session.inc.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * eGroupWare - eTemplate request object storing the data in the session
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage api
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker@outdoor-training.de>
+ * @copyright (c) 2007-9 by Ralf Becker <RalfBecker@outdoor-training.de>
+ * @version $Id$
+ */
+
+/**
+ * Class to represent the persitent information stored on the server for each eTemplate request
+ *
+ * The information is stored in the users session, which causes the session to constantly grow.
+ * We implement here some garbadge collection to remove old requests.
+ *
+ * The request object should be instancated only via the factory method etemplate_request::read($id=null)
+ *
+ * $request = etemplate_request::read();
+ *
+ * // add request data
+ *
+ * $id = $request->id();
+ *
+ * b) open or modify an existing request:
+ *
+ * if (!($request = etemplate_request::read($id)))
+ * {
+ * 		// request not found
+ * }
+ *
+ * Ajax requests can use this object to open the original request by using the id, they have to transmitt back,
+ * and register further variables, modify the registered ones or delete them AND then update the id, if it changed:
+ *
+ *	if (($new_id = $request->id()) != $id)
+ *	{
+ *		$response->addAssign('etemplate_exec_id','value',$new_id);
+ *	}
+ *
+ * For an example look in link_widget::ajax_search()
+ */
+class etemplate_request_session extends etemplate_request
+{
+	/**
+	 * request id
+	 *
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * Private constructor to force the instancation of this class only via it's static factory method read
+	 *
+	 * @param array $id
+	 */
+	private function __construct($id=null)
+	{
+		if (!$id) $id = self::request_id();
+
+		$this->id = $id;
+	}
+
+	/**
+	 * return the id of this request
+	 *
+	 * @return string
+	 */
+	public function id()
+	{
+		//error_log(__METHOD__."() id=$this->id");
+		return $this->id;
+	}
+
+	/**
+	 * Factory method to get a new request object or the one for an existing request
+	 *
+	 * @param string $id=null
+	 * @return etemplate_request|boolean the object or false if $id is not found
+	 */
+	static function read($id=null)
+	{
+		$request = new etemplate_request_session($id);
+
+		if (!is_null($id))
+		{
+			if (!($data = $GLOBALS['egw']->session->appsession($id,'etemplate')))
+			{
+				return false;	// request not found
+			}
+			$request->data = $data;
+		}
+		//error_log(__METHOD__."(id=$id");
+		return $request;
+	}
+
+	/**
+	 * creates a new request-id via microtime()
+	 *
+	 * @return string
+	 */
+	static function request_id()
+	{
+		$time = (int) (100 * microtime(true));	// gives precision of 1/100 sec
+		$id = $GLOBALS['egw_info']['flags']['currentapp'] .':'. $time;
+
+		return $id;
+	}
+
+	/**
+	 * saves content,readonlys,template-keys, ... via eGW's appsession function
+	 *
+	 * As a user may open several windows with the same content/template wie generate a location-id from microtime
+	 * which is used as location for request to descriminate between the different windows. This location-id
+	 * is then saved as a hidden-var in the form. The above mentions session-id has nothing to do / is different
+	 * from the session-id which is constant for all windows opened in one session.
+	 */
+	function __destruct()
+	{
+		if ($this->data_modified) $GLOBALS['egw']->session->appsession($this->id,'etemplate',$this->data);
+
+		if (!$this->garbage_collection_done)
+		{
+			$this->_php4_request_garbage_collection();
+		}
+	}
+
+	/**
+	 * a little bit of garbage collection for php4 sessions (their size is limited by memory_limit)
+	 *
+	 * With constant eTemplate use it can grow quite big and lead to unusable sessions (php terminates
+	 * before any output with "Allowed memory size of ... exhausted").
+	 * We delete now sessions once used after 10min and sessions never or multiple used after 60min.
+	 */
+	protected function _php4_request_garbage_collection()
+	{
+		// now we are on php4 sessions and do a bit of garbage collection
+		$appsessions =& $_SESSION[egw_session::EGW_APPSESSION_VAR]['etemplate'];
+		$session_used =& $appsessions['session_used'];
+
+		if ($this->id)
+		{
+			//echo "session_used[$id_used]='".$session_used[$id_used]."'<br/>\n";
+			++$session_used[$this->id];	// count the number of times a session got used
+		}
+		$this->garbage_collection_done = true;
+
+		if (count($appsessions) < 20) return;	// we dont need to care
+
+		$now = (int) (100 * microtime(true));	// gives precision of 1/100 sec
+
+		foreach(array_keys($appsessions) as $id)
+		{
+			list(,$time) = explode(':',$id);
+
+			if (!$time) continue;	// other data, no session
+
+			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
+
+			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
+				$time < $now - 30*6000)	// session not used and older then 30min
+			{
+				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
+				unset($appsessions[$id]);
+				unset($session_used[$id]);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/etemplate/inc/class.link_widget.inc.php b/etemplate/inc/class.link_widget.inc.php
index 02e69e0979..f9bb0919c9 100644
--- a/etemplate/inc/class.link_widget.inc.php
+++ b/etemplate/inc/class.link_widget.inc.php
@@ -7,6 +7,7 @@
  * @subpackage extensions
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
  * @version $Id$
  */
 
@@ -114,6 +115,7 @@ class link_widget
 			// readonly ==> omit the whole widget
 			$value = '';
 			$cell = $tmpl->empty_cell();
+			$extension_data = null;
 			return;
 		}
 		if (!is_array($value) && in_array($type,array('link-to','link-list','link-add')))
@@ -133,6 +135,7 @@ class link_widget
 		{
 		case 'link':
 			$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+			$extension_data = null;
 			$cell['no_lang'] = 1;
 			$link = $target = $popup = '';
 			if (!is_array($value) && $value && isset($GLOBALS['egw_info']['apps'][$cell['size']]))
@@ -152,7 +155,7 @@ class link_widget
 					$link .= '&'.$var.'='.$val;
 				}
 				if (!($popup = egw_link::is_popup($value['app'],'view')) &&
-					$GLOBALS['egw_info']['etemplate']['output_mode'] == 2)	// we are in a popup
+					etemplate::$request->output_mode == 2)	// we are in a popup
 				{
 					$target = '_blank';
 				}
@@ -166,6 +169,7 @@ class link_widget
 			{
 				$cell = $tmpl->empty_cell();
 				$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+				$extension_data = null;
 				return;
 			}
 			$cell['type'] = 'label';
@@ -208,7 +212,7 @@ class link_widget
 						list($w,$h) = explode('x',$popup);
 						$options = ' onclick="window.open(this,this.target,\'width='.(int)$w.',height='.(int)$h.',location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;"';
 					}
-					elseif ($GLOBALS['egw_info']['etemplate']['output_mode'] == 2 || 	// we are in a popup
+					elseif (etemplate::$request->output_mode == 2 || 	// we are in a popup
 						$link['app'] == egw_link::VFS_APPNAME)	// or it's a link to an attachment
 					{
 						$options = ' target="_blank"';
@@ -220,6 +224,7 @@ class link_widget
 			}
 			$cell['type'] = 'html';
 			$cell['readonly'] = True;	// set it readonly to NOT call our post_process function
+			$extension_data = null;
 			$value = $str;
 			return True;
 
@@ -292,7 +297,7 @@ class link_widget
 				{
 					$value[$row]['view']  = egw_link::view($link['app'],$link['id'],$link);
 					if (!($value[$row]['popup'] = egw_link::is_popup($link['app'],'view')) &&
-						$GLOBALS['egw_info']['etemplate']['output_mode'] == 2)	// we are in a popup
+						etemplate::$request->output_mode == 2)	// we are in a popup
 					{
 						$value[$row]['target'] = '_blank';		// we create a new window as the linked page is no popup
 					}
@@ -656,12 +661,17 @@ class link_widget
 			$response->addScript($script);
 		}
 		// store new allowed id's in the eT request
-		if ($etemplate_exec_id && ($et_request = etemplate_request::read($etemplate_exec_id)))
+		if ($etemplate_exec_id && ($request = etemplate_request::read($etemplate_exec_id)))
 		{
-			$data = $et_request->get_to_process($id_res);
+			$data = $request->get_to_process($id_res);
 			//error_log($id_res.'='.array2string($data));
 			$data['allowed'] = $found ? array_keys($found) : array();
-			$et_request->set_to_process($id_res,$data);
+			$request->set_to_process($id_res,$data);
+			// update id, if request changed it (happens if the request data is stored direct in the form)
+			if ($etemplate_exec_id != ($new_id = $request->id()))
+			{
+				$response->addAssign('etemplate_exec_id','value',$new_id);
+			}
 		}
 		return $response->getXML();
 	}
diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 488f18cac1..440b0632e8 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -3,7 +3,7 @@
  * eGroupWare  eTemplate Extension - Nextmatch Widget
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @copyright 2002-8 by RalfBecker@outdoor-training.de
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
  * @package etemplate
  * @subpackage extensions
  * @link http://www.egroupware.org
@@ -11,8 +11,6 @@
  * @version $Id$
  */
 
-require_once(EGW_INCLUDE_ROOT. '/etemplate/inc/class.etemplate.inc.php');
-
 /**
  * eTemplate Extension: Widget that show only a certain number of data-rows and allows to modifiy the rows shown (scroll).
  *
@@ -313,7 +311,7 @@ class nextmatch_widget
 		$rows = array();
 		if (!is_object($obj) || !method_exists($obj,$method))
 		{
-			$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] = "nextmatch_widget::pre_process($cell[name]): '$value[get_rows]' is no valid method !!!";
+			etemplate::set_validation_error($name,"nextmatch_widget::pre_process($cell[name]): '$value[get_rows]' is no valid method !!!");
 		}
 		else
 		{
@@ -393,7 +391,7 @@ class nextmatch_widget
 				{
 					// make each letter internally behave like a button
 					$form_name = $name.'[searchletter]['.($key === 'all' ? $key : $letter).']';
-					$GLOBALS['egw_info']['etemplate']['to_process'][$form_name] = 'button';
+					etemplate::$request->set_to_process($form_name,'button');
 
 					if (!$key) $letterbox =& $lettersearch[1];	// to re-use the first child
 					$letterbox = etemplate::empty_cell('label',$letter,array(
@@ -402,13 +400,13 @@ class nextmatch_widget
 							$key === 'all' && !$value['searchletter'] ? '_active' : ''),
 						'no_lang' => 2,
 						'align'   => $key == 'all' ? 'right' : '',
-						'onclick' => "return submitit($tmpl->name_form,'$form_name');",
+						'onclick' => 'return submitit('.etemplate::$name_form.",'$form_name');",
 					));
 					// if not the first (re-used) child, add it to the parent
 					if ($key) etemplate::add_child($lettersearch,$letterbox);
 					unset($letterbox);
 				}
-				//_debug_array($GLOBALS['egw_info']['etemplate']['to_process']);
+				//_debug_array(etemplate::$request->to_process);
 			}
 			if(isset($value['no_search'])) $value['no_start_search'] = $value['no_search'];
 			foreach(array('no_cat'=>'cat_id','no_filter'=>'filter','no_filter2'=>'filter2', 'no_search' => 'search', 'no_start_search' => 'start_search' ) as $val_name => $cell_name)
@@ -896,7 +894,7 @@ class nextmatch_widget
 		}
 		if (!is_object($obj) || !method_exists($obj,$method))
 		{
-			$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] = "nextmatch_widget::pre_process($cell[name]): '$value[get_rows]' is no valid method !!!";
+			etemplate::set_validation_error($name,"nextmatch_widget::pre_process($cell[name]): '$value[get_rows]' is no valid method !!!");
 			return false;
 		}
 		$this->charset = $this->charset_out = $GLOBALS['egw']->translation->charset();
@@ -922,7 +920,7 @@ class nextmatch_widget
 			}
 			if ($export_limit && (!is_numeric($export_limit) || $export_limit < $total))
 			{
-				$GLOBALS['egw_info']['etemplate']['validation_errors'][$name] = lang('You are not allowed to export more then %1 entries!',$export_limit);
+				etemplate::set_validation_error($name,lang('You are not allowed to export more then %1 entries!',$export_limit));
 				return false;
 			}
 			if (!isset($value['no_csv_support'])) $value['no_csv_support'] = !is_array($value['csv_fields']);
diff --git a/etemplate/inc/class.select_widget.inc.php b/etemplate/inc/class.select_widget.inc.php
index 3671948869..8113c0a8e1 100644
--- a/etemplate/inc/class.select_widget.inc.php
+++ b/etemplate/inc/class.select_widget.inc.php
@@ -1,555 +1,552 @@
 <?php
+/**
+ * eGroupWare  eTemplate Extension - Select Widgets
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage extensions
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker@outdoor-training.de>
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
+ * @version $Id$
+ */
+
+/**
+ * eTemplate Extension: several select-boxes with predefined eGW specific content
+ *
+ * This widgets replaces the not longer exiting phpgwapi.sbox class. The widgets are independent of the UI,
+ * as they only uses etemplate-widgets and therefore have no render-function.
+ */
+class select_widget
+{
 	/**
-	 * eGroupWare  eTemplate Extension - Select Widgets
-	 *
-	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	 * @package etemplate
-	 * @link http://www.egroupware.org
-	 * @author Ralf Becker <RalfBecker@outdoor-training.de>
-	 * @version $Id$
+	 * exported methods of this class
+	 * @var array
 	 */
+	var $public_functions = array(
+		'pre_process' => True,
+		'post_process' => True,
+	);
+	/**
+	 * availible extensions and there names for the editor
+	 * @var array
+	 */
+	var $human_name = array(
+		'select-percent'  => 'Select Percentage',
+		'select-priority' => 'Select Priority',
+		'select-access'   => 'Select Access',
+		'select-country'  => 'Select Country',
+		'select-state'    => 'Select State',	// US-states
+		'select-cat'      => 'Select Category',	// Category-Selection, size: -1=Single+All, 0=Single, >0=Multiple with size lines
+		'select-account'  => 'Select Account',	// label=accounts(default),groups,both
+												// size: -1=Single+not assigned, 0=Single, >0=Multiple
+		'select-year'     => 'Select Year',
+		'select-month'    => 'Select Month',
+		'select-day'      => 'Select Day',
+		'select-dow'      => 'Select Day of week',
+		'select-hour'     => 'Select Hour',		// either 0-23 or 12am,1am-11am,12pm,1pm-11pm
+		'select-number'   => 'Select Number',
+		'select-app'      => 'Select Application',
+		'select-lang'     => 'Select Language',
+	);
+	/**
+	 * @var array
+	 */
+	var $monthnames = array(
+		0  => '',
+		1  => 'January',
+		2  => 'February',
+		3  => 'March',
+		4  => 'April',
+		5  => 'May',
+		6  => 'June',
+		7  => 'July',
+		8  => 'August',
+		9  => 'September',
+		10 => 'October',
+		11 => 'November',
+		12 => 'December'
+	);
 
 	/**
-	 * eTemplate Extension: several select-boxes with predefined eGW specific content
+	 * Constructor of the extension
 	 *
-	 * This widgets replaces the not longer exiting phpgwapi.sbox class. The widgets are independent of the UI,
-	 * as they only uses etemplate-widgets and therefor have no render-function.
-	 *
-	 * @package etemplate
-	 * @subpackage extensions
-	 * @author RalfBecker-AT-outdoor-training.de
-	 * @license GPL
+	 * @param string $ui '' for html
 	 */
-	class select_widget
+	function select_widget($ui)
 	{
-		/** 
-		 * exported methods of this class
-		 * @var array
-		 */
-		var $public_functions = array(
-			'pre_process' => True,
-			'post_process' => True,
-		);
-		/**
-		 * availible extensions and there names for the editor
-		 * @var array
-		 */
-		var $human_name = array(
-			'select-percent'  => 'Select Percentage',
-			'select-priority' => 'Select Priority',
-			'select-access'   => 'Select Access',
-			'select-country'  => 'Select Country',
-			'select-state'    => 'Select State',	// US-states
-			'select-cat'      => 'Select Category',	// Category-Selection, size: -1=Single+All, 0=Single, >0=Multiple with size lines
-			'select-account'  => 'Select Account',	// label=accounts(default),groups,both
-													// size: -1=Single+not assigned, 0=Single, >0=Multiple
-			'select-year'     => 'Select Year',
-			'select-month'    => 'Select Month',
-			'select-day'      => 'Select Day',
-			'select-dow'      => 'Select Day of week',
-			'select-hour'     => 'Select Hour',		// either 0-23 or 12am,1am-11am,12pm,1pm-11pm
-			'select-number'   => 'Select Number',
-			'select-app'      => 'Select Application',
-			'select-lang'     => 'Select Language',
-		);
-		/**
-		 * @var array
-		 */
-		var $monthnames = array(
-			0  => '',
-			1  => 'January',
-			2  => 'February',
-			3  => 'March',
-			4  => 'April',
-			5  => 'May',
-			6  => 'June',
-			7  => 'July',
-			8  => 'August',
-			9  => 'September',
-			10 => 'October',
-			11 => 'November',
-			12 => 'December'
-		);
-
-		/**
-		 * Constructor of the extension
-		 *
-		 * @param string $ui '' for html
-		 */
-		function select_widget($ui)
+		foreach($this->monthnames as $k => $name)
 		{
-			foreach($this->monthnames as $k => $name)
+			if ($name)
 			{
-				if ($name)
-				{
-					$this->monthnames[$k] = lang($name);
-				}
+				$this->monthnames[$k] = lang($name);
 			}
-			$this->ui = $ui;
 		}
+		$this->ui = $ui;
+	}
 
-		/**
-		 * pre-processing of the extension
-		 *
-		 * This function is called before the extension gets rendered
-		 *
-		 * @param string $name form-name of the control
-		 * @param mixed &$value value / existing content, can be modified
-		 * @param array &$cell array with the widget, can be modified for ui-independent widgets 
-		 * @param array &$readonlys names of widgets as key, to be made readonly
-		 * @param mixed &$extension_data data the extension can store persisten between pre- and post-process
-		 * @param object &$tmpl reference to the template we belong too
-		 * @return boolean true if extra label is allowed, false otherwise
-		 */
-		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+	/**
+	 * pre-processing of the extension
+	 *
+	 * This function is called before the extension gets rendered
+	 *
+	 * @param string $name form-name of the control
+	 * @param mixed &$value value / existing content, can be modified
+	 * @param array &$cell array with the widget, can be modified for ui-independent widgets
+	 * @param array &$readonlys names of widgets as key, to be made readonly
+	 * @param mixed &$extension_data data the extension can store persisten between pre- and post-process
+	 * @param object &$tmpl reference to the template we belong too
+	 * @return boolean true if extra label is allowed, false otherwise
+	 */
+	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+	{
+		list($rows,$type,$type2,$type3,$type4) = explode(',',$cell['size']);
+
+		$extension_data['type'] = $cell['type'];
+
+		$readonly = $cell['readonly'] || $readonlys;
+		switch ($cell['type'])
 		{
-			list($rows,$type,$type2,$type3,$type4) = explode(',',$cell['size']);
+			case 'select-percent':	// options: #row,decrement(default=10)
+				$decr = $type > 0 ? $type : 10;
+				for ($i=0; $i <= 100; $i += $decr)
+				{
+					$cell['sel_options'][intval($i)] = intval($i).'%';
+				}
+				$cell['sel_options'][100] = '100%';
+				if (!$rows || !empty($value))
+				{
+					$value = intval(($value+($decr/2)) / $decr) * $decr;
+				}
+				$cell['no_lang'] = True;
+				break;
 
-			$extension_data['type'] = $cell['type'];
+			case 'select-priority':
+				$cell['sel_options'] = array('','low','normal','high');
+				break;
 
-			$readonly = $cell['readonly'] || $readonlys;
-			switch ($cell['type'])
-			{
-				case 'select-percent':	// options: #row,decrement(default=10)
-					$decr = $type > 0 ? $type : 10;
-					for ($i=0; $i <= 100; $i += $decr)
+			case 'select-access':
+				$cell['sel_options'] = array(
+					'private' => 'Private',
+					'public' => 'Global public',
+					'group' => 'Group public'
+				);
+				break;
+
+			case 'select-country':	// #Row|Extralabel,1=use country name, 0=use 2 letter-code
+				$cell['sel_options'] = $GLOBALS['egw']->country->countries();
+
+				if (($extension_data['country_use_name'] = $type) && $value)
+				{
+					$value = $GLOBALS['egw']->country->country_code($value);
+					if (!isset($cell['sel_options'][$value]))
 					{
-						$cell['sel_options'][intval($i)] = intval($i).'%';
-					}
-					$cell['sel_options'][100] = '100%';
-					if (!$rows || !empty($value))
-					{
-						$value = intval(($value+($decr/2)) / $decr) * $decr;
+						$cell['sel_options'][$value] = $value;
 					}
+				}
+				$cell['no_lang'] = True;
+				break;
+
+			case 'select-state':
+				$cell['sel_options'] = $GLOBALS['egw']->country->us_states();
+				$cell['no_lang'] = True;
+				break;
+
+			case 'select-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app
+				if ($readonly)	// for readonly we dont need to fetch all cat's, nor do we need to indent them by level
+				{
 					$cell['no_lang'] = True;
-					break;
-
-				case 'select-priority':
-					$cell['sel_options'] = array('','low','normal','high');
-					break;
-
-				case 'select-access':
-					$cell['sel_options'] = array(
-						'private' => 'Private',
-						'public' => 'Global public',
-						'group' => 'Group public'
-					);
-					break;
-
-				case 'select-country':	// #Row|Extralabel,1=use country name, 0=use 2 letter-code
-					$cell['sel_options'] = $GLOBALS['egw']->country->countries();
-
-					if (($extension_data['country_use_name'] = $type) && $value)
+					if ($value)
 					{
-						$value = $GLOBALS['egw']->country->country_code($value);
-						if (!isset($cell['sel_options'][$value]))
+						if (!is_array($value)) $value = explode(',',$value);
+						foreach($value as $key => $id)
 						{
-							$cell['sel_options'][$value] = $value;
-						}
-					}
-					$cell['no_lang'] = True;
-					break;
-
-				case 'select-state':
-					$cell['sel_options'] = $GLOBALS['egw']->country->us_states();
-					$cell['no_lang'] = True;
-					break;
-
-				case 'select-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app
-					if ($readonly)	// for readonly we dont need to fetch all cat's, nor do we need to indent them by level
-					{
-						$cell['no_lang'] = True;
-						if ($value)
-						{
-							if (!is_array($value)) $value = explode(',',$value);
-							foreach($value as $key => $id)
+							if ($id && ($name = stripslashes($GLOBALS['egw']->categories->id2name($id))) && $name != '--')
 							{
-								if ($id && ($name = stripslashes($GLOBALS['egw']->categories->id2name($id))) && $name != '--')
-								{
-									$cell['sel_options'][$id] = $name;
-								}
-								else
-								{
-									unset($value[$key]);	// remove not (longer) existing or inaccessible cats
-								}
+								$cell['sel_options'][$id] = $name;
+							}
+							else
+							{
+								unset($value[$key]);	// remove not (longer) existing or inaccessible cats
 							}
 						}
-						break;
 					}
-					if (!$type3 || $type3 === $GLOBALS['egw']->categories->app_name)
-					{
-						$categories =& $GLOBALS['egw']->categories;
-					}
-					else	// we need to instanciate a new cat object for the correct application
-					{
-						$categories =& new categories('',$type3);
-					}
-					foreach((array)$categories->return_sorted_array(0,False,'','','',!$type) as $cat)
-					{
-						$s = str_repeat('&nbsp;',$cat['level']) . stripslashes($cat['name']);
-
-						if ($cat['app_name'] == 'phpgw' || $cat['owner'] == '-1')
-						{
-							$s .= ' &#9830;';
-						}
-						if (!$tmpl->xslt)
-						{
-							$cell['sel_options'][$cat['id']] = $s;	// 0.9.14 only
-						}
-						else
-						{
-							$cell['sel_options'][$cat['cat_id']] = $s;
-						}
-					}
-					// preserv unavailible cats (eg. private user-cats)
-					if ($value && ($unavailible = array_diff(is_array($value) ? $value : explode(',',$value),array_keys((array)$cell['sel_options']))))
-					{
-						$extension_data['unavailible'] = $unavailible;
-					}
-					$cell['size'] = $rows.($type2 ? ','.$type2 : '');
-					$cell['no_lang'] = True;
 					break;
+				}
+				if (!$type3 || $type3 === $GLOBALS['egw']->categories->app_name)
+				{
+					$categories =& $GLOBALS['egw']->categories;
+				}
+				else	// we need to instanciate a new cat object for the correct application
+				{
+					$categories =& new categories('',$type3);
+				}
+				foreach((array)$categories->return_sorted_array(0,False,'','','',!$type) as $cat)
+				{
+					$s = str_repeat('&nbsp;',$cat['level']) . stripslashes($cat['name']);
 
-				case 'select-account':	// options: #rows,{accounts(default)|both|groups|owngroups},{0(=lid)|1(default=name)|2(=lid+name),expand-multiselect-rows,not-to-show-accounts,...)}
-					//echo "<p>select-account widget: name=$cell[name], type='$type', rows=$rows, readonly=".(int)($cell['readonly'] || $readonlys)."</p>\n";
-					if($type == 'owngroups') 
+					if ($cat['app_name'] == 'phpgw' || $cat['owner'] == '-1')
 					{
-						$type = 'groups';
-						$owngroups = true;
-						foreach($GLOBALS['egw']->accounts->membership() as $group) $mygroups[] = $group['account_id'];
+						$s .= ' &#9830;';
 					}
-					// in case of readonly, we read/create only the needed entries, as reading accounts is expensive
-					if ($readonly)
+					if (!$tmpl->xslt)
+					{
+						$cell['sel_options'][$cat['id']] = $s;	// 0.9.14 only
+					}
+					else
+					{
+						$cell['sel_options'][$cat['cat_id']] = $s;
+					}
+				}
+				// preserv unavailible cats (eg. private user-cats)
+				if ($value && ($unavailible = array_diff(is_array($value) ? $value : explode(',',$value),array_keys((array)$cell['sel_options']))))
+				{
+					$extension_data['unavailible'] = $unavailible;
+				}
+				$cell['size'] = $rows.($type2 ? ','.$type2 : '');
+				$cell['no_lang'] = True;
+				break;
+
+			case 'select-account':	// options: #rows,{accounts(default)|both|groups|owngroups},{0(=lid)|1(default=name)|2(=lid+name),expand-multiselect-rows,not-to-show-accounts,...)}
+				//echo "<p>select-account widget: name=$cell[name], type='$type', rows=$rows, readonly=".(int)($cell['readonly'] || $readonlys)."</p>\n";
+				if($type == 'owngroups')
+				{
+					$type = 'groups';
+					$owngroups = true;
+					foreach($GLOBALS['egw']->accounts->membership() as $group) $mygroups[] = $group['account_id'];
+				}
+				// in case of readonly, we read/create only the needed entries, as reading accounts is expensive
+				if ($readonly)
+				{
+					$cell['no_lang'] = True;
+					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
+					{
+						$cell['sel_options'][$id] = $this->accountInfo($id,$acc,$type2,$type=='both');
+					}
+					break;
+				}
+				if ($this->ui == 'html' && $type != 'groups')	// use eGW's new account-selection (html only)
+				{
+					$not = array_slice(explode(',',$cell['size']),4);
+					$help = (int)$cell['no_lang'] < 2 ? lang($cell['help']) : $cell['help'];
+					$onFocus = "self.status='".addslashes(htmlspecialchars($help))."'; return true;";
+					$onBlur  = "self.status=''; return true;";
+					if ($cell['noprint'])
 					{
-						$cell['no_lang'] = True;
 						foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
 						{
-							$cell['sel_options'][$id] = $this->accountInfo($id,$acc,$type2,$type=='both');
+							if ($id) $onlyPrint[] = $this->accountInfo($id,$acc,$type2,$type=='both');
 						}
-						break;
+						$onlyPrint = $onlyPrint ? implode('<br />',$onlyPrint) : lang((int)$rows < 0 ? 'all' : $rows);
+						$noPrint_class = ' class="noPrint"';
 					}
-					if ($this->ui == 'html' && $type != 'groups')	// use eGW's new account-selection (html only)
+					if (($rows > 0 || $type3) && substr($name,-2) != '[]') $name .= '[]';
+					$value = $GLOBALS['egw']->uiaccountsel->selection($name,'eT_accountsel_'.str_replace(array('[','][',']'),array('_','_',''),$name),
+						$value,$type,$rows > 0 ? $rows : ($type3 ? -$type3 : 0),$not,' onfocus="'.$onFocus.'" onblur="'.$onBlur.'"'.$noPrint_class,
+						$cell['onchange'] == '1' ? 'this.form.submit();' : $cell['onchange'],
+						!empty($rows) && 0+$rows <= 0 ? lang($rows < 0 ? 'all' : $rows) : False);
+					if ($cell['noprint'])
 					{
-						$not = array_slice(explode(',',$cell['size']),4);
-						$help = (int)$cell['no_lang'] < 2 ? lang($cell['help']) : $cell['help'];
-						$onFocus = "self.status='".addslashes(htmlspecialchars($help))."'; return true;";
-						$onBlur  = "self.status=''; return true;";
-						if ($cell['noprint'])
-						{
-							foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
-							{
-								if ($id) $onlyPrint[] = $this->accountInfo($id,$acc,$type2,$type=='both');
-							}
-							$onlyPrint = $onlyPrint ? implode('<br />',$onlyPrint) : lang((int)$rows < 0 ? 'all' : $rows);
-							$noPrint_class = ' class="noPrint"';
-						}
-						if (($rows > 0 || $type3) && substr($name,-2) != '[]') $name .= '[]';
-						$value = $GLOBALS['egw']->uiaccountsel->selection($name,'eT_accountsel_'.str_replace(array('[','][',']'),array('_','_',''),$name),
-							$value,$type,$rows > 0 ? $rows : ($type3 ? -$type3 : 0),$not,' onfocus="'.$onFocus.'" onblur="'.$onBlur.'"'.$noPrint_class,
-							$cell['onchange'] == '1' ? 'this.form.submit();' : $cell['onchange'],
-							!empty($rows) && 0+$rows <= 0 ? lang($rows < 0 ? 'all' : $rows) : False);
-						if ($cell['noprint'])
-						{
-							$value = '<span class="onlyPrint">'.$onlyPrint.'</span>'.$value;
-						}
-						$cell['type'] = 'html';
-						$cell['size'] = '';	// is interpreted as link otherwise
-						$GLOBALS['egw_info']['etemplate']['to_process'][$name] = 'select';
-						break;
-					}
-					$cell['no_lang'] = True;
-					$accs = $GLOBALS['egw']->accounts->get_list(empty($type) ? 'accounts' : $type); // default is accounts
-					foreach($accs as $acc)
-					{
-						if ($acc['account_type'] == 'u')
-						{
-							$cell['sel_options'][$acc['account_id']] = $this->accountInfo($acc['account_id'],$acc,$type2,$type=='both');
-						}
-					}
-					foreach($accs as $acc)
-					{
-						if ($acc['account_type'] == 'g' && (!$owngroups || ($owngroups && in_array($acc['account_id'],(array)$mygroups))))
-						{
-							$cell['sel_options'][$acc['account_id']] = $this->accountInfo($acc['account_id'],$acc,$type2,$type=='both');
-						}
+						$value = '<span class="onlyPrint">'.$onlyPrint.'</span>'.$value;
 					}
+					$cell['type'] = 'html';
+					$cell['size'] = '';	// is interpreted as link otherwise
+					etemplate::$request->set_to_process($name,'select');
 					break;
-
-				case 'select-year':	// options: #rows,#before(default=3),#after(default=2)
-					$cell['sel_options'][''] = '';
-					if ($type <= 0)  $type  = 3;
-					if ($type2 <= 0) $type2 = 2;
-					if ($type > 100 && $type2 > 100 && $type > $type) { $y = $type; $type=$type2; $type2=$y; }
-					$y = date('Y')-$type;
-					if ($value && $value-$type < $y || $type > 100) $y = $type > 100 ? $type : $value-$type;
-					$to = date('Y')+$type2;
-					if ($value && $value+$type2 > $to || $type2 > 100) $to = $type2 > 100 ? $type2 : $value+$type2;
-					for ($n = 0; $y <= $to && $n < 200; ++$n)
-					{
-						$cell['sel_options'][$y] = $y++;
-					}
-					$cell['no_lang'] = True;
-					break;
-
-				case 'select-month':
-					$cell['sel_options'] = $this->monthnames;
-					$value = intval($value);
-					break;
-					
-				case 'select-dow':	// options: rows[,0=summaries befor days, 1=summaries after days, 2=no summaries[,extraStyleMultiselect]]
-					if (!defined('MCAL_M_SUNDAY'))
-					{
-						define('MCAL_M_SUNDAY',1);
-						define('MCAL_M_MONDAY',2);
-						define('MCAL_M_TUESDAY',4);
-						define('MCAL_M_WEDNESDAY',8);
-						define('MCAL_M_THURSDAY',16);
-						define('MCAL_M_FRIDAY',32);
-						define('MCAL_M_SATURDAY',64);
-						
-						define('MCAL_M_WEEKDAYS',62);
-						define('MCAL_M_WEEKEND',65);
-						define('MCAL_M_ALLDAYS',127);
-					}
-					$weekstart = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
-					$cell['sel_options'] = array();
-					if ($rows >= 2 && !$type) 
-					{
-						$cell['sel_options'] = array(
-							MCAL_M_ALLDAYS	=> 'all days',
-							MCAL_M_WEEKDAYS	=> 'working days',
-							MCAL_M_WEEKEND	=> 'weekend',
-						);
-					}
-					if ($weekstart == 'Saturday') $cell['sel_options'][MCAL_M_SATURDAY] = 'saturday';
-					if ($weekstart != 'Monday') $cell['sel_options'][MCAL_M_SUNDAY] = 'sunday';
-					$cell['sel_options'] += array(
-						MCAL_M_MONDAY	=> 'monday',
-						MCAL_M_TUESDAY	=> 'tuesday',
-						MCAL_M_WEDNESDAY=> 'wednesday',
-						MCAL_M_THURSDAY	=> 'thursday',
-						MCAL_M_FRIDAY	=> 'friday',
-					);
-					if ($weekstart != 'Saturday') $cell['sel_options'][MCAL_M_SATURDAY] = 'saturday';
-					if ($weekstart == 'Monday') $cell['sel_options'][MCAL_M_SUNDAY] = 'sunday';
-					if ($rows >= 2 && $type == 1) 
-					{
-						$cell['sel_options'] += array(
-							MCAL_M_ALLDAYS	=> 'all days',
-							MCAL_M_WEEKDAYS	=> 'working days',
-							MCAL_M_WEEKEND	=> 'weekend',
-						);
-					}
-					$value_in = $value;
-					$value = array();
-					foreach($cell['sel_options'] as $val => $lable)
-					{
-						if (($value_in & $val) == $val)
-						{
-							$value[] = $val;
-							
-							if ($val == MCAL_M_ALLDAYS || 
-								$val == MCAL_M_WEEKDAYS && $value_in == MCAL_M_WEEKDAYS ||
-								$val == MCAL_M_WEEKEND && $value_in == MCAL_M_WEEKEND)
-							{
-								break;	// dont set the others
-							}			
-						}
-					}
-					if (!$readonly)
-					{
-						$GLOBALS['egw_info']['etemplate']['to_process'][$name] = 'ext-select-dow';
-					}
-					$cell['size'] = $rows.($type2 ? ','.$type2 : '');
-					break;
-
-				case 'select-day':
-					$type = 1;
-					$type2 = 31;
-					$type3 = 1;
-					// fall-through
-					
-				case 'select-number':	// options: rows,min,max,decrement,suffix
-					$type = $type === '' ? 1 : intval($type);		// min
-					$type2 = $type2 === '' ? 10 : intval($type2);	// max
-					$format = '%d';
-					if (!empty($type3) && $type3[0] == '0')			// leading zero
-					{
-						$format = '%0'.strlen($type3).'d';
-					}
-					$type3 = !$type3 ? 1 : intval($type3);			// decrement
-					if (($type <= $type2) != ($type3 > 0))
-					{
-						$type3 = -$type3;	// void infinite loop
-					}
-					if (!empty($type4)) $format .= lang($type4);
-					for ($i=0,$n=$type; $n <= $type2 && $i <= 100; $n += $type3,++$i)
-					{
-						$cell['sel_options'][$n] = sprintf($format,$n);
-					}
-					$cell['no_lang'] = True;
-					break;
-					
-				case 'select-hour':
-					for ($h = 0; $h <= 23; ++$h)
-					{
-						$cell['sel_options'][$h] = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ?
-							(($h % 12 ? $h % 12 : 12).' '.($h < 12 ? lang('am') : lang('pm'))) : 
-							sprintf('%02d',$h);
-					}
-					$cell['no_lang'] = True;
-					break;
-					
-				case 'select-app':	// type2: ''=users enabled apps, 'installed', 'all' = not installed ones too
-					$apps = array();
-					foreach ($GLOBALS['egw_info']['apps'] as $app => $data)
-					{
-						if (!$type2 || $GLOBALS['egw_info']['user']['apps'][$app])
-						{
-							$apps[$app] = $data['title'] ? $data['title'] : lang($app);
-						}
-					}
-					if ($type2 == 'all')
-					{
-						$dir = opendir(EGW_SERVER_ROOT);
-						while ($file = readdir($dir))
-						{
-							if (@is_dir(EGW_SERVER_ROOT."/$file/setup") && $file[0] != '.' &&
-									!isset($apps[$app = basename($file)]))
-							{
-								$apps[$app] = $app . ' (*)';
-							}
-						}
-						closedir($dir);
-					}
-					$apps_lower = $apps;	// case-in-sensitve sort
-					foreach ($apps_lower as $app => $title)
-					{
-						$apps_lower[$app] = strtolower($title);
-					}
-					asort($apps_lower);
-					foreach ($apps_lower as $app => $title)
-					{
-						$cell['sel_options'][$app] = $apps[$app];
-					}
-					break;
-				case 'select-lang':
-					$cell['sel_options'] = $GLOBALS['egw']->translation->list_langs();
-					$cell['no_lang'] = True;
-				break;
-			}
-			if ($rows > 1)
-			{
-				unset($cell['sel_options']['']);
-			}
-			return True;	// extra Label Ok
-		}
-
-		/**
-		 * internal function to format account-data
-		 */
-		function accountInfo($id,$acc=0,$longnames=0,$show_type=0)
-		{
-			if (!$id)
-			{
-				return '&nbsp;';
-			}
-
-			if (!is_array($acc))
-			{
-				$data = $GLOBALS['egw']->accounts->get_account_data($id);
-				if (!isset($data[$id])) return '#'.$id;
-				foreach(array('type','lid','firstname','lastname') as $name)
-				{
-					$acc['account_'.$name] = $data[$id][$name];
 				}
-			}
-			$info = $show_type ? '('.$acc['account_type'].') ' : '';
-			
-			if ($acc['account_type'] == 'g')
-			{
-				$longnames = 1;
-			}
-			switch ($longnames)
-			{
-				case 2:
-					$info .= '&lt;'.$acc['account_lid'].'&gt; ';
-					// fall-through
-				case 1:
-					$info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] :
-						$acc['account_firstname'].' '.$acc['account_lastname'];
-					break;
-				case '0':
-					$info .= $acc['account_lid'];
-					break;
-				default:			// use the phpgw default
-					$info = $GLOBALS['egw']->common->display_fullname($acc['account_lid'],
-						$acc['account_firstname'],$acc['account_lastname']);
-					break;
-			}
-			return $info;
-		}
-		
-		/**
-		 * postprocessing method, called after the submission of the form
-		 *
-		 * It has to copy the allowed/valid data from $value_in to $value, otherwise the widget
-		 * will return no data (if it has a preprocessing method). The framework insures that
-		 * the post-processing of all contained widget has been done before.
-		 *
-		 * Only used by select-dow so far
-		 *
-		 * @param string $name form-name of the widget
-		 * @param mixed &$value the extension returns here it's input, if there's any
-		 * @param mixed &$extension_data persistent storage between calls or pre- and post-process
-		 * @param boolean &$loop can be set to true to request a re-submision of the form/dialog
-		 * @param object &$tmpl the eTemplate the widget belongs too
-		 * @param mixed &value_in the posted values (already striped of magic-quotes)
-		 * @return boolean true if $value has valid content, on false no content will be returned!
-		 */
-		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
-		{
-			switch ($extension_data['type'])
-			{
-				case 'select-cat':
-					$value = $value_in;
-					// check if we have some unavailible cats and add them again
-					if (is_array($extension_data['unavailible']) && $extension_data['unavailible'])
+				$cell['no_lang'] = True;
+				$accs = $GLOBALS['egw']->accounts->get_list(empty($type) ? 'accounts' : $type); // default is accounts
+				foreach($accs as $acc)
+				{
+					if ($acc['account_type'] == 'u')
 					{
-						if (is_array($value))	// multiselection
-						{
-							$value = array_merge($value,$extension_data['unavailible']);
-						}
-						elseif (!$value)		// non-multiselection and nothing selected by the user
-						{
-							$value = $extension_data['unavailible'][0];
-						}
+						$cell['sel_options'][$acc['account_id']] = $this->accountInfo($acc['account_id'],$acc,$type2,$type=='both');
 					}
-					break;
+				}
+				foreach($accs as $acc)
+				{
+					if ($acc['account_type'] == 'g' && (!$owngroups || ($owngroups && in_array($acc['account_id'],(array)$mygroups))))
+					{
+						$cell['sel_options'][$acc['account_id']] = $this->accountInfo($acc['account_id'],$acc,$type2,$type=='both');
+					}
+				}
+				break;
 
-				case 'select-dow':
-					$value = 0;
-					if (!is_array($value_in)) $value_in = explode(',',$value_in);
-					foreach($value_in as $val)
+			case 'select-year':	// options: #rows,#before(default=3),#after(default=2)
+				$cell['sel_options'][''] = '';
+				if ($type <= 0)  $type  = 3;
+				if ($type2 <= 0) $type2 = 2;
+				if ($type > 100 && $type2 > 100 && $type > $type) { $y = $type; $type=$type2; $type2=$y; }
+				$y = date('Y')-$type;
+				if ($value && $value-$type < $y || $type > 100) $y = $type > 100 ? $type : $value-$type;
+				$to = date('Y')+$type2;
+				if ($value && $value+$type2 > $to || $type2 > 100) $to = $type2 > 100 ? $type2 : $value+$type2;
+				for ($n = 0; $y <= $to && $n < 200; ++$n)
+				{
+					$cell['sel_options'][$y] = $y++;
+				}
+				$cell['no_lang'] = True;
+				break;
+
+			case 'select-month':
+				$cell['sel_options'] = $this->monthnames;
+				$value = intval($value);
+				break;
+
+			case 'select-dow':	// options: rows[,0=summaries befor days, 1=summaries after days, 2=no summaries[,extraStyleMultiselect]]
+				if (!defined('MCAL_M_SUNDAY'))
+				{
+					define('MCAL_M_SUNDAY',1);
+					define('MCAL_M_MONDAY',2);
+					define('MCAL_M_TUESDAY',4);
+					define('MCAL_M_WEDNESDAY',8);
+					define('MCAL_M_THURSDAY',16);
+					define('MCAL_M_FRIDAY',32);
+					define('MCAL_M_SATURDAY',64);
+
+					define('MCAL_M_WEEKDAYS',62);
+					define('MCAL_M_WEEKEND',65);
+					define('MCAL_M_ALLDAYS',127);
+				}
+				$weekstart = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
+				$cell['sel_options'] = array();
+				if ($rows >= 2 && !$type)
+				{
+					$cell['sel_options'] = array(
+						MCAL_M_ALLDAYS	=> 'all days',
+						MCAL_M_WEEKDAYS	=> 'working days',
+						MCAL_M_WEEKEND	=> 'weekend',
+					);
+				}
+				if ($weekstart == 'Saturday') $cell['sel_options'][MCAL_M_SATURDAY] = 'saturday';
+				if ($weekstart != 'Monday') $cell['sel_options'][MCAL_M_SUNDAY] = 'sunday';
+				$cell['sel_options'] += array(
+					MCAL_M_MONDAY	=> 'monday',
+					MCAL_M_TUESDAY	=> 'tuesday',
+					MCAL_M_WEDNESDAY=> 'wednesday',
+					MCAL_M_THURSDAY	=> 'thursday',
+					MCAL_M_FRIDAY	=> 'friday',
+				);
+				if ($weekstart != 'Saturday') $cell['sel_options'][MCAL_M_SATURDAY] = 'saturday';
+				if ($weekstart == 'Monday') $cell['sel_options'][MCAL_M_SUNDAY] = 'sunday';
+				if ($rows >= 2 && $type == 1)
+				{
+					$cell['sel_options'] += array(
+						MCAL_M_ALLDAYS	=> 'all days',
+						MCAL_M_WEEKDAYS	=> 'working days',
+						MCAL_M_WEEKEND	=> 'weekend',
+					);
+				}
+				$value_in = $value;
+				$value = array();
+				foreach($cell['sel_options'] as $val => $lable)
+				{
+					if (($value_in & $val) == $val)
 					{
-						$value |= $val;
-					}
-					//echo "<p>select_widget::post_process('$name',...,'$value_in'): value='$value'</p>\n";
-					break;
-				case 'select-country':
-					if ($extension_data['country_use_name'] && $value_in)
-					{
-						if (($value = $GLOBALS['egw']->country->get_full_name($value_in)))
+						$value[] = $val;
+
+						if ($val == MCAL_M_ALLDAYS ||
+							$val == MCAL_M_WEEKDAYS && $value_in == MCAL_M_WEEKDAYS ||
+							$val == MCAL_M_WEEKEND && $value_in == MCAL_M_WEEKEND)
 						{
-							break;
+							break;	// dont set the others
 						}
 					}
-					// fall through
-				default:
-					$value = $value_in;
-					break;
-			}
-			//echo "<p>select_widget::post_process('$name',,'$extension_data',,,'$value_in'): value='$value', is_null(value)=".(int)is_null($value)."</p>\n";
-			return true;
+				}
+				if (!$readonly)
+				{
+					etemplate::$request->set_to_process($name,'ext-select-dow');
+				}
+				$cell['size'] = $rows.($type2 ? ','.$type2 : '');
+				break;
+
+			case 'select-day':
+				$type = 1;
+				$type2 = 31;
+				$type3 = 1;
+				// fall-through
+
+			case 'select-number':	// options: rows,min,max,decrement,suffix
+				$type = $type === '' ? 1 : intval($type);		// min
+				$type2 = $type2 === '' ? 10 : intval($type2);	// max
+				$format = '%d';
+				if (!empty($type3) && $type3[0] == '0')			// leading zero
+				{
+					$format = '%0'.strlen($type3).'d';
+				}
+				$type3 = !$type3 ? 1 : intval($type3);			// decrement
+				if (($type <= $type2) != ($type3 > 0))
+				{
+					$type3 = -$type3;	// void infinite loop
+				}
+				if (!empty($type4)) $format .= lang($type4);
+				for ($i=0,$n=$type; $n <= $type2 && $i <= 100; $n += $type3,++$i)
+				{
+					$cell['sel_options'][$n] = sprintf($format,$n);
+				}
+				$cell['no_lang'] = True;
+				break;
+
+			case 'select-hour':
+				for ($h = 0; $h <= 23; ++$h)
+				{
+					$cell['sel_options'][$h] = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ?
+						(($h % 12 ? $h % 12 : 12).' '.($h < 12 ? lang('am') : lang('pm'))) :
+						sprintf('%02d',$h);
+				}
+				$cell['no_lang'] = True;
+				break;
+
+			case 'select-app':	// type2: ''=users enabled apps, 'installed', 'all' = not installed ones too
+				$apps = array();
+				foreach ($GLOBALS['egw_info']['apps'] as $app => $data)
+				{
+					if (!$type2 || $GLOBALS['egw_info']['user']['apps'][$app])
+					{
+						$apps[$app] = $data['title'] ? $data['title'] : lang($app);
+					}
+				}
+				if ($type2 == 'all')
+				{
+					$dir = opendir(EGW_SERVER_ROOT);
+					while ($file = readdir($dir))
+					{
+						if (@is_dir(EGW_SERVER_ROOT."/$file/setup") && $file[0] != '.' &&
+								!isset($apps[$app = basename($file)]))
+						{
+							$apps[$app] = $app . ' (*)';
+						}
+					}
+					closedir($dir);
+				}
+				$apps_lower = $apps;	// case-in-sensitve sort
+				foreach ($apps_lower as $app => $title)
+				{
+					$apps_lower[$app] = strtolower($title);
+				}
+				asort($apps_lower);
+				foreach ($apps_lower as $app => $title)
+				{
+					$cell['sel_options'][$app] = $apps[$app];
+				}
+				break;
+			case 'select-lang':
+				$cell['sel_options'] = $GLOBALS['egw']->translation->list_langs();
+				$cell['no_lang'] = True;
+			break;
 		}
+		if ($rows > 1)
+		{
+			unset($cell['sel_options']['']);
+		}
+		return True;	// extra Label Ok
 	}
+
+	/**
+	 * internal function to format account-data
+	 */
+	function accountInfo($id,$acc=0,$longnames=0,$show_type=0)
+	{
+		if (!$id)
+		{
+			return '&nbsp;';
+		}
+
+		if (!is_array($acc))
+		{
+			$data = $GLOBALS['egw']->accounts->get_account_data($id);
+			if (!isset($data[$id])) return '#'.$id;
+			foreach(array('type','lid','firstname','lastname') as $name)
+			{
+				$acc['account_'.$name] = $data[$id][$name];
+			}
+		}
+		$info = $show_type ? '('.$acc['account_type'].') ' : '';
+
+		if ($acc['account_type'] == 'g')
+		{
+			$longnames = 1;
+		}
+		switch ($longnames)
+		{
+			case 2:
+				$info .= '&lt;'.$acc['account_lid'].'&gt; ';
+				// fall-through
+			case 1:
+				$info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] :
+					$acc['account_firstname'].' '.$acc['account_lastname'];
+				break;
+			case '0':
+				$info .= $acc['account_lid'];
+				break;
+			default:			// use the phpgw default
+				$info = $GLOBALS['egw']->common->display_fullname($acc['account_lid'],
+					$acc['account_firstname'],$acc['account_lastname']);
+				break;
+		}
+		return $info;
+	}
+
+	/**
+	 * postprocessing method, called after the submission of the form
+	 *
+	 * It has to copy the allowed/valid data from $value_in to $value, otherwise the widget
+	 * will return no data (if it has a preprocessing method). The framework insures that
+	 * the post-processing of all contained widget has been done before.
+	 *
+	 * Only used by select-dow so far
+	 *
+	 * @param string $name form-name of the widget
+	 * @param mixed &$value the extension returns here it's input, if there's any
+	 * @param mixed &$extension_data persistent storage between calls or pre- and post-process
+	 * @param boolean &$loop can be set to true to request a re-submision of the form/dialog
+	 * @param object &$tmpl the eTemplate the widget belongs too
+	 * @param mixed &value_in the posted values (already striped of magic-quotes)
+	 * @return boolean true if $value has valid content, on false no content will be returned!
+	 */
+	function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	{
+		switch ($extension_data['type'])
+		{
+			case 'select-cat':
+				$value = $value_in;
+				// check if we have some unavailible cats and add them again
+				if (is_array($extension_data['unavailible']) && $extension_data['unavailible'])
+				{
+					if (is_array($value))	// multiselection
+					{
+						$value = array_merge($value,$extension_data['unavailible']);
+					}
+					elseif (!$value)		// non-multiselection and nothing selected by the user
+					{
+						$value = $extension_data['unavailible'][0];
+					}
+				}
+				break;
+
+			case 'select-dow':
+				$value = 0;
+				if (!is_array($value_in)) $value_in = explode(',',$value_in);
+				foreach($value_in as $val)
+				{
+					$value |= $val;
+				}
+				//echo "<p>select_widget::post_process('$name',...,'$value_in'): value='$value'</p>\n";
+				break;
+			case 'select-country':
+				if ($extension_data['country_use_name'] && $value_in)
+				{
+					if (($value = $GLOBALS['egw']->country->get_full_name($value_in)))
+					{
+						break;
+					}
+				}
+				// fall through
+			default:
+				$value = $value_in;
+				break;
+		}
+		//echo "<p>select_widget::post_process('$name',,'$extension_data',,,'$value_in'): value='$value', is_null(value)=".(int)is_null($value)."</p>\n";
+		return true;
+	}
+}
diff --git a/etemplate/inc/class.soetemplate.inc.php b/etemplate/inc/class.soetemplate.inc.php
index d215158350..9c107a575f 100644
--- a/etemplate/inc/class.soetemplate.inc.php
+++ b/etemplate/inc/class.soetemplate.inc.php
@@ -4,7 +4,7 @@
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright 2002-8 by RalfBecker@outdoor-training.de
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package etemplate
  * @subpackage api
@@ -30,20 +30,20 @@
  */
 class soetemplate
 {
-	var $debug;		// =1 show some debug-messages, = 'app.name' show messages only for eTemplate 'app.name'
-	var $name;		// name of the template, e.g. 'infolog.edit'
-	var $template;	// '' = default (not 'default')
-	var $lang;		// '' if general template else language short, e.g. 'de'
-	var $group;		// 0 = not specific else groupId or if < 0  userId
-	var $version;	// like 0.9.13.001
-	var $style;		// embeded CSS style-sheet
-	var $children;	// array with children
-	var $data;		// depricated: first grid of the children
-	var $size;		// depricated: witdh,height,border of first grid
+	public $debug;		// =1 show some debug-messages, = 'app.name' show messages only for eTemplate 'app.name'
+	public $name;		// name of the template, e.g. 'infolog.edit'
+	public $template;	// '' = default (not 'default')
+	public $lang;		// '' if general template else language short, e.g. 'de'
+	public $group;		// 0 = not specific else groupId or if < 0  userId
+	public $version;	// like 0.9.13.001
+	public $style;		// embeded CSS style-sheet
+	public $children;	// array with children
+	public $data;		// depricated: first grid of the children
+	public $size;		// depricated: witdh,height,border of first grid
 	/**
 	 * private reference to the global db-object
 	 *
-	 * @var egw_db
+	 * @public egw_db
 	 */
 	private $db;
 	/**
@@ -68,7 +68,7 @@ class soetemplate
 	 * widgets that contain other widgets, eg. for tree_walk method
 	 * widget-type is the key, the value specifys how the children are stored.
 	 *
-	 * @var array
+	 * @public array
 	 */
 	static $widgets_with_children = array(
 		'template' => 'template',
@@ -94,9 +94,9 @@ class soetemplate
 	 * @param int $cols initial size of the template, default 1, only used if no name given !!!
 	 * @return soetemplate
 	 */
-	function soetemplate($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
+	function __construct($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
 	{
-		if (is_object($GLOBALS['egw']->db))
+		if (isset($GLOBALS['egw']->db))
 		{
 			$this->db = $GLOBALS['egw']->db;
 		}
@@ -674,6 +674,8 @@ class soetemplate
 		$this->set_rows_cols();
 	}
 
+	static private $compress_array_recursion = array();
+
 	/**
 	 * all empty values and objects in the array got unset (to save space in the db )
 	 *
@@ -686,6 +688,8 @@ class soetemplate
 	 */
 	function compress_array($arr,$remove_objs=false)
 	{
+		static $recursion = array();
+
 		if (!is_array($arr))
 		{
 			return $arr;
@@ -702,7 +706,7 @@ class soetemplate
 			}
 			elseif (!$remove_objs && $key == 'obj' && is_object($val) && method_exists($val,'as_array') &&
 				// this test prevents an infinit recursion of templates calling itself, atm. etemplate.editor.new
-				$GLOBALS['egw_info']['etemplate']['as_array'][$this->name]++ < 2)
+				self::$compress_array_recursion[$this->name]++ < 2)
 			{
 				$arr['obj'] = $val->as_array(2);
 			}
@@ -1077,6 +1081,8 @@ class soetemplate
 		return lang("%1 new eTemplates imported for Application '%2'",$n,$app);
 	}
 
+	static private $import_tested = array();
+
 	/**
 	 * test if new template-import necessary for app and does the import
 	 *
@@ -1090,11 +1096,11 @@ class soetemplate
 	{
 		list($app) = explode('.',$app);
 
-		if (!$app || $GLOBALS['egw_info']['etemplate']['import_tested'][$app])
+		if (!$app || self::$import_tested[$app])
 		{
 			return '';	// ensure test is done only once per call and app
 		}
-		$GLOBALS['egw_info']['etemplate']['import_tested'][$app] = True;	// need to be done before new ...
+		self::$import_tested[$app] = True;	// need to be done before new ...
 
 		$path = EGW_SERVER_ROOT."/$app/setup/etemplates.inc.php";
 
diff --git a/etemplate/inc/class.tab_widget.inc.php b/etemplate/inc/class.tab_widget.inc.php
index 17acea5225..2d24624263 100644
--- a/etemplate/inc/class.tab_widget.inc.php
+++ b/etemplate/inc/class.tab_widget.inc.php
@@ -9,7 +9,7 @@
 	 * @author Ralf Becker <RalfBecker@outdoor-training.de>
 	 * @version $Id$
 	 */
-	
+
 	/**
 	 * eTemplate Extension: widget that shows one row of tabs and an other row with the eTemplate of the selected tab
 	 *
@@ -19,7 +19,7 @@
 	 */
 	class tab_widget
 	{
-		/** 
+		/**
 		 * exported methods of this class
 		 * @var array
 		 */
@@ -32,7 +32,7 @@
 		 * @var string
 		 */
 		var $human_name = 'Tabs';	// this is the name for the editor
-	
+
 		/**
 		 * Constructor of the extension
 		 *
@@ -41,7 +41,7 @@
 		function tab_widget($ui)
 		{
 		}
-	
+
 		/**
 		 * pre-processing of the extension
 		 *
@@ -49,7 +49,7 @@
 		 *
 		 * @param string $name form-name of the control
 		 * @param mixed &$value value / existing content, can be modified
-		 * @param array &$cell array with the widget, can be modified for ui-independent widgets 
+		 * @param array &$cell array with the widget, can be modified for ui-independent widgets
 		 * @param array &$readonlys names of widgets as key, to be made readonly
 		 * @param mixed &$extension_data data the extension can store persisten between pre- and post-process
 		 * @param object &$tmpl reference to the template we belong too
@@ -58,10 +58,10 @@
 		function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 		{
 			//echo "<p>tab_widget::pre_process('$form_name',$value,,$extension_data)</p>\n";
-	
+
 			if (!$cell['onchange'])	// onchange allows to use the old behavior (submit for each new tab)
 			{
-				$dom_enabled = isset($GLOBALS['egw_info']['etemplate']['dom_enabled']) ? $GLOBALS['egw_info']['etemplate']['dom_enabled'] : true;
+				$dom_enabled = true;
 			}
 			$labels = explode('|',$cell['label']);
 			$helps = explode('|',$cell['help']);
@@ -85,10 +85,10 @@
 				}
 			}
 			$all_names = implode('|',$names);
-	
+
 			$tab_widget =& new etemplate('etemplate.tab_widget');
 			$tab_widget->no_onclick = true;
-	
+
 			if ($value && strpos($value,'.') === false)
 			{
 				$value = $tmpl->name . '.' . $value;
@@ -109,7 +109,7 @@
 				$value = $selected_tab = $names[0];
 			}
 			$extension_data = $value;	// remember the active tab in the extension_data
-	
+
 			foreach($names as $k => $name)
 			{
 				if (strpos($name,'.') === false)
@@ -138,13 +138,13 @@
 				}
 				$tcell['label'] = $labels[$k];
 				$tcell['help'] = $helps[$k];
-	
+
 				$tab_widget->set_cell_attribute('tabs',1+$k,$tcell);
 			}
 			$tab_widget->set_cell_attribute('tabs','type','hbox');
 			$tab_widget->set_cell_attribute('tabs','size',count($names));
 			$tab_widget->set_cell_attribute('tabs','name','');
-	
+
 			if ($dom_enabled)
 			{
 				foreach($names as $n => $name)
@@ -166,14 +166,14 @@
 				$tab_widget->set_cell_attribute('body','obj',$stab);
 			}
 			$tab_widget->set_cell_attribute('body','name',$selected_tab);
-	
+
 			$cell['type'] = 'template';
 			$cell['obj'] = &$tab_widget;
 			$cell['label'] = $cell['help'] = '';
-	
+
 			return False;	// NO extra Label
 		}
-	
+
 		/**
 		 * postprocessing method, called after the submission of the form
 		 *
@@ -194,7 +194,7 @@
 		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
 		{
 			//echo "<p>tab_widget::post_process($name): value_in = "; _debug_array($value_in);
-	
+
 			if (is_array($value_in))
 			{
 				foreach ($value_in as $tab => $button_pressed)
@@ -213,7 +213,7 @@
 			// if value not set (other button pressed), set the value we remembered in the extension_data
 			if (!$value)
 			{
-				$value = $extension_data;	
+				$value = $extension_data;
 			}
 			return True;
 		}
diff --git a/etemplate/inc/class.uietemplate_gtk.inc.php b/etemplate/inc/class.uietemplate_gtk.inc.php
index 5555b2dc3b..7a5e1128f4 100644
--- a/etemplate/inc/class.uietemplate_gtk.inc.php
+++ b/etemplate/inc/class.uietemplate_gtk.inc.php
@@ -24,7 +24,7 @@
 	 * @param $debug enables debug messages: 0=no, 1=calls to show and process_show, 2=content of process_show
 	 * @param                                3=calls to show_cell OR template- or cell-type name
 	 */
-	class etemplate extends boetemplate
+	class gtk_etemplate extends boetemplate
 	{
 		var $debug;//='etemplate.editor.edit'; // 1=calls to show and process_show, 2=content after process_show,
 						// 3=calls to show_cell and process_show_cell, or template-name or cell-type
diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index 374367194b..91532518b6 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -508,7 +508,7 @@
 									// save tmpl to the cache, as the file may contain more then one tmpl
 									$cname = ($etempl->template == '' ? 'default' : $etempl->template).'/'.$etempl->name.
 													 ($etempl->lang == '' ? '' : '.'.$etempl->lang);
-									$GLOBALS['egw_info']['etemplate']['cache'][$cname] = $etempl->as_array(1);
+									boetemplate::$template_cache[$cname] = $etempl->as_array(1);
 									if ($this->debug)
 									{
 										$etempl->echo_tmpl();

From 6ef914fbbbe54a03f9df635651615808efc542ed Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Mar 2009 13:00:45 +0000
Subject: [PATCH 084/510] "using etemplate::$hooked instead of
 $GLOBALS['egw_info']['etemplate']['hooked']"

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

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index e8444bd6df..af1853d586 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -1493,12 +1493,12 @@ class infolog_ui
 
 		$GLOBALS['egw']->translation->add_app('infolog');
 
-		$GLOBALS['egw_info']['etemplate']['hooked'] = True;
+		etemplate::$hooked = true;
 		$this->index(0,$app,$args[$view_id],array(
 			'menuaction' => $view,
 			isset($view_id2) ? $view_id2 : $view_id => $args[$view_id]
 		),True);
-		unset($GLOBALS['egw_info']['etemplate']['hooked']);
+		etemplate::$hooked = false;
 	}
 
 	/**

From 81a8b7dda9656d9a73fa969de7f5274e9e45de94 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 16 Mar 2009 13:08:33 +0000
Subject: [PATCH 085/510] making view typesafe, hardening view against
 sql-injection

---
 addressbook/inc/class.addressbook_so.inc.php | 30 ++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_so.inc.php b/addressbook/inc/class.addressbook_so.inc.php
index 14514fdec1..8778b7f986 100755
--- a/addressbook/inc/class.addressbook_so.inc.php
+++ b/addressbook/inc/class.addressbook_so.inc.php
@@ -65,7 +65,7 @@ class addressbook_so
 	 * @var string
 	 */
 	var $distributionlist_view ='(SELECT contact_id, egw_addressbook_lists.list_id as list_id, egw_addressbook_lists.list_name as list_name, egw_addressbook_lists.list_owner as list_owner FROM egw_addressbook_lists, egw_addressbook2list where egw_addressbook_lists.list_id=egw_addressbook2list.list_id) d_view ';
-
+	var $distributionlist_tabledef = array();
 	/**
 	* @var string
 	*/
@@ -259,6 +259,17 @@ class addressbook_so
 				$this->account_extra_search = array('uid');
 			}
 		}
+		if ($this->contact_repository == 'sql' || $this->contact_repository = 'sql-ldap') {
+			$tda2list = $this->db->get_table_definitions('phpgwapi','egw_addressbook2list');
+			$tdlists = $this->db->get_table_definitions('phpgwapi','egw_addressbook_lists');
+			$this->distributionlist_tabledef = array('fd' => array(
+					$this->distri_id => $tda2list['fd'][$this->distri_id],
+					$this->distri_owner => $tdlists['fd'][$this->distri_owner],
+        	    	$this->distri_key => $tdlists['fd'][$this->distri_key],
+					$this->distri_value => $tdlists['fd'][$this->distri_value],
+				), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(),
+			);
+		}  
 		// add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access,
 		// if he has not set the hide_accounts preference
 		// ToDo: be more specific for 'groupmembers', they should be able to see the groupmembers
@@ -362,7 +373,22 @@ class addressbook_so
 		$filter[$this->distri_id]=$ids;
 		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
 		$this->distributionlist_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
-		foreach($this->db->select($this->distributionlist_view,'*',$filter,__LINE__,__FILE__) as $row)
+		/*
+		#$ts= microtime(true);
+		$tda2list = $this->db->get_table_definitions('phpgwapi','egw_addressbook2list');
+		$tdlists = $this->db->get_table_definitions('phpgwapi','egw_addressbook_lists');
+		$this->distributionlist_tabledef = array('fd' => array(
+			$this->distri_id => $tda2list['fd'][$this->distri_id],
+			$this->distri_owner => $tdlists['fd'][$this->distri_owner],
+			$this->distri_key => $tdlists['fd'][$this->distri_key],
+			$this->distri_value => $tdlists['fd'][$this->distri_value],
+			), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(),
+		);	
+		#echo microtime(true)-$ts."seks to get def<br>";
+		*/
+		#_debug_array($this->distributionlist_tabledef);
+		foreach($this->db->select($this->distributionlist_view,'*',$filter,__LINE__,__FILE__,
+			false,'ORDER BY '.$this->distri_id,false,$num_rows=0,$join='',$this->distributionlist_tabledef) as $row)
 		{
 			if ((isset($row[$this->distri_id])&&strlen($row[$this->distri_value])>0))
 			{

From 85a93987a985b44dd5c244fe825abf3eb0e474dc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Mar 2009 13:43:16 +0000
Subject: [PATCH 086/510] "etemplate_request class to store the request data in
 the filesystem need to be explicitly enabled by setting:
 etemplate_request::$request_class = 'etemplate_request_files';"

---
 .../inc/class.etemplate_request_files.inc.php | 147 ++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 etemplate/inc/class.etemplate_request_files.inc.php

diff --git a/etemplate/inc/class.etemplate_request_files.inc.php b/etemplate/inc/class.etemplate_request_files.inc.php
new file mode 100644
index 0000000000..13e3129405
--- /dev/null
+++ b/etemplate/inc/class.etemplate_request_files.inc.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * eGroupWare - eTemplate request object storing the data in the filesystem
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage api
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker@outdoor-training.de>
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker@outdoor-training.de>
+ * @version $Id$
+ */
+
+/**
+ * Class to represent the persitent information stored on the server for each eTemplate request
+ *
+ * The information is stored in the filesystem. The admin has to take care of regulary cleaning of
+ * the used directory, as old requests get NOT deleted by this handler.
+ *
+ * To enable the use of this handler, you have to set (in etemplate/inc/class.etemplate_request.inc.php):
+ *
+ * 		etemplate_request::$request_class = 'etemplate_request_files';
+ *
+ * The request object should be instancated only via the factory method etemplate_request::read($id=null)
+ *
+ * $request = etemplate_request::read();
+ *
+ * // add request data
+ *
+ * $id = $request->id();
+ *
+ * b) open or modify an existing request:
+ *
+ * if (!($request = etemplate_request::read($id)))
+ * {
+ * 		// request not found
+ * }
+ *
+ * Ajax requests can use this object to open the original request by using the id, they have to transmitt back,
+ * and register further variables, modify the registered ones or delete them AND then update the id, if it changed:
+ *
+ *	if (($new_id = $request->id()) != $id)
+ *	{
+ *		$response->addAssign('etemplate_exec_id','value',$new_id);
+ *	}
+ *
+ * For an example look in link_widget::ajax_search()
+ */
+class etemplate_request_files extends etemplate_request
+{
+	/**
+	 * request id
+	 *
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * Name of the directory to store the request data, by default $GLOBALS['egw_info']['server']['temp_dir']
+	 *
+	 * @var string
+	 */
+	static public $directory;
+
+	/**
+	 * Private constructor to force the instancation of this class only via it's static factory method read
+	 *
+	 * @param array $id
+	 */
+	private function __construct($id=null)
+	{
+		if (is_null(self::$directory))
+		{
+			self::$directory = $GLOBALS['egw_info']['server']['temp_dir'];
+		}
+		if (!$id) $id = self::request_id();
+
+		$this->id = $id;
+	}
+
+	/**
+	 * return the id of this request
+	 *
+	 * @return string
+	 */
+	public function id()
+	{
+		//error_log(__METHOD__."() id=$this->id");
+		return $this->id;
+	}
+
+	/**
+	 * Factory method to get a new request object or the one for an existing request
+	 *
+	 * @param string $id=null
+	 * @return etemplate_request|boolean the object or false if $id is not found
+	 */
+	static function read($id=null)
+	{
+		$request = new etemplate_request_files($id);
+
+		if (!is_null($id))
+		{
+			if (!file_exists($filename = self::$directory.'/'.$id) || !is_readable($filename))
+			{
+				error_log("Error opening '$filename' to read the etemplate request data!");
+				return false;
+			}
+			$request->data = unserialize(file_get_contents($filename));
+			if ($request->data === false) error_log("Error unserializing '$filename' to read the etemplate request data!");
+		}
+		//error_log(__METHOD__."(id=$id");
+		return $request;
+	}
+
+	/**
+	 * creates a new request-id via microtime()
+	 *
+	 * @return string
+	 */
+	static function request_id()
+	{
+		do
+		{
+			$id = uniqid('etemplate_'.$GLOBALS['egw_info']['flags']['currentapp'].'_',true);
+		}
+		while (file_exists(self::$directory.'/'.$id));
+
+		return $id;
+	}
+
+	/**
+	 * saves content,readonlys,template-keys, ... via eGW's appsession function
+	 *
+	 * As a user may open several windows with the same content/template wie generate a location-id from microtime
+	 * which is used as location for request to descriminate between the different windows. This location-id
+	 * is then saved as a hidden-var in the form. The above mentions session-id has nothing to do / is different
+	 * from the session-id which is constant for all windows opened in one session.
+	 */
+	function __destruct()
+	{
+		if (!file_put_contents($filename = self::$directory.'/'.$this->id,serialize($this->data)))
+		{
+			error_log("Error opening '$filename' to store the etemplate request data!");
+		}
+	}
+}
\ No newline at end of file

From 38bf424a25c5d6bae065ff214640f2889b6003af Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 16 Mar 2009 13:50:03 +0000
Subject: [PATCH 087/510] speeding up search, by using a view to retrieve the
 participants

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

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 5da1c67944..e7cf74a510 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -375,10 +375,13 @@ class calendar_so
 			// now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)
 			// This will always read the first entry of each recuring event too, we eliminate it later
 			$recur_dates[] = 0;
-			foreach($this->db->select($this->user_table,'*',array(
-				'cal_id' => array_unique($ids),
-				'cal_recur_date' => $recur_dates,
-			),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+			$utcal_id_view = " (select * from ".$this->user_table." where cal_id in (".implode(',',array_unique($ids)).")) utcalid ";
+			//$utrecurdate_view = " (select * from ".$this->user_table." where cal_recur_date in (".implode(',',array_unique($recur_dates)).")) utrecurdates ";
+			foreach($this->db->select($utcal_id_view,'*',array(
+					//'cal_id' => array_unique($ids),
+					'cal_recur_date' => $recur_dates,
+				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',$num_rows=0,$join='',
+				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
 				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];

From 432798715a4affd6c0edd5ff25f09481f413c832 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 18 Mar 2009 09:31:11 +0000
Subject: [PATCH 088/510] fixing a problem with non numeric contact ids, while
 retrieving the distributionlist (reported by Benoit LORAND)

---
 addressbook/inc/class.addressbook_so.inc.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/addressbook/inc/class.addressbook_so.inc.php b/addressbook/inc/class.addressbook_so.inc.php
index 8778b7f986..239b294d87 100755
--- a/addressbook/inc/class.addressbook_so.inc.php
+++ b/addressbook/inc/class.addressbook_so.inc.php
@@ -365,29 +365,15 @@ class addressbook_so
 		}
 		foreach($ids as $key => $id)
 		{
-			if (!(int)$id) unset($ids[$key]);
+			if (!is_numeric($id)) unset($ids[$key]);
 		}
 		if (!$ids) return array();	// nothing to do, eg. all these contacts are in ldap
-
 		$fields = array();
 		$filter[$this->distri_id]=$ids;
 		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
-		$this->distributionlist_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
-		/*
-		#$ts= microtime(true);
-		$tda2list = $this->db->get_table_definitions('phpgwapi','egw_addressbook2list');
-		$tdlists = $this->db->get_table_definitions('phpgwapi','egw_addressbook_lists');
-		$this->distributionlist_tabledef = array('fd' => array(
-			$this->distri_id => $tda2list['fd'][$this->distri_id],
-			$this->distri_owner => $tdlists['fd'][$this->distri_owner],
-			$this->distri_key => $tdlists['fd'][$this->distri_key],
-			$this->distri_value => $tdlists['fd'][$this->distri_value],
-			), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(),
-		);	
-		#echo microtime(true)-$ts."seks to get def<br>";
-		*/
+		$distri_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
 		#_debug_array($this->distributionlist_tabledef);
-		foreach($this->db->select($this->distributionlist_view,'*',$filter,__LINE__,__FILE__,
+		foreach($this->db->select($distri_view,'*',$filter,__LINE__,__FILE__,
 			false,'ORDER BY '.$this->distri_id,false,$num_rows=0,$join='',$this->distributionlist_tabledef) as $row)
 		{
 			if ((isset($row[$this->distri_id])&&strlen($row[$this->distri_value])>0))

From 52db44fb8390bdc44b595f5333a5bd31525d103d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 19 Mar 2009 12:06:49 +0000
Subject: [PATCH 089/510] make boetemplate::store_to_cache public (static) to
 call it from xul_io

---
 etemplate/inc/class.boetemplate.inc.php | 9 ++++++---
 etemplate/inc/class.xul_io.inc.php      | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 207256fca4..ae0b71da5d 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -725,11 +725,14 @@ class boetemplate extends soetemplate
 
 	/**
 	 * stores the etemplate in the cache in egw_info
+	 *
+	 * @param boetemplate $tpl=null required parameter for static use!
 	 */
-	private function store_in_cache()
+	public /*static*/ function store_in_cache(boetemplate $tpl=null)
 	{
-		//echo "<p>store_in_cache('$this->name','$this->template','$this->lang','$this->version')</p>\n";
-		self::$template_cache[$this->cache_name()] = $this->as_array(1);
+		if (is_null($tpl)) $tpl = $this;
+		//echo "<p>store_in_cache('$tpl->name','$tpl->template','$tpl->lang','$tpl->version')</p>\n";
+		self::$template_cache[$tpl->cache_name()] = $tpl->as_array(1);
 	}
 
 	/**
diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index 91532518b6..374df3f182 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -508,7 +508,7 @@
 									// save tmpl to the cache, as the file may contain more then one tmpl
 									$cname = ($etempl->template == '' ? 'default' : $etempl->template).'/'.$etempl->name.
 													 ($etempl->lang == '' ? '' : '.'.$etempl->lang);
-									boetemplate::$template_cache[$cname] = $etempl->as_array(1);
+									boetemplate::store_in_cache($etempl);
 									if ($this->debug)
 									{
 										$etempl->echo_tmpl();

From 55d2aaa3ee20ab96210da3d86eabde8fe4fb76f1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 19 Mar 2009 20:12:35 +0000
Subject: [PATCH 090/510] Implemented symlinks for eGW's VFS: - sqlfs can store
 now symlinks (implements symlink and readlink) - vfs resolves symlinks before
 calling a mounted stream-wrapper --> symlinks can be between different
 mount-points - filemanger can create symlinks and follows them - etemplate
 vfs_widget displays symlinks (to be improved) Happy testing :-)

---
 etemplate/inc/class.vfs_widget.inc.php        |  28 +++
 etemplate/templates/default/app.css           |  86 +++++---
 filemanager/inc/class.filemanager_ui.inc.php  |  45 +++--
 filemanager/setup/etemplates.inc.php          |  17 +-
 filemanager/templates/default/file.xet        |  12 +-
 filemanager/templates/default/images/link.png | Bin 0 -> 720 bytes
 filemanager/templates/default/index.xet       |   3 +-
 phpgwapi/inc/class.egw_vfs.inc.php            |  71 ++++++-
 .../inc/class.sqlfs_stream_wrapper.inc.php    |  84 +++++++-
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 190 ++++++++++++++----
 10 files changed, 435 insertions(+), 101 deletions(-)
 create mode 100644 filemanager/templates/default/images/link.png

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index f9355fbb97..c059f77793 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -133,6 +133,24 @@ class vfs_widget
 					}
 					$value['c'.$n] = $component;
 					$path .= '/'.$component;
+					// replace id's in /apps again with human readable titles
+					$path_parts = explode('/',$path);
+					if ($path_parts[1] == 'apps')
+					{
+						switch(count($path_parts))
+						{
+							case 2:
+								$value['c'.$n] = lang('Applications');
+								break;
+							case 3:
+								$value['c'.$n] = lang($path_parts[2]);
+								break;
+							case 4:
+								$value['c'.$n] .= ': '.egw_link::title($path_parts[2],$path_parts[3]);
+								//$value['c'.$n] = egw_link::title($path_parts[2],$path_parts[3]);
+								break;
+						}
+					}
 					if (egw_vfs::check_access($path,egw_vfs::READABLE))	// show link only if we have access to the file or dir
 					{
 						if ($n < count($comps)-1 || $mime == egw_vfs::DIR_MIME_TYPE)
@@ -201,6 +219,16 @@ class vfs_widget
 				{
 					$value = egw_vfs::mime_icon($mime);
 				}
+				// mark symlinks (check if method exists, to allow etemplate to run on 1.6 API!)
+				if (method_exists('egw_vfs','is_link') && egw_vfs::is_link($path))
+				{
+					$broken = !egw_vfs::stat($path);
+					list($span,$class) = explode(',',$cell['span'],2);
+					$class .= ($class ? ' ' : '') . ($broken ? 'vfsIsBrokenLink' : 'vfsIsLink');
+					$cell['span'] = $span.','.$class;
+					$cell['label'] = ($broken ? lang('Broken link') : lang('Link')).': '.egw_vfs::readlink($path).
+						(!$broken ? ' ('.$cell['label'].')' : '');
+				}
 				break;
 
 			default:
diff --git a/etemplate/templates/default/app.css b/etemplate/templates/default/app.css
index d8ec94828c..214b51b066 100644
--- a/etemplate/templates/default/app.css
+++ b/etemplate/templates/default/app.css
@@ -11,12 +11,12 @@
 /*
  * a few generic styles used in most eT apps
  */
-.redItalic,.message { 
-	color: red; 
-	font-style: italic; 
+.redItalic,.message {
+	color: red;
+	font-style: italic;
 }
-.gray { 
-	color: gray; 
+.gray {
+	color: gray;
 }
 .leftPad5 {
 	padding-left: 5px;
@@ -31,24 +31,24 @@
 }
 
 /*
- * Styles of the eT editor 
+ * Styles of the eT editor
  */
-.clickWidgetToEdit { 
-	cursor: pointer; 
-	display: inline; 
+.clickWidgetToEdit {
+	cursor: pointer;
+	display: inline;
 }
-.clickWidgetToEdit:hover { 
-	background-color: pink; 
+.clickWidgetToEdit:hover {
+	background-color: pink;
 }
 
 /*
- * Styles of the nextmatch widget 
+ * Styles of the nextmatch widget
  */
-.activ_sortcolumn { 
-	font-weight: bold; 
+.activ_sortcolumn {
+	font-weight: bold;
 }
-.inactiv_sortcolumn { 
-	font-weight: normal; 
+.inactiv_sortcolumn {
+	font-weight: normal;
 }
 .lettersearch,.lettersearch_active {
 	background-color: #D3DCE3;
@@ -80,30 +80,30 @@
 /*
  * Styles for the tab widget
  */
-.etemplate_tab,.etemplate_tab_active { 
-	border-style:solid; 
-	border-width:1px 1px 0px; 
-	border-color:black; 
-	padding:3px; 
-	padding-left: 6px; 
-	padding-right: 6px; 
-	width: 60px; 
+.etemplate_tab,.etemplate_tab_active {
+	border-style:solid;
+	border-width:1px 1px 0px;
+	border-color:black;
+	padding:3px;
+	padding-left: 6px;
+	padding-right: 6px;
+	width: 60px;
 	white-space: nowrap;
 }
-.etemplate_tab { 
-	cursor: pointer; 
+.etemplate_tab {
+	cursor: pointer;
 	background-color: #E8F0F0;
 }
-.etemplate_tab_active { 
-	border-width:2px 2px 0px; 
+.etemplate_tab_active {
+	border-width:2px 2px 0px;
 	background-color: #D3DCE3;
 }
-.tab_body { 
-	border: black solid 2px; 
+.tab_body {
+	border: black solid 2px;
 }
 
-.nextmatch_header { 
-	border: 1px solid black; 
+.nextmatch_header {
+	border: 1px solid black;
 }
 .nextmatch_header select {
 	width: 140px;
@@ -120,4 +120,24 @@
 }
 .vfsFilename {
 	white-space: nowrap;
-}
\ No newline at end of file
+}
+/**
+ * mark a file (icon) as link
+ */
+.vfsIsLink img {
+	border-bottom: 4px solid darkgray;
+	border-right: 4px solid darkgray;
+}
+/**
+ * nicer would be, but it's not working ...
+ */
+.vfsIsLink img:after {
+	content: url(filemanager/templates/default/images/link.png);
+}
+/**
+ * mark a link (icon) as broken link
+ */
+.vfsIsBrokenLink img {
+	border-bottom: 4px solid red;
+	border-right: 4px solid red;
+}
diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index bf1d183d54..a175a7fce1 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -170,6 +170,20 @@ class filemanager_ui
 						$content['nm']['path'] = $old_path;
 					}
 					break;
+				case 'symlink':
+					$target = $content['nm']['path'];
+					$ses = $GLOBALS['egw']->session->appsession('index','filemanager');
+					$content['nm']['path'] = $ses['path'];
+					$link = egw_vfs::concat($content['nm']['path'],basename($target));
+					$abs_target = $target[0] == '/' ? $target : egw_vfs::concat($content['nm']['path'],$target);
+					if (!egw_vfs::stat($abs_target))
+					{
+						$content['nm']['msg'] = lang('Link target %1 not found!',$abs_target);
+						break;
+					}
+					$content['nm']['msg'] = egw_vfs::symlink($target,$link) ?
+						lang('Symlink to %1 created.',$target) : lang('Error creating symlink to target %1!',$target);
+					break;
 				case 'paste':
 					$content['nm']['msg'] = self::action($clipboard_type.'_paste',$clipboard_files,$content['nm']['path']);
 					break;
@@ -223,6 +237,7 @@ class filemanager_ui
 
 		$readonlys['button[paste]'] = !$clipboard_files;
 		$readonlys['button[createdir]'] = !$dir_is_writable;
+		$readonlys['button[symlink]'] = !$dir_is_writable;
 		$readonlys['button[upload]'] = $readonlys['upload'] = !$dir_is_writable;
 
 		if ($dir_is_writable || !$content['nm']['filter']) $sel_options['action']['delete'] = lang('Delete');
@@ -357,7 +372,7 @@ class filemanager_ui
 				$dirs = $files = $errs = 0;
 				foreach(egw_vfs::find($selected,array('depth'=>true)) as $path)
 				{
-					if (($is_dir = egw_vfs::is_dir($path)) && egw_vfs::rmdir($path,0))
+					if (($is_dir = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)) && egw_vfs::rmdir($path,0))
 					{
 						++$dirs;
 					}
@@ -503,10 +518,9 @@ class filemanager_ui
 			'limit' => (int)$query['num_rows'].','.(int)$query['start'],
 			'need_mime' => true,
 			'name_preg' => $namefilter,
+			'follow' => true,	// follow symlinks
 		),true) as $path => $row)
 		{
-			$row['icon'] = egw_vfs::mime_icon($row['mime']);
-
 			//echo $path; _debug_array($row);
 			$rows[++$n] = $row;
 			$path2n[$path] = $n;
@@ -552,13 +566,11 @@ class filemanager_ui
 	 */
 	function file(array $content=null,$msg='')
 	{
-		static $tabs = 'general|perms|eacl|preview|custom';
-
 		$tpl = new etemplate('filemanager.file');
 
 		if (!is_array($content))
 		{
-			if (!($stat = egw_vfs::stat($path = $_GET['path'])))
+			if (!($path = $_GET['path']) || !($stat = egw_vfs::lstat($path)))
 			{
 				$content['msg'] = lang('File or directory not found!');
 			}
@@ -576,9 +588,13 @@ class filemanager_ui
 				{
 					foreach($props as $prop) $content[$prop['name']] = $prop['val'];
 				}
+				if (($content['is_link'] = egw_vfs::is_link($path)))
+				{
+					$content['symlink'] = egw_vfs::readlink($path);
+				}
 			}
-			$content[$tabs] = $_GET['tabs'];
-			if (!($content['is_dir'] = egw_vfs::is_dir($path)))
+			$content['tabs'] = $_GET['tabs'];
+			if (!($content['is_dir'] = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)))
 			{
 				$content['perms']['executable'] = (int)!!($content['mode'] & 0111);
 				$mask = 6;
@@ -742,6 +758,10 @@ class filemanager_ui
 			echo "<html>\n<body>\n<script>\n$js\n</script>\n</body>\n</html>\n";
 			if ($button == 'save')$GLOBALS['egw']->common->egw_exit();
 		}
+		if ($content['is_link'] && !egw_vfs::stat($path))
+		{
+			$msg .= ($msg ? "\n" : '').lang('Link target %1 not found!',$content['symlink']);
+		}
 		$content['link'] = $GLOBALS['egw']->link(egw_vfs::download_url($path));
 		$content['msg'] = $msg;
 
@@ -758,13 +778,14 @@ class filemanager_ui
 		}
 		$readonlys['name'] = $path == '/' || !egw_vfs::is_writable($content['dir']);
 		$readonlys['comment'] = !egw_vfs::is_writable($path);
+		$readonlys['tabs']['preview'] = $readonlys['tabs']['perms'] = $content['is_link'];
 
 		// if neither owner nor is writable --> disable save&apply
 		$readonlys['button[save]'] = $readonlys['button[apply]'] = !$content['is_owner'] && !egw_vfs::is_writable($path);
 
 		if (!($cfs = config::get_customfields('filemanager')))
 		{
-			$readonlys[$tabs]['custom'] = true;
+			$readonlys['tabs']['custom'] = true;
 		}
 		elseif (!egw_vfs::is_writable($path))
 		{
@@ -773,10 +794,10 @@ class filemanager_ui
 				$readonlys['#'.$name] = true;
 			}
 		}
-		$readonlys[$tabs]['eacl'] = true;	// eacl off by default
+		$readonlys['tabs']['eacl'] = true;	// eacl off by default
 		if ($content['is_dir'])
 		{
-			$readonlys[$tabs]['preview'] = true;	// no preview tab for dirs
+			$readonlys['tabs']['preview'] = true;	// no preview tab for dirs
 			$sel_options['rights']=$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
 				7 => lang('Display and modification of content'),
 				5 => lang('Display of content'),
@@ -784,7 +805,7 @@ class filemanager_ui
 			);
 			if(($content['eacl'] = egw_vfs::get_eacl($content['path'])) !== false)	// backend supports eacl
 			{
-				unset($readonlys[$tabs]['eacl']);	// --> switch the tab on again
+				unset($readonlys['tabs']['eacl']);	// --> switch the tab on again
 				foreach($content['eacl'] as &$eacl)
 				{
 					$eacl['path'] = parse_url($eacl['path'],PHP_URL_PATH);
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index f9b5a62a10..4826591693 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-02-26 16:26
+	* generated by soetemplate::dump4setup() 2009-03-19 16:18
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -25,6 +25,17 @@ $templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => ''
   display: none;
 }','modified' => '1223224423',);
 
+$templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:54:"General|Permissions|Extended ACL|Preview|Custom fields";s:4:"name";s:38:"tabs=general|perms|eacl|preview|custom";s:4:"span";s:3:"all";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:15:"window.close();";}}i:2;a:6:{s:4:"type";s:10:"buttononly";s:5:"label";s:9:"Superuser";s:5:"align";s:5:"right";s:4:"help";s:48:"Enter setup user and password to get root rights";s:7:"onclick";s:121:"set_style_by_class(\'fieldset\',\'superuser\',\'display\',\'inline\'); document.getElementById(form::name(\'sudo[user]\')).focus();";s:4:"name";s:4:"sudo";}}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:29:"Enter setup user and password";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"User";s:4:"size";s:13:",,,sudo[user]";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"sudo[user]";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Password";s:4:"size";s:15:",,,sudo[passwd]";}s:1:"B";a:2:{s:4:"type";s:6:"passwd";s:4:"name";s:12:"sudo[passwd]";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Submit";s:4:"name";s:13:"button[setup]";}}}s:7:"options";a:0:{}s:4:"rows";i:3;s:4:"cols";i:2;}s:4:"span";s:10:",superuser";}}}s:4:"rows";i:4;s:4:"cols";i:1;}}','size' => '','style' => '.eaclAccount select,.eaclRights select { width: 160px; }
+.superuser { 
+  position: absolute; 
+  top: 130px; 
+  left: 120px; 
+  width: 200px; 
+  background-color: white;
+  z-index: 1;
+  display: none;
+}','modified' => '1223224423',);
+
 $templ_data[] = array('name' => 'filemanager.file.custom','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:18:"450,300,,,10,,auto";}}','size' => '450,300,,,10,,auto','style' => '','modified' => '1223224487',);
 
 $templ_data[] = array('name' => 'filemanager.file.eacl','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:4:",top";s:2:"c2";s:7:",bottom";s:2:"h2";s:11:",!@is_owner";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:4:"span";s:3:"all";s:5:"label";s:28:"Extended access control list";i:1;a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,200,,,,,auto";s:4:"data";a:3:{i:0;a:7:{s:1:"A";s:2:"80";s:1:"B";s:2:"80";s:1:"D";s:2:"16";s:2:"h2";s:4:",!@1";s:1:"C";s:3:"20%";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Rights";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Inherited";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[rights]";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[path]";}s:1:"D";a:5:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:39:"delete[$row_cont[ino]-$row_cont[owner]]";s:7:"onclick";s:43:"return confirm(\'Delete this extended ACL\');";}}}s:4:"name";s:4:"eacl";s:4:"rows";i:2;s:4:"cols";i:4;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:15:"select one,both";s:4:"name";s:11:"eacl[owner]";s:4:"span";s:12:",eaclAccount";s:5:"label";s:5:"Owner";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:12:"eacl[rights]";s:4:"span";s:11:",eaclRights";s:5:"label";s:6:"Rights";}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:12:"button[eacl]";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1207724932',);
@@ -33,6 +44,8 @@ $templ_data[] = array('name' => 'filemanager.file.general','template' => '','lan
 
 $templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:2:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:4:"size";s:4:"size";s:1:"1";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,comment";s:5:"label";s:7:"Comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:7:"comment";s:4:"span";s:8:",comment";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
 
+$templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:10:{i:0;a:4:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";s:2:"h3";s:10:",!@is_link";s:2:"h6";s:9:",@is_link";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Link";s:4:"size";s:10:",,,symlink";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"span";s:9:",fileName";s:4:"name";s:7:"symlink";s:8:"readonly";s:1:"1";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:4:"size";s:4:"size";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,comment";s:5:"label";s:7:"Comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:7:"comment";s:4:"span";s:8:",comment";}}}s:4:"rows";i:9;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
+
 $templ_data[] = array('name' => 'filemanager.file.perms','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h3";s:9:",!@is_dir";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:12:"Accessrights";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:1:"A";s:2:"80";s:2:"h5";s:2:",1";s:2:"h4";s:8:",@is_dir";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:12:"perms[owner]";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Group";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:12:"perms[group]";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Other";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:12:"perms[other]";}}i:4;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:10:"Executable";s:4:"name";s:17:"perms[executable]";}}i:5;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:43:"Only owner can rename or delete the content";s:4:"name";s:13:"perms[sticky]";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:7:"options";a:0:{}}}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:5:"Owner";i:1;a:5:{s:4:"type";s:4:"grid";s:7:"options";a:0:{}s:4:"data";a:3:{i:0;a:1:{s:1:"A";s:2:"80";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:13:"root,accounts";s:4:"name";s:3:"uid";s:5:"label";s:12:"@ro_uid_root";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Group";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:11:"root,groups";s:4:"name";s:3:"gid";s:5:"label";s:12:"@ro_gid_root";}}}s:4:"rows";i:2;s:4:"cols";i:2;}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:43:"Modify all Subdirectories and their content";s:4:"name";s:11:"modify_subs";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204567746',);
 
 $templ_data[] = array('name' => 'filemanager.file.preview','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2:"c1";s:4:",top";s:2:"h1";s:16:",!@mime=/^image/";s:2:"h3";s:22:",@mime=/^(image|text)/";s:2:"h2";s:18:"280,!@text_content";s:2:"c2";s:4:",top";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:4:"link";s:4:"span";s:13:",previewImage";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:12:"text_content";s:4:"span";s:12:",previewText";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"No preview available";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:18:"450,300,,,10,,auto";s:7:"options";a:4:{i:0;s:3:"450";i:1;s:3:"300";i:6;s:4:"auto";i:4;s:2:"10";}}}','size' => '450,300,,,10,,auto','style' => '','modified' => '1204567479',);
@@ -41,6 +54,8 @@ $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '
 
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1235658193',);
 
+$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:12:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"9";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"link";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
+
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:5:"label";s:15:"$row_cont[mime]";s:4:"name";s:12:"${row}[icon]";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"size";s:14:",@${row}[link]";s:4:"name";s:12:"${row}[name]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[hsize]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:5:"label";s:16:"$row_cont[perms]";s:4:"span";s:6:",perms";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[user]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[group]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=400,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:15:"$row_cont[path]";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:15:"$row_cont[path]";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
diff --git a/filemanager/templates/default/file.xet b/filemanager/templates/default/file.xet
index 8f5a34223b..7848b68053 100644
--- a/filemanager/templates/default/file.xet
+++ b/filemanager/templates/default/file.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="filemanager.file.general" template="" lang="" group="0" version="1.5.003">
+	<template id="filemanager.file.general" template="" lang="" group="0" version="1.7.001">
 		<grid width="450" height="300" spacing="10">
 			<columns>
 				<column width="80"/>
@@ -15,6 +15,10 @@
 				<row>
 					<hrule span="all"/>
 				</row>
+				<row disabled="!@is_link">
+					<description value="Link" options=",,,symlink"/>
+					<textbox class="fileName" id="symlink" readonly="true"/>
+				</row>
 				<row>
 					<description value="Type"/>
 					<description id="mime"/>
@@ -23,7 +27,7 @@
 					<description value="Directory"/>
 					<description id="dir"/>
 				</row>
-				<row>
+				<row disabled="@is_link">
 					<description value="Size"/>
 					<vfs-size id="size" options="1"/>
 				</row>
@@ -199,7 +203,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="filemanager.file" template="" lang="" group="0" version="1.5.004">
+	<template id="filemanager.file" template="" lang="" group="0" version="1.7.001">
 		<grid>
 			<columns>
 				<column/>
@@ -209,7 +213,7 @@
 					<description span="all" class="redItalic" id="msg"/>
 				</row>
 				<row>
-					<tabbox span="all">
+					<tabbox id="tabs" span="all">
 						<tabs>
 							<tab label="General" statustext=""/>
 							<tab label="Permissions" statustext=""/>
diff --git a/filemanager/templates/default/images/link.png b/filemanager/templates/default/images/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbe6247ab7f637d48ab4bae7990af4ea59ba3080
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG?
z3=J@5gwkUG000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006jNkl<Z
zILnoj%S)6|7>A#8zVCC!%cM>^rjGLEg^{uvBFZdK!i_=^5g7dgZGsjpTLx_^h@g!`
z&_56aErOy&6lf7)hIs*_NX!zgk>++TUyGS8j!fi%vpH~{_j!NkJ>tae$>7oa8e3Tc
zIFoE*>|{6YgXtBn9`9x-(eU4ZrweObc{s=W{S~-2fPv0h_BK~yZNSUvFDxv6C#ww^
zl}G6SgT)n+uI4&M`hBD@Tyq7PYzFslvXp{kqJdO8&#iltjL$5R%4JbXQ5gzz>Fgm!
z`uz<yvQ#hRImGI#kOHI-I0z6R1q>$JHnroH9=w@f<>Jj}EPq?aa~;B-hmZ~(O||s2
z*F(UcU20%$z@7Uu=)9%EaoM?}jvMC(iEoe4*V{@c93rbAuge&GTK>Vur4$vei(en&
z`h}ykG(>nl^_jta?PvowfV?RK$mBG}26&ES^jLz{#%*W|!+l-s?u?;y0bop-5L+5+
zsHyS_FcqLJC<BN0v=XTbku!zrdHXwpjetnC%juy`gb+L)|G?7MG{yo#qAlnmK<P3e
z0-PA|Id`fTtu2?wCYYF7CZ__lDcC3t%KqaS9Vr+-(oQlF<JIg6FQ%4wx3J2t?ihYs
z6k`RtG{m*6-ZUW5x-bI=;`AlsXaiYQsH_aEW-O-Ig6l`ajNW}qwA$MM2#T6E0Q+lp
zikDJZO}x?~g+R<Mt_M$E&yh~2xAdPoY9$AIe0~CwgWp(fwy9YF0000<MNUMnLSTaD
C_cTcW

literal 0
HcmV?d00001

diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index 3d7a758af1..c10d0cd4cc 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -53,7 +53,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="filemanager.index" template="" lang="" group="0" version="1.6.001">
+	<template id="filemanager.index" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column width="250"/>
@@ -73,6 +73,7 @@
 						<image src="buttonseparator"/>
 						<button image="edit" label="Edit settings" id="edit[{$cont[nm][path]}]" statustext="Rename, change permissions or ownership" onclick="window.open(egw::link('/index.php','menuaction=filemanager.filemanager_ui.file&amp;path={$cont[nm][path]}'),'fileprefs','dependent=yes,width=495,height=425,scrollbars=yes,status=yes'); return false;"/>
 						<button id="button[createdir]" image="button_createdir" label="Create directory" onclick="var dir = prompt(egw::lang('New directory')); if (!dir) return false; document.getElementById(form::name('nm[path]')).value=dir;"/>
+						<button image="link" label="Create a link" id="button[symlink]" onclick="var link = prompt(egw::lang('Link target')); if (!link) return false; document.getElementById(form::name('nm[path]')).value=link;"/>
 						<button id="button[paste]" image="editpaste" statustext="$cont[paste_tooltip]"/>
 					</hbox>
 				</row>
diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index d32c9c3a7a..271084d97d 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -169,7 +169,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 * stat working on just the eGW VFS (alias of url_stat)
 	 *
 	 * @param string $path filename with absolute path in the eGW VFS
-	 * @return resource
+	 * @return array
 	 */
 	static function stat($path)
 	{
@@ -184,6 +184,25 @@ class egw_vfs extends vfs_stream_wrapper
 		return $stat;
 	}
 
+	/**
+	 * lstat (not resolving symbolic links) working on just the eGW VFS (alias of url_stat)
+	 *
+	 * @param string $path filename with absolute path in the eGW VFS
+	 * @return array
+	 */
+	static function lstat($path)
+	{
+		if ($path[0] != '/')
+		{
+			throw new egw_exception_assertion_failed("File '$path' is not an absolute path!");
+		}
+		if (($stat = self::url_stat($path,STREAM_URL_STAT_LINK)))
+		{
+			$stat = array_slice($stat,13);	// remove numerical indices 0-12
+		}
+		return $stat;
+	}
+
 	/**
 	 * is_dir() version working only inside the vfs
 	 *
@@ -195,6 +214,16 @@ class egw_vfs extends vfs_stream_wrapper
 		return $path[0] == '/' && is_dir(self::SCHEME.'://default'.$path);
 	}
 
+	/**
+	 * is_link() version working only inside the vfs
+	 *
+	 * @param string $path
+	 * @return boolean
+	 */
+	static function is_link($path)
+	{
+		return $path[0] == '/' && is_link(self::SCHEME.'://default'.$path);
+	}
 
 	/**
 	 * Mounts $url under $path in the vfs, called without parameter it returns the fstab
@@ -272,12 +301,12 @@ class egw_vfs extends vfs_stream_wrapper
 	 * - empty,size => (+|-|)N
 	 * - cmin/mmin => (+|-|)N file/dir create/modified in the last N minutes
 	 * - ctime/mtime => (+|-|)N file/dir created/modified in the last N days
-	 * - depth => (+|-)N
 	 * - url => false(default),true allow (and return) full URL's instead of VFS pathes (only set it, if you know what you doing securitywise!)
 	 * - need_mime => false(default),true should we return the mime type
 	 * - order => name order rows by name column
 	 * - sort => (ASC|DESC) sort, default ASC
 	 * - limit => N,[n=0] return N entries from position n on, which defaults to 0
+	 * - follow => {true|false(default)} follow symlinks
 	 * @param string/array/true $exec=null function to call with each found file/dir as first param and stat array as last param or
 	 * 	true to return file => stat pairs
 	 * @param array $exec_params=null further params for exec as array, path is always the first param and stat the last!
@@ -338,7 +367,7 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			if (!$url) $path = egw_vfs::PREFIX . $path;
 
-			$is_dir = is_dir($path);
+			$is_dir = is_dir($path) && ($options['follow'] || !is_link($path));
 			if (!isset($options['remove']))
 			{
 				$options['remove'] = count($base) == 1 ? count(explode('/',$path))-3+(int)(substr($path,-1)!='/') : 0;
@@ -556,7 +585,7 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			$url = self::PREFIX . $url;
 		}
-		if (is_dir($url))
+		if (is_dir($url) && !is_link($url))
 		{
 			return rmdir($url);
 		}
@@ -962,6 +991,8 @@ class egw_vfs extends vfs_stream_wrapper
 	/**
 	 * Concat a relative path to an url, taking into account, that the url might already end with a slash or the path starts with one or is empty
 	 *
+	 * Also normalizing the path, as the relative path can contain ../
+	 *
 	 * @param string $url base url or path, might end in a /
 	 * @param string $relative relative path to add to $url
 	 * @return string
@@ -970,7 +1001,37 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		list($url,$query) = explode('?',$url,2);
 		if (substr($url,-1) == '/') $url = substr($url,0,-1);
-		return ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative).($query ? '?'.$query : '');
+		$url = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
+
+		// now normalize the path (remove "/something/..")
+		while (strpos($url,'..') !== false)
+		{
+			list($a,$b) = explode('..',$url,2);
+			$a = explode('/',$a);
+			array_pop($a);
+			array_pop($a);
+			$b = explode('/',$b);
+			if ($b[0] === '') array_shift($b);
+			$url = implode('/',array_merge($a,$b));
+		}
+		return $url.($query ? '?'.$query : '');
+	}
+
+	/**
+	 * Build an url from it's components (reverse of parse_url)
+	 *
+	 * @param array $url_parts values for keys 'scheme', 'host', 'user', 'pass', 'query', 'fragment' (all but 'path' are optional)
+	 * @return string
+	 */
+	static function build_url(array $url_parts)
+	{
+		$url = (!isset($url_parts['scheme'])?'':$url_parts['scheme'].'://'.
+			(!isset($url_parts['user'])?'':$url_parts['user'].(!isset($url_parts['pass'])?'':':'.$url_parts['pass']).'@').
+			$url_parts['host']).$url_parts['path'].
+			(!isset($url_parts['query'])?'':'?'.$url_parts['query']).
+			(!isset($url_parts['fragment'])?'':'?'.$url_parts['fragment']);
+		//error_log(__METHOD__.'('.array2string($url_parts).") = '".$url."'");
+		return $url;
 	}
 
 	/**
diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index baf2c555ed..f2c3a60372 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -29,7 +29,7 @@
  *
  * The stream wrapper interface is according to the docu on php.net
  *
- * @link http://de.php.net/manual/de/function.stream-wrapper-register.php
+ * @link http://www.php.net/manual/en/function.stream-wrapper-register.php
  * @ToDo versioning
  */
 class sqlfs_stream_wrapper implements iface_stream_wrapper
@@ -38,6 +38,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 * Mime type of directories, the old vfs uses 'Directory', while eg. WebDAV uses 'httpd/unix-directory'
 	 */
 	const DIR_MIME_TYPE = 'httpd/unix-directory';
+	/**
+	 * Mime type for symlinks
+	 */
+	const SYMLINK_MIME_TYPE = 'application/x-symlink';
 	/**
 	 * Scheme / protocoll used for this stream-wrapper
 	 */
@@ -62,6 +66,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 * mode-bits, which have to be set for directories
 	 */
 	const MODE_DIR =   040000;
+	/**
+	 * mode-bits, which have to be set for links
+	 */
+	const MODE_LINK = 0120000;
 	/**
 	 * How much should be logged to the apache error-log
 	 *
@@ -69,7 +77,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 * 1 = only errors
 	 * 2 = all function calls and errors (contains passwords too!)
 	 */
-	const LOG_LEVEL = 2;
+	const LOG_LEVEL = 1;
 
 	/**
 	 * We do versioning AND store the content in the db, NOT YET IMPLEMENTED
@@ -495,7 +503,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 
 		$path = parse_url($url,PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,0)) || !egw_vfs::check_access(dirname($path),egw_vfs::WRITABLE))
+		if (!($stat = self::url_stat($path,STREAM_URL_STAT_LINK)) || !egw_vfs::check_access(dirname($path),egw_vfs::WRITABLE))
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) (type=$type) permission denied!");
@@ -506,7 +514,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 
 		if (($ret = $stmt->execute(array(':fs_id' => $stat['ino']))))
 		{
-			if (self::url2operation($url) == self::STORE2FS) unlink(self::_fs_path($stat['ino']));
+			if (self::url2operation($url) == self::STORE2FS && !($stat['mode'] & self::MODE_LINK))
+			{
+				unlink(self::_fs_path($stat['ino']));
+			}
 			// delete props
 			unset($stmt);
 			$stmt = self::$pdo->prepare('DELETE FROM '.self::PROPS_TABLE.' WHERE fs_id=?');
@@ -1086,6 +1097,68 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		return true;
 	}
 
+	/**
+	 * This method is called in response to readlink().
+	 *
+	 * @param string $url
+	 * @return string|boolean content of the symlink or false if $url is no symlink (or not found)
+	 */
+	static function readlink($url)
+	{
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url')");
+
+		$url_path = parse_url($url,PHP_URL_PATH);
+
+		if (!($lstat = self::url_stat($url_path,STREAM_URL_STAT_LINK)) || !($lstat['mode'] & self::MODE_LINK) ||
+			!($result = self::$pdo->query("SELECT fs_content FROM ".self::TABLE." WHERE fs_id=".(int)$lstat['ino'])))
+		{
+			return false;
+		}
+		return $result->fetchColumn();
+	}
+
+	/**
+	 * Method called for symlink()
+	 *
+	 * @param string $target
+	 * @param string $link
+	 * @return boolean true on success false on error
+	 */
+	static function symlink($target,$link)
+	{
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$target','$link')");
+
+		if (self::url_stat($link,0) || !($dir = dirname($link)) ||
+			!egw_vfs::check_access($dir,egw_vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))
+		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!stat('$link') || !is_writable('$dir'))");
+			return false;	// $link already exists or parent dir does not
+		}
+		$stmt = self::$pdo->prepare($query='INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_content'.
+			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_content)');
+		$values = array(
+			'fs_name' => basename($link),
+			'fs_dir'  => $dir_stat['ino'],
+			// we use the mode of the dir, so files in group dirs stay accessible by all members
+			'fs_mode' => ($dir_stat['mode'] & 0666),
+			// for the uid we use the uid of the dir if not 0=root or the current user otherwise
+			'fs_uid'  => $dir_stat['uid'] ? $dir_stat['uid'] : egw_vfs::$user,
+			// we allways use the group of the dir
+			'fs_gid'  => $dir_stat['gid'],
+			'fs_created'  => self::_pdo_timestamp(time()),
+			'fs_modified' => self::_pdo_timestamp(time()),
+			'fs_creator'  => egw_vfs::$user,
+			'fs_mime'     => self::SYMLINK_MIME_TYPE,
+			'fs_size'     => bytes($target),
+			'fs_content'  => $target,
+		);
+		foreach($values as $name => &$val)
+		{
+			$stmt->bindParam(':'.$name,$val);
+		}
+		return !!$stmt->execute();
+	}
+
 	private static $extended_acl;
 
 	/**
@@ -1330,7 +1403,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			'ino'   => $info['fs_id'],
 			'name'  => $info['fs_name'],
 			'mode'  => $info['fs_mode'] |
-				($info['fs_mime'] == self::DIR_MIME_TYPE ? self::MODE_DIR : self::MODE_FILE),	// required by the stream wrapper
+				($info['fs_mime'] == self::DIR_MIME_TYPE ? self::MODE_DIR :
+				($info['fs_mime'] == self::SYMLINK_MIME_TYPE ? self::MODE_LINK : self::MODE_FILE)),	// required by the stream wrapper
 			'size'  => $info['fs_size'],
 			'uid'   => $info['fs_uid'],
 			'gid'   => $info['fs_gid'],
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index b033fcfc13..6a0b5ebd6d 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -49,6 +49,10 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 * @var mixed
 	 */
 	var $context;
+	/**
+	 * mode-bits, which have to be set for links
+	 */
+	const MODE_LINK = 0120000;
 
 	/**
 	 * Our fstab in the form mount-point => url
@@ -101,11 +105,33 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 
 	private static $wrappers;
 
+	/**
+	 * Resolve the given path according to our fstab AND symlinks
+	 *
+	 * @param string $path
+	 * @param boolean $file_exists=true true if file needs to exists, false if not
+	 * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
+	 */
+	static function resolve_url_symlinks($path,$file_exists=true,$resolve_last_symlink=true)
+	{
+		if (!($stat = self::url_stat($path,$resolve_last_symlink?0:STREAM_URL_STAT_LINK)) && !$file_exists)
+		{
+			$ret = self::check_symlink_components($path,0,$url);
+			//error_log(__METHOD__."('$path',$file_exists) check_symlink_components()=$ret, url='$url'");
+		}
+		else
+		{
+			$url = $stat['url'];
+		}
+		//error_log(__METHOD__."($path,file_exists=$file_exists,resolve_last_symlink=$resolve_last_symlink) = '$url'");
+		return $url;
+	}
+
 	/**
 	 * Resolve the given path according to our fstab
 	 *
 	 * @param string $path
-	 * @return string/boolean false if the url cant be relsolved, should not happen if fstab has a root entry
+	 * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
 	 */
 	static function resolve_url($path)
 	{
@@ -176,7 +202,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	{
 		$this->opened_stream = null;
 
-		if (!($url = self::resolve_url($path)))
+		if (!($url = self::resolve_url_symlinks($path,$mode[0]=='r')))
 		{
 			return false;
 		}
@@ -319,7 +345,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function unlink ( $path )
 	{
-		if (!($url = self::resolve_url($path)))
+		if (!($url = self::resolve_url_symlinks($path,true,false)))	// true,false file need to exist, but do not resolve last component
 		{
 			return false;
 		}
@@ -340,8 +366,8 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function rename ( $path_from, $path_to )
 	{
-		if (!($url_from = self::resolve_url($path_from)) ||
-			!($url_to = self::resolve_url($path_to)))
+		if (!($url_from = self::resolve_url_symlinks($path_from,true,false)) ||
+			!($url_to = self::resolve_url_symlinks($path_to,false)))
 		{
 			return false;
 		}
@@ -361,7 +387,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function mkdir ( $path, $mode, $options )
 	{
-		if (!($url = self::resolve_url($path)))
+		if (!($url = self::resolve_url_symlinks($path,false)))	// false = directory does not need to exists
 		{
 			return false;
 		}
@@ -380,7 +406,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function rmdir ( $path, $options )
 	{
-		if (!($url = self::resolve_url($path)))
+		if (!($url = self::resolve_url_symlinks($path)))
 		{
 			return false;
 		}
@@ -396,16 +422,17 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 * @param array $params first param has to be the path, otherwise we can not determine the correct wrapper
 	 * @param boolean $fail_silent=false should only false be returned if function is not supported by the backend,
 	 * 	or should an E_USER_WARNING error be triggered (default)
+	 * @param int $path_param_key=0 key in params containing the path, default 0
 	 * @return mixed return value of backend or false if function does not exist on backend
 	 */
-	static protected function _call_on_backend($name,$params,$fail_silent=false)
+	static protected function _call_on_backend($name,$params,$fail_silent=false,$path_param_key=0)
 	{
-		$pathes = $params[0];
+		$pathes = $params[$path_param_key];
 
 		$scheme2urls = array();
 		foreach(is_array($pathes) ? $pathes : array($pathes) as $path)
 		{
-			if (!($url = self::resolve_url($path)))
+			if (!($url = self::resolve_url_symlinks($path,false,false)))
 			{
 				return false;
 			}
@@ -423,11 +450,11 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				}
 				if (!is_array($pathes))
 				{
-					$params[0] = $url;
+					$params[$path_param_key] = $url;
 
 					return call_user_func_array(array($scheme.'_stream_wrapper',$name),$params);
 				}
-				$params[0] = $urls;
+				$params[$path_param_key] = $urls;
 				if (!is_array($r = call_user_func_array(array($scheme.'_stream_wrapper',$name),$params)))
 				{
 					return $r;
@@ -445,29 +472,6 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			}
 		}
 		return $ret;
-
-		// old, non array aware code
-		if (!($url = self::resolve_url($params[0])))
-		{
-			return false;
-		}
-		if (($scheme = parse_url($url,PHP_URL_SCHEME)))
-		{
-			if (!class_exists($class = $scheme.'_stream_wrapper') || !method_exists($class,$name))
-			{
-				if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
-				return false;
-			}
-			$params[0] = $url;
-
-			return call_user_func_array(array($scheme.'_stream_wrapper',$name),$params);
-		}
-		// call the filesystem specific function
-		if (!function_exists($name))
-		{
-			return false;
-		}
-		return $name($url,$time);
 	}
 
 	/**
@@ -525,6 +529,33 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		return self::_call_on_backend('chgrp',array($path,$group));
 	}
 
+	/**
+	 * Returns the target of a symbolic link
+	 *
+	 * This is not (yet) a stream-wrapper function, but it's necessary and can be used static
+	 *
+	 * @param string $path
+	 * @return string|boolean link-data or false if no link
+	 */
+	static function readlink($path)
+	{
+		return self::_call_on_backend('readlink',array($path));
+	}
+
+	/**
+	 * Creates a symbolic link
+	 *
+	 * This is not (yet) a stream-wrapper function, but it's necessary and can be used static
+	 *
+	 * @param string $target target of the link
+	 * @param string $link path of the link to create
+	 * @return boolean true on success, false on error
+	 */
+	static function symlink($target,$link)
+	{
+		return self::_call_on_backend('symlink',array($target,$link),false,1);	// 1=path is in $link!
+	}
+
 	/**
 	 * This is not (yet) a stream-wrapper function, but it's necessary and can be used static
 	 *
@@ -539,7 +570,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function mime_content_type($path)
 	{
-		if (!($url = self::resolve_url($path)))
+		if (!($url = self::resolve_url_symlinks($path)))
 		{
 			return false;
 		}
@@ -591,10 +622,11 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		$this->opened_dir = $this->extra_dirs = null;
 		$this->extra_dir_ptr = 0;
 
-		if (!($this->opened_dir_url = self::resolve_url($path)))
+		if (!($this->opened_dir_url = self::resolve_url_symlinks($path)))
 		{
 			return false;
 		}
+
 		if (!($this->opened_dir = opendir($this->opened_dir_url)))
 		{
 			//error_log(__METHOD__." dir failed: ".$this->opened_dir);
@@ -641,9 +673,11 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 * - STREAM_URL_STAT_QUIET	If this flag is set, your wrapper should not raise any errors. If this flag is not set,
 	 *                          you are responsible for reporting errors using the trigger_error() function during stating of the path.
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
+	 * @param boolean $try_create_home=true should a user home-directory be created automatic, if it does not exist
+	 * @param boolean $check_symlink_components=true check if path contains symlinks in path components other then the last one
 	 * @return array
 	 */
-	static function url_stat ( $path, $flags )
+	static function url_stat ( $path, $flags, $try_create_home=true, $check_symlink_components=true )
 	{
 		//error_log(__METHOD__."('$path',$flags)");
 
@@ -652,8 +686,30 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			return false;
 		}
 		//error_log(__METHOD__."('$path',$flags) calling stat($url)");
-		$stat = @stat($url);	// suppressed the stat failed warnings
+		if ($flags & STREAM_URL_STAT_LINK)
+		{
+			$stat = @lstat($url);	// suppressed the stat failed warnings
+		}
+		else
+		{
+			$stat = @stat($url);	// suppressed the stat failed warnings
 
+			if ($stat && ($stat['mode'] & self::MODE_LINK) &&  ($l=$lpath = self::readlink($url)))
+			{
+				if ($lpath[0] != '/')	// contact releative path
+				{
+					$url = egw_vfs::concat($url,'../'.$lpath);
+				}
+				else	// or replace absolute path in url
+				{
+					$url_parts = parse_url($url);
+					$url_parts['path'] = $lpath;
+					$url = egw_vfs::build_url($url_parts);
+				}
+				//error_log(__METHOD__."($path,$flags) symlink found and resolved to $url");
+				$stat = @stat($url);
+			}
+		}
 		// check if a failed url_stat was for a home dir, in that case silently create it
 		if (!$stat && dirname(parse_url($path,PHP_URL_PATH)) == '/home' && ($id = $GLOBALS['egw']->accounts->name2id(basename($path))))
 		{
@@ -664,7 +720,15 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				'account_name' => basename($path),
 			);
 			call_user_func(array('vfs_home_hooks',$hook_data['location']),$hook_data);
-			$stat = @stat($url);
+			$stat = self::url_stat($path,$flags,false);
+		}
+		if (!$stat && $check_symlink_components)	// check if there's a symlink somewhere inbetween the path
+		{
+			$stat = self::check_symlink_components($path,$flags,$urlx=$url);
+		}
+		elseif(is_array($stat) && !isset($stat['url']))
+		{
+			$stat['url'] = $url;
 		}
 		return $stat;
 
@@ -678,6 +742,52 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		return $stat;
 	}
 
+	/**
+	 * Check if path (which fails the stat call) contains symlinks in path-components other then the last one
+	 *
+	 * @param string $path
+	 * @param int $flags=0 see url_stat
+	 * @param string &$url=null already resolved path
+	 * @return array|boolean stat array or false if not found
+	 */
+	static private function check_symlink_components($path,$flags=0,&$url=null)
+	{
+		if (is_null($url) && !($url = self::resolve_url($path)))
+		{
+			return false;
+		}
+		//echo "<p>".__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1)."</p>\n";
+		while (($rel_path = egw_vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
+		       ($url = egw_vfs::dirname($url)))
+		{
+			$stat = self::url_stat($url,0,false,false);
+			//echo "<p>rel_path='$rel_path', stat(url='$url')=".array2string($stat)."</p>\n";
+			if (($stat = self::url_stat($url,0,false,false)))
+			{
+				if (is_link($url) && ($lpath = self::readlink($url)))
+				{
+					//echo "<p>rel_path='$rel_path', url='$url': lpath='$lpath'\n";
+					if ($lpath[0] != '/')
+					{
+						$url = egw_vfs::concat($url,'../'.$lpath);
+					}
+					else
+					{
+						$url_parts = parse_url($url);
+						$url_parts['path'] = $lpath;
+						$url = egw_vfs::build_url($url_parts);
+					}
+					$url = egw_vfs::concat($url,$rel_path);
+					//echo "--> <b>url='$url'</b></p>\n";
+					return self::url_stat($url,$flags);
+				}
+				$url = egw_vfs::concat($url,$rel_path);
+				return null;
+			}
+		}
+		return false;	// $path does not exist
+	}
+
 	/**
 	 * This method is called in response to readdir().
 	 *

From f5015cf6e870bc086b341103a0df1bfd3946c4b5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 20 Mar 2009 07:55:22 +0000
Subject: [PATCH 091/510] "fixed wrong class-name for $this->so"

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

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 165fc8de36..8022bf0b29 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -140,7 +140,7 @@ class calendar_bo
 	/**
 	 * Instance of the socal class
 	 *
-	 * @var socal
+	 * @var calendar_so
 	 */
 	var $so;
 	/**

From b587bab7d1ec377c498a4955945bb24b7d78ab1a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 20 Mar 2009 08:17:54 +0000
Subject: [PATCH 092/510] "other docu update and removed an unnecessary
 (doublicate) condition"

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

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 2231733fdb..cf1c578c84 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -100,7 +100,7 @@ class calendar_boupdate extends calendar_bo
 			// if no owner given, set user to owner
 			if (!$event['owner']) $event['owner'] = $this->user;
 			// set owner as participant if none is given
-			if (!$event['id'] && (!is_array($event['participants']) || !count($event['participants'])))
+			if (!is_array($event['participants']) || !count($event['participants']))
 			{
 				$event['participants'][$event['owner']] = 'U';
 			}
@@ -285,7 +285,7 @@ class calendar_boupdate extends calendar_bo
 	}
 
 	/**
-	 * Check for added, modified or deleted participants
+	 * Check for added, modified or deleted participants AND notify them
 	 *
 	 * @param array $new_event the updated event
 	 * @param array $old_event the event before the update

From 18372ab45e7999b22560198031ecfbe3c4044a9d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 20 Mar 2009 08:57:17 +0000
Subject: [PATCH 093/510] "fixed not working multiget report (caused by .ics
 extension of calendar ressources)"

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

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index d30dad8b88..9c303faad4 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -244,7 +244,7 @@ class calendar_groupdav extends groupdav_handler
 					if ($option['name'] == 'href')
 					{
 						$parts = explode('/',$option['data']);
-						if (is_numeric($id = array_pop($parts))) $ids[] = $id;
+						if (is_numeric($id = basename(array_pop($parts),'.ics'))) $ids[] = $id;
 					}
 				}
 			}

From 019dd988c84cc9697733171a099151aa967f9c2f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 20 Mar 2009 09:02:41 +0000
Subject: [PATCH 094/510] fixed TranslationTools problem in trunk, caused by
 old copy of solangfile in etemplate. --> moved that now completely to
 etemplate (Also updated the docu of TT a bit)

---
 etemplate/inc/class.solangfile.inc.php | 690 +++++++++++++------------
 1 file changed, 348 insertions(+), 342 deletions(-)

diff --git a/etemplate/inc/class.solangfile.inc.php b/etemplate/inc/class.solangfile.inc.php
index 3c30cf638c..4ba5583f0d 100644
--- a/etemplate/inc/class.solangfile.inc.php
+++ b/etemplate/inc/class.solangfile.inc.php
@@ -1,404 +1,410 @@
 <?php
+/**
+ * eGroupWare - TranslationTools
+ *
+ * @link http://www.egroupware.org
+ * @author Miles Lott <milos(at)groupwhere.org>
+ * @author Ralf Becker <RalfBecker(at)outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package translationtools
+ * @version $Id$
+ */
+
+class solangfile
+{
+	var $total;
+	var $debug = False;
+
+	var $langarray;   // Currently loaded translations
+	// array of missing phrases.
+	var $missingarray;
+	var $src_file;
+	var $tgt_file;
+	var $loaded_apps = array(); // Loaded app langs
+
+	var $functions = array(		// functions containing phrases to translate and param#
+		'lang'                => array(1),
+		'create_input_box'    => array(1,3),
+		'create_check_box'    => array(1,3),
+		'create_select_box'   => array(1,4),
+		'create_text_area'    => array(1,5),
+		'create_notify'       => array(1,5),
+		'create_password_box' => array(1,3)
+	);
+	var $files = array(
+		'config.tpl' => 'config',
+		'hook_admin.inc.php' => 'file_admin',
+		'hook_preferences.inc.php' => 'file_preferences',
+		'hook_settings.inc.php' => 'file',
+		'hook_sidebox_menu.inc.php' => 'file',
+		'hook_acl_manager.inc.php' => 'acl_manager'
+	);
 	/**
-	 * eGroupWare - Translation Editor
+	 * Reference to global db-object
 	 *
-	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	 * @package etemplate
-	 * @link http://www.egroupware.org
-	 * @author Ralf Becker <RalfBecker@outdoor-training.de>
-	 * @version $Id$
+	 * @var egw_db
 	 */
+	var $db;
 
-	class solangfile
+	function __construct()
 	{
-		var $total;
-		var $debug = False;
+		$this->db = $GLOBALS['egw']->db;
+	}
 
-		var $langarray;   // Currently loaded translations
-		// array of missing phrases.
-		var $missingarray;
-		var $src_file;
-		var $tgt_file;
-		var $loaded_apps = array(); // Loaded app langs
-		
-		var $functions = array(		// functions containing phrases to translate and param#
-			'lang'                => array(1),
-			'create_input_box'    => array(1,3),
-			'create_check_box'    => array(1,3),
-			'create_select_box'   => array(1,4),
-			'create_text_area'    => array(1,5),
-			'create_notify'       => array(1,5),
-			'create_password_box' => array(1,3)
-		);
-		var $files = array(
-			'config.tpl' => 'config',
-			'hook_admin.inc.php' => 'file_admin',
-			'hook_preferences.inc.php' => 'file_preferences',
-			'hook_settings.inc.php' => 'file',
-			'hook_sidebox_menu.inc.php' => 'file',
-			'hook_acl_manager.inc.php' => 'acl_manager'
-		);
-
-		var $public_functions = array(
-			'index' => True
-		);
-
-		function solangfile()
+	function fetch_keys($app,$arr)
+	{
+		if (!is_array($arr))
 		{
-			$this->db = $GLOBALS['egw']->db;
+			return;
 		}
-
-		function fetch_keys($app,$arr)
+		foreach($arr as $key => $val)
 		{
-			if (!is_array($arr))
+			$this->plist[$key] = $app;
+		}
+	}
+
+	function config_file($app,$fname)
+	{
+		//echo "<p>solangfile::config_file(app='$app',fname='$fname')</p>\n";
+		$lines = file($fname);
+
+		if ($app != 'setup')
+		{
+			$app = 'admin';
+		}
+		foreach($lines as $n => $line)
+		{
+			while (ereg('\{lang_([^}]+)\}(.*)',$line,$found))
 			{
+				$lang = str_replace('_',' ',$found[1]);
+				$this->plist[$lang] = $app;
+
+				$line = $found[2];
+			}
+		}
+	}
+
+	function special_file($app,$fname,$langs_in)
+	{
+		//echo "<p>solangfile::special_file(app='$app',fname='$fname',langs_in='$langs_in')</p>\n";
+		switch ($langs_in)
+		{
+		 	case 'config':
+				$this->config_file($app,$fname);
 				return;
-			}
-			foreach($arr as $key => $val)
-			{
-				$this->plist[$key] = $app;
-			}
+			case 'file_admin':
+			case 'file_preferences':
+				$app = substr($langs_in,5);
+				break;
+			case 'phpgwapi':
+				$app = 'common';
+				break;
 		}
+		$GLOBALS['file'] = $GLOBALS['settings'] = array();
+		unset($GLOBALS['acl_manager']);
 
-		function config_file($app,$fname)
+		ob_start();		// suppress all output
+		include($fname);
+		ob_end_clean();
+
+		if (isset($GLOBALS['acl_manager']))	// hook_acl_manager
 		{
-			//echo "<p>solangfile::config_file(app='$app',fname='$fname')</p>\n";
-			$lines = file($fname);
-
-			if ($app != 'setup')
+			foreach($GLOBALS['acl_manager'] as $app => $data)
 			{
-				$app = 'admin';
-			}
-			foreach($lines as $n => $line)
-			{
-				while (ereg('\{lang_([^}]+)\}(.*)',$line,$found))
+				foreach ($data as $item => $arr)
 				{
-					$lang = str_replace('_',' ',$found[1]);
-					$this->plist[$lang] = $app;
-
-					$line = $found[2];
-				}
-			}
-		}
-
-		function special_file($app,$fname,$langs_in)
-		{
-			//echo "<p>solangfile::special_file(app='$app',fname='$fname',langs_in='$langs_in')</p>\n";
-			switch ($langs_in)
-			{
-			 	case 'config':
-					$this->config_file($app,$fname);
-					return;
-				case 'file_admin':
-				case 'file_preferences':
-					$app = substr($langs_in,5);
-					break;
-				case 'phpgwapi':
-					$app = 'common';
-					break;
-			}
-			$GLOBALS['file'] = $GLOBALS['settings'] = array();
-			unset($GLOBALS['acl_manager']);
-
-			ob_start();		// suppress all output
-			include($fname);
-			ob_end_clean();
-
-			if (isset($GLOBALS['acl_manager']))	// hook_acl_manager
-			{
-				foreach($GLOBALS['acl_manager'] as $app => $data)
-				{
-					foreach ($data as $item => $arr)
+					foreach ($arr as $key => $val)
 					{
-						foreach ($arr as $key => $val)
+						switch ($key)
 						{
-							switch ($key)
-							{
-								case 'name':
-									$this->plist[$val] = $app;
-									break;
-								case 'rights':
-									foreach($val as $lang => $right)
-									{
-										$this->plist[$lang] = $app;
-									}
-									break;
-							}
+							case 'name':
+								$this->plist[$val] = $app;
+								break;
+							case 'rights':
+								foreach($val as $lang => $right)
+								{
+									$this->plist[$lang] = $app;
+								}
+								break;
 						}
 					}
 				}
 			}
-			if (count($GLOBALS['file']))	// hook_{admin|preferences|sidebox_menu}
+		}
+		if (count($GLOBALS['file']))	// hook_{admin|preferences|sidebox_menu}
+		{
+			foreach ($GLOBALS['file'] as $lang => $link)
 			{
-				foreach ($GLOBALS['file'] as $lang => $link)
+				$this->plist[$lang] = $app;
+			}
+		}
+		foreach($GLOBALS['settings'] as $data)
+		{
+			foreach(array('label','help') as $key)
+			{
+				if (isset($data[$key]) && !empty($data[$key]))
 				{
-					$this->plist[$lang] = $app;
+					$this->plist[$data[$key]] = $app;
 				}
 			}
-			foreach($GLOBALS['settings'] as $data)
+		}
+	}
+
+	function parse_php_app($app,$fd)
+	{
+		$reg_expr = '('.implode('|',array_keys($this->functions)).")[ \t]*\([ \t]*(.*)$";
+		define('SEP',filesystem_separator());
+		$d=dir($fd);
+		while ($fn=$d->read())
+		{
+			if (@is_dir($fd.$fn.SEP))
 			{
-				foreach(array('label','help') as $key)
+				if (($fn!='.')&&($fn!='..')&&($fn!='CVS') && $fn != '.svn')
 				{
-					if (isset($data[$key]) && !empty($data[$key]))
+					$this->parse_php_app($app,$fd.$fn.SEP);
+				}
+			}
+			elseif (is_readable($fd.$fn))
+			{
+				if (isset($this->files[$fn]))
+				{
+					$this->special_file($app,$fd.$fn,$this->files[$fn]);
+				}
+				if (strpos($fn,'.php') === False)
+				{
+					continue;
+				}
+				$lines = file($fd.$fn);
+
+				foreach($lines as $n => $line)
+				{
+					//echo "line='$line', lines[1+$n]='".$lines[1+$n]."'<br>\n";
+					while (eregi($reg_expr,$line,$parts))
 					{
-						$this->plist[$data[$key]] = $app;
+						//echo "***func='$parts[1]', rest='$parts[2]'<br>\n";
+						$args = $this->functions[$parts[1]];
+						$rest = $parts[2];
+						for($i = 1; $i <= $args[0]; ++$i)
+						{
+							$next = 1;
+							if (!$rest || empty($del) || strpos($rest,$del,1) === False)
+							{
+								$rest .= trim($lines[++$n]);
+							}
+							$del = $rest[0];
+							if ($del == '"' || $del == "'")
+							{
+								//echo "rest='$rest'<br>\n";
+								while (($next = strpos($rest,$del,$next)) !== False && $rest[$next-1] == '\\')
+								{
+									$rest = substr($rest,0,$next-1).substr($rest,$next);
+								}
+								if ($next === False)
+								{
+									break;
+								}
+								$phrase = str_replace('\\\\','\\',substr($rest,1,$next-1));
+								//echo "next2=$next, phrase='$phrase'<br>\n";
+								if ($args[0] == $i)
+								{
+									//if (!isset($this->plist[$phrase])) echo ">>>$phrase<<<<br>\n";
+									$this->plist[$phrase] = $app;
+									array_shift($args);
+									if (!count($args))
+									{
+										break;	// no more args needed
+									}
+								}
+								$rest = substr($rest,$next+1);
+							}
+							if(!ereg("[ \t\n]*,[ \t\n]*(.*)$",$rest,$parts))
+							{
+								break;	// nothing found
+							}
+							$rest = $parts[1];
+						}
+						$line = $rest;
 					}
 				}
 			}
 		}
+		$d->close();
+	}
 
-		function parse_php_app($app,$fd)
+	function missing_app($app,$userlang=en)
+	{
+		$cur_lang=$this->load_app($app,$userlang);
+		define('SEP',filesystem_separator());
+		$fd = EGW_SERVER_ROOT . SEP . $app . SEP;
+		$this->plist = array();
+		$this->parse_php_app($app == 'phpgwapi' ? 'common' : $app,$fd);
+
+		reset($this->plist);
+		return($this->plist);
+	}
+
+	/**
+	 * loads all app phrases into langarray
+	 *
+	 * @param $lang user lang variable (defaults to en)
+	 */
+	function load_app($app,$userlang='en',$target=True)
+	{
+		define('SEP',filesystem_separator());
+
+		$langarray = array();
+		$fd = EGW_SERVER_ROOT . SEP . $app . SEP . ($app == 'setup' ? 'lang' : 'setup');
+		$fn = $fd . SEP . EGW_LANGFILE_PREFIX . $userlang . '.lang';
+
+		if (@is_writeable($fn) || is_writeable($fd))
 		{
-			$reg_expr = '('.implode('|',array_keys($this->functions)).")[ \t]*\([ \t]*(.*)$";
-			define('SEP',filesystem_separator());
-			$d=dir($fd);
-			while ($fn=$d->read())
+			$wr = True;
+		}
+		if (!$target) $this->src_apps = array();
+
+		$from = $GLOBALS['egw']->translation->charset($userlang);
+		$to = $GLOBALS['egw']->translation->charset();
+		//echo "<p>solangfile::load_app('$app','$userlang') converting from charset('$userlang')='$from' to '$to'</p>\n";
+
+		if (file_exists($fn))
+		{
+			if ($fp = @fopen($fn,'rb'))
 			{
-				if (@is_dir($fd.$fn.SEP))
-				{
-					if (($fn!='.')&&($fn!='..')&&($fn!='CVS'))
-					{
-						$this->parse_php_app($app,$fd.$fn.SEP);
-					}
-				}
-				elseif (is_readable($fd.$fn))
-				{
-					if (isset($this->files[$fn]))
-					{
-						$this->special_file($app,$fd.$fn,$this->files[$fn]);
-					}
-					if (strpos($fn,'.php') === False)
+				 while ($data = fgets($fp,8000))
+				 {
+					list($message_id,$app_name,,$content) = explode("\t",$data);
+					if(!$message_id)
 					{
 						continue;
 					}
-					$lines = file($fd.$fn);
-
-					foreach($lines as $n => $line)
+					if (empty($app_name))
 					{
-						//echo "line='$line', lines[1+$n]='".$lines[1+$n]."'<br>\n";
-						while (eregi($reg_expr,$line,$parts))
-						{
-							//echo "***func='$parts[1]', rest='$parts[2]'<br>\n";
-							$args = $this->functions[$parts[1]];
-							$rest = $parts[2];
-							for($i = 1; $i <= $args[0]; ++$i)
-							{
-								$next = 1;
-								if (!$rest || empty($del) || strpos($rest,$del,1) === False)
-								{
-									$rest .= trim($lines[++$n]);
-								}
-								$del = $rest[0];
-								if ($del == '"' || $del == "'")
-								{
-									//echo "rest='$rest'<br>\n";
-									while (($next = strpos($rest,$del,$next)) !== False && $rest[$next-1] == '\\')
-									{
-										$rest = substr($rest,0,$next-1).substr($rest,$next);
-									}
-									if ($next === False)
-									{
-										break;
-									}
-									$phrase = str_replace('\\\\','\\',substr($rest,1,$next-1));
-									//echo "next2=$next, phrase='$phrase'<br>\n";
-									if ($args[0] == $i)
-									{
-										//if (!isset($this->plist[$phrase])) echo ">>>$phrase<<<<br>\n";
-										$this->plist[$phrase] = $app;
-										array_shift($args);
-										if (!count($args))
-										{
-											break;	// no more args needed
-										}
-									}
-									$rest = substr($rest,$next+1);
-								}
-								if(!ereg("[ \t\n]*,[ \t\n]*(.*)$",$rest,$parts))
-								{
-									break;	// nothing found
-								}
-								$rest = $parts[1];
-							}
-							$line = $rest;
-						}
+						$app_name = $app;	// fix missing app_name
 					}
-				}
+					//echo '<br>load_app(): adding phrase: $this->langarray["'.$message_id.'"]=' . trim($content)."' for $app_name";
+					$_mess_id = strtolower(trim($message_id));
+					$langarray[$_mess_id]['message_id'] = $_mess_id;
+					$app_name   = trim($app_name);
+					$langarray[$_mess_id]['app_name']   = $app_name;
+					if (!$target)
+					{
+						$this->src_apps[$app_name] = $app_name;
+					}
+					$langarray[$_mess_id]['content']    =
+						$GLOBALS['egw']->translation->convert(trim($content),$from,$to);
+				 }
+				 fclose($fp);
 			}
-			$d->close();
 		}
-
-		function missing_app($app,$userlang=en)
+		else
 		{
-			$cur_lang=$this->load_app($app,$userlang);
-			define('SEP',filesystem_separator());
-			$fd = EGW_SERVER_ROOT . SEP . $app . SEP;
-			$this->plist = array();
-			$this->parse_php_app($app == 'phpgwapi' ? 'common' : $app,$fd);
-
-			reset($this->plist);
-			return($this->plist);
+			$fn = lang('no file');
 		}
-
-		/**
-		 * loads all app phrases into langarray
-		 *
-		 * @param $lang user lang variable (defaults to en)
-		 */
-		function load_app($app,$userlang='en',$target=True)
+		if ($target)
 		{
-			define('SEP',filesystem_separator());
-
-			$langarray = array();
-			$fd = EGW_SERVER_ROOT . SEP . $app . SEP . ($app == 'setup' ? 'lang' : 'setup');
-			$fn = $fd . SEP . 'phpgw_' . $userlang . '.lang';
-			if (@is_writeable($fn) || is_writeable($fd))
-			{
-				$wr = True;
-			}
-			if (!$target) $this->src_apps = array();
-
-			$from = $GLOBALS['egw']->translation->charset($userlang);
-			$to = $GLOBALS['egw']->translation->charset();
-			//echo "<p>solangfile::load_app('$app','$userlang') converting from charset('$userlang')='$from' to '$to'</p>\n";
-
-			if (file_exists($fn))
-			{
-				if ($fp = @fopen($fn,'rb'))
-				{
-					 while ($data = fgets($fp,8000))
-					 {
-						list($message_id,$app_name,,$content) = explode("\t",$data);
-						if(!$message_id)
-						{
-							continue;
-						}
-						if (empty($app_name))
-						{
-							$app_name = $app;	// fix missing app_name
-						}
-						//echo '<br>load_app(): adding phrase: $this->langarray["'.$message_id.'"]=' . trim($content)."' for $app_name";
-						$_mess_id = strtolower(trim($message_id));
-						$langarray[$_mess_id]['message_id'] = $_mess_id;
-						$app_name   = trim($app_name);
-						$langarray[$_mess_id]['app_name']   = $app_name;
-						if (!$target)
-						{
-							$this->src_apps[$app_name] = $app_name;
-						}
-						$langarray[$_mess_id]['content']    =
-							$GLOBALS['egw']->translation->convert(trim($content),$from,$to);
-					 }
-					 fclose($fp);
-				}
-			}
-			else
-			{
-				$fn = lang('no file');
-			}
-			if ($target)
-			{
-				$this->tgt_file = $fn;
-			}
-			else
-			{
-				$this->src_file = $fn;
-			}
-			// stuff class array listing apps that are included already
-			$this->loaded_apps[$userlang]['filename']  = $fn;
-			$this->loaded_apps[$userlang]['writeable'] = $wr;
-
-			if (!$target) ksort($this->src_apps);
-
-			if($this->debug) { _debug_array($langarray); }
-			@ksort($langarray);
-			return $langarray;
+			$this->tgt_file = $fn;
 		}
-
-		function write_file($app_name,$langarray,$userlang,$which='target')
+		else
 		{
-			$to = $GLOBALS['egw']->translation->charset($userlang);
-			$from = $GLOBALS['egw']->translation->charset();
-			//echo "<p>solangfile::write_file('$app_name',,'$userlang') converting from '$from' to charset('$userlang')='$to'</p>\n";
-
-			$fn = EGW_SERVER_ROOT . SEP . $app_name . SEP . ($app_name == 'setup' ? 'lang' : 'setup') . SEP . 'phpgw_' . $userlang . '.lang';
-			if (file_exists($fn))
-			{
-				$backup = $fn . '.old';
-				@unlink($backup);
-				@rename($fn,$backup);
-			}
-			$fp = fopen($fn,'wb');
-			while(list($mess_id,$data) = @each($langarray))
-			{
-				$data['content'] = $GLOBALS['egw']->translation->convert(trim($data['content']),$from,$to);
-
-				// dont write empty content
-				if (!empty($data['content']))
-				{
-					fwrite($fp,$mess_id . "\t" . $data['app_name'] . "\t" . $userlang . "\t" . $data['content'] . "\n");
-				}
-			}
-			fclose($fp);
-
-			if ($which == 'source')
-			{
-				$this->src_file = $fn;
-			}
-			else
-			{
-				$this->tgt_file = $fn;
-			}
-			return $fn;
+			$this->src_file = $fn;
 		}
+		// stuff class array listing apps that are included already
+		$this->loaded_apps[$userlang]['filename']  = $fn;
+		$this->loaded_apps[$userlang]['writeable'] = $wr;
 
-		function loaddb($app_name,$userlangs)
-		{
-			if (!is_array($userlangs))
-			{
-				$userlangs = array($userslangs => $userlangs);
-			}
-			$GLOBALS['egw']->translation->install_langs($userlangs,'addmissing',$app_name);
+		if (!$target) ksort($this->src_apps);
 
-			return lang('done');
-		}
+		if($this->debug) { _debug_array($langarray); }
+		@ksort($langarray);
+		return $langarray;
 	}
 
-	/*
-	 * Helper functions for searching new phrases in sidebox, preferences or admin menus
-	 */
-	if (!function_exists('display_sidebox') && $_GET['menuaction'] == 'developer_tools.uilangfile.missingphrase')
+	function write_file($app_name,$langarray,$userlang,$which='target')
 	{
-		function display_sidebox($appname,$menu_title,$file)	// hook_sidebox_menu
-		{
-			if (!is_array($file)) return;
+		$to = $GLOBALS['egw']->translation->charset($userlang);
+		$from = $GLOBALS['egw']->translation->charset();
+		//echo "<p>solangfile::write_file('$app_name',,'$userlang') converting from '$from' to charset('$userlang')='$to'</p>\n";
 
-			unset($file['_NewLine_']);
-			if (is_array($GLOBALS['file']))
+		$fn = EGW_SERVER_ROOT . SEP . $app_name . SEP . ($app_name == 'setup' ? 'lang' : 'setup') . SEP . EGW_LANGFILE_PREFIX . $userlang . '.lang';
+		if (file_exists($fn))
+		{
+			$backup = $fn . '.old';
+			@unlink($backup);
+			@rename($fn,$backup);
+		}
+		$fp = fopen($fn,'wb');
+		while(list($mess_id,$data) = @each($langarray))
+		{
+			$data['content'] = $GLOBALS['egw']->translation->convert(trim($data['content']),$from,$to);
+
+			// dont write empty content
+			if (!empty($data['content']))
 			{
-				$GLOBALS['file'] = $file;
-			}
-			else
-			{
-				$GLOBALS['file'] += $file;
+				fwrite($fp,$mess_id . "\t" . $data['app_name'] . "\t" . $userlang . "\t" . $data['content'] . "\n");
 			}
 		}
-		function display_section($appname,$file,$file2='')		// hook_preferences, hook_admin
-		{
-			if (is_array($file2))
-			{
-				$file = $file2;
-			}
-			if (!is_array($file)) return;
+		fclose($fp);
 
-			if (is_array($GLOBALS['file']))
-			{
-				$GLOBALS['file'] = $file;
-			}
-			else
-			{
-				$GLOBALS['file'] += $file;
-			}
+		if ($which == 'source')
+		{
+			$this->src_file = $fn;
+		}
+		else
+		{
+			$this->tgt_file = $fn;
+		}
+		return $fn;
+	}
+
+	function loaddb($app_name,$userlangs)
+	{
+		if (!is_array($userlangs))
+		{
+			$userlangs = array($userslangs => $userlangs);
+		}
+		$GLOBALS['egw']->translation->install_langs($userlangs,'addmissing',$app_name);
+
+		return lang('done');
+	}
+}
+
+/*
+ * Helper functions for searching new phrases in sidebox, preferences or admin menus
+ */
+if (!function_exists('display_sidebox') && $_GET['menuaction'] == 'developer_tools.uilangfile.missingphrase')
+{
+	function display_sidebox($appname,$menu_title,$file)	// hook_sidebox_menu
+	{
+		if (!is_array($file)) return;
+
+		unset($file['_NewLine_']);
+		if (is_array($GLOBALS['file']))
+		{
+			$GLOBALS['file'] = $file;
+		}
+		else
+		{
+			$GLOBALS['file'] += $file;
 		}
 	}
-?>
+}
+if (!function_exists('display_section') && $_GET['menuaction'] == 'developer_tools.uilangfile.missingphrase')
+{
+	function display_section($appname,$file,$file2='')		// hook_preferences, hook_admin
+	{
+		if (is_array($file2))
+		{
+			$file = $file2;
+		}
+		if (!is_array($file)) return;
+
+		if (is_array($GLOBALS['file']))
+		{
+			$GLOBALS['file'] = $file;
+		}
+		else
+		{
+			$GLOBALS['file'] += $file;
+		}
+	}
+}

From d0913c2dbd17d622e69f0890fccc0ce87a8605fc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 20 Mar 2009 09:03:15 +0000
Subject: [PATCH 095/510] Translations for symlink commit

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

diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index 37ae0b674f..c5a38e6140 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -37,6 +37,7 @@ could not move %1 to %2	filemanager	de	Konnte %1 nicht nach %2 verschieben
 could not move file because no destination directory is given	filemanager	de	Die Datei konnte nicht verschoben werden, da kein Zielverzeichnis angegeben ist.
 could not rename %1 to %2	filemanager	de	Konnte %1 nicht in %2 umbenennen
 could not save %1	filemanager	de	Konnte %1 nicht speichern
+create a link	filemanager	de	Verknüpfung anlegen
 create directory	filemanager	de	Verzeichnis anlegen
 create file	filemanager	de	Datei erstellen
 create folder	filemanager	de	Verzeichnis erstellen
@@ -67,6 +68,7 @@ enter setup user and password to get root rights	filemanager	de	Setup Benutzers
 enter the complete vfs path to specify a fast access link to a folder	filemanager	de	Geben Sie den kompletten VFS Pfad ein, um einen Verweis zu diesem Ordner im Seitenmenu zu erzeugen
 enter the complete vfs path to specify your desired start folder.	filemanager	de	Geben Sie den kompletten VFS Pfad zu Ihrem gewünschten Anfangsverzeichnis ein
 error adding the acl!	filemanager	de	Fehler beim Hinzufügen des Zugriffsrechts!
+error creating symlink to target %1!	filemanager	de	Fehler beim Anlegen einer Verknüpfung zu %1!
 error deleting the acl entry!	filemanager	de	Fehler beim Löschen des Zugriffsrechts!
 error uploading file!	filemanager	de	Fehler beim Hochladen der Datei!
 executable	filemanager	de	Ausführbar
@@ -95,6 +97,7 @@ go up	filemanager	de	in das darüber liegende Verzeichnis wechseln
 id	filemanager	de	Id
 inherited	filemanager	de	Geerbt
 link %1: %2	filemanager	de	%1. Verknüpfung: %2
+link target %1 not found!	filemanager	de	Verküpfungsziel %1 nicht gefunden!
 location	filemanager	de	Ort
 log out as superuser	filemanager	de	Superuser abmelden
 max folderlinks	admin	de	maximale Anzahl von Links zu Verzeichnissen
@@ -146,6 +149,7 @@ show link to filemanagers basedirectory (/) in side box menu?	filemanager	de	Zei
 size	filemanager	de	Größe
 start search	filemanager	de	Suche starten
 superuser	filemanager	de	Superuser
+symlink to %1 created.	filemanager	de	Verknüpfung nach %1 angelegt.
 the default start folder is your personal folder. the default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.	filemanager	de	Die Vorgabe für das Anfangsverzeichnis ist Ihr perönlicher Ordner. Die Vorgabe wird benutzt, wenn Sie hier nichts eintragen, der Pfad nicht existiert oder Ihnen die notwending Zugriffsrechte fehlen.
 the requested path %1 is not available.	filemanager	de	Der angeforderte Verzeichnispfad %1 steht nicht zur Verfügung.
 there's already a directory with that name!	filemanager	de	Es gibt bereits ein Verzeichnis mit diesem Namen!
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index 78e3d3e9ed..280ea7461f 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -37,6 +37,7 @@ could not move %1 to %2	filemanager	en	Could not move %1 to %2
 could not move file because no destination directory is given	filemanager	en	Could not move file because no destination directory is given
 could not rename %1 to %2	filemanager	en	Could not rename %1 to %2
 could not save %1	filemanager	en	Could not save %1
+create a link	filemanager	en	Create a link
 create directory	filemanager	en	Create directory
 create file	filemanager	en	Create File
 create folder	filemanager	en	Create Folder
@@ -67,6 +68,7 @@ enter setup user and password to get root rights	filemanager	en	Enter setup user
 enter the complete vfs path to specify a fast access link to a folder	filemanager	en	Enter the complete VFS path to specify a fast access link to a folder
 enter the complete vfs path to specify your desired start folder.	filemanager	en	Enter the complete VFS path to specify your desired start folder.
 error adding the acl!	filemanager	en	Error adding the ACL!
+error creating symlink to target %1!	filemanager	en	Error creating symlink to target %1!
 error deleting the acl entry!	filemanager	en	Error deleting the ACL entry!
 error uploading file!	filemanager	en	Error uploading file!
 executable	filemanager	en	Executable
@@ -95,6 +97,7 @@ go up	filemanager	en	go up
 id	filemanager	en	Id
 inherited	filemanager	en	Inherited
 link %1: %2	filemanager	en	Link %1: %2
+link target %1 not found!	filemanager	en	Link target %1 not found!
 location	filemanager	en	Location
 log out as superuser	filemanager	en	Log out as superuser
 max folderlinks	admin	en	max folderlinks
@@ -146,6 +149,7 @@ show link to filemanagers basedirectory (/) in side box menu?	filemanager	en	Sho
 size	filemanager	en	Size
 start search	filemanager	en	start search
 superuser	filemanager	en	Superuser
+symlink to %1 created.	filemanager	en	Symlink to %1 created.
 the default start folder is your personal folder. the default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.	filemanager	en	The default start folder is your personal Folder. The default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.
 the requested path %1 is not available.	filemanager	en	The requested path %1 is not available.
 there's already a directory with that name!	filemanager	en	There's already a directory with that name!

From 84e8b857f3a3f19adba818b3cc1aa38812223a3d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 20 Mar 2009 11:56:05 +0000
Subject: [PATCH 096/510] "added missing xajax include, which caused the
 overwrite message to fail, if xajax was not otherwise (eg. notifications)
 loaded"

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

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index a175a7fce1..9a39187f73 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -72,6 +72,8 @@ class filemanager_ui
 	 */
 	function index(array $content=null,$msg=null)
 	{
+		$GLOBALS['egw_info']['flags']['include_xajax'] = true;
+
 		$tpl = new etemplate('filemanager.index');
 
 		if (!is_array($content))

From 302b6ae7e15ee382e604f499b385c723a357d632 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 20 Mar 2009 11:59:18 +0000
Subject: [PATCH 097/510] "fixed not working xajax call, if no handler given
 and PHP runs with error_reporting E_ALL (undefined index ...)"

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

diff --git a/xajax.php b/xajax.php
index 45a33982bc..325eff7b4b 100644
--- a/xajax.php
+++ b/xajax.php
@@ -87,7 +87,7 @@ function doXMLHTTP()
 
 	if (strpos($arg0,'::') !== false && strpos($arg0,'.') === false)	// static method name app_something::method
 	{
-		list($className,$functionName,$handler) = explode('::',$arg0);
+		@list($className,$functionName,$handler) = explode('::',$arg0);
 		list($appName) = explode('_',$className);
 	}
 	else

From 3ef43df5c8d52dad521fb300525417ed39a71ddc Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Fri, 20 Mar 2009 13:34:02 +0000
Subject: [PATCH 098/510] "RB: romoved tab in message phrase, which caused TT
 to choke"

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

diff --git a/timesheet/inc/class.export_timesheet_csv.inc.php b/timesheet/inc/class.export_timesheet_csv.inc.php
index 25022bbb36..e3891ac9d5 100644
--- a/timesheet/inc/class.export_timesheet_csv.inc.php
+++ b/timesheet/inc/class.export_timesheet_csv.inc.php
@@ -65,7 +65,7 @@ class export_timesheet_csv implements iface_export_plugin {
 	 * @return string descriprion
 	 */
 	public static function get_description() {
-		return lang("Exports entries from your Timesheet into a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you	can also choose other seperators.");
+		return lang("Exports entries from your Timesheet into a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
 	/**

From 3818c671cc4edc377fbe6d993f0ef1c2ca73b25e Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Mon, 23 Mar 2009 09:53:03 +0000
Subject: [PATCH 099/510] setting an individual status to multiple timesheet
 via a action method like the Addressbook and the Inlolog status. Sponsored by
 Martin Frimmel

---
 timesheet/inc/class.timesheet_bo.inc.php    |  44 ++-
 timesheet/inc/class.timesheet_hooks.inc.php |  13 +-
 timesheet/inc/class.timesheet_ui.inc.php    | 305 ++++++++++++++++----
 timesheet/setup/egw_de.lang                 |  44 +++
 timesheet/setup/egw_en.lang                 |  39 +++
 timesheet/setup/etemplates.inc.php          |  71 ++++-
 timesheet/setup/setup.inc.php               |   4 +-
 timesheet/setup/tables_current.inc.php      |  71 ++---
 timesheet/setup/tables_update.inc.php       |  15 +-
 timesheet/templates/default/edit.xet        |  14 +-
 timesheet/templates/default/editstatus.xet  |  67 +++++
 timesheet/templates/default/index.xet       |  44 ++-
 12 files changed, 606 insertions(+), 125 deletions(-)
 create mode 100644 timesheet/templates/default/editstatus.xet

diff --git a/timesheet/inc/class.timesheet_bo.inc.php b/timesheet/inc/class.timesheet_bo.inc.php
index f007cb7229..b8d25f2162 100644
--- a/timesheet/inc/class.timesheet_bo.inc.php
+++ b/timesheet/inc/class.timesheet_bo.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package timesheet
- * @copyright (c) 2005-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -99,8 +99,18 @@ class timesheet_bo extends so_sql
 	 * @var array
 	 */
 	var $show_sums;
-
+	/**
+	 * Array with custom fileds
+	 *
+	 * @var array
+	 */
 	var $customfields=array();
+	/**
+	 * Array with status label
+	 *
+	 * @var array
+	 */
+	var $status_labels = array();
 
 	/**
 	 * Name of the timesheet table storing custom fields
@@ -114,6 +124,7 @@ class timesheet_bo extends so_sql
 		$this->config_data = config::read(TIMESHEET_APP);
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
 		$this->customfields = config::get_customfields(TIMESHEET_APP);
+		if($this->config_data['status_labels']) $this->status_labels =&  $this->config_data['status_labels'];
 
 		$this->tz_offset_s = $GLOBALS['egw']->datetime->tz_offset;
 		$this->now = time() + $this->tz_offset_s;	// time() is server-time and we need a user-time
@@ -488,6 +499,35 @@ class timesheet_bo extends so_sql
 		return $ret;
 	}
 
+
+	/**
+	 * set a status for timesheet entry identified by $keys
+	 *
+	 * @param array $keys if given array with col => value pairs to characterise the rows to delete
+	 * @param boolean $status
+	 * @return int affected rows, should be 1 if ok, 0 if an error
+	 */
+	function set_status($keys=null,$status)
+	{
+		$ret = true;
+		if (!is_array($keys) && (int) $keys)
+		{
+			$keys = array('ts_id' => (int) $keys);
+		}
+		$ts_id = is_null($keys) ? $this->data['ts_id'] : $keys['ts_id'];
+
+		if (!$this->check_acl(EGW_ACL_EDIT,$ts_id))
+		{
+			return false;
+		}
+
+		$this->read($keys,true,false);
+		$this->data['ts_status'] = $status;
+		if ($this->save($ts_id)!=0) $ret = false;
+
+		return $ret;
+	}
+
 	/**
 	 * changes the data from the db-format to your work-format
 	 *
diff --git a/timesheet/inc/class.timesheet_hooks.inc.php b/timesheet/inc/class.timesheet_hooks.inc.php
index 6a882d9e0d..867352e1bb 100644
--- a/timesheet/inc/class.timesheet_hooks.inc.php
+++ b/timesheet/inc/class.timesheet_hooks.inc.php
@@ -97,9 +97,9 @@ class timesheet_hooks
 		if ($GLOBALS['egw_info']['user']['apps']['preferences'] && $location != 'admin')
 		{
 			$file = array(
-//				'Preferences'     => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname='.$appname),
-				'Grant Access'    => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
-				'Edit Categories' => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True')
+//				'Preferences'     => egw::link('/index.php','menuaction=preferences.uisettings.index&appname='.$appname),
+				'Grant Access'    => egw::link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
+				'Edit Categories' => egw::link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True')
 			);
 			if ($location == 'preferences')
 			{
@@ -114,12 +114,13 @@ class timesheet_hooks
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && $location != 'preferences')
 		{
 			$file = Array(
-				'Site Configuration' => $GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
-				'Custom fields' => $GLOBALS['egw']->link('/index.php','menuaction=admin.customfields.edit&appname='.$appname),
-				'Global Categories'  => $GLOBALS['egw']->link('/index.php',array(
+				'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+				'Custom fields' => egw::link('/index.php','menuaction=admin.customfields.edit&appname='.$appname),
+				'Global Categories'  => egw::link('/index.php',array(
 					'menuaction' => 'admin.uicategories.index',
 					'appname'    => $appname,
 					'global_cats'=> True)),
+				'Edit Status' => egw::link('/index.php','menuaction=timesheet.timesheet_ui.editstatus'),
 			);
 			if ($location == 'admin')
 			{
diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 15e8566f75..81969bdf85 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -16,9 +16,10 @@
 class timesheet_ui extends timesheet_bo
 {
 	var $public_functions = array(
-		'view' => true,
-		'edit' => true,
-		'index' => true,
+	'view' => true,
+	'edit' => true,
+	'index' => true,
+	'editstatus' => true,
 	);
 	/**
 	 * ProjectManager integration: 'none', 'full' or default null
@@ -78,14 +79,14 @@ class timesheet_ui extends timesheet_bo
 			else	// new entry
 			{
 				$this->data = array(
-					'ts_start' => $this->today,
-					'end_time' => $this->now - $this->today,
-					'ts_owner' => $GLOBALS['egw_info']['user']['account_id'],
-					'cat_id'   => (int) $_REQUEST['cat_id'],
+				'ts_start' => $this->today,
+				'end_time' => $this->now - $this->today,
+				'ts_owner' => $GLOBALS['egw_info']['user']['account_id'],
+				'cat_id'   => (int) $_REQUEST['cat_id'],
 				);
 			}
 			$referer = preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] :
-				(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
+			(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
 		}
 		else
 		{
@@ -144,7 +145,7 @@ class timesheet_ui extends timesheet_bo
 					if (!$this->data['ts_title'])
 					{
 						$this->data['ts_title'] = $this->data['ts_title_blur'] ?
-							$this->data['ts_title_blur'] : $this->data['ts_project_blur'];
+						$this->data['ts_title_blur'] : $this->data['ts_project_blur'];
 
 						if (!$this->data['ts_title'])
 						{
@@ -180,8 +181,8 @@ class timesheet_ui extends timesheet_bo
 						}
 					}
 					$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php',array(
-						'menuaction' => $referer,
-						'msg'        => $msg,
+					'menuaction' => $referer,
+					'msg'        => $msg,
 					))."';";
 					if ($button == 'apply') break;
 					if ($button == 'save_new')
@@ -230,22 +231,22 @@ class timesheet_ui extends timesheet_bo
 			}
 		}
 		$preserv = $this->data + array(
-			'view'    => $view,
-			'referer' => $referer,
-			'ts_title_blur' => $content['ts_title_blur'],
+		'view'    => $view,
+		'referer' => $referer,
+		'ts_title_blur' => $content['ts_title_blur'],
 		);
 		$content = array_merge($this->data,array(
-			'msg'  => $msg,
-			'view' => $view,
-			$tabs  => $content[$tabs],
-			'link_to' => array(
-				'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : $content['link_to']['to_id'],
-				'to_app' => TIMESHEET_APP,
-			),
-			'js' => "<script>\n$js\n</script>\n",
-			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
-			'start_time' => $this->datetime2time($this->data['ts_start']),
-			'pm_integration' => $this->pm_integration,
+		'msg'  => $msg,
+		'view' => $view,
+		$tabs  => $content[$tabs],
+		'link_to' => array(
+		'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : $content['link_to']['to_id'],
+		'to_app' => TIMESHEET_APP,
+		),
+		'js' => "<script>\n$js\n</script>\n",
+		'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
+		'start_time' => $this->datetime2time($this->data['ts_start']),
+		'pm_integration' => $this->pm_integration,
 		));
 		$links = array();
 		// create links specified in the REQUEST (URL)
@@ -300,11 +301,11 @@ class timesheet_ui extends timesheet_bo
 		$content['ts_title_blur'] = $preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur'];
 
 		$readonlys = array(
-			'button[delete]'   => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE),
-			'button[edit]'     => !$view || !$this->check_acl(EGW_ACL_EDIT),
-			'button[save]'     => $view,
-			'button[save_new]' => $view,
-			'button[apply]'    => $view,
+		'button[delete]'   => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE),
+		'button[edit]'     => !$view || !$this->check_acl(EGW_ACL_EDIT),
+		'button[save]'     => $view,
+		'button[save_new]' => $view,
+		'button[apply]'    => $view,
 		);
 		if ($view)
 		{
@@ -320,7 +321,7 @@ class timesheet_ui extends timesheet_bo
 			$readonlys['ts_owner'] = true;
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('timesheet').' - '.
-			($view ? lang('View') : ($this->data['ts_id'] ? lang('Edit') : lang('Add')));
+		($view ? lang('View') : ($this->data['ts_id'] ? lang('Edit') : lang('Add')));
 
 		// supress unknow widget 'projectmanager-*', if projectmanager is not installed or old
 		if (!@file_exists(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.projectmanager_widget.inc.php'))
@@ -336,7 +337,8 @@ class timesheet_ui extends timesheet_bo
 		if (!$this->customfields) $readonlys[$tabs]['customfields'] = true;	// suppress tab if there are not customfields
 
 		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,array(
-			'ts_owner' => $edit_grants,
+		'ts_owner'  => $edit_grants,
+		'ts_status' => $this->status_labels,
 		),$readonlys,$preserv,2);
 	}
 
@@ -410,6 +412,7 @@ class timesheet_ui extends timesheet_bo
 		$GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
 		$query = $query_in;	// keep the original query
 		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
+		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
 		#_debug_array($query['col_filter']);
 		// PM project filter for the PM integration
 		if ((string)$query['col_filter']['pm_id'] != '')
@@ -536,7 +539,7 @@ class timesheet_ui extends timesheet_bo
 
 		// query cf's for the displayed rows
 		if ($ids && $this->customfields &&
-			in_array('customfields',$cols_to_show=explode(',',$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['nextmatch-timesheet.index.rows'])))
+		in_array('customfields',$cols_to_show=explode(',',$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['nextmatch-timesheet.index.rows'])))
 		{
 			$cfs = $this->read_cfs($ids,$cols_to_show);
 		}
@@ -554,18 +557,18 @@ class timesheet_ui extends timesheet_bo
 				switch($row['ts_id'])
 				{
 					case 0:	// day-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.$GLOBALS['egw']->common->show_date($row['ts_start'],
-							$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
-						break;
+					$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.$GLOBALS['egw']->common->show_date($row['ts_start'],
+					$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
+					break;
 					case -1:	// week-sum
-						$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
-						break;
+					$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
+					break;
 					case -2:	// month-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
-						break;
+					$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
+					break;
 					case -3:	// year-sum
-						$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
-						break;
+					$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
+					break;
 				}
 				$row['ts_start'] = $row['ts_unitprice'] = '';
 				if (!$this->quantity_sum) $row['ts_quantity'] = '';
@@ -627,6 +630,7 @@ class timesheet_ui extends timesheet_bo
 			if (strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
 			if (strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
 		}
+		$rows['no_ts_status'] = $query['no_status'];
 		return $total;
 	}
 
@@ -654,9 +658,31 @@ class timesheet_ui extends timesheet_bo
 				$msg = lang('Error deleting the entry!!!');
 			}
 		}
+
+		if ($content['action'] != '')
+		{
+			if (!count($content['nm']['rows']['checked']) && !$content['use_all'])
+			{
+
+				$msg = lang('You need to select some timesheets first');
+			}
+			else
+			{
+				if ($this->action($content['action'],$content['nm']['rows']['checked'],$content['use_all'],
+				$success,$failed,$action_msg,$content['action'],$msg))
+				{
+					$msg .= lang('%1 timesheets(s) %2',$success,$action_msg);
+				}
+				elseif(is_null($msg))
+				{
+					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+				}
+			}
+		}
+
 		$content = array(
-			'nm' => $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP),
-			'msg' => $msg,
+		'nm' => $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP),
+		'msg' => $msg,
 		);
 		if (!is_array($content['nm']))
 		{
@@ -668,25 +694,37 @@ class timesheet_ui extends timesheet_bo
 			$date_filters['custom'] = 'custom';
 
 			$content['nm'] = array(
-				'get_rows'       =>	TIMESHEET_APP.'.timesheet_ui.get_rows',
-				'options-filter' => $date_filters,
-				'options-filter2' => array('No details','Details'),
-				'order'          =>	'ts_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
-				'header_left'    => 'timesheet.index.dates',
-				'header_right'   => 'timesheet.index.add',
-				'filter_onchange' => "set_style_by_class('table','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();",
-				'filter2'        => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],
+			'get_rows'       =>	TIMESHEET_APP.'.timesheet_ui.get_rows',
+			'options-filter' => $date_filters,
+			'options-filter2' => array('No details','Details'),
+			'order'          =>	'ts_start',// IO name of the column to sort after (optional for the sortheaders)
+			'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
+			'header_left'    => 'timesheet.index.dates',
+			'header_right'   => 'timesheet.index.add',
+			'filter_onchange' => "set_style_by_class('table','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();",
+			'filter2'        => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],
 			);
 		}
 		$read_grants = $this->grant_list(EGW_ACL_READ);
 		$content['nm']['no_owner_col'] = count($read_grants) == 1;
 
 		$sel_options = array(
-			'ts_owner'   => $read_grants,
-			'pm_id'      => array(lang('No project')),
-			'cat_id'     => array(lang('None')),
+		'ts_owner'   => $read_grants,
+		'pm_id'      => array(lang('No project')),
+		'cat_id'     => array(lang('None')),
+		'ts_status'  => $this->status_labels,
 		);
+		$content['nm']['no_status'] = !$sel_options['ts_status'];
+
+		$status =array();
+		$sel_options['action'] ['delete']= lang('Delete Timesheet');
+		foreach ($this->status_labels as $status_id => $label_status)
+		{
+			$status['to_status_'.$status_id] = $label_status;
+		}
+		$sel_options['action'][lang('Modify the Status of the Timesheet')] = $status;
+		unset($status);
+
 		if ($this->pm_integration != 'full')
 		{
 			$projects =& $this->query_list('ts_project');
@@ -695,10 +733,154 @@ class timesheet_ui extends timesheet_bo
 		}
 		// dont show [Export] button if app is not availible to the user or we are on php4
 		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int) phpversion() < 5;
-
 		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
 
+	/**
+	 * apply an action to multiple timesheets
+	 *
+	 * @param string/int $action 'status_to',set status to timeshhets
+	 * @param array $checked timesheet id's to use if !$use_all
+	 * @param boolean $use_all if true use all timesheets of the current selection (in the session)
+	 * @param int &$success number of succeded actions
+	 * @param int &$failed number of failed actions (not enought permissions)
+	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 timesheets 'deleted'
+	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @return boolean true if all actions succeded, false otherwise
+	 */
+	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	{
+		//echo "<p>uicontacts::action('$action',".print_r($checked,true).','.(int)$use_all.",...)</p>\n";
+		$success = $failed = 0;
+		if ($use_all)
+		{
+			// get the whole selection
+			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession($session_name,'timesheet');
+
+			if ($use_all)
+			{
+				@set_time_limit(0);			// switch off the execution time limit, as it's for big selections to small
+				$query['num_rows'] = -1;	// all
+				$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+			}
+		}
+
+		if (substr($action,0,9) == 'to_status')
+		{
+			$to_status = (int)substr($action,10);
+			$action = 'to_status';
+		}
+
+		switch($action)
+		{
+			case 'delete':
+				$action_msg = lang('deleted');
+				foreach((array)$checked as $n => $id)
+				{
+					if ($this->delete($id))
+					{
+						$success++;
+					}
+					else
+					{
+						$failed++;
+					}
+				}
+				break;
+			case 'to_status':
+				$action_msg =lang('changed status');
+				foreach((array)$checked as $n => $id)
+				{
+					if ($this->set_status($id,$to_status))
+					{
+						$success++;
+					}
+					else
+					{
+						$failed++;
+					}
+				}
+				break;
+		}
+
+		return !$failed;
+	}
+
+	/**
+	 * function for setting individual Status
+	 *
+	 * @param conetnt
+	 * @param view
+	 */
+	function editstatus($content = null,$msg='')
+	{
+		// this function requires admin rights
+		$GLOBALS['egw_info']['flags']['admin_only'] = true;
+		$GLOBALS['egw']->check_app_rights();
+
+		if (is_array($content))
+		{
+			list($button) = @each($content['button']);
+
+			switch($button)
+			{
+				case 'delete':
+					break;
+				case 'cancel':
+					$GLOBALS['egw']->redirect_link('/index.php',array(
+					'menuaction' => 'timesheet.timesheet_ui.index',
+					'msg' => $msg,
+					));
+					break;
+				case 'apply':
+				case 'save':
+					foreach($content['statis'] as $cat)
+					{
+						$id = $cat['id'];
+						if (($cat ['name'] !== $this->status_labels[$id]) && ($cat ['name'] !== ''))
+						{
+							$this->status_labels[$id] = $cat['name'];
+							$need_update = true;
+						}
+					}
+					if ($need_update)
+					{
+						config::save_value('status_labels',$this->status_labels,TIMESHEET_APP);
+						$msg .= lang('Status updated.');
+					}
+			}
+		}
+		if (isset($content['button'])) unset ($content['button']);
+		if (isset($content['statis']['delete']))
+		{
+			list($id) = each($content['statis']['delete']);
+			if (isset($this->status_labels[$id]))
+			{
+				unset($this->status_labels[$id]);
+				config::save_value('status_labels',$this->status_labels,TIMESHEET_APP);
+				unset($this->status_labels[$id]);
+				$msg .= lang('Status deleted.');
+			}
+		}
+
+		$i = 1;
+		unset($content['statis']);
+		foreach($this->status_labels as $id => $label)
+		{
+			$content['statis'][$i]['name']= $label;
+			$content['statis'][$i]['id']= $id;
+			$i++;
+		}
+		$content['statis'][$i]['name'] = '';
+		$content['statis'][$i]['id'] = ++$id;
+
+		$content['msg'] = $msg;
+		$preserv = $content;
+
+		$etpl = new etemplate('timesheet.editstatus');
+		$etpl->exec('timesheet.timesheet_ui.editstatus',$content,$sel_options,$readonlys,$preserv);
+	}
+
 	function js()
 	{
 		return '<script LANGUAGE="JavaScript">
@@ -710,6 +892,15 @@ class timesheet_ui extends timesheet_bo
 				"Export",400,400);
 			return false;
 		}
+
+		function do_action(selbox)
+		{
+			if (selbox.value != "") {
+				selbox.form.submit();
+				selbox.value = "";
+			}
+		}
+
 		</script>';
 	}
 }
diff --git a/timesheet/setup/egw_de.lang b/timesheet/setup/egw_de.lang
index e229e739a3..3abadd9d5f 100644
--- a/timesheet/setup/egw_de.lang
+++ b/timesheet/setup/egw_de.lang
@@ -1,13 +1,30 @@
+%1 timesheets(s) %2	timesheet	de	%1 Stundenzettel %2
+%1 timesheets(s) %2, %3 failed because of insufficent rights !!!	timesheet	de	%1 Stundenzettel %2, %3 wurde nicht durchgeführt wegen ungenügenden Rechten !!!
+--> enter new name	timesheet	de	-> neuer Name eingeben
 2 month ago	timesheet	de	Vor 2 Monaten
 2 years ago	timesheet	de	Vor 2 Jahren
 3 years ago	timesheet	de	Vor 3 Jahren
 actions	timesheet	de	Aktionen
 all projects	timesheet	de	Alle Projekte
+all status	timesheet	de	Alle Status
+and its members	timesheet	de	und die Mitglieder
+applies the changes	timesheet	de	Änderungen durchführen
+apply the action on the whole query, not only the shown timesheets!!!	timesheet	de	Wendet den Befehl auf die gesamte Abfrage an, NICHT nur die angezeigten Stundenzettel!!
 both: allow to use projectmanager and free project-names	admin	de	Beides: verwende Projektmanager und freie Projektnamen
 by	timesheet	de	von
+changed status	timesheet	de	Status geändert
+check all	timesheet	de	Alle selektieren
 create new links	timesheet	de	Neue Verknüpfung erstellen
+creates a new field	timesheet	de	neues Feld anlegen
 creating new entry	timesheet	de	neuen Eintrag anlegen
 delete this entry	timesheet	de	Diesen Eintrag löschen
+delete this status	timesheet	de	Diesen Status löschen
+delete timesheet	timesheet	de	Stundenzettel löschen
+deleted	timesheet	de	gelöscht
+deletes this field	timesheet	de	Dies Feld löschen
+determines the order the fields are displayed	timesheet	de	verändert die Reihenfolge der angezeigten Felder
+each value is a line like <id>[=<label>]	timesheet	de	jeder Wert ist eine Zeile in dem Format <id>[=|label>]
+edit status	timesheet	de	Status bearbeiten
 edit this entry	timesheet	de	diesen Eintrag bearbeiten
 empty if identical to duration	timesheet	de	leer lassen wenn gleich Dauer
 end	timesheet	de	Ende
@@ -16,6 +33,10 @@ entry saved	timesheet	de	Eintrag gespeichert
 error deleting the entry!!!	timesheet	de	Fehler beim Löschen des Eintrags!!!
 error saving the entry!!!	timesheet	de	Fehler beim Speichern des Eintrags!!!
 existing links	timesheet	de	Bestehende Verknüpfungen
+export	timesheet	de	Exportieren
+export to openoffice spreadsheet	timesheet	de	zu Open Office exortieren
+exports entries from your timesheet into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	timesheet	de	Exportiert die Einträge des Stundenzettels in eine CSV Datei. CSV bedeutet, Komma getrennte Werte. In dem options Tab können Sie andere Trennzeichen festlegen.
+field must not be empty !!!	timesheet	de	Dieses Feld darf nicht leer sein!!!
 full: use only projectmanager	admin	de	Komplett: verwende nur Projektmanager
 general	timesheet	de	Allgemein
 last modified	timesheet	de	Zuletzt geändert
@@ -23,31 +44,54 @@ last month	timesheet	de	Letzten Monat
 last week	timesheet	de	Letzte Woche
 last year	timesheet	de	Letztes Jahr
 leave it empty for a full week	timesheet	de	Leer lassen für eine volle Woche
+leaves without saveing	timesheet	de	beenden ohne speichern
+length<br>rows	timesheet	de	Länge<br>Reihe
 links	timesheet	de	Verknüpfungen
+max length of the input [, length of the inputfield (optional)]	timesheet	de	maximale Länge der Eingabe[,Länge des Eingabefeldes (optional)]
+modify the status of the timesheet	timesheet	de	Status des Stundenzettels verändern
 no details	timesheet	de	Keine Details
 no project	timesheet	de	Kein Projekt
 none: use only free project-names	admin	de	Keine: verwende nur freie Projektnamen
+number of row for a multiline inputfield or line of a multi-select-box	timesheet	de	Anzahl von Reihen für ein Mehrzeiliges Textfeld oder einer Mehrfachauswahlbox
 or endtime	timesheet	de	oder Endzeit
+order	timesheet	de	Reihenfolge
 permission denied!!!	timesheet	de	Zugriff verweigert!!!
 price	timesheet	de	Preis
 projectmanager integration	admin	de	Integration des Projektmanagers
 quantity	timesheet	de	Menge
 save & new	timesheet	de	Speichern & Neu
 saves the changes made	timesheet	de	Speichert die Änderungen
+saves the changes made and leaves	timesheet	de	Änderungen  speidern und beenden
 saves this entry and add a new one	timesheet	de	Speichert diesen Eintrag und fügt einen neuen hinzu
 select a price	timesheet	de	Preis auswählen
 select a project	timesheet	de	Projekt auswählen
+select a status of the timesheet	timesheet	de	einen status auswählen
+select an action or timesheet to modify	timesheet	de	Eine Aktion auswählen
+select an action or timesheet you want to modify...	timesheet	de	Wählen Sie eine Aktion oder einen Stundenzettel aus, der geändert werden soll.
+select multiple timeshhets for a further action	timesheet	de	Wählen Sie mehrere Stundenzettel für einen weitere Aktion aus
 show a quantity sum (eg. to sum up negative overtime)	admin	de	Zeige eine Mengensumme (z.B. um negative Ãœberstunden zu summieren)
 start	timesheet	de	Start
 starttime	timesheet	de	Startzeit
 starttime has to be before endtime !!!	timesheet	de	Startzeit muss vor der Endzeit liegen !!!
+status deleted.	timesheet	de	Status gelöscht
+status updated.	timesheet	de	Status geändert
 sum %1:	timesheet	de	Summe %1:
+the name used internaly (<= 20 chars), changeing it makes existing data unavailible	timesheet	de	Dieser Name wird nur intern benutzt (<= 20 Zeichen), Änderungen führen dazu, das bestehende Daten nicht mehr angezeigt werden können.
+the text displayed to the user	timesheet	de	der Text wird dem Benutzer angezeigt
 this month	timesheet	de	Diesen Monat
 this week	timesheet	de	Diese Woche
 this year	timesheet	de	Dieses Jahr
 timesheet	common	de	Stundenzettel
+timesheet csv export	timesheet	de	Export des  Stundenzettels als CSV
+timesheet openoffice export	timesheet	de	Export des  Stundenzettels als Open Office
+timesheet status-%1 '%2' added.	timesheet	de	Stundenzettel Status %1 '%2' hinzugefügt.
+timesheet-%1 '%2' updated.	timesheet	de	Stundenzettel Status %1 '%2' geändert
+timesheet-%1 deleted.	timesheet	de	Stundenzettel %1 gelöscht
 unitprice	timesheet	de	Preis pro Einheit
+values for selectbox	timesheet	de	Werte der Auswahlbox
 view this entry	timesheet	de	Diesen Eintrag anzeigen
 week	timesheet	de	Woche
+whole query	timesheet	de	gesamte Abfrage
 yesterday	timesheet	de	Gestern
+you need to select some timesheets first	timesheet	de	Sie müssen zuerst Datensätze auswählen
 your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database.	timesheet	de	Ihre Datenbank ist NICHT aktuell (%1 statt %2), bitte rufen sie %3setup%4 auf um die Datenbank zu aktualisieren.
diff --git a/timesheet/setup/egw_en.lang b/timesheet/setup/egw_en.lang
index 0e3bd0502b..25fe5d5825 100644
--- a/timesheet/setup/egw_en.lang
+++ b/timesheet/setup/egw_en.lang
@@ -1,13 +1,30 @@
+%1 timesheets(s) %2	timesheet	en	%1 timesheets(s) %2
+%1 timesheets(s) %2, %3 failed because of insufficent rights !!!	timesheet	en	%1 timesheets(s) %2, %3 failed because of insufficent rights !!!
+--> enter new name	timesheet	en	--> enter new name
 2 month ago	timesheet	en	2 month ago
 2 years ago	timesheet	en	2 years ago
 3 years ago	timesheet	en	3 years ago
 actions	timesheet	en	Actions
 all projects	timesheet	en	All projects
+all status	timesheet	en	All status
+and its members	timesheet	en	and its members
+applies the changes	timesheet	en	applies the changes
+apply the action on the whole query, not only the shown timesheets!!!	timesheet	en	Apply the action on the whole query, NOT only the shown timesheets!!!
 both: allow to use projectmanager and free project-names	admin	en	Both: allow to use ProjectManager and free project-names
 by	timesheet	en	by
+changed status	timesheet	en	changed status
+check all	timesheet	en	Check all
 create new links	timesheet	en	Create new links
+creates a new field	timesheet	en	creates a new field
 creating new entry	timesheet	en	creating new entry
 delete this entry	timesheet	en	Delete this entry
+delete this status	timesheet	en	Delete this status
+delete timesheet	timesheet	en	Delete Timesheet
+deleted	timesheet	en	deleted
+deletes this field	timesheet	en	deletes this field
+determines the order the fields are displayed	timesheet	en	determines the order the fields are displayed
+each value is a line like <id>[=<label>]	timesheet	en	each value is a line like <id>[=<label>]
+edit status	timesheet	en	Edit status
 edit this entry	timesheet	en	Edit this entry
 empty if identical to duration	timesheet	en	empty if identical to duration
 end	timesheet	en	End
@@ -16,6 +33,7 @@ entry saved	timesheet	en	Entry saved
 error deleting the entry!!!	timesheet	en	Error deleting the entry!!!
 error saving the entry!!!	timesheet	en	Error saving the entry!!!
 existing links	timesheet	en	Existing links
+export	timesheet	en	Export
 export to openoffice spreadsheet	timesheet	en	Export to OpenOffice Spreadsheet
 exports entries from your timesheet into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	timesheet	en	Exports entries from your Timesheet into a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.
 field must not be empty !!!	timesheet	en	Field must not be empty !!!
@@ -26,33 +44,54 @@ last month	timesheet	en	Last month
 last week	timesheet	en	Last week
 last year	timesheet	en	Last year
 leave it empty for a full week	timesheet	en	Leave it empty for a full week
+leaves without saveing	timesheet	en	leaves without saveing
+length<br>rows	timesheet	en	Length<br>Rows
 links	timesheet	en	Links
+max length of the input [, length of the inputfield (optional)]	timesheet	en	max length of the input [, length of the inputfield (optional)]
+modify the status of the timesheet	timesheet	en	Modify the Status of the Timesheet
 no details	timesheet	en	no details
 no project	timesheet	en	No project
 none: use only free project-names	admin	en	None: use only free project-names
+number of row for a multiline inputfield or line of a multi-select-box	timesheet	en	number of row for a multiline inputfield or line of a multi-select-box
 or endtime	timesheet	en	or Endtime
+order	timesheet	en	Order
 permission denied!!!	timesheet	en	Permission denied!!!
 price	timesheet	en	Price
 projectmanager integration	admin	en	ProjectManager integration
 quantity	timesheet	en	Quantity
 save & new	timesheet	en	Save & New
 saves the changes made	timesheet	en	Saves the changes made
+saves the changes made and leaves	timesheet	en	saves the changes made and leaves
 saves this entry and add a new one	timesheet	en	Saves this entry and add a new one
 select a price	timesheet	en	Select a price
 select a project	timesheet	en	Select a project
+select a status of the timesheet	timesheet	en	select a status of the timesheet
+select an action or timesheet to modify	timesheet	en	Select an action or timesheet to modify
+select an action or timesheet you want to modify...	timesheet	en	Select an action or timesheet you want to modify...
+select multiple timeshhets for a further action	timesheet	en	Select multiple timeshhets for a further action
 show a quantity sum (eg. to sum up negative overtime)	admin	en	Show a quantity sum (eg. to sum up negative overtime)
 start	timesheet	en	Start
 starttime	timesheet	en	Starttime
 starttime has to be before endtime !!!	timesheet	en	Starttime has to be before endtime !!!
+status deleted.	timesheet	en	Status deleted.
+status updated.	timesheet	en	Status updated.
 sum %1:	timesheet	en	Sum %1:
+the name used internaly (<= 20 chars), changeing it makes existing data unavailible	timesheet	en	the name used internaly (<= 20 chars), changeing it makes existing data unavailible
+the text displayed to the user	timesheet	en	the text displayed to the user
 this month	timesheet	en	This month
 this week	timesheet	en	This week
 this year	timesheet	en	This year
 timesheet	common	en	TimeSheet
 timesheet csv export	timesheet	en	Timesheet CSV export
 timesheet openoffice export	timesheet	en	Timesheet OpenOffice export
+timesheet status-%1 '%2' added.	timesheet	en	Timesheet Status-%1 '%2' added.
+timesheet-%1 '%2' updated.	timesheet	en	Timesheet-%1 '%2' updated.
+timesheet-%1 deleted.	timesheet	en	Timesheet-%1 deleted.
 unitprice	timesheet	en	Unitprice
+values for selectbox	timesheet	en	Values for selectbox
 view this entry	timesheet	en	View this entry
 week	timesheet	en	Week
+whole query	timesheet	en	whole query
 yesterday	timesheet	en	Yesterday
+you need to select some timesheets first	timesheet	en	You need to select some timesheets first
 your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database.	timesheet	en	Your database is NOT up to date (%1 vs. %2), please run %3setup%4 to update your database.
diff --git a/timesheet/setup/etemplates.inc.php b/timesheet/setup/etemplates.inc.php
index 335ed36d67..1b023b669d 100644
--- a/timesheet/setup/etemplates.inc.php
+++ b/timesheet/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application timesheet
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-02-16 10:01
+	* generated by soetemplate::dump4setup() 2009-03-23 10:43
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package timesheet
@@ -12,29 +12,74 @@
 
 $templ_version=1;
 
+$templ_data[] = array('name' => 'timesheet.customfields','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"C";s:3:"80%";s:2:"c4";s:6:"header";s:2:"h1";s:8:"40,!@msg";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,reditalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:3:"typ";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:3;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:5;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:6;a:3:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:3;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
+.error_msg { color: red; font-style: italics; }','modified' => '1148375906',);
+
 $templ_data[] = array('name' => 'timesheet.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";}i:1;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1163155004',);
 
 $templ_data[] = array('name' => 'timesheet.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";}i:1;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1163162665',);
 
+$templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"A";s:2:",!";}i:1;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1148375979',);
+
+$templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1163155060',);
+
+$templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"A";s:2:",!";}i:1;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1163429556',);
+
 $templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.003','data' => 'a:1:{i:0;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:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"F";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:6:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";s:8:"disabled";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"F";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1163430791',);
 
 $templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.004','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:2:{s:4:"type";s:6:"select";s:4:"name";s:12:"${row}[type]";}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:12:"${row}[rows]";s:4:"size";s:6:"0,10,2";s:4:"blur";s:1:"1";}i:3;a:6:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";s:8:"disabled";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1164631589',);
 
+$templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:8:{s:2:"c2";s:7:"row,top";s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";s:2:"c3";s:7:"row,top";s:2:"c4";s:7:"row,top";s:2:"h5";s:23:",!@allow_defaultproject";s:2:"c5";s:7:"row,top";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,140,,,,,auto";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:1:"C";s:2:"5%";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Autoassign to";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:12:"${row}[name]";s:4:"size";s:6:"60,150";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"size";s:5:"Noone";s:4:"name";s:18:"${row}[autoassign]";s:7:"no_lang";s:1:"1";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:39:"return confirm(\'Delete this category\');";s:4:"help";s:20:"Delete this category";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"name";s:4:"cats";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"140";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Versions";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,100,,,,,auto";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:2:"5%";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:12:"${row}[name]";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:38:"return confirm(\'Delete this version\');";s:4:"help";s:19:"Delete this version";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"name";s:8:"versions";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"100";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,100,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"100";i:6;s:4:"auto";}s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"B";s:2:"5%";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:2;}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Canned responses";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:4:"100%";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"C";s:2:"5%";s:2:"c2";s:7:"row,top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"Canned response";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:12:"${row}[name]";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"3,50";s:4:"name";s:19:"${row}[description]";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:46:"return confirm(\'Delete this canned response\');";s:4:"help";s:27:"Delete this canned response";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"name";s:9:"responses";s:7:"options";a:1:{i:0;s:4:"100%";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:5;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Assign to project";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:16:"100%,90,,,,,auto";s:4:"name";s:8:"projects";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:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Project selection";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"40,40";s:4:"name";s:12:"${row}[name]";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:4:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:44:"--> choose a project from the drop-down list";s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[projectlist]";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";s:4:"help";s:17:"Delete this entry";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"span";s:3:"all";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:2:"90";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1236865642',);
+
+$templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:3:{s:4:"type";s:8:"template";s:7:"no_lang";s:1:"1";s:4:"name";s:27:"timesheet.customstatus.cats";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1236865711',);
+
+$templ_data[] = array('name' => 'timesheet.customstatus.cats','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,280,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"B";s:2:"5%";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"280";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"300";i:6;s:4:"auto";}}}','size' => '100%,300,,,,,auto','style' => '','modified' => '1236867741',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:10:"ts_project";s:4:"span";s:3:"all";s:4:"blur";s:16:"@ts_project_blur";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134772260',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '0.2.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1136861594',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.0.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1136861594',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142930663',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:14:{i:0;a:20:{s:2:"c3";s:2:"th";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";s:2:"c4";s:3:"row";s:2:"h5";s:7:",!@hide";s:2:"c5";s:3:"row";s:2:"c7";s:3:"row";s:2:"h6";s:7:",!@hide";s:2:"c6";s:3:"row";s:2:"h8";s:6:",@hide";s:2:"h7";s:7:",!@hide";s:3:"c12";s:3:"row";s:3:"h12";s:14:",!@ts_modified";s:3:"c10";s:10:"titlePopup";s:2:"h9";s:6:",@hide";s:2:"c8";s:3:"row";s:2:"h3";s:8:"28,@hide";s:2:"c2";s:10:"titlePopup";s:3:"h10";s:10:",!@cftitle";s:3:"h11";s:10:",!@cftitle";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:12:"general data";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:5:"label";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:8:"disabled";s:1:"1";}}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:6:"cat_id";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"date";}s:1:"B";a:2:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"ts_start";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"size";s:3:",hm";s:4:"name";s:11:"ts_duration";}}i:8;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:9;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:10;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:1:"2";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";s:4:"span";s:1:"2";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:13;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:13;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1148390957',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:14:{i:0;a:19:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",!@msg";s:2:"c4";s:3:"row";s:2:"h5";s:7:",!@hide";s:2:"c5";s:3:"row";s:2:"c7";s:3:"row";s:2:"h6";s:7:",!@hide";s:2:"c6";s:3:"row";s:2:"h8";s:6:",@hide";s:2:"h7";s:7:",!@hide";s:2:"h9";s:6:",@hide";s:2:"c8";s:3:"row";s:2:"h3";s:8:"28,@hide";s:2:"c2";s:10:"titlePopup";s:3:"c12";s:3:"row";s:3:"h12";s:14:",!@ts_modified";s:3:"h10";s:10:",!@cftitle";s:3:"c10";s:10:"titlePopup";s:3:"h11";s:10:",!@cftitle";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:12:"general data";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:8:"disabled";s:1:"1";}}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:6:"cat_id";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"date";}s:1:"B";a:2:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"size";s:3:",hm";s:4:"name";s:11:"ts_duration";}}i:8;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:9;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:10;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:13:"custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:11;a:2:{s:1:"A";a:4:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";s:4:"span";s:1:"2";s:4:"size";s:3:"147";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:13;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:13;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1148998178',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:21:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",!@msg";s:2:"c4";s:3:"row";s:2:"h5";s:7:",!@hide";s:2:"c5";s:3:"row";s:2:"c7";s:3:"row";s:2:"h8";s:7:",!@hide";s:2:"h7";s:7:",!@hide";s:2:"h9";s:6:",@hide";s:2:"c8";s:3:"row";s:2:"h3";s:8:"28,@hide";s:2:"c2";s:10:"titlePopup";s:3:"h12";s:10:",!@cftitle";s:3:"h10";s:6:",@hide";s:3:"h11";s:10:",!@cftitle";s:3:"c13";s:3:"row";s:3:"h13";s:14:",!@ts_modified";s:3:"c11";s:10:"titlePopup";s:2:"c9";s:3:"row";s:2:"h6";s:7:",!@hide";s:2:"c6";s:3:"row";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:12:"general data";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:8:"disabled";s:1:"1";}}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:6:"cat_id";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"date";}s:1:"B";a:2:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"size";s:3:",hm";s:4:"name";s:11:"ts_duration";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Bemerkung";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:14:"ts_description";s:4:"size";s:4:"6,50";}}i:9;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:10;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:13:"custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:4:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";s:4:"span";s:1:"2";s:4:"size";s:3:"147";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:14;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:14;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1151935355',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1158066408',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1163173853',);
+
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164291373',);
+
 $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.4.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1165332731',);
 
 $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
 .fullWidth input { widht: 100%; }
 .fullWidth textarea { widht: 100%; }','modified' => '1165332731',);
 
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
+.fullWidth input { widht: 100%; }
+.fullWidth textarea { widht: 100%; }','modified' => '1236614859',);
+
 $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1163173930',);
 
 $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '100%,150,,,,,auto','style' => '','modified' => '1163173930',);
 
+$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:5:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:6:"needed";s:1:"1";s:4:"blur";s:14:"@ts_title_blur";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:5:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1134773043',);
+
+$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:8:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c2";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:2:"80";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1134773043',);
+
 $templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1164289627',);
 
-$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1164289627',);
+$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1164289627',);
+
+$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:9:"ts_status";s:4:"help";s:32:"select a status of the timesheet";s:4:"size";s:13:"please select";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1236615245',);
 
 $templ_data[] = array('name' => 'timesheet.edit.links','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:6:",@view";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '100%,150,,,,,auto','style' => '','modified' => '1134775301',);
 
@@ -42,19 +87,31 @@ $templ_data[] = array('name' => 'timesheet.edit.notes','template' => '','lang' =
 
 $templ_data[] = array('name' => 'timesheet.edit.notes','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:7:"row,top";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"8,70";s:4:"name";s:14:"ts_description";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1134773787',);
 
+$templ_data[] = array('name' => 'timesheet.editstatus','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,280,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"B";s:2:"5%";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"280";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1237544666',);
+
+$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134799202',);
+
+$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142977673',);
+
+$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:5:"dates";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1149257156',);
+
+$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142977673',);
+
+$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164373176',);
+
 $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164373176',);
 
 $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164373176',);
 
+$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"use_all";s:5:"label";s:11:"whole query";s:8:"onchange";s:128:"if (this.checked==true && !confirm(\'Apply the action on the whole query, NOT only the shown timesheets!!!\')) this.checked=false;";s:4:"help";s:69:"Apply the action on the whole query, NOT only the shown timesheets!!!";}i:2;a:5:{s:4:"type";s:6:"select";s:8:"onchange";s:16:"do_action(this);";s:4:"size";s:51:"Select an action or timesheet you want to modify...";s:4:"name";s:6:"action";s:4:"help";s:39:"Select an action or timesheet to modify";}i:3;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237399516',);
+
 $templ_data[] = array('name' => 'timesheet.index.add','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}','size' => '','style' => '','modified' => '1158042543',);
 
 $templ_data[] = array('name' => 'timesheet.index.dates','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:4:"hbox";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}i:2;a:2:{s:4:"type";s:4:"date";s:4:"name";s:9:"startdate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"End";}i:4;a:3:{s:4:"type";s:4:"date";s:4:"name";s:7:"enddate";s:4:"help";s:30:"Leave it empty for a full week";}s:4:"span";s:12:",custom_hide";}}','size' => '','style' => '.custom_hide { visibility: hidden; }','modified' => '1142973260',);
 
-$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@ts_viewtype";s:1:"F";s:13:",@ts_viewtype";s:1:"E";s:13:",@ts_viewtype";}i:1;a:9:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164279120',);
-
-$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@ts_viewtype";s:1:"F";s:13:",@ts_viewtype";s:1:"E";s:13:",@ts_viewtype";}i:1;a:9:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164279120',);
-
-$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@ts_viewtype";s:1:"F";s:13:",@ts_viewtype";s:1:"E";s:13:",@ts_viewtype";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164279120',);
+$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"G";s:14:",@no_owner_col";s:1:"B";s:3:"50%";}i:1;a:8:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:7:"no_lang";s:1:"1";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:7:"Project";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"G";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"D";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"F";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"G";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134799629',);
 
 $templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@no_ts_total";s:1:"F";s:17:",@no_ts_unitprice";s:1:"E";s:16:",@no_ts_quantity";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1234522226',);
 
+$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@no_ts_total";s:1:"F";s:17:",@no_ts_unitprice";s:1:"E";s:16:",@no_ts_quantity";s:1:"I";s:14:",@no_ts_status";}i:1;a:11:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:9:"ts_status";s:8:"onchange";i:1;s:4:"size";s:10:"All status";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"K";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:8:",noPrint";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:9:"Check all";s:4:"size";s:5:"check";s:4:"name";s:9:"check_all";s:6:"needed";s:1:"1";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";}}}i:2;a:11:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:6:"select";s:4:"name";s:17:"${row}[ts_status]";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"K";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";i:4;a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:16:"$row_cont[ts_id]";s:4:"name";s:9:"checked[]";s:4:"help";s:47:"Select multiple timeshhets for a further action";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237399465',);
+
diff --git a/timesheet/setup/setup.inc.php b/timesheet/setup/setup.inc.php
index 14b9c9ce5a..1272fd501d 100644
--- a/timesheet/setup/setup.inc.php
+++ b/timesheet/setup/setup.inc.php
@@ -17,9 +17,9 @@ if (!defined('TIMESHEET_APP'))
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
-$setup_info[TIMESHEET_APP]['version']   = '1.6';
+$setup_info[TIMESHEET_APP]['version']   = '1.007';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
-$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet', 'egw_timesheet_extra');
+$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;
 
 $setup_info[TIMESHEET_APP]['author'] =
diff --git a/timesheet/setup/tables_current.inc.php b/timesheet/setup/tables_current.inc.php
index 03fb2ca8ec..e5874fd2e3 100644
--- a/timesheet/setup/tables_current.inc.php
+++ b/timesheet/setup/tables_current.inc.php
@@ -6,42 +6,43 @@
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package timesheet
  * @subpackage setup
- * @copyright (c) 2005 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id$ 
+ * @version $Id$
  */
 
-	$phpgw_baseline = array(
-		'egw_timesheet' => array(
-			'fd' => array(
-				'ts_id' => array('type' => 'auto','nullable' => False),
-				'ts_project' => array('type' => 'varchar','precision' => '80'),
-				'ts_title' => array('type' => 'varchar','precision' => '80','nullable' => False),
-				'ts_description' => array('type' => 'text'),
-				'ts_start' => array('type' => 'int','precision' => '8','nullable' => False),
-				'ts_duration' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'ts_quantity' => array('type' => 'float','precision' => '8','nullable' => False),
-				'ts_unitprice' => array('type' => 'float','precision' => '4'),
-				'cat_id' => array('type' => 'int','precision' => '4','default' => '0'),
-				'ts_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-				'ts_modified' => array('type' => 'int','precision' => '8','nullable' => False),
-				'ts_modifier' => array('type' => 'int','precision' => '4','nullable' => False),
-				'pl_id' => array('type' => 'int','precision' => '4','default' => '0')
-			),
-			'pk' => array('ts_id'),
-			'fk' => array(),
-			'ix' => array('ts_project','ts_owner'),
-			'uc' => array()
+$phpgw_baseline = array(
+	'egw_timesheet' => array(
+		'fd' => array(
+			'ts_id' => array('type' => 'auto','nullable' => False),
+			'ts_project' => array('type' => 'varchar','precision' => '80'),
+			'ts_title' => array('type' => 'varchar','precision' => '80','nullable' => False),
+			'ts_description' => array('type' => 'text'),
+			'ts_start' => array('type' => 'int','precision' => '8','nullable' => False),
+			'ts_duration' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'ts_quantity' => array('type' => 'float','precision' => '8','nullable' => False),
+			'ts_unitprice' => array('type' => 'float','precision' => '4'),
+			'cat_id' => array('type' => 'int','precision' => '4','default' => '0'),
+			'ts_owner' => array('type' => 'int','precision' => '4','nullable' => False),
+			'ts_modified' => array('type' => 'int','precision' => '8','nullable' => False),
+			'ts_modifier' => array('type' => 'int','precision' => '4','nullable' => False),
+			'pl_id' => array('type' => 'int','precision' => '4','default' => '0'),
+			'ts_status' => array('type' => 'int','precision' => '4')
 		),
-		'egw_timesheet_extra' => array(
-			'fd' => array(
-				'ts_id' => array('type' => 'int','precision' => '4','nullable' => False),
-				'ts_extra_name' => array('type' => 'varchar','precision' => '32','nullable' => False),
-				'ts_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
-			),
-			'pk' => array('ts_id','ts_extra_name'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array()
-		)
-	);
+		'pk' => array('ts_id'),
+		'fk' => array(),
+		'ix' => array('ts_project','ts_owner','ts_status'),
+		'uc' => array()
+	),
+	'egw_timesheet_extra' => array(
+		'fd' => array(
+			'ts_id' => array('type' => 'int','precision' => '4','nullable' => False),
+			'ts_extra_name' => array('type' => 'varchar','precision' => '32','nullable' => False),
+			'ts_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+		),
+		'pk' => array('ts_id','ts_extra_name'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	)
+);
diff --git a/timesheet/setup/tables_update.inc.php b/timesheet/setup/tables_update.inc.php
index 81a6a25430..a5bee0cf66 100644
--- a/timesheet/setup/tables_update.inc.php
+++ b/timesheet/setup/tables_update.inc.php
@@ -6,7 +6,7 @@
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package timesheet
  * @subpackage setup
- * @copyright (c) 2005-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -54,3 +54,16 @@ function timesheet_upgrade1_4()
 
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.6';
 }
+
+function timesheet_upgrade1_6()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet','ts_status',array(
+		'type' => 'int',
+		'precision' => '4'
+	));
+
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_timesheet','ts_status');
+
+	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.7.001';
+}
+
diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet
index 17d6ea500b..5cd523af69 100644
--- a/timesheet/templates/default/edit.xet
+++ b/timesheet/templates/default/edit.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="timesheet.edit.general" template="" lang="" group="0" version="1.5.001">
+	<template id="timesheet.edit.general" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%" height="150">
 			<columns>
 				<column width="95"/>
@@ -44,6 +44,14 @@
 					<description options=",,,ts_quantity" value="Quantity"/>
 					<textbox type="float" id="ts_quantity" statustext="empty if identical to duration" blur="@ts_quantity_blur" precision="3" span="all"/>
 				</row>
+				<row>
+					<description value="Status"/>
+					<menulist>
+						<menupopup id="ts_status" statustext="select a status of the timesheet" options="please select"/>
+					</menulist>
+					<description/>
+					<description/>
+				</row>
 			</rows>
 		</grid>
 	</template>
@@ -93,7 +101,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="timesheet.edit" template="" lang="" group="0" version="1.5.001">
+	<template id="timesheet.edit" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column width="100"/>
@@ -142,7 +150,7 @@
 					</grid>
 				</row>
 				<row>
-					<tabbox span="all">
+					<tabbox id="general|notes|links|customfields" span="all">
 						<tabs>
 							<tab label="General" statustext=""/>
 							<tab label="Notes" statustext=""/>
diff --git a/timesheet/templates/default/editstatus.xet b/timesheet/templates/default/editstatus.xet
new file mode 100644
index 0000000000..133525a6ae
--- /dev/null
+++ b/timesheet/templates/default/editstatus.xet
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="timesheet.editstatus" template="" lang="" group="0" version="1.7.001">
+		<grid width="100%" height="450" overflow="auto">
+			<columns>
+				<column width="100"/>
+				<column/>
+				<column/>
+				<column width="30%"/>
+			</columns>
+			<rows>
+				<row disabled="!@msg">
+					<description id="msg" span="all" class="redItalic" align="center"/>
+					<description/>
+					<description/>
+					<description/>
+				</row>
+				<row>
+					<groupbox rows="1" cols="1">
+						<grid width="100%" height="300" overflow="auto">
+							<columns>
+								<column width="100"/>
+								<column/>
+								<column/>
+								<column width="30%"/>
+							</columns>
+							<rows>
+								<row class="row" valign="top">
+									<description value="Status"/>
+									<grid width="100%" height="280" overflow="auto" id="statis">
+										<columns>
+											<column/>
+											<column width="5%"/>
+										</columns>
+										<rows>
+											<row class="th">
+												<description value="Name"/>
+												<description value="Actions"/>
+											</row>
+											<row class="row">
+												<textbox size="80" maxlength="150" blur="--&gt; enter new name" id="${row}[name]"/>
+												<button image="delete" label="Delete" align="center" id="delete[$row_cont[id]]" statustext="Delete this status" onclick="return confirm('Delete this status');"/>
+											</row>
+										</rows>
+									</grid>
+								</row>
+							</rows>
+						</grid>
+					</groupbox>
+					<description/>
+					<description/>
+					<description/>
+				</row>
+				<row>
+					<hbox span="2">
+						<button label="Save" id="button[save]"/>
+						<button id="button[apply]" label="Apply"/>
+						<button label="Cancel" id="button[cancel]"/>
+					</hbox>
+					<description/>
+					<description/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file
diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index fc8180443b..07af6eef72 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -15,24 +15,25 @@
 	<template id="timesheet.index.add" template="" lang="" group="0" version="1.3.001">
 		<button label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
 	</template>
-	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.5.002">
+	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column width="15%"/>
 				<column width="50%"/>
 				<column/>
 				<column/>
-				<column disabled="@ts_viewtype"/>
-				<column disabled="@ts_viewtype"/>
-				<column disabled="@ts_viewtype"/>
+				<column disabled="@no_ts_quantity"/>
+				<column disabled="@no_ts_unitprice"/>
+				<column disabled="@no_ts_total"/>
 				<column disabled="@no_owner_col"/>
+				<column disabled="@no_ts_status"/>
 				<column/>
 				<column/>
 			</columns>
 			<rows>
 				<row class="th">
 					<nextmatch-sortheader label="Date" id="ts_start"/>
-					<grid spacing="1" padding="1">
+					<grid spacing="0" padding="0">
 						<columns>
 							<column/>
 						</columns>
@@ -63,12 +64,16 @@
 						<textbox type="float" id="price" readonly="true" precision="2"/>
 					</vbox>
 					<nextmatch-filterheader id="ts_owner" options="User" no_lang="1" class="$cont[ownerClass]"/>
+					<nextmatch-filterheader id="ts_status" onchange="1" options="All status"/>
 					<nextmatch-customfields id="customfields" readonly="true"/>
-					<description value="Actions" class="noPrint"/>
+					<hbox class="noPrint">
+						<description value="Actions" class="noPrint" align="right"/>
+						<button label="Check all" image="check" id="check_all" needed="1" statustext="Check all" onclick="toggle_all(this.form,form::name('checked[]')); return false;"/>
+					</hbox>
 				</row>
 				<row class="$row_cont[class]">
 					<date-time id="${row}[ts_start]" readonly="true" options=",8"/>
-					<vbox>
+					<vbox options="0,0">
 						<link id="${row}[ts_link]" no_lang="1"/>
 						<description id="${row}[ts_title]" no_lang="1" class="$row_cont[titleClass]"/>
 						<description id="${row}[ts_description]" no_lang="1"/>
@@ -83,39 +88,54 @@
 					<menulist class="$cont[ownerClass]">
 						<menupopup type="select-account" id="${row}[ts_owner]" readonly="true"/>
 					</menulist>
+					<menulist>
+						<menupopup id="${row}[ts_status]" readonly="true"/>
+					</menulist>
 					<customfields-list id="$row" readonly="true"/>
-					<hbox class="noPrint">
+					<hbox class="noPrint" align="right">
 						<button image="view" label="View" id="view[$row_cont[ts_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.view&amp;ts_id=$row_cont[ts_id]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" statustext="View this entry"/>
 						<button image="edit" label="Edit" id="edit[$row_cont[ts_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;ts_id=$row_cont[ts_id]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
 						<button image="delete" label="Delete" id="delete[$row_cont[ts_id]]" statustext="Delete this entry" onclick="return confirm('Delete this entry');"/>
+						<checkbox options="$row_cont[ts_id]" id="checked[]" statustext="Select multiple contacts for a further action"/>
 					</hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="timesheet.index" template="" lang="" group="0" version="1.5.002">
+	<template id="timesheet.index" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column/>
+				<column/>
 			</columns>
 			<rows>
 				<row disabled="!@msg">
 					<description span="all" class="redItalic" no_lang="1" id="msg" align="center"/>
+					<description/>
 				</row>
 				<row disabled="1">
 					<hbox>
-						<template id="timesheet.index.dates"/>
-						<template id="timesheet.index.add" align="right"/>
+						<template id="dates"/>
+						<template id="add" align="right"/>
 					</hbox>
+					<description/>
 				</row>
 				<row>
-					<nextmatch id="nm" options="timesheet.index.rows"/>
+					<nextmatch id="nm" options="timesheet.index.rows" span="all"/>
 				</row>
 				<row class="noPrint">
 					<button label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
+					<hbox align="right">
+						<checkbox id="use_all" label="whole query" onchange="if (this.checked==true &amp;&amp; !confirm('Apply the action on the whole query, NOT only the shown contacts!!!')) this.checked=false;" statustext="Apply the action on the whole query, NOT only the shown contacts!!!"/>
+						<menulist>
+							<menupopup onchange="do_action(this);" options="Select an action or timesheet you want to modify..." no_lang="1" id="action" statustext="Select an action or timesheet to modify"/>
+						</menulist>
+						<button image="arrow_ltr" label="Check all" id="check_all" statustext="Check all" onclick="toggle_all(this.form,form::name('nm[rows][checked][]')); return false;" needed="1" class="checkAllArrow"/>
+					</hbox>
 				</row>
 				<row disabled="1">
 					<button label="Export" onclick="timesheet_export(); return false;" id="export"/>
+					<description/>
 				</row>
 			</rows>
 		</grid>

From a2252deadec771f7590e1f51429a90ac14050582 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 23 Mar 2009 15:01:01 +0000
Subject: [PATCH 100/510] "fixed wrong version, causing the update to fail"

---
 timesheet/setup/setup.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/timesheet/setup/setup.inc.php b/timesheet/setup/setup.inc.php
index 1272fd501d..e2096ab504 100644
--- a/timesheet/setup/setup.inc.php
+++ b/timesheet/setup/setup.inc.php
@@ -17,7 +17,7 @@ if (!defined('TIMESHEET_APP'))
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
-$setup_info[TIMESHEET_APP]['version']   = '1.007';
+$setup_info[TIMESHEET_APP]['version']   = '1.7.001';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
 $setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;

From 3687395dab7040a2ec034fd6224e8fab89125e0c Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Mon, 23 Mar 2009 15:23:45 +0000
Subject: [PATCH 101/510] searching and sorting with customfields using the new
 standard custimfield class so_sql_cf

---
 timesheet/inc/class.timesheet_bo.inc.php | 68 +++---------------------
 timesheet/inc/class.timesheet_ui.inc.php | 10 ----
 timesheet/setup/egw_de.lang              |  3 +-
 timesheet/setup/egw_en.lang              |  3 +-
 timesheet/setup/etemplates.inc.php       |  6 +--
 timesheet/templates/default/index.xet    |  8 +--
 6 files changed, 15 insertions(+), 83 deletions(-)

diff --git a/timesheet/inc/class.timesheet_bo.inc.php b/timesheet/inc/class.timesheet_bo.inc.php
index b8d25f2162..40b5b1cc2d 100644
--- a/timesheet/inc/class.timesheet_bo.inc.php
+++ b/timesheet/inc/class.timesheet_bo.inc.php
@@ -22,7 +22,7 @@ if (!defined('TIMESHEET_APP'))
  *
  * @todo Implement sorting&filtering by and searching of custom fields
  */
-class timesheet_bo extends so_sql
+class timesheet_bo extends so_sql_cf
 {
 	/**
 	 * Timesheets config data
@@ -119,11 +119,10 @@ class timesheet_bo extends so_sql
 
 	function __construct()
 	{
-		parent::__construct(TIMESHEET_APP,'egw_timesheet',null,'',true);	// true = use global db object!
+		parent::__construct(TIMESHEET_APP,'egw_timesheet',self::EXTRA_TABLE,'','ts_extra_name','ts_extra_value','ts_id');
 
 		$this->config_data = config::read(TIMESHEET_APP);
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
-		$this->customfields = config::get_customfields(TIMESHEET_APP);
 		if($this->config_data['status_labels']) $this->status_labels =&  $this->config_data['status_labels'];
 
 		$this->tz_offset_s = $GLOBALS['egw']->datetime->tz_offset;
@@ -178,7 +177,7 @@ class timesheet_bo extends so_sql
 		if (!is_array($data))
 		{
 			$save_data = $this->data;
-			$data = $this->read($data,true,false);	// no need to read cf's
+			$data = $this->read($data,true);
 			$this->data = $save_data;
 
 			if (!$data) return null; 	// entry not found
@@ -370,10 +369,9 @@ class timesheet_bo extends so_sql
 	 *
 	 * @param int $ts_id
 	 * @param boolean $ignore_acl=false should the acl be checked
-	 * @param boolean $read_cfs=true also read the custom fields
 	 * @return array/boolean array with timesheet entry, null if timesheet not found or false if no rights
 	 */
-	function read($ts_id,$ignore_acl=false,$read_cfs=true)
+	function read($ts_id,$ignore_acl=false)
 	{
 		//error_log(__METHOD__."($ts_id,$ignore_acl) ".function_backtrace());
 		if (!(int)$ts_id || (int)$ts_id != $this->data['ts_id'] && !parent::read($ts_id))
@@ -384,43 +382,9 @@ class timesheet_bo extends so_sql
 		{
 			return false;	// no read rights
 		}
-		if ($read_cfs && $this->customfields && ($cfs = $this->read_cfs($ts_id)))
-		{
-			$this->data += $cfs[$ts_id];
-		}
 		return $this->data;
 	}
 
-	/**
-	 * Read the cf's of the given ts_id's and evtl names
-	 *
-	 * @param int|array $ts_ids
-	 * @param array $names=null
-	 * @return array with ts_id => array(name => value) pairs
-	 */
-	function read_cfs($ts_ids,$names=null)
-	{
-		//error_log(__METHOD__."(".array2string($ts_ids).",".array2string($names).")");
-		if (!$this->customfields || !$ts_ids)
-		{
-			return array();
-		}
-		$where = array('ts_id' => $ts_ids);
-		if ($names)
-		{
-			foreach($names as $name)
-			{
-				if ($name[0] == '#') $where['ts_extra_name'][] = substr($name,1);
-			}
-		}
-		$cfs = array();
-		foreach($this->db->select(self::EXTRA_TABLE,'ts_id,ts_extra_name,ts_extra_value',$where,__LINE__,__FILE__,false,'',TIMESHEET_APP) as $row)
-		{
-			$cfs[$row['ts_id']]['#'.$row['ts_extra_name']] = $row['ts_extra_value'];
-		}
-		return $cfs;
-	}
-
 	/**
 	 * saves a timesheet entry
 	 *
@@ -446,22 +410,6 @@ class timesheet_bo extends so_sql
 		}
 		if (!($err = parent::save()))
 		{
-			if ($this->customfields)	//saves data of custom fields in timesheet_extra
-			{
-				$this->db->delete(self::EXTRA_TABLE,array('ts_id' => $this->data['ts_id']),__LINE__,__FILE__,TIMESHEET_APP);
-
-				foreach($this->customfields as $name => $data)
-				{
-					if (isset($this->data['#'.$name]) && !empty($this->data['#'.$name]))
-					{
-						$this->db->insert(self::EXTRA_TABLE,array(
-							'ts_id' => $this->data['ts_id'],
-							'ts_extra_name' => $name,
-							'ts_extra_value' => $this->data['#'.$name],
-						),false,__LINE__,__FILE__,TIMESHEET_APP);
-					}
-				}
-			}
 			// notify the link-class about the update, as other apps may be subscribt to it
 			egw_link::notify_update(TIMESHEET_APP,$this->data['ts_id'],$this->data);
 		}
@@ -489,10 +437,6 @@ class timesheet_bo extends so_sql
 		}
 		if (($ret = parent::delete($keys)) && $ts_id)
 		{
-			if ($this->customfields)	//delete custom fields entries
-			{
-				$this->db->delete(self::EXTRA_TABLE,array('ts_id' => $ts_id),__LINE__,__FILE__,TIMESHEET_APP);
-			}
 			// delete all links to timesheet entry $ts_id
 			egw_link::unlink(0,TIMESHEET_APP,$ts_id);
 		}
@@ -521,7 +465,7 @@ class timesheet_bo extends so_sql
 			return false;
 		}
 
-		$this->read($keys,true,false);
+		$this->read($keys,true);
 		$this->data['ts_status'] = $status;
 		if ($this->save($ts_id)!=0) $ret = false;
 
@@ -595,7 +539,7 @@ class timesheet_bo extends so_sql
 	{
 		if (!is_array($entry))
 		{
-			$entry = $this->read( $entry,false,false );		// no need to read cfs
+			$entry = $this->read( $entry,false,false);
 		}
 		if (!$entry)
 		{
diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 81969bdf85..0ffa7f0e5e 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -537,12 +537,6 @@ class timesheet_ui extends timesheet_bo
 		#_debug_array($links);
 		unset($query['col_filter'][0]);
 
-		// query cf's for the displayed rows
-		if ($ids && $this->customfields &&
-		in_array('customfields',$cols_to_show=explode(',',$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['nextmatch-timesheet.index.rows'])))
-		{
-			$cfs = $this->read_cfs($ids,$cols_to_show);
-		}
 		$readonlys = array();
 		$have_cats = false;
 		foreach($rows as &$row)
@@ -576,10 +570,6 @@ class timesheet_ui extends timesheet_bo
 				$row['titleClass'] = 'titleSum';
 				continue;
 			}
-			elseif($cfs && isset($cfs[$row['ts_id']]))
-			{
-				$row += $cfs[$row['ts_id']];
-			}
 			if (!$this->check_acl(EGW_ACL_EDIT,$row))
 			{
 				$readonlys["edit[$row[ts_id]]"] = true;
diff --git a/timesheet/setup/egw_de.lang b/timesheet/setup/egw_de.lang
index 3abadd9d5f..096b36d0e9 100644
--- a/timesheet/setup/egw_de.lang
+++ b/timesheet/setup/egw_de.lang
@@ -66,8 +66,7 @@ saves this entry and add a new one	timesheet	de	Speichert diesen Eintrag und fü
 select a price	timesheet	de	Preis auswählen
 select a project	timesheet	de	Projekt auswählen
 select a status of the timesheet	timesheet	de	einen status auswählen
-select an action or timesheet to modify	timesheet	de	Eine Aktion auswählen
-select an action or timesheet you want to modify...	timesheet	de	Wählen Sie eine Aktion oder einen Stundenzettel aus, der geändert werden soll.
+select action	timesheet	de	Bitte eine Aktion auswählen
 select multiple timeshhets for a further action	timesheet	de	Wählen Sie mehrere Stundenzettel für einen weitere Aktion aus
 show a quantity sum (eg. to sum up negative overtime)	admin	de	Zeige eine Mengensumme (z.B. um negative Ãœberstunden zu summieren)
 start	timesheet	de	Start
diff --git a/timesheet/setup/egw_en.lang b/timesheet/setup/egw_en.lang
index 25fe5d5825..8fcbef477c 100644
--- a/timesheet/setup/egw_en.lang
+++ b/timesheet/setup/egw_en.lang
@@ -66,8 +66,7 @@ saves this entry and add a new one	timesheet	en	Saves this entry and add a new o
 select a price	timesheet	en	Select a price
 select a project	timesheet	en	Select a project
 select a status of the timesheet	timesheet	en	select a status of the timesheet
-select an action or timesheet to modify	timesheet	en	Select an action or timesheet to modify
-select an action or timesheet you want to modify...	timesheet	en	Select an action or timesheet you want to modify...
+select action	timesheet	en	Select action
 select multiple timeshhets for a further action	timesheet	en	Select multiple timeshhets for a further action
 show a quantity sum (eg. to sum up negative overtime)	admin	en	Show a quantity sum (eg. to sum up negative overtime)
 start	timesheet	en	Start
diff --git a/timesheet/setup/etemplates.inc.php b/timesheet/setup/etemplates.inc.php
index 1b023b669d..a352f39103 100644
--- a/timesheet/setup/etemplates.inc.php
+++ b/timesheet/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application timesheet
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-03-23 10:43
+	* generated by soetemplate::dump4setup() 2009-03-23 16:17
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package timesheet
@@ -103,7 +103,7 @@ $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '',
 
 $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164373176',);
 
-$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"use_all";s:5:"label";s:11:"whole query";s:8:"onchange";s:128:"if (this.checked==true && !confirm(\'Apply the action on the whole query, NOT only the shown timesheets!!!\')) this.checked=false;";s:4:"help";s:69:"Apply the action on the whole query, NOT only the shown timesheets!!!";}i:2;a:5:{s:4:"type";s:6:"select";s:8:"onchange";s:16:"do_action(this);";s:4:"size";s:51:"Select an action or timesheet you want to modify...";s:4:"name";s:6:"action";s:4:"help";s:39:"Select an action or timesheet to modify";}i:3;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237399516',);
+$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"use_all";s:5:"label";s:11:"whole query";s:8:"onchange";s:128:"if (this.checked==true && !confirm(\'Apply the action on the whole query, NOT only the shown timesheets!!!\')) this.checked=false;";s:4:"help";s:69:"Apply the action on the whole query, NOT only the shown timesheets!!!";}i:2;a:5:{s:4:"type";s:6:"select";s:8:"onchange";s:16:"do_action(this);";s:4:"size";s:13:"Select action";s:4:"name";s:6:"action";s:4:"help";s:13:"Select action";}i:3;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237399516',);
 
 $templ_data[] = array('name' => 'timesheet.index.add','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}','size' => '','style' => '','modified' => '1158042543',);
 
@@ -113,5 +113,5 @@ $templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' =
 
 $templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@no_ts_total";s:1:"F";s:17:",@no_ts_unitprice";s:1:"E";s:16:",@no_ts_quantity";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1234522226',);
 
-$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@no_ts_total";s:1:"F";s:17:",@no_ts_unitprice";s:1:"E";s:16:",@no_ts_quantity";s:1:"I";s:14:",@no_ts_status";}i:1;a:11:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:9:"ts_status";s:8:"onchange";i:1;s:4:"size";s:10:"All status";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"K";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:8:",noPrint";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:9:"Check all";s:4:"size";s:5:"check";s:4:"name";s:9:"check_all";s:6:"needed";s:1:"1";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";}}}i:2;a:11:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:6:"select";s:4:"name";s:17:"${row}[ts_status]";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"K";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";i:4;a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:16:"$row_cont[ts_id]";s:4:"name";s:9:"checked[]";s:4:"help";s:47:"Select multiple timeshhets for a further action";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237399465',);
+$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@no_ts_total";s:1:"F";s:17:",@no_ts_unitprice";s:1:"E";s:16:",@no_ts_quantity";s:1:"I";s:14:",@no_ts_status";}i:1;a:11:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:9:"ts_status";s:8:"onchange";i:1;s:4:"size";s:10:"All status";}s:1:"J";a:2:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";}s:1:"K";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:8:",noPrint";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}i:2;a:7:{s:4:"type";s:6:"button";s:5:"label";s:9:"Check all";s:4:"size";s:5:"check";s:4:"name";s:9:"check_all";s:6:"needed";s:1:"1";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";}}}i:2;a:11:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:6:"select";s:4:"name";s:17:"${row}[ts_status]";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"K";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";i:4;a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:16:"$row_cont[ts_id]";s:4:"name";s:9:"checked[]";s:4:"help";s:47:"Select multiple timeshhets for a further action";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237399465',);
 
diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index 07af6eef72..dbd6835c7e 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -65,7 +65,7 @@
 					</vbox>
 					<nextmatch-filterheader id="ts_owner" options="User" no_lang="1" class="$cont[ownerClass]"/>
 					<nextmatch-filterheader id="ts_status" onchange="1" options="All status"/>
-					<nextmatch-customfields id="customfields" readonly="true"/>
+					<nextmatch-customfields id="customfields"/>
 					<hbox class="noPrint">
 						<description value="Actions" class="noPrint" align="right"/>
 						<button label="Check all" image="check" id="check_all" needed="1" statustext="Check all" onclick="toggle_all(this.form,form::name('checked[]')); return false;"/>
@@ -96,7 +96,7 @@
 						<button image="view" label="View" id="view[$row_cont[ts_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.view&amp;ts_id=$row_cont[ts_id]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" statustext="View this entry"/>
 						<button image="edit" label="Edit" id="edit[$row_cont[ts_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;ts_id=$row_cont[ts_id]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
 						<button image="delete" label="Delete" id="delete[$row_cont[ts_id]]" statustext="Delete this entry" onclick="return confirm('Delete this entry');"/>
-						<checkbox options="$row_cont[ts_id]" id="checked[]" statustext="Select multiple contacts for a further action"/>
+						<checkbox options="$row_cont[ts_id]" id="checked[]" statustext="Select multiple timeshhets for a further action"/>
 					</hbox>
 				</row>
 			</rows>
@@ -126,9 +126,9 @@
 				<row class="noPrint">
 					<button label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
 					<hbox align="right">
-						<checkbox id="use_all" label="whole query" onchange="if (this.checked==true &amp;&amp; !confirm('Apply the action on the whole query, NOT only the shown contacts!!!')) this.checked=false;" statustext="Apply the action on the whole query, NOT only the shown contacts!!!"/>
+						<checkbox id="use_all" label="whole query" onchange="if (this.checked==true &amp;&amp; !confirm('Apply the action on the whole query, NOT only the shown timesheets!!!')) this.checked=false;" statustext="Apply the action on the whole query, NOT only the shown timesheets!!!"/>
 						<menulist>
-							<menupopup onchange="do_action(this);" options="Select an action or timesheet you want to modify..." no_lang="1" id="action" statustext="Select an action or timesheet to modify"/>
+							<menupopup onchange="do_action(this);" options="Select action" id="action" statustext="Select action"/>
 						</menulist>
 						<button image="arrow_ltr" label="Check all" id="check_all" statustext="Check all" onclick="toggle_all(this.form,form::name('nm[rows][checked][]')); return false;" needed="1" class="checkAllArrow"/>
 					</hbox>

From 9d55dfa69e4968f3ee1b16a2a2912c59eb4e8a09 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Mar 2009 08:06:05 +0000
Subject: [PATCH 102/510] "fixed not working status change of participants of
 type email ('e')"

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

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index e7cf74a510..83cf700852 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -856,7 +856,10 @@ ORDER BY cal_user_type, cal_usre_id
 			TENTATIVE	=> 'T',
 			ACCEPTED	=> 'A'
 		);
-		if (!(int)$cal_id || !(int)$user_id) return false;
+		if (!(int)$cal_id || !(int)$user_id && $user_type != 'e')
+		{
+			return false;
+		}
 
 		if (is_numeric($status)) $status = $status_code_short[$status];
 
@@ -883,6 +886,8 @@ ORDER BY cal_user_type, cal_usre_id
 				'cal_status'     => $status,
 			),$where,__LINE__,__FILE__,'calendar');
 		}
+		$ret = $this->db->affected_rows();
+		error_log(__METHOD__."($cal_id,$user_type,$user_id,$status,$recur_date) = $ret");
 		return $this->db->affected_rows();
 	}
 

From 21338a83277215ae51f3d3f350531cad975b00da Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Mar 2009 09:33:28 +0000
Subject: [PATCH 103/510] "added filemtime to force browser to reload
 javascript file after a modification"

---
 notifications/inc/hook_after_navbar.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/notifications/inc/hook_after_navbar.inc.php b/notifications/inc/hook_after_navbar.inc.php
index 68a9b47619..e343bc3d83 100644
--- a/notifications/inc/hook_after_navbar.inc.php
+++ b/notifications/inc/hook_after_navbar.inc.php
@@ -15,13 +15,14 @@
 $notification_config = config::read('notifications');
 if ($notification_config['popup_enable']) {
 	$GLOBALS['egw']->translation->add_app('notifications');
-	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup.js'. '" type="text/javascript"></script>';
+	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup.js?'.
+		filemtime(EGW_SERVER_ROOT.'/notifications/js/notificationajaxpopup.js'). '" type="text/javascript"></script>';
 	echo '<script type="text/javascript">egwpopup_init();</script>';
 	echo '
 		<div id="egwpopup" style="display: none; z-index: 999;">
 			<div id="egwpopup_header">'.lang('Notification').'</div>
 			<div id="egwpopup_message"></div>
-			<div id="egwpopup_footer">	
+			<div id="egwpopup_footer">
 				<input id="egwpopup_ok_button" type="submit" value="'. lang('ok'). '" onClick="egwpopup_button_ok();">
 			</div>
 		</div>

From d741545f59b913316fbb2f31b4463c664e4150a8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Mar 2009 11:28:17 +0000
Subject: [PATCH 104/510] "fixed  \"whole query\" checkbox leads to not working
 selection after the action"

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

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 0ffa7f0e5e..e626be33b5 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -409,7 +409,7 @@ class timesheet_ui extends timesheet_bo
 			}
 		}
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
-		$GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
+		if (!$id_only) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
 		$query = $query_in;	// keep the original query
 		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
 		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;

From e966c73febeceafcd31af56a28b7e8e1b04f1776 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Mar 2009 13:56:22 +0000
Subject: [PATCH 105/510] "make profind and get_eacl fail silent, if backend
 does not support them"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 271084d97d..6497922f03 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -720,7 +720,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function get_eacl($path)
 	{
-		return self::_call_on_backend('get_eacl',array($path));
+		return self::_call_on_backend('get_eacl',array($path),true);	// true = fail silent (no PHP Warning)
 	}
 
 	/**
@@ -751,7 +751,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function propfind($path,$ns=self::DEFAULT_PROP_NAMESPACE)
 	{
-		return self::_call_on_backend('propfind',array($path,$ns));
+		return self::_call_on_backend('propfind',array($path,$ns),true);	// true = fail silent (no PHP Warning)
 	}
 
 	/**
@@ -833,7 +833,15 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function int2mode( $mode )
 	{
-		if($mode & 0x1000)     // FIFO pipe
+		if(($mode & self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
+		{
+			$sP = 'l';
+		}
+		elseif(($mode & 0xC000) == 0xC000) // Socket
+		{
+			$sP = 's';
+		}
+		elseif($mode & 0x1000)     // FIFO pipe
 		{
 			$sP = 'p';
 		}
@@ -853,14 +861,6 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			$sP = '-';
 		}
-		elseif($mode & 0xA000) // Symbolic Link
-		{
-			$sP = 'l';
-		}
-		elseif($mode & 0xC000) // Socket
-		{
-			$sP = 's';
-		}
 		else                         // UNKNOWN
 		{
 			$sP = 'u';

From 5501dd0fc3f496466a9b5f5c97b7350b039289f9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Mar 2009 13:58:01 +0000
Subject: [PATCH 106/510] "fixed some problem with the new symlinks (specially
 between different stream-wrappers) and added a permanent loggin facility"

---
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 111 +++++++++---------
 1 file changed, 53 insertions(+), 58 deletions(-)

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 6a0b5ebd6d..b5ca3b3340 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -7,7 +7,7 @@
  * @package api
  * @subpackage vfs
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -17,15 +17,6 @@
  * The new vfs stream wrapper uses a kind of fstab to mount different filesystems / stream wrapper types
  * together for eGW's virtual file system.
  *
- * @ToDo extended ACL with inheritance and specific rights for users or groups
- * 	Backends can implement them, in which case they get stored independent of the current mount-points.
- *  If the backend does not implement them, they get stored by the VFS under the final URL of the backend,
- *  to also allow mounts to change. The URL's to these extended attributes need to be renamed, when the
- *  file or an underlaying directory get's renamed. That's the task of the backend, if it chooses to
- *  implement extended ACL itself.
- * @ToDo storage for WebDAV properties
- * @ToDo implement the necessary function of WebDAV locks
- *
  * @link http://www.php.net/manual/en/function.stream-wrapper-register.php
  */
 class vfs_stream_wrapper implements iface_stream_wrapper
@@ -54,6 +45,15 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	const MODE_LINK = 0120000;
 
+	/**
+	 * How much should be logged to the apache error-log
+	 *
+	 * 0 = Nothing
+	 * 1 = only errors
+	 * 2 = all function calls and errors (contains passwords too!)
+	 */
+	const LOG_LEVEL = 1;
+
 	/**
 	 * Our fstab in the form mount-point => url
 	 *
@@ -117,13 +117,18 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		if (!($stat = self::url_stat($path,$resolve_last_symlink?0:STREAM_URL_STAT_LINK)) && !$file_exists)
 		{
 			$ret = self::check_symlink_components($path,0,$url);
-			//error_log(__METHOD__."('$path',$file_exists) check_symlink_components()=$ret, url='$url'");
+			if (self::LOG_LEVEL > 1) $log = " (check_symlink_components('$path',0,'$url') = $ret)";
 		}
 		else
 		{
 			$url = $stat['url'];
 		}
-		//error_log(__METHOD__."($path,file_exists=$file_exists,resolve_last_symlink=$resolve_last_symlink) = '$url'");
+		// if the url resolves to a symlink to the vfs, resolve this vfs:// url direct
+		if ($url && parse_url($url,PHP_URL_SCHEME) == self::SCHEME)
+		{
+			$url = self::resolve_url(parse_url($url,PHP_URL_PATH));
+		}
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,file_exists=$file_exists,resolve_last_symlink=$resolve_last_symlink) = '$url'$log");
 		return $url;
 	}
 
@@ -140,6 +145,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		// we do some caching here
 		if (isset($cache[$path]))
 		{
+			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '{$cache[$path]}' (from cache)");
 			return $cache[$path];
 		}
 		// setting default user, passwd and domain, if it's not contained int the url
@@ -157,6 +163,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 
 		if (!empty($parts['scheme']) && $parts['scheme'] != self::SCHEME)
 		{
+			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '$path' (path is already an url)");
 			return $path;	// path is already a non-vfs url --> nothing to do
 		}
 		if (empty($parts['path'])) $parts['path'] = '/';
@@ -177,11 +184,11 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				if ($parts['query']) $url .= '?'.$parts['query'];
 				if ($parts['fragment']) $url .= '#'.$parts['fragment'];
 
-				//error_log(__METHOD__."($path) = $url");
+				if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '$url'");
 				return $cache[$path] = $url;
 			}
 		}
-		//error_log(__METHOD__."($path) can't resolve path!\n");
+		if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path') can't resolve path!\n");
 		trigger_error(__METHOD__."($path) can't resolve path!\n",E_USER_WARNING);
 		return false;
 	}
@@ -618,34 +625,30 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	function dir_opendir ( $path, $options )
 	{
-		//error_log(__METHOD__." called with ".$path);
 		$this->opened_dir = $this->extra_dirs = null;
 		$this->extra_dir_ptr = 0;
 
 		if (!($this->opened_dir_url = self::resolve_url_symlinks($path)))
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) resolve_url_symlinks() failed!");
 			return false;
 		}
-
 		if (!($this->opened_dir = opendir($this->opened_dir_url)))
 		{
-			//error_log(__METHOD__." dir failed: ".$this->opened_dir);
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) opendir($this->opened_dir_url) failed!");
 			return false;
 		}
 		$this->opened_dir_writable = egw_vfs::check_access($this->opened_dir_url,egw_vfs::WRITABLE);
-		#error_log(__METHOD__." check for ".$this->opened_dir_url);
 		// check our fstab if we need to add some of the mountpoints
-		$basepath = parse_url($this->opened_dir_url,PHP_URL_PATH);
-		#error_log(__METHOD__." basepath here: ".print_r($basepath,true));
+		$basepath = parse_url($path,PHP_URL_PATH);
 		foreach(self::$fstab as $mounted => $nul)
 		{
-			#error_log(__METHOD__." dirname mounted: ".print_r(dirname($mounted),true));
-			if ((dirname($mounted) == $basepath || dirname($mounted)."/" == $basepath) && $mounted != '/')
+			if ((dirname($mounted) == $basepath || dirname($mounted).'/' == $basepath) && $mounted != '/')
 			{
-				#error_log(__METHOD__." mounted dir: ".print_r($mounted,true));
 				$this->extra_dirs[] = basename($mounted);
 			}
 		}
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( $path,$options): opendir($this->opened_dir_url)=$this->opened_dir, extra_dirs=".array2string($this->extra_dirs).', '.function_backtrace());
 		return true;
 	}
 
@@ -679,13 +682,13 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function url_stat ( $path, $flags, $try_create_home=true, $check_symlink_components=true )
 	{
-		//error_log(__METHOD__."('$path',$flags)");
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components)");
 
 		if (!($url = self::resolve_url($path)))
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!");
 			return false;
 		}
-		//error_log(__METHOD__."('$path',$flags) calling stat($url)");
 		if ($flags & STREAM_URL_STAT_LINK)
 		{
 			$stat = @lstat($url);	// suppressed the stat failed warnings
@@ -696,17 +699,12 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 
 			if ($stat && ($stat['mode'] & self::MODE_LINK) &&  ($l=$lpath = self::readlink($url)))
 			{
-				if ($lpath[0] != '/')	// contact releative path
+				if ($lpath[0] != '/')	// concat relative path
 				{
-					$url = egw_vfs::concat($url,'../'.$lpath);
+					$lpath = egw_vfs::concat(parse_url($path,PHP_URL_PATH),'../'.$lpath);
 				}
-				else	// or replace absolute path in url
-				{
-					$url_parts = parse_url($url);
-					$url_parts['path'] = $lpath;
-					$url = egw_vfs::build_url($url_parts);
-				}
-				//error_log(__METHOD__."($path,$flags) symlink found and resolved to $url");
+				$url = egw_vfs::PREFIX.$lpath;
+				if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$flags) symlink found and resolved to $url");
 				$stat = @stat($url);
 			}
 		}
@@ -754,37 +752,34 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	{
 		if (is_null($url) && !($url = self::resolve_url($path)))
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags,'$url') can NOT resolve path: ".function_backtrace(1));
 			return false;
 		}
-		//echo "<p>".__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1)."</p>\n";
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1));
+
 		while (($rel_path = egw_vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
 		       ($url = egw_vfs::dirname($url)))
 		{
-			$stat = self::url_stat($url,0,false,false);
-			//echo "<p>rel_path='$rel_path', stat(url='$url')=".array2string($stat)."</p>\n";
 			if (($stat = self::url_stat($url,0,false,false)))
 			{
 				if (is_link($url) && ($lpath = self::readlink($url)))
 				{
-					//echo "<p>rel_path='$rel_path', url='$url': lpath='$lpath'\n";
+					if (self::LOG_LEVEL > 1) $log = "rel_path='$rel_path', url='$url': lpath='$lpath'";
+
 					if ($lpath[0] != '/')
 					{
-						$url = egw_vfs::concat($url,'../'.$lpath);
+						$lpath = egw_vfs::concat(parse_url($url,PHP_URL_PATH),'../'.$lpath);
 					}
-					else
-					{
-						$url_parts = parse_url($url);
-						$url_parts['path'] = $lpath;
-						$url = egw_vfs::build_url($url_parts);
-					}
-					$url = egw_vfs::concat($url,$rel_path);
-					//echo "--> <b>url='$url'</b></p>\n";
+					$url = egw_vfs::PREFIX.egw_vfs::concat($lpath,$rel_path);
+					if (self::LOG_LEVEL > 1) error_log("$log --> lpath='$lpath', url='$url'");
 					return self::url_stat($url,$flags);
 				}
 				$url = egw_vfs::concat($url,$rel_path);
+				if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url') returning null");
 				return null;
 			}
 		}
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url') returning false");
 		return false;	// $path does not exist
 	}
 
@@ -800,21 +795,21 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	function dir_readdir ( )
 	{
-		#error_log(__METHOD__." called.");
 		if ($this->extra_dirs && count($this->extra_dirs) > $this->extra_dir_ptr)
 		{
-			return $this->extra_dirs[$this->extra_dir_ptr++];
+			$file = $this->extra_dirs[$this->extra_dir_ptr++];
 		}
-		// only return children readable by the user, if dir is not writable
-		do {
-			//error_log(__METHOD__." called with:".$this->opened_dir_url);
-			$file = readdir($this->opened_dir);
-			//error_log(__METHOD__." got:".$file);
+		else
+		{
+			// only return children readable by the user, if dir is not writable
+			do {
+				$file = readdir($this->opened_dir);
+			}
+			while($file !== false && (is_array($this->extra_dirs) && in_array($file,$this->extra_dirs) ||	// dont return mountpoints twice
+				self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
+				!egw_vfs::check_access(egw_vfs::concat($this->opened_dir_url,$file),egw_vfs::READABLE)));
 		}
-		while($file !== false && (is_array($this->extra_dirs) && in_array($file,$this->extra_dirs) ||	// dont return mountpoints twice
-			self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
-			!egw_vfs::check_access(egw_vfs::concat($this->opened_dir_url,$file),egw_vfs::READABLE)));
-
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( $this->opened_dir ) = '$file'");
 		return $file;
 	}
 

From 3927555c22aa54944b7ad548f5d608f181dec3b4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Mar 2009 16:27:29 +0000
Subject: [PATCH 107/510] "show symlinks in ls -l"

---
 filemanager/cli.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/filemanager/cli.php b/filemanager/cli.php
index fe715c4627..dd444c030f 100755
--- a/filemanager/cli.php
+++ b/filemanager/cli.php
@@ -655,8 +655,11 @@ function do_stat($url,$long=false,$numeric=false,$full_path=false)
 		$size = hsize($stat['size']);
 		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
 		$nlink = $stat['nlink'];
-
-		echo "$perms $nlink\t$uid\t$gid\t$size\t$mtime\t$bname\n";
+		if (($stat['mode'] & 0xA000) == 0xA000)
+		{
+			$symlink = " -> ".(class_exists('egw_vfs') ? egw_vfs::readlink($url) : readlink($url));
+		}
+		echo "$perms $nlink\t$uid\t$gid\t$size\t$mtime\t$bname$symlink\n";
 	}
 	else
 	{
@@ -788,7 +791,15 @@ function do_find($bases,$options)
  */
 function int2mode( $mode )
 {
-	if($mode & 0x1000)     // FIFO pipe
+	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	{
+		$sP = 'l';
+	}
+	elseif(($mode & 0xC000) == 0xC000) // Socket
+	{
+		$sP = 's';
+	}
+	elseif($mode & 0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
@@ -808,14 +819,6 @@ function int2mode( $mode )
 	{
 		$sP = '-';
 	}
-	elseif($mode & 0xA000) // Symbolic Link
-	{
-		$sP = 'l';
-	}
-	elseif($mode & 0xC000) // Socket
-	{
-		$sP = 's';
-	}
 	else                         // UNKNOWN
 	{
 		$sP = 'u';

From cc9d7445c3aa48961b80e98e1971b8061bfb343f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 24 Mar 2009 17:19:38 +0000
Subject: [PATCH 108/510] "fix concat to allow filenames containing \"..\""

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 6497922f03..8a743f3d4c 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -1004,14 +1004,12 @@ class egw_vfs extends vfs_stream_wrapper
 		$url = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
 
 		// now normalize the path (remove "/something/..")
-		while (strpos($url,'..') !== false)
+		while (strpos($url,'/../') !== false)
 		{
-			list($a,$b) = explode('..',$url,2);
+			list($a,$b) = explode('/../',$url,2);
 			$a = explode('/',$a);
 			array_pop($a);
-			array_pop($a);
 			$b = explode('/',$b);
-			if ($b[0] === '') array_shift($b);
 			$url = implode('/',array_merge($a,$b));
 		}
 		return $url.($query ? '?'.$query : '');

From 3b0f5e5ab2d1cdbde6fe3afdd08ff23d9eb9ab06 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 25 Mar 2009 09:03:36 +0000
Subject: [PATCH 109/510] PDO compatibilty function fetchSingle() was renamed
 in PDO to fetchColumn($column_num=0): now both are available in ADOdb,
 thought fetchSingle is depricated and should no longer be used!

---
 phpgwapi/inc/adodb/adodb.inc.php  | 1428 +++++++++++++++--------------
 phpgwapi/inc/class.egw_db.inc.php |    4 +-
 2 files changed, 727 insertions(+), 705 deletions(-)

diff --git a/phpgwapi/inc/adodb/adodb.inc.php b/phpgwapi/inc/adodb/adodb.inc.php
index d7fecc76e6..9e6cab9fb4 100644
--- a/phpgwapi/inc/adodb/adodb.inc.php
+++ b/phpgwapi/inc/adodb/adodb.inc.php
@@ -1,9 +1,9 @@
-<?php 
+<?php
 /*
  * Set tabs to 4 for best viewing.
- * 
+ *
  * Latest version is available at http://adodb.sourceforge.net
- * 
+ *
  * This is the main include file for ADOdb.
  * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
  *
@@ -12,15 +12,15 @@
  */
 
 /**
-	\mainpage 	
-	
+	\mainpage
+
 	 @version V4.65 22 July 2005  (c) 2000-2005 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
-	
-	PHP's database access functions are not standardised. This creates a need for a database 
-	class library to hide the differences between the different database API's (encapsulate 
+
+	PHP's database access functions are not standardised. This creates a need for a database
+	class library to hide the differences between the different database API's (encapsulate
 	the differences) so we can easily switch databases.
 
 	We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2,
@@ -30,41 +30,41 @@
 
 	Latest Download at http://php.weblogs.com/adodb<br>
 	Manual is at http://php.weblogs.com/adodb_manual
-	  
+
  */
- 
+
  if (!defined('_ADODB_LAYER')) {
  	define('_ADODB_LAYER',1);
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CONSTANT DEFINITIONS
-	//==============================================================================================	
+	//==============================================================================================
 
 
-	/** 
+	/**
 	 * Set ADODB_DIR to the directory where this file resides...
 	 * This constant was formerly called $ADODB_RootPath
 	 */
 	if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
-	
-	//==============================================================================================	
-	// GLOBAL VARIABLES
-	//==============================================================================================	
 
-	GLOBAL 
+	//==============================================================================================
+	// GLOBAL VARIABLES
+	//==============================================================================================
+
+	GLOBAL
 		$ADODB_vers, 		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
 		$ADODB_EXTENSION,   // ADODB extension installed
 		$ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
 	 	$ADODB_FETCH_MODE;	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// GLOBAL SETUP
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
-	
+
 	//********************************************************//
 	/*
 	Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
@@ -83,32 +83,32 @@
 
 
 	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
+
 		define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
-	
+
 	// allow [ ] @ ` " and . in table names
 		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-	
+
 	// prefetching used by oracle
 		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
+
+
 	/*
 	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
 	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
+
  		0 = assoc lowercase field names. $rs->fields['orderid']
 		1 = assoc uppercase field names. $rs->fields['ORDERID']
 		2 = use native-case field names. $rs->fields['OrderID']
 	*/
-	
+
 		define('ADODB_FETCH_DEFAULT',0);
 		define('ADODB_FETCH_NUM',1);
 		define('ADODB_FETCH_ASSOC',2);
 		define('ADODB_FETCH_BOTH',3);
-		
+
 		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
+
 		// PHP's version scheme makes converting to numbers difficult - workaround
 		$_adodb_ver = (float) PHP_VERSION;
 		if ($_adodb_ver >= 5.0) {
@@ -123,17 +123,17 @@
 			define('ADODB_PHPVER',0x4000);
 		}
 	}
-	
+
 	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 
-	
+
 	/**
 	 	Accepts $src and $dest arrays, replacing string $data
 	*/
 	function ADODB_str_replace($src, $dest, $data)
 	{
 		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
+
 		$s = reset($src);
 		$d = reset($dest);
 		while ($s !== false) {
@@ -143,16 +143,16 @@
 		}
 		return $data;
 	}
-	
+
 	function ADODB_Setup()
 	{
-	GLOBAL 
+	GLOBAL
 		$ADODB_vers, 		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
 	 	$ADODB_FETCH_MODE,
 		$ADODB_FORCE_TYPE;
-		
+
 		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
 		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
 
@@ -161,58 +161,58 @@
 			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
 		} else {
 			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+			if (strpos($ADODB_CACHE_DIR,'://') !== false)
 				die("Illegal path http:// or ftp://");
 		}
-		
-			
+
+
 		// Initialize random number generator for randomizing cache flushes
 		srand(((double)microtime())*1000000);
-		
+
 		/**
 		 * ADODB version as a string.
 		 */
 		$ADODB_vers = 'V4.65 22 July 2005  (c) 2000-2005 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
-	
+
 		/**
-		 * Determines whether recordset->RecordCount() is used. 
+		 * Determines whether recordset->RecordCount() is used.
 		 * Set to false for highest performance -- RecordCount() will always return -1 then
 		 * for databases that provide "virtual" recordcounts...
 		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true;
 	}
-	
-	
-	//==============================================================================================	
+
+
+	//==============================================================================================
 	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	ADODB_Setup();
 
-	//==============================================================================================	
+	//==============================================================================================
 	// CLASS ADOFieldObject
-	//==============================================================================================	
+	//==============================================================================================
 	/**
 	 * Helper class for FetchFields -- holds info on a column
 	 */
-	class ADOFieldObject { 
+	class ADOFieldObject {
 		var $name = '';
 		var $max_length=0;
 		var $type="";
 /*
 		// additional fields by dannym... (danny_milo@yahoo.com)
-		var $not_null = false; 
+		var $not_null = false;
 		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
 		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
 
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
+		var $has_default = false; // this one I have done only in mysql and postgres for now ...
 			// others to come (dannym)
 		var $default_value; // default, if any, and supported. Check has_default first.
 */
 	}
-	
 
-	
+
+
 	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
 	{
 		//print "Errorno ($fn errno=$errno m=$errmsg) ";
@@ -222,27 +222,27 @@
 			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
 		}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADOConnection
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
+	 */
 	class ADOConnection {
 	//
-	// PUBLIC VARS 
+	// PUBLIC VARS
 	//
 	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
+	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql
+	var $database = '';			/// Name of database to be used.
+	var $host = ''; 			/// The hostname of the database server
+	var $user = ''; 			/// The username which is used to connect to the database server.
 	var $password = ''; 		/// Password for the username. For security, we no longer store it.
 	var $debug = false; 		/// if set to true will output sql statements
 	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
+	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase
 	var $substr = 'substr';		/// substring operator
 	var $length = 'length';		/// string length ofperator
 	var $random = 'rand()';		/// random function
@@ -277,9 +277,9 @@
 	var $sysDate = false; /// name of function that returns the current date
 	var $sysTimeStamp = false; /// name of function that returns the current timestamp
 	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
+
 	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
+	var $numCacheHits = 0;
 	var $numCacheMisses = 0;
 	var $pageExecuteCountRows = true;
 	var $uniqueSort = false; /// indicates that all fields in order by must be unique
@@ -288,73 +288,73 @@
 	var $ansiOuter = false; /// whether ansi outer join syntax supported
 	var $autoRollback = false; // autoRollback on PConnect().
 	var $poorAffectedRows = false; // affectedRows not working or unreliable
-	
+
 	var $fnExecute = false;
 	var $fnCacheExecute = false;
 	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
 	var $rsPrefix = "ADORecordSet_";
-	
+
 	var $autoCommit = true; 	/// do not modify this yourself - actually private
 	var $transOff = 0; 			/// temporarily disable transactions
 	var $transCnt = 0; 			/// count of nested transactions
-	
+
 	var $fetchMode=false;
 	 //
 	 // PRIVATE VARS
 	 //
 	var $_oldRaiseFn =  false;
 	var $_transOK = null;
-	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
+	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.
 	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
-								/// then returned by the errorMsg() function	
-	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
+								/// then returned by the errorMsg() function
+	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8
 	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
+
 	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
 	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
-	
 
-	
+
+
 	/**
 	 * Constructor
 	 */
-	function ADOConnection()			
+	function ADOConnection()
 	{
 		die('Virtual Class -- cannot instantiate');
 	}
-	
+
 	function Version()
 	{
 	global $ADODB_vers;
-	
+
 		return (float) substr($ADODB_vers,1);
 	}
-	
+
 	/**
 		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
+
+		@returns An array with 2 elements: $arr['string'] is the description string,
 			and $arr[version] is the version (also a string).
 	*/
 	function ServerInfo()
 	{
 		return array('description' => '', 'version' => '');
 	}
-	
+
 	function IsConnected()
 	{
     	return !empty($this->_connectionID);
 	}
-	
+
 	function _findvers($str)
 	{
 		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
 		else return '';
 	}
-	
+
 	/**
 	* All error messages go through this bottleneck function.
 	* You can define your own handler by defining the function name in ADODB_OUTP.
@@ -362,7 +362,7 @@
 	function outp($msg,$newline=true)
 	{
 	global $ADODB_FLUSH,$ADODB_OUTP;
-	
+
 		if (defined('ADODB_OUTP')) {
 			$fn = ADODB_OUTP;
 			$fn($msg,$newline);
@@ -372,25 +372,25 @@
 			$fn($msg,$newline);
 			return;
 		}
-		
+
 		if ($newline) $msg .= "<br>\n";
-		
+
 		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
 		else echo strip_tags($msg);
-	
-		
-		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
-		
+
+
+		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan
+
 	}
-	
+
 	function Time()
 	{
 		$rs =& $this->_Execute("select $this->sysTimeStamp");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * Connect to database
 	 *
@@ -401,15 +401,15 @@
 	 * @param [forceNew]		force new connection
 	 *
 	 * @return true or false
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
+	 */
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false)
 	{
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = false;
 		if ($forceNew) {
 			if ($rez=$this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
 		} else {
@@ -423,21 +423,21 @@
 			$err = "Missing extension for ".$this->dataProvider;
 			$ret = 0;
 		}
-		if ($fn = $this->raiseErrorFn) 
+		if ($fn = $this->raiseErrorFn)
 			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		
-		
+
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
-	}	
-	
+	}
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
 	}
-	
-	
+
+
 	/**
 	 * Always force a new connection to database - currently only works with oracle
 	 *
@@ -447,12 +447,12 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
+	 */
+	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
 		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
 	}
-	
+
 	/**
 	 * Establish persistent connect to database
 	 *
@@ -462,18 +462,18 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return return true or false
-	 */	
+	 */
 	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
-		if (defined('ADODB_NEVER_PERSIST')) 
+		if (defined('ADODB_NEVER_PERSIST'))
 			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
+
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = $argPassword;
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = true;
 		if ($rez = $this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
 		if (isset($rez)) {
 			$err = $this->ErrorMsg();
@@ -486,7 +486,7 @@
 		if ($fn = $this->raiseErrorFn) {
 			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
 		}
-		
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
@@ -494,11 +494,11 @@
 
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysDate;
 		return $col; // child class implement
 	}
-	
+
 	/**
 	 * Should prepare the sql statement and return the stmt resource.
 	 * For databases that do not support this, we return the $sql. To ensure
@@ -513,12 +513,12 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function Prepare($sql)
 	{
 		return $sql;
 	}
-	
+
 	/**
 	 * Some databases, eg. mssql require a different function for preparing
 	 * stored procedures. So we cannot use Prepare().
@@ -532,12 +532,12 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function PrepareSP($sql,$param=true)
 	{
 		return $this->Prepare($sql,$param);
 	}
-	
+
 	/**
 	* PEAR DB Compat
 	*/
@@ -545,7 +545,7 @@
 	{
 		return $this->qstr($s,false);
 	}
-	
+
 	/**
 	 Requested by "Karsten Dambekalns" <k.dambekalns@fishfarm.de>
 	*/
@@ -558,18 +558,18 @@
 	{
 		$s = $this->qstr($s,false);
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function ErrorNative()
 	{
 		return $this->ErrorNo();
 	}
 
-	
+
    /**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function nextId($seq_name)
 	{
@@ -587,19 +587,19 @@
 	{
 		return false;
 	}
-	
+
 	function CommitLock($table)
 	{
 		return $this->CommitTrans();
 	}
-	
+
 	function RollbackLock($table)
 	{
 		return $this->RollbackTrans();
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*
 	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
 	* 	for easy porting :-)
@@ -608,20 +608,20 @@
 	* @returns		The previous fetch mode
 	*/
 	function SetFetchMode($mode)
-	{	
+	{
 		$old = $this->fetchMode;
 		$this->fetchMode = $mode;
-		
+
 		if ($old === false) {
 		global $ADODB_FETCH_MODE;
 			return $ADODB_FETCH_MODE;
 		}
 		return $old;
 	}
-	
+
 
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function &Query($sql, $inputarr=false)
 	{
@@ -630,18 +630,18 @@
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
 	function &LimitQuery($sql, $offset, $count, $params=false)
 	{
-		$rs = &$this->SelectLimit($sql, $count, $offset, $params); 
+		$rs = &$this->SelectLimit($sql, $count, $offset, $params);
 		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -649,13 +649,13 @@
 	{
 		return $this->Close();
 	}
-	
+
 	/*
 		 Returns placeholder for parameter, eg.
 		 $DB->Param('a')
-		 
+
 		 will return ':a' for Oracle, and '?' for most other databases...
-		 
+
 		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
 		 	pass in Param(false) before setting the first parameter.
 	*/
@@ -663,7 +663,7 @@
 	{
 		return '?';
 	}
-	
+
 	/*
 		InParameter and OutParameter are self-documenting versions of Parameter().
 	*/
@@ -671,22 +671,22 @@
 	{
 		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
 	}
-	
+
 	/*
 	*/
 	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
+
 	}
-	
-	/* 
+
+	/*
 	Usage in oracle
 		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
 		$db->Parameter($stmt,$id,'myid');
 		$db->Parameter($stmt,$group,'group',64);
 		$db->Execute();
-		
+
 		@param $stmt Statement returned by Prepare() or PrepareSP().
 		@param $var PHP variable to bind to
 		@param $name Name of stored procedure variable name to bind to.
@@ -699,11 +699,11 @@
 	{
 		return false;
 	}
-	
+
 	/**
 		Improved method of initiating a transaction. Used together with CompleteTrans().
 		Advantages include:
-		
+
 		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
 		   Only the outermost block is treated as a transaction.<br>
 		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br>
@@ -716,22 +716,22 @@
 			$this->transOff += 1;
 			return;
 		}
-		
+
 		$this->_oldRaiseFn = $this->raiseErrorFn;
 		$this->raiseErrorFn = $errfn;
 		$this->_transOK = true;
-		
+
 		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
 		$this->BeginTrans();
 		$this->transOff = 1;
 	}
-	
-	
+
+
 	/**
 		Used together with StartTrans() to end a transaction. Monitors connection
 		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
+
+		@autoComplete if true, monitor sql errors and commit and rollback as appropriate,
 		and if set to false force rollback even if no SQL error detected.
 		@returns true on commit, false on rollback.
 	*/
@@ -742,7 +742,7 @@
 			return true;
 		}
 		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
+
 		$this->transOff = 0;
 		if ($this->_transOK && $autoComplete) {
 			if (!$this->CommitTrans()) {
@@ -755,16 +755,16 @@
 			$this->RollbackTrans();
 			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
 		}
-		
+
 		return $this->_transOK;
 	}
-	
+
 	/*
 		At the end of a StartTrans/CompleteTrans block, perform a rollback.
 	*/
 	function FailTrans()
 	{
-		if ($this->debug) 
+		if ($this->debug)
 			if ($this->transOff == 0) {
 				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
 			} else {
@@ -773,7 +773,7 @@
 			}
 		$this->_transOK = false;
 	}
-	
+
 	/**
 		Check if transaction has failed, only for Smart Transactions.
 	*/
@@ -782,15 +782,15 @@
 		if ($this->transOff > 0) return $this->_transOK == false;
 		return false;
 	}
-	
+
 	/**
-	 * Execute SQL 
+	 * Execute SQL
 	 *
 	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function &Execute($sql,$inputarr=false) 
+	function &Execute($sql,$inputarr=false)
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
@@ -799,21 +799,21 @@
 		}
 		if ($inputarr) {
 			if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
+
 			$element0 = reset($inputarr);
 			# is_object check because oci8 descriptors can be passed in
 			$array_2d = is_array($element0) && !is_object(reset($element0));
-			
+
 			if (!is_array($sql) && !$this->_bindInputArray) {
 				$sqlarr = explode('?',$sql);
-					
+
 				if (!$array_2d) $inputarr = array($inputarr);
 				foreach($inputarr as $arr) {
 					$sql = ''; $i = 0;
 					foreach($arr as $v) {
 						$sql .= $sqlarr[$i];
 						// from Ron Baldwin <ron.baldwin#sourceprose.com>
-						// Only quote string types	
+						// Only quote string types
 						$typ = gettype($v);
 						if ($typ == 'string')
 							$sql .= $this->qstr($v);
@@ -830,19 +830,19 @@
 					if (isset($sqlarr[$i])) {
 						$sql .= $sqlarr[$i];
 						if ($i+1 != sizeof($sqlarr)) ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
-					} else if ($i != sizeof($sqlarr))	
+					} else if ($i != sizeof($sqlarr))
 						ADOConnection::outp( "Input array does not match ?: ".htmlspecialchars($sql));
-		
+
 					$ret =& $this->_Execute($sql);
 					if (!$ret) return $ret;
-				}	
+				}
 			} else {
 				if ($array_2d) {
 					if (is_string($sql))
 						$stmt = $this->Prepare($sql);
 					else
 						$stmt = $sql;
-						
+
 					foreach($inputarr as $arr) {
 						$ret =& $this->_Execute($stmt,$arr);
 						if (!$ret) return $ret;
@@ -857,8 +857,8 @@
 
 		return $ret;
 	}
-	
-	
+
+
 	function &_Execute($sql,$inputarr=false)
 	{
 
@@ -869,26 +869,26 @@
 		} else {
 			$this->_queryID = @$this->_query($sql,$inputarr);
 		}
-		
+
 		/************************
 		// OK, query executed
 		*************************/
 
 		if ($this->_queryID === false) { // error handling if query fails
-			if ($this->debug == 99) adodb_backtrace(true,5);	
+			if ($this->debug == 99) adodb_backtrace(true,5);
 			$fn = $this->raiseErrorFn;
 			if ($fn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
+			}
 			$false = false;
 			return $false;
-		} 
-		
+		}
+
 		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
 			$rs =& new ADORecordSet_empty();
 			return $rs;
 		}
-		
+
 		// return real recordset from select statement
 		$rsclass = $this->rsPrefix.$this->databaseType;
 		$rs = new $rsclass($this->_queryID,$this->fetchMode);
@@ -899,7 +899,7 @@
 		if ($rs->_numOfRows <= 0) {
 		global $ADODB_COUNTRECS;
 			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF) { 
+				if (!$rs->EOF) {
 					$rs = &$this->_rs2rs($rs,-1,-1,!is_array($sql));
 					$rs->_queryID = $this->_queryID;
 				} else
@@ -934,16 +934,16 @@
 		if (!$this->hasGenID) {
 			return 0; // formerly returns false pre 1.60
 		}
-		
+
 		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
+
 		$holdtransOK = $this->_transOK;
-		
+
 		$save_handler = $this->raiseErrorFn;
 		$this->raiseErrorFn = '';
 		@($rs = $this->Execute($getnext));
 		$this->raiseErrorFn = $save_handler;
-		
+
 		if (!$rs) {
 			$this->_transOK = $holdtransOK; //if the status was ok before reset
 			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
@@ -951,17 +951,17 @@
 		}
 		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
 		else $this->genID = 0; // false
-	
+
 		if ($rs) $rs->Close();
 
 		return $this->genID;
-	}	
+	}
 
 	/**
 	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
 	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
 	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
+	 */
 	function Insert_ID($table='',$column='')
 	{
 		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
@@ -979,8 +979,8 @@
 	 *
 	 * @return  the last inserted ID. All databases support this. But aware possible
 	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
+	 */
+	function PO_Insert_ID($table="", $id="")
 	{
 	   if ($this->hasInsertID){
 		   return $this->Insert_ID($table,$id);
@@ -991,7 +991,7 @@
 
 	/**
 	* @return # rows affected by UPDATE/DELETE
-	*/ 
+	*/
 	function Affected_Rows()
 	{
 		if ($this->hasAffectedRows) {
@@ -1001,12 +1001,12 @@
 			$val = $this->_affectedrows();
 			return ($val < 0) ? false : $val;
 		}
-				  
+
 		if ($this->debug) ADOConnection::outp( '<p>Affected_Rows error</p>',false);
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * @return  the last error message
 	 */
@@ -1015,29 +1015,29 @@
 		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
 		else return '';
 	}
-	
-	
+
+
 	/**
 	 * @return the last error number. Normally 0 means no error.
 	 */
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		return ($this->_errorMsg) ? -1 : 0;
 	}
-	
+
 	function MetaError($err=false)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		if ($err === false) $err = $this->ErrorNo();
 		return adodb_error($this->dataProvider,$this->databaseType,$err);
 	}
-	
+
 	function MetaErrorMsg($errno)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		return adodb_errormsg($errno);
 	}
-	
+
 	/**
 	 * @returns an array with the primary key columns in it.
 	 */
@@ -1057,7 +1057,7 @@
 			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
 		return false;
 	}
-	
+
 	/**
 	 * @returns assoc array where keys are tables, and values are foreign keys
 	 */
@@ -1071,16 +1071,16 @@
 	 * @param dbName 	is the name of the database to select
 	 * @return 		true or false
 	 */
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{return false;}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* Will select, getting rows from $offset (1-based), for $nrows.
 	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
 	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
 	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
+	* eg.
 	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
 	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
 	*
@@ -1097,14 +1097,14 @@
 	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
+		// suggested by Reinhard Balling. Access requires top after distinct
 		 // Informix requires first before distinct - F Riosa
 			$ismssql = (strpos($this->databaseType,'mssql') !== false);
 			if ($ismssql) $isaccess = false;
 			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
+
 			if ($offset <= 0) {
-				
+
 					// access includes ties in result
 					if ($isaccess) {
 						$sql = preg_replace(
@@ -1134,14 +1134,14 @@
 				}
 			}
 		}
-		
+
 		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
 		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
 		global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-			
+
 		if ($offset>0){
 			if ($secs2cache>0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
 			else $rs = &$this->Execute($sql,$inputarr);
@@ -1156,7 +1156,7 @@
 		//print_r($rs);
 		return $rs;
 	}
-	
+
 	/**
 	* Create serializable recordset. Breaks rs link to connection.
 	*
@@ -1167,10 +1167,10 @@
 		$rs2 =& $this->_rs2rs($rs);
 		$ignore = false;
 		$rs2->connection =& $ignore;
-		
+
 		return $rs2;
 	}
-	
+
 	/**
 	* Convert database recordset to an array recordset
 	* input recordset's cursor should be at beginning, and
@@ -1205,9 +1205,9 @@
 		$arr =& $rs->GetArrayLimit($nrows,$offset);
 		//print_r($arr);
 		if ($close) $rs->Close();
-		
+
 		$arrayClass = $this->arrayClass;
-		
+
 		$rs2 = new $arrayClass();
 		$rs2->connection = &$this;
 		$rs2->sql = $rs->sql;
@@ -1216,7 +1216,7 @@
 		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
 		return $rs2;
 	}
-	
+
 	/*
 	* Return all rows. Compat with PEAR DB
 	*/
@@ -1225,7 +1225,7 @@
 		$arr =& $this->GetArray($sql,$inputarr);
 		return $arr;
 	}
-	
+
 	function &GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		$rs =& $this->Execute($sql, $inputarr);
@@ -1236,7 +1236,7 @@
 		$arr =& $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	function &CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		if (!is_numeric($secs2cache)) {
@@ -1251,7 +1251,7 @@
 		$arr =& $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	/**
 	* Return first element of first row of sql statement. Recordset is disposed
 	* for you.
@@ -1264,29 +1264,29 @@
 	global $ADODB_COUNTRECS;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$ret = false;
 		$rs = &$this->Execute($sql,$inputarr);
-		if ($rs) {	
+		if ($rs) {
 			if (!$rs->EOF) $ret = reset($rs->fields);
 			$rs->Close();
 		}
 		$ADODB_COUNTRECS = $crecs;
 		return $ret;
 	}
-	
+
 	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
 	{
 		$ret = false;
 		$rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {		
+		if ($rs) {
 			if (!$rs->EOF) $ret = reset($rs->fields);
 			$rs->Close();
-		} 
-		
+		}
+
 		return $ret;
 	}
-	
+
 	function GetCol($sql, $inputarr = false, $trim = false)
 	{
 	  	$rv = false;
@@ -1308,7 +1308,7 @@
 	  	}
 	  	return $rv;
 	}
-	
+
 	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
 	{
 	  	$rv = false;
@@ -1329,21 +1329,21 @@
 	  	}
 	  	return $rv;
 	}
- 
+
 	/*
 		Calculate the offset of a date for a particular database and generate
 			appropriate SQL. Useful for calculating future/past dates and storing
 			in a database.
-			
+
 		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
 	*/
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		return  '('.$date.'+'.$dayFraction.')';
 	}
-	
-	
+
+
 	/**
 	*
 	* @param sql			SQL statement
@@ -1352,12 +1352,12 @@
 	function &GetArray($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs =& $this->Execute($sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
+		if (!$rs)
 			if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
 			else {
 				$false = false;
@@ -1367,22 +1367,22 @@
 		$rs->Close();
 		return $arr;
 	}
-	
+
 	function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
 	{
 		return $this->CacheGetArray($secs2cache,$sql,$inputarr);
 	}
-	
+
 	function &CacheGetArray($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
+
+		if (!$rs)
 			if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
 			else {
 				$false = false;
@@ -1392,9 +1392,9 @@
 		$rs->Close();
 		return $arr;
 	}
-	
-	
-	
+
+
+
 	/**
 	* Return one row of sql statement. Recordset is disposed for you.
 	*
@@ -1406,9 +1406,9 @@
 	global $ADODB_COUNTRECS;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$rs =& $this->Execute($sql,$inputarr);
-		
+
 		$ADODB_COUNTRECS = $crecs;
 		if ($rs) {
 			if (!$rs->EOF) $arr = $rs->fields;
@@ -1416,11 +1416,11 @@
 			$rs->Close();
 			return $arr;
 		}
-		
+
 		$false = false;
 		return $false;
 	}
-	
+
 	function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
 	{
 		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
@@ -1433,9 +1433,9 @@
 		$false = false;
 		return $false;
 	}
-	
+
 	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
+	* Insert or replace a single record. Note: this is not the same as MySQL's replace.
 	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
 	* Also note that no table locking is done currently, so it is possible that the
 	* record be inserted twice by two programs...
@@ -1451,24 +1451,24 @@
 	*
 	* Currently blob replace not supported
 	*
-	* returns 0 = fail, 1 = update, 2 = insert 
+	* returns 0 = fail, 1 = update, 2 = insert
 	*/
-	
+
 	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		
+
 		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
 	}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* Will select, getting rows from $offset (1-based), for $nrows.
 	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
 	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
 	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
+	* eg.
 	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
 	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
 	*
@@ -1482,7 +1482,7 @@
 	* @return		the recordset ($rs->databaseType == 'array')
  	*/
 	function &CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
+	{
 		if (!is_numeric($secs2cache)) {
 			if ($sql === false) $sql = -1;
 			if ($offset == -1) $offset = false;
@@ -1494,21 +1494,21 @@
 		}
 		return $rs;
 	}
-	
+
 	/**
-	* Flush cached recordsets that match a particular $sql statement. 
+	* Flush cached recordsets that match a particular $sql statement.
 	* If $sql == false, then we purge all files in the cache.
  	*/
 	function CacheFlush($sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE_DIR;
-	
+
 		if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
 			if (strncmp(PHP_OS,'WIN',3) === 0) {
 				$cmd = 'del /s '.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
 			} else {
 				//$cmd = 'find "'.$ADODB_CACHE_DIR.'" -type f -maxdepth 1 -print0 | xargs -0 rm -f';
-				$cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/'; 
+				$cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/';
 				// old version 'rm -f `find '.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
 			}
 			if ($this->debug) {
@@ -1517,18 +1517,18 @@
 				exec($cmd);
 			}
 			return;
-		} 
-		
+		}
+
 		global $ADODB_INCLUDED_CSV;
 		if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-		
+
 		$f = $this->_gencachename($sql.serialize($inputarr),false);
 		adodb_write_file($f,''); // is adodb_write_file needed?
 		if (!@unlink($f)) {
 			if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
 		}
 	}
-	
+
 	/**
 	* Private function to generate filename for caching.
 	* Filename is generated based on:
@@ -1539,40 +1539,40 @@
 	*  - userid
 	*  - setFetchMode (adodb 4.23)
 	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
+	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
+	* Assuming that we can have 50,000 files per directory with good performance,
 	* then we can scale to 12.8 million unique cached recordsets. Wow!
  	*/
 	function _gencachename($sql,$createdir)
 	{
 	global $ADODB_CACHE_DIR;
 	static $notSafeMode;
-		
-		if ($this->fetchMode === false) { 
+
+		if ($this->fetchMode === false) {
 		global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		} else {
 			$mode = $this->fetchMode;
 		}
 		$m = md5($sql.$this->databaseType.$this->database.$this->user.$mode);
-		
+
 		if (!isset($notSafeMode)) $notSafeMode = !ini_get('safe_mode');
 		$dir = ($notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($m,0,2) : $ADODB_CACHE_DIR;
-			
+
 		if ($createdir && $notSafeMode && !file_exists($dir)) {
 			$oldu = umask(0);
-			if (!mkdir($dir,0771)) 
+			if (!mkdir($dir,0771))
 				if ($this->debug) ADOConnection::outp( "Unable to mkdir $dir for $sql");
 			umask($oldu);
 		}
 		return $dir.'/adodb_'.$m.'.cache';
 	}
-	
-	
+
+
 	/**
 	 * Execute SQL, caching recordsets.
 	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query.
 	 *					  This is an optional parameter.
 	 * @param sql		SQL statement to execute
 	 * @param [inputarr]	holds the input data  to bind to
@@ -1581,25 +1581,25 @@
 	function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
 	{
 
-			
+
 		if (!is_numeric($secs2cache)) {
 			$inputarr = $sql;
 			$sql = $secs2cache;
 			$secs2cache = $this->cacheSecs;
 		}
-		
+
 		if (is_array($sql)) {
 			$sqlparam = $sql;
 			$sql = $sql[0];
 		} else
 			$sqlparam = $sql;
-			
+
 		global $ADODB_INCLUDED_CSV;
 		if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-		
+
 		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
 		$err = '';
-		
+
 		if ($secs2cache > 0){
 			$rs = &csv2rs($md5file,$err,$secs2cache,$this->arrayClass);
 			$this->numCacheHits += 1;
@@ -1616,14 +1616,14 @@
 				}
 				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
 			}
-			
+
 			$rs = &$this->Execute($sqlparam,$inputarr);
 
 			if ($rs) {
 				$eof = $rs->EOF;
 				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
 				$txt = _rs2serialize($rs,false,$sql); // serialize
-		
+
 				if (!adodb_write_file($md5file,$txt,$this->debug)) {
 					if ($fn = $this->raiseErrorFn) {
 						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
@@ -1632,46 +1632,46 @@
 				}
 				if ($rs->EOF && !$eof) {
 					$rs->MoveFirst();
-					//$rs = &csv2rs($md5file,$err);		
+					//$rs = &csv2rs($md5file,$err);
 					$rs->connection = &$this; // Pablo suggestion
-				}  
-				
+				}
+
 			} else
 				@unlink($md5file);
 		} else {
 			$this->_errorMsg = '';
 			$this->_errorCode = 0;
-			
+
 			if ($this->fnCacheExecute) {
 				$fn = $this->fnCacheExecute;
 				$fn($this, $secs2cache, $sql, $inputarr);
 			}
 		// ok, set cached object found
 			$rs->connection = &$this; // Pablo suggestion
-			if ($this->debug){ 
-					
+			if ($this->debug){
+
 				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
 				$ttl = $rs->timeCreated + $secs2cache - time();
 				$s = is_array($sql) ? $sql[0] : $sql;
 				if ($inBrowser) $s = '<i>'.htmlspecialchars($s).'</i>';
-				
+
 				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
 			}
 		}
 		return $rs;
 	}
-	
-	
-	/* 
-		Similar to PEAR DB's autoExecute(), except that 
+
+
+	/*
+		Similar to PEAR DB's autoExecute(), except that
 		$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
 		If $mode == 'UPDATE', then $where is compulsory as a safety measure.
-		
+
 		$forceUpdate means that even if the data has not changed, perform update.
 	 */
-	function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
+	function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
 	{
-		$sql = 'SELECT * FROM '.$table;  
+		$sql = 'SELECT * FROM '.$table;
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE') {
 			ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
@@ -1681,7 +1681,7 @@
 		$rs =& $this->SelectLimit($sql,1);
 		if (!$rs) return false; // table does not exist
 		$rs->tableName = $table;
-		
+
 		switch((string) $mode) {
 		case 'UPDATE':
 		case '2':
@@ -1700,15 +1700,15 @@
 		if ($ret) $ret = true;
 		return $ret;
 	}
-	
-	
+
+
 	/**
 	 * Generates an Update Query based on an existing recordset.
 	 * $arrFields is an associative array of fields with the value
 	 * that should be assigned.
 	 *
 	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table and sql should only 
+	 *	   that is run against a single table and sql should only
 	 *		 be a simple select stmt with no groupby/orderby/limit
 	 *
 	 * "Jonathan Younger" <jyounger@unilab.com>
@@ -1730,8 +1730,8 @@
 		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
 	}
 
-	
-	
+
+
 
 	/**
 	 * Generates an Insert Query based on an existing recordset.
@@ -1742,27 +1742,27 @@
 	 *	   that is run against a single table.
   	 */
 	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
-	{	
+	{
 		global $ADODB_INCLUDED_LIB;
 		if (!isset($force)) {
 			global $ADODB_FORCE_TYPE;
 			$force = $ADODB_FORCE_TYPE;
-			
+
 		}
 		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
 		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
 	}
-	
+
 
 	/**
 	* Update a blob column, given a where clause. There are more sophisticated
 	* blob handling functions that we could have implemented, but all require
 	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
+	* simple to understand and use.
 	*
 	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
 	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+	* Usage to update a $blobvalue which has a primary key blob_id=1 into a
 	* field blobtable.blobcolumn:
 	*
 	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
@@ -1772,7 +1772,7 @@
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	
+
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
@@ -1781,7 +1781,7 @@
 	/**
 	* Usage:
 	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
+	*
 	*	$blobtype supports 'BLOB' and 'CLOB'
 	*
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
@@ -1795,45 +1795,45 @@
 		fclose($fd);
 		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
 	}
-	
+
 	function BlobDecode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function BlobEncode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function SetCharSet($charset)
 	{
 		return false;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
 	}
-	
+
 	function LogSQL($enable=true)
 	{
 		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
+
 		if ($enable) $this->fnExecute = 'adodb_log_sql';
 		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
+
+		$old = $this->_logsql;
 		$this->_logsql = $enable;
 		if ($enable && !$old) $this->_affected = false;
 		return $old;
 	}
-	
+
 	function GetCharSet()
 	{
 		return false;
 	}
-	
+
 	/**
 	* Usage:
 	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
@@ -1845,21 +1845,21 @@
 	{
 		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
 	}
-	
+
 	// not the fastest implementation - quick and dirty - jlim
 	// for best performance, use the actual $rs->MetaType().
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
-		
+
 		if (empty($this->_metars)) {
 			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars =& new $rsclass(false,$this->fetchMode); 
+			$this->_metars =& new $rsclass(false,$this->fetchMode);
 		}
-		
+
 		return $this->_metars->MetaType($t,$len,$fieldobj);
 	}
-	
-	
+
+
 	/**
 	*  Change the SQL connection locale to a specified locale.
 	*  This is used to get the date formats written depending on the client locale.
@@ -1873,12 +1873,12 @@
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
 				break;
-				
+
 			case 'US':
 				$this->fmtDate = "'m-d-Y'";
 				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
 				break;
-				
+
 			case 'NL':
 			case 'FR':
 			case 'RO':
@@ -1886,12 +1886,12 @@
 				$this->fmtDate="'d-m-Y'";
 				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
 				break;
-				
+
 			case 'GE':
 				$this->fmtDate="'d.m.Y'";
 				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
 				break;
-				
+
 			default:
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -1899,7 +1899,7 @@
 		}
 	}
 
-	
+
 	/**
 	 * Close Connection
 	 */
@@ -1909,15 +1909,15 @@
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	/**
 	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
 	 *
 	 * @return true if succeeded or false if database does not support transactions
 	 */
 	function BeginTrans() {return false;}
-	
-	
+
+
 	/**
 	 * If database does not support transactions, always return true as data always commited
 	 *
@@ -1925,47 +1925,47 @@
 	 *
 	 * @return true/false.
 	 */
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok=true)
 	{ return true;}
-	
-	
+
+
 	/**
 	 * If database does not support transactions, rollbacks always fail, so return false
 	 *
 	 * @return true/false.
 	 */
-	function RollbackTrans() 
+	function RollbackTrans()
 	{ return false;}
 
 
 	/**
-	 * return the databases that the driver can connect to. 
+	 * return the databases that the driver can connect to.
 	 * Some databases will return an empty array.
 	 *
 	 * @return an array of database names.
 	 */
-		function MetaDatabases() 
+		function MetaDatabases()
 		{
 		global $ADODB_FETCH_MODE;
-		
+
 			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
+				$save = $ADODB_FETCH_MODE;
+				$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
+
 				$arr = $this->GetCol($this->metaDatabasesSQL);
 				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
+				$ADODB_FETCH_MODE = $save;
+
 				return $arr;
 			}
-			
+
 			return false;
 		}
-		
+
 	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
+	 * @param ttype can either be 'VIEW' or 'TABLE' or false.
 	 * 		If false, both views and tables are returned.
 	 *		"VIEW" returns only views
 	 *		"TABLE" returns only tables
@@ -1973,34 +1973,34 @@
 	 * @param mask  is the input mask - only supported by oci8 and postgresql
 	 *
 	 * @return  array of tables for current database.
-	 */ 
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	 */
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
-		
+
+
 		$false = false;
 		if ($mask) {
 			return $false;
 		}
 		if ($this->metaTablesSQL) {
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
+
 			$rs = $this->Execute($this->metaTablesSQL);
 			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
+			$ADODB_FETCH_MODE = $save;
+
 			if ($rs === false) return $false;
 			$arr =& $rs->GetArray();
 			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
+
+			if ($hast = ($ttype && isset($arr[0][1]))) {
 				$showt = strncmp($ttype,'T',1);
 			}
-			
+
 			for ($i=0; $i < sizeof($arr); $i++) {
 				if ($hast) {
 					if ($showt == 0) {
@@ -2016,8 +2016,8 @@
 		}
 		return $false;
 	}
-	
-	
+
+
 	function _findschema(&$table,&$schema)
 	{
 		if (!$schema && ($at = strpos($table,'.')) !== false) {
@@ -2025,9 +2025,9 @@
 			$table = substr($table,$at+1);
 		}
 	}
-	
+
 	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
+	 * List columns in a database as an array of ADOFieldObjects.
 	 * See top of file for definition of object.
 	 *
 	 * @param table	table name to query
@@ -2036,17 +2036,17 @@
 	 *
 	 * @return  array of ADOFieldObjects for current table.
 	 */
-	function &MetaColumns($table,$upper=true) 
+	function &MetaColumns($table,$upper=true)
 	{
 	global $ADODB_FETCH_MODE;
-		
+
 		$false = false;
-		
+
 		if (!empty($this->metaColumnsSQL)) {
-		
+
 			$schema = false;
 			$this->_findschema($table,$schema);
-		
+
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
@@ -2066,24 +2066,24 @@
 					if ($fld->scale>0) $fld->max_length += 1;
 				} else
 					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 				else $retarr[strtoupper($fld->name)] = $fld;
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return $false;
 	}
-	
+
     /**
       * List indexes on a table as an array.
       * @param table  table name to query
       * @param primary true to only show primary keys. Not actually used for most databases
 	  *
       * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
-	  
+
 		 Array (
 		    [name_of_index] => Array
 		      (
@@ -2093,7 +2093,7 @@
 	          	[0] => firstname
 		      	[1] => lastname
 	          )
-		)		
+		)
       */
      function &MetaIndexes($table, $primary = false, $owner = false)
      {
@@ -2102,12 +2102,12 @@
      }
 
 	/**
-	 * List columns names in a table as an array. 
+	 * List columns names in a table as an array.
 	 * @param table	table name to query
 	 *
 	 * @return  array of column names for current table.
-	 */ 
-	function &MetaColumnNames($table, $numIndexes=false) 
+	 */
+	function &MetaColumnNames($table, $numIndexes=false)
 	{
 		$objarr =& $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2120,27 +2120,27 @@
 			foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
-		
+
 		return $arr;
 	}
-			
+
 	/**
 	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
+	 * This function provides a wrapper.
+	 *
 	 * param s	variable number of string parameters
 	 *
 	 * Usage: $db->Concat($str1,$str2);
-	 * 
+	 *
 	 * @return concatenated string
-	 */ 	 
+	 */
 	function Concat()
-	{	
+	{
 		$arr = func_get_args();
 		return implode($this->concat_operator, $arr);
 	}
-	
-	
+
+
 	/**
 	 * Converts a date "d" to a string that the database can understand.
 	 *
@@ -2160,8 +2160,8 @@
 
 		return adodb_date($this->fmtDate,$d);
 	}
-	
-	
+
+
 	/**
 	 * Converts a timestamp "ts" to a string that the database can understand.
 	 *
@@ -2174,16 +2174,16 @@
 		if (empty($ts) && $ts !== 0) return 'null';
 
 		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14))
 			return adodb_date($this->fmtTimeStamp,$ts);
-		
+
 		if ($ts === 'null') return $ts;
 		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
-		
+
 		$ts = ADOConnection::UnixTimeStamp($ts);
 		return adodb_date($this->fmtTimeStamp,$ts);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 * @param $v is a date string in YYYY-MM-DD format
@@ -2197,16 +2197,16 @@
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-	
+
 		if (is_numeric($v) && strlen($v) !== 8) return $v;
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|",
 			($v), $rr)) return false;
 
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
 		// h-m-s-MM-DD-YY
 		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 
 	/**
 	 * Also in ADORecordSet.
@@ -2221,18 +2221,18 @@
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($v), $rr)) return false;
-			
+
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 *
@@ -2243,7 +2243,7 @@
 	 *
 	 * @return a date formated as user desires
 	 */
-	 
+
 	function UserDate($v,$fmt='Y-m-d',$gmt=false)
 	{
 		$tt = $this->UnixDate($v);
@@ -2253,11 +2253,11 @@
 		else if ($tt == 0) return $this->emptyDate;
 		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
 		}
-		
+
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	
+
 	}
-	
+
 		/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -2276,19 +2276,19 @@
 		if ($tt == 0) return $this->emptyTimeStamp;
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
 	}
-	
+
 	function escape($s,$magic_quotes=false)
 	{
 		return $this->addq($s,$magic_quotes);
 	}
-	
+
 	/**
-	* Quotes a string, without prefixing nor appending quotes. 
+	* Quotes a string, without prefixing nor appending quotes.
 	*/
 	function addq($s,$magic_quotes=false)
 	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2296,10 +2296,10 @@
 			}
 			return  str_replace("'",$this->replaceQuote,$s);
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
 			return $s;
 		else {// change \' to '' for sybase/mssql
@@ -2307,12 +2307,12 @@
 			return str_replace("\\'",$this->replaceQuote,$s);
 		}
 	}
-	
+
 	/**
 	 * Correctly quotes a string so that all strings are escaped. We prefix and append
 	 * to the string single-quotes.
 	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
+	 *
 	 * @param s			the string to quote
 	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
 	 *				This undoes the stupidity of magic quotes for GPC.
@@ -2320,9 +2320,9 @@
 	 * @return  quoted string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
-	{	
+	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2330,10 +2330,10 @@
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
 			return "'$s'";
 		else {// change \' to '' for sybase/mssql
@@ -2341,11 +2341,11 @@
 			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
 		}
 	}
-	
-	
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
 	* and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
 	*
 	* See readme.htm#ex8 for an example of usage.
@@ -2360,7 +2360,7 @@
 	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
 	*
 	*/
-	function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+	function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
@@ -2368,11 +2368,11 @@
 		else $rs =& _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
 		return $rs;
 	}
-	
-		
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
 	* and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
 	*
 	* @param secs2cache	seconds to cache data, set to 0 to force query
@@ -2382,11 +2382,11 @@
 	* @param [inputarr]	array of bind variables
 	* @return		the recordset ($rs->databaseType == 'array')
 	*/
-	function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
+	function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false)
 	{
 		/*switch($this->dataProvider) {
 		case 'postgres':
-		case 'mysql': 
+		case 'mysql':
 			break;
 		default: $secs2cache = 0; break;
 		}*/
@@ -2395,23 +2395,23 @@
 	}
 
 } // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
+
+
+
+	//==============================================================================================
 	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
+	//==============================================================================================
+
 	/**
 	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
 	*/
 	class ADOFetchObj {
 	};
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	* Lightweight recordset when there are no records to be returned
 	*/
@@ -2431,15 +2431,15 @@
 		function FieldCount(){ return 0;}
 		function Init() {}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
+	//==============================================================================================
 	include_once(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet
-	//==============================================================================================	
+	//==============================================================================================
 
 	if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
 	else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
@@ -2451,7 +2451,7 @@
 	 */
 	class ADORecordSet extends ADODB_BASE_RS {
 	/*
-	 * public variables	
+	 * public variables
 	 */
 	var $dataProvider = "native";
 	var $fields = false; 	/// holds the current row data
@@ -2459,8 +2459,8 @@
 							/// in other words, we use a text area for editing.
 	var $canSeek = false; 	/// indicates that seek is supported
 	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
+	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object.
+
 	var $emptyTimeStamp = '&nbsp;'; /// what to display when $time==0
 	var $emptyDate = '&nbsp;'; /// what to display when $time==0
 	var $debug = false;
@@ -2470,7 +2470,7 @@
 	var $fetchMode;			/// default fetch mode
 	var $connection = false; /// the parent connection
 	/*
-	 *	private variables	
+	 *	private variables
 	 */
 	var $_numOfRows = -1;	/** number of rows, or -1 */
 	var $_numOfFields = -1;	/** number of fields in recordset */
@@ -2480,27 +2480,27 @@
 	var $_inited = false; 	/** Init() should only be called once */
 	var $_obj; 				/** Used by FetchObj */
 	var $_names;			/** Used by FetchObj */
-	
+
 	var $_currentPage = -1;	/** Added by Iv�n Oliva to implement recordset pagination */
 	var $_atFirstPage = false;	/** Added by Iv�n Oliva to implement recordset pagination */
 	var $_atLastPage = false;	/** Added by Iv�n Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
+	var $_lastPageNo = -1;
 	var $_maxRecordCount = 0;
 	var $datetime = false;
-	
+
 	/**
 	 * Constructor
 	 *
 	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
 	 *
 	 */
-	function ADORecordSet($queryID) 
+	function ADORecordSet($queryID)
 	{
 		$this->_queryID = $queryID;
 	}
-	
-	
-	
+
+
+
 	function Init()
 	{
 		if ($this->_inited) return;
@@ -2511,7 +2511,7 @@
 			$this->_numOfFields = 0;
 		}
 		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
+
 			$this->_currentRow = 0;
 			if ($this->EOF = ($this->_fetch() === false)) {
 				$this->_numOfRows = 0; // _numOfRows could be -1
@@ -2520,11 +2520,11 @@
 			$this->EOF = true;
 		}
 	}
-	
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the FIRST column.
 	 *
@@ -2535,7 +2535,7 @@
 	 * @param [size]		#rows to show for listbox. not used by popup
 	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
 	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
+	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with
 	 *				column 0 (1st col) if this is true. This is not documented.
 	 *
 	 * @return HTML
@@ -2550,22 +2550,22 @@
 		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,$compareFields0);
 	}
-	
 
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the SECOND column.
 	 *
 	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
+	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')
 	{
 		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,false);
 	}
-	
+
 	/*
 		Grouped Menu
 	*/
@@ -2585,10 +2585,10 @@
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function &GetArray($nRows = -1) 
+	function &GetArray($nRows = -1)
 	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) return adodb_getall($this,$nRows);
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nRows != $cnt) {
@@ -2598,13 +2598,13 @@
 		}
 		return $results;
 	}
-	
+
 	function &GetAll($nRows = -1)
 	{
 		$arr =& $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/*
 	* Some databases allow multiple recordsets to be returned. This function
 	* will return true if there is a next recordset, or false if no more.
@@ -2613,9 +2613,9 @@
 	{
 		return false;
 	}
-	
+
 	/**
-	 * return recordset as a 2-dimensional array. 
+	 * return recordset as a 2-dimensional array.
 	 * Helper function for ADOConnection->SelectLimit()
 	 *
 	 * @param offset	is the row to start calculations from (1-based)
@@ -2623,26 +2623,26 @@
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{	
+	function &GetArrayLimit($nrows,$offset=-1)
+	{
 		if ($offset <= 0) {
 			$arr =& $this->GetArray($nrows);
 			return $arr;
-		} 
-		
+		}
+
 		$this->Move($offset);
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
+
+
 	/**
 	 * Synonym for GetArray() for compatibility with ADO.
 	 *
@@ -2650,15 +2650,15 @@
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function &GetRows($nRows = -1) 
+	function &GetRows($nRows = -1)
 	{
 		$arr =& $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/**
-	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
-	 * The first column is treated as the key and is not included in the array. 
+	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns.
+	 * The first column is treated as the key and is not included in the array.
 	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
 	 * $force_array == true.
 	 *
@@ -2666,16 +2666,16 @@
 	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
 	 * 	read the source.
 	 *
-	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
+	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and
 	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
 	 *
-	 * @return an associative array indexed by the first column of the array, 
+	 * @return an associative array indexed by the first column of the array,
 	 * 	or false if the  data has less than 2 cols.
 	 */
-	function &GetAssoc($force_array = false, $first2cols = false) 
+	function &GetAssoc($force_array = false, $first2cols = false)
 	{
 	global $ADODB_EXTENSION;
-	
+
 		$cols = $this->_numOfFields;
 		if ($cols < 2) {
 			$false = false;
@@ -2683,7 +2683,7 @@
 		}
 		$numIndex = isset($this->fields[0]);
 		$results = array();
-		
+
 		if (!$first2cols && ($cols > 2 || $force_array)) {
 			if ($ADODB_EXTENSION) {
 				if ($numIndex) {
@@ -2723,7 +2723,7 @@
 					while (!$this->EOF) {
 					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
 						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						adodb_movenext($this);
 					}
@@ -2739,17 +2739,17 @@
 					while (!$this->EOF) {
 					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
 						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						$this->MoveNext();
 					}
 				}
 			}
 		}
-		return $results; 
+		return $results;
 	}
-	
-	
+
+
 	/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -2766,8 +2766,8 @@
 		if ($tt === 0) return $this->emptyTimeStamp;
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
 	 * @param fmt 	is the format to apply to it, using date()
@@ -2784,8 +2784,8 @@
 		}
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param $v is a date string in YYYY-MM-DD format
 	 *
@@ -2795,7 +2795,7 @@
 	{
 		return ADOConnection::UnixDate($v);
 	}
-	
+
 
 	/**
 	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
@@ -2806,8 +2806,8 @@
 	{
 		return ADOConnection::UnixTimeStamp($v);
 	}
-	
-	
+
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -2815,8 +2815,8 @@
 	{
 		return $this->Close();
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of rows
 	*/
@@ -2824,8 +2824,8 @@
 	{
 		return $this->_numOfRows;
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of cols
 	*/
@@ -2833,9 +2833,9 @@
 	{
 		return $this->_numOfFields;
 	}
-	
+
 	/**
-	* Fetch a row, returning false if no more rows. 
+	* Fetch a row, returning false if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return false or array containing the current record
@@ -2851,10 +2851,10 @@
 		if (!$this->_fetch()) $this->EOF = true;
 		return $arr;
 	}
-	
-	
+
+
 	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
+	* Fetch a row, returning PEAR_Error if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return DB_OK or error object
@@ -2866,26 +2866,26 @@
 		$this->MoveNext();
 		return 1; // DB_OK
 	}
-	
-	
+
+
 	/**
 	 * Move to the first row in the recordset. Many databases do NOT support this.
 	 *
 	 * @return true or false
 	 */
-	function MoveFirst() 
+	function MoveFirst()
 	{
 		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
+		return $this->Move(0);
+	}
+
 
-	
 	/**
-	 * Move to the last row in the recordset. 
+	 * Move to the last row in the recordset.
 	 *
 	 * @return true or false
 	 */
-	function MoveLast() 
+	function MoveLast()
 	{
 		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
 		if ($this->EOF) return false;
@@ -2897,14 +2897,14 @@
 		$this->EOF = false;
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * Move to next record in the recordset.
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
@@ -2920,8 +2920,8 @@
 		*/
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * Random access to a specific row in the recordset. Some databases do not support
 	 * access to previous rows in the databases (no scrolling backwards).
@@ -2930,15 +2930,15 @@
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function Move($rowNumber = 0) 
+	function Move($rowNumber = 0)
 	{
 		$this->EOF = false;
 		if ($rowNumber == $this->_currentRow) return true;
 		if ($rowNumber >= $this->_numOfRows)
 	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
+
+		if ($this->canSeek) {
+
 			if ($this->_seek($rowNumber)) {
 				$this->_currentRow = $rowNumber;
 				if ($this->_fetch()) {
@@ -2956,26 +2956,26 @@
 					adodb_movenext($this);
 				}
 			} else {
-			
+
 				while (! $this->EOF && $this->_currentRow < $rowNumber) {
 					$this->_currentRow++;
-					
+
 					if (!$this->_fetch()) $this->EOF = true;
 				}
 			}
 			return !($this->EOF);
 		}
-		
-		$this->fields = false;	
+
+		$this->fields = false;
 		$this->EOF = true;
 		return false;
 	}
-	
-		
+
+
 	/**
 	 * Get the value of a field in the current row by column name.
 	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
+	 *
 	 * @param colname  is the field to access
 	 *
 	 * @return the value of $colname column
@@ -2984,7 +2984,7 @@
 	{
 		return $this->fields[$colname];
 	}
-	
+
 	function GetAssocKeys($upper=true)
 	{
 		$this->bind = array();
@@ -2994,7 +2994,7 @@
 			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
 		}
 	}
-	
+
   /**
    * Use associative array to get fields array for databases that do not support
    * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
@@ -3008,44 +3008,44 @@
 	{
 		$record = array();
 	 //	if (!$this->fields) return $record;
-		
+
 	   	if (!$this->bind) {
 			$this->GetAssocKeys($upper);
 		}
-		
+
 		foreach($this->bind as $k => $v) {
 			$record[$k] = $this->fields[$v];
 		}
 
 		return $record;
 	}
-	
-	
+
+
 	/**
 	 * Clean up recordset
 	 *
 	 * @return true or false
 	 */
-	function Close() 
+	function Close()
 	{
 		// free connection object - this seems to globally free the object
 		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
+		// $this->connection = false;
 		if (!$this->_closed) {
 			$this->_closed = true;
-			return $this->_close();		
+			return $this->_close();
 		} else
 			return true;
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
 	function RecordCount() {return $this->_numOfRows;}
-	
-	
+
+
 	/*
 	* If we are using PageExecute(), this will return the maximum possible rows
 	* that can be returned when paging a recordset.
@@ -3054,14 +3054,14 @@
 	{
 		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
+	function RowCount() {return $this->_numOfRows;}
+
 
 	 /**
 	 * Portable RecordCount. Pablo Roca <pabloroca@mvps.org>
@@ -3070,38 +3070,38 @@
 	 *
 	 * But aware possible problems in multiuser environments. For better speed the table
 	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
+	 */
 	function PO_RecordCount($table="", $condition="") {
-		
+
 		$lnumrows = $this->_numOfRows;
 		// the database doesn't support native recordcount, so we do a workaround
 		if ($lnumrows == -1 && $this->connection) {
 			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
+				if ($condition) $condition = " WHERE " . $condition;
 				$resultrows = &$this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
 				if ($resultrows) $lnumrows = reset($resultrows->fields);
 			}
 		}
 		return $lnumrows;
 	}
-	
+
 	/**
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function CurrentRow() {return $this->_currentRow;}
-	
+
 	/**
 	 * synonym for CurrentRow -- for ADO compat
 	 *
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function AbsolutePosition() {return $this->_currentRow;}
-	
+
 	/**
 	 * @return the number of columns in the recordset. Some databases will set this to 0
 	 * if no records are returned, others will return the number of columns in the query.
 	 */
-	function FieldCount() {return $this->_numOfFields;}   
+	function FieldCount() {return $this->_numOfFields;}
 
 
 	/**
@@ -3111,11 +3111,11 @@
 	 *
 	 * @return the ADOFieldObject for that column, or false.
 	 */
-	function &FetchField($fieldoffset) 
+	function &FetchField($fieldoffset)
 	{
 		// must be defined by child class
-	}	
-	
+	}
+
 	/**
 	 * Get the ADOFieldObjects of all columns in an array.
 	 *
@@ -3123,11 +3123,11 @@
 	function& FieldTypesArray()
 	{
 		$arr = array();
-		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
+		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++)
 			$arr[] = $this->FetchField($i);
 		return $arr;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is lowercase field names.
@@ -3139,11 +3139,11 @@
 		$o =& $this->FetchObject(false);
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is uppercase.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row
@@ -3161,21 +3161,21 @@
 		$i = 0;
 		if (PHP_VERSION >= 5) $o = clone($this->_obj);
 		else $o = $this->_obj;
-	
+
 		for ($i=0; $i <$this->_numOfFields; $i++) {
 			$name = $this->_names[$i];
 			if ($isupper) $n = strtoupper($name);
 			else $n = $name;
-			
+
 			$o->$n = $this->Fields($name);
 		}
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default is lower-case field names.
-	* 
+	*
 	* @return the object with the properties set to the fields of the current row,
 	* 	or false if EOF
 	*
@@ -3186,12 +3186,12 @@
 		$o =& $this->FetchNextObject(false);
 		return $o;
 	}
-	
-	
+
+
 	/**
-	* Return the fields array of the current row as an object for convenience. 
+	* Return the fields array of the current row as an object for convenience.
 	* The default is upper case field names.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row,
@@ -3203,14 +3203,14 @@
 	{
 		$o = false;
 		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
+			$o = $this->FetchObject($isupper);
 			$this->_currentRow++;
 			if ($this->_fetch()) return $o;
 		}
 		$this->EOF = true;
 		return $o;
 	}
-	
+
 	/**
 	 * Get the metatype of the column. This is used for formatting. This is because
 	 * many databases use different names for the same type, so we transform the original
@@ -3221,8 +3221,8 @@
 	 * 	fields bigger than a certain size as a 'B' (blob).
 	 * @param fieldobj is the field object returned by the database driver. Can hold
 	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
+	 *
+	 * @return the general type of the data:
 	 *	C for character < 250 chars
 	 *	X for teXt (>= 250 chars)
 	 *	B for Binary
@@ -3232,7 +3232,7 @@
 	 * 	L for logical/Boolean
 	 *	I for integer
 	 *	R for autoincrement counter/integer
-	 * 
+	 *
 	 *
 	*/
 	function MetaType($t,$len=-1,$fieldobj=false)
@@ -3283,7 +3283,7 @@
 		'T' => 'T',
 		##
 		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
+		'BOOLEAN' => 'L',
 		'BIT' => 'L',
 		'L' => 'L',
 		##
@@ -3316,62 +3316,62 @@
 		'NUM' => 'N',
 		'NUMERIC' => 'N',
 		'MONEY' => 'N',
-		
+
 		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
-		'SQLTEXT' => 'X' 
+		'SQLINT' => 'I',
+		'SQLSERIAL' => 'I',
+		'SQLSMINT' => 'I',
+		'SQLSMFLOAT' => 'N',
+		'SQLFLOAT' => 'N',
+		'SQLMONEY' => 'N',
+		'SQLDECIMAL' => 'N',
+		'SQLDATE' => 'D',
+		'SQLVCHAR' => 'C',
+		'SQLCHAR' => 'C',
+		'SQLDTIME' => 'T',
+		'SQLINTERVAL' => 'N',
+		'SQLBYTES' => 'B',
+		'SQLTEXT' => 'X'
 		);
-		
+
 		$tmap = false;
 		$t = strtoupper($t);
 		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
 		switch ($tmap) {
 		case 'C':
-		
-			// is the char field is too long, return as text field... 
+
+			// is the char field is too long, return as text field...
 			if ($this->blobSize >= 0) {
 				if ($len > $this->blobSize) return 'X';
 			} else if ($len > 250) {
 				return 'X';
 			}
 			return 'C';
-			
+
 		case 'I':
 			if (!empty($fieldobj->primary_key)) return 'R';
 			return 'I';
-		
+
 		case false:
 			return 'N';
-			
+
 		case 'B':
-			 if (isset($fieldobj->binary)) 
+			 if (isset($fieldobj->binary))
 				 return ($fieldobj->binary) ? 'B' : 'X';
 			return 'B';
-		
+
 		case 'D':
 			if (!empty($this->datetime)) return 'T';
 			return 'D';
-			
-		default: 
+
+		default:
 			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
 			return $tmap;
 		}
 	}
-	
+
 	function _close() {}
-	
+
 	/**
 	 * set/returns the current recordset page when paginating
 	 */
@@ -3380,7 +3380,7 @@
 		if ($page != -1) $this->_currentPage = $page;
 		return $this->_currentPage;
 	}
-	
+
 	/**
 	 * set/returns the status of the atFirstPage flag when paginating
 	 */
@@ -3389,13 +3389,13 @@
 		if ($status != false) $this->_atFirstPage = $status;
 		return $this->_atFirstPage;
 	}
-	
+
 	function LastPageNo($page = false)
 	{
 		if ($page != false) $this->_lastPageNo = $page;
 		return $this->_lastPageNo;
 	}
-	
+
 	/**
 	 * set/returns the status of the atLastPage flag when paginating
 	 */
@@ -3404,11 +3404,12 @@
 		if ($status != false) $this->_atLastPage = $status;
 		return $this->_atLastPage;
 	}
-	
+
 	/**
 	 * PDO compatibility function: fetch the next row
 	 *
-	 * @return array/boolean false if there's nothing to fetch
+	 * @param $fetchmode=null ADODB_FETCH_{DEFAULT|ASSOC|NUM|BOTH}, default is to use currently selected fetch-mode
+	 * @return array|boolean false if there's nothing to fetch
 	 */
 	function &fetch($fetchmode=null)
 	{
@@ -3426,28 +3427,49 @@
 	}
 
 	/**
-	 * PDO compatibility function: fetch the first column of the next row
+	 * PDO compatibility function: fetch the n-th column of the next row
 	 *
-	 * @return string/boolean false if there's nothing to fetch
+	 * @param int $column_number=0
+	 * @return string|boolean false if there's nothing to fetch
+	 */
+	function fetchColumn($column_number=0)
+	{
+		if(!($row = $this->FetchRow()))
+		{
+			return false;
+		}
+		while ($column_number-- >= 0)
+		{
+			$ret = array_shift($row);
+		}
+		return $ret;
+	}
+
+	/**
+	 * fetch the first column of the next row
+	 *
+	 * was introduced in eGroupware 1.6 as PDO compatibility function, but is renamed in PDO to fetchColumn()
+	 *
+	 * @deprecated use fetchColumn()
+	 * @return string|boolean false if there's nothing to fetch
 	 */
 	function fetchSingle()
 	{
-		$row = $this->FetchRow();
-		return is_array($row) ? array_shift($row) : false;
+		return $this->fetchColumn();
 	}
 } // end class ADORecordSet
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * This class encapsulates the concept of a recordset created in memory
 	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
+	 *
 	 * Note that the constructor is different from the standard ADORecordSet
 	 */
-	
+
 	class ADORecordSet_array extends ADORecordSet
 	{
 		var $databaseType = 'array';
@@ -3469,21 +3491,21 @@
 		function ADORecordSet_array($fakeid=1)
 		{
 		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
+
 			// fetch() on EOF does not delete $this->fields
 			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
+			$this->ADORecordSet($fakeid); // fake queryID
 			$this->fetchMode = $ADODB_FETCH_MODE;
 		}
-		
-		
+
+
 		/**
 		 * Setup the array.
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
+		 * @param typearr	holds an array of types. These are the same types
 		 *			used in MetaTypes (C,B,L,I,N).
 		 * @param [colnames]	array of column names. If set, then the first row of
 		 *			$array should not hold the column names.
@@ -3491,7 +3513,7 @@
 		function InitArray($array,$typearr,$colnames=false)
 		{
 			$this->_array = $array;
-			$this->_types = $typearr;	
+			$this->_types = $typearr;
 			if ($colnames) {
 				$this->_skiprow1 = false;
 				$this->_colnames = $colnames;
@@ -3505,7 +3527,7 @@
 		 * Setup the Array and datatype file objects
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
 		 * @param fieldarr	holds an array of ADOFieldObject's.
 		 */
@@ -3515,10 +3537,10 @@
 			$this->_skiprow1= false;
 			if ($fieldarr) {
 				$this->_fieldobjects =& $fieldarr;
-			} 
+			}
 			$this->Init();
 		}
-		
+
 		function &GetArray($nRows=-1)
 		{
 			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
@@ -3528,21 +3550,21 @@
 				return $arr;
 			}
 		}
-		
+
 		function _initrs()
 		{
 			$this->_numOfRows =  sizeof($this->_array);
 			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
+
 			$this->_numOfFields =(isset($this->_fieldobjects)) ?
 				 sizeof($this->_fieldobjects):sizeof($this->_types);
 		}
-		
+
 		/* Use associative array to get fields array */
 		function Fields($colname)
 		{
 			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
-			
+
 			if ($mode & ADODB_FETCH_ASSOC) {
 				if (!isset($this->fields[$colname])) $colname = strtolower($colname);
 				return $this->fields[$colname];
@@ -3556,8 +3578,8 @@
 			}
 			return $this->fields[$this->bind[strtoupper($colname)]];
 		}
-		
-		function &FetchField($fieldOffset = -1) 
+
+		function &FetchField($fieldOffset = -1)
 		{
 			if (isset($this->_fieldobjects)) {
 				return $this->_fieldobjects[$fieldOffset];
@@ -3566,10 +3588,10 @@
 			$o->name = $this->_colnames[$fieldOffset];
 			$o->type =  $this->_types[$fieldOffset];
 			$o->max_length = -1; // length not known
-			
+
 			return $o;
 		}
-			
+
 		function _seek($row)
 		{
 			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
@@ -3580,31 +3602,31 @@
 			}
 			return false;
 		}
-		
-		function MoveNext() 
+
+		function MoveNext()
 		{
-			if (!$this->EOF) {		
+			if (!$this->EOF) {
 				$this->_currentRow++;
-				
+
 				$pos = $this->_currentRow;
-				
+
 				if ($this->_numOfRows <= $pos) {
 					if (!$this->compat) $this->fields = false;
 				} else {
 					if ($this->_skiprow1) $pos += 1;
 					$this->fields = $this->_array[$pos];
 					return true;
-				}		
+				}
 				$this->EOF = true;
 			}
-			
+
 			return false;
-		}	
-	
+		}
+
 		function _fetch()
 		{
 			$pos = $this->_currentRow;
-			
+
 			if ($this->_numOfRows <= $pos) {
 				if (!$this->compat) $this->fields = false;
 				return false;
@@ -3613,41 +3635,41 @@
 			$this->fields = $this->_array[$pos];
 			return true;
 		}
-		
-		function _close() 
+
+		function _close()
 		{
-			return true;	
+			return true;
 		}
-	
+
 	} // ADORecordSet_array
 
-	//==============================================================================================	
+	//==============================================================================================
 	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
+	//==============================================================================================
+
 	/**
 	 * Synonym for ADOLoadCode. Private function. Do not use.
 	 *
 	 * @deprecated
 	 */
-	function ADOLoadDB($dbType) 
-	{ 
+	function ADOLoadDB($dbType)
+	{
 		return ADOLoadCode($dbType);
 	}
-		
+
 	/**
 	 * Load the code for a specific database driver. Private function. Do not use.
 	 */
-	function ADOLoadCode($dbType) 
+	function ADOLoadCode($dbType)
 	{
 	global $ADODB_LASTDB;
-	
+
 		if (!$dbType) return false;
 		$db = strtolower($dbType);
 		switch ($db) {
-			case 'ado': 
+			case 'ado':
 				if (PHP_VERSION >= 5) $db = 'ado5';
-				$class = 'ado'; 
+				$class = 'ado';
 				break;
 			case 'ifx':
 			case 'maxsql': $class = $db = 'mysqlt'; break;
@@ -3657,12 +3679,12 @@
 			default:
 				$class = $db; break;
 		}
-		
+
 		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
 		@include_once($file);
 		$ADODB_LASTDB = $class;
 		if (class_exists("ADODB_" . $class)) return $class;
-		
+
 		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
 		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
 		else ADOConnection::outp("Syntax error in file: $file");
@@ -3677,7 +3699,7 @@
 		$tmp =& ADONewConnection($db);
 		return $tmp;
 	}
-	
+
 	/**
 	 * Instantiate a new Connection class for a specific database driver.
 	 *
@@ -3689,14 +3711,14 @@
 	function &ADONewConnection($db='')
 	{
 	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-		
+
 		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
 		$false = false;
 		if (strpos($db,'://')) {
 			$origdsn = $db;
 			$dsna = @parse_url($db);
-			
+
 			if (!$dsna) {
 				// special handling of oracle, which might not have host
 				$db = str_replace('@/','@adodb-fakehost/',$db);
@@ -3710,7 +3732,7 @@
 			$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
 			$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
 			$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
-			
+
 			if (isset($dsna['query'])) {
 				$opt1 = explode('&',$dsna['query']);
 				foreach($opt1 as $k => $v) {
@@ -3719,7 +3741,7 @@
 				}
 			} else $opt = array();
 		}
-		
+
 	/*
 	 *  phptype: Database backend used in PHP (mysql, odbc etc.)
 	 *  dbsyntax: Database used with regards to SQL syntax etc.
@@ -3733,12 +3755,12 @@
 			$obj = $ADODB_NEWCONNECTION($db);
 
 		} else {
-		
+
 			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
 			if (empty($db)) $db = $ADODB_LASTDB;
-			
+
 			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-			
+
 			if (!$db) {
 				if (isset($origdsn)) $db = $origdsn;
 				if ($errorfn) {
@@ -3749,19 +3771,19 @@
 							 $db,false,$ignore);
 				} else
 					 ADOConnection::outp( "<p>ADONewConnection: Unable to load database driver '$db'</p>",false);
-					
+
 				return $false;
 			}
-			
+
 			$cls = 'ADODB_'.$db;
 			if (!class_exists($cls)) {
 				adodb_backtrace();
 				return $false;
 			}
-			
+
 			$obj = new $cls();
 		}
-		
+
 		# constructor should not fail
 		if ($obj) {
 			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
@@ -3794,27 +3816,27 @@
 					$ok = $obj->Connect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
 				else
 					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-					
+
 				if (!$ok) return $false;
 			}
 		}
 		return $obj;
 	}
-	
-	
-	
+
+
+
 	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
 	function _adodb_getdriver($provider,$drivername,$perf=false)
 	{
 		switch ($provider) {
-		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
-		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
+		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6);
+		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5);
 		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
 		case 'native':  break;
 		default:
 			return $provider;
 		}
-		
+
 		switch($drivername) {
 		case 'firebird15': $drivername = 'firebird'; break;
 		case 'oracle': $drivername = 'oci8'; break;
@@ -3828,7 +3850,7 @@
 		}
 		return $drivername;
 	}
-	
+
 	function &NewPerfMonitor(&$conn)
 	{
 		$false = false;
@@ -3839,10 +3861,10 @@
 		$class = "Perf_$drivername";
 		if (!class_exists($class)) return $false;
 		$perf = new $class($conn);
-		
+
 		return $perf;
 	}
-	
+
 	function &NewDataDictionary(&$conn,$drivername=false)
 	{
 		$false = false;
@@ -3865,34 +3887,34 @@
 		$dict->quote = $conn->nameQuote;
 		if (!empty($conn->_connectionID))
 			$dict->serverInfo = $conn->ServerInfo();
-		
+
 		return $dict;
 	}
 
 
-	
+
 	/*
 		Perform a print_r, with pre tags for better formatting.
 	*/
 	function adodb_pr($var,$as_string=false)
 	{
 		if ($as_string) ob_start();
-		
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+
+		if (isset($_SERVER['HTTP_USER_AGENT'])) {
 			echo " <pre>\n";print_r($var);echo "</pre>\n";
 		} else
 			print_r($var);
-			
+
 		if ($as_string) {
 			$s = ob_get_contents();
 			ob_end_clean();
 			return $s;
 		}
 	}
-	
+
 	/*
 		Perform a stack-crawl and pretty print it.
-		
+
 		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
 		@param levels Number of levels to display
 	*/
@@ -3902,6 +3924,6 @@
 		if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
 		return _adodb_backtrace($printOrArr,$levels);
 	}
-	
+
 } // defined
 ?>
diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index d6f5905ac6..88a8f6adbb 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -30,8 +30,8 @@
  *
  * c) foreach($db->select($table,'*',$where,__LINE__,__FILE__,false,'',$app) as $row)
  *
- * To fetch only single column (of the next row):
- *		$cnt = $db->query("SELECT COUNT(*) FROM ...")->fetchSingle();
+ * To fetch only a single column (of the next row):
+ *		$cnt = $db->query("SELECT COUNT(*) FROM ...")->fetchColumn($column_num=0);
  *
  * To fetch a next (single) row, you can use:
  *		$row = $db->query("SELECT COUNT(*) FROM ...")->fetch($fetchmod=null);

From 4311a6621511b31f96ab0350da4a82863c369793 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Mar 2009 14:25:41 +0000
Subject: [PATCH 110/510] "improved csv-export: - use options to export values
 of select boxes - use strtotime on not-numerical date or time values - use
 specified number formats for int and float"

---
 etemplate/inc/class.nextmatch_widget.inc.php | 39 ++++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 440b0632e8..28abe5c614 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -690,11 +690,11 @@ class nextmatch_widget
 	 * @param mixed &$value the extension returns here it's input, if there's any
 	 * @param mixed &$extension_data persistent storage between calls or pre- and post-process
 	 * @param boolean &$loop can be set to true to request a re-submision of the form/dialog
-	 * @param object &$tmpl the eTemplate the widget belongs too
+	 * @param etemplate &$tmpl the eTemplate the widget belongs too
 	 * @param mixed &value_in the posted values (already striped of magic-quotes)
 	 * @return boolean true if $value has valid content, on false no content will be returned!
 	 */
-	function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	function post_process($name,&$value,&$extension_data,&$loop,etemplate &$tmpl,$value_in)
 	{
 		$nm_global =& self::get_nm_global($name,$extension_data['type']);
 
@@ -872,7 +872,7 @@ class nextmatch_widget
 	 * Export the list as csv file download
 	 *
 	 * @param array $value content of the nextmatch widget
-	 * @param boolean false=error, eg. get_rows callback does not exits, true=nothing to export, otherwise we do NOT return!
+	 * @return boolean false=error, eg. get_rows callback does not exits, true=nothing to export, otherwise we do NOT return!
 	 */
 	function _csv_export(&$value)
 	{
@@ -934,7 +934,7 @@ class nextmatch_widget
 			foreach($rows as $key => $row)
 			{
 				if (!is_numeric($key)) continue;	// not a real rows
-				fwrite($fp,$this->_csv_encode($row,$value['csv_fields'])."\n");
+				fwrite($fp,$this->_csv_encode($row,$value['csv_fields'],true,$rows['sel_options'])."\n");
 			}
 			$value['start'] += $value['num_rows'];
 
@@ -994,9 +994,10 @@ class nextmatch_widget
 	 * @param array $data
 	 * @param array $fields
 	 * @param boolean $use_type=true
+	 * @param array $extra_sel_options=null
 	 * @return string
 	 */
-	function _csv_encode($data,$fields,$use_type=true)
+	function _csv_encode($data,$fields,$use_type=true,$extra_sel_options=null)
 	{
 		static $date_format,$time_format;
 		if (is_null($date_format))
@@ -1004,12 +1005,14 @@ class nextmatch_widget
 			$time_format = $date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
 			$time_format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:ia' : 'H:i');
 		}
+		$sel_options =& boetemplate::$request->sel_options;
+
 		$out = array();
 		foreach($fields as $field => $label)
 		{
 			$value = (array)$data[$field];
 
-			if ($use_type && is_array($label) && in_array($label['type'],array('select-account','select-cat','date-time','date')))
+			if ($use_type && is_array($label) && in_array($label['type'],array('select-account','select-cat','date-time','date','select','int','float')))
 			{
 				foreach($value as $key => $val)
 				{
@@ -1025,11 +1028,31 @@ class nextmatch_widget
 							}
 							break;
 						case 'date-time':
-							if ($val) $value[$key] = date($time_format,$val);
+							if ($val) $value[$key] = date($time_format,!is_numeric($val) ? strtotime($val) : $val);
 							break;
 						case 'date':
-							if ($val) $value[$key] = date($date_format,$val);
+							if ($val) $value[$key] = date($date_format,!is_numeric($val) ? strtotime($val) : $val);
 							break;
+						case 'select':
+							if (isset($sel_options[$field]))
+							{
+								if ($val) $value[$key] = lang($sel_options[$field][$val]);
+							}
+							elseif(is_array($extra_sel_options) && isset($extra_sel_options[$field]))
+							{
+								if ($val) $value[$key] = lang($extra_sel_options[$field][$val]);
+							}
+							break;
+						case 'int':		// size: [min],[max],[len],[precission/sprint format]
+						case 'float':
+							list(,,,$pre) = explode(',',$label['size']);
+							if (($label['type'] == 'float' || !is_numeric($pre)) && $val && $pre)
+							{
+								$val = str_replace(array(' ',','),array('','.'),$val);
+								$value[$key] = is_numeric($pre) ? round($value,$pre) : sprintf($pre,$value);
+							}
+						case 'float':
+
 					}
 				}
 			}

From 4cbbbc38923498d97d1014d180c00aaa2a9c2a0e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Mar 2009 14:38:37 +0000
Subject: [PATCH 111/510] "upps"

---
 etemplate/inc/class.nextmatch_widget.inc.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 28abe5c614..cff08469a6 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -1051,8 +1051,6 @@ class nextmatch_widget
 								$val = str_replace(array(' ',','),array('','.'),$val);
 								$value[$key] = is_numeric($pre) ? round($value,$pre) : sprintf($pre,$value);
 							}
-						case 'float':
-
 					}
 				}
 			}

From 2375e7e26a8442e400a75c4e2e5d65daafceb877 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Mar 2009 15:42:15 +0000
Subject: [PATCH 112/510] "removed trailing tabs"

---
 calendar/egroupware.org/holidays.AT.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/calendar/egroupware.org/holidays.AT.csv b/calendar/egroupware.org/holidays.AT.csv
index b5c59a498b..3af74d2754 100644
--- a/calendar/egroupware.org/holidays.AT.csv
+++ b/calendar/egroupware.org/holidays.AT.csv
@@ -1,13 +1,13 @@
-charset	iso-8859-1					
+charset	iso-8859-1
 
-regular (year=0):						
+regular (year=0):
 AT	Neujahr	1	1	0	0	0
-AT	Hl. Drei Könige	6	1	0	0	0
+AT	Hl. Drei K�nige	6	1	0	0	0
 AT	Staatsfeiertag	1	5	0	0	0
 AT	Maria Himmelfahrt	15	8	0	0	0
 AT	Nationalfeiertag	26	10	0	0	0
 AT	Allerheiligen	1	11	0	0	0
-AT	Maria Empfängnis	8	12	0	0	0
+AT	Maria Empf�ngnis	8	12	0	0	0
 AT	Heiliger Abend	24	12	0	0	0
 AT	Christtag	25	12	0	0	0
 AT	Stephanitag	26	12	0	0	0

From 1baaa6cd01d0ba509cb8e2f09462487f3f050dc7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 Mar 2009 15:49:43 +0000
Subject: [PATCH 113/510] "converted to utf-8"

---
 calendar/egroupware.org/holidays.AT.csv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/calendar/egroupware.org/holidays.AT.csv b/calendar/egroupware.org/holidays.AT.csv
index 3af74d2754..881e506886 100644
--- a/calendar/egroupware.org/holidays.AT.csv
+++ b/calendar/egroupware.org/holidays.AT.csv
@@ -1,13 +1,13 @@
-charset	iso-8859-1
+charset	utf-8
 
 regular (year=0):
 AT	Neujahr	1	1	0	0	0
-AT	Hl. Drei K�nige	6	1	0	0	0
+AT	Hl. Drei Könige	6	1	0	0	0
 AT	Staatsfeiertag	1	5	0	0	0
 AT	Maria Himmelfahrt	15	8	0	0	0
 AT	Nationalfeiertag	26	10	0	0	0
 AT	Allerheiligen	1	11	0	0	0
-AT	Maria Empf�ngnis	8	12	0	0	0
+AT	Maria Empfängnis	8	12	0	0	0
 AT	Heiliger Abend	24	12	0	0	0
 AT	Christtag	25	12	0	0	0
 AT	Stephanitag	26	12	0	0	0

From 03fc976ce64d0069474b22facbcdc4365d243511 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 27 Mar 2009 13:40:49 +0000
Subject: [PATCH 114/510] handling array_intersect warning if info_responsible
 is not an array

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

diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index bbbb161535..485a57dae9 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -91,7 +91,7 @@ class infolog_so
 			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($this->user,true);
 			$user_and_memberships[] = $this->user;
 		}
-		return $info['info_responsible'] && array_intersect($info['info_responsible'],$user_and_memberships);
+		return $info['info_responsible'] && array_intersect(array($info['info_responsible']),$user_and_memberships);
 	}
 
 	/**

From c2dd0ab7d16eccb35f15620025e1a6499397bd9c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 27 Mar 2009 14:10:18 +0000
Subject: [PATCH 115/510] handling array_intersect warning if info_responsible
 is not an array (typecast)

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

diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index 485a57dae9..0fea11f771 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -91,7 +91,7 @@ class infolog_so
 			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($this->user,true);
 			$user_and_memberships[] = $this->user;
 		}
-		return $info['info_responsible'] && array_intersect(array($info['info_responsible']),$user_and_memberships);
+		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'],$user_and_memberships);
 	}
 
 	/**

From 7caeef71fd00a84a5ced7c750eb70492cf6eb692 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 27 Mar 2009 15:35:54 +0000
Subject: [PATCH 116/510] "Do NOT trim decrypted string, as it contains binary
 data (it is compressed) and can be demaged by that. This might be a problem
 if a mcrypt alogrithm is used, that pad decrypted strings with \"\0\". (I
 tried rtrim($str,\"\0\"), but that still failed)"

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

diff --git a/etemplate/inc/class.etemplate_request.inc.php b/etemplate/inc/class.etemplate_request.inc.php
index 4221d3a8b5..9d3935411f 100644
--- a/etemplate/inc/class.etemplate_request.inc.php
+++ b/etemplate/inc/class.etemplate_request.inc.php
@@ -86,7 +86,7 @@ class etemplate_request
 	 *
 	 * @var string
 	 */
-	static public $request_class;// = 'etemplate_request_session';
+	static public $request_class; // = 'etemplate_request_session';
 
 	/**
 	 * Factory method to get a new request object or the one for an existing request
@@ -119,7 +119,7 @@ class etemplate_request
 			// decrypt the data if available
 			if (self::init_crypt())
 			{
-				$id = trim(mdecrypt_generic(self::$mcrypt,$id));
+				$id = mdecrypt_generic(self::$mcrypt,$id);
 			}
 			// uncompress the data if available
 			if (self::$compression_level && function_exists('gzcompress'))

From b54d0dab258ecb6e3f5948dbff7072f44e2904d4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 27 Mar 2009 17:39:37 +0000
Subject: [PATCH 117/510] "fixed invinit recursion (causing a segfault) when
 trying to create a home directory"

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

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index b5ca3b3340..7c7f9b1d63 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -709,7 +709,10 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			}
 		}
 		// check if a failed url_stat was for a home dir, in that case silently create it
-		if (!$stat && dirname(parse_url($path,PHP_URL_PATH)) == '/home' && ($id = $GLOBALS['egw']->accounts->name2id(basename($path))))
+		static $hook_data;	// we have to make sure to not call ourself recursivly (eg. mkdir will call stat to make sure the dir does not yet exist!)
+		if (!$stat && is_null($hook_data) && dirname(parse_url($path,PHP_URL_PATH)) == '/home' &&
+			($id = $GLOBALS['egw']->accounts->name2id(basename($path))) &&
+			$GLOBALS['egw']->accounts->id2name($id) == basename($path))	// make sure path has the right case!
 		{
 			$hook_data = array(
 				'location' => $GLOBALS['egw']->accounts->get_type($id) == 'g' ? 'addgroup' : 'addaccount',
@@ -718,6 +721,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				'account_name' => basename($path),
 			);
 			call_user_func(array('vfs_home_hooks',$hook_data['location']),$hook_data);
+			$hook_data = null;
 			$stat = self::url_stat($path,$flags,false);
 		}
 		if (!$stat && $check_symlink_components)	// check if there's a symlink somewhere inbetween the path

From 9e8ef4d85164ea2e0719a20f92878258ff9ae2c7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 27 Mar 2009 18:05:42 +0000
Subject: [PATCH 118/510] "some permanent logging (switched off by default) and
 only running chown, chgrp, chmod if mkdir succeeds"

---
 phpgwapi/inc/class.vfs_home_hooks.inc.php | 35 +++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/inc/class.vfs_home_hooks.inc.php b/phpgwapi/inc/class.vfs_home_hooks.inc.php
index 2b22488c99..d2c7d283ae 100644
--- a/phpgwapi/inc/class.vfs_home_hooks.inc.php
+++ b/phpgwapi/inc/class.vfs_home_hooks.inc.php
@@ -7,7 +7,7 @@
  * @package api
  * @subpackage vfs
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -22,6 +22,13 @@
  */
 class vfs_home_hooks
 {
+	/**
+	 * Should we log our calls to the error_log
+	 * 0 - no logging
+	 * 1 - log method calls
+	 */
+	const LOG_LEVEL = 0;
+
 	/**
 	 * Hook called after new accounts have been added
 	 *
@@ -31,12 +38,15 @@ class vfs_home_hooks
 	 */
 	static function addAccount($data)
 	{
+		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		// create a user-dir
 		egw_vfs::$is_root = true;
-		egw_vfs::mkdir($dir='/home/'.$data['account_lid'],0700,0);
-		egw_vfs::chown($dir,$data['account_id']);
-		egw_vfs::chgrp($dir,0);
-		egw_vfs::chmod($dir,0700);	// only user has access
+		if (@egw_vfs::mkdir($dir='/home/'.$data['account_lid'],0700,0))
+		{
+			egw_vfs::chown($dir,$data['account_id']);
+			egw_vfs::chgrp($dir,0);
+			egw_vfs::chmod($dir,0700);	// only user has access
+		}
 		egw_vfs::$is_root = false;
 	}
 
@@ -50,6 +60,7 @@ class vfs_home_hooks
 	 */
 	static function editAccount($data)
 	{
+		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		if ($data['account_lid'] == $data['old_loginid']) return;	// nothing to do here
 
 		// rename the user-dir
@@ -68,6 +79,7 @@ class vfs_home_hooks
 	 */
 	static function deleteAccount($data)
 	{
+		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		egw_vfs::$is_root = true;
 		if ($data['new_owner'] && ($new_lid = $GLOBALS['egw']->accounts->id2name($data['new_owner'])))
 		{
@@ -94,12 +106,15 @@ class vfs_home_hooks
 	 */
 	static function addGroup($data)
 	{
+		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		// create a group-dir
 		egw_vfs::$is_root = true;
-		egw_vfs::mkdir($dir='/home/'.$data['account_name'],070,0);
-		egw_vfs::chown($dir,0);
-		egw_vfs::chgrp($dir,$data['account_id']);
-		egw_vfs::chmod($dir,0070);	// only group has access
+		if (@egw_vfs::mkdir($dir='/home/'.$data['account_name'],070,0))
+		{
+			egw_vfs::chown($dir,0);
+			egw_vfs::chgrp($dir,$data['account_id']);
+			egw_vfs::chmod($dir,0070);	// only group has access
+		}
 		egw_vfs::$is_root = false;
 	}
 
@@ -113,6 +128,7 @@ class vfs_home_hooks
 	 */
 	static function editGroup($data)
 	{
+		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		if ($data['account_name'] == $data['old_name']) return;	// nothing to do here
 
 		// rename the group-dir
@@ -130,6 +146,7 @@ class vfs_home_hooks
 	 */
 	static function deleteGroup($data)
 	{
+		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		// delete the group-directory
 		egw_vfs::$is_root = true;
 		egw_vfs::remove('/home/'.$data['account_name']);

From 881225849d44fcee132082684071ee9d792f3d26 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 27 Mar 2009 19:03:29 +0000
Subject: [PATCH 119/510] "fixed not shown comments and other properties, if
 path contained a symlink"

---
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 7c7f9b1d63..5156440b1d 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -443,7 +443,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			{
 				return false;
 			}
-			$scheme2urls[(string)parse_url($url,PHP_URL_SCHEME)][] = $url;
+			$scheme2urls[(string)parse_url($url,PHP_URL_SCHEME)][$path] = $url;
 		}
 		$ret = array();
 		foreach($scheme2urls as $scheme => $urls)
@@ -466,7 +466,14 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				{
 					return $r;
 				}
-				$ret += $r;
+				// we need to re-translate the urls to pathes, as they can eg. contain symlinks
+				foreach($urls as $path => $url)
+				{
+					if (isset($r[$url]) || isset($r[$url=parse_url($url,PHP_URL_PATH)]))
+					{
+						$ret[$path] = $r[$url];
+					}
+				}
 			}
 			// call the filesystem specific function (dont allow to use arrays!)
 			elseif(!function_exists($name) || is_array($pathes))
@@ -726,7 +733,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		}
 		if (!$stat && $check_symlink_components)	// check if there's a symlink somewhere inbetween the path
 		{
-			$stat = self::check_symlink_components($path,$flags,$urlx=$url);
+			$stat = self::check_symlink_components($path,$flags,$url);
 		}
 		elseif(is_array($stat) && !isset($stat['url']))
 		{

From 7f9aace5280065924b023ab28d00d529f9a4b424 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 27 Mar 2009 19:10:16 +0000
Subject: [PATCH 120/510] "- sqlfs is now fully case-sensitiv (before it was
 partly case-insensitiv) - symlinks are now read by url_stat and dir_opendir
 and stored in the stat cache, to minimize DB accesses - negative url_stat
 calles (not found) are now stored in the stat cache too, to minimize DB
 access - added new log level 3, which adds method-name and line number to the
 sql statements"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index f2c3a60372..00b6c63f4e 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -7,7 +7,7 @@
  * @package api
  * @subpackage vfs
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -76,6 +76,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 * 0 = Nothing
 	 * 1 = only errors
 	 * 2 = all function calls and errors (contains passwords too!)
+	 * 3 = log line numbers in sql statements
 	 */
 	const LOG_LEVEL = 1;
 
@@ -195,8 +196,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				return false;
 			}
 			// new file --> create it in the DB
-			$stmt = self::$pdo->prepare($query='INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size'.
-				') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size)');
+			$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size'.
+				') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size)';
+			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+			$stmt = self::$pdo->prepare($query);
 			$values = array(
 				'fs_name' => basename($path),
 				'fs_dir'  => $dir_stat['ino'],
@@ -231,7 +234,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			elseif(!file_exists($fs_dir=dirname(self::_fs_path($this->opened_fs_id))))
 			{
 				$umaskbefore = umask();
-				if (self::LOG_LEVEL) error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
+				if (self::LOG_LEVEL > 1) error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
 				self::mkdir_recursive($fs_dir,0700,true);
 			}
 		}
@@ -339,6 +342,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		}
 		$ret = fclose($this->opened_stream) && $ret;
 
+		unset(self::$stat_cache[$this->opened_path]);
 		$this->opened_stream = $this->opened_path = $this->opened_mode = $this->opend_fs_id = null;
 		$this->operation = self::DEFAULT_OPERATION;
 
@@ -580,6 +584,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			return false;
 		}
 		unset(self::$stat_cache[$path_from]);
+		unset(self::$stat_cache[$path_to]);
 
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_dir=:fs_dir,fs_name=:fs_name WHERE fs_id=:fs_id');
 		return $stmt->execute(array(
@@ -654,6 +659,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			}
 			return false;	// no permission or file does not exist
 		}
+		unset(self::$stat_cache[$path]);
 		$stmt = self::$pdo->prepare('INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_creator'.
 					') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_size,:fs_mime,:fs_created,:fs_modified,:fs_creator)');
 		return  $stmt->execute(array(
@@ -751,6 +757,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			}
 			$stat = self::url_stat($path,0);
 		}
+		unset(self::$stat_cache[$path]);
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_modified=:fs_modified,fs_modifier=:fs_modifier WHERE fs_id=:fs_id');
 
 		return $stmt->execute(array(
@@ -905,7 +912,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			return false;
 		}
 		$this->opened_dir = array();
-		$query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified FROM '.self::TABLE." WHERE fs_dir=? ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
+		$query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.
+			",CASE fs_mime WHEN '".self::SYMLINK_MIME_TYPE."' THEN fs_content ELSE NULL END AS readlink FROM ".self::TABLE.
+			" WHERE fs_dir=? ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
+		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 		$stmt = self::$pdo->prepare($query);
 		$stmt->setFetchMode(PDO::FETCH_ASSOC);
@@ -964,14 +974,16 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		// check if we already have the info from the last dir_open call, as the old vfs reads it anyway from the db
 		if (self::$stat_cache && isset(self::$stat_cache[$path]))
 		{
-			return self::_vfsinfo2stat(self::$stat_cache[$path]);
+			return self::$stat_cache[$path] ? self::_vfsinfo2stat(self::$stat_cache[$path]) : false;
 		}
 
 		if (!is_object(self::$pdo))
 		{
 			self::_pdo();
 		}
-		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified FROM '.self::TABLE.' WHERE fs_name=? AND fs_dir=';
+		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.
+			",CASE fs_mime WHEN '".self::SYMLINK_MIME_TYPE."' THEN fs_content ELSE NULL END AS readlink FROM ".self::TABLE.
+			' WHERE fs_name'.self::$case_sensitive_equal.'? AND fs_dir=';
 		$parts = explode('/',$path);
 
 		// if we have extendes acl access to the url, we dont need and can NOT include the sql for the readable check
@@ -987,7 +999,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			}
 			elseif ($n < count($parts)-1)
 			{
-				$query = 'SELECT fs_id FROM '.self::TABLE.' WHERE fs_dir=('.$query.') AND fs_name='.self::$pdo->quote($name);
+				$query = 'SELECT fs_id FROM '.self::TABLE.' WHERE fs_dir=('.$query.') AND fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name);
 
 				// if we are not root AND have no extended acl access, we need to make sure the user has the right to tranverse all parent directories (read-rights)
 				if (!egw_vfs::$is_root && !$eacl_access)
@@ -1003,17 +1015,20 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			}
 			else
 			{
-				$query = str_replace('fs_name=?','fs_name='.self::$pdo->quote($name),$base_query).'('.$query.')';
+				$query = str_replace('fs_name'.self::$case_sensitive_equal.'?','fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name),$base_query).'('.$query.')';
 			}
 		}
-		//$query = "/* sqlfs::url_stat($path) */ ".$query;
-		//echo "query=$query\n";
+		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 		if (!($result = self::$pdo->query($query)) || !($info = $result->fetch(PDO::FETCH_ASSOC)))
 		{
-			self::_remove_password($url);
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags) file or directory not found!");
-			return false;
+			if (self::LOG_LEVEL > 1)
+			{
+				self::_remove_password($url);
+				error_log(__METHOD__."('$url',$flags) file or directory not found!");
+			}
+			// we also store negatives (all methods creating new files/dirs have to unset the stat-cache!)
+			return self::$stat_cache[$path] = false;
 		}
 		self::$stat_cache[$path] = $info;
 
@@ -1100,21 +1115,18 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	/**
 	 * This method is called in response to readlink().
 	 *
+	 * The readlink value is read by url_stat or dir_opendir and therefore cached in the stat-cache.
+	 *
 	 * @param string $url
 	 * @return string|boolean content of the symlink or false if $url is no symlink (or not found)
 	 */
-	static function readlink($url)
+	static function readlink($path)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url')");
+		$link = !($lstat = self::url_stat($path,STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
 
-		$url_path = parse_url($url,PHP_URL_PATH);
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = $link");
 
-		if (!($lstat = self::url_stat($url_path,STREAM_URL_STAT_LINK)) || !($lstat['mode'] & self::MODE_LINK) ||
-			!($result = self::$pdo->query("SELECT fs_content FROM ".self::TABLE." WHERE fs_id=".(int)$lstat['ino'])))
-		{
-			return false;
-		}
-		return $result->fetchColumn();
+		return $link;
 	}
 
 	/**
@@ -1134,16 +1146,15 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!stat('$link') || !is_writable('$dir'))");
 			return false;	// $link already exists or parent dir does not
 		}
-		$stmt = self::$pdo->prepare($query='INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_content'.
-			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_content)');
+		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_content'.
+			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_content)';
+		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		$stmt = self::$pdo->prepare($query);
 		$values = array(
 			'fs_name' => basename($link),
 			'fs_dir'  => $dir_stat['ino'],
-			// we use the mode of the dir, so files in group dirs stay accessible by all members
 			'fs_mode' => ($dir_stat['mode'] & 0666),
-			// for the uid we use the uid of the dir if not 0=root or the current user otherwise
 			'fs_uid'  => $dir_stat['uid'] ? $dir_stat['uid'] : egw_vfs::$user,
-			// we allways use the group of the dir
 			'fs_gid'  => $dir_stat['gid'],
 			'fs_created'  => self::_pdo_timestamp(time()),
 			'fs_modified' => self::_pdo_timestamp(time()),
@@ -1156,6 +1167,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			$stmt->bindParam(':'.$name,$val);
 		}
+		unset(self::$stat_cache[$link]);
+
 		return !!$stmt->execute();
 	}
 
@@ -1354,6 +1367,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		if (count($ids) > 1) array_map(create_function('&$v','$v = (int)$v;'),$ids);
 		$query = 'SELECT fs_id,fs_dir,fs_name FROM '.self::TABLE.' WHERE fs_id'.
 			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',',$ids).')');
+		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 		if (!is_object(self::$pdo))
 		{
@@ -1411,14 +1425,21 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			'mtime' => strtotime($info['fs_modified']),
 			'ctime' => strtotime($info['fs_created']),
 			'nlink' => $info['fs_mime'] == self::DIR_MIME_TYPE ? 2 : 1,
-			// eGW addition to return the mime type
+			// eGW addition to return some extra values
 			'mime'  => $info['fs_mime'],
+			'readlink' => $info['readlink'],
 		);
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($info[name]) = ".array2string($stat));
 		return $stat;
 	}
 
 	private static $pdo_type;
+	/**
+	 * Case sensitive comparison operator, for mysql we use ' COLLATE utf8_bin ='
+	 *
+	 * @var string
+	 */
+	public static $case_sensitive_equal = '=';
 
 	/**
 	 * Create pdo object / connection, as long as pdo is not generally used in eGW
@@ -1433,6 +1454,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			case 'mysqli':
 			case 'mysqlt':
+			case 'mysql':
+				self::$case_sensitive_equal = ' COLLATE utf8_bin =';
 				self::$pdo_type = 'mysql';
 				break;
 			default:
@@ -1531,7 +1554,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
 					'config_name' => 'files_dir',
 					'config_app' => 'phpgwapi',
-				),__LINE__,__FILE__)->fetchSingle();
+				),__LINE__,__FILE__)->fetchColumn();
 			}
 		}
 		if (!$GLOBALS['egw_info']['server']['files_dir'])
@@ -1673,7 +1696,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			{
 				if (!($stat = self::url_stat($id,0)))
 				{
-					if (self::LOG_LEVEL) error_log(__METHOD__."(".array2string($path_ids).",$depth,$ns) path '$id' not found!");
+					if (self::LOG_LEVEL) error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
 					return false;
 				}
 				$id = $stat['ino'];
@@ -1683,6 +1706,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$query = 'SELECT * FROM '.self::PROPS_TABLE.' WHERE (fs_id'.
 			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',',$ids).')').')'.
 			(!is_null($ns) ? ' AND prop_namespace=?' : '');
+		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 		$stmt = self::$pdo->prepare($query);
 		$stmt->setFetchMode(PDO::FETCH_ASSOC);

From b976659346dfb182201fc9f575c2a7cd34a68044 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 08:17:28 +0000
Subject: [PATCH 121/510] "removed unnecessary ambersand in url creation, if no
 extravars"

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

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index c32d05c175..053f082c1a 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -510,7 +510,7 @@ class egw_session
 			session_regenerate_id(true);
 		}
 		$this->sessionid = $no_session ? 'no-session' : session_id();
-		$this->kp3       = $GLOBALS['egw']->common->randomstring(24);
+		$this->kp3       = common::randomstring(24);
 
 		unset($GLOBALS['egw_info']['server']['default_domain']); // we kill this for security reasons
 
@@ -1020,7 +1020,7 @@ class egw_session
 		}
 		else
 		{
-			if ($othervars) $extravars .= '&'.$othervars;
+			if ($othervars) $extravars .= ($extravars?'&':'').$othervars;
 		}
 
 		// parse extravars string into the vars array

From 2e4577ae83498f53b207c6d9333fb7bd6e796fd3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 08:48:59 +0000
Subject: [PATCH 122/510] skipping unnecessary redirect by directly displaying
 index-method link in navbar

---
 calendar/setup/setup.inc.php    |  1 +
 etemplate/setup/setup.inc.php   |  1 +
 filemanager/setup/setup.inc.php |  1 +
 resources/index.php             | 31 ++++++++++++-------------------
 resources/setup/setup.inc.php   |  1 +
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 83a97e3d69..4897cd2c53 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -13,6 +13,7 @@ $setup_info['calendar']['name']    = 'calendar';
 $setup_info['calendar']['version'] = '1.6';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
+$setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index';
 
 $setup_info['calendar']['license']  = 'GPL';
 $setup_info['calendar']['description'] =
diff --git a/etemplate/setup/setup.inc.php b/etemplate/setup/setup.inc.php
index 8ff4e0ee17..2ae9ba9384 100644
--- a/etemplate/setup/setup.inc.php
+++ b/etemplate/setup/setup.inc.php
@@ -16,6 +16,7 @@ $setup_info['etemplate']['version']   = '1.6';
 $setup_info['etemplate']['app_order'] = 60;	// just behind the developers-tools
 $setup_info['etemplate']['tables']    = array('egw_etemplate');
 $setup_info['etemplate']['enable']    = 1;
+$setup_info['etemplate']['index']     = 'etemplate.editor.edit';
 
 $setup_info['etemplate']['author'] =
 	$setup_info['etemplate']['maintainer'] = array(
diff --git a/filemanager/setup/setup.inc.php b/filemanager/setup/setup.inc.php
index eab7667cce..08b7ea0064 100755
--- a/filemanager/setup/setup.inc.php
+++ b/filemanager/setup/setup.inc.php
@@ -13,6 +13,7 @@ $setup_info['filemanager']['title']   = 'Filemanager';
 $setup_info['filemanager']['version'] = '1.6';
 $setup_info['filemanager']['app_order'] = 6;
 $setup_info['filemanager']['enable']  = 1;
+$setup_info['filemanager']['index']   = 'filemanager.filemanager_ui.index';
 
 $setup_info['infolog']['author'] =
 $setup_info['infolog']['maintainer'] = array(
diff --git a/resources/index.php b/resources/index.php
index 8e44877df8..01fb88e75f 100755
--- a/resources/index.php
+++ b/resources/index.php
@@ -1,21 +1,14 @@
 <?php
-	/**
-	 * eGroupWare - resources
-	 * http://www.egroupware.org 
-	 *
-	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	 * @package resources
-	 * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
-	 * @author Lukas Weiss <wnz_gh05t@users.sourceforge.net>
-	 * @version $Id$
-	 */
-	
-	$GLOBALS['egw_info']['flags'] = array(
-		'currentapp'	=> 'resources',
-		'noheader'	=> True,
-		'nonavbar'	=> True
-	);
-	include('../header.inc.php');
+/**
+ * eGroupWare - resources
+ * http://www.egroupware.org
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package resources
+ * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
+ * @author Lukas Weiss <wnz_gh05t@users.sourceforge.net>
+ * @version $Id$
+ */
 
-	$GLOBALS['egw']->redirect_link('/index.php','menuaction=resources.ui_resources.index');
-	
\ No newline at end of file
+header('Location: ../index.php?menuaction=resources.ui_resources.index'.
+	(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));
diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php
index 92d2235f84..5c80b2f808 100755
--- a/resources/setup/setup.inc.php
+++ b/resources/setup/setup.inc.php
@@ -17,6 +17,7 @@ $setup_info['resources']['version']	= '1.6';
 $setup_info['resources']['app_order']	= 5;
 $setup_info['resources']['tables']	= array('egw_resources','egw_resources_extra');
 $setup_info['resources']['enable']	= 1;
+$setup_info['resources']['index']	= 'resources.ui_resources.index';
 
 $setup_info['resources']['author']	= 'Cornelius Weiss';
 $setup_info['resources']['license']	= 'GPL';

From d006ef24f9716c30750f7bc6466317a8cfb8d13f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 11:17:30 +0000
Subject: [PATCH 123/510] "as PDO allows to use named params without colon
 prefix, switched to that, as it's close to the way we use our own db class"

---
 .../inc/class.sqlfs_stream_wrapper.inc.php    | 107 ++++++++----------
 1 file changed, 49 insertions(+), 58 deletions(-)

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 00b6c63f4e..a357d9c9cc 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -215,11 +215,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				'fs_mime'     => 'application/octet-stream',	// required NOT NULL!
 				'fs_size'     => 0,
 			);
-			foreach($values as $name => &$val)
-			{
-				$stmt->bindParam(':'.$name,$val);
-			}
-			if (!$stmt->execute() || !($this->opened_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq')))
+			if (!$stmt->execute($values) || !($this->opened_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq')))
 			{
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) execute() failed: ".self::$pdo->errorInfo());
@@ -314,11 +310,11 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			}
 			// we need to update the mime-type, size and content (if STORE2DB)
 			$values = array(
-				':fs_size' => $this->stream_tell(),
+				'fs_size' => $this->stream_tell(),
 				// todo: analyse the file for the mime-type
-				':fs_mime' => $mime_magic->filename2mime($this->opened_path),
-				':fs_id'   => $this->opened_fs_id,
-				':fs_modifier' => egw_vfs::$user,
+				'fs_mime' => $mime_magic->filename2mime($this->opened_path),
+				'fs_id'   => $this->opened_fs_id,
+				'fs_modifier' => egw_vfs::$user,
 			);
 
 			if ($this->operation == self::STORE2FS)
@@ -329,13 +325,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			{
 				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_size=:fs_size,fs_mime=:fs_mime,fs_modifier=:fs_modifier,fs_content=:fs_content WHERE fs_id=:fs_id');
 				$this->stream_seek(0,SEEK_SET);	// rewind to the start
-				$stmt->bindParam(':fs_content', $this->opened_stream, PDO::PARAM_LOB);
+				$stmt->bindParam('fs_content', $this->opened_stream, PDO::PARAM_LOB);
 			}
-			foreach($values as $name => &$value)
-			{
-				$stmt->bindParam($name,$value);
-			}
-			if (!($ret = $stmt->execute()))
+			if (!($ret = $stmt->execute($values)))
 			{
 				error_log(__METHOD__."() execute() failed! errorInfo()=".array2string(self::$pdo->errorInfo()));
 			}
@@ -516,7 +508,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
 		unset(self::$stat_cache[$path]);
 
-		if (($ret = $stmt->execute(array(':fs_id' => $stat['ino']))))
+		if (($ret = $stmt->execute(array('fs_id' => $stat['ino']))))
 		{
 			if (self::url2operation($url) == self::STORE2FS && !($stat['mode'] & self::MODE_LINK))
 			{
@@ -588,9 +580,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_dir=:fs_dir,fs_name=:fs_name WHERE fs_id=:fs_id');
 		return $stmt->execute(array(
-			':fs_dir'  => $to_dir_stat['ino'],
-			':fs_name' => basename($path_to),
-			':fs_id'   => $from_stat['ino'],
+			'fs_dir'  => $to_dir_stat['ino'],
+			'fs_name' => basename($path_to),
+			'fs_id'   => $from_stat['ino'],
 		));
 	}
 
@@ -663,16 +655,16 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$stmt = self::$pdo->prepare('INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_creator'.
 					') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_size,:fs_mime,:fs_created,:fs_modified,:fs_creator)');
 		return  $stmt->execute(array(
-			':fs_name' => basename($path),
-			':fs_dir'  => $parent['ino'],
-			':fs_mode' => $parent['mode'],
-			':fs_uid'  => $parent['uid'],
-			':fs_gid'  => $parent['gid'],
-			':fs_size' => 0,
-			':fs_mime' => self::DIR_MIME_TYPE,
-			':fs_created'  => self::_pdo_timestamp(time()),
-			':fs_modified' => self::_pdo_timestamp(time()),
-			':fs_creator'  => egw_vfs::$user,
+			'fs_name' => basename($path),
+			'fs_dir'  => $parent['ino'],
+			'fs_mode' => $parent['mode'],
+			'fs_uid'  => $parent['uid'],
+			'fs_gid'  => $parent['gid'],
+			'fs_size' => 0,
+			'fs_mime' => self::DIR_MIME_TYPE,
+			'fs_created'  => self::_pdo_timestamp(time()),
+			'fs_modified' => self::_pdo_timestamp(time()),
+			'fs_creator'  => egw_vfs::$user,
 		));
 	}
 
@@ -761,9 +753,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_modified=:fs_modified,fs_modifier=:fs_modifier WHERE fs_id=:fs_id');
 
 		return $stmt->execute(array(
-			':fs_modified' => self::_pdo_timestamp($time ? $time : time()),
-			':fs_modifier' => egw_vfs::$user,
-			':fs_id' => $stat['ino'],
+			'fs_modified' => self::_pdo_timestamp($time ? $time : time()),
+			'fs_modifier' => egw_vfs::$user,
+			'fs_id' => $stat['ino'],
 		));
 	}
 
@@ -802,8 +794,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_uid=:fs_uid WHERE fs_id=:fs_id');
 
 		return $stmt->execute(array(
-			':fs_uid' => (int) $owner,
-			':fs_id' => $stat['ino'],
+			'fs_uid' => (int) $owner,
+			'fs_id' => $stat['ino'],
 		));
 	}
 
@@ -843,8 +835,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_gid=:fs_gid WHERE fs_id=:fs_id');
 
 		return $stmt->execute(array(
-			':fs_gid' => $owner,
-			':fs_id' => $stat['ino'],
+			'fs_gid' => $owner,
+			'fs_id' => $stat['ino'],
 		));
 	}
 
@@ -882,8 +874,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_mode=:fs_mode WHERE fs_id=:fs_id');
 
 		return $stmt->execute(array(
-			':fs_mode' => ((int) $mode) & 0777,		// we dont store the file and dir bits, give int overflow!
-			':fs_id' => $stat['ino'],
+			'fs_mode' => ((int) $mode) & 0777,		// we dont store the file and dir bits, give int overflow!
+			'fs_id' => $stat['ino'],
 		));
 	}
 
@@ -915,7 +907,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.
 			",CASE fs_mime WHEN '".self::SYMLINK_MIME_TYPE."' THEN fs_content ELSE NULL END AS readlink FROM ".self::TABLE.
 			" WHERE fs_dir=? ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$options)".' */ '.$query;
 
 		$stmt = self::$pdo->prepare($query);
 		$stmt->setFetchMode(PDO::FETCH_ASSOC);
@@ -1018,7 +1011,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				$query = str_replace('fs_name'.self::$case_sensitive_equal.'?','fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name),$base_query).'('.$query.')';
 			}
 		}
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$flags,$eacl_access)".' */ '.$query;
+		//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 		if (!($result = self::$pdo->query($query)) || !($info = $result->fetch(PDO::FETCH_ASSOC)))
 		{
@@ -1150,7 +1144,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_content)';
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 		$stmt = self::$pdo->prepare($query);
-		$values = array(
+		unset(self::$stat_cache[$link]);
+
+		return !!$stmt->execute(array(
 			'fs_name' => basename($link),
 			'fs_dir'  => $dir_stat['ino'],
 			'fs_mode' => ($dir_stat['mode'] & 0666),
@@ -1162,14 +1158,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			'fs_mime'     => self::SYMLINK_MIME_TYPE,
 			'fs_size'     => bytes($target),
 			'fs_content'  => $target,
-		);
-		foreach($values as $name => &$val)
-		{
-			$stmt->bindParam(':'.$name,$val);
-		}
-		unset(self::$stat_cache[$link]);
-
-		return !!$stmt->execute();
+		));
 	}
 
 	private static $extended_acl;
@@ -1653,11 +1642,12 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				if (!isset($del_stmt))
 				{
 					$del_stmt = self::$pdo->prepare('DELETE FROM '.self::PROPS_TABLE.' WHERE fs_id=:fs_id AND prop_namespace=:prop_namespace AND prop_name=:prop_name');
-					$del_stmt->bindParam(':fs_id',$id);
 				}
-				$del_stmt->bindParam(':prop_namespace',$prop['ns']);
-				$del_stmt->bindParam(':prop_name',$prop['name']);
-				$del_stmt->execute();
+				$del_stmt->execute(array(
+					'fs_id'          => $id,
+					'prop_namespace' => $prop['ns'],
+					'prop_name'      => $prop['name'],
+				));
 			}
 			if (isset($prop['val']))
 			{
@@ -1665,12 +1655,13 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				{
 					$ins_stmt = self::$pdo->prepare((self::$pdo_type == 'mysql' ? 'REPLACE' : 'INSERT').
 						' INTO '.self::PROPS_TABLE.' (fs_id,prop_namespace,prop_name,prop_value) VALUES (:fs_id,:prop_namespace,:prop_name,:prop_value)');
-					$ins_stmt->bindParam(':fs_id',$id);
 				}
-				$ins_stmt->bindParam(':prop_namespace',$prop['ns']);
-				$ins_stmt->bindParam(':prop_name',$prop['name']);
-				$ins_stmt->bindParam(':prop_value',$prop['val']);
-				if (!$ins_stmt->execute())
+				if (!$ins_stmt->execute(array(
+					'fs_id'          => $id,
+					'prop_namespace' => $prop['ns'],
+					'prop_name'      => $prop['name'],
+					'prop_value'     => $prop['val'],
+				)))
 				{
 					return false;
 				}

From 873ee33dc7701ab9ccbce93ac988786e3a028042 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 11:18:58 +0000
Subject: [PATCH 124/510] "- fixed not working symlinks to other symlinks -
 added a symlink cache (only per request) to cut down db accesses"

---
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 94 ++++++++++++++++++-
 1 file changed, 90 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 5156440b1d..f4adc9dbb2 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -136,9 +136,10 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 * Resolve the given path according to our fstab
 	 *
 	 * @param string $path
+	 * @param boolean $do_symlink=true is a direct match allowed, default yes (must be false for a lstat or readlink!)
 	 * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
 	 */
-	static function resolve_url($path)
+	static function resolve_url($path,$do_symlink=true)
 	{
 		static $cache = array();
 
@@ -148,6 +149,9 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '{$cache[$path]}' (from cache)");
 			return $cache[$path];
 		}
+		// check if we can already resolve path (or a part of it) with a known symlinks
+		$path = self::symlinkCache_resolve($path,$do_symlink);
+
 		// setting default user, passwd and domain, if it's not contained int the url
 		static $defaults;
 		if (is_null($defaults))
@@ -356,6 +360,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		{
 			return false;
 		}
+		self::symlinkCache_remove($path);
 		return unlink($url);
 	}
 
@@ -378,6 +383,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		{
 			return false;
 		}
+		self::symlinkCache_remove($path_from);
 		return rename($url_from,$url_to);
 	}
 
@@ -417,6 +423,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		{
 			return false;
 		}
+		self::symlinkCache_remove($path);
 		return rmdir($url);
 	}
 
@@ -691,7 +698,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components)");
 
-		if (!($url = self::resolve_url($path)))
+		if (!($url = self::resolve_url($path,!($flags & STREAM_URL_STAT_LINK))))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!");
 			return false;
@@ -704,7 +711,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		{
 			$stat = @stat($url);	// suppressed the stat failed warnings
 
-			if ($stat && ($stat['mode'] & self::MODE_LINK) &&  ($l=$lpath = self::readlink($url)))
+			if ($stat && ($stat['mode'] & self::MODE_LINK) &&  ($lpath = self::readlink($url)))
 			{
 				if ($lpath[0] != '/')	// concat relative path
 				{
@@ -712,7 +719,12 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				}
 				$url = egw_vfs::PREFIX.$lpath;
 				if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$flags) symlink found and resolved to $url");
-				$stat = @stat($url);
+				// try reading the stat of the link
+				if ($stat = self::url_stat($lpath,STREAM_URL_STAT_QUIET))
+				{
+					if(isset($stat['url'])) $url = $stat['url'];	// if stat returns an url use that, as there might be more links ...
+					self::symlinkCache_add($path,$url);
+				}
 			}
 		}
 		// check if a failed url_stat was for a home dir, in that case silently create it
@@ -734,6 +746,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		if (!$stat && $check_symlink_components)	// check if there's a symlink somewhere inbetween the path
 		{
 			$stat = self::check_symlink_components($path,$flags,$url);
+			if ($stat) self::symlinkCache_add($path,$url);
 		}
 		elseif(is_array($stat) && !isset($stat['url']))
 		{
@@ -781,6 +794,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 					{
 						$lpath = egw_vfs::concat(parse_url($url,PHP_URL_PATH),'../'.$lpath);
 					}
+					//self::symlinkCache_add($path,egw_vfs::PREFIX.$lpath);
 					$url = egw_vfs::PREFIX.egw_vfs::concat($lpath,$rel_path);
 					if (self::LOG_LEVEL > 1) error_log("$log --> lpath='$lpath', url='$url'");
 					return self::url_stat($url,$flags);
@@ -794,6 +808,78 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		return false;	// $path does not exist
 	}
 
+	/**
+	 * Cache of already resolved symlinks
+	 *
+	 * @var array with path => target
+	 */
+	private static $symlink_cache = array();
+
+	/**
+	 * Add a resolved symlink to cache
+	 *
+	 * @param string $path vfs path
+	 * @param string $target target path
+	 */
+	static protected function symlinkCache_add($path,$target)
+	{
+		if ($path[0] != '/') $path = parse_url($path,PHP_URL_PATH);
+		if (isset(self::$symlink_cache[$path])) return;	// nothing to do
+
+		if ($target[0] != '/') $target = parse_url($target,PHP_URL_PATH);
+
+		self::$symlink_cache[$path] = $target;
+
+		// sort longest path first
+		uksort(self::$symlink_cache,create_function('$b,$a','return strlen($a)-strlen($b);'));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$target) cache now ".array2string(self::$symlink_cache));
+	}
+
+	/**
+	 * Remove a resolved symlink from cache
+	 *
+	 * @param string $path vfs path
+	 */
+	static protected function symlinkCache_remove($path)
+	{
+		if ($path[0] != '/') $path = parse_url($path,PHP_URL_PATH);
+		unset(self::$symlink_cache[$path]);
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path) cache now ".array2string(self::$$symlink_cache));
+	}
+
+	/**
+	 * Resolve a path from our symlink cache
+	 *
+	 * The cache is sorted from longer to shorter pathes.
+	 *
+	 * @param string $path
+	 * @param boolean $do_symlink=true is a direct match allowed, default yes (must be false for a lstat or readlink!)
+	 * @return string target or path, if path not found
+	 */
+	static protected function symlinkCache_resolve($path,$do_symlink=true)
+	{
+		if ($path[0] != '/') $path = parse_url($path,PHP_URL_PATH);
+		$strlen_path = strlen($path);
+
+		foreach(self::$symlink_cache as $p => $t)
+		{
+			if (($strlen_p = strlen($p)) > $strlen_path) continue;	// $path can NOT start with $p
+
+			if ($path == $p)
+			{
+				if ($do_symlink) $target = $t;
+				break;
+			}
+			elseif (substr($path,0,$strlen_p+1) == $p.'/')
+			{
+				$target = $t . substr($path,$strlen_p);
+				break;
+			}
+		}
+		if (self::LOG_LEVEL > 1 && isset($target)) error_log(__METHOD__."($path) = $target");
+		return isset($target) ? $target : $path;
+	}
+
 	/**
 	 * This method is called in response to readdir().
 	 *

From 5522a6b90706e5b170165ea27b07812231994b19 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 30 Mar 2009 12:17:27 +0000
Subject: [PATCH 125/510] Feature Request 1968: Display gray up/down arrows for
 first/last message in message window

---
 phpgwapi/templates/default/images/down.grey.png | Bin 0 -> 499 bytes
 phpgwapi/templates/default/images/up.grey.png   | Bin 0 -> 500 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 phpgwapi/templates/default/images/down.grey.png
 create mode 100644 phpgwapi/templates/default/images/up.grey.png

diff --git a/phpgwapi/templates/default/images/down.grey.png b/phpgwapi/templates/default/images/down.grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bdec813739bb1dd76b7dd88f5bdca1312f6704e
GIT binary patch
literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002VoOIv0RM-N
z%)bBt010qNS#tmY3k?7O3k?D72f!=<000McNliru*#jO61R9&zZlnMJ0fb3JK~yNu
zMbXbo({TXC@z>|OIo6tv0?R@QZ6OE}R1!$H=+Hq3qKlUZjrt$z5Jde2-Uga<>d;Aw
zkPaTagn<VkLKyv8&eD-nXKuFdI%MlPKF|B`JUl^L6KTV(yr38_PVfG6!$Fw!Ai9^z
z9hI`CUX7nOA3y!l1}1vK{IP+n1|7z}6>~mq#5bqr2~1?eyTO6$4q*Y8(e%pO%Kp$y
zIl=iS$45s6b#)h<^V5!oQ_7jm&Wm$lJRPlF%k>^q8pb!Ph^=|K(-=w`PUkW<|Bta}
z(~f0(QrZ2Hq<p8UAZi0OMHO{)i1Lxpv?1+=OFn>gN%xKa9T+7QYu07ZYYg<c0up|U
zOHsU7uLfVupbzxpqi2%pwboKJy&F$8<W#+Aw<wu)L_>2nwHncU^rP6)W!q~|_C}YM
z@1=NBCBW@7$+@%rrv=@*z1Q;DN-4gZSSV~AoOSC&;$dd2C)<f_<=U^=c(P-;u+@H(
pJE_LWFcRfOajCVGT2(1D;18>#isS_%RXhLy002ovPDHLkV1j#G;5h&Q

literal 0
HcmV?d00001

diff --git a/phpgwapi/templates/default/images/up.grey.png b/phpgwapi/templates/default/images/up.grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0fb749716d91089405bc93c232fb25a4d0daf9d
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00002VoOIv0RM-N
z%)bBt010qNS#tmY3k?7O3k?D72f!=<000McNliru*#jO61s;X2oBRL(0fk9KK~yNu
zJ<(4~RB;r>@z4FucrhDiNcv9{<%A(vP)T5G7cGP~ts^q(6|`y>^$Nm8k`}aypiR`m
zHZFn?1tSPVFe)ZzGR;v`n6Z0rn{m$ad>?qu;TvhsXs5xfEV7i&PVVe&qZTZ95bnjL
z9<iFnM*1pw^!#T#FnTnaKHN8~-+t^`H0AqhdShamh|xkc*WY*DK70Y^CElA^+Z}jO
z&2jPZk&zLRhDBGM)9aHiCsn)Z-Iu4L+nu3yt#kr)R}@>PeNa^MZmT&E40e{f)YV;T
zV}>o55f`GNpxkXk-32{Z0l#q5X&pj2h!U&TC3tB8jQO_rV8~nA_6JX8GRImK&qRWM
z(n?5Y8yk@z$jMqb=+Ggrv7OC_$(?kfsidUjpaM9g#{o^r+ju#UJX~4I6crV%qpGMV
z^ShEhu@=Ft-u%?rGpF{%$o#NaN$=)9j&J7R^ZLN+zuncoM%=We>g#sxO>#d!H@?}n
q$(^`)JQ@mRA+2Qd@v^n?Cj18xn}>Aqjba!80000<MNUMnLSTZ4H{lxq

literal 0
HcmV?d00001


From b93a4503949c6ba872b537d368e5ddfda0e15455 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 14:06:39 +0000
Subject: [PATCH 126/510] "- added more licenses with urls (LGPL, PHP, GPL3) -
 fixed not displayed information, if setup info is in an other apps setup file
 (eg. GroupDAV or Website) - added support different navbar icon name"

---
 phpgwapi/inc/class.about.inc.php | 85 +++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 33 deletions(-)

diff --git a/phpgwapi/inc/class.about.inc.php b/phpgwapi/inc/class.about.inc.php
index 2f4d9c2d19..d0b71d6b0c 100644
--- a/phpgwapi/inc/class.about.inc.php
+++ b/phpgwapi/inc/class.about.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * eGroupWare: About informations
- * 
+ *
  * rewrite of the old PHPLib based about page
  * it now uses eTemplate
  *
@@ -57,7 +57,7 @@ class about
 			$type = 'application';
 			$detail = true;
 		}
-		
+
 		// template detail?
 		if (isset($_GET['template']) && $_GET['template'] != 'eGroupWare') {
 			$name = basename($_GET['template']);
@@ -69,8 +69,8 @@ class about
 		if (isset($_GET['nonavbar'])) {
 			$nonavbar = $_GET['nonavbar'];
 		}
-		
-		
+
+
 		if ($detail) {
 			$this->_detailView($name, $type, $nonavbar);
 		} else {
@@ -97,7 +97,9 @@ class about
 		// get informations about the applications
 		$apps = array();
 		$apps[] = ''; // first empty row for eTemplate
-		foreach ($GLOBALS['egw_info']['user']['apps'] as $app => $appinfo) {
+		foreach (isset($GLOBALS['egw_info']['user']['apps']['admin']) ?
+			$GLOBALS['egw_info']['apps'] : $GLOBALS['egw_info']['user']['apps'] as $app => $appinfo)
+		{
 			$info = $this->_getParsedAppInfo($app);
 			$apps[] = array(
 				'appImage'		=> '<img src="'.$info['image'].'" />',
@@ -135,7 +137,7 @@ class about
 				'langName'	=>	$translationinfo.' ('.$translation.')'
 				);
 		}
-		
+
 
 		// fill content array for eTemplate
 		$content = array(
@@ -247,8 +249,8 @@ class about
 	 * parse application informations from setup.inc.php file
 	 *
 	 * @param	string	$app	application name
-	 * @return	array	html formated informations about author(s), 
-	 *					maintainer(s), version, license of the 
+	 * @return	array	html formated informations about author(s),
+	 *					maintainer(s), version, license of the
 	 *					given application
 	 *
 	 * @access  private
@@ -256,30 +258,41 @@ class about
 	 */
 	function _getParsedAppInfo($app)
 	{
+		// we read all setup files once, as no every app has it's own file
+		static $setup_info;
+		if (is_null($setup_info))
+		{
+			foreach($GLOBALS['egw_info']['apps'] as $_app => $_data)
+			{
+				if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$_app.'/setup/setup.inc.php'))
+				{
+					include($file);
+				}
+			}
+		}
+		$app_info  = $GLOBALS['egw_info']['apps'][$app];
+
 		// define the return array
 		$ret = array(
-			'image'			=> $GLOBALS['egw']->common->image($app,array('navbar','nonav')),
+			'image'			=> $GLOBALS['egw']->common->image(isset($app_info['icon_app'])?$app_info['icon_app']:$app,
+				isset($app_info['icon'])?$app_info['icon']:array('navbar','nonav')),
 			'author'		=> '',
 			'maintainer'	=> '',
-			'version'		=> '',
+			'version'		=> $app_info['version'],
 			'license'		=> '',
 			'description'	=> '',
 			'note'			=> ''
 		);
-		
-		if (!file_exists(EGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php")) {
-			return $ret;
-		}
-		
-		include(EGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php");
-		
-		$ret['author'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'author');
-		$ret['maintainer'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'maintainer');
-		$ret['version'] = $setup_info[$app]['version'];
-		$ret['license'] = $setup_info[$app]['license'];
-		$ret['description'] = $setup_info[$app]['description'];
-		$ret['note'] = $setup_info[$app]['note'];
 
+		if (isset($setup_info[$app]))
+		{
+			$ret['author'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'author');
+			$ret['maintainer'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'maintainer');
+			if ($app_info['version'] != $setup_info[$app]['version']) $ret['version'] .= ' ('.$setup_info[$app]['version'].')';
+			$ret['license'] = $setup_info[$app]['license'];
+			$ret['description'] = $setup_info[$app]['description'];
+			$ret['note'] = $setup_info[$app]['note'];
+		}
 		return $ret;
 	}
 
@@ -287,7 +300,7 @@ class about
 	/**
 	 * helper to parse author and maintainer info from setup_info array
 	 *
-	 * @param	array	$setup_info	setup_info[$app] array 
+	 * @param	array	$setup_info	setup_info[$app] array
 	 *								($GLOBALS['egw_info']['template'][$template] array for template informations)
 	 * @param	string	$f			'author' or 'maintainer', default='author'
 	 * @return	string	html formated informations about author/maintainer
@@ -310,7 +323,7 @@ class about
 						if ($setup_info[$f.'_url']) {
 							$authors[0]['url'] = $setup_info[$f.'_url'];
 						}
-	
+
 				} else {
 						// author is array
 						if ($setup_info[$f]['name']) {
@@ -370,15 +383,21 @@ class about
 	{
 		// toupper known licenses
 		$knownLicenses = array(
-			'GPL'	=> 'http://www.gnu.org/copyleft/gpl.html'
-			);
-		
-		if (array_key_exists(strtoupper($license), $knownLicenses)) {
-			$license = '<a href="'.$knownLicenses[strtoupper($license)].'" target="_blank">'.$license.'</a>';
+			'GPL'	=> 'http://opensource.org/licenses/gpl-2.0.php',
+			'LGPL'	=> 'http://opensource.org/licenses/lgpl-2.1.php',
+			'GPL3'	=> 'http://opensource.org/licenses/gpl-3.0.php',
+			'LGPL3'	=> 'http://opensource.org/licenses/lgpl-3.0.php',
+			'PHP'   => 'http://opensource.org/licenses/php.php',
+		);
+
+		$name = is_array($license) ? $license['name'] : $license;
+		$url = is_array($license) && isset($license['url']) ? $license['url'] : '';
+
+		if (!$url && isset($knownLicenses[strtoupper($name)]))
+		{
+			$url = $knownLicenses[$name=strtoupper($name)];
 		}
 
-		return $license;
+		return !$url ? $name : '<a href="'.htmlspecialchars($url).'" target="_blank">'.htmlspecialchars($name).'</a>';
 	}
 }
-
-?>
\ No newline at end of file

From ea398a45de3f0afee21d35e2cea1a37478b51d80 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 14:07:46 +0000
Subject: [PATCH 127/510] added more info about groupdav

---
 phpgwapi/setup/setup.inc.php                   |  13 ++++++++++++-
 phpgwapi/templates/default/images/groupdav.png | Bin 0 -> 5451 bytes
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 phpgwapi/templates/default/images/groupdav.png

diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index 134b49d89d..0e4d20cd69 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -16,6 +16,11 @@ $setup_info['phpgwapi']['version']   = '1.7.001';
 $setup_info['phpgwapi']['versions']['current_header'] = '1.29';
 $setup_info['phpgwapi']['enable']    = 3;
 $setup_info['phpgwapi']['app_order'] = 1;
+$setup_info['phpgwapi']['license'] = 'GPL';
+$setup_info['phpgwapi']['maintainer']	= $setup_info['phpgwapi']['author']	= array(
+	'name'  => 'eGroupWare coreteam',
+	'email' => 'egroupware-developers@lists.sourceforge.net',
+);
 
 /* The tables this app creates */
 $setup_info['phpgwapi']['tables'][]  = 'egw_config';
@@ -63,4 +68,10 @@ $setup_info['groupdav']['name']      = 'groupdav';
 $setup_info['groupdav']['version']   = '1.6';
 $setup_info['groupdav']['enable']    = 2;
 $setup_info['groupdav']['app_order'] = 1;
-
+$setup_info['groupdav']['icon']      = 'groupdav';
+$setup_info['groupdav']['icon_app']  = 'phpgwapi';
+$setup_info['groupdav']['author'] = $setup_info['groupdav']['maintainer'] = array(
+	'name'  => 'Ralf Becker',
+	'email' => 'RalfBecker@outdoor-training.de'
+);
+$setup_info['groupdav']['license'] = 'GPL';
diff --git a/phpgwapi/templates/default/images/groupdav.png b/phpgwapi/templates/default/images/groupdav.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c239857a0d4b03422f4d6fd7a2f8a849db7f6b3
GIT binary patch
literal 5451
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
BlluSw

literal 0
HcmV?d00001


From 05a29fc777f7011e15a517ddc7aa5498ce2abb96 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 14:09:13 +0000
Subject: [PATCH 128/510] "fixed typo in author and maintainer info"

---
 filemanager/setup/setup.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/filemanager/setup/setup.inc.php b/filemanager/setup/setup.inc.php
index 08b7ea0064..d5cfa82a42 100755
--- a/filemanager/setup/setup.inc.php
+++ b/filemanager/setup/setup.inc.php
@@ -15,12 +15,12 @@ $setup_info['filemanager']['app_order'] = 6;
 $setup_info['filemanager']['enable']  = 1;
 $setup_info['filemanager']['index']   = 'filemanager.filemanager_ui.index';
 
-$setup_info['infolog']['author'] =
-$setup_info['infolog']['maintainer'] = array(
+$setup_info['filemanager']['author'] =
+$setup_info['filemanager']['maintainer'] = array(
 	'name'  => 'Ralf Becker',
 	'email' => 'ralfbecker@outdoor-training.de'
 );
-$setup_info['infolog']['license']  = 'GPL';
+$setup_info['filemanager']['license']  = 'GPL';
 
 /* The hooks this app includes, needed for hooks registration */
 $setup_info['filemanager']['hooks']['preferences'] = 'filemanager_hooks::preferences';

From f27989b93129da8dd5fa55840a151f6d01a8a157 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 14:12:21 +0000
Subject: [PATCH 129/510] "fixed author & maintainer info"

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

diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index 99af1fa6af..bca023a26e 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -24,8 +24,10 @@ $setup_info['addressbook']['description'] =
 	 Addressbook is the eGroupWare default contact application. <br />
 	 It stores contact information via SQL or LDAP and provides contact services via the eGroupWare API.';
 
-$setup_info['addressbook']['maintainer'] = 'eGroupWare coreteam';
-$setup_info['addressbook']['maintainer_email'] = 'egroupware-developers@lists.sourceforge.net';
+$setup_info['addressbook']['maintainer'] = array(
+	'name'  => 'Ralf Becker',
+	'email' => 'ralfbecker@outdoor-training.de'
+);
 
 $setup_info['addressbook']['tables']  = array();	// addressbook tables are in the API!
 

From 9937f44e5a0286966b4efc785e09f630bc09296e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 16:34:04 +0000
Subject: [PATCH 130/510] "- using exceptions instead of die with
 function_backtrace --> gives nicer traces (specially with ajax) - fixed typo
 in get_array"

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

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index ae0b71da5d..94750d4012 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -528,7 +528,7 @@ class boetemplate extends soetemplate
 	{
 		if (!is_array($arr))
 		{
-			die('set_array() $arr is no array<br>'.function_backtrace());
+			throw new egw_exception_assertion_failed(__METHOD__."(\$arr,'$idx','$val') \$arr is no array!");
 		}
 		$idxs = explode('[',str_replace(']','',$idx));
 		$pos = &$arr;
@@ -555,7 +555,7 @@ class boetemplate extends soetemplate
 	{
 		if (!is_array($arr))
 		{
-			die('set_array() $arr is no array<br>'.function_backtrace());
+			throw new egw_exception_assertion_failed(__METHOD__."(\$arr,'$idx',$reference_into,$skip_empty) \$arr is no array!");
 		}
 		if (is_object($idx)) return false;	// given an error in php5.2
 
@@ -563,7 +563,7 @@ class boetemplate extends soetemplate
 		$pos = &$arr;
 		foreach($idxs as $idx)
 		{
-			if (!is_array($pos) && !$referenz_info)
+			if (!is_array($pos) && !$reference_info)
 			{
 				return False;
 			}
@@ -586,7 +586,7 @@ class boetemplate extends soetemplate
 	{
 		if (!is_array($arr))
 		{
-			die('set_array() $arr is no array<br>'.function_backtrace());
+			throw new egw_exception_assertion_failed(__METHOD__."(\$arr,'$idx') \$arr is no array!");
 		}
 		$idxs = explode('[',str_replace(']','',$idx));
 		$last_idx = array_pop($idxs);

From 1dbec93dc95faafbbf1575143d6dfb6fbccdb792 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2009 16:36:25 +0000
Subject: [PATCH 131/510] "fixed broken extended search in addressbook: form
 get's summited via ajax (without the _FILES array), which caused the
 process_show for 'files' to stall the the ajax request --> get's ignored now"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 0b147ab68a..b19740caea 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -2049,6 +2049,7 @@ class etemplate extends boetemplate
 						$file = array();
 						foreach(array('tmp_name','type','size','name','error') as $part)
 						{
+							if (!is_array($_FILES[$name])) break 2;	// happens eg. in forms set via xajax, which do not upload files
 							$file[$part] = $this->get_array($_FILES[$name],$part.$index.($multiple ? "[$i]" : ''));
 						}
 						if (!$multiple) $file['path'] = $this->get_array($content_in,substr($form_name,0,-1).'_path]');

From 637b6557fbe7ec58f24d6354f57a54e1c366da4f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 31 Mar 2009 08:43:12 +0000
Subject: [PATCH 132/510] "- symlinkCache_resolve failed on other mounted dir
 (eg. from the filesystem stream-wrapper), as it removed the scheme --> now
 done only for vfs scheme - quitened readlink to not complain if backend does
 not support links"

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

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index f4adc9dbb2..c38904cddb 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -560,7 +560,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function readlink($path)
 	{
-		return self::_call_on_backend('readlink',array($path));
+		return self::_call_on_backend('readlink',array($path),true);	// true = fail silent, if backend does not support readlink
 	}
 
 	/**
@@ -858,7 +858,11 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static protected function symlinkCache_resolve($path,$do_symlink=true)
 	{
-		if ($path[0] != '/') $path = parse_url($path,PHP_URL_PATH);
+		// remove vfs scheme, but no other schemes (eg. filesystem!)
+		if ($path[0] != '/' && parse_url($path,PHP_URL_SCHEME) == self::SCHEME)
+		{
+			$path = parse_url($path,PHP_URL_PATH);
+		}
 		$strlen_path = strlen($path);
 
 		foreach(self::$symlink_cache as $p => $t)

From 8f7f89666fd091b43027690448fd4bd277839e12 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 31 Mar 2009 11:30:12 +0000
Subject: [PATCH 133/510] New options for filesystme stream-wrapper: - all:  
 false (default) = ignore files starting with a dot '.',   true = show all
 files (. and .. are always ignored!) - exec: false (default) = do NOT allow
 to upload or modify scripts,   true = allow it (if docroot is mounted, this
 allows to run scripts!) --> deny_script method was added to egw_vfs and calls
 to it from filemanager Other fixes: - missing write rights of the webserver
 were not removed from perms   (causing warnings to be displayed in the ui) -
 rename was not working due to typos --> should be backported for obvious
 reasons to 1.6

---
 filemanager/inc/class.filemanager_ui.inc.php  | 13 ++-
 phpgwapi/inc/class.egw_vfs.inc.php            | 15 ++-
 .../class.filesystem_stream_wrapper.inc.php   | 95 ++++++++++++++++---
 3 files changed, 107 insertions(+), 16 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 9a39187f73..a9e9fbeb3f 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @package filemanager
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -274,7 +274,12 @@ class filemanager_ui
 		// strip '?', '/' and '#' from filenames, as they are forbidden for sqlfs / make problems
 		$path = egw_vfs::concat($dir,str_replace(array('?','/','#'),'',$name));
 
-		if (egw_vfs::stat($path))
+		if(egw_vfs::deny_script($path))
+		{
+			$response->addAlert(lang('You are NOT allowed to upload a script!'));
+			$response->addScript("document.getElementById('$id').value='';");
+		}
+		elseif (egw_vfs::stat($path))
 		{
 			if (egw_vfs::is_dir($path))
 			{
@@ -656,6 +661,10 @@ class filemanager_ui
 							else
 							{
 								$msg .= lang('Rename of %1 to %2 failed!',$path,$to).' ';
+								if (egw_vfs::deny_script($to))
+								{
+									$msg .= lang('You are NOT allowed to upload a script!').' ';
+								}
 							}
 						}
 						elseif ($name[0] == '#' || $name == 'comment')
diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 8a743f3d4c..d69c29012d 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -7,7 +7,7 @@
  * @package api
  * @subpackage vfs
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -695,6 +695,17 @@ class egw_vfs extends vfs_stream_wrapper
 		return self::is_readable($path,1);
 	}
 
+	/**
+	 * Check if path is a script and write access would be denied by backend
+	 *
+	 * @param string $path
+	 * @return boolean true if $path is a script AND exec mount-option is NOT set, false otherwise
+	 */
+	static function deny_script($path)
+	{
+		return self::_call_on_backend('deny_script',array($path),true);
+	}
+
 	/**
 	 * Set or delete extended acl for a given path and owner (or delete  them if is_null($rights)
 	 *
@@ -1012,7 +1023,7 @@ class egw_vfs extends vfs_stream_wrapper
 			$b = explode('/',$b);
 			$url = implode('/',array_merge($a,$b));
 		}
-		return $url.($query ? '?'.$query : '');
+		return $url.($query ? (strpos($url,'?')===false ? '?' : '&').$query : '');
 	}
 
 	/**
diff --git a/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php b/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
index cf2f9d81cc..4d8e44d19c 100644
--- a/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
@@ -7,7 +7,7 @@
  * @package api
  * @subpackage vfs
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -21,6 +21,9 @@
  * - user:  uid or user-name owning the path, default root
  * - group: gid or group-name owning the path, default root
  * - mode:  mode bit for the path, default 0005 (read and execute for nobody)
+ * - all:   false (default) = ignore files starting with a dot '.', true = show all files (. and .. are always ignored!)
+ * - 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
  *
  * @link http://www.php.net/manual/en/function.stream-wrapper-register.php
  */
@@ -79,6 +82,13 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 	 */
 	private $opened_dir_url;
 
+	/**
+	 * Should dir show all files, or only the ones NOT starting with a dot (. and .. are never shown)
+	 *
+	 * @var boolean
+	 */
+	private $dir_show_all = false;
+
 	/**
 	 * How much should be logged to the apache error-log
 	 *
@@ -88,6 +98,11 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 	 */
 	const LOG_LEVEL = 1;
 
+	/**
+	 * Regular expression identifying scripts, to NOT allow updating them if exec mount option is NOT set
+	 */
+	const SCRIPT_EXTENSIONS_PREG = '/\.(php[0-9]*|pl|py)$/';
+
 	/**
 	 * This method is called immediately after your stream object is created.
 	 *
@@ -129,10 +144,20 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 			}
 			return false;
 		}
+		if ($mode != 'r' && self::deny_script($url))
+		{
+			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			if (!($options & STREAM_URL_STAT_QUIET))
+			{
+				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
+			}
+			return false;
+		}
 
 		// open the "real" file
-		if (!($this->opened_stream = fopen(parse_url($url,PHP_URL_PATH),$mode,$options)))
+		if (!($this->opened_stream = fopen($path=parse_url($url,PHP_URL_PATH),$mode,$options)))
 		{
+			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
 			return false;
 		}
 		$this->opened_stream_url = $url;
@@ -303,21 +328,27 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 		// check access rights
 		if (!($from_stat = self::url_stat($url_from,0)) || !egw_vfs::check_access(egw_vfs::dirname($url_from),egw_vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_from permission denied!");
+			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
 			return false;	// no permission or file does not exist
 		}
+		$to_dir = egw_vfs::dirname($url_to);
 		if (!egw_vfs::check_access($to_dir,egw_vfs::WRITABLE,$to_dir_stat = self::url_stat($to_dir,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_to permission denied!");
+			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
 			return false;	// no permission or parent-dir does not exist
 		}
+		if (self::deny_script($url_to))
+		{
+			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			return false;
+		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
 		// for our vfs too, we abort here with an error, like the filesystem one does
-		if (($to_stat = self::url_stat($path_to,0)) &&
+		if (($to_stat = self::url_stat($to['path'],0)) &&
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $path_to is $is_dir directory!");
+			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
 			return false;	// no permission or file does not exist
 		}
 		// if destination file already exists, delete it
@@ -459,16 +490,19 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 	 */
 	function dir_opendir ( $url, $options )
 	{
-		error_log(__METHOD__."($url,$options)");
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
 
 		$this->opened_dir = null;
 
 		$parts = parse_url($this->opened_dir_url = $url);
+		parse_str($parts['query'],$get);
+		$this->dir_show_all = (bool)$get['all'];
 
 		// ToDo: check access rights
 
 		if (!($this->opened_dir = opendir($parts['path'])))
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."($url,$options) opendir('$parts[path]') failed!");
 			return false;
 		}
 		return true;
@@ -504,7 +538,6 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 	{
 		$parts = parse_url($url);
 
-		//error_log(__METHOD__."('$path',$flags) calling stat($url)");
 		$stat = @stat($parts['path']);	// suppressed the stat failed warnings
 
 		if ($stat)
@@ -513,12 +546,18 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 			if (!self::parse_query($parts['query'],$uid,$gid,$mode))
 			{
 				return false;
+				if (self::LOG_LEVEL > 0) error_log(__METHOD__."($url,$flags) can NOT self::parse_query('$parts[query]')!");
 			}
 			$stat['uid'] = $stat[4] = $uid;
 			$stat['gid'] = $stat[5] = $gid;
 			$stat['mode'] = $stat[2] = $stat['mode'] & self::MODE_DIR ? self::MODE_DIR | $mode : self::MODE_FILE | ($mode & ~0111);
+			// write rights also depend on the write rights of the webserver
+			if (!is_writable($parts['path']))
+			{
+				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
+			}
 		}
-		//echo __METHOD__."($url,$flags) path=$parts[path], mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.egw_vfs::int2mode($stat['mode'])."\n"; //print_r($stat);
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$parts[path], mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.egw_vfs::int2mode($stat['mode']));
 		return $stat;
 	}
 
@@ -534,7 +573,19 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 	 */
 	function dir_readdir ( )
 	{
-		return readdir($this->opened_dir);
+		do {
+			$file = readdir($this->opened_dir);
+
+			$ignore = !($file === false ||									// stop if no more dirs or
+				$file[0] != '.' ||											// file does NOT start with a dot '.' or
+				($this->dir_show_all && $file != '.' && $file != '..' ));	// file not . or .. or dir_show_all set
+			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
+		}
+		while ($ignore);
+
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() returning '.array2string($file));
+
+		return $file;
 	}
 
 	/**
@@ -559,11 +610,11 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 	 */
 	function dir_closedir ( )
 	{
-		$ret = closedir($this->opened_dir);
+		closedir($this->opened_dir);
 
 		$this->opened_dir = $this->extra_dirs = null;
 
-		return $ret;
+		return true;
 	}
 
 	/**
@@ -643,6 +694,26 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 		//echo __METHOD__.'('.print_r($query,true).") uid=$uid, gid=$gid, mode=".sprintf('0%o',$mode)."\n";
 		return true;
 	}
+
+	/**
+	 * Check if url is a script (self::$script_extentions) and exec mount option is NOT set
+	 *
+	 * @param string $url
+	 * @return boolean true if $url is a script AND exec is NOT set, false otherwise
+	 */
+	static function deny_script($url)
+	{
+		$parts = parse_url($url);
+		parse_str($parts['query'],$get);
+
+		$deny = !$get['exec'] && preg_match(self::SCRIPT_EXTENSIONS_PREG,$parts['path']);
+
+		if (self::LOG_LEVEL > 1 || self::LOG_LEVEL > 0 && $deny)
+		{
+			error_log(__METHOD__."($url) returning ".array2string($deny));
+		}
+		return $deny;
+	}
 }
 
 stream_register_wrapper(filesystem_stream_wrapper::SCHEME ,'filesystem_stream_wrapper');

From 4710810a4106b25441f77dd3dd12faed18837be2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 31 Mar 2009 11:30:49 +0000
Subject: [PATCH 134/510] Translations for r26708

---
 filemanager/setup/egw_de.lang | 1 +
 filemanager/setup/egw_en.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index c5a38e6140..5401aa59e8 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -162,6 +162,7 @@ updated comment for %1	filemanager	de	Kommentar für %1 aktualisiert
 used space	filemanager	de	Benutzter Platz
 users and groups	filemanager	de	Benutzer und Gruppen
 wrong username or password!	filemanager	de	Falscher Benutzername oder Passwort!
+you are not allowed to upload a script!	filemanager	de	Sie dürfen KEINE Skripte hochladen!
 you do not have access to %1	filemanager	de	Sie besitzen keine Zugriffsrechte für %1
 you need to select an owner!	filemanager	de	Sie müssen einen Eigentümer auswählen!
 you need to select some files first!	filemanager	de	Sie müssen zuerst die Dateien auswählen!
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index 280ea7461f..c459d0d893 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -162,6 +162,7 @@ updated comment for %1	filemanager	en	Updated comment for %1
 used space	filemanager	en	Used space
 users and groups	filemanager	en	Users and groups
 wrong username or password!	filemanager	en	Wrong username or password!
+you are not allowed to upload a script!	filemanager	en	You are NOT allowed to upload a script!
 you do not have access to %1	filemanager	en	You do not have access to %1
 you need to select an owner!	filemanager	en	You need to select an owner!
 you need to select some files first!	filemanager	en	You need to select some files first!

From 1f6bba4aba43b9b542a5672cffe6439846263cf8 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 1 Apr 2009 08:22:01 +0000
Subject: [PATCH 135/510] handling the doubling of select/multiselect -cfs in
 advanced search,, adding empty entry for radio-cfs in advanced search,
 allowing to edit readonly cfs when in advanced search.

---
 etemplate/inc/class.customfields_widget.inc.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.customfields_widget.inc.php b/etemplate/inc/class.customfields_widget.inc.php
index 17e8ee3e03..4ba34fed29 100644
--- a/etemplate/inc/class.customfields_widget.inc.php
+++ b/etemplate/inc/class.customfields_widget.inc.php
@@ -217,11 +217,13 @@ class customfields_widget
 						$select =& $input; unset($input);
 						$input =& etemplate::empty_cell('hbox');
 						etemplate::add_child($input, $select); unset($select);
+						/* the following seem to double the select fields in advanced search.
 						etemplate::add_child($input, etemplate::empty_cell('select',$this->prefix.$lname,array(
 							'sel_options' => $field['values'],
 							'size'        => $field['rows'],
 							'no_lang'     => True
 						)));
+						*/
 					}
 					break;
 				case 'label' :
@@ -232,6 +234,7 @@ class customfields_widget
 					{
 						$field['values'] = $this->_get_options_from_file($field['values']['@']);
 					}
+					if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
 					$input =& etemplate::empty_cell('groupbox');
 					$m = 0;
 					foreach ($field['values'] as $key => $val)
@@ -260,7 +263,7 @@ class customfields_widget
 							{
 								if (array_key_exists('readonly',$field['values']))
 								{
-									$tmparray['readonly']='readonly';
+									if(!$this->advanced_search) $tmparray['readonly']='readonly';
 								}
 							}
 							$input =& etemplate::empty_cell('text',$this->prefix.$lname,$tmparray);
@@ -272,7 +275,7 @@ class customfields_widget
 							);
 							if (is_array($field['values']) && array_key_exists('readonly',$field['values']))
 							{
-								$tmparray['readonly']='readonly';
+								if(!$this->advanced_search) $tmparray['readonly']='readonly';
 							}
 							$input =& etemplate::empty_cell('textarea',$this->prefix.$lname,$tmparray);
 						}
@@ -298,16 +301,19 @@ class customfields_widget
 					));
 					break;
 				case 'button':  // button(s) to execute javascript (label=onclick) or textinputs (empty label, readonly with neg. length)
+					// a button does not seem to be helpful in advanced search ???, 
+					if($this->advanced_search) break;
 					$input =& etemplate::empty_cell('hbox');
 					foreach($field['values'] as $label => $js)
 					{
 						if (!$label)    // display an readonly input
 						{
-							$widget =& etemplate::empty_cell('text',$this->prefix.$lname.$label,array(
+							$tmparray = array(
 								'size' => $field['len'] ? $field['len'] : 20,
 								'readonly' => $field['len'] < 0,
 								'onchange' => $js,
-							));
+							);
+							$widget =& etemplate::empty_cell('text',$this->prefix.$lname.$label,$tmparray);
 						}
 						else
 						{

From 923c98f079ae0431a7246b40f12b8f6c1008654d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 09:32:35 +0000
Subject: [PATCH 136/510] "imporved array2string to give a type-specific output
 (eg. TRUE or FALSE for boolean)"

---
 phpgwapi/inc/common_functions.inc.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 06e36f981c..4e85ff7c9f 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -33,12 +33,30 @@ function bytes($str)
 /**
  * Format array or other types as (one-line) string, eg. for error_log statements
  *
- * @param mixed $arr
+ * @param mixed $var variable to dump
  * @return string
  */
-function array2string($arr)
+function array2string($var)
 {
-	return str_replace(array("\n",'    '),'',print_r($arr,true));
+	switch (($type = gettype($var)))
+	{
+		case 'boolean':
+			return $var ? 'TRUE' : 'FALSE';
+		case 'string':
+			return "'$var'";
+		case 'integer':
+		case 'double':
+		case 'resource':
+			return $var;
+		case 'NULL':
+			return 'NULL';
+		case 'object':
+			$type = get_class($var);
+			// fall-through
+		case 'array':
+			return $type.str_replace(array("\n",'    ','array'),'',print_r($var,true));
+	}
+	return 'UNKNOWN TYPE!';
 }
 
 /**

From 81e0a774617cb016c92e25103960ea88407d0a33 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 09:34:37 +0000
Subject: [PATCH 137/510] "run \"after_navbar\" hook for all apps, not only the
 ones the user has rights to"

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

diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index 991fdd4df8..8f1759ad51 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -245,7 +245,7 @@ class idots_framework extends egw_framework
 
 		// hook after navbar
 		ob_start();
-		$GLOBALS['egw']->hooks->process('after_navbar');
+		$GLOBALS['egw']->hooks->process('after_navbar',null,true);
 		$content .= ob_get_contents();
 		ob_end_clean();
 

From c0baa83dbe82265d92a3011419c776dd728bfdaf Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 1 Apr 2009 10:59:56 +0000
Subject: [PATCH 138/510] read_calendar should return an array, as it is
 expected, and described in the functions description

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

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index a7d8afe997..fc851fb1bc 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -963,7 +963,7 @@ class addressbook_bo extends addressbook_so
 	 */
 	function read_calendar($ids,$extra_title=true)
 	{
-		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return null;
+		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
 
 		$uids = array();
 		foreach($ids as $id)

From cbf707ba13a0dac4791f933a383cbf3666052e4e Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 1 Apr 2009 12:41:21 +0000
Subject: [PATCH 139/510] added ID field in template of timesheet custom status

---
 timesheet/setup/etemplates.inc.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/timesheet/setup/etemplates.inc.php b/timesheet/setup/etemplates.inc.php
index a352f39103..e9e05d6901 100644
--- a/timesheet/setup/etemplates.inc.php
+++ b/timesheet/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application timesheet
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-03-23 16:17
+	* generated by soetemplate::dump4setup() 2009-04-01 14:39
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package timesheet
@@ -35,6 +35,8 @@ $templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang'
 
 $templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:3:{s:4:"type";s:8:"template";s:7:"no_lang";s:1:"1";s:4:"name";s:27:"timesheet.customstatus.cats";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1236865711',);
 
+$templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:4:"100%";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:3:{s:4:"type";s:8:"template";s:7:"no_lang";s:1:"1";s:4:"name";s:27:"timesheet.customstatus.cats";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1237891752',);
+
 $templ_data[] = array('name' => 'timesheet.customstatus.cats','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,280,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"B";s:2:"5%";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"280";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"300";i:6;s:4:"auto";}}}','size' => '100%,300,,,,,auto','style' => '','modified' => '1236867741',);
 
 $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:10:"ts_project";s:4:"span";s:3:"all";s:4:"blur";s:16:"@ts_project_blur";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134772260',);
@@ -63,10 +65,14 @@ $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','
 .fullWidth input { widht: 100%; }
 .fullWidth textarea { widht: 100%; }','modified' => '1165332731',);
 
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:41:"General|Notes|Links|Custom Fields|History";s:4:"name";s:40:"general|notes|links|customfields|history";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
 .fullWidth input { widht: 100%; }
 .fullWidth textarea { widht: 100%; }','modified' => '1236614859',);
 
+$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:41:"General|Notes|Links|Custom Fields|History";s:4:"name";s:40:"general|notes|links|customfields|history";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
+.fullWidth input { widht: 100%; }
+.fullWidth textarea { widht: 100%; }','modified' => '1237891824',);
+
 $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1163173930',);
 
 $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '100%,150,,,,,auto','style' => '','modified' => '1163173930',);
@@ -81,6 +87,8 @@ $templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang'
 
 $templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:9:"ts_status";s:4:"help";s:32:"select a status of the timesheet";s:4:"size";s:13:"please select";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1236615245',);
 
+$templ_data[] = array('name' => 'timesheet.edit.history','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,250,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"250";i:6;s:4:"auto";}}}','size' => '100%,250,,,,,auto','style' => '','modified' => '1237823283',);
+
 $templ_data[] = array('name' => 'timesheet.edit.links','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:6:",@view";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '100%,150,,,,,auto','style' => '','modified' => '1134775301',);
 
 $templ_data[] = array('name' => 'timesheet.edit.notes','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:7:"row,top";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"8,70";s:4:"name";s:14:"ts_description";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1134773787',);
@@ -89,6 +97,8 @@ $templ_data[] = array('name' => 'timesheet.edit.notes','template' => '','lang' =
 
 $templ_data[] = array('name' => 'timesheet.editstatus','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,280,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"B";s:2:"5%";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"280";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1237544666',);
 
+$templ_data[] = array('name' => 'timesheet.editstatus','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,280,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"C";s:2:"5%";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:2:"ID";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:10:"${row}[id]";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"280";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1237892884',);
+
 $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134799202',);
 
 $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142977673',);

From 892e22a4a060cc305abb63a2786880686469e868 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 13:00:46 +0000
Subject: [PATCH 140/510] Replaced [Add] submitbutton with a button, to allow
 to start search with enter

---
 timesheet/setup/etemplates.inc.php    | 61 ++-------------------------
 timesheet/templates/default/index.xet |  4 +-
 2 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/timesheet/setup/etemplates.inc.php b/timesheet/setup/etemplates.inc.php
index e9e05d6901..f1a2707279 100644
--- a/timesheet/setup/etemplates.inc.php
+++ b/timesheet/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application timesheet
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-01 14:39
+	* generated by soetemplate::dump4setup() 2009-04-01 15:00
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package timesheet
@@ -12,59 +12,22 @@
 
 $templ_version=1;
 
-$templ_data[] = array('name' => 'timesheet.customfields','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"C";s:3:"80%";s:2:"c4";s:6:"header";s:2:"h1";s:8:"40,!@msg";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,reditalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:3:"typ";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:3;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:5;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:6;a:3:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:3;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
-.error_msg { color: red; font-style: italics; }','modified' => '1148375906',);
-
 $templ_data[] = array('name' => 'timesheet.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";}i:1;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1163155004',);
 
 $templ_data[] = array('name' => 'timesheet.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";}i:1;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1163162665',);
 
-$templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"A";s:2:",!";}i:1;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1148375979',);
-
-$templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1163155060',);
-
-$templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"A";s:2:",!";}i:1;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1163429556',);
-
 $templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.003','data' => 'a:1:{i:0;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:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"F";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:6:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";s:8:"disabled";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"F";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1163430791',);
 
 $templ_data[] = array('name' => 'timesheet.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.004','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:2:{s:4:"type";s:6:"select";s:4:"name";s:12:"${row}[type]";}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:12:"${row}[rows]";s:4:"size";s:6:"0,10,2";s:4:"blur";s:1:"1";}i:3;a:6:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";s:8:"disabled";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1164631589',);
 
-$templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:8:{s:2:"c2";s:7:"row,top";s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";s:2:"c3";s:7:"row,top";s:2:"c4";s:7:"row,top";s:2:"h5";s:23:",!@allow_defaultproject";s:2:"c5";s:7:"row,top";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,140,,,,,auto";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:1:"C";s:2:"5%";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Autoassign to";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:12:"${row}[name]";s:4:"size";s:6:"60,150";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"size";s:5:"Noone";s:4:"name";s:18:"${row}[autoassign]";s:7:"no_lang";s:1:"1";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:39:"return confirm(\'Delete this category\');";s:4:"help";s:20:"Delete this category";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"name";s:4:"cats";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"140";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Versions";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,100,,,,,auto";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:2:"5%";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:12:"${row}[name]";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:38:"return confirm(\'Delete this version\');";s:4:"help";s:19:"Delete this version";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"name";s:8:"versions";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"100";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,100,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"100";i:6;s:4:"auto";}s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"B";s:2:"5%";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:2;}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Canned responses";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:4:"100%";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"C";s:2:"5%";s:2:"c2";s:7:"row,top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"Canned response";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:12:"${row}[name]";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"3,50";s:4:"name";s:19:"${row}[description]";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:46:"return confirm(\'Delete this canned response\');";s:4:"help";s:27:"Delete this canned response";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"name";s:9:"responses";s:7:"options";a:1:{i:0;s:4:"100%";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:5;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Assign to project";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:16:"100%,90,,,,,auto";s:4:"name";s:8:"projects";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:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Project selection";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"40,40";s:4:"name";s:12:"${row}[name]";s:4:"blur";s:18:"--> enter new name";}s:1:"B";a:4:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:44:"--> choose a project from the drop-down list";s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[projectlist]";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";s:4:"help";s:17:"Delete this entry";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"span";s:3:"all";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:2:"90";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1236865642',);
-
 $templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:3:{s:4:"type";s:8:"template";s:7:"no_lang";s:1:"1";s:4:"name";s:27:"timesheet.customstatus.cats";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1236865711',);
 
 $templ_data[] = array('name' => 'timesheet.customstatus','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:4:"100%";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:3:{s:4:"type";s:8:"template";s:7:"no_lang";s:1:"1";s:4:"name";s:27:"timesheet.customstatus.cats";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1237891752',);
 
 $templ_data[] = array('name' => 'timesheet.customstatus.cats','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,280,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:1:"B";s:2:"5%";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"B";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"280";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"300";i:6;s:4:"auto";}}}','size' => '100%,300,,,,,auto','style' => '','modified' => '1236867741',);
 
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:10:"ts_project";s:4:"span";s:3:"all";s:4:"blur";s:16:"@ts_project_blur";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134772260',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '0.2.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1136861594',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.0.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1136861594',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142930663',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:14:{i:0;a:20:{s:2:"c3";s:2:"th";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";s:2:"c4";s:3:"row";s:2:"h5";s:7:",!@hide";s:2:"c5";s:3:"row";s:2:"c7";s:3:"row";s:2:"h6";s:7:",!@hide";s:2:"c6";s:3:"row";s:2:"h8";s:6:",@hide";s:2:"h7";s:7:",!@hide";s:3:"c12";s:3:"row";s:3:"h12";s:14:",!@ts_modified";s:3:"c10";s:10:"titlePopup";s:2:"h9";s:6:",@hide";s:2:"c8";s:3:"row";s:2:"h3";s:8:"28,@hide";s:2:"c2";s:10:"titlePopup";s:3:"h10";s:10:",!@cftitle";s:3:"h11";s:10:",!@cftitle";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:12:"general data";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:5:"label";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:8:"disabled";s:1:"1";}}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:6:"cat_id";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"date";}s:1:"B";a:2:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"ts_start";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"size";s:3:",hm";s:4:"name";s:11:"ts_duration";}}i:8;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:9;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:10;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:1:"2";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";s:4:"span";s:1:"2";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:13;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:13;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1148390957',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:14:{i:0;a:19:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",!@msg";s:2:"c4";s:3:"row";s:2:"h5";s:7:",!@hide";s:2:"c5";s:3:"row";s:2:"c7";s:3:"row";s:2:"h6";s:7:",!@hide";s:2:"c6";s:3:"row";s:2:"h8";s:6:",@hide";s:2:"h7";s:7:",!@hide";s:2:"h9";s:6:",@hide";s:2:"c8";s:3:"row";s:2:"h3";s:8:"28,@hide";s:2:"c2";s:10:"titlePopup";s:3:"c12";s:3:"row";s:3:"h12";s:14:",!@ts_modified";s:3:"h10";s:10:",!@cftitle";s:3:"c10";s:10:"titlePopup";s:3:"h11";s:10:",!@cftitle";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:12:"general data";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:8:"disabled";s:1:"1";}}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:6:"cat_id";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"date";}s:1:"B";a:2:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"size";s:3:",hm";s:4:"name";s:11:"ts_duration";}}i:8;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:9;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:10;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:13:"custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:11;a:2:{s:1:"A";a:4:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";s:4:"span";s:1:"2";s:4:"size";s:3:"147";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:13;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:13;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1148998178',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.2.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:21:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",!@msg";s:2:"c4";s:3:"row";s:2:"h5";s:7:",!@hide";s:2:"c5";s:3:"row";s:2:"c7";s:3:"row";s:2:"h8";s:7:",!@hide";s:2:"h7";s:7:",!@hide";s:2:"h9";s:6:",@hide";s:2:"c8";s:3:"row";s:2:"h3";s:8:"28,@hide";s:2:"c2";s:10:"titlePopup";s:3:"h12";s:10:",!@cftitle";s:3:"h10";s:6:",@hide";s:3:"h11";s:10:",!@cftitle";s:3:"c13";s:3:"row";s:3:"h13";s:14:",!@ts_modified";s:3:"c11";s:10:"titlePopup";s:2:"c9";s:3:"row";s:2:"h6";s:7:",!@hide";s:2:"c6";s:3:"row";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:12:"general data";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}i:2;a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:8:"disabled";s:1:"1";}}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:6:"cat_id";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"date";}s:1:"B";a:2:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"size";s:3:",hm";s:4:"name";s:11:"ts_duration";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Bemerkung";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:14:"ts_description";s:4:"size";s:4:"6,50";}}i:9;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}i:10;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:1:"2";s:5:"label";s:13:"custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:4:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";s:4:"span";s:1:"2";s:4:"size";s:3:"147";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:14;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:14;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.width100 { width: 100%; }','modified' => '1151935355',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:19:"General|Notes|Links";s:4:"name";s:19:"general|notes|links";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1158066408',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:8:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1163173853',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164291373',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.4.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:3:"all";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1165332731',);
-
-$templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:33:"General|Notes|Links|Custom Fields";s:4:"name";s:32:"general|notes|links|customfields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
-.fullWidth input { widht: 100%; }
-.fullWidth textarea { widht: 100%; }','modified' => '1165332731',);
-
 $templ_data[] = array('name' => 'timesheet.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";s:1:"A";s:3:"100";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@ts_modified";s:2:"c4";s:3:"row";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:2:"h4";s:13:",@ts_viewtype";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_owner";s:5:"label";s:4:"User";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:8:"ts_owner";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,ts_project";s:5:"label";s:7:"Project";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:7:",,,,1,1";s:4:"span";s:3:"all";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=none";s:2:"h2";s:21:",@pm_integration=full";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:21:"projectmanager-select";s:4:"size";s:4:"None";s:4:"name";s:5:"pm_id";s:4:"span";s:13:"all,fullWidth";s:4:"help";s:16:"Select a project";s:8:"onchange";i:1;}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"text";s:4:"name";s:10:"ts_project";s:4:"blur";s:16:"@ts_project_blur";s:4:"size";s:5:"65,80";s:4:"span";s:10:",fullWidth";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,ts_unitprice";s:5:"label";s:9:"Unitprice";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:21:",@pm_integration=none";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:209:"this.form[\'exec[ts_unitprice]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}s:1:"B";a:3:{s:4:"type";s:5:"float";s:4:"name";s:12:"ts_unitprice";s:4:"span";s:3:"all";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:41:"General|Notes|Links|Custom Fields|History";s:4:"name";s:40:"general|notes|links|customfields|history";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"ts_modified";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:11:"ts_modifier";s:5:"label";s:2:"by";s:8:"readonly";s:1:"1";}}}i:7;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";s:4:"span";s:1:"2";i:1;a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:4:"help";s:15:"Edit this entry";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[save_new]";s:5:"label";s:10:"Save & New";s:4:"help";s:34:"Saves this entry and add a new one";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[save]";s:5:"label";s:4:"Save";s:4:"help";s:22:"Saves the changes made";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:24:"Applies the changes made";}i:5;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}i:6;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}i:2;a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.fullWidth select { widht: 100%; }
 .fullWidth input { widht: 100%; }
 .fullWidth textarea { widht: 100%; }','modified' => '1236614859',);
@@ -77,12 +40,6 @@ $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','
 
 $templ_data[] = array('name' => 'timesheet.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,150,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"150";i:6;s:4:"auto";}}}','size' => '100%,150,,,,,auto','style' => '','modified' => '1163173930',);
 
-$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:5:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c2";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:6:"needed";s:1:"1";s:4:"blur";s:14:"@ts_title_blur";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:5:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1134773043',);
-
-$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:8:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c2";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:2:"80";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1134773043',);
-
-$templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1164289627',);
-
 $templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1164289627',);
 
 $templ_data[] = array('name' => 'timesheet.edit.general','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:13:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:1:"B";s:3:"120";s:1:"C";s:15:"80,@ts_viewtype";s:1:"D";s:13:",@ts_viewtype";s:2:"c2";s:3:"row";s:2:"h2";s:14:",!@ts_viewtype";s:2:"h1";s:13:",@ts_viewtype";s:2:"c6";s:3:"row";s:2:"h6";s:13:",@ts_viewtype";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_title";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"65,80";s:4:"name";s:8:"ts_title";s:4:"blur";s:14:"@ts_title_blur";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"comment";}s:1:"B";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"5,50";s:4:"name";s:14:"ts_description";s:4:"span";s:13:"all,fullWidth";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,cat_id";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:4:"None";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,ts_start";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:8:"ts_start";s:6:"needed";s:1:"1";s:4:"size";s:2:",8";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Starttime";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:10:"start_time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_duration";s:5:"label";s:8:"Duration";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:11:"ts_duration";s:4:"size";s:3:",hm";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"or endtime";s:4:"span";s:7:",noWrap";}s:1:"D";a:2:{s:4:"type";s:13:"date-timeonly";s:4:"name";s:8:"end_time";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,ts_quantity";s:5:"label";s:8:"Quantity";}s:1:"B";a:6:{s:4:"type";s:5:"float";s:4:"name";s:11:"ts_quantity";s:4:"help";s:30:"empty if identical to duration";s:4:"blur";s:17:"@ts_quantity_blur";s:4:"size";s:4:",,,3";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:9:"ts_status";s:4:"help";s:32:"select a status of the timesheet";s:4:"size";s:13:"please select";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:4;s:4:"size";s:8:"100%,150";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"150";}}}','size' => '100%,150','style' => '','modified' => '1236615245',);
@@ -99,27 +56,15 @@ $templ_data[] = array('name' => 'timesheet.editstatus','template' => '','lang' =
 
 $templ_data[] = array('name' => 'timesheet.editstatus','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"D";s:3:"30%";s:1:"A";s:3:"100";s:2:"h1";s:6:",!@msg";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"1";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:1:"D";s:3:"30%";s:2:"c1";s:7:"row,top";s:1:"A";s:3:"100";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:8:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,280,,,,,auto";s:4:"span";s:3:"all";s:4:"name";s:6:"statis";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"C";s:2:"5%";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:2:"ID";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:10:"${row}[id]";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,150";s:4:"blur";s:18:"--> enter new name";s:4:"name";s:12:"${row}[name]";}s:1:"C";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:18:"Delete this status";s:7:"onclick";s:37:"return confirm(\'Delete this status\');";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"280";i:6;s:4:"auto";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;s:4:"size";s:17:"100%,450,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"450";i:6;s:4:"auto";}}}','size' => '100%,450,,,,,auto','style' => '','modified' => '1237892884',);
 
-$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134799202',);
-
-$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142977673',);
-
-$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:5:"dates";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1149257156',);
-
-$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142977673',);
-
-$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164373176',);
-
-$templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:163:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164373176',);
-
 $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164373176',);
 
 $templ_data[] = array('name' => 'timesheet.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h5";s:2:",1";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:5:"dates";}i:2;a:3:{s:4:"type";s:8:"template";s:4:"name";s:3:"add";s:5:"align";s:5:"right";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"name";s:2:"nm";s:4:"size";s:20:"timesheet.index.rows";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"use_all";s:5:"label";s:11:"whole query";s:8:"onchange";s:128:"if (this.checked==true && !confirm(\'Apply the action on the whole query, NOT only the shown timesheets!!!\')) this.checked=false;";s:4:"help";s:69:"Apply the action on the whole query, NOT only the shown timesheets!!!";}i:2;a:5:{s:4:"type";s:6:"select";s:8:"onchange";s:16:"do_action(this);";s:4:"size";s:13:"Select action";s:4:"name";s:6:"action";s:4:"help";s:13:"Select action";}i:3;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:7:"onclick";s:33:"timesheet_export(); return false;";s:4:"name";s:6:"export";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237399516',);
 
 $templ_data[] = array('name' => 'timesheet.index.add','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}','size' => '','style' => '','modified' => '1158042543',);
 
-$templ_data[] = array('name' => 'timesheet.index.dates','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:4:"hbox";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}i:2;a:2:{s:4:"type";s:4:"date";s:4:"name";s:9:"startdate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"End";}i:4;a:3:{s:4:"type";s:4:"date";s:4:"name";s:7:"enddate";s:4:"help";s:30:"Leave it empty for a full week";}s:4:"span";s:12:",custom_hide";}}','size' => '','style' => '.custom_hide { visibility: hidden; }','modified' => '1142973260',);
+$templ_data[] = array('name' => 'timesheet.index.add','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:7:"onclick";s:164:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}','size' => '','style' => '','modified' => '1158042543',);
 
-$templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"G";s:14:",@no_owner_col";s:1:"B";s:3:"50%";}i:1;a:8:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";s:7:"no_lang";s:1:"1";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:7:"Project";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"G";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"D";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"F";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"G";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1134799629',);
+$templ_data[] = array('name' => 'timesheet.index.dates','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:4:"hbox";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}i:2;a:2:{s:4:"type";s:4:"date";s:4:"name";s:9:"startdate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"End";}i:4;a:3:{s:4:"type";s:4:"date";s:4:"name";s:7:"enddate";s:4:"help";s:30:"Leave it empty for a full week";}s:4:"span";s:12:",custom_hide";}}','size' => '','style' => '.custom_hide { visibility: hidden; }','modified' => '1142973260',);
 
 $templ_data[] = array('name' => 'timesheet.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:16:"$row_cont[class]";s:1:"A";s:3:"15%";s:1:"B";s:3:"50%";s:1:"H";s:14:",@no_owner_col";s:1:"G";s:13:",@no_ts_total";s:1:"F";s:17:",@no_ts_unitprice";s:1:"E";s:16:",@no_ts_quantity";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Date";s:4:"name";s:8:"ts_start";}s:1:"B";a:7:{s:4:"type";s:4:"grid";s:7:"no_lang";s:1:"1";s:4:"data";a:4:{i:0;a:2:{s:2:"h1";s:21:",@pm_integration=full";s:2:"h2";s:22:",!@pm_integration=full";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:12:"All projects";s:4:"name";s:10:"ts_project";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"size";s:34:"projectmanager-select,All projects";s:4:"name";s:5:"pm_id";s:8:"onchange";i:1;}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:8:"ts_title";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:7:"options";a:2:{i:4;s:1:"1";i:5;s:1:"1";}s:4:"size";s:7:",,,,1,1";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Duration";s:4:"name";s:11:"ts_duration";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:8:"duration";s:4:"size";s:6:",h,,,1";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Quantity";s:4:"name";s:11:"ts_quantity";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:8:"quantity";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,3";}}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Price";s:4:"name";s:12:"ts_unitprice";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Total";s:4:"name";s:8:"ts_total";}i:2;a:4:{s:4:"type";s:5:"float";s:4:"name";s:5:"price";s:8:"readonly";s:1:"1";s:4:"size";s:4:",,,2";}}s:1:"H";a:5:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:8:"ts_owner";s:4:"size";s:4:"User";s:7:"no_lang";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:4:"name";s:12:"customfields";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[ts_start]";s:8:"readonly";s:1:"1";s:4:"size";s:2:",8";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:4:"link";s:4:"name";s:15:"${row}[ts_link]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[ts_title]";s:7:"no_lang";s:1:"1";s:4:"span";s:22:",$row_cont[titleClass]";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[ts_description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"span";s:7:",noWrap";}s:1:"D";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"${row}[ts_duration]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",h,,,1";}s:1:"E";a:5:{s:4:"type";s:5:"float";s:4:"name";s:19:"${row}[ts_quantity]";s:7:"no_lang";s:1:"1";s:4:"size";s:4:",,,3";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[ts_unitprice]";}s:1:"G";a:5:{s:4:"type";s:5:"float";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[ts_total]";s:4:"size";s:4:",,,2";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[ts_owner]";s:8:"readonly";s:1:"1";s:4:"span";s:18:",$cont[ownerClass]";}s:1:"I";a:3:{s:4:"type";s:17:"customfields-list";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:22:"view[$row_cont[ts_id]]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.view&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:4:"help";s:15:"View this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:22:"edit[$row_cont[ts_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&ts_id=$row_cont[ts_id]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:24:"delete[$row_cont[ts_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1234522226',);
 
diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index dbd6835c7e..3a5f0b94c0 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -12,8 +12,8 @@
 			.custom_hide { visibility: hidden; }
 		</styles>
 	</template>
-	<template id="timesheet.index.add" template="" lang="" group="0" version="1.3.001">
-		<button label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
+	<template id="timesheet.index.add" template="" lang="" group="0" version="1.7.001">
+		<buttononly label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
 	</template>
 	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">

From bfab75389c9a40d712dd7500fa7e92ab07726be1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 13:01:16 +0000
Subject: [PATCH 141/510] "replace ambiguous auto-id with (an exact match of)
 table_name.autoid"

---
 etemplate/inc/class.so_sql_cf.inc.php | 60 ++++++++++++++++-----------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index fa7b865d95..dec3b8b529 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -12,14 +12,14 @@
 
 /**
  * Generalized SQL Storage Object with build in custom field support
- * 
+ *
  * This class allows to display, search, order and filter by custom fields simply by replacing so_sql
- * by it and adding custom field widgets to the eTemplates of an applications. 
+ * by it and adding custom field widgets to the eTemplates of an applications.
  * It's inspired by the code from Klaus Leithoff, which does the same thing limited to addressbook.
  *
  * The schema of the custom fields table should be like (the lenght of the cf name is nowhere enfored and
  * varies throughout eGW from 40-255, the value column from varchar(255) to longtext!):
- * 
+ *
  * 'egw_app_extra' => array(
  * 	'fd' => array(
  * 		'prefix_id' => array('type' => 'int','precision' => '4','nullable' => False),
@@ -50,21 +50,21 @@ class so_sql_cf extends so_sql
 
 	/**
 	 * name of id column, defaults to the regular tables auto id
-	 * 
+	 *
 	 * @var string
 	 */
 	var $extra_id = '_id';
 
 	/**
 	 * Name of key (cf name) column or just a postfix added to the table prefix
-	 * 
+	 *
 	 * @var string
 	 */
 	var $extra_key = '_name';
 
 	/**
 	 * Name of value column or just a postfix added to the table prefix
-	 * 
+	 *
 	 * @var string
 	 */
 	var $extra_value = '_value';
@@ -72,17 +72,17 @@ class so_sql_cf extends so_sql
 	var $extra_join;
 	var $extra_join_order;
 	var $extra_join_filter;
-	
+
 	/**
 	 * Custom fields of $app, read by the constructor
-	 * 
+	 *
 	 * @var array
 	 */
 	var $customfields;
 
 	/**
 	 * constructor of the class
-	 * 
+	 *
 	 * Please note the different params compared to so_sql!
 	 *
 	 * @param string $app application name to load table schemas
@@ -102,10 +102,10 @@ class so_sql_cf extends so_sql
 	{
 		// calling the so_sql constructor
 		parent::__construct($app,$table,$db,$column_prefix,$no_clone);
-		
+
 		$this->extra_table = $extra_table;
 		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
-		
+
 		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
 		if (!($prefix=$column_prefix))
 		{
@@ -136,7 +136,7 @@ class so_sql_cf extends so_sql
 		$this->extra_join = " LEFT JOIN $extra_table ON $table.$this->autoinc_id=$extra_table.$this->extra_id";
 		$this->extra_join_order = " LEFT JOIN $extra_table extra_order ON $table.$this->autoinc_id=extra_order.$this->extra_id";
 		$this->extra_join_filter = " JOIN $extra_table extra_filter ON $table.$this->autoinc_id=extra_filter.$this->extra_id";
-		
+
 		$this->customfields = config::get_customfields($app);
 	}
 
@@ -184,7 +184,7 @@ class so_sql_cf extends so_sql
 				$this->extra_id    => $data[$this->autoinc_id],
 				$this->extra_key   => $field,
 			);
-			
+
 			if((string) $data[self::CF_PREFIX.$field] === '')	// dont write empty values
 			{
 				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);	// just delete them, in case they were previously set
@@ -197,7 +197,7 @@ class so_sql_cf extends so_sql
 		}
 		return false;	// no error
 	}
-	
+
 	/**
 	 * merges in new values from the given new data-array
 	 *
@@ -223,7 +223,7 @@ class so_sql_cf extends so_sql
 
 	/**
 	 * reads row matched by key and puts all cols in the data array
-	 * 
+	 *
 	 * reimplented to also read the custom fields
 	 *
 	 * @param array $keys array with keys in form internalName => value, may be a scalar value if only one key
@@ -259,7 +259,7 @@ class so_sql_cf extends so_sql
 		if (is_array($keys) && count($keys)) $this->data_merge($keys);
 
 		$ret = parent::save(null,$extra_where);
-		
+
 		if ($ret == 0 && $this->customfields)
 		{
 			$this->save_customfields($this->data);
@@ -300,9 +300,9 @@ class so_sql_cf extends so_sql
 
 	/**
 	 * query rows for the nextmatch widget
-	 * 
+	 *
 	 * Reimplemented to also read the custom fields (if enabled via $query['selectcols']).
-	 * 
+	 *
 	 * Please note: the name of the nextmatch-customfields has to be 'customfields'!
 	 *
 	 * @param array $query with keys 'start', 'search', 'order', 'sort', 'col_filter'
@@ -331,7 +331,7 @@ class so_sql_cf extends so_sql
 			$query['col_filter'],$join,$need_full_no_count);
 
 		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
-		
+
 		$selectcols = $query['selectcols'] ? explode(',',$query['selectcols']) : array();
 
 		if ($rows && $this->customfields && (!$selectcols || in_array('customfields',$selectcols)))
@@ -359,7 +359,7 @@ class so_sql_cf extends so_sql
 
 	/**
 	 * searches db for rows matching searchcriteria
-	 * 
+	 *
 	 * Reimplemented to search, order and filter by custom fields
 	 *
 	 * @param array/string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
@@ -383,19 +383,29 @@ class so_sql_cf extends so_sql
 		if ($criteria && is_array($criteria) && isset($criteria[$this->extra_value]))
 		{
 			$criteria[] = $this->extra_table.'.'.$this->extra_value . ' ' .
-				$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' . 
+				$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
 				$this->db->quote('%'.$criteria[$this->extra_value].'%');
 			unset($criteria[$this->extra_value]);
 			$join .= $this->extra_join;
+
+			// replace ambiguous auto-id with (an exact match of) table_name.autoid
+			if (isset($criteria[$this->autoinc_id]))
+			{
+				if ((int)$criteria[$this->autoinc_id])
+				{
+					$criteria[] = $this->table_name.'.'.$this->autoinc_id.'='.(int)$criteria[$this->autoinc_id];
+				}
+				unset($criteria[$this->autoinc_id]);
+			}
 		}
 		// check if we order by a custom field --> join cf table for given cf and order by it's value
-		if (strpos($order_by,self::CF_PREFIX) !== false && 
+		if (strpos($order_by,self::CF_PREFIX) !== false &&
 			preg_match('/'.self::CF_PREFIX.'([^ ]+) (asc|desc)/i',$order_by,$matches))
 		{
 			$order_by = str_replace($matches[0],'extra_order.'.$this->extra_value.' IS NULL,extra_order.'.$this->extra_value.' '.$matches[2],$order_by);
 			$join .= $this->extra_join_order.' AND extra_order.'.$this->extra_key.'='.$this->db->quote($matches[1]);
 		}
-		
+
 		// check if we filter by a custom field
 		foreach($filter as $name => $val)
 		{
@@ -420,10 +430,10 @@ class so_sql_cf extends so_sql
 				unset($filter[$name]);
 			}
 		}
-		
+
 		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 	}
-	
+
 	/**
 	 * Prevent someone calling the old php4 so_sql constructor
 	 */

From 039cf26d221e62c52d3c9b6d879f012cd8916553 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 14:06:50 +0000
Subject: [PATCH 142/510] "- replaced self::SCHEME.'://default' with
 self::PREFIX - added log calls to mount and umount - fixed not working
 remount of a path with a different url (returned true but did not changed the
 fstab)"

---
 phpgwapi/inc/class.egw_vfs.inc.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index d69c29012d..8bb58188e6 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -120,7 +120,7 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			throw new egw_exception_assertion_failed("Filename '$path' is not an absolute path!");
 		}
-		return fopen(self::SCHEME.'://default'.$path,$mode);
+		return fopen(self::PREFIX.$path,$mode);
 	}
 
 	/**
@@ -135,7 +135,7 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			throw new egw_exception_assertion_failed("Directory '$path' is not an absolute path!");
 		}
-		return opendir(self::SCHEME.'://default'.$path);
+		return opendir(self::PREFIX.$path);
 	}
 
 	/**
@@ -211,7 +211,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function is_dir($path)
 	{
-		return $path[0] == '/' && is_dir(self::SCHEME.'://default'.$path);
+		return $path[0] == '/' && is_dir(self::PREFIX.$path);
 	}
 
 	/**
@@ -222,7 +222,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function is_link($path)
 	{
-		return $path[0] == '/' && is_link(self::SCHEME.'://default'.$path);
+		return $path[0] == '/' && is_link(self::PREFIX.$path);
 	}
 
 	/**
@@ -238,18 +238,22 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		if (is_null($url) || is_null($path))
 		{
+			if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
 			return self::$fstab;
 		}
 		if (!self::$is_root)
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
 			return false;	// only root can mount
 		}
-		if (isset(self::$fstab[$path]))
+		if (isset(self::$fstab[$path]) && self::$fstab[$path] === $url)
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
 			return true;	// already mounted
 		}
-		if (stat($url) === false && opendir($url) === false)
+		if (!file_exists($url) || opendir($url) === false)
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
 			return false;	// url does not exist
 		}
 		self::$fstab[$path] = $url;
@@ -259,6 +263,7 @@ class egw_vfs extends vfs_stream_wrapper
 		config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');
 		return true;
 	}
 
@@ -271,10 +276,12 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		if (!self::$is_root)
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
 			return false;	// only root can mount
 		}
 		if (!isset(self::$fstab[$path]) && ($path = array_search($path,self::$fstab)) === false)
 		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') NOT mounted!');
 			return false;	// $path not mounted
 		}
 		unset(self::$fstab[$path]);
@@ -282,6 +289,7 @@ class egw_vfs extends vfs_stream_wrapper
 		config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful unmount).');
 		return true;
 	}
 

From b1f0863d814509fe4d01447193f6cb53d41cef2f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 14:08:20 +0000
Subject: [PATCH 143/510] A scheme is not allowed to contain an underscore, but
 allows a dot and a class names only allow or need underscores, but no dots
 --> we replace dots in scheme with underscored to get the class-name

---
 filemanager/cli.php                           | 17 +++---------
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 26 ++++++++++++++-----
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/filemanager/cli.php b/filemanager/cli.php
index dd444c030f..84055cf6de 100755
--- a/filemanager/cli.php
+++ b/filemanager/cli.php
@@ -349,14 +349,6 @@ switch($cmd)
 					if (($scheme = parse_url($url,PHP_URL_SCHEME)))
 					{
 						load_wrapper($url);
-						if (class_exists($class = $scheme.'_stream_wrapper') && method_exists($class,'touch'))
-						{
-							$cmd = array($scheme.'_stream_wrapper',$cmd);
-						}
-						else
-						{
-							die("Can't $cmd for scheme $scheme!\n");
-						}
 					}
 					if ($recursive && class_exists('egw_vfs'))
 					{
@@ -429,7 +421,7 @@ switch($cmd)
 }
 
 /**
- * Load the necessary wrapper for an url
+ * Load the necessary wrapper for an url or die if it cant be loaded
  *
  * @param string $url
  */
@@ -451,17 +443,16 @@ function load_wrapper($url)
 				{
 					load_egw(parse_url($url,PHP_URL_USER),parse_url($url,PHP_URL_PASS),parse_url($url,PHP_URL_HOST));
 				}
-				// as eGW might not be loaded, we have to require the class exlicit
-				@include_once(EGW_API_INC.'/class.'.$scheme.'_stream_wrapper.inc.php');
+				// get eGW's __autoload() function
+				include_once(EGW_API_INC.'/common_functions.inc.php');
 
-				if (!class_exists($scheme.'_stream_wrapper'))
+				if (!class_exists(str_replace('.','_',$scheme).'_stream_wrapper'))
 				{
 					die("Unknown scheme '$scheme' in $url !!!\n\n");
 				}
 				break;
 		}
 	}
-	//print_r(stream_get_wrappers());
 }
 
 /**
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index c38904cddb..b4125c8182 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -457,7 +457,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		{
 			if ($scheme)
 			{
-				if (!class_exists($class = $scheme.'_stream_wrapper') || !method_exists($class,$name))
+				if (!class_exists($class = self::scheme2class($scheme)) || !method_exists($class,$name))
 				{
 					if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
 					return false;
@@ -466,10 +466,10 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				{
 					$params[$path_param_key] = $url;
 
-					return call_user_func_array(array($scheme.'_stream_wrapper',$name),$params);
+					return call_user_func_array(array($class,$name),$params);
 				}
 				$params[$path_param_key] = $urls;
-				if (!is_array($r = call_user_func_array(array($scheme.'_stream_wrapper',$name),$params)))
+				if (!is_array($r = call_user_func_array(array($class,$name),$params)))
 				{
 					return $r;
 				}
@@ -602,9 +602,9 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		if (!$mime && ($scheme = parse_url($url,PHP_URL_SCHEME)))
 		{
 			// check it it's an eGW stream wrapper returning mime-type via url_stat
-			if (class_exists($class = $scheme.'_stream_wrapper') && ($mime_attr = @constant($class.'::STAT_RETURN_MIME_TYPE')))
+			if (class_exists($class = self::scheme2class($scheme)) && ($mime_attr = @constant($class.'::STAT_RETURN_MIME_TYPE')))
 			{
-				$stat = call_user_func(array($scheme.'_stream_wrapper','url_stat'),parse_url($url,PHP_URL_PATH),0);
+				$stat = call_user_func(array($class,'url_stat'),parse_url($url,PHP_URL_PATH),0);
 				if ($stat[$mime_attr])
 				{
 					$mime = $stat[$mime_attr];
@@ -965,7 +965,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 					break;	// default file, always loaded
 				default:
 					// check if scheme is buildin in php or one of our own stream wrappers
-					if (in_array($scheme,stream_get_wrappers()) || class_exists($scheme.'_stream_wrapper'))
+					if (in_array($scheme,stream_get_wrappers()) || class_exists(self::scheme2class($scheme)))
 					{
 						self::$wrappers[] = $scheme;
 					}
@@ -993,6 +993,20 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		return self::$wrappers;
 	}
 
+	/**
+	 * Get the class-name for a scheme
+	 *
+	 * A scheme is not allowed to contain an underscore, but allows a dot and a class names only allow or need underscores, but no dots
+	 * --> we replace dots in scheme with underscored to get the class-name
+	 *
+	 * @param string $scheme eg. vfs
+	 * @return string
+	 */
+	static function scheme2class($scheme)
+	{
+		return str_replace('.','_',$scheme).'_stream_wrapper';
+	}
+
 	static function init_static()
 	{
 		stream_register_wrapper(self::SCHEME,__CLASS__);

From 1092f3213e12b8153da1d77ea7b79b95f8c6f649 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 1 Apr 2009 15:20:32 +0000
Subject: [PATCH 144/510] move decode header functionality from FeLaMiMail to
 phpgwapi/translation to be available for other applications

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index c7d92b2b7e..c34a293c36 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -855,4 +855,49 @@ class translation
 		
 		return $this->db->select($this->lang_table,'message_id',$where,__LINE__,__FILE__)->fetchSingle();
 	}
+
+	/**
+	 * Return the decoded string meeting some additional requirements for mailheaders
+	 *
+	 * @param string $_string -> part of an mailheader
+	 * @param string $displayCharset the charset parameter specifies the character set to represent the result by (if iconv_mime_decode is to be used)
+	 * @return string
+	 */
+	function decodeMailHeader($_string, $displayCharset)
+	{
+		//error_log(__FILE__.','.__METHOD__.':'."called");
+		if(function_exists(imap_mime_header_decode)) {
+			$newString = '';
+
+			$string = preg_replace('/\?=\s+=\?/', '?= =?', $_string);
+
+			$elements=imap_mime_header_decode($string);
+
+			foreach((array)$elements as $element) {
+				if ($element->charset == 'default')
+					$element->charset = 'iso-8859-1';
+				$newString .= self::convert($element->text,$element->charset);
+			}
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
+		} elseif(function_exists(mb_decode_mimeheader)) {
+			$string = $_string;
+			if(preg_match_all('/=\?.*\?Q\?.*\?=/iU', $string, $matches)) {
+				foreach($matches[0] as $match) {
+					$fixedMatch = str_replace('_', ' ', $match);
+					$string = str_replace($match, $fixedMatch, $string);
+				}
+				$string = str_replace('=?ISO8859-','=?ISO-8859-',$string);
+				$string = str_replace('=?windows-1258','=?ISO-8859-1',$string);
+			}
+			$string = mb_decode_mimeheader($string);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
+		} elseif(function_exists(iconv_mime_decode)) {
+			// continue decoding also if an error occurs
+			$string = @iconv_mime_decode($_string, 2, $displayCharset);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
+		}
+
+		// no decoding function available
+		return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$_string);
+	}
 }

From b7444a9598bf19aac13197e0624dcd0f6350b524 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 20:01:54 +0000
Subject: [PATCH 145/510] "fix for bug #2025: Database error in Timesheet with
 selected view category/date"

---
 etemplate/inc/class.so_sql_cf.inc.php | 51 +++++++++++++++++----------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index dec3b8b529..0aa90678c7 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -379,6 +379,10 @@ class so_sql_cf extends so_sql
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
+		if ($only_keys === false)
+		{
+			$only_keys = $this->table_name.'.*';
+		}
 		// check if we search in the custom fields
 		if ($criteria && is_array($criteria) && isset($criteria[$this->extra_value]))
 		{
@@ -407,30 +411,41 @@ class so_sql_cf extends so_sql
 		}
 
 		// check if we filter by a custom field
-		foreach($filter as $name => $val)
+		if (is_array($filter))
 		{
-			if (is_string($name) && $name[0] == self::CF_PREFIX)
+			foreach($filter as $name => $val)
 			{
-				if (!empty($val))	// empty -> dont filter
+				// replace ambiguous auto-id with (an exact match of) table_name.autoid
+				if ($name == $this->autoinc_id)
 				{
-					$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
-						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($name,1)).
-						' AND extra_filter.'.$this->extra_value.'='.$this->db->quote($val));
-					++$extra_filter;
+					if ((int)$filter[$this->autoinc_id])
+					{
+						$filter[] = $this->table_name.'.'.$this->autoinc_id.'='.(int)$filter[$this->autoinc_id];
+					}
+					unset($filter[$this->autoinc_id]);
+				}
+				elseif (is_string($name) && $name[0] == self::CF_PREFIX)
+				{
+					if (!empty($val))	// empty -> dont filter
+					{
+						$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
+							' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($name,1)).
+							' AND extra_filter.'.$this->extra_value.'='.$this->db->quote($val));
+						++$extra_filter;
+					}
+					unset($filter[$name]);
+				}
+				elseif(is_int($name) && $val[0] == self::CF_PREFIX)	// lettersearch: #cfname LIKE 's%'
+				{
+					list($cf) = explode(' ',$val);
+					$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
+						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($cf,1)).
+						' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));
+					++$extra_filter;
+					unset($filter[$name]);
 				}
-				unset($filter[$name]);
-			}
-			elseif(is_int($name) && $val[0] == self::CF_PREFIX)	// lettersearch: #cfname LIKE 's%'
-			{
-				list($cf) = explode(' ',$val);
-				$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
-					' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($cf,1)).
-					' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));
-				++$extra_filter;
-				unset($filter[$name]);
 			}
 		}
-
 		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 	}
 

From 1fa08b5095a4f0a38903b6bc65c27c78be3ac684 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Apr 2009 20:02:33 +0000
Subject: [PATCH 146/510] "fix for bug #2025: Database error in Timesheet with
 selected view category/date"

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

diff --git a/timesheet/inc/class.timesheet_bo.inc.php b/timesheet/inc/class.timesheet_bo.inc.php
index 40b5b1cc2d..7441403bd6 100644
--- a/timesheet/inc/class.timesheet_bo.inc.php
+++ b/timesheet/inc/class.timesheet_bo.inc.php
@@ -354,7 +354,7 @@ class timesheet_bo extends so_sql_cf
 				$sum_extra_cols[$type]{0} = '1';
 				// the $type sum
 				parent::search($criteria,$sum_ts_id[$type].",'','','',MIN(ts_start),SUM(ts_duration) AS ts_duration,".
-					($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0').",0,NULL,0,0,0,0,SUM($total_sql) AS ts_total",
+					($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0').",0,NULL,0,0,0,0,0,SUM($total_sql) AS ts_total",
 					'GROUP BY '.$sum_sql[$type],$sum_extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
 				$sum_extra_cols[$type]{0} = '0';
 			}

From dd5376c41f942cf4b8d957052eae5debbbecfaef Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Apr 2009 08:15:50 +0000
Subject: [PATCH 147/510] making the charset param optional, with preset to
 utf-8 in decodeMailHandler

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index c34a293c36..35458f5d5b 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -863,9 +863,9 @@ class translation
 	 * @param string $displayCharset the charset parameter specifies the character set to represent the result by (if iconv_mime_decode is to be used)
 	 * @return string
 	 */
-	function decodeMailHeader($_string, $displayCharset)
+	function decodeMailHeader($_string, $displayCharset='utf-8')
 	{
-		//error_log(__FILE__.','.__METHOD__.':'."called");
+		error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset");
 		if(function_exists(imap_mime_header_decode)) {
 			$newString = '';
 

From 27891f28039a86afa1531c2b373aab7588d04875 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Apr 2009 10:18:05 +0000
Subject: [PATCH 148/510] making sure rows is an array in id2path

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index a357d9c9cc..aedf07ae1d 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -1384,7 +1384,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			return false;	// parent not found, should never happen ...
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
-		foreach($rows as $fs_id => $row)
+		foreach((array)$rows as $fs_id => $row)
 		{
 			$parent = $row['fs_dir'] > 1 ? $parents[$row['fs_dir']] : '';
 

From e1e09203ed48817b9c82afba807569ba2be41585 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Apr 2009 12:31:44 +0000
Subject: [PATCH 149/510] njv: addressbook/groupdav work to improve groupdav
 compatibility

---
 .../inc/class.addressbook_groupdav.inc.php    | 28 +++++-
 .../inc/class.addressbook_vcal.inc.php        | 92 ++++++++++++++-----
 2 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index f4df479a60..cd0bb6056b 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -36,7 +36,11 @@ class addressbook_groupdav extends groupdav_handler
 	 * @var string
 	 */
 	var $charset = 'utf-8';
-
+	/**
+	*Profiling
+	*/
+	var $starttime;
+	
 	/**
 	 * What attribute is used to construct the path, default id, can be uid too
 	 */
@@ -54,6 +58,7 @@ class addressbook_groupdav extends groupdav_handler
 		parent::__construct($app,$debug,$base_uri);
 
 		$this->bo =& new addressbook_bo();
+		//$this->starttime = microtime(true);	    
 	}
 
 	/**
@@ -79,6 +84,7 @@ class addressbook_groupdav extends groupdav_handler
 	 */
 	function propfind($path,$options,&$files,$user,$id='')
 	{
+		$this->starttime = microtime(true);	
 		$filter = array();
 		// show addressbook of a single user?
 		if ($user && $path != '/addressbook/') $filter['contact_owner'] = $user;
@@ -111,17 +117,24 @@ class addressbook_groupdav extends groupdav_handler
 		// we query etag and modified, as LDAP does not have the strong sql etag
 		if (($contacts =& $this->bo->search(array(),$address_data ? false : array('id','uid','etag','modified'),'contact_id','','',False,'AND',false,$filter)))
 		{
+			//$icount= 0;
 			foreach($contacts as $contact)
 			{
- 				$props = array(
+ 				
+			//$st = microtime(true);
+				$props = array(
 					HTTP_WebDAV_Server::mkprop('getetag',$this->get_etag($contact)),
 					HTTP_WebDAV_Server::mkprop('getcontenttype', 'text/x-vcard'),
 					// getlastmodified and getcontentlength are required by WebDAV and Cadaver eg. reports 404 Not found if not set
 					HTTP_WebDAV_Server::mkprop('getlastmodified', $contact['modified']),
 				);
-			 	if ($address_data)
+			 	////error_log("groupdav-props\n".print_r($props,true));
+				if ($address_data)
 				{
+ 					//$sta = microtime(true);
 					$content = $handler->getVCard($contact,$this->charset,false);
+					//$en = microtime(true) - $sta;
+					//error_log("getVCard took : $en");
 					$props[] = HTTP_WebDAV_Server::mkprop('getcontentlength',bytes($content));
 					$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'address-data',$content);
 				}
@@ -133,8 +146,15 @@ class addressbook_groupdav extends groupdav_handler
 	            	'path'  => self::get_path($contact),
 	            	'props' => $props,
 				);
+				
+			//$end = microtime(true) - $st;	
+			//$icount++;
+			//error_log("function propfind foreach : $end : $icount");
 			}
 		}
+
+		$endtime = microtime(true) - $this->starttime;
+		error_log(__FILE__ ."->". __METHOD__ ." elapsed time : $endtime"); 
 		return true;
 	}
 
@@ -224,7 +244,7 @@ class addressbook_groupdav extends groupdav_handler
 			return $contact;
 		}
 		$handler = self::_get_handler();
-		$options['data'] = $handler->getVCard($contact['id'],$this->charset);
+		$options['data'] = $handler->getVCard($contact['id'],$this->charset,false);
 		$options['mimetype'] = 'text/x-vcard; charset='.$this->charset;
 		header('Content-Encoding: identity');
 		header('ETag: '.$this->get_etag($contact));
diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index bf7fefed9d..cd0970352f 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -65,18 +65,20 @@ class addressbook_vcal extends addressbook_bo
 		require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php');
 
 		$vCard =& new Horde_iCalendar_vcard;
-
+		
 		if(!is_array($this->supportedFields)) {
 			$this->setSupportedFields();
 		}
 		$sysCharSet = $GLOBALS['egw']->translation->charset();
-
+		$called = microtime(true);
 		if(!($entry = $this->read($_id))) {
 			return false;
 		}
-
+		//error_log("entry before fixed:\n".print_r($entry,true));
+		
 		$this->fixup_contact($entry);
-
+		
+		
 		foreach($this->supportedFields as $vcardField => $databaseFields)
 		{
 			$values = array();
@@ -109,7 +111,7 @@ class addressbook_vcal extends addressbook_bo
 					case 'jpegphoto':
 						if(!empty($value))
 						{
-							//error_log("PHOTO='".$value."'");
+							error_log(__FILE__ ."\nThis vcard contains a JPEG\n '".$value."'");
 							$options['ENCODING'] = 'BASE64';
 							$options['TYPE'] = 'JPEG';
 							$value = base64_encode($value);
@@ -137,7 +139,8 @@ class addressbook_vcal extends addressbook_bo
 									$options['ENCODING'] = 'QUOTED-PRINTABLE';
 								}
 							}
-							elseif(preg_match('/([\000-\012\015\016\020-\037\075])/',$value))
+							// protect the CardDAV
+							elseif(($extra_charset_attribute && preg_match('/([\000-\012\015\016\020-\037\075])/',$value)))
 							{
 								$options['ENCODING'] = 'QUOTED-PRINTABLE';
 							}
@@ -150,6 +153,7 @@ class addressbook_vcal extends addressbook_bo
 				{
 					$value = "";
 				}
+				//if(preg_match('/([\000-\010])/',$value)) error_log(__FILE__."#".__METHOD__."\nThis value has 000-010: $value");
 
 				$values[] = $value;
 			}
@@ -164,9 +168,8 @@ class addressbook_vcal extends addressbook_bo
 			$vCard->setAttribute($vcardField, implode(';', $values));
 			$vCard->setParameter($vcardField, $options);
 		}
-
 		$result = $vCard->exportvCalendar();
-
+		//error_log(__FILE__ . __METHOD__ ."\nvcard:".print_r($result,true));
 		return $result;
 	}
 
@@ -212,7 +215,7 @@ class addressbook_vcal extends addressbook_bo
 		// store product manufacturer and name, to be able to use it elsewhere
 		$this->productManufacturer = strtolower($_productManufacturer);
 		$this->productName = strtolower($_productName);
-
+		//error_log("prodM- prodN".print_r($_productManufacturer,true).print_r($_productName,true));
 		/**
 		 * ToDo Lars:
 		 * + changes / renamed fields in 1.3+:
@@ -262,8 +265,9 @@ class addressbook_vcal extends addressbook_bo
 							'adr_two_postalcode','adr_two_countryname'),
 			'BDAY'		=> array('bday'),
 			'CATEGORIES'	=> array('cat_id'),
-			'EMAIL;INTERNET;WORK' => array('email'),
-			'EMAIL;INTERNET;HOME' => array('email_home'),
+			'EMAIL;INTERNET' => array('email'),//tp4 tp43
+			'EMAIL;INTERNET;HOME' => array('email_home'),//tp42 tp42
+			#'EMAIL;INTERNET;WORK' => array('#email_work'),//tp43 lost
 			'N'		=> array('n_family','n_given','n_middle','n_prefix','n_suffix'),
 			'FN'		=> array('n_fn'),
 			'NOTE'		=> array('note'),
@@ -515,7 +519,7 @@ class addressbook_vcal extends addressbook_bo
 						break;
 
 					default:
-						error_log("Funambol product '$_productName', assuming same as thunderbird");
+						//error_log("Funambol product '$_productName', assuming same as thunderbird");
 						$this->supportedFields = $defaultFields[6];
 						break;
 				}
@@ -621,21 +625,20 @@ class addressbook_vcal extends addressbook_bo
 			case 'file':	// used outside of SyncML, eg. by the calendar itself ==> all possible fields
 				$this->supportedFields = $defaultFields[1];
 				break;
-
-			case 'groupdav':		// all GroupDAV access goes through here
+			case 'groupdav':                // all GroupDAV access goes through here
 				switch($this->productName)
 				{
-					case 'kde':		// KDE Addressbook
-						$this->supportedFields = $defaultFields[8];
+					case 'kde':             // KDE Addressbook
+						$this->supportedFields = $defaultFields[1];
+						error_log(__FILE__ . ":groupdav kde 1");	
 						break;
 					default:
 						$this->supportedFields = $defaultFields[1];
 				}
-				break;
-
+				break;		
 			// the fallback for SyncML
 			default:
-				error_log("Client not found: '$_productManufacturer' '$_productName'");
+				error_log(__FILE__. __METHOD__ ."\nManufacturer-Product not found: '$_productManufacturer' '$_productName'");
 				$this->supportedFields = $defaultFields[0];
 				break;
 		}
@@ -645,6 +648,7 @@ class addressbook_vcal extends addressbook_bo
 	{
 		// the horde class does the charset conversion. DO NOT CONVERT HERE.
 
+		//error_log("vcardin vtoe".print_r($_vcard, true));
 		if(!is_array($this->supportedFields))
 		{
 			$this->setSupportedFields();
@@ -698,8 +702,13 @@ class addressbook_vcal extends addressbook_bo
 		// we need also to take care about ADR for example. we do not
 		// support this. We support only ADR;WORK or ADR;HOME
 
+		// njv: As the order of tag occurence is undefined and tags 1... to  n are mapped to one addressbook 
+		//	fieldname and tags 1... to n may have conflicting content eg EMAIL is set but EMAIL;INTERNET is empty 
+		//  and both are mapped to "email" who wins? 
+		
 		foreach($rowNames as $rowName => $vcardKey)
 		{
+			//	error_log("eachrownane:".print_r($rowName,true));
 
 			switch($rowName)
 			{
@@ -740,11 +749,38 @@ class addressbook_vcal extends addressbook_bo
 					}
 					break;
 				case 'EMAIL':
-				case 'EMAIL;WORK':
 				case 'EMAIL;INTERNET':
+					$ckey = false;
+                                        foreach($this->supportedFields as $tag => $value)
+                                        {
+                                        if(in_array ('email', $value))
+                                            {
+                                            $ckey = $tag;
+                                            }
+                                        }
+                        //              error_log("key:$ckey:$vcardKey");
+
+                                        if( $ckey && !empty($vcardValues[$vcardKey]['value']))
+                                        {
+                        //                error_log("$akey : ".print_r($vcardKey,true));
+                                        $finalRowNames[$ckey] = $vcardKey;
+                                        }
+                                        break;
+
+				case 'EMAIL;WORK':
 					if(!isset($rowNames['EMAIL;INTERNET;WORK']))
 					{
-						$finalRowNames['EMAIL;INTERNET;WORK'] = $vcardKey;
+						if(in_array ('#email_work', $value))
+						{
+							$akey = $tag;
+						}
+					}
+					//		error_log("key:$akey:$vcardKey");
+					
+					if( $akey && !empty($vcardValues[$vcardKey]['value']))
+					{
+						//error_log("$akey : ".print_r($vcardKey,true));
+						$finalRowNames[$akey] = $vcardKey;
 					}
 					break;
 				case 'EMAIL;HOME':
@@ -752,17 +788,26 @@ class addressbook_vcal extends addressbook_bo
 					{
 						$finalRowNames['EMAIL;INTERNET;HOME'] = $vcardKey;
 					}
+					
+					//	error_log("email_home-key: ".print_r($bkey, true));
+					
+					if($bkey && !empty($vcardValues[$vcardKey]['value']))
+					{
+						//	error_log("$bkey :".print_r($vcardKey,true));
+						$finalRowNames[$bkey] = $vcardKey;
+					}
 					break;
 
 				case 'VERSION':
 					break;
 
 				default:
+					//error_log("default row map".print_r($vcardKey,true));
 					$finalRowNames[$rowName] = $vcardKey;
 					break;
 			}
 		}
-		#error_log(print_r($finalRowNames, true));
+		//error_log("finalrownames".print_r($finalRowNames, true));
 
 		$contact = array();
 
@@ -797,7 +842,7 @@ class addressbook_vcal extends addressbook_bo
 								break;
 
 							case 'cat_id':
-								$contact[$fieldName] = implode(',',$this->find_or_add_categories(explode(',',$value)));
+								$contact[$fieldName] = implode(',',$this->find_or_add_categories(explode(',',$value),'private'));
 								break;
 
 							case 'note':
@@ -815,6 +860,7 @@ class addressbook_vcal extends addressbook_bo
 		}
 
 		$this->fixup_contact($contact);
+		//error_log(__FILE__ . __METHOD__ . "\nContact:\n " .print_r($contact,true));
 		return $contact;
 	}
 

From 085961d7e1279330a63e48b3ec9f3d48d9953dc2 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Apr 2009 12:35:26 +0000
Subject: [PATCH 150/510] njv: calendar/groupdav work to improve groupdav
 compatibility and various sync proplems connected

---
 calendar/inc/class.calendar_groupdav.inc.php |  44 +++--
 calendar/inc/class.calendar_ical.inc.php     | 178 ++++++++++++++++---
 2 files changed, 185 insertions(+), 37 deletions(-)

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 9c303faad4..00db6f0bce 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -43,7 +43,7 @@ class calendar_groupdav extends groupdav_handler
 	 * @param int $debug=null debug-level to set
 	 * @param string $base_uri=null base url of handler
 	 */
-	function __construct($app,$debug=null,$base_uri=null)
+	function __construct($app,$debug=null, $base_uri=null)
 	{
 		parent::__construct($app,$debug,$base_uri);
 
@@ -85,18 +85,20 @@ class calendar_groupdav extends groupdav_handler
 	function propfind($path,$options,&$files,$user,$id='')
 	{
 		if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id)");
-
+		 //error_log(__METHOD__."($path,".array2string($options).",,$user,$id)");//njv:
 		// ToDo: add parameter to only return id & etag
+		//error_log( __FILE__ . __METHOD__ ."  :$user ". print_r($options,true));
+		$st = microtime(true);
 		$cal_filters = array(
 			'users' => $user,
-			'start' => time()-30*24*3600,	// default one month back
-			'end' => time()+365*24*3600,	// default one year into the future
+			'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
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
 		);
 		if ($this->debug > 1) error_log(__METHOD__."($path,,,$user,$id) cal_filters=".array2string($cal_filters));
-
+		//error_log(__METHOD__."($path,,,$user,$id) cal_filters=".array2string($cal_filters));//njv
 		// process REPORT filters or multiget href's
 		if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$cal_filters,$id))
 		{
@@ -114,6 +116,7 @@ class calendar_groupdav extends groupdav_handler
 				}
 			}
 		}
+		//error_log(__FILE__ . __METHOD__ ."Filters:" .print_r($cal_filters,true));
 		if (($events = $this->bo->search($cal_filters)))
 		{
 			foreach($events as $event)
@@ -126,6 +129,7 @@ class calendar_groupdav extends groupdav_handler
 					// getlastmodified and getcontentlength are required by WebDAV and Cadaver eg. reports 404 Not found if not set
 					HTTP_WebDAV_Server::mkprop('getlastmodified', $event['modified']),
 				);
+				//error_log(__FILE__ . __METHOD__ . "Calendar Data : $calendar_data");
 				if ($calendar_data)
 				{
 					if (is_null($handler)) $handler = $this->_get_handler();
@@ -143,6 +147,8 @@ class calendar_groupdav extends groupdav_handler
 				);
 			}
 		}
+		$end = microtime(true) - $st;
+		if ($this->debug) error_log(__FILE__ . __METHOD__ . "Function took : $end");
 		return true;
 	}
 
@@ -169,6 +175,7 @@ class calendar_groupdav extends groupdav_handler
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($path,...) comp-filter='{$filter['attrs']['name']}'");
+						
 						switch($filter['attrs']['name'])
 						{
 							case 'VTODO':
@@ -177,7 +184,7 @@ class calendar_groupdav extends groupdav_handler
 								$infolog_handler = new groupdav_infolog();
 								return $infolog_handler->propfind($path,$options,$files,$user,$method);
 							case 'VCALENDAR':
-							CASE 'VEVENT':
+							case 'VEVENT':
 								break;			// that's our default anyway
 						}
 						break;
@@ -201,7 +208,7 @@ class calendar_groupdav extends groupdav_handler
 						if ($this->debug) error_log(__METHOD__."($path,...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'time-range':
-						if ($this->debug > 1) error_log(__METHOD__."($path,...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($path,...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
 						$cal_filters['start'] = $filter['attrs']['start'];
 						$cal_filters['end']   = $filter['attrs']['end'];
 						break;
@@ -217,6 +224,7 @@ class calendar_groupdav extends groupdav_handler
 			}
 		}
 		// multiget or propfind on a given id
+		//error_log(__FILE__ . __METHOD__ . "multiget of propfind:");
 		if ($options['root']['name'] == 'calendar-multiget' || $id)
 		{
 			// no standard time-range!
@@ -241,9 +249,11 @@ class calendar_groupdav extends groupdav_handler
 			{
 				foreach($options['other'] as $option)
 				{
+
 					if ($option['name'] == 'href')
 					{
 						$parts = explode('/',$option['data']);
+		
 						if (is_numeric($id = basename(array_pop($parts),'.ics'))) $ids[] = $id;
 					}
 				}
@@ -252,7 +262,8 @@ class calendar_groupdav extends groupdav_handler
 			{
 				$cal_filters['query'][] = 'egw_cal.cal_id IN ('.implode(',',array_map(create_function('$n','return (int)$n;'),$ids)).')';
 			}
-			if ($this->debug) error_log(__METHOD__."($path,,,$user,$id) calendar-multiget: ids=".implode(',',$ids));
+			
+			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($path,,,$user,$id) calendar-multiget: ids=".implode(',',$ids));
 		}
 		return true;
 	}
@@ -288,10 +299,14 @@ class calendar_groupdav extends groupdav_handler
 	 */
 	function put(&$options,$id,$user=null)
 	{
+		if($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
 		$return_no_access=true;	// as handled by importVCal anyway and allows it to set the status for participants
 		$event = $this->_common_get_put_delete('PUT',$options,$id,$return_no_access);
+		
 		if (!is_null($event) && !is_array($event))
 		{
+		
+		if($this->debug) error_log(__METHOD__.print_r($event,true).function_backtrace());
 			return $event;
 		}
 		$handler = $this->_get_handler();
@@ -346,6 +361,8 @@ class calendar_groupdav extends groupdav_handler
 	 */
 	function read($id)
 	{
+		//$cal_read = $this->bo->read($id,null,false,'server');//njv: do we actually get anything
+		if ($this->debug > 1) error_log("bo-ical read  :$id:");//njv: 
 		return $this->bo->read($id,null,false,'server');
 	}
 
@@ -362,12 +379,14 @@ class calendar_groupdav extends groupdav_handler
 		{
 			$entry = $this->read($entry);
 		}
-		if (!$entry['id'] || !isset($entry['etag']) || !isset($entry['participants'])) error_log(__METHOD__."($e_in): id=$entry[id], etag=$entry[etag], isset(participants)=".(int)isset($entry['participants']).", title=$entry[title]: id, etag or participants not set!!!");
+		if (!$entry['id'] || !isset($entry['etag']) || !isset($entry['participants'])) {
+			if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($e_in): id=$entry[id], etag=$entry[etag], isset(participants)=".(int)isset($entry['participants']).", title=$entry[title]: id, etag or participants not set!!!");
+		}
 		$etag = $entry['id'].':'.$entry['etag'];
 		// add a hash over the participants and their stati
 		ksort($entry['participants']);	// create a defined order
 		$etag .= ':'.md5(serialize($entry['participants']));
-		//error_log(__METHOD__."($entry[id] ($entry[etag]): $entry[title] --> etag=$etag");
+		//error_log(__FILE__ .__METHOD__ . "($entry[id] ($entry[etag]): $entry[title] --> etag=$etag");
 		return $etag;
 	}
 
@@ -408,7 +427,8 @@ class calendar_groupdav extends groupdav_handler
 	{
 		$handler =& new calendar_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
-
+		if ($this->debug > 1) error_log("ical Handler called:" . $this->agent);
 		return $handler;
 	}
-}
\ No newline at end of file
+}
+
diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index d666f6e0bd..22555f2c66 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -111,6 +111,7 @@ class calendar_ical extends calendar_boupdate
 	 */
 	function &exportVCal($events,$version='1.0', $method='PUBLISH')
 	{
+	//	error_log(__FILE__ . __METHOD__ ."exportVCal is called ");
 		$egwSupportedFields = array(
 			'CLASS'			=> array('dbName' => 'public'),
 			'SUMMARY'		=> array('dbName' => 'title'),
@@ -225,8 +226,8 @@ class calendar_ical extends calendar_boupdate
     	    				break;
 
         				case 'ORGANIZER':	// according to iCalendar standard, ORGANIZER not used for events in the own calendar
-        					if ($event['owner'] != $this->user)
-        					//if (!isset($event['participants'][$event['owner']]) || count($event['participants']) > 1)
+        					//if ($event['owner'] != $this->user)
+        					if (!isset($event['participants'][$event['owner']]) || count($event['participants']) > 1)
         					{
 								$mailtoOrganizer = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
 								$attributes['ORGANIZER'] = $mailtoOrganizer ? 'MAILTO:'.$mailtoOrganizer : '';
@@ -237,9 +238,33 @@ class calendar_ical extends calendar_boupdate
 
 						case 'DTEND':
 							// write start + end of whole day events as dates
+							//  $event['end'] += 12*3600;
+                            // we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+                            //njv: This appears to be another urban myth misinterpretation 20090220
+
+							 /*
+                            DTSTART;VALUE=DATE:20090317 implies 000000Z
+                            DTEND;VALUE=DATE:20090317 implies 235959Z
+                            And DEFINES an ALLDAY event
+                            and as such is "inclusive"
+                            some clients(Lightning, Korganiser?) use "exclusive"
+                            Legacy: EGW held 235900 As DTEND allday, such entries in databases will exist
+                            EGW is internally correct on 235959 "inclusive"
+                            */
+							// Whats in DTSTART/DTEND	
+							//error_log(__FILE__ . __METHOD__. "\nDTSTART:". print_r($event['start'],true)."\nDTEND:".print_r($event['end'],true));
+							//Lets do it right first:
+ 							//If (YMD DTSTART == YMD DTEND) and (His DTSTART == 00:00:00 )and (His DTEND in 235900 or 235959) then we are oneday allday return YMD DTSTART DTEND
+							//if (YMD DTSTART <= YMD DTEND) and (HIS DTSTART == 00:00:00) (His DTEND in 235900 or 235959) then we are all day or allday multiday ending in an allday return DTG DTSTART and DTEND
+							//error_log(__FILE__ . __METHOD__ ." :$this->productManufacturer :$this->productName" ); 
+							// returns "GroupDAV" "kde"
+								
 							if (date('H:i:s',$event['start']) == '00:00:00' && in_array(date('H:i:s',$event['end']),array('23:59:59','23:59:00')))
 							{
-								$event['end'] += 12*3600;	// we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+								//if kde or lightning increase dtend by 24 hours? 86400 secs
+								if($this->productName == "kde" || $this->productName == "lightning"){
+								$event['end'] += 86400;
+								}
 								foreach(array('start' => 'DTSTART','end' => 'DTEND') as $f => $t)
 								{
 									$arr = calendar_bo::date2array($event[$f]);
@@ -447,24 +472,34 @@ class calendar_ical extends calendar_boupdate
 					$valueData = $GLOBALS['egw']->translation->convert($valueData,$GLOBALS['egw']->translation->charset(),'UTF-8');
 					$paramData = (array) $GLOBALS['egw']->translation->convert(is_array($value) ? $parameters[$key][$valueID] : $parameters[$key],
 						$GLOBALS['egw']->translation->charset(),'UTF-8');
-					//echo "$key:$valueID: value=$valueData, param=".print_r($paramDate,true)."\n";
 					$vevent->setAttribute($key, $valueData, $paramData);
 					$options = array();
 					if ($paramData['CN']) $valueData .= $paramData['CN'];	// attendees or organizer CN can contain utf-8 content
-					if($key != 'RRULE' && preg_match('/([\000-\012\015\016\020-\037\075])/',$valueData))
-					{
-						$options['ENCODING'] = 'QUOTED-PRINTABLE';
+					
+					if($this->productManufacturer == 'file' || $this->productManufacturer == 'GroupDAV') {
+					} 
+					else
+					{							
+						if($key != 'RRULE' && preg_match('/([\000-\012\015\016\020-\037\075])/',$valueData))
+						{
+							error_log(__FILE__ . __METHOD__ . "QP key $key:  ".print_r($valueData,true));
+							$options['ENCODING'] = 'QUOTED-PRINTABLE';
+						}
 					}
-					if($this->productManufacturer != 'GroupDAV' && preg_match('/([\177-\377])/',$valueData))
+
+					if($this->productManufacturer != 'GroupDAV'  && preg_match('/([\177-\377])/',$valueData))
 					{
 						$options['CHARSET'] = 'UTF-8';
 					}
-					$vevent->setParameter($key, $options);
+				 	if(preg_match('/([\000-\012])/',$valueData))
+					{
+					error_log(__FILE__ . __METHOD__ ."Has invalid XML data :$valueData");	
+					}
+				$vevent->setParameter($key, $options);
 				}
 			}
 			$vcal->addComponent($vevent);
 		}
-		//_debug_array($vcal->exportvCalendar());
 
 		return $vcal->exportvCalendar();
 	}
@@ -481,7 +516,6 @@ class calendar_ical extends calendar_boupdate
 	{
 		// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
 		$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
-
 		$vcal = &new Horde_iCalendar;
 		if(!$vcal->parsevCalendar($_vcalData))
 		{
@@ -489,7 +523,7 @@ class calendar_ical extends calendar_boupdate
 		}
 
 		$version = $vcal->getAttribute('VERSION');
-
+		error_log(__FILE__ . __METHOD__ ."Called with :\n ". print_r($_vcalData,true));
 		if(!is_array($this->supportedFields))
 		{
 			$this->setSupportedFields();
@@ -520,6 +554,7 @@ class calendar_ical extends calendar_boupdate
 				// lets see what we can get from the vcard
 				foreach($component->_attributes as $attributes)
 				{
+					//error_log(__FILE__ . __METHOD__ .":" . print_r($attributes,true));
 					switch($attributes['name'])
 					{
 						case 'AALARM':
@@ -555,10 +590,33 @@ class calendar_ical extends calendar_boupdate
 							$vcardData['description']	= $attributes['value'];
 							break;
 						case 'DTEND':
-							$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-							if(date('H:i:s',$dtend_ts) == '00:00:00') {
-								$dtend_ts -= 60;
+							/* 
+							DTSTART;VALUE=DATE:20090317 implies 000000Z
+                            DTEND;VALUE=DATE:20090317 implies 235959Z
+                            And DEFINES an ALLDAY event
+                            and as such is "inclusive"
+                            some clients(Lightning, Korganiser?) use "exclusive"
+                            Legacy: EGW held 235900 As DTEND allday, such entries in databases will exist
+                            EGW is internally correct on 235959 "inclusive"
+                            */
+							// We aren't allday
+							$allday = false;
+							// get and ensure the DTSTART/DTEND is a numeric Timestamp
+							$dtstart_ts  =	self::_get_attribute($component->_attributes,'DTSTART');
+							$dtstart_ts = is_numeric($dtstart_ts) ? $dtstart_ts : $this->date2ts($dtstart_ts);
+							$dtend_ts = self::_get_attribute($component->_attributes,'DTEND');
+							$dtend_ts = is_numeric($dtend_ts) ? $dtend_ts : $this->date2ts($dtend_ts);
+							//Plausibility Check and Convert Vcal/ical Allday to EGW Allday
+							if($dtstart_ts <= $dtend_ts && date('H:i:s',$dtend_ts) == '00:00:00'){ 
+							// We are a one day Allday event or Allday last day of a sequence
+							// dtend_ts += 23:59:59 +=86339 = EGW intern
+							$allday = true;
+							$dtend_ts += 86399;
 							}
+							 //if kde or lightning reduce dtend by 24 hours? 86400 secs
+                            if($allday && ($this->productName == "kde" || $this->productName == "lightning")){
+                            $dtend_ts -= 86400;
+                                }
 							$vcardData['end']		= $dtend_ts;
 							break;
 						case 'DTSTART':
@@ -784,7 +842,8 @@ class calendar_ical extends calendar_boupdate
 							}
  							break;
  						case 'ATTENDEE':
- 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) ||
+ 							error_log(__FILE__ . __METHOD__ . "case:ATTENDEE:" . print_r($attributes,true));
+							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) ||
  								preg_match('/<([@.a-z0-9_-]+)>/i',$attributes['value'],$matches))
 							{
 								$email = $matches[1];
@@ -838,12 +897,16 @@ class calendar_ical extends calendar_boupdate
  								if (!$email) $email = 'no-email@egroupware.org';	// set dummy email to store the CN
  								$uid = 'e'.($attributes['params']['CN'] ? $attributes['params']['CN'].' <'.$email.'>' : $email);
  							}
- 							$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
+ 							
+ 							error_log(__FILE__ . __METHOD__ . "\n ATTENDEE:" . print_r($attributes['value'],true));
+							$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
  									$this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])] :
  									($uid == $event['owner'] ? 'A' : 'U');
- 							break;
+ 							
+							break;
  						case 'ORGANIZER':	// will be written direct to the event
- 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
+ 							error_log(__FILE__ . __METHOD__ . "\n ORGANIZER:" . print_r($attributes['value'],true));
+							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
  								($uid = $GLOBALS['egw']->accounts->name2id($matches[1],'account_email')))
  							{
  								$event['owner'] = $uid;
@@ -857,7 +920,7 @@ class calendar_ical extends calendar_boupdate
 							break;
 					}
 				}
-
+				//error_log(__FILE__ . __METHOD__ . "\n after case:" . print_r($event['participants'],true));
 				// check if the entry is a birthday
 				// this field is only set from NOKIA clients
 				$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
@@ -936,6 +999,7 @@ class calendar_ical extends calendar_boupdate
 				// participants OR the event no longer contains participants, add them back
 				if( $cal_id > 0 && (!isset($this->supportedFields['participants']) || !count($event['participants'])))
 				{
+					
 					if (($egw_event = $this->read($cal_id)))
 					{
 						$event['participants'] = $egw_event['participants'];
@@ -973,21 +1037,40 @@ class calendar_ical extends calendar_boupdate
 				}
 
 				#error_log('ALARMS');
-				#error_log(print_r($event, true));
+				//error_log(__FILE__ . __METHOD__ ."whats in event". print_r($event, true));
 
 				// if an etag is given, include it in the update
 				if (!is_null($etag))
 				{
 					$event['etag'] = $etag;
 				}
+				/*
+				We have for CREATE:
+				if vcal OWNER set then either this->user = OWNER or has add rights to owners Calendar
+				We have for UPDATE:
+				vcal OWNER = EGW owner
+				case: this->user = OWNER then all rights (C-ok,R-ok,U-?,D-ok)
+				*/
+				if($this->user == $event['owner']){
+				//error_log("\nuser:$this->user owner:". print_r($event['owner'],true));
+				}
+				/*
+				case: this->user = participant then only change own status
+				*/
+				if(array_key_exists($this->user,$event['participants'])){
+				//	error_log("\nuser:$this->user : ". print_r($egw_event,true)); 
+				}
+				$original_event = $event;
+				//error_log(__FILE__ . __METHOD__ . "\n after case:" . print_r($event['participants'],true));
 				if (!($Ok = $this->update($event, TRUE)))
 				{
 					// check if current user is an attendee and tried to change his status
+					//error_log(__FILE__ . __METHOD__ . "\n:in update" . print_r($egw_event,true));
 					if ($Ok === false && $cal_id && ($egw_event = $this->read($cal_id)) && isset($egw_event['participants'][$this->user]) &&
 						$egw_event['participants'][$this->user] !== $event['participants'][$this->user])
 					{
-						$this->set_status($egw_event,$this->user,
-							$status = $event['participants'][$this->user] ? $event['participants'][$this->user] : 'R');
+						//error_log(__FILE__ . __METHOD__ . "\n:set status" . print_r($egw_event,true));
+						$this->set_status($egw_event,$this->user,$status = $event['participants'][$this->user] ? $event['participants'][$this->user] : 'R');
 
 						$Ok = $cal_id;
 						continue;
@@ -997,7 +1080,8 @@ class calendar_ical extends calendar_boupdate
 				else
 				{
 					$eventID =& $Ok;
-
+					if(isset($egw_event) && $original_event['participants'] != $egw_event['participants'])$this->update_status($original_event,$egw_event);
+					
 					// handle the alarms
 					foreach ($component->getComponents() as $valarm)
 					{
@@ -1089,7 +1173,7 @@ class calendar_ical extends calendar_boupdate
 				// 	break;
 
 				default:
-					error_log('VALARM field:' .$vattr['name'] .':' . print_r($vattrval,true) . ' HAS NO CONVERSION YET');
+				//	error_log('VALARM field:' .$vattr['name'] .':' . print_r($vattrval,true) . ' HAS NO CONVERSION YET');
 			}
 		}
 		return $count;
@@ -1292,6 +1376,17 @@ class calendar_ical extends calendar_boupdate
 							$vcardData['description']	= $attributes['value'];
 							break;
 						case 'DTEND':
+						/* write start + end of whole day events as dates
+                            DTSTART;VALUE=DATE:20090317 implies 000000Z
+                            DTEND;VALUE=DATE:20090317 implies 235959Z
+                            And DEFINES an ALLDAY event
+                            and as such is "inclusive"
+                            some clients(Lightning, Korganiser?) need an "exclusive"
+                            Legacy: EGW held 235900 As DTEND allday, such entries in databases will exist
+                            EGW is internally correct on 235959 "inclusive"
+                            */
+                            //error_log(__FILE__ . __METHOD__. "DTEND:". print_r($attributes['value'],true));
+	
 							if(date('H:i:s',$attributes['value']) == '00:00:00')
 								$attributes['value']--;
 							$vcardData['end']		= $attributes['value'];
@@ -1612,4 +1707,37 @@ class calendar_ical extends calendar_boupdate
 
 		return $vcal->exportvCalendar();
 	}
+
+	function update_status($new_event,$old_event)
+   	{
+       	$modified = $added = $deleted = array();
+		//error_log(__FILE__ . __METHOD__ . "\nnew_event:" . print_r($new_event,true));
+        
+		// check the old list against the new list and write the changes
+		foreach($old_event['participants'] as $old_userid => $old_status)
+        {
+            if(isset($new_event['participants'][$old_userid])){
+				if($new_event['participants'][$old_userid] != $old_event['participants'][$old_userid]){
+                //$modified[$old_userid] = $new_event['participants'][$old_userid];
+					$this->set_status($old_event,$old_userid,$status = $new_event['participants'][$old_userid] ? $new_event['participants'][$old_userid] : 'R');
+        		}
+			}
+            else
+            {
+                // this doesn't get written from here at the moment
+				$deleted[$old_userid] = $old_status;
+            }
+        }
+        // Find new participants ... 
+        foreach($new_event['participants'] as $new_userid => $new_status)
+        {
+            if(!isset($old_event['participants'][$new_userid]))
+            {
+                // this doesn't get written from here at the moment
+				$added[$new_userid] = 'U';
+            }
+        }
+    }
+
+
 }

From b8601d92d7b663d79ec96ea4aaf0aa0d77d12c05 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Apr 2009 12:39:52 +0000
Subject: [PATCH 151/510] njv: phpgwapi/groupdav work to improve groupdav
 compatibility and various sync proplems connected

---
 phpgwapi/inc/class.groupdav.inc.php          |  5 +-
 phpgwapi/inc/class.groupdav_handler.inc.php  | 10 ++--
 phpgwapi/inc/horde/Horde/RPC/syncml.php      |  4 +-
 phpgwapi/inc/horde/Horde/iCalendar.php       | 63 +++++++++++++-------
 phpgwapi/inc/horde/Horde/iCalendar/vcard.php |  4 ++
 5 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index adb8c9ff68..1e40741ce5 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -145,6 +145,8 @@ class groupdav extends HTTP_WebDAV_Server
 		{
 			if ($this->debug > 1) error_log(__CLASS__."::$method: user=$user, app=$app, id=$id: 404 not found!");
 			return '404 Not Found';
+
+
 		}
 		if ($this->debug > 1) error_log(__CLASS__."::$method: user=$user, app='$app', id=$id");
 
@@ -476,8 +478,9 @@ class groupdav extends HTTP_WebDAV_Server
 	 */
 	function _parse_path($path,&$id,&$app,&$user)
 	{
+		if ($this->debug) error_log(__METHOD__." called with ('$path') id=$id, app='$app', user=$user");
 		$parts = explode('/',$path);
-
+		if ($this->debug) error_log(__METHOD__." called parts: ".print_r($parts,true));
 		if (in_array($parts[1],array('principals','groups')))
 		{
 			$user = $GLOBALS['egw_info']['user']['account_id'];
diff --git a/phpgwapi/inc/class.groupdav_handler.inc.php b/phpgwapi/inc/class.groupdav_handler.inc.php
index bfe0efe3e8..c55c5e28d5 100644
--- a/phpgwapi/inc/class.groupdav_handler.inc.php
+++ b/phpgwapi/inc/class.groupdav_handler.inc.php
@@ -81,11 +81,12 @@ abstract class groupdav_handler
 	 */
 	function __construct($app,$debug=null,$base_uri=null)
 	{
+	    //error_log(__METHOD__." called");
 		$this->app = $app;
-		if (!is_null($debug)) $this->debug = $debug;
+		#if (!is_null($debug)) $this->debug = $debug = 3;
 		$this->base_uri = is_null($base_uri) ? $base_uri : $_SERVER['SCRIPT_NAME'];
 		$this->agent = self::get_agent();
-
+		
 		$this->translation =& $GLOBALS['egw']->translation;
 		$this->egw_charset = $this->translation->charset();
 	}
@@ -171,7 +172,7 @@ abstract class groupdav_handler
 		}
 		if (!is_array($entry) || !isset($entry['id']) || !(isset($entry['modified']) || isset($entry['etag'])))
 		{
-			error_log(__METHOD__."(".array2string($entry).") Cant create etag!");
+		//	error_log(__METHOD__."(".array2string($entry).") Cant create etag!");
 			return false;
 		}
 		return '"'.$entry['id'].':'.(isset($entry['etag']) ? $entry['etag'] : $entry['modified']).'"';
@@ -303,4 +304,5 @@ abstract class groupdav_handler
 		}
 		return $agent;
 	}
-}
\ No newline at end of file
+}
+
diff --git a/phpgwapi/inc/horde/Horde/RPC/syncml.php b/phpgwapi/inc/horde/Horde/RPC/syncml.php
index 99fc9ae72e..a25ab8a63c 100644
--- a/phpgwapi/inc/horde/Horde/RPC/syncml.php
+++ b/phpgwapi/inc/horde/Horde/RPC/syncml.php
@@ -113,8 +113,8 @@ class Horde_RPC_syncml extends Horde_RPC {
          * that came up for later debugging. */
         $errorLogging = ob_get_clean();
         if (!empty($errorLogging)) {
-            Horde::logMessage('SyncML: caught output=' .
-                              $errorLogging, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            #Horde::logMessage('SyncML: caught output=' .
+            #                  $errorLogging, __FILE__, __LINE__, PEAR_LOG_DEBUG);
         }
 
         return $response;
diff --git a/phpgwapi/inc/horde/Horde/iCalendar.php b/phpgwapi/inc/horde/Horde/iCalendar.php
index 20dfcba71b..f91d2d3da4 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar.php
@@ -48,20 +48,22 @@ class Horde_iCalendar {
     {
 #        require_once 'Horde/String.php';
         $type = strtolower($type);
-        $class = 'Horde_iCalendar_' . strtolower($type);
-		if (!class_exists($class)) {
-		  include_once dirname(__FILE__) . '/iCalendar/' . $type . '.php';
+        #error_log("called horde ical new comp". print_r($type,true) );
+		$class = 'Horde_iCalendar_' . strtolower($type);
+		if (!class_exists($class,false)) {
+			include_once dirname(__FILE__) . '/iCalendar/' . $type . '.php';
 		}
 		if (class_exists($class)) {
-            $component = &new $class();
-            if ($container !== false) {
-                $component->_container = &$container;
-            }
-            return $component;
-        } else {
-            // Should return an dummy x-unknown type class here.
-            return false;
-        }
+			#include_once dirname(__FILE__) . '/iCalendar/' . $type . '.php';
+			$component = &new $class();
+			if ($container !== false) {
+				$component->_container = &$container;
+			}
+			return $component;
+		} else {
+			// Should return an dummy x-unknown type class here.
+			return false;
+		}
     }
 
     /**
@@ -353,6 +355,7 @@ class Horde_iCalendar {
      */
     function exportvCalendar()
     {
+	#error_log(__METHOD__.": called");
         // Default values.
         $requiredAttributes['VERSION'] = '2.0';
         $requiredAttributes['PRODID'] = '-//The Horde Project//Horde_iCalendar Library, Horde 3.0-cvs //EN';
@@ -363,7 +366,10 @@ class Horde_iCalendar {
                 $this->setAttribute($name, $default_value);
             }
         }
-
+	//error_log(__METHOD__.":requiredAttributes->".print_r($requiredAttributes,true));
+	//njv:$buffcontent = ob_get_clean();
+	#error_log(__METHOD__.":".print_r($buffcontent,true));
+	#ob_end_clean();
         return $this->_exportvData('VCALENDAR') . $this->_newline;
     }
 
@@ -411,7 +417,8 @@ class Horde_iCalendar {
         if ($clear) {
             $this->clear();
         }
-        if (preg_match('/(BEGIN:' . $base . '\r?\n)([\W\w]*)(END:' . $base . '\r?\n?)/i', $text, $matches)) {
+        error_log(__FILE__ . __METHOD__ . ":\n".$text."\n xxxxxxxxx");
+	if (preg_match('/(BEGIN:' . $base . '\r?\n)([\W\w]*)(END:' . $base . '\r?\n?)/i', $text, $matches)) {
             $vCal = $matches[2];
         } else {
             // Text isn't enclosed in BEGIN:VCALENDAR
@@ -488,7 +495,12 @@ class Horde_iCalendar {
                 }
 
                 // Charset and encoding handling.
-                if ((isset($params['ENCODING'])
+                
+
+				// njv sanity todo: decode  text fields containing qp but not tagged
+					
+
+				if ((isset($params['ENCODING'])
                      && $params['ENCODING'] == 'QUOTED-PRINTABLE')
                     || isset($params['QUOTED-PRINTABLE'])) {
 
@@ -616,9 +628,10 @@ class Horde_iCalendar {
                     $value = trim($value);
                     // As of rfc 2426 2.4.2 semi-colon, comma, and
                     // colon must be escaped.
-                    $value = str_replace('\\n', $this->_newline, $value);
+                    // njv an "urban myth" a colon is tsafe and should not be escaped
+		    		$value = str_replace('\\n', $this->_newline, $value);
                     $value = str_replace('\\,', ',', $value);
-                    $value = str_replace('\\:', ':', $value);
+                    //njv:$value = str_replace('\\:', ':', $value);
 
                     // Split by unescaped semi-colons:
                     $values = preg_split('/(?<!\\\\);/',$value);
@@ -630,12 +643,19 @@ class Horde_iCalendar {
 
                 // String fields.
                 default:
-                    $value = trim($value);
-                    // As of rfc 2426 2.4.2 semi-colon, comma, and
+                    
+					$value = trim($value);
+                    
+					//sanity $value should not contain qp
+					if(preg_match('/^=[24]/',$value)){
+						error_log(__FILE__ .__METHOD__ ."?qp decoded : ". print_r($value , true));
+						quoted_printable_decode($value);
+					}
+					// As of rfc 2426 2.4.2 semi-colon, comma, and
                     // colon must be escaped.
                     $value = str_replace('\\n', $this->_newline, $value);
                     $value = str_replace('\\;', ';', $value);
-                    $value = str_replace('\\:', ':', $value);
+                    //njv:$value = str_replace('\\:', ':', $value);
 
                     // Split by unescaped commas:
                     $values = preg_split('/(?<!\\\\),/',$value);
@@ -784,7 +804,8 @@ class Horde_iCalendar {
 		#$value = str_replace($this->_newline, '\n', $value);
 		$value = str_replace(',', '\,', $value);
 		$value = str_replace(';', '\;', $value);
-		$value = str_replace(':', '\:', $value);
+		//njv:RFC 2445 says very definately NO!
+		//$value = str_replace(':', '\:', $value);
                 break;
 
             default:
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vcard.php b/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
index e7a222f767..6a08c90343 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
@@ -64,6 +64,10 @@ class Horde_iCalendar_vcard extends Horde_iCalendar {
                 $this->setAttribute($name, $default_value);
             }
         }
+		//error_log(__METHOD__.":requiredAttributes->".print_r($requiredAttributes,true));
+		//njv:$buffcontent = ob_get_clean();
+		#error_log(__METHOD__.":".print_r($buffcontent,true));
+		#ob_end_clean();
 
         return $this->_exportvData('VCARD') . $this->_newline;
     }

From d5e4faffb19bea5890f626ab5e88aaf028035db5 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Apr 2009 12:45:17 +0000
Subject: [PATCH 152/510] bionicmessage.net may get a session, as it retrieves
 via MULTIGET now

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

diff --git a/groupdav.php b/groupdav.php
index 698a87d0a4..34512fd9a3 100644
--- a/groupdav.php
+++ b/groupdav.php
@@ -34,7 +34,7 @@ function check_access(&$account)
 	$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
 	foreach(array(
 		'davkit',	// Apple iCal
-		'bionicmessage.net',
+	//	'bionicmessage.net',
 		'zideone',
 		'lightning',
 	) as $test)

From 70bfaee90e099d15e0a44af2fe388939180bcbbe Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Apr 2009 12:57:48 +0000
Subject: [PATCH 153/510] njv infolog/groupdav work, mostly debug, and special
 handling for GroupDav as PeroductManufacturer

---
 infolog/inc/class.infolog_groupdav.inc.php | 21 +++++++++++++++++----
 infolog/inc/class.infolog_ical.inc.php     | 10 +++++++---
 infolog/inc/class.infolog_sif.inc.php      |  1 +
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php
index 021276e4a4..0fa8a23a46 100644
--- a/infolog/inc/class.infolog_groupdav.inc.php
+++ b/infolog/inc/class.infolog_groupdav.inc.php
@@ -22,7 +22,7 @@ class infolog_groupdav extends groupdav_handler
 	 * @var infolog_bo
 	 */
 	var $bo;
-
+	static $debugInfo = 0; // sometimes debuging is quite handy, to see things. check with the error log to see results
 	/**
 	 * Constructor
 	 *
@@ -32,8 +32,10 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function __construct($app,$debug=null,$base_uri=null)
 	{
+		if (self::$debugInfo) $debug = self::$debugInfo;
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		parent::__construct($app,$debug,$base_uri);
-
+		if (self::$debugInfo) error_log(__METHOD__." parent constructed with $app,$debug,$base_uri; initializing infolog_bo ");
 		$this->bo =& new infolog_bo();
 	}
 
@@ -47,6 +49,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	static function get_path($info)
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called with".print_r($info,true));
 		if (is_numeric($info) && self::PATH_ATTRIBUTE == 'info_id')
 		{
 			$name = $info;
@@ -54,6 +57,7 @@ class infolog_groupdav extends groupdav_handler
 		else
 		{
 			if (!is_array($info)) $info = $this->bo->read($info);
+			if (self::$debugInfo) error_log(__METHOD__." returning info on ".print_r( $info,true));
 			$name = $info[self::PATH_ATTRIBUTE];
 		}
 		return '/infolog/'.$name.'.ics';
@@ -70,6 +74,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function propfind($path,$options,&$files,$user,$id='')
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		// todo add a filter to limit how far back entries from the past get synced
 		$filter = array(
 			'info_type'	=> 'task',
@@ -112,6 +117,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function get(&$options,$id)
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		if (!is_array($task = $this->_common_get_put_delete('GET',$options,$id)))
 		{
 			return $task;
@@ -134,6 +140,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function put(&$options,$id,$user=null)
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		$ok = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($ok) && !is_array($ok))
 		{
@@ -142,7 +149,7 @@ class infolog_groupdav extends groupdav_handler
 		$handler = $this->_get_handler();
 		if (!($info_id = $handler->importVTODO($options['content'],is_numeric($id) ? $id : -1)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
+			if ($this->debug ) error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
 			return '403 Forbidden';
 		}
 		header('ETag: '.$this->get_etag($info_id));
@@ -163,6 +170,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function delete(&$options,$id)
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		if (!is_array($task = $this->_common_get_put_delete('DELETE',$options,$id)))
 		{
 			return $task;
@@ -178,6 +186,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function read($id)
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		return $this->bo->read($id,false);
 	}
 
@@ -190,6 +199,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function check_access($acl,$task)
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		return $this->bo->check_access($task,$acl);
 	}
 
@@ -201,6 +211,7 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	function get_etag($info)
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		if (!is_array($info))
 		{
 			$info = $this->bo->read($info);
@@ -219,9 +230,11 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	private function _get_handler()
 	{
+		if (self::$debugInfo) error_log(__METHOD__." called ");
 		$handler =& new infolog_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 
 		return $handler;
 	}
-}
\ No newline at end of file
+}
+
diff --git a/infolog/inc/class.infolog_ical.inc.php b/infolog/inc/class.infolog_ical.inc.php
index d2dc783646..e331ca5f6e 100644
--- a/infolog/inc/class.infolog_ical.inc.php
+++ b/infolog/inc/class.infolog_ical.inc.php
@@ -11,6 +11,8 @@
  */
 
 require_once EGW_API_INC.'/horde/Horde/iCalendar.php';
+require_once EGW_API_INC.'/horde/Horde/iCalendar/vnote.php';
+require_once EGW_API_INC.'/horde/Horde/iCalendar/vtodo.php';
 
 /**
  * InfoLog: Create and parse iCal's
@@ -70,7 +72,7 @@ class infolog_ical extends infolog_bo
 		{
 			$vevent->setAttribute($field,$value);
 			$options = array();
-			if(preg_match('/([\000-\012\015\016\020-\037\075])/',$value))
+			if($this->productManufacturer != 'GroupDAV' &&  preg_match('/([\000-\012\015\016\020-\037\075])/',$value))
 			{
 				$options['ENCODING'] = 'QUOTED-PRINTABLE';
 			}
@@ -102,8 +104,10 @@ class infolog_ical extends infolog_bo
 			$cats = $this->get_categories(array($taskData['info_cat']));
 			$vevent->setAttribute('CATEGORIES', $cats[0]);
 		}
+		//error_log("\n\nexportvcal\n". print_r($vcal,true));
+		//error_log("\n\nexportvcal\n". print_r($vevent,true));
 		$vcal->addComponent($vevent);
-
+		error_log("\n\nexportvcal from infolog\n");
 		return $vcal->exportvCalendar();
 	}
 
@@ -356,7 +360,7 @@ class infolog_ical extends infolog_bo
 				else
 				{
 					// should better be imported as subject, but causes duplicates
-					// TODO: should be examined
+					// TODO: should be qexamined
 					$note['info_des'] = $txt;
 				}
 
diff --git a/infolog/inc/class.infolog_sif.inc.php b/infolog/inc/class.infolog_sif.inc.php
index f595c80545..c7f50bc410 100644
--- a/infolog/inc/class.infolog_sif.inc.php
+++ b/infolog/inc/class.infolog_sif.inc.php
@@ -439,6 +439,7 @@ class infolog_sif extends infolog_bo
 
 	function exportVTODO($_taskID, $_version)
 	{
+		error_log(__METHOD__."called : $_version ,$_taskID");
 		$taskData = $this->read($_taskID);
 
 		$taskData = $GLOBALS['egw']->translation->convert($taskData,$GLOBALS['egw']->translation->charset(),'UTF-8');

From b11d7fe912042931680cef3c5d9251b57b6bf25f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 3 Apr 2009 07:02:08 +0000
Subject: [PATCH 154/510] "fix for \"bug\" #1954: greatings should be greetings
 and a new file-header"

---
 admin/inc/class.uiasyncservice.inc.php | 354 ++++++++++++-------------
 1 file changed, 172 insertions(+), 182 deletions(-)

diff --git a/admin/inc/class.uiasyncservice.inc.php b/admin/inc/class.uiasyncservice.inc.php
index 54bf2c06d2..4b101f41f8 100644
--- a/admin/inc/class.uiasyncservice.inc.php
+++ b/admin/inc/class.uiasyncservice.inc.php
@@ -1,213 +1,203 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare Admin - Timed Asynchron Services for eGroupWare               *
-	* Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
-	* Class to admin cron-job like timed calls of eGroupWare methods           *
-	* -------------------------------------------------------------------------*
-	* This library is part of the eGroupWare API                               *
-	* http://www.egroupware.org/                                               *
-	* ------------------------------------------------------------------------ *
-	* This library is free software; you can redistribute it and/or modify it  *
-	* under the terms of the GNU Lesser General Public License as published by *
-	* the Free Software Foundation; either version 2.1 of the License,         *
-	* or any later version.                                                    *
-	* This library is distributed in the hope that it will be useful, but      *
-	* WITHOUT ANY WARRANTY; without even the implied warranty of               *
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
-	* See the GNU Lesser General Public License for more details.              *
-	* You should have received a copy of the GNU Lesser General Public License *
-	* along with this library; if not, write to the Free Software Foundation,  *
-	* Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
-	\**************************************************************************/
+/**
+ * eGgroupWare admin - Timed Asynchron Services
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @package admin
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
+/**
+ * Class to admin cron-job like timed calls of eGroupWare methods
+ */
+class uiasyncservice
+{
+	var $public_functions = array(
+		'index' => True,
+	);
 
-	class uiasyncservice
+	function index()
 	{
-		var $public_functions = array(
-			'index' => True,
+		if ($GLOBALS['egw']->acl->check('asyncservice_access',1,'admin'))
+		{
+			$GLOBALS['egw']->redirect_link('/index.php');
+		}
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Asynchronous timed services');
+
+		$GLOBALS['egw']->js->validate_file('jscode','openwindow','admin');
+		$GLOBALS['egw']->common->egw_header();
+		echo parse_navbar();
+
+		$async = $GLOBALS['egw']->asyncservice;	// use an own instance, as we might set debug=True
+
+		$async->debug = !!$_POST['debug'];
+
+		$units = array(
+			'year'  => lang('Year'),
+			'month' => lang('Month'),
+			'day'   => lang('Day'),
+			'dow'   => lang('Day of week<br>(0-6, 0=Sun)'),
+			'hour'  => lang('Hour<br>(0-23)'),
+			'min'   => lang('Minute')
 		);
 
-		function index()
+		if ($_POST['send'] || $_POST['test'] || $_POST['cancel'] || $_POST['install'] || $_POST['deinstall'] || $_POST['update'] || isset($_POST['asyncservice']))
 		{
-			if ($GLOBALS['egw']->acl->check('asyncservice_access',1,'admin'))
+			$times = array();
+			foreach($units as $u => $ulabel)
 			{
-				$GLOBALS['egw']->redirect_link('/index.php');
-			}
-			$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Asynchronous timed services');
-
-			$GLOBALS['egw']->js->validate_file('jscode','openwindow','admin');
-			$GLOBALS['egw']->common->egw_header();
-			echo parse_navbar();
-
-			$async = $GLOBALS['egw']->asyncservice;	// use an own instance, as we might set debug=True
-
-			$async->debug = !!$_POST['debug'];
-
-			$units = array(
-				'year'  => lang('Year'),
-				'month' => lang('Month'),
-				'day'   => lang('Day'),
-				'dow'   => lang('Day of week<br>(0-6, 0=Sun)'),
-				'hour'  => lang('Hour<br>(0-23)'),
-				'min'   => lang('Minute')
-			);
-
-			if ($_POST['send'] || $_POST['test'] || $_POST['cancel'] || $_POST['install'] || $_POST['deinstall'] || $_POST['update'] || isset($_POST['asyncservice']))
-			{
-				$times = array();
-				foreach($units as $u => $ulabel)
+				if ($_POST[$u] !== '')
 				{
-					if ($_POST[$u] !== '')
-					{
-						$times[$u] = $_POST[$u];
-					}
-				}
-
-				if ($_POST['test'])
-				{
-					if (!$async->set_timer($times,'test','admin.uiasyncservice.test',$GLOBALS['egw_info']['user']['email']))
-					{
-						echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
-					}
-				}
-				if ($_POST['cancel'])
-				{
-					if (!$async->cancel_timer('test'))
-					{
-						echo '<p><b>'.lang("Error canceling timer, maybe there's none set !!!")."</b></p>\n";
-					}
-				}
-				if ($_POST['install'] || $_POST['deinstall'])
-				{
-					if (!($install = $async->install($_POST['install'] ? $times : False)))
-					{
-						echo '<p><b>'.lang('Error: %1 not found or other error !!!',$async->crontab)."</b></p>\n";
-					}
-					$_POST['asyncservice'] = $_POST['deinstall'] ? 'fallback' : 'crontab';
+					$times[$u] = $_POST[$u];
 				}
 			}
-			else
-			{
-				$times = array('min' => '*/5');		// set some default
-			}
-			echo '<form action="'.$GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.uiasyncservice.index')).'" method="POST">'."\n<p>";
-			echo '<div style="text-align: left; margin: 10px;">'."\n";
 
-			$last_run = $async->last_check_run();
-			$lr_date = $last_run['end'] ? $GLOBALS['egw']->common->show_date($last_run['end']) : lang('never');
-			echo '<p><b>'.lang('Async services last executed').'</b>: '.$lr_date.' ('.$last_run['run_by'].")</p>\n<hr>\n";
-
-			if (isset($_POST['asyncservice']) && $_POST['asyncservice'] != $GLOBALS['egw_info']['server']['asyncservice'])
+			if ($_POST['test'])
 			{
-				$config =& CreateObject('phpgwapi.config','phpgwapi');
-				$config->read_repository();
-				$config->value('asyncservice',$GLOBALS['egw_info']['server']['asyncservice']=$_POST['asyncservice']);
-				$config->save_repository();
-				unset($config);
-			}
-			if (!$async->only_fallback)
-			{
-				$installed = $async->installed();
-				if (is_array($installed) && isset($installed['cronline']))
+				if (!$async->set_timer($times,'test','admin.uiasyncservice.test',$GLOBALS['egw_info']['user']['email']))
 				{
-					$async_use['cron'] = lang('crontab only (recomended)');
+					echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
 				}
 			}
-			$async_use['']    = lang('fallback (after each pageview)');
-			$async_use['off'] = lang('disabled (not recomended)');
-			echo '<p><b>'.lang('Run Asynchronous services').'</b>'.
-				' <select name="asyncservice" onChange="this.form.submit();">';
-			foreach ($async_use as $key => $label)
+			if ($_POST['cancel'])
 			{
-				$selected = $key == $GLOBALS['egw_info']['server']['asyncservice'] ? ' selected' : ''; 
-				echo "<option value=\"$key\"$selected>$label</option>\n";
+				if (!$async->cancel_timer('test'))
+				{
+					echo '<p><b>'.lang("Error canceling timer, maybe there's none set !!!")."</b></p>\n";
+				}
 			}
-			echo "</select>\n";
+			if ($_POST['install'] || $_POST['deinstall'])
+			{
+				if (!($install = $async->install($_POST['install'] ? $times : False)))
+				{
+					echo '<p><b>'.lang('Error: %1 not found or other error !!!',$async->crontab)."</b></p>\n";
+				}
+				$_POST['asyncservice'] = $_POST['deinstall'] ? 'fallback' : 'crontab';
+			}
+		}
+		else
+		{
+			$times = array('min' => '*/5');		// set some default
+		}
+		echo '<form action="'.$GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.uiasyncservice.index')).'" method="POST">'."\n<p>";
+		echo '<div style="text-align: left; margin: 10px;">'."\n";
+
+		$last_run = $async->last_check_run();
+		$lr_date = $last_run['end'] ? $GLOBALS['egw']->common->show_date($last_run['end']) : lang('never');
+		echo '<p><b>'.lang('Async services last executed').'</b>: '.$lr_date.' ('.$last_run['run_by'].")</p>\n<hr>\n";
+
+		if (isset($_POST['asyncservice']) && $_POST['asyncservice'] != $GLOBALS['egw_info']['server']['asyncservice'])
+		{
+			$config =& CreateObject('phpgwapi.config','phpgwapi');
+			$config->read_repository();
+			$config->value('asyncservice',$GLOBALS['egw_info']['server']['asyncservice']=$_POST['asyncservice']);
+			$config->save_repository();
+			unset($config);
+		}
+		if (!$async->only_fallback)
+		{
+			$installed = $async->installed();
+			if (is_array($installed) && isset($installed['cronline']))
+			{
+				$async_use['cron'] = lang('crontab only (recomended)');
+			}
+		}
+		$async_use['']    = lang('fallback (after each pageview)');
+		$async_use['off'] = lang('disabled (not recomended)');
+		echo '<p><b>'.lang('Run Asynchronous services').'</b>'.
+			' <select name="asyncservice" onChange="this.form.submit();">';
+		foreach ($async_use as $key => $label)
+		{
+			$selected = $key == $GLOBALS['egw_info']['server']['asyncservice'] ? ' selected' : '';
+			echo "<option value=\"$key\"$selected>$label</option>\n";
+		}
+		echo "</select>\n";
+
+		if (is_array($installed) && isset($installed['cronline']))
+		{
+			echo ' &nbsp; <input type="submit" name="deinstall" value="'.lang('Deinstall crontab')."\">\n";
+		}
+		echo "</p>\n";
+
+		if ($async->only_fallback)
+		{
+			echo '<p>'.lang('Under windows you need to install the asyncservice %1manually%2 or use the fallback mode. Fallback means the jobs get only checked after each page-view !!!','<a href="http://www.egroupware.org/wiki/TimedAsyncServicesWindows" target="_blank">','</a>')."</p>\n";
+		}
+		else
+		{
+			echo '<p>'.lang('Installed crontab').": \n";
 
 			if (is_array($installed) && isset($installed['cronline']))
 			{
-				echo ' &nbsp; <input type="submit" name="deinstall" value="'.lang('Deinstall crontab')."\">\n";
+				echo "$installed[cronline]</p>";
 			}
-			echo "</p>\n";
-
-			if ($async->only_fallback)
+			elseif ($installed === 0)
 			{
-				echo '<p>'.lang('Under windows you need to install the asyncservice %1manually%2 or use the fallback mode. Fallback means the jobs get only checked after each page-view !!!','<a href="http://www.egroupware.org/wiki/TimedAsyncServicesWindows" target="_blank">','</a>')."</p>\n";
+				echo '<b>'.lang('%1 not found or not executable !!!',$async->crontab)."</b></p>\n";
 			}
 			else
 			{
-				echo '<p>'.lang('Installed crontab').": \n";
-
-				if (is_array($installed) && isset($installed['cronline']))
-				{
-					echo "$installed[cronline]</p>";
-				}
-				elseif ($installed === 0)
-				{
-					echo '<b>'.lang('%1 not found or not executable !!!',$async->crontab)."</b></p>\n";
-				}
-				else
-				{
-					echo '<b>'.lang('asyncservices not yet installed or other error (%1) !!!',$installed['error'])."</b></p>\n";
-				}
-				echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n".
-					lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n";
+				echo '<b>'.lang('asyncservices not yet installed or other error (%1) !!!',$installed['error'])."</b></p>\n";
 			}
-
-			echo "<hr><table border=0><tr>\n";
-			foreach ($units as $u => $ulabel)
-			{
-				echo " <td>$ulabel</td><td><input name=\"$u\" value=\"$times[$u]\" size=5> &nbsp; </td>\n";
-			}
-			echo "</tr><tr>\n <td colspan=4>\n";
-			echo ' <input type="submit" name="send" value="'.lang('Calculate next run').'"></td>'."\n";
-			echo ' <td colspan="8"><input type="checkbox" name="debug" value="1"'.($_POST['debug'] ? ' checked' : '')."> \n".
-				lang('Enable debug-messages')."</td>\n</tr></table>\n";
-
-			if ($_POST['send'])
-			{
-				$next = $async->next_run($times,True);
-
-				echo "<p>asyncservice::next_run(";print_r($times);echo")=".($next === False ? 'False':"'$next'=".$GLOBALS['egw']->common->show_date($next))."</p>\n";
-			}
-			echo '<hr><p><input type="submit" name="cancel" value="'.lang('Cancel TestJob!')."\"> &nbsp;\n";
-			echo '<input type="submit" name="test" value="'.lang('Start TestJob!')."\">\n";
-			echo lang('for the times above')."</p>\n";
-			echo '<p>'.lang('The TestJob sends you a mail everytime it is called.')."</p>\n";
-
-			echo '<hr><p><b>'.lang('Jobs').":</b>\n";
-			if ($jobs = $async->read('%'))
-			{
-				echo "<table border=1>\n<tr>\n<th>Id</th><th>".lang('Next run').'</th><th>'.lang('Times').'</th><th>'.lang('Method').'</th><th>'.lang('Data')."</th><th>".lang('LoginID')."</th></tr>\n";
-				foreach($jobs as $job)
-				{
-					echo "<tr>\n<td>$job[id]</td><td>".$GLOBALS['egw']->common->show_date($job['next'])."</td><td>";
-					print_r($job['times']); 
-					echo "</td><td>$job[method]</td><td>"; 
-					print_r($job['data']); 
-					echo "</td><td align=\"center\">".$GLOBALS['egw']->accounts->id2name($job[account_id])."</td></tr>\n"; 
-				}
-				echo "</table>\n";
-			}
-			else
-			{
-				echo lang('No jobs in the database !!!')."</p>\n";
-			}
-			echo '<p><input type="submit" name="update" value="'.lang('Update').'"></p>'."\n";
-			echo "</form>\n";
-			
+			echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n".
+				lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n";
 		}
-		
-		function test($to)
+
+		echo "<hr><table border=0><tr>\n";
+		foreach ($units as $u => $ulabel)
 		{
-			$returncode = $GLOBALS['egw']->send->msg('email',$to,$subject='Asynchronous timed services','Greatings from cron ;-)');
-
-			if (!$returncode)	// not nice, but better than failing silently
-			{
-				echo "<p>bocalendar::send_update: sending message to '$to' subject='$subject' failed !!!<br>\n"; 
-				echo $GLOBALS['egw']->send->err['desc']."</p>\n";
-			}
-			//print_r($GLOBALS['egw_info']['user']);
+			echo " <td>$ulabel</td><td><input name=\"$u\" value=\"$times[$u]\" size=5> &nbsp; </td>\n";
 		}
+		echo "</tr><tr>\n <td colspan=4>\n";
+		echo ' <input type="submit" name="send" value="'.lang('Calculate next run').'"></td>'."\n";
+		echo ' <td colspan="8"><input type="checkbox" name="debug" value="1"'.($_POST['debug'] ? ' checked' : '')."> \n".
+			lang('Enable debug-messages')."</td>\n</tr></table>\n";
+
+		if ($_POST['send'])
+		{
+			$next = $async->next_run($times,True);
+
+			echo "<p>asyncservice::next_run(";print_r($times);echo")=".($next === False ? 'False':"'$next'=".$GLOBALS['egw']->common->show_date($next))."</p>\n";
+		}
+		echo '<hr><p><input type="submit" name="cancel" value="'.lang('Cancel TestJob!')."\"> &nbsp;\n";
+		echo '<input type="submit" name="test" value="'.lang('Start TestJob!')."\">\n";
+		echo lang('for the times above')."</p>\n";
+		echo '<p>'.lang('The TestJob sends you a mail everytime it is called.')."</p>\n";
+
+		echo '<hr><p><b>'.lang('Jobs').":</b>\n";
+		if ($jobs = $async->read('%'))
+		{
+			echo "<table border=1>\n<tr>\n<th>Id</th><th>".lang('Next run').'</th><th>'.lang('Times').'</th><th>'.lang('Method').'</th><th>'.lang('Data')."</th><th>".lang('LoginID')."</th></tr>\n";
+			foreach($jobs as $job)
+			{
+				echo "<tr>\n<td>$job[id]</td><td>".$GLOBALS['egw']->common->show_date($job['next'])."</td><td>";
+				print_r($job['times']);
+				echo "</td><td>$job[method]</td><td>";
+				print_r($job['data']);
+				echo "</td><td align=\"center\">".$GLOBALS['egw']->accounts->id2name($job[account_id])."</td></tr>\n";
+			}
+			echo "</table>\n";
+		}
+		else
+		{
+			echo lang('No jobs in the database !!!')."</p>\n";
+		}
+		echo '<p><input type="submit" name="update" value="'.lang('Update').'"></p>'."\n";
+		echo "</form>\n";
+
 	}
+
+	function test($to)
+	{
+		$returncode = $GLOBALS['egw']->send->msg('email',$to,$subject='Asynchronous timed services','Greetings from cron ;-)');
+
+		if (!$returncode)	// not nice, but better than failing silently
+		{
+			echo "<p>bocalendar::send_update: sending message to '$to' subject='$subject' failed !!!<br>\n";
+			echo $GLOBALS['egw']->send->err['desc']."</p>\n";
+		}
+		//print_r($GLOBALS['egw_info']['user']);
+	}
+}

From b71a2209d28a55ba52a6fcbd799974eeab12578c Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Fri, 3 Apr 2009 07:29:30 +0000
Subject: [PATCH 155/510] Added some German Translation

---
 addressbook/setup/egw_de.lang | 15 ++++++++++++++-
 addressbook/setup/egw_en.lang | 18 ++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/addressbook/setup/egw_de.lang b/addressbook/setup/egw_de.lang
index 79db39787c..44ef4d85f3 100644
--- a/addressbook/setup/egw_de.lang
+++ b/addressbook/setup/egw_de.lang
@@ -35,6 +35,7 @@ address line 2	addressbook	de	Adresszeile 2
 address type	addressbook	de	Adresstyp
 addressbook	common	de	Adressbuch
 addressbook csv export	addressbook	de	Adressbuch CSV Export
+addressbook field	addressbook	de	Adressbuch Feld
 addressbook menu	addressbook	de	Adressbuch Menü
 addressbook preferences	addressbook	de	Adressbuch Einstellungen
 addressbook the contact should be saved to	addressbook	de	Adressbuch in das der Kontakt gespeichert werden soll
@@ -113,6 +114,7 @@ country	common	de	Land
 create new links	addressbook	de	Neue Verknüpfung erstellen
 created	addressbook	de	Angelegt
 credit	addressbook	de	Darlehen
+csv field	addressbook	de	CSV Feld
 csv-fieldname	addressbook	de	CSV-Feldname
 csv-filename	addressbook	de	CSV-Dateiname
 custom	addressbook	de	Benutzerdefiniert
@@ -140,6 +142,7 @@ display contact	addressbook	de	Kontakte Anzeigen
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	de	Zeigt auf der Startseite eine Geburtstags Erinnerung an. Die Startseite ist die Seite die Sie sehen, wenn Sie eGroupWare betreten oder auf das Startseiten Icon (Haus) klicken.
 distribution list deleted	addressbook	de	Verteiler gelöscht
 distribution lists	addressbook	de	Verteilerlisten
+distribution lists, ...	addressbook	de	Verteilerlisten,..
 do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	de	Wollen Sie ein privates Adressbuch, dass nicht von Benutzern einsehbar ist, denen Sie Zugriff auf Ihr persönliches Adressbuch gegeben haben?
 do your really want to delete this contact?	addressbook	de	Wollen sie diesen Kontakt wirklich löschen?
 document '%1' does not exist or is not readable for you!	addressbook	de	Dokument '%1' existiert nicht oder ist für Sie nicht lesbar!
@@ -164,7 +167,7 @@ enter the path to the exported file here	addressbook	de	Bitte geben Sie den Pfad
 error deleting the contact !!!	addressbook	de	Fehler beim Löschen des Kontakts !!!
 error saving the contact !!!	addressbook	de	Fehler beim Speichern des Kontakts !!!
 error: the entry has been updated since you opened it for editing!	addressbook	de	Fehler: der Eintrag wurde geändert, seit Sie ihn zum Bearbeiten geöffnet haben!
-example $$if n_prefix~mr~hello mr.~hello ms.$$ - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	de	Beispiel: "$$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$" - suche in dem Feld "n_prefix" nach "Herr", wenn gefunden, schreibe "Sehr geehrter", wenn nicht gefunden schreibe "Sehr geehrte"
+example $$if n_prefix~mr~hello mr.~hello ms.$$ - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	de	Beispiel: "$$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$" - suche in dem Feld "n_prefix" nach "Herr", wenn gefunden, schreibe "Sehr geehrter", wenn nicht gefunden schreibe "Sehr geehrte". Es ist auch möglich anstatt fixer Werte, den Wert eines andren Feldes zu übernehmen. Beispiel(Land wird nur dann angezeit, denn es nicht DEUTSCHLAND ist: $$IFadr_one_countryname~DEUTSCHLAND~~adr_one_countryname$$
 existing links	addressbook	de	Bestehende Verknüpfungen
 export	addressbook	de	Export
 export as csv	addressbook	de	Exportieren als CSV
@@ -176,6 +179,7 @@ export selection	addressbook	de	Auswahl exportieren
 exported	addressbook	de	exportiert
 exports contacts from your addressbook into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	de	Exportiert Kontakte vom Adressbuch in eine CSV Datei. CSV bedeutet 'Komma getrennte Werte'. Im Optionen Reiter können Sie aber auch ein anderes Trennzeichen wählen.
 extra	addressbook	de	Extra
+extra private	addressbook	de	EXtra Privat
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	de	%1 Mitglied(er) der Organisation nicht geändert (fehlende Rechte) !!!
 fax	addressbook	de	Telefax
 fax number	common	de	Telefaxnummer
@@ -186,6 +190,7 @@ fields for the csv export	addressbook	de	Felder für den CSV Export
 fields the user is allowed to edit himself	admin	de	Felder die der Benutzer selbst bearbeiten darf
 fields to show in address list	addressbook	de	Felder, die in der Adressliste angezeigt werden sollen
 fieldseparator	addressbook	de	Feldtrenner
+fieldseperator	addressbook	de	Feldtrenner
 for more then one contact in a document use the tag pagerepeat!	addressbook	de	Um mehr als eine Adresse in ein Dokument einzufügen, benutzen Sie das pagerepeat Tag in Ihrer Vorlage. Damit Können Sie Serienbriefe erstellen
 for read only ldap	admin	de	für nur lesendes LDAP
 for serial letter use this tag. put the content, you want to repeat between two tags.	addressbook	de	Wenn Sie Serienbriefe erzeugen wollen, dann benutzen Sie dieses Tag. Setzen Sie den Inhalt, der wiederholt werden soll (Anschriftstags und Briefinhalt) zwischen zwei pagerepeat Tags.
@@ -215,6 +220,7 @@ icon	addressbook	de	Icon
 if accounts are already in ldap	admin	de	wenn die Benutzer bereits im LDAP sind
 if you specify a directory (full vfs path) here, addressbook displays an action for each document. that action allows to download the specified document with the contact data inserted.	addressbook	de	Wenn Sie hier ein Verzeichnis (kompletter VFS Pfad) angeben, zeigt das Adressbuch einen Befehl für jedes Dokument darin. Diese Befehle erlauben das angegebene Dokument mit Kontaktdaten eingefügt herunterzuladen.
 if you specify a document (full vfs path) here, addressbook displays an extra document icon for each address. that icon allows to download the specified document with the contact data inserted.	addressbook	de	Wenn Sie hier ein Dokument (kompletter VFS Pfad) angeben, zeigt das Adressbuch ein zusätzliches Dokumenten Icon. Diese Icon erlaubt das Dokument mit Kontaktdaten eingefügt herunterzuladen.
+ignore first line	addressbook	de	Erste Zeile ignorieren
 import	addressbook	de	Import
 import contacts	addressbook	de	Kontakte importieren
 import csv-file into addressbook	addressbook	de	Import CSV-Datei ins Adressbuch
@@ -228,9 +234,11 @@ import_instructions	addressbook	de	In Netscape, öffnen Sie das Adressbuch und w
 imports contacts into your addressbook from a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	de	Importiert Kontakte aus einer CSV Datei in Ihr Adressbuch. CSV bedeutet Komma getrennte Werte. Sie können in dem Reiter Einstellungen auch ein anderes Trennzeichen wählen.
 in %1 days (%2) is %3's birthday.	addressbook	de	In %1 Tagen (%2) ist der Geburtstag von %3.
 income	addressbook	de	Einkommen
+infolog	addressbook	de	InfoLog
 insert in document	addressbook	de	Einfügen in Dokument
 insufficent rights to delete this list!	addressbook	de	Keine Rechte diese Liste zu löschen!
 international	addressbook	de	International
+internet	addressbook	de	Internet
 label	addressbook	de	Adressetikett
 last date	addressbook	de	Letzter Termin
 last modified	addressbook	de	Letzte Änderung
@@ -301,6 +309,7 @@ preferred email address to use in distribution lists	addressbook	de	Bevorzugte E
 preferred phone	addressbook	de	präferierte Telefonnummer
 preferred type of email address to add for distribution lists	addressbook	de	bevorzugter Typ der E-Mailadresse für Verteilerlisten
 prefix	addressbook	de	Anrede
+private custom fields	addressbook	de	Private Benutzerdefinierte Felder
 public key	addressbook	de	öffentlicher Schlüssel
 publish into groups:	addressbook	de	In folgende Gruppen veröffentlichen:
 read a list / search for entries.	addressbook	de	Lese die Liste / Suche nach Einträgen
@@ -309,6 +318,7 @@ read a single entry by passing the id and fieldlist.	addressbook	de	Liest einen
 read only	addressbook	de	nur lesend
 record access	addressbook	de	Zugriffsrechte
 record owner	addressbook	de	Datensatzeigentümer
+region	addressbook	de	Region
 remove selected contacts from distribution list	addressbook	de	Ausgewählte Kontakte vom Verteiler löschen
 removed from distribution list	addressbook	de	vom Verteiler gelöscht
 repetition	addressbook	de	Wiederholung
@@ -322,6 +332,7 @@ select a view	addressbook	de	Eine Ansicht auswählen
 select addressbook type	addressbook	de	Typ des Adressbuchs auswählen
 select all	addressbook	de	Alles auswählen
 select an action or addressbook to move to	addressbook	de	Befehl oder Adressbuch zum Verschieben auswählen
+select an action or addressbook to move to...	addressbook	de	Befehl oder Adressbuch zum Verschieben auswählen...
 select migration type	admin	de	Migrationstyp auswählen
 select multiple contacts for a further action	addressbook	de	Mehrere Adressen für weiteren Befehl auswählen
 select phone number as prefered way of contact	addressbook	de	Telefonnummer als präferierten Kontaktweg auswählen
@@ -329,12 +340,14 @@ select the type of conversion	addressbook	de	Typ der Umwandlung auswählen
 select the type of conversion:	addressbook	de	Typ der Umwandlung auswählen:
 select where you want to store / retrieve contacts	admin	de	Auswählen wo Sie Adressen speichern wollen
 selected contacts	addressbook	de	ausgewählte Kontakte
+seperator	addressbook	de	Feldtrenner
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	de	Sollen die Spalten Foto und Privatadresse immer angezeigt werden, auch wenn sie leer sind.
 show	addressbook	de	Anzeigen
 show birthday reminders on main screen	addressbook	de	Geburtstagserinnerungen auf der Startseite anzeigen
 show infolog entries for this organisation	addressbook	de	InfoLog Einträge dieser Organisation anzeigen
 show the contacts of this organisation	addressbook	de	Kontakte dieser Organisation anzeigen
 size of popup (wxh, eg.400x300, if a popup should be used)	admin	de	Größe des Popup (WxH, zB. 400x300, falls ein Popup verwendet werden soll)
+stadt	addressbook	de	Stadt
 start	admin	de	Starten
 startrecord	addressbook	de	Startdatensatz
 state	common	de	Bundesland
diff --git a/addressbook/setup/egw_en.lang b/addressbook/setup/egw_en.lang
index 5b4ec0c6c2..d151097153 100644
--- a/addressbook/setup/egw_en.lang
+++ b/addressbook/setup/egw_en.lang
@@ -8,7 +8,7 @@
 %s please calculate the result	addressbook	en	%s please calculate the result
 (e.g. 1969)	addressbook	en	(e.g. 1969)
 (empty = use global limit, no = no export at all)	admin	en	(empty = use global limit, no = no export at all)
-<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	en	<b>No conversion type &lt;none&gt; could be located.</b>  Please choose a conversion type from the list
+<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	en	<b>No conversion type <none> could be located.</b>  Please choose a conversion type from the list
 @-eval() is only availible to admins!!!	addressbook	en	@-eval() is only availible to admins!!!
 account repository	admin	en	Account repository
 accounts	addressbook	en	Accounts
@@ -35,6 +35,7 @@ address line 2	addressbook	en	Address Line 2
 address type	addressbook	en	Address Type
 addressbook	common	en	Addressbook
 addressbook csv export	addressbook	en	Addressbook CSV export
+addressbook field	addressbook	en	Addressbook Field
 addressbook menu	addressbook	en	Addressbook menu
 addressbook preferences	addressbook	en	Addressbook preferences
 addressbook the contact should be saved to	addressbook	en	Addressbook the contact should be saved to
@@ -113,6 +114,7 @@ country	common	en	Country
 create new links	addressbook	en	Create new links
 created	addressbook	en	Created
 credit	addressbook	en	Credit
+csv field	addressbook	en	CSV Field
 csv-fieldname	addressbook	en	CSV-Fieldname
 csv-filename	addressbook	en	CSV-Filename
 custom	addressbook	en	Custom
@@ -140,6 +142,7 @@ display contact	addressbook	en	Display Contact
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	en	Displays a remider for birthdays on the startpage (page you get when you enter eGroupWare or click on the homepage icon).
 distribution list deleted	addressbook	en	Distribution list deleted
 distribution lists	addressbook	en	Distribution lists
+distribution lists, ...	addressbook	en	Distribution lists, ...
 do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	en	Do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?
 do your really want to delete this contact?	addressbook	en	Do your really want to delete this contact?
 document '%1' does not exist or is not readable for you!	addressbook	en	Document '%1' does not exist or is not readable for you!
@@ -159,12 +162,13 @@ email & internet	addressbook	en	Email & Internet
 email addresses (comma separated) to send the contact data	addressbook	en	Email addresses (comma separated) to send the contact data
 empty for all	addressbook	en	empty for all
 enable an extra private addressbook	addressbook	en	Enable an extra private addressbook
+enclosure	addressbook	en	Enclosure
 end	addressbook	en	End
 enter the path to the exported file here	addressbook	en	Enter the path to the exported file here
 error deleting the contact !!!	addressbook	en	Error deleting the contact !!!
 error saving the contact !!!	addressbook	en	Error saving the contact !!!
 error: the entry has been updated since you opened it for editing!	addressbook	en	Error: the entry has been updated since you opened it for editing!
-example $$if n_prefix~mr~hello mr.~hello ms.$$ - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	en	Example $$IF n_prefix~Mr~Hello Mr.~Hello Ms.$$ - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.
+example $$if n_prefix~mr~hello mr.~hello ms.$$ - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	en	Example $$IF n_prefix~Mr~Hello Mr.~Hello Ms.$$ - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms. You can also use a fieldname instead a fix value. Example: $$IFadr_one_countryname~DEUTSCHLAND~~adr_one_countryname$$
 existing links	addressbook	en	Existing links
 export	addressbook	en	export
 export as csv	addressbook	en	Export as CSV
@@ -176,6 +180,7 @@ export selection	addressbook	en	Export selection
 exported	addressbook	en	exported
 exports contacts from your addressbook into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	en	Exports contacts from your Addressbook into a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.
 extra	addressbook	en	Extra
+extra private	addressbook	en	Extra private
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	en	failed to change %1 organisation member(s) (insufficent rights) !!!
 fax	addressbook	en	Fax
 fax number	common	en	Fax Number
@@ -186,6 +191,7 @@ fields for the csv export	addressbook	en	Fields for the CSV export
 fields the user is allowed to edit himself	admin	en	Fields the user is allowed to edit himself
 fields to show in address list	addressbook	en	Fields to show in address list
 fieldseparator	addressbook	en	Fieldseparator
+fieldseperator	addressbook	en	Fieldseperator
 for more then one contact in a document use the tag pagerepeat!	addressbook	en	for more then one contact in a document use the tag pagerepeat!
 for read only ldap	admin	en	for read only LDAP
 for serial letter use this tag. put the content, you want to repeat between two tags.	addressbook	en	For serial letter use this tag. Put the content, you want to repeat between two Tags.
@@ -215,6 +221,7 @@ icon	addressbook	en	Icon
 if accounts are already in ldap	admin	en	if accounts are already in LDAP
 if you specify a directory (full vfs path) here, addressbook displays an action for each document. that action allows to download the specified document with the contact data inserted.	addressbook	en	If you specify a directory (full vfs path) here, addressbook displays an action for each document. That action allows to download the specified document with the contact data inserted.
 if you specify a document (full vfs path) here, addressbook displays an extra document icon for each address. that icon allows to download the specified document with the contact data inserted.	addressbook	en	If you specify a document (full vfs path) here, addressbook displays an extra document icon for each address. That icon allows to download the specified document with the contact data inserted.
+ignore first line	addressbook	en	Ignore first line
 import	addressbook	en	Import
 import contacts	addressbook	en	Import Contacts
 import csv-file into addressbook	addressbook	en	Import CSV-File into Addressbook
@@ -228,9 +235,11 @@ import_instructions	addressbook	en	In Netscape, open the Addressbook and select
 imports contacts into your addressbook from a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	en	Imports contacts into your Addressbook from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.
 in %1 days (%2) is %3's birthday.	addressbook	en	In %1 days (%2) is %3's birthday.
 income	addressbook	en	Income
+infolog	addressbook	en	InfoLog
 insert in document	addressbook	en	Insert in document
 insufficent rights to delete this list!	addressbook	en	Insufficent rights to delete this list!
 international	addressbook	en	International
+internet	addressbook	en	Internet
 label	addressbook	en	Label
 last date	addressbook	en	Last date
 last modified	addressbook	en	last modified
@@ -301,6 +310,7 @@ preferred email address to use in distribution lists	addressbook	en	Preferred em
 preferred phone	addressbook	en	preferred phone
 preferred type of email address to add for distribution lists	addressbook	en	preferred type of email address to add for distribution lists
 prefix	addressbook	en	Prefix
+private custom fields	addressbook	en	Private custom fields
 public key	addressbook	en	Public Key
 publish into groups:	addressbook	en	Publish into groups:
 read a list / search for entries.	addressbook	en	Read a list / search for entries.
@@ -309,6 +319,7 @@ read a single entry by passing the id and fieldlist.	addressbook	en	Read a singl
 read only	addressbook	en	read only
 record access	addressbook	en	Record Access
 record owner	addressbook	en	Record owner
+region	addressbook	en	Region
 remove selected contacts from distribution list	addressbook	en	Remove selected contacts from distribution list
 removed from distribution list	addressbook	en	removed from distribution list
 repetition	addressbook	en	Repetition
@@ -322,6 +333,7 @@ select a view	addressbook	en	Select a view
 select addressbook type	addressbook	en	Select addressbook type
 select all	addressbook	en	Select all
 select an action or addressbook to move to	addressbook	en	Select an action or addressbook to move to
+select an action or addressbook to move to...	addressbook	en	Select an action or addressbook to move to...
 select migration type	admin	en	Select migration type
 select multiple contacts for a further action	addressbook	en	Select multiple contacts for a further action
 select phone number as prefered way of contact	addressbook	en	select phone number as prefered way of contact
@@ -329,12 +341,14 @@ select the type of conversion	addressbook	en	Select the type of conversion
 select the type of conversion:	addressbook	en	Select the type of conversion:
 select where you want to store / retrieve contacts	admin	en	Select where you want to store / retrieve contacts
 selected contacts	addressbook	en	selected contacts
+seperator	addressbook	en	Seperator
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	en	Should the columns photo and home address always be displayed, even if they are empty.
 show	addressbook	en	Show
 show birthday reminders on main screen	addressbook	en	Show birthday reminders on main screen
 show infolog entries for this organisation	addressbook	en	Show InfoLog entries for this organisation
 show the contacts of this organisation	addressbook	en	Show the contacts of this organisation
 size of popup (wxh, eg.400x300, if a popup should be used)	admin	en	Size of popup (WxH, eg.400x300, if a popup should be used)
+stadt	addressbook	en	Stadt
 start	admin	en	Start
 startrecord	addressbook	en	Startrecord
 state	common	en	State

From 677a7b0be0b7b8f2404374a2c44eda274074abec Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 3 Apr 2009 12:13:28 +0000
Subject: [PATCH 156/510] "fix for \"bug\" #1954: greatings should be greetings
 and a new file-header"

---
 addressbook/setup/egw_de.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addressbook/setup/egw_de.lang b/addressbook/setup/egw_de.lang
index 44ef4d85f3..c6b5a16323 100644
--- a/addressbook/setup/egw_de.lang
+++ b/addressbook/setup/egw_de.lang
@@ -142,7 +142,7 @@ display contact	addressbook	de	Kontakte Anzeigen
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	de	Zeigt auf der Startseite eine Geburtstags Erinnerung an. Die Startseite ist die Seite die Sie sehen, wenn Sie eGroupWare betreten oder auf das Startseiten Icon (Haus) klicken.
 distribution list deleted	addressbook	de	Verteiler gelöscht
 distribution lists	addressbook	de	Verteilerlisten
-distribution lists, ...	addressbook	de	Verteilerlisten,..
+distribution lists, ...	addressbook	de	Verteilerlisten, ...
 do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	de	Wollen Sie ein privates Adressbuch, dass nicht von Benutzern einsehbar ist, denen Sie Zugriff auf Ihr persönliches Adressbuch gegeben haben?
 do your really want to delete this contact?	addressbook	de	Wollen sie diesen Kontakt wirklich löschen?
 document '%1' does not exist or is not readable for you!	addressbook	de	Dokument '%1' existiert nicht oder ist für Sie nicht lesbar!

From 646931dc8ad3046606d529bf86f7509c968b8720 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 3 Apr 2009 12:26:32 +0000
Subject: [PATCH 157/510] fix for bug #1838: problem with utf-8 data in all csv
 imports - fgetcsv only works correct, if setlocal is called with an existing
 and   correct local - improved projectmanager method guess_local and moved it
 to   common::setlocal, which takes now the charset, lang and country of the  
 user into account - csv-import also displays now the conversation done and
 reads usernames   in brackets - added some missing fields

---
 addressbook/csv_import.php        | 24 ++++++++----
 calendar/csv_import.php           | 63 ++++++++++++++++++-------------
 infolog/csv_import.php            | 32 +++++++++++-----
 phpgwapi/inc/class.common.inc.php | 41 ++++++++++++++++++++
 4 files changed, 118 insertions(+), 42 deletions(-)

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index f3f237406d..066f4200f1 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package addressbook
- * @copyright (c) 2003-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -34,6 +34,11 @@ if ($_POST['cancel'])
 	@unlink($csvfile);
 	$GLOBALS['egw']->redirect_link('/addressbook/index.php');
 }
+if (isset($_POST['charset']))
+{
+	// we have to set the local, to fix eg. utf-8 imports, as fgetcsv requires it!
+	common::setlocale(LC_CTYPE,$_POST['charset']);
+}
 $GLOBALS['egw_info']['flags']['app_header'] = lang('Import CSV-File into Addressbook');
 $GLOBALS['egw']->common->egw_header();
 
@@ -266,7 +271,7 @@ switch($_POST['action'])
 		$GLOBALS['egw']->preferences->add('addressbook','cvs_import',$defaults);
 		$GLOBALS['egw']->preferences->save_repository(True);
 
-		$log = "<table border=1>\n\t<tr><td>#</td>\n";
+		$log = '<table border="1" style="border: 1px dotted black; border-collapse: collapse;">'."\n\t<tr><td>#</td>\n";
 
 		foreach($addr_fields as $csv_idx => $addr)
 		{	// convert $_POST['trans'][$csv_idx] into array of pattern => value
@@ -315,7 +320,7 @@ switch($_POST['action'])
 
 			$log .= "\t</tr><tr><td>".($start+$anz)."</td>\n";
 
-			$values = array();
+			$values = $orig = array();
 			foreach($addr_fields as $csv_idx => $addr)
 			{
 				//echo "<p>$csv: $addr".($_POST['trans'][$csv] ? ': '.$_POST['trans'][$csv] : '')."</p>";
@@ -360,9 +365,7 @@ switch($_POST['action'])
 						}
 					}
 				}
-				$values[$addr] = $val;
-
-				$log .= "\t\t<td>$val</td>\n";
+				$values[$addr] = $orig[$addr] = $val;
 			}
 			$empty = !count($values);
 			// convert the category name to an id
@@ -387,7 +390,8 @@ switch($_POST['action'])
 			{
 				if (isset($values[$user]) && !is_numeric($user))
 				{
-					$values[$user] = $GLOBALS['egw']->accounts->name2id($values[$user]);
+					if (preg_match('/\[([^\]]+)\]/',$values[$user],$matches)) $values[$user] = $matches[1];
+					$values[$user] = $GLOBALS['egw']->accounts->name2id($values[$user],'account_lid',$user=='owner'?null:'u');
 				}
 			}
 			if (!in_array('owner',$addr_fields) || !$values['owner'])
@@ -415,6 +419,12 @@ switch($_POST['action'])
 				$rvalue=$GLOBALS['egw']->contacts->save($values);
 				//echo "<p>adding: ".print_r($values,true)."</p>\n";
 			}
+			// display read and interpreted results, so the user can check it
+			foreach($addr_fields as $name)
+			{
+				$log .= "\t\t<td>".($orig[$name] != $values[$name] ? htmlspecialchars($orig[$name]).' --> ' : '').
+					htmlspecialchars($values[$name])."</td>\n";
+			}
 		}
 		$log .= "\t</tr>\n</table>\n";
 
diff --git a/calendar/csv_import.php b/calendar/csv_import.php
index d3f435cf3d..f79a560323 100644
--- a/calendar/csv_import.php
+++ b/calendar/csv_import.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package calendar
- * @copyright (c) 2003-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -32,7 +32,12 @@ else
 if ($_POST['cancel'])
 {
 	@unlink($csvfile);
-	$GLOBALS['egw']->redirect_link('/admin/index.php');
+	$GLOBALS['egw']->redirect_link('/calendar/index.php');
+}
+if (isset($_POST['charset']))
+{
+	// we have to set the local, to fix eg. utf-8 imports, as fgetcsv requires it!
+	common::setlocale(LC_CTYPE,$_POST['charset']);
 }
 $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File');
 $cal = new calendar_boupdate(true);
@@ -171,6 +176,7 @@ case 'download':
 		'public'	=> 'Access: 1=public, 0=private',
 		'owner'		=> 'Owner: int(11) user-id/-name',
 		'modified'	=> 'Modification date',
+		'modifier'	=> 'Modification user',
 		'non_blocking' => '0=Event blocks time, 1=Event creates no conflicts',
 		'uid'       => 'Unique Id, allows multiple import to update identical entries',
 //		'recur_type'=> 'Type of recuring event',
@@ -325,16 +331,15 @@ case 'import':
 				$replaces .= ($replaces != '' ? $PSep : '') . $pattern . $ASep . $replace;
 			}
 			$trans[$csv_idx] = $values;
-		} /*else
-			unset( $trans[$csv_idx] );*/
-
+		}
 		$log .= "\t\t<td><b>$info</b></td>\n";
 	}
 	if (!in_array('public',$cal_fields))	// autocreate public access if not set by user
 	{
 		$log .= "\t\t<td><b>isPublic</b></td>\n";
+		$cal_fields[] = 'public';
 	}
-/*		if (!in_array('recur_type',$cal_fields))	// autocreate single event if not set by user
+/*	if (!in_array('recur_type',$cal_fields))	// autocreate single event if not set by user
 	{
 		$log .= "\t\t<td><b>recureing</b></td>\n";
 	}*/
@@ -358,7 +363,7 @@ case 'import':
 
 		$log .= "\t<tr>\n\t\t<td>".($start+$anz)."</td>\n";
 
-		$values = array();
+		$values = $orig = array();
 		foreach($cal_fields as $csv_idx => $info)
 		{
 			//echo "<p>$csv: $info".($trans[$csv] ? ': '.$trans[$csv] : '')."</p>";
@@ -392,27 +397,24 @@ case 'import':
 					}
 				}
 			}
-			$values[$info] = $val;
-
-			$log .= "\t\t<td>$val</td>\n";
+			$values[$info] = $orig[$info] = $val;
 		}
-		if (!in_array('public',$cal_fields))
+		if (!isset($values['public']))
 		{
 			$values['public'] = 1;	// public access if not set by user
-			$log .= "\t\t<td>".$values['public']."</td>\n";
 		}
-		if (!in_array('recur_type',$cal_fields))
+		if (!isset($values['recur_type']))
 		{
 			$values['recur_type'] = MCAL_RECUR_NONE;	// single event if not set by user
-//				$log .= "\t\t<td>".$values['recure_type']."</td>\n";
 		}
 
-		if(!$_POST['debug'] && count($values))	// dont import empty contacts
+		if(count($values))	// dont import empty contacts
 		{
 			//echo "values=<pre>".print_r($values,True)."</pre>\n";
-			if (!is_numeric($values['owner']))
+			foreach(array('owner','modifier') as $name)
 			{
-				$values['owner'] = $GLOBALS['egw']->accounts->name2id($values['owner']);
+				if (preg_match('/\[([^\]]+)\]/',$values[$name],$matches)) $values[$name] = $matches[1];
+				if (!is_numeric($values[$name])) $values[$name] = $GLOBALS['egw']->accounts->name2id($values[$name],'account_lid','u');
 			}
 			if (!$values['owner'] || !$GLOBALS['egw']->accounts->exists($values['owner']))
 			{
@@ -452,8 +454,9 @@ case 'import':
 				list($part,$status) = explode('=',$part_status);
 				$valid_status = array('U'=>'U','u'=>'U','A'=>'A','a'=>'A','R'=>'R','r'=>'R','T'=>'T','t'=>'T');
 				$status = isset($valid_status[$status]) ? $valid_status[$status] : 'U';
-				if ($GLOBALS['egw']->accounts->exists($part))
+				if (!is_numeric($part))
 				{
+					if (preg_match('/\[([^\]]+)\]/',$part,$matches)) $part = $matches[1];
 					$part = $GLOBALS['egw']->accounts->name2id($part);
 				}
 				if ($part && is_numeric($part))
@@ -484,9 +487,8 @@ case 'import':
 			}
 			$action = $values['id'] ? 'updating' : 'adding';
 			//echo $action.'<pre>'.print_r($values,True)."</pre>\n";
-			$cal_id = $cal->update($values,true,!$values['modified'],$is_admin);	// ignoring conflicts and ACL (for admins) on import
-
-			if ($cal_id)
+			if (!$_POST['debug'] &&
+				($cal_id = $cal->update($values,true,!$values['modified'],$is_admin)))	// ignoring conflicts and ACL (for admins) on import
 			{
 				foreach(array(
 					'addressbook:'.$values['addr_id'],
@@ -501,11 +503,20 @@ case 'import':
 					}
 				}
 			}
-			$log .= "\t\t".'<td align="center">'.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."</td>\n\t</tr>\n";
-		}
-		else
-		{
-			$log .= "\t\t".'<td align="center">only test</td>'."\n\t</tr>\n";
+			// display read and interpreted results, so the user can check it
+			foreach($cal_fields as $name)
+			{
+				$log .= "\t\t<td>".($orig[$name] != $values[$name] ? htmlspecialchars($orig[$name]).' --> ' : '').
+					htmlspecialchars($values[$name])."</td>\n";
+			}
+			if(!$_POST['debug'] && count($values))	// dont import empty contacts
+			{
+				$log .= "\t\t".'<td align="center">'.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."</td>\n\t</tr>\n";
+			}
+			else
+			{
+				$log .= "\t\t".'<td align="center">only test</td>'."\n\t</tr>\n";
+			}
 		}
 	}
 	$log .= "</table>\n";
diff --git a/infolog/csv_import.php b/infolog/csv_import.php
index 92617a3d31..30110ac94d 100644
--- a/infolog/csv_import.php
+++ b/infolog/csv_import.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package infolog
- * @copyright (c) 2003-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -36,7 +36,12 @@ else
 if ($_POST['cancel'])
 {
 	@unlink($csvfile);
-	$GLOBALS['egw']->redirect_link('/admin/index.php');
+	$GLOBALS['egw']->redirect_link('/infolog/index.php');
+}
+if (isset($_POST['charset']))
+{
+	// we have to set the local, to fix eg. utf-8 imports, as fgetcsv requires it!
+	common::setlocale(LC_CTYPE,$_POST['charset']);
 }
 $GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog - Import CSV-File');
 $GLOBALS['egw']->common->egw_header();
@@ -365,7 +370,7 @@ case 'import':
 	$GLOBALS['egw']->preferences->add('infolog','cvs_import',$defaults);
 	$GLOBALS['egw']->preferences->save_repository(True);
 
-	$log = "<table border=1>\n\t<tr><td>#</td>\n";
+	$log = '<table border="1" style="border: 1px dotted black; border-collapse: collapse;">'."\n\t<tr><td>#</td>\n";
 
 	foreach($info_fields as $csv_idx => $info)
 	{	// convert $trans[$csv_idx] into array of pattern => value
@@ -412,7 +417,7 @@ case 'import':
 
 		$log .= "\t</tr><tr><td>".($start+$anz)."</td>\n";
 
-		$values = array();
+		$values = $orig = array();
 		foreach($info_fields as $csv_idx => $info)
 		{
 			//echo "<p>$csv: $info".($trans[$csv] ? ': '.$trans[$csv] : '')."</p>";
@@ -446,9 +451,7 @@ case 'import':
 					}
 				}
 			}
-			$values[$info] = $val;
-
-			$log .= "\t\t<td>$val</td>\n";
+			$values[$info] = $orig[$info] = $val;
 		}
 		$empty = !count($values);
 
@@ -470,9 +473,13 @@ case 'import':
 		if (!isset($values['datemodified'])) $values['datemodified'] = $values['startdate'];
 
 		// convert user-names to user-id's
-		if (isset($values['owner']) && !is_numeric($values['owner']))
+		foreach(array('owner','modifier') as $user)
 		{
-			$values['owner'] = $GLOBALS['egw']->accounts->name2id($values['owner']);
+			if (isset($values[$user]) && !is_numeric($values[$user]))
+			{
+				if (preg_match('/\[([^\]]+)\]/',$values[$user],$matches)) $values[$user] = $matches[1];
+				$values[$user] = $GLOBALS['egw']->accounts->name2id($values[$user],'account_lid',$user=='owner'?null:'u');
+			}
 		}
 		if (isset($values['responsible']))
 		{
@@ -480,6 +487,7 @@ case 'import':
 			$values['responsible'] = array();
 			foreach(split('[,;]',$responsible) as $user)
 			{
+				if (preg_match('/\[([^\]]+)\]/',$user,$matches)) $user = $matches[1];
 				if ($user && !is_numeric($user)) $user = $GLOBALS['egw']->accounts->name2id($user);
 				if ($user) $values['responsible'][] = $user;
 			}
@@ -533,6 +541,12 @@ case 'import':
 				}
 			}
 		}
+		// display read and interpreted results, so the user can check it
+		foreach($info_fields as $name)
+		{
+			$log .= "\t\t<td>".($orig[$name] != $values[$name] ? htmlspecialchars($orig[$name]).' --> ' : '').
+				htmlspecialchars($values[$name])."</td>\n";
+		}
 	}
 	$log .= "\t</tr>\n</table>\n";
 
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 122150857d..a4347d74ba 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -24,6 +24,47 @@ class common
 	static $debug_info; // An array with debugging info from the API
 	static $found_files;
 
+	/**
+	 * Try to guess and set a locale supported by the server, with fallback to 'en_EN' and 'C'
+	 *
+	 * This method uses the language and nationalty set in the users common prefs.
+	 *
+	 * @param $category=LC_ALL category to set, see setlocal function
+	 * @param $charset=null default system charset
+	 * @return string the local (or best estimate) set
+	 */
+	static function setlocale($category=LC_ALL,$charset=null)
+	{
+		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
+		$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
+
+		if (strlen($lang) == 2)
+		{
+			$country_from_lang = strtoupper($lang);
+		}
+		else
+		{
+			list($lang,$country_from_lang) = explode('-',$lang);
+			$country_from_lang = strtoupper($country_from_lang);
+		}
+		if (is_null($charset)) $charset = $GLOBALS['egw']->translation->charset();
+
+		foreach(array(
+			$lang.'_'.$country,
+			$lang.'_'.$country_from_lang,
+			$lang,
+			'en_EN',
+			'de_DE',	// this works with utf-8, en_EN@utf-8 does NOT!
+			'C',
+		) as $local)
+		{
+			if (($ret = setlocale($category,$local.'@'.$charset))) return $ret;
+			if (($ret = setlocale($category,$local))) return $ret;
+		}
+		error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: Could not set local!");
+		return false;	// should not happen, as the 'C' local should at least be available everywhere
+	}
+
 	/**
 	 * Compares two Version strings and return 1 if str2 is newest (bigger version number) than str1
 	 *

From f1855baac2ce589b3d8e62afd5e1501636706a65 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 3 Apr 2009 13:27:01 +0000
Subject: [PATCH 158/510] "fixed typo"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index b19740caea..8e69ba5bd2 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1855,7 +1855,7 @@ class etemplate extends boetemplate
 		{
 			return stripslashes($var);
 		}
-		foreach($public as $key => $val)
+		foreach($var as $key => $val)
 		{
 			$var[$key] = is_array($val) ? self::array_stripslashes($val) : stripslashes($val);
 		}

From a6836fb367fae1d9f65fb96326bfb46c3e420f86 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 3 Apr 2009 13:29:47 +0000
Subject: [PATCH 159/510] "some more info for error_log on Exceptions:
 Instance, User & URL causing the exception"

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

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 4e85ff7c9f..0591e8f145 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -54,7 +54,7 @@ function array2string($var)
 			$type = get_class($var);
 			// fall-through
 		case 'array':
-			return $type.str_replace(array("\n",'    ','array'),'',print_r($var,true));
+			return $type.str_replace(array("\n",'    ','Array'),'',print_r($var,true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -1426,6 +1426,8 @@ function egw_exception_handler(Exception $e)
 	// logging all exceptions to the error_log
 	error_log($headline.': '.$e->getMessage());
 	foreach(explode("\n",$e->getTraceAsString()) as $line) error_log($line);
+	error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', URL='.
+		($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 
 	// exception handler for cli (command line interface) clients, no html
 	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')

From 3e0ff9b00412978b718e6ede3a0eecf925e5aa81 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 3 Apr 2009 14:01:24 +0000
Subject: [PATCH 160/510] prevent strpos to fail, if lable is empty

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

diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index cff08469a6..52b7d782f8 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -666,7 +666,7 @@ class nextmatch_widget
 			{
 				$cols[$widget['name']] = $label;
 			}
-			elseif (strpos($cols[$col],$label) === false)
+			elseif (empty($label) || strpos($cols[$col],$label) === false)
 			{
 				$cols[$col] .= ($cols[$col] ? ', ' : '').$label;
 				$cols['name2col'][$col] = $col;

From b20b78e07e4d52328f58538067081ab788305d27 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Fri, 3 Apr 2009 20:12:35 +0000
Subject: [PATCH 161/510] quitened a logging message which slows down eGW

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 35458f5d5b..f238e1fdc4 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -865,7 +865,7 @@ class translation
 	 */
 	function decodeMailHeader($_string, $displayCharset='utf-8')
 	{
-		error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset");
+		//error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset");
 		if(function_exists(imap_mime_header_decode)) {
 			$newString = '';
 

From 612f7be6d9c03fb5c975d7bffd9526e7b8949681 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Fri, 3 Apr 2009 20:17:22 +0000
Subject: [PATCH 162/510] created ONE single AJAX request to improve
 performance again

---
 .../inc/class.ajaxnotifications.inc.php       | 96 +++++++++++--------
 notifications/js/notificationajaxpopup.js     |  5 +-
 2 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/notifications/inc/class.ajaxnotifications.inc.php b/notifications/inc/class.ajaxnotifications.inc.php
index f78ed059cd..9638a7e4d0 100644
--- a/notifications/inc/class.ajaxnotifications.inc.php
+++ b/notifications/inc/class.ajaxnotifications.inc.php
@@ -104,65 +104,39 @@ class ajaxnotifications {
 	public function __destruct() {}
 	
 	/**
-	 * Gets all egwpopup notification for calling user.
-	 * Requests and response is done via xajax
+	 * public AJAX trigger function to be called by the JavaScript client
+	 *
+	 * this function calls all other recurring AJAX notifications methods
+	 * to have ONE single recurring AJAX call per user
 	 * 
 	 * @return xajax response
 	 */
-	public function get_egwpopup_notifications() {
-		$session_id = $GLOBALS['egw_info']['user']['sessionid'];
-		$message = '';
-		$rs = $this->db->select(self::_notification_table, 
-			'*', array(
-				'account_id' => $this->recipient->account_id,
-				'session_id' => $session_id,
-			),
-			__LINE__,__FILE__,false,'',self::_appname);
-		if ($rs->NumRows() > 0)	{
-			foreach ($rs as $notification) {
-				$this->response->addScriptCall('append_notification_message',$notification['message']);
-			}
-			$myval=$this->db->delete(self::_notification_table,array(
-				'account_id' => $this->recipient->account_id,
-				'session_id' => $session_id,
-			),__LINE__,__FILE__,self::_appname);
-			
-			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
-				case 'low':
-					$this->response->addScript('notificationbell_switch("active");');
-					break;
-				case 'high':
-					$this->response->addAlert(lang('eGroupWare has notifications for you'));
-					$this->response->addScript('egwpopup_display();');
-					break;
-				case 'medium':
-				default:
-					$this->response->addScript('egwpopup_display();');
-					break;
-			}
-		}
+	public function get_notifications() {
+		$this->check_mailbox();
+		$this->get_egwpopup();
+		
 		return $this->response->getXML();
 	}
 	
 	/**
 	 * checks users mailbox and sends a notification if new mails have arrived
 	 * 
-	 * @return xajax response
+	 * @return boolean true or false
 	 */
-	public function check_mailbox() {
+	private function check_mailbox() {
 		if(!isset($this->preferences[self::_mailappname]['notify_folders'])) {
-			return $this->response->getXML(); //no pref set for notifying - exit
+			return true; //no pref set for notifying - exit
 		}
 		$notify_folders = explode(',', $this->preferences[self::_mailappname]['notify_folders']);
-		if (count($notify_folders) == 0) {
-			return $this->response->getXML(); //no folders configured for notifying - exit
+		if(count($notify_folders) == 0) {
+			return true; //no folders configured for notifying - exit
 		}
 		
 		$bofelamimail = new bofelamimail($GLOBALS['egw']->translation->charset());
 		if(!$bofelamimail->openConnection()) {
 			// TODO: This is ugly. Log a bit nicer!
 			error_log(self::_appname.' (user: '.$this->recipient->account_lid.'): cannot connect to mailbox. Please check your prefs!');
-			return $this->response->getXML(); // cannot connect to mailbox
+			return false; // cannot connect to mailbox
 		}
 		
 		$this->restore_session_data();
@@ -223,7 +197,47 @@ class ajaxnotifications {
 		}
 		
 		$this->save_session_data();
-		return $this->response->getXML();
+		return true;
+	}
+	
+	/**
+	 * gets all egwpopup notifications for calling user
+	 * 
+	 * @return boolean true or false
+	 */
+	private function get_egwpopup() {
+		$session_id = $GLOBALS['egw_info']['user']['sessionid'];
+		$message = '';
+		$rs = $this->db->select(self::_notification_table, 
+			'*', array(
+				'account_id' => $this->recipient->account_id,
+				'session_id' => $session_id,
+			),
+			__LINE__,__FILE__,false,'',self::_appname);
+		if ($rs->NumRows() > 0)	{
+			foreach ($rs as $notification) {
+				$this->response->addScriptCall('append_notification_message',$notification['message']);
+			}
+			$myval=$this->db->delete(self::_notification_table,array(
+				'account_id' => $this->recipient->account_id,
+				'session_id' => $session_id,
+			),__LINE__,__FILE__,self::_appname);
+			
+			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
+				case 'low':
+					$this->response->addScript('notificationbell_switch("active");');
+					break;
+				case 'high':
+					$this->response->addAlert(lang('eGroupWare has notifications for you'));
+					$this->response->addScript('egwpopup_display();');
+					break;
+				case 'medium':
+				default:
+					$this->response->addScript('egwpopup_display();');
+					break;
+			}
+		}
+		return true;
 	}
 	
 	/**
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index 360f589da6..b056f795f8 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -4,7 +4,7 @@
  * @package notifications
  * @subpackage ajaxpoup
  * @link http://www.egroupware.org
- * @author Cornelius Weiss <nelius@cwtech.de>
+ * @author Cornelius Weiss <nelius@cwtech.de>, Christian Binder <christian@jaytraxx.de>
  * @version $Id$
  */
 
@@ -18,8 +18,7 @@ function egwpopup_setTimeout() {
 	window.setTimeout("egwpopup_refresh();", 60000);
 }
 function egwpopup_refresh() {
-	xajax_doXMLHTTP("notifications.ajaxnotifications.check_mailbox");
-	xajax_doXMLHTTP("notifications.ajaxnotifications.get_egwpopup_notifications");
+	xajax_doXMLHTTP("notifications.ajaxnotifications.get_notifications");
 	egwpopup_setTimeout();
 }
 

From 5a53158bc7720886eef812c607151e655ee73b42 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Fri, 3 Apr 2009 20:36:28 +0000
Subject: [PATCH 163/510] renamed ajax class to fit autoloading scheme

---
 ...tifications.inc.php => class.notifications_ajax.inc.php} | 6 +++---
 notifications/inc/class.notifications_popup.inc.php         | 2 +-
 notifications/js/notificationajaxpopup.js                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename notifications/inc/{class.ajaxnotifications.inc.php => class.notifications_ajax.inc.php} (98%)

diff --git a/notifications/inc/class.ajaxnotifications.inc.php b/notifications/inc/class.notifications_ajax.inc.php
similarity index 98%
rename from notifications/inc/class.ajaxnotifications.inc.php
rename to notifications/inc/class.notifications_ajax.inc.php
index 9638a7e4d0..a8be2354c9 100644
--- a/notifications/inc/class.ajaxnotifications.inc.php
+++ b/notifications/inc/class.notifications_ajax.inc.php
@@ -12,7 +12,7 @@
 /**
  * Ajax methods for notifications
  */
-class ajaxnotifications {
+class notifications_ajax {
 	/**
 	 * Appname
 	 */
@@ -80,7 +80,7 @@ class ajaxnotifications {
 	private $response;
 	
 	/**
-	 * constructor of ajaxnotifications
+	 * constructor
 	 *
 	 */
 	public function __construct() {
@@ -98,7 +98,7 @@ class ajaxnotifications {
 	}
 	
 	/**
-	 * destructor of ajaxnotifications
+	 * destructor
 	 *
 	 */
 	public function __destruct() {}
diff --git a/notifications/inc/class.notifications_popup.inc.php b/notifications/inc/class.notifications_popup.inc.php
index 0b621a1fcd..56bf6aef94 100644
--- a/notifications/inc/class.notifications_popup.inc.php
+++ b/notifications/inc/class.notifications_popup.inc.php
@@ -17,7 +17,7 @@
  * notification is written into self::_notification_table.
  * In the second stage a request from the client reads
  * out the table to look if there is a notificaton for this
- * client. The second stage is done in class.ajaxnotifications.inc.php
+ * client. The second stage is done in class.notifications_ajax.inc.php
  *
  * Todo:
  * - save the messages by uid instead of sessionid into the notification table, this
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index b056f795f8..e9a19389d9 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -18,7 +18,7 @@ function egwpopup_setTimeout() {
 	window.setTimeout("egwpopup_refresh();", 60000);
 }
 function egwpopup_refresh() {
-	xajax_doXMLHTTP("notifications.ajaxnotifications.get_notifications");
+	xajax_doXMLHTTP("notifications.notifications_ajax.get_notifications");
 	egwpopup_setTimeout();
 }
 

From 1c11bfcf55a2c2c46b624937b226522d5770fe68 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 4 Apr 2009 08:38:56 +0000
Subject: [PATCH 164/510] using a session for basic auth (not session aware)
 clients for WebDAV and GroupDAV. The "sessionid" get's constructed from the
 basic auth credentials and is not random (as the clients dont store them).
 --> speeds up the use of *DAV --> stops *DAV handlers to created numerious
 sessions

---
 groupdav.php                           |  23 +----
 phpgwapi/inc/class.egw_session.inc.php | 136 +++++++++++++++++--------
 webdav.php                             |  10 +-
 3 files changed, 103 insertions(+), 66 deletions(-)

diff --git a/groupdav.php b/groupdav.php
index 34512fd9a3..434c109f5e 100644
--- a/groupdav.php
+++ b/groupdav.php
@@ -9,7 +9,7 @@
  * @package api
  * @subpackage groupdav
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2007/8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2007-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -25,25 +25,8 @@ $starttime = microtime(true);
  */
 function check_access(&$account)
 {
-	$account = array(
-		'login'  => $_SERVER['PHP_AUTH_USER'],
-		'passwd' => $_SERVER['PHP_AUTH_PW'],
-		'passwd_type' => 'text',
-	);
-	// no session for clients known to NOT use it (no cookie support)
-	$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
-	foreach(array(
-		'davkit',	// Apple iCal
-	//	'bionicmessage.net',
-		'zideone',
-		'lightning',
-	) as $test)
-	{
-		if (($no_session = strpos($agent,$test) !== false)) break;
-	}
-	//error_log("GroupDAV PHP_AUTH_USER={$_SERVER['PHP_AUTH_USER']}, HTTP_USER_AGENT={$_SERVER['HTTP_USER_AGENT']} --> no_session=".(int)$no_session);
-
-	if (!isset($_SERVER['PHP_AUTH_USER']) || !($sessionid = $GLOBALS['egw']->session->create($account,'','',$no_session)))
+	if (!isset($_SERVER['PHP_AUTH_USER']) ||
+		!($sessionid = $GLOBALS['egw']->session->create($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW'],'text')))
 	{
 		header('WWW-Authenticate: Basic realm="'.groupdav::REALM.
 			// if the session class gives a reason why the login failed --> append it to the REALM
diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index 053f082c1a..ab44c844f4 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -48,6 +48,11 @@ if (!defined('PHP_SHLIB_PREFIX'))
  */
 class egw_session
 {
+	/**
+	 * Write debug messages about session verification and creation to the error_log
+	 */
+	const ERROR_LOG_DEBUG = false;
+
 	/**
 	 * key of eGW's session-data in $_SESSION
 	 */
@@ -151,13 +156,6 @@ class egw_session
 	*/
 	private $egw_domains;
 
-	/**
-	 * Write debug messages about session verification and creation to the error_log
-	 *
-	 * @var boolean
-	 */
-	private static $errorlog_debug = false;
-
 	/**
 	 * $_SESSION at the time the constructor was called
 	 *
@@ -174,7 +172,7 @@ class egw_session
 	{
 		$this->required_files = $_SESSION[self::EGW_REQUIRED_FILES];
 
-		$this->sessionid = $_REQUEST[self::EGW_SESSION_NAME];
+		$this->sessionid = self::get_sessionid();
 		$this->kp3       = $_REQUEST['kp3'];
 
 		$this->egw_domains = $domain_names;
@@ -258,6 +256,7 @@ class egw_session
 	 */
 	function commit_session()
 	{
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$this->sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
 		self::encrypt($this->kp3);
 
 		session_write_close();
@@ -430,7 +429,7 @@ class egw_session
 			$this->passwd      = $passwd;
 			$this->passwd_type = $passwd_type;
 		}
-		if (self::$errorlog_debug) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check)");
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check)");
 
 		self::split_login_domain($login,$this->account_lid,$this->account_domain);
 		// add domain to the login, if not already there
@@ -470,6 +469,7 @@ class egw_session
 			$GLOBALS['egw']->setup('',false);
 */
 		}
+		unset($GLOBALS['egw_info']['server']['default_domain']); // we kill this for security reasons
 
 		//echo "<p>session::create(login='$login'): lid='$this->account_lid', domain='$this->account_domain'</p>\n";
 		$user_ip = self::getuser_ip();
@@ -503,16 +503,25 @@ class egw_session
 
 		$GLOBALS['egw_info']['user']['account_id'] = $this->account_id;
 		$GLOBALS['egw']->accounts->accounts($this->account_id);
-		session_start();
-		// set a new session-id, if not syncml (already done in Horde code and can NOT be changed)
-		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'syncml')
-		{
-			session_regenerate_id(true);
-		}
-		$this->sessionid = $no_session ? 'no-session' : session_id();
-		$this->kp3       = common::randomstring(24);
 
-		unset($GLOBALS['egw_info']['server']['default_domain']); // we kill this for security reasons
+		// for WebDAV and GroupDAV we use a pseudo sessionid created from md5(user:passwd)
+		// --> allows this stateless protocolls which use basic auth to use sessions!
+		if ($this->sessionid = self::get_sessionid(true))
+		{
+			$no_session = true;	// no need to set cookie
+			session_id($this->sessionid);
+		}
+		else
+		{
+			session_start();
+			// set a new session-id, if not syncml (already done in Horde code and can NOT be changed)
+			if (!$no_session && $GLOBALS['egw_info']['flags']['currentapp'] != 'syncml')
+			{
+				session_regenerate_id(true);
+			}
+			$this->sessionid = session_id();
+		}
+		$this->kp3       = common::randomstring(24);
 
 		$this->read_repositories();
 		if ($GLOBALS['egw']->accounts->is_expired($this->user))
@@ -589,7 +598,7 @@ class egw_session
 			self::egw_setcookie('last_domain',$this->account_domain,$now+1209600);
 		}
 		//if (!$this->sessionid) echo "<p>session::create(login='$login') = '$this->sessionid': lid='$this->account_lid', domain='$this->account_domain'</p>\n";
-		if (self::$errorlog_debug) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
 
 		return $this->sessionid;
 	}
@@ -717,6 +726,34 @@ class egw_session
 		return $blocked;
 	}
 
+	/**
+	 * Get the sessionid from Cookie, Get-Parameter or basic auth
+	 *
+	 * @param boolean $only_basic_auth=false return only a basic auth pseudo sessionid, default no
+	 * @return string
+	 */
+	static function get_sessionid($only_basic_auth=false)
+	{
+		// for WebDAV and GroupDAV we use a pseudo sessionid created from md5(user:passwd)
+		// --> allows this stateless protocolls which use basic auth to use sessions!
+		if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) &&
+			in_array(basename($_SERVER['SCRIPT_NAME']),array('webdav.php','groupdav.php')))
+		{
+			// we generate a pseudo-sessionid from the basic auth credentials
+			$sessionid = md5($_SERVER['PHP_AUTH_USER'].':'.$_SERVER['PHP_AUTH_PW'].':'.$_SERVER['HTTP_HOST']);
+		}
+		elseif(!$only_basic_auth && isset($_REQUEST[self::EGW_SESSION_NAME]))
+		{
+			$sessionid = $_REQUEST[self::EGW_SESSION_NAME];
+		}
+		else
+		{
+			$sessionid = false;
+		}
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() returning '.array2string($sessionid));
+		return $sessionid;
+	}
+
 	/**
 	 * Check to see if a session is still current and valid
 	 *
@@ -724,34 +761,43 @@ class egw_session
 	 * @param string $kp3 ?? to be verified
 	 * @return bool is the session valid?
 	 */
-	function verify($sessionid='',$kp3='')
+	function verify($sessionid=null,$kp3=null)
 	{
-		if (self::$errorlog_debug) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
 
 		$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
 
 		if(!$sessionid)
 		{
-			$sessionid = $_REQUEST[self::EGW_SESSION_NAME];
+			$sessionid = self::get_sessionid();
 			$kp3       = $_REQUEST['kp3'];
 		}
 
 		$this->sessionid = $sessionid;
 		$this->kp3       = $kp3;
 
-		if (!$this->sessionid) {
-			if (self::$errorlog_debug) error_log(__METHOD__."('$sessionid')_REQUEST[sessionid]='$_REQUEST[sessionid]' No session ID");
+
+		if (!$this->sessionid)
+		{
+			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid')_REQUEST[sessionid]='$_REQUEST[sessionid]' No session ID");
 			return false;
 		}
 
 		session_name(self::EGW_SESSION_NAME);
 		session_id($this->sessionid);
 		session_start();
+
+		// check if we have a eGroupware session --> return false if not (but dont destroy it!)
+		if (is_null($_SESSION) || !isset($_SESSION[self::EGW_SESSION_VAR]))
+		{
+			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session does NOT exist!");
+			return false;
+		}
 		$session =& $_SESSION[self::EGW_SESSION_VAR];
 
 		if ($session['session_dla'] <= time() - $GLOBALS['egw_info']['server']['sessions_timeout'])
 		{
-			if (self::$errorlog_debug) error_log(__METHOD__."('$sessionid') session timed out");
+			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session timed out!");
 			$this->destroy($sessionid,$kp3);
 			return false;
 		}
@@ -764,7 +810,7 @@ class egw_session
 		if($GLOBALS['egw_info']['user']['domain'] && $this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 		{
 			throw new Exception("Wrong domain! '$this->account_domain' != '{$GLOBALS['egw_info']['user']['domain']}'");
-/*			if (self::$errorlog_debug) error_log(__METHOD__."('$sessionid','$kp3') account_domain='$this->account_domain' != '{$GLOBALS['egw_info']['user']['domain']}'=egw_info[user][domain]");
+/*			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid','$kp3') account_domain='$this->account_domain' != '{$GLOBALS['egw_info']['user']['domain']}'=egw_info[user][domain]");
 			$GLOBALS['egw']->ADOdb = null;
 			$GLOBALS['egw_info']['user']['domain'] = $this->account_domain;
 			// reset the db
@@ -787,7 +833,7 @@ class egw_session
 		$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
 		if (!$this->account_id)
 		{
-			if (self::$errorlog_debug) error_log("*** session::verify($sessionid) !accounts::name2id('$this->account_lid')");
+			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) !accounts::name2id('$this->account_lid')");
 			return false;
 		}
 
@@ -800,7 +846,7 @@ class egw_session
 
 		if ($this->user['expires'] != -1 && $this->user['expires'] < time())
 		{
-			if (self::$errorlog_debug) error_log("*** session::verify($sessionid) accounts is expired");
+			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) accounts is expired");
 			if(is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
@@ -822,7 +868,7 @@ class egw_session
 		}
 		if ($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 		{
-			if (self::$errorlog_debug) error_log("*** session::verify($sessionid) wrong domain");
+			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) wrong domain");
 			if(is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
@@ -839,7 +885,7 @@ class egw_session
 
 		if ($GLOBALS['egw_info']['server']['sessions_checkip'])
 		{
-			if (self::$errorlog_debug) error_log("*** session::verify($sessionid) wrong IP");
+			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) wrong IP");
 			if (strtoupper(substr(PHP_OS,0,3)) != 'WIN' && (!$GLOBALS['egw_info']['user']['session_ip'] ||
 				$GLOBALS['egw_info']['user']['session_ip'] != $this->getuser_ip()))
 			{
@@ -868,7 +914,7 @@ class egw_session
 		}
 		if (!$this->account_lid)
 		{
-			if (self::$errorlog_debug) error_log("*** session::verify($sessionid) !account_lid");
+			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) !account_lid");
 			if(is_object($GLOBALS['egw']->log))
 			{
 				// This needs some better wording
@@ -886,7 +932,7 @@ class egw_session
 		$_current_app=$GLOBALS['egw_info']['flags']['currentapp'];
 		if($this->session_flags=='A' && !$GLOBALS['egw_info']['user']['apps'][$_current_app])
 		{
-			if (self::$errorlog_debug) error_log("*** session::verify($sessionid) anon user entering not allowed app");
+			if (self::ERROR_LOG_DEBUG) error_log("*** session::verify($sessionid) anon user entering not allowed app");
 			$this->destroy($sessionid,$kp3);
 
 			/* Overwrite Cookie with empty user. For 2 weeks */
@@ -898,7 +944,7 @@ class egw_session
 
 			return false;
 		}
-		if (self::$errorlog_debug) error_log("--> session::verify($sessionid) SUCCESS");
+		if (self::ERROR_LOG_DEBUG) error_log("--> session::verify($sessionid) SUCCESS");
 
 		return true;
 	}
@@ -918,7 +964,7 @@ class egw_session
 		}
 		$this->log_access($this->sessionid);	// log logout-time
 
-		if (self::$errorlog_debug) error_log(__METHOD__."($sessionid,$kp3) parent::destroy()=$ret");
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($sessionid,$kp3) parent::destroy()=$ret");
 
 		$GLOBALS['egw']->hooks->process(array(
 			'location'  => 'session_destroyed',
@@ -928,7 +974,7 @@ class egw_session
 		// Only do the following, if where working with the current user
 		if (!$GLOBALS['egw_info']['user']['sessionid'] || $sessionid == $GLOBALS['egw_info']['user']['sessionid'])
 		{
-			if (self::$errorlog_debug) error_log(__METHOD__." ********* about to call session_destroy!");
+			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__." ********* about to call session_destroy!");
 			session_unset();
 			//echo '<p>'.__METHOD__.": session_destroy() returned ".(session_destroy() ? 'true' : 'false')."</p>\n";
 			@session_destroy();
@@ -1076,7 +1122,7 @@ class egw_session
 	{
 		if (isset($_SESSION[self::EGW_SESSION_ENCRYPTED]))
 		{
-			//error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
 			return false;	// can no longer store something in the session, eg. because commit_session() was called
 		}
 		if (!$appname)
@@ -1101,7 +1147,7 @@ class egw_session
 			$_SESSION[self::EGW_APPSESSION_VAR][$appname][$location] =& $data;
 			$ret =& $_SESSION[self::EGW_APPSESSION_VAR][$appname][$location];
 		}
-		if (self::$errorlog_debug === 'appsession')
+		if (self::ERROR_LOG_DEBUG === 'appsession')
 		{
 			error_log(__METHOD__."($location,$appname,$data) === ".(is_scalar($ret) && strlen($ret) < 50 ?
 				(is_bool($ret) ? ($ret ? '(bool)true' : '(bool)false') : $ret) :
@@ -1148,7 +1194,7 @@ class egw_session
 		{
 			self::set_cookiedomain();
 		}
-		if (self::$errorlog_debug) error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,self::$cookie_domain)");
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,self::$cookie_domain)");
 
 		setcookie($cookiename,$cookievalue,$cookietime,is_null($cookiepath) ? self::$cookie_path : $cookiepath,self::$cookie_domain);
 	}
@@ -1269,6 +1315,7 @@ class egw_session
 
 		$_SESSION[self::EGW_SESSION_VAR]['session_dla'] = time();
 		$_SESSION[self::EGW_SESSION_VAR]['session_action'] = $action;
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() _SESSION['.self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
 	}
 
 	/**
@@ -1374,7 +1421,7 @@ class egw_session
 		{
 			self::$session_handler = $GLOBALS['egw_info']['server']['session_handler'];
 		}
-		//error_log(__METHOD__.'() session_handler='.self::$session_handler.', egw_info[server][session_handler]='.$GLOBALS['egw_info']['server']['session_handler']);
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() session_handler='.self::$session_handler.', egw_info[server][session_handler]='.$GLOBALS['egw_info']['server']['session_handler']);
 
 		if (method_exists(self::$session_handler,'init_session_handler'))
 		{
@@ -1382,11 +1429,16 @@ class egw_session
 		}
 		ini_set('session.use_cookies',0);	// disable the automatic use of cookies, as it uses the path / by default
 		session_name(self::EGW_SESSION_NAME);
-		if ($_REQUEST[egw_session::EGW_SESSION_NAME])
+		if (($sessionid = self::get_sessionid()))
 		{
-		 	session_id($_REQUEST[egw_session::EGW_SESSION_NAME]);
+		 	session_id($sessionid);
 			session_start();
-			egw_session::decrypt();
+			self::decrypt();
+			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+		}
+		else
+		{
+			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() no active session!");
 		}
 	}
 
diff --git a/webdav.php b/webdav.php
index 516dcd1502..eba6104ba7 100644
--- a/webdav.php
+++ b/webdav.php
@@ -9,7 +9,7 @@
  * @package api
  * @subpackage vfs
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2006-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2006-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -30,7 +30,8 @@ function check_access(&$account)
 		'passwd' => $_SERVER['PHP_AUTH_PW'],
 		'passwd_type' => 'text',
 	);
-	if (!isset($_SERVER['PHP_AUTH_USER']) || !($sessionid = $GLOBALS['egw']->session->create($account)))
+	if (!isset($_SERVER['PHP_AUTH_USER']) ||
+		!($sessionid = $GLOBALS['egw']->session->create($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW'],'text')))
 	{
 		header('WWW-Authenticate: Basic realm="'.vfs_webdav_server::REALM.
 			// if the session class gives a reason why the login failed --> append it to the REALM
@@ -45,7 +46,8 @@ function check_access(&$account)
 // if we are called with a /apps/$app path, use that $app as currentapp, to not require filemanager rights for the links
 $parts = explode('/',$_SERVER['PATH_INFO']);
 //error_log("webdav: explode".print_r($parts,true));
-if(count($parts)== 1){
+if(count($parts) == 1)
+{
 	error_log(__METHOD__. "Malformed Url: missing slash:\n".$_SERVER['SERVER_NAME']."\n PATH_INFO:".$_SERVER['PATH_INFO'].
 		"\n REQUEST_URI".$_SERVER['REQUEST_URI']."\n ORIG_SCRIPT_NAME:".$_SERVER['ORIG_SCRIPT_NAME'].
 		"\n REMOTE_ADDR:".$_SERVER['REMOTE_ADDR']."\n PATH_INFO:".$_SERVER['PATH_INFO']."\n HTTP_USER_AGENT:".$_SERVER['HTTP_USER_AGENT']) ;
@@ -72,5 +74,5 @@ $headertime = microtime(true);
 
 $webdav_server = new vfs_webdav_server();
 $webdav_server->ServeRequest();
-//error_log(sprintf("GroupDAV %s request took %5.3f s (header include took %5.3f s)",$_SERVER['REQUEST_METHOD'],microtime(true)-$starttime,$headertime-$starttime));
+//error_log(sprintf("WebDAV %s request took %5.3f s (header include took %5.3f s)",$_SERVER['REQUEST_METHOD'],microtime(true)-$starttime,$headertime-$starttime));
 

From 73aeaa3cad992131751f1c961955c836d42b6ac1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 4 Apr 2009 17:41:15 +0000
Subject: [PATCH 165/510] "add link title only, if id is numeric"

---
 etemplate/inc/class.vfs_widget.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index c059f77793..10042f49bb 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -146,8 +146,7 @@ class vfs_widget
 								$value['c'.$n] = lang($path_parts[2]);
 								break;
 							case 4:
-								$value['c'.$n] .= ': '.egw_link::title($path_parts[2],$path_parts[3]);
-								//$value['c'.$n] = egw_link::title($path_parts[2],$path_parts[3]);
+								if (is_numeric($value['c'.$n])) $value['c'.$n] .= egw_link::title($path_parts[2],$path_parts[3]);
 								break;
 						}
 					}

From c314069e0c75ccd8011e9d70044ec951067d92b6 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 4 Apr 2009 19:20:21 +0000
Subject: [PATCH 166/510] "using path's instead of url's were possible"

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

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index 121fdf1d0d..0d3db245c7 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -668,7 +668,7 @@ class egw_link extends solink
 	{
 		if ($app == self::VFS_APPNAME && !empty($id) && is_array($link))
 		{
-			return egw_vfs::download_url(parse_url(self::vfs_path($link['app2'],$link['id2'],$link['id']),PHP_URL_PATH));
+			return egw_vfs::download_url(self::vfs_path($link['app2'],$link['id2'],$link['id'],true));
 		}
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['view']) || !isset($reg['view_id']))
 		{
@@ -783,7 +783,7 @@ class egw_link extends solink
 		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
 		{
 			if (($Ok = copy($file['tmp_name'],$fname = egw_vfs::concat($entry_dir,$file['name'])) &&
-				($stat = links_stream_wrapper::url_stat($fname,0))) && $comment)
+				($stat = egw_vfs::stat($fname,0))) && $comment)
 			{
 				egw_vfs::proppatch(parse_url($fname,PHP_URL_PATH),array(array('name'=>'comment','val'=>$comment)));	// set comment
 			}
@@ -849,12 +849,12 @@ class egw_link extends solink
 	 */
 	static function info_attached($app,$id,$filename)
 	{
-		$url = self::vfs_path($app,$id,$filename);
-		if (!($stat = links_stream_wrapper::url_stat($url,STREAM_URL_STAT_QUIET)))
+		$path = self::vfs_path($app,$id,$filename,true);
+		if (!($stat = egw_vfs::stat($path,STREAM_URL_STAT_QUIET)))
 		{
 			return false;
 		}
-		return self::fileinfo2link($stat,$url);
+		return self::fileinfo2link($stat,$path);
 	}
 
 	/**
@@ -873,7 +873,7 @@ class egw_link extends solink
 				return false;
 			}
 		}
-		list(,,,,$app,$id) = explode('/',$url);	// links://apps/$app/$id
+		list(,,$app,$id) = explode('/',$url[0] == '/' ? $url : parse_url($url,PHP_URL_PATH));	// /apps/$app/$id
 
 		return array(
 			'app'       => self::VFS_APPNAME,
@@ -898,13 +898,13 @@ class egw_link extends solink
 	 */
 	static function list_attached($app,$id)
 	{
-		$url = self::vfs_path($app,$id);
+		$path = self::vfs_path($app,$id,'',true);
 		//error_log(__METHOD__."($app,$id) url=$url");
 
 		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
 
 		$attached = array();
-		if (($url2stats = egw_vfs::find($url,array('url'=>true,'need_mime'=>true,'type'=>'f')+$extra,true)))
+		if (($url2stats = egw_vfs::find($path,array('need_mime'=>true,'type'=>'f')+$extra,true)))
 		{
 			$props = egw_vfs::propfind(array_keys($url2stats));	// get the comments
 			foreach($url2stats as $url => &$fileinfo)

From 979466c1fcb3b53aec860fe17b6f7aa364418bc4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 6 Apr 2009 13:02:28 +0000
Subject: [PATCH 167/510] fixed typo: stoped --> stopped

---
 filemanager/inc/class.filemanager_ui.inc.php | 2 +-
 filemanager/setup/egw_de.lang                | 2 +-
 filemanager/setup/egw_en.lang                | 2 +-
 filemanager/setup/egw_es-es.lang             | 2 +-
 filemanager/setup/egw_nl.lang                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index a9e9fbeb3f..4033cacd8a 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -630,7 +630,7 @@ class filemanager_ui
 			if ($button == 'sudo' || $content['sudo']['user'])
 			{
 				$msg = $this->sudo($content['sudo']['user'],$content['sudo']['passwd']) ? lang('Root access granted.') :
-					($content['sudo']['user'] ? lang('Wrong username or password!') : lang('Root access stoped.'));
+					($content['sudo']['user'] ? lang('Wrong username or password!') : lang('Root access stopped.'));
 				unset($content['sudo']);
 				$content['is_owner'] = egw_vfs::has_owner_rights($path);
 			}
diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index 5401aa59e8..492dd6b4c1 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -134,7 +134,7 @@ renamed %1 to %2.	filemanager	de	%1 nach %2 umbenannt.
 replaced %1	filemanager	de	%1 ersetzt
 rights	filemanager	de	Rechte
 root access granted.	filemanager	de	Root Zugriff gewährt.
-root access stoped.	filemanager	de	Root Zugriff gestopt.
+root access stopped.	filemanager	de	Root Zugriff gestoppt.
 save %1	filemanager	de	%1 speichern
 save %1, and go back to file listing	filemanager	de	%1 speichern, und zurück zur Verzeichnisansicht
 save changes	filemanager	de	Änderungen speichern
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index c459d0d893..c12d24edca 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -134,7 +134,7 @@ renamed %1 to %2.	filemanager	en	Renamed %1 to %2.
 replaced %1	filemanager	en	Replaced %1
 rights	filemanager	en	Rights
 root access granted.	filemanager	en	Root access granted.
-root access stoped.	filemanager	en	Root access stoped.
+root access stopped.	filemanager	en	Root access stopped.
 save %1	filemanager	en	Save %1
 save %1, and go back to file listing	filemanager	en	Save %1, and go back to file listing
 save changes	filemanager	en	Save changes
diff --git a/filemanager/setup/egw_es-es.lang b/filemanager/setup/egw_es-es.lang
index 9ecb4a679d..5a7e8c219a 100644
--- a/filemanager/setup/egw_es-es.lang
+++ b/filemanager/setup/egw_es-es.lang
@@ -129,7 +129,7 @@ renamed %1 to %2.	filemanager	es-es	Se ha renombrado %1 a %2.
 replaced %1	filemanager	es-es	Se ha sustituido %1
 rights	filemanager	es-es	Derechos
 root access granted.	filemanager	es-es	Permiso de administrador concedido.
-root access stoped.	filemanager	es-es	Acceso de administrador detenido.
+root access stopped.	filemanager	es-es	Acceso de administrador detenido.
 save %1	filemanager	es-es	Guardar %1
 save %1, and go back to file listing	filemanager	es-es	Guardar %1, y volver al listado
 save changes	filemanager	es-es	Guardar cambios
diff --git a/filemanager/setup/egw_nl.lang b/filemanager/setup/egw_nl.lang
index e9092fa495..6d07bd6df5 100644
--- a/filemanager/setup/egw_nl.lang
+++ b/filemanager/setup/egw_nl.lang
@@ -129,7 +129,7 @@ renamed %1 to %2.	filemanager	nl	%1 hernoemd in %2
 replaced %1	filemanager	nl	%1 is vervangen
 rights	filemanager	nl	Rechten
 root access granted.	filemanager	nl	Root toegang verleend.
-root access stoped.	filemanager	nl	Root toegang ingetrokken.
+root access stopped.	filemanager	nl	Root toegang ingetrokken.
 save %1	filemanager	nl	Bewaar %1
 save %1, and go back to file listing	filemanager	nl	Bewaar %1 en ga terug naar de bestandenlijst
 save changes	filemanager	nl	Wijzigingen bewaren

From fcb8f3497ccdd4a7bd0dd6d52c40ffba9876a4c4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 6 Apr 2009 13:46:45 +0000
Subject: [PATCH 168/510] Finally fixed creation and rename of home
 directories: - egw_vfs::stat and egw_vfs_stream_wrapper::url_stat now both
 have a   parameter $try_create_home=false, which do not create a non-existing
   home-directory by default. - filemanger_ui calls egw_vfs::stat($path,true)
 to create an evtl.   missing home dir (in case it does not exist because of
 previous   problems) --> fixes not working home-dir creation or rename,
 because url_stat     already tried to create the home-dir

---
 filemanager/inc/class.filemanager_ui.inc.php  |  6 +++---
 phpgwapi/inc/class.egw_vfs.inc.php            | 10 ++++++----
 phpgwapi/inc/class.vfs_home_hooks.inc.php     |  4 ++--
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php |  7 +++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 4033cacd8a..a6cf3e66bd 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -102,7 +102,7 @@ class filemanager_ui
 			if (isset($_GET['msg'])) $msg = $_GET['msg'];
 			if (isset($_GET['path']) && ($path = $_GET['path']))
 			{
-				if ($path[0] == '/' && egw_vfs::is_dir($path) && egw_vfs::check_access($path,egw_vfs::READABLE))
+				if ($path[0] == '/' && egw_vfs::stat($path,true) && egw_vfs::is_dir($path) && egw_vfs::check_access($path,egw_vfs::READABLE))
 				{
 					$content['nm']['path'] = $path;
 				}
@@ -224,7 +224,7 @@ class filemanager_ui
 					break;
 			}
 		}
-		if (!egw_vfs::is_dir($content['nm']['path']))
+		if (!egw_vfs::stat($content['nm']['path'],true) || !egw_vfs::is_dir($content['nm']['path']))
 		{
 			$content['nm']['msg'] .= ' '.lang('Directory not found or no permission to access it!');
 		}
@@ -489,7 +489,7 @@ class filemanager_ui
 	{
 		$GLOBALS['egw']->session->appsession('index','filemanager',$query);
 
-		if (!egw_vfs::is_dir($query['path']) || !egw_vfs::check_access($query['path'],egw_vfs::READABLE))
+		if (!egw_vfs::stat($query['path'],true) || !egw_vfs::is_dir($query['path']) || !egw_vfs::check_access($query['path'],egw_vfs::READABLE))
 		{
 			// we will leave here, since we are not allowed, or the location does not exist. Index must handle that, and give
 			// an appropriate message
diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 8bb58188e6..9cb7e6e5f4 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -169,15 +169,16 @@ class egw_vfs extends vfs_stream_wrapper
 	 * stat working on just the eGW VFS (alias of url_stat)
 	 *
 	 * @param string $path filename with absolute path in the eGW VFS
+	 * @param boolean $try_create_home=false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function stat($path)
+	static function stat($path,$try_create_home=false)
 	{
 		if ($path[0] != '/')
 		{
 			throw new egw_exception_assertion_failed("File '$path' is not an absolute path!");
 		}
-		if (($stat = self::url_stat($path,0)))
+		if (($stat = self::url_stat($path,0,$try_create_home)))
 		{
 			$stat = array_slice($stat,13);	// remove numerical indices 0-12
 		}
@@ -188,15 +189,16 @@ class egw_vfs extends vfs_stream_wrapper
 	 * lstat (not resolving symbolic links) working on just the eGW VFS (alias of url_stat)
 	 *
 	 * @param string $path filename with absolute path in the eGW VFS
+	 * @param boolean $try_create_home=false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function lstat($path)
+	static function lstat($path,$try_create_home=false)
 	{
 		if ($path[0] != '/')
 		{
 			throw new egw_exception_assertion_failed("File '$path' is not an absolute path!");
 		}
-		if (($stat = self::url_stat($path,STREAM_URL_STAT_LINK)))
+		if (($stat = self::url_stat($path,STREAM_URL_STAT_LINK,$try_create_home)))
 		{
 			$stat = array_slice($stat,13);	// remove numerical indices 0-12
 		}
diff --git a/phpgwapi/inc/class.vfs_home_hooks.inc.php b/phpgwapi/inc/class.vfs_home_hooks.inc.php
index d2c7d283ae..66a46961a1 100644
--- a/phpgwapi/inc/class.vfs_home_hooks.inc.php
+++ b/phpgwapi/inc/class.vfs_home_hooks.inc.php
@@ -41,7 +41,7 @@ class vfs_home_hooks
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		// create a user-dir
 		egw_vfs::$is_root = true;
-		if (@egw_vfs::mkdir($dir='/home/'.$data['account_lid'],0700,0))
+		if (egw_vfs::mkdir($dir='/home/'.$data['account_lid'],0700,0))
 		{
 			egw_vfs::chown($dir,$data['account_id']);
 			egw_vfs::chgrp($dir,0);
@@ -109,7 +109,7 @@ class vfs_home_hooks
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		// create a group-dir
 		egw_vfs::$is_root = true;
-		if (@egw_vfs::mkdir($dir='/home/'.$data['account_name'],070,0))
+		if (egw_vfs::mkdir($dir='/home/'.$data['account_name'],0070,0))
 		{
 			egw_vfs::chown($dir,0);
 			egw_vfs::chgrp($dir,$data['account_id']);
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index b4125c8182..e2343188fb 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -690,11 +690,11 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 * - STREAM_URL_STAT_QUIET	If this flag is set, your wrapper should not raise any errors. If this flag is not set,
 	 *                          you are responsible for reporting errors using the trigger_error() function during stating of the path.
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
-	 * @param boolean $try_create_home=true should a user home-directory be created automatic, if it does not exist
+	 * @param boolean $try_create_home=false should a user home-directory be created automatic, if it does not exist
 	 * @param boolean $check_symlink_components=true check if path contains symlinks in path components other then the last one
 	 * @return array
 	 */
-	static function url_stat ( $path, $flags, $try_create_home=true, $check_symlink_components=true )
+	static function url_stat ( $path, $flags, $try_create_home=false, $check_symlink_components=true )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components)");
 
@@ -728,8 +728,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			}
 		}
 		// check if a failed url_stat was for a home dir, in that case silently create it
-		static $hook_data;	// we have to make sure to not call ourself recursivly (eg. mkdir will call stat to make sure the dir does not yet exist!)
-		if (!$stat && is_null($hook_data) && dirname(parse_url($path,PHP_URL_PATH)) == '/home' &&
+		if (!$stat && $try_create_home && dirname(parse_url($path,PHP_URL_PATH)) == '/home' &&
 			($id = $GLOBALS['egw']->accounts->name2id(basename($path))) &&
 			$GLOBALS['egw']->accounts->id2name($id) == basename($path))	// make sure path has the right case!
 		{

From 6f7c9611ea496fa8cb3242be6da05023c9f69024 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Mon, 6 Apr 2009 21:46:11 +0000
Subject: [PATCH 169/510] added configureable poll interval for egwpopup -
 default is 60 seconds

---
 notifications/inc/hook_after_navbar.inc.php |  3 ++-
 notifications/js/notificationajaxpopup.js   | 12 +++++------
 notifications/templates/default/config.tpl  | 24 +++++++++++++++------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/notifications/inc/hook_after_navbar.inc.php b/notifications/inc/hook_after_navbar.inc.php
index e343bc3d83..982a9a2f6f 100644
--- a/notifications/inc/hook_after_navbar.inc.php
+++ b/notifications/inc/hook_after_navbar.inc.php
@@ -15,9 +15,10 @@
 $notification_config = config::read('notifications');
 if ($notification_config['popup_enable']) {
 	$GLOBALS['egw']->translation->add_app('notifications');
+	$popup_poll_interval = empty($notification_config['popup_poll_interval']) ? 60 : $notification_config['popup_poll_interval'];
 	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup.js?'.
 		filemtime(EGW_SERVER_ROOT.'/notifications/js/notificationajaxpopup.js'). '" type="text/javascript"></script>';
-	echo '<script type="text/javascript">egwpopup_init();</script>';
+	echo '<script type="text/javascript">egwpopup_init("'.$popup_poll_interval.'");</script>';
 	echo '
 		<div id="egwpopup" style="display: none; z-index: 999;">
 			<div id="egwpopup_header">'.lang('Notification').'</div>
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index e9a19389d9..554eabf9f2 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -10,16 +10,16 @@
 
 var notifymessages = new Array();
 
-function egwpopup_init() {
-	window.setTimeout("egwpopup_refresh();", 1000);
+function egwpopup_init(_i) {
+	window.setTimeout("egwpopup_refresh(" + _i + ");", 1000);
 }
 
-function egwpopup_setTimeout() {
-	window.setTimeout("egwpopup_refresh();", 60000);
+function egwpopup_setTimeout(_i) {
+	window.setTimeout("egwpopup_refresh(" + _i + ");", _i*1000);
 }
-function egwpopup_refresh() {
+function egwpopup_refresh(_i) {
 	xajax_doXMLHTTP("notifications.notifications_ajax.get_notifications");
-	egwpopup_setTimeout();
+	egwpopup_setTimeout(_i);
 }
 
 function egwpopup_display() {
diff --git a/notifications/templates/default/config.tpl b/notifications/templates/default/config.tpl
index 08d026ebc2..bda08019d4 100644
--- a/notifications/templates/default/config.tpl
+++ b/notifications/templates/default/config.tpl
@@ -13,7 +13,7 @@
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_eGroupWare-Popup_backend}</b></td>
    </tr>
-   <tr bgcolor="{row_on}">
+   <tr class="row_on">
     <td>{lang_Enable_eGroupWare-Popup_backend}</td>
     <td>
      <select name="newsettings[popup_enable]">
@@ -22,10 +22,20 @@
      </select>
     </td>
    </tr>
+   <tr class="row_off">
+    <td>{lang_Poll_interval}</td>
+    <td>
+     <select name="newsettings[popup_poll_interval]">
+      <option value="60"{selected_popup_poll_interval_60}>1 {lang_minute}</option>
+      <option value="120"{selected_popup_poll_interval_120}>2 {lang_minutes}</option>
+      <option value="300"{selected_popup_poll_interval_300}>5 {lang_minutes}</option>
+     </select>
+    </td>
+   </tr>
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_Windows-Popup_backend}</b></td>
    </tr>
-   <tr bgcolor="{row_on}">
+   <tr class="row_on">
     <td>{lang_Enable_Windows-Popup_backend}</td>
     <td>
      <select name="newsettings[winpopup_enable]">
@@ -37,7 +47,7 @@
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_SMS_backend}</b></td>
    </tr>
-   <tr bgcolor="{row_on}">
+   <tr class="row_on">
     <td>{lang_Enable_SMS_backend}</td>
     <td>
      <select name="newsettings[sms_enable]">
@@ -46,13 +56,13 @@
      </select>
     </td>
    </tr> 
-   <tr bgcolor="{row_off}">
+   <tr class="row_off">
     <td>{lang_Maximum_SMS_messages_per_notification}</td>
     <td>
      <select name="newsettings[sms_maxmessages]">
-      <option value="1">1</option>
-      <option value="2">2</option>
-      <option value="3">3</option>
+      <option value="1"{selected_sms_maxmessages_1}>1</option>
+      <option value="2"{selected_sms_maxmessages_2}>2</option>
+      <option value="3"{selected_sms_maxmessages_3}>3</option>
      </select>
     </td>
    </tr>

From cd3e5788e8e817fb9dacc5abe0ba850bef4c125e Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Mon, 6 Apr 2009 21:47:18 +0000
Subject: [PATCH 170/510] updated lang files for notifications

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

diff --git a/notifications/setup/egw_de.lang b/notifications/setup/egw_de.lang
index d6e50cabf0..5c7f792cee 100644
--- a/notifications/setup/egw_de.lang
+++ b/notifications/setup/egw_de.lang
@@ -23,9 +23,11 @@ if set, embedded links get rendered special for external clients	notifications	d
 linked entries:	notifications	de	Verknüpfte Einträge:
 maximum sms messages per notification	admin	de	Maximale Anzahl an SMS Nachrichten pro Benachrichtigung
 message from	notifications	de	Nachricht von
+minutes	notifications	de	Minuten
 notification	common	de	Benachrichtigung
 notify me by	notifications	de	Benachrichtige mich per
 optimize e-mails for external mail client	notifications	de	Optimiere E-Mails für externe Mailclients
+poll interval	notifications	de	Abfrageintervall
 preferences for notification	notifications	de	Benachrichtigungs-Einstellungen
 received	notifications	de	Erhalten
 sms backend	admin	de	SMS Backend
diff --git a/notifications/setup/egw_en.lang b/notifications/setup/egw_en.lang
index 4d13809c3f..8186d914cf 100644
--- a/notifications/setup/egw_en.lang
+++ b/notifications/setup/egw_en.lang
@@ -23,9 +23,11 @@ if set, embedded links get rendered special for external clients	notifications	e
 linked entries:	notifications	en	Linked entries:
 maximum sms messages per notification	admin	en	Maximum SMS messages per notification
 message from	notifications	en	Message from
+minutes	notifications	en	minutes
 notification	common	en	Notification
 notify me by	notifications	en	Notify me by
 optimize e-mails for external mail client	notifications	en	Optimize E-Mails for external mail client
+poll interval	notifications	en	Poll interval
 preferences for notification	notifications	en	Preferences for notification
 received	notifications	en	Received
 sms backend	admin	en	SMS backend

From abc2de958ac86a0428405a3bb4aa86e943ddb640 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Apr 2009 19:32:27 +0000
Subject: [PATCH 171/510] "Reimplemented stream_open, to ensure our url_stat
 gets called, which fills the stat-cache with our eAcl"

---
 .../inc/class.links_stream_wrapper.inc.php    | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.links_stream_wrapper.inc.php b/phpgwapi/inc/class.links_stream_wrapper.inc.php
index b8692daf74..db755c5e0e 100644
--- a/phpgwapi/inc/class.links_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.links_stream_wrapper.inc.php
@@ -7,7 +7,7 @@
  * @package api
  * @subpackage vfs
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id: class.sqlfs_stream_wrapper.inc.php 24997 2008-03-02 21:44:15Z ralfbecker $
  */
 
@@ -28,7 +28,7 @@
  *
  * The stream wrapper interface is according to the docu on php.net
  *
- * @link http://de.php.net/manual/de/function.stream-wrapper-register.php
+ * @link http://www.php.net/manual/en/function.stream-wrapper-register.php
  */
 class links_stream_wrapper extends sqlfs_stream_wrapper
 {
@@ -184,6 +184,28 @@ class links_stream_wrapper extends sqlfs_stream_wrapper
 		//error_log(__METHOD__."($path,$mode,$options) apps=$apps, app=$app, id=$id: returning $ret");
 		return $ret;
 	}
+
+	/**
+	 * This method is called immediately after your stream object is created.
+	 *
+	 * Reimplemented from sqlfs to ensure self::url_stat is called, to fill sqlfs stat cache with our eacl!
+	 *
+	 * @param string $url URL that was passed to fopen() and that this object is expected to retrieve
+	 * @param string $mode mode used to open the file, as detailed for fopen()
+	 * @param int $options additional flags set by the streams API (or'ed together):
+	 * - STREAM_USE_PATH      If path is relative, search for the resource using the include_path.
+	 * - STREAM_REPORT_ERRORS If this flag is set, you are responsible for raising errors using trigger_error() during opening of the stream.
+	 *                        If this flag is not set, you should not raise any errors.
+	 * @param string $opened_path full path of the file/resource, if the open was successfull and STREAM_USE_PATH was set
+	 * @return boolean true if the ressource was opened successful, otherwise false
+	 */
+	function stream_open ( $url, $mode, $options, &$opened_path )
+	{
+		// the following call is necessary to fill sqlfs_stream_wrapper::$stat_cache, WITH the extendes ACL!
+		self::url_stat($url,0);
+
+		return parent::stream_open($url,$mode,$options,$opened_path);
+	}
 }
 
 stream_register_wrapper(links_stream_wrapper::SCHEME ,'links_stream_wrapper');

From e33b55efa34ffbdeff2b7c17fe44a2df940d40f1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Apr 2009 19:37:50 +0000
Subject: [PATCH 172/510] "- only show thumbnail for image types with support
 (eg. not for tiff) - resolve symlinks for links"

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

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index 10042f49bb..9d622b8f55 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -207,11 +207,16 @@ class vfs_widget
 					$class .= ($class ? ' ' : '') . 'vfsMimeIcon';
 					$cell['span'] = $span.','.$class;
 				}
-				elseif($path && $mime_main == 'image' && (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
+				elseif($path && $mime_main == 'image' && in_array($mime_sub,array('gif','jpeg','jpg','gif','bmp')) &&
+					(string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
 					(string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
 					// check the size of the image, as too big images get no icon, but a PHP Fatal error:  Allowed memory size exhausted
 					(!is_array($value) && ($stat = egw_vfs::stat($path)) ? $stat['size'] : $value['size']) < 600000)
 				{
+					if (substr($path,0,6) == '/apps/')
+					{
+						$path = parse_url(egw_vfs::resolve_url_symlinks($path),PHP_URL_PATH);
+					}
 					$value = $GLOBALS['egw']->link('/etemplate/thumbnail.php',array('path' => $path));
 				}
 				else

From 7be96d4412e36b759590adfcdd470f21ab515589 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Apr 2009 19:40:42 +0000
Subject: [PATCH 173/510] "added file_exists()"

---
 etemplate/thumbnail.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/etemplate/thumbnail.php b/etemplate/thumbnail.php
index c2fc0cccfc..d331fa9bb0 100644
--- a/etemplate/thumbnail.php
+++ b/etemplate/thumbnail.php
@@ -9,6 +9,12 @@
 * @version $Id$
 */
 
+// strip slashes from _GET parameters, if someone still has magic_quotes_gpc on
+if (get_magic_quotes_gpc() && $_GET)
+{
+	$_GET = etemplate::array_stripslashes($_GET);
+}
+
 if (isset($_GET['app']))
 {
 	$app = $_GET['app'];
@@ -27,30 +33,26 @@ $GLOBALS['egw_info']['flags'] = array(
 );
 include ('../header.inc.php');
 
-// strip slashes from _GET parameters, if someone still has magic_quotes_gpc on
-if (get_magic_quotes_gpc() && $_GET)
-{
-	$_GET = etemplate::array_stripslashes($_GET);
-}
-
 if (isset($_GET['path']))
 {
-	$g_srcfile = egw_vfs::PREFIX.$_GET['path'];
+	$g_srcfile = $_GET['path'];
 }
 else
 {
-	$g_srcfile = egw_link::vfs_path($_GET['app'],$_GET['id'],$_GET['file']);
+	$g_srcfile = egw_link::vfs_path($_GET['app'],$_GET['id'],$_GET['file'],true);
 }
+$g_dstfile = $GLOBALS['egw_info']['server']['temp_dir'] . '/egw-thumbs'.$g_srcfile;
+$g_srcfile = egw_vfs::PREFIX.$g_srcfile;
+
 if (!file_exists($g_srcfile) || !egw_vfs::is_readable($g_srcfile))
 {
 	//error_log("file_exists('$g_srcfile')=".(int)file_exists($g_srcfile).", egw_vfs::is_readable('$g_srcfile')=".(int)egw_vfs::is_readable($g_srcfile));
 	header('404 Not found');
 	exit;
 }
-$g_dstfile = $GLOBALS['egw_info']['server']['temp_dir'] . '/egw-thumbs'.parse_url($g_srcfile,PHP_URL_PATH);
 
 // Check for existing thumbnail
-if(filemtime($g_dstfile) >= filemtime($g_srcfile)) {
+if(file_exists($g_dstfile) && filemtime($g_dstfile) >= filemtime($g_srcfile)) {
 	header('Content-Type: image/png');
 	readfile($g_dstfile);
 	return;

From e21fdcc3fc7eb2632ae3f5ce049438008959e70c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Apr 2009 19:42:46 +0000
Subject: [PATCH 174/510] "- docu update - adding some options to quite stats -
 using stat-cache only if it contains a positiv response or $eacl is not set"

---
 phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index aedf07ae1d..e4691a3532 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -136,9 +136,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	protected $opened_fs_id;
 	/**
-	 * Directory vfs::ls() of dir opened with dir_opendir()
+	 * Cache containing stat-infos from previous url_stat calls AND dir_opendir calls
 	 *
-	 * This static var gets overwritten by each new dir_opendir, it helps to not read the entries twice.
+	 * It's values are the columns read from the DB (fs_*), not the ones returned by url_stat!
 	 *
 	 * @var array $path => info-array pairs
 	 */
@@ -180,11 +180,12 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$this->opened_mode = $mode = str_replace('b','',$mode);	// we are always binary, like every Linux system
 		$this->opened_stream = null;
 
-		if (!($stat = self::url_stat($path,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = self::url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
 		{
 			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
 				$mode[0] == 'x' ||	// or file should not exist, but does
-				!egw_vfs::check_access($dir,egw_vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))	// or we are not allowed to 																																			create it
+				!($dir_stat=self::url_stat($dir,STREAM_URL_STAT_QUIET)) ||	// or parent dir does not exist																																			create it
+				!egw_vfs::check_access($dir,egw_vfs::WRITABLE,$dir_stat))	// or we are not allowed to 																																			create it
 			{
 				self::_remove_password($url);
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
@@ -632,7 +633,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 
 		// check if we should also create all non-existing path components and our parent does not exist,
 		// if yes call ourself recursive with the parent directory
-		if (($options & STREAM_MKDIR_RECURSIVE) && $path != '/' && !$parent)
+		if (($options & STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent)
 		{
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__." creating parents: $parent_path, $mode");
 			if (!self::mkdir($parent_path,$mode,$options))
@@ -965,7 +966,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			$path = substr($path,0,-1);
 		}
 		// check if we already have the info from the last dir_open call, as the old vfs reads it anyway from the db
-		if (self::$stat_cache && isset(self::$stat_cache[$path]))
+		if (self::$stat_cache && isset(self::$stat_cache[$path]) && (is_null($eacl_access) || self::$stat_cache[$path] !== false))
 		{
 			return self::$stat_cache[$path] ? self::_vfsinfo2stat(self::$stat_cache[$path]) : false;
 		}

From 2248427e48ae162b1b967df332668bc6fceba3a5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Apr 2009 09:10:07 +0000
Subject: [PATCH 175/510] "fixed bug reported by Martin Kramer on the German
 list: attachments via WebGUI are no longer working: File
 'links://default/apps/infolog/1265/2009-04-07_1219.png' is not an absolute
 path!"

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

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index 0d3db245c7..a230d38ece 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -783,7 +783,7 @@ class egw_link extends solink
 		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
 		{
 			if (($Ok = copy($file['tmp_name'],$fname = egw_vfs::concat($entry_dir,$file['name'])) &&
-				($stat = egw_vfs::stat($fname,0))) && $comment)
+				($stat = egw_vfs::url_stat($fname,0))) && $comment)
 			{
 				egw_vfs::proppatch(parse_url($fname,PHP_URL_PATH),array(array('name'=>'comment','val'=>$comment)));	// set comment
 			}

From bd8ba08bc3aabfa4fa56eedce78bbe41163ca158 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Apr 2009 09:54:13 +0000
Subject: [PATCH 176/510] allowing stream-wrappers to specify an other
 mime-type for directories

---
 etemplate/inc/class.vfs_widget.inc.php        |  2 +-
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index 9d622b8f55..cc1339c678 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -152,7 +152,7 @@ class vfs_widget
 					}
 					if (egw_vfs::check_access($path,egw_vfs::READABLE))	// show link only if we have access to the file or dir
 					{
-						if ($n < count($comps)-1 || $mime == egw_vfs::DIR_MIME_TYPE)
+						if ($n < count($comps)-1 || $mime == egw_vfs::DIR_MIME_TYPE || egw_vfs::is_dir($path))
 						{
 							$value['l'.$n] = '/index.php?menuaction=filemanager.filemanager_ui.index&path='.urlencode($path);
 							$target = '';
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index e2343188fb..3b53a6175f 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -595,11 +595,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		{
 			return false;
 		}
-		if (is_dir($url))
-		{
-			$mime = self::DIR_MIME_TYPE;
-		}
-		if (!$mime && ($scheme = parse_url($url,PHP_URL_SCHEME)))
+		if (($scheme = parse_url($url,PHP_URL_SCHEME)))
 		{
 			// check it it's an eGW stream wrapper returning mime-type via url_stat
 			if (class_exists($class = self::scheme2class($scheme)) && ($mime_attr = @constant($class.'::STAT_RETURN_MIME_TYPE')))
@@ -611,6 +607,10 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 				}
 			}
 		}
+		if (!$mime && is_dir($url))
+		{
+			$mime = self::DIR_MIME_TYPE;
+		}
 		// if we operate on the regular filesystem and the mime_content_type function is available --> use it
 		if (!$mime && !$scheme && function_exists('mime_content_type'))
 		{

From 7698d3ef650def11e56e932049b65dfcc1670f39 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 06:41:41 +0000
Subject: [PATCH 177/510] Fixed not (always) updated last password change date

---
 phpgwapi/inc/class.accounts_ldap.inc.php |  7 ++++---
 phpgwapi/inc/class.accounts_sql.inc.php  |  1 +
 phpgwapi/inc/class.auth_ldap.inc.php     | 12 +++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index 0897db9ae9..0d9f1599ea 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -488,7 +488,7 @@ class accounts_ldap
 			// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
 			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0]*24*3600+$utc_diff < time() ? false : 'A',
 			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
-			'account_lastpasswd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0]*24*3600 : null,
+			'account_lastpasswd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0]*24*3600+$utc_diff : null,
 			// lastlogin and lastlogin from are not availible via the shadowAccount object class
 			// 'account_lastlogin' => $data['phpgwaccountlastlogin'][0],
 			// 'account_lastloginfrom' => $data['phpgwaccountlastloginfrom'][0],
@@ -548,6 +548,7 @@ class accounts_ldap
 		}
 		$to_write['cn']        = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
 
+		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
 		{
 			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
@@ -555,13 +556,13 @@ class accounts_ldap
 				$data['account_passwd'] = auth::encrypt_ldap($data['account_passwd']);
 			}
 			$to_write['userpassword'] = $data['account_passwd'];
+			$to_write['shadowLastChange'] = (time()-$utc_diff) / (24*3600);
 		}
 		// both status and expires are encoded in the single shadowexpire value in LDAP
 		// - if it's unset an account is enabled AND does never expire
 		// - if it's set to 0, the account is disabled
 		// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 		// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-		$utc_diff = date('Z');
 		$shadowexpire = ($data['account_expires']-$utc_diff) / (24*3600);
 		$account_expire = $shadowexpire*3600*24+$utc_diff;
 		//echo "<p align=right>account_expires=".date('Y-m-d H:i',$data['account_expires'])." --> $shadowexpire --> ".date('Y-m-d H:i',$account_expire)."</p>\n";
@@ -714,7 +715,7 @@ class accounts_ldap
 				$relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet);
 				// if we do not have a start, or want the members of a certain group, we want all, that way we dont want to or the uids
 				// since if we have a whole lot of members, it slows the query down
-				// if you work with very big groups, it may present a problem 
+				// if you work with very big groups, it may present a problem
 				if (is_numeric($start) || is_numeric($param['type'])) {
 					$filter = "(" . "&(objectclass=posixaccount)" . '(|(uid='.implode(')(uid=',$relevantAccounts).'))' . $this->account_filter . ")";
 				} else {
diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 5f506346e3..ac8ccadfe5 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -167,6 +167,7 @@ class accounts_sql
 				$data['account_passwd'] = $GLOBALS['egw']->auth->encrypt_sql($data['account_passwd']);
 			}
 			$to_write['account_pwd'] = $data['account_passwd'];
+			$to_write['account_lastpwd_change'] = time();
 		}
 		if (!(int)$data['account_id'] || !$this->id2name($data['account_id']))
 		{
diff --git a/phpgwapi/inc/class.auth_ldap.inc.php b/phpgwapi/inc/class.auth_ldap.inc.php
index cc02c0b33c..70410fa2bd 100644
--- a/phpgwapi/inc/class.auth_ldap.inc.php
+++ b/phpgwapi/inc/class.auth_ldap.inc.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * eGroupWare API - LDAP Authentication
- * 
+ *
  * @link http://www.egroupware.org
  * @author Lars Kneschke <lkneschke@linux-at-work.de>
- * @author Joseph Engo <jengo@phpgroupware.org> 
+ * @author Joseph Engo <jengo@phpgroupware.org>
  * Copyright (C) 2000, 2001 Joseph Engo
  * Copyright (C) 2002, 2003 Lars Kneschke
   * @license http://opensource.org/licenses/lgpl-license.php LGPL - GNU Lesser General Public License
@@ -107,9 +107,9 @@ class auth_
 	/**
 	 * changes password in LDAP
 	 *
-	 * If $old_passwd is given, the password change is done binded as user and NOT with the 
+	 * If $old_passwd is given, the password change is done binded as user and NOT with the
 	 * "root" dn given in the configurations.
-	 * 
+	 *
 	 * @param string $old_passwd must be cleartext or empty to not to be checked
 	 * @param string $new_passwd must be cleartext
 	 * @param int $account_id account id of user whose passwd should be changed
@@ -134,8 +134,10 @@ class auth_
 		$ds = $GLOBALS['egw']->common->ldapConnect();
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter);
 		$allValues = ldap_get_entries($ds, $sri);
-		
+
 		$entry['userpassword'] = auth::encrypt_password($new_passwd);
+		$entry['shadowLastChange'] = (time()-date('Z')) / (24*3600);
+
 		$dn = $allValues[0]['dn'];
 
 		if($old_passwd)	// if old password given (not called by admin) --> bind as that user to change the pw

From bbcb856b77c3293e07725645f7fc3063a1df4c9e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 07:13:01 +0000
Subject: [PATCH 178/510] "fixed not correctly translated holidays downloaded
 from egroupware.org (charset was not recogniced because of HTTP headers
 before charset line)"

---
 calendar/inc/class.boholiday.inc.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/calendar/inc/class.boholiday.inc.php b/calendar/inc/class.boholiday.inc.php
index 0c0549df22..f541d84931 100755
--- a/calendar/inc/class.boholiday.inc.php
+++ b/calendar/inc/class.boholiday.inc.php
@@ -26,7 +26,7 @@
 			'delete_holiday'	=> True,
 			'delete_locale'	=> True,
 			'accept_holiday'	=> True,
-			
+
 			'read_entries'	=> True,
 			'read_entry'	=> True,
 			'add_entry'	=> True,
@@ -168,7 +168,7 @@
 				}
 				// sort holidays by year / occurence:
 				usort($holidays,'_holiday_cmp');
-				
+
 				$last_year = -1;
 				foreach($holidays as $holiday)
 				{
@@ -291,16 +291,23 @@
 					$lines = @file(EGW_SERVER_ROOT.'/calendar/egroupware.org/holidays.'.strtoupper($locale).'.csv');
 				}
 				else
+				{
 					$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
-
+				}
 				if (!$lines)
 				{
 					return false;
 				}
-				$charset = split("[\t\n ]+",$lines[0]);		// give a bit flexibility in the syntax AND remove the lineend (\n)
-				if (strpos($charset[0],'charset') !== false && $charset[1])
+				// reading the holidayfile from egroupware.org via network::gethttpsocketfile contains all the headers!
+				foreach($lines as $n => $line)
 				{
-					$lines = $GLOBALS['egw']->translation->convert($lines,$charset[1]);
+					$fields = split("[\t\n ]+",$line);
+
+					if ($fields[0] == 'charset' && $fields[1])
+					{
+						$lines = $GLOBALS['egw']->translation->convert($lines,$fields[1]);
+						break;
+					}
 				}
 				$c_lines = count($lines);
 				foreach ($lines as $i => $line)
@@ -475,7 +482,7 @@
 
 				$dow_str = Array(lang('Sun'),lang('Mon'),lang('Tue'),lang('Wed'),lang('Thu'),lang('Fri'),lang('Sat'));
 				$dow = $dow_str[$holiday['dow']];
-				
+
 				$str = lang('%1 %2 in %3',$occ,$dow,$month);
 			}
 			else

From b39f985d043cda8fcddb715f9792032f2ee951f9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 07:22:44 +0000
Subject: [PATCH 179/510] new holiday files from egroupware.org

---
 calendar/egroupware.org/holidays.AR.csv | 16 +++++++++++++++
 calendar/egroupware.org/holidays.BD.csv | 15 ++++++++++++++
 calendar/egroupware.org/holidays.BY.csv | 17 ++++++++++++++++
 calendar/egroupware.org/holidays.CN.csv | 11 +++++++++++
 calendar/egroupware.org/holidays.HU.csv | 26 +++++++++++++++++++++++++
 calendar/egroupware.org/holidays.ID.csv | 21 ++++++++++++++++++++
 calendar/egroupware.org/holidays.IN.csv | 16 +++++++++++++++
 calendar/egroupware.org/holidays.LI.csv | 10 ++++++++++
 calendar/egroupware.org/holidays.LU.csv | 19 ++++++++++++++++++
 calendar/egroupware.org/holidays.SG.csv | 14 +++++++++++++
 calendar/egroupware.org/holidays.SI.csv | 18 +++++++++++++++++
 calendar/egroupware.org/holidays.ST.csv | 13 +++++++++++++
 calendar/egroupware.org/holidays.UA.csv | 15 ++++++++++++++
 13 files changed, 211 insertions(+)
 create mode 100644 calendar/egroupware.org/holidays.AR.csv
 create mode 100644 calendar/egroupware.org/holidays.BD.csv
 create mode 100644 calendar/egroupware.org/holidays.BY.csv
 create mode 100644 calendar/egroupware.org/holidays.CN.csv
 create mode 100644 calendar/egroupware.org/holidays.HU.csv
 create mode 100644 calendar/egroupware.org/holidays.ID.csv
 create mode 100644 calendar/egroupware.org/holidays.IN.csv
 create mode 100644 calendar/egroupware.org/holidays.LI.csv
 create mode 100644 calendar/egroupware.org/holidays.LU.csv
 create mode 100644 calendar/egroupware.org/holidays.SG.csv
 create mode 100644 calendar/egroupware.org/holidays.SI.csv
 create mode 100644 calendar/egroupware.org/holidays.ST.csv
 create mode 100644 calendar/egroupware.org/holidays.UA.csv

diff --git a/calendar/egroupware.org/holidays.AR.csv b/calendar/egroupware.org/holidays.AR.csv
new file mode 100644
index 0000000000..c76249534b
--- /dev/null
+++ b/calendar/egroupware.org/holidays.AR.csv
@@ -0,0 +1,16 @@
+charset	utf-8
+
+regular (year=0):
+AR	Año Nuevo	1	1	0	0	0
+AR	Día Nacional de la Memoria por la Verdad y la Just	24	3	0	0	0
+AR	Día del Veterano y Caídos en la Guerra de Malvinas	2	4	0	0	0
+AR	Día del Trabajador	1	5	0	0	0
+AR	Primer Gobierno Patrio	25	5	0	0	0
+AR	Día de la Independencia	9	7	0	0	0
+AR	Día de la Raza	12	10	0	0	1
+AR	Inmaculada Concepción de María	8	12	0	0	0
+AR	Navidad	25	12	0	0	0
+
+3:
+AR	Paso a la Inmortalidad Gral Manuel Belgrano (20/6)	0	6	3	1	0
+AR	Paso a la Inmortalidad Gral José de Sn.Martín 17/8	0	8	3	1	0
diff --git a/calendar/egroupware.org/holidays.BD.csv b/calendar/egroupware.org/holidays.BD.csv
new file mode 100644
index 0000000000..d0b69b80e5
--- /dev/null
+++ b/calendar/egroupware.org/holidays.BD.csv
@@ -0,0 +1,15 @@
+charset	utf-8
+
+regular (year=0):
+BD	International Mother Language Day	21	2	0	0	0
+BD	National Independence Day	26	3	0	0	0
+BD	Bengali New Year	14	4	0	0	0
+BD	May day	1	5	0	0	0
+BD	Jonmashtomee	24	8	0	0	0
+BD	Durga Puja	9	10	0	0	0
+BD	Victory Day	16	12	0	0	0
+BD	Christmas Day	25	12	0	0	0
+
+2008:
+BD	Eid- E - Miladunnobi	21	3	2008	0	0
+BD	Laila Tul Barat	17	8	2008	0	0
diff --git a/calendar/egroupware.org/holidays.BY.csv b/calendar/egroupware.org/holidays.BY.csv
new file mode 100644
index 0000000000..6132ab5d96
--- /dev/null
+++ b/calendar/egroupware.org/holidays.BY.csv
@@ -0,0 +1,17 @@
+charset	utf-8
+
+regular (year=0):
+BY	�овый Год	1	1	0	0	0
+BY	Право�лавное Рожде�тво	7	1	0	0	0
+BY	День защитников Отече�тва и Вооруженных Сил РБ	23	2	0	0	0
+BY	Международный жен�кий день	8	3	0	0	0
+BY	День Кон�титуции	15	3	0	0	0
+BY	День единени� народов Белару�и и Ро��ии	2	4	0	0	0
+BY	День труда	1	5	0	0	0
+BY	День Победы	9	5	0	0	0
+BY	День Ре�публики	3	7	0	0	0
+BY	День Окт�брь�кой революции	7	11	0	0	0
+BY	Католиче�кое Рожде�тво	25	12	0	0	0
+
+2009:
+BY	День �и�темного админи�тратора	31	7	2009	0	0
diff --git a/calendar/egroupware.org/holidays.CN.csv b/calendar/egroupware.org/holidays.CN.csv
new file mode 100644
index 0000000000..b74669d0cb
--- /dev/null
+++ b/calendar/egroupware.org/holidays.CN.csv
@@ -0,0 +1,11 @@
+charset	utf-8
+
+2009:
+CN	Losar (Tibet New Year)	22	2	2009	0	0
+CN	Losar (Tibet New Year)	23	2	2009	0	0
+CN	Losar (Tibet New Year)	24	2	2009	0	0
+CN	Losar (Tibet New Year)	25	2	2009	0	0
+CN	Losar (Tibet New Year)	26	2	2009	0	0
+CN	Losar (Tibet New Year)	27	2	2009	0	0
+CN	Losar (Tibet New Year)	28	2	2009	0	0
+CN	Losar (Tibet New Year)	1	3	2009	0	0
diff --git a/calendar/egroupware.org/holidays.HU.csv b/calendar/egroupware.org/holidays.HU.csv
new file mode 100644
index 0000000000..1126c1f960
--- /dev/null
+++ b/calendar/egroupware.org/holidays.HU.csv
@@ -0,0 +1,26 @@
+charset	utf-8
+
+regular (year=0):
+HU	Újév	1	1	0	0	0
+HU	Vízkereszt	6	1	0	0	0
+HU	Valentin nap	14	2	0	0	0
+HU	NÅ‘nap	8	3	0	0	0
+HU	Munka ünnepe	1	5	0	0	0
+HU	Sznetivánéj	24	6	0	0	0
+HU	Szent István, az államalapítás ünnepe	20	8	0	0	0
+HU	Nemzeti ünnep	23	10	0	0	0
+HU	Mindenszentek napja	1	11	0	0	0
+HU	Halottak napja	2	11	0	0	0
+HU	Mikulás	6	12	0	0	0
+HU	Karácsony	25	12	0	0	0
+HU	Karácsony	26	12	0	0	0
+HU	Szilveszter	31	12	0	0	0
+
+1:
+HU	Anyák napja	0	5	1	0	0
+
+99:
+HU	Gyermeknap	0	5	99	0	0
+
+2008:
+HU	Nemzeti ünnep	15	3	2008	0	0
diff --git a/calendar/egroupware.org/holidays.ID.csv b/calendar/egroupware.org/holidays.ID.csv
new file mode 100644
index 0000000000..548a98359c
--- /dev/null
+++ b/calendar/egroupware.org/holidays.ID.csv
@@ -0,0 +1,21 @@
+charset	utf-8
+
+regular (year=0):
+ID	Tahun Baru Masehi	1	1	0	0	1
+ID	Natal	25	12	0	0	1
+
+2007:
+ID	Waisak 2007	1	6	2007	0	0
+ID	1 Syawal 1428H	13	10	2007	0	0
+ID	2 Syawal 1428H	14	10	2007	0	0
+ID	Idul Adha 1428H	20	12	2007	0	1
+
+2008:
+ID	Cuti Bersama Idul Fitri 1429H	29	9	2008	0	0
+ID	Cuti Bersama Idul Fitri 1429H	30	9	2008	0	0
+ID	Idul Fitri 1419H	1	10	2008	0	0
+ID	Idul Fitri 1419H	2	10	2008	0	0
+ID	Cuti Bersama Idul Fitri 1429H	3	10	2008	0	0
+
+2009:
+ID	Tahun Baru Imlek 2560	26	1	2009	0	0
diff --git a/calendar/egroupware.org/holidays.IN.csv b/calendar/egroupware.org/holidays.IN.csv
new file mode 100644
index 0000000000..acaded2080
--- /dev/null
+++ b/calendar/egroupware.org/holidays.IN.csv
@@ -0,0 +1,16 @@
+charset	utf-8
+
+2009:
+IN	New Year	1	1	2009	0	0
+IN	Republic Day	26	1	2009	0	0
+IN	Good Friday	10	4	2009	0	0
+IN	VISHU	14	4	2009	0	0
+IN	May Day	1	5	2009	0	0
+IN	Independence Day	15	8	2009	0	0
+IN	Thiruvonam	2	9	2009	0	0
+IN	Third Onam	3	9	2009	0	0
+IN	MahaNavami	27	9	2009	0	0
+IN	VijayaDashami	28	9	2009	0	0
+IN	Gandhu Jayanthi	2	10	2009	0	0
+IN	Bakrid	27	11	2009	0	0
+IN	Xmas	25	12	2009	0	0
diff --git a/calendar/egroupware.org/holidays.LI.csv b/calendar/egroupware.org/holidays.LI.csv
new file mode 100644
index 0000000000..7c511086ed
--- /dev/null
+++ b/calendar/egroupware.org/holidays.LI.csv
@@ -0,0 +1,10 @@
+charset	utf-8
+
+regular (year=0):
+LI	Neujahr	1	1	0	0	0
+LI	Dreikönigstag	6	1	0	0	0
+LI	Maifeiertag	1	5	0	0	0
+LI	Fürstenfest	15	8	0	0	0
+LI	Maria Geburt	8	12	0	0	0
+LI	1. Weihnachtstag	25	12	0	0	0
+LI	2. Weihnachtstag	26	12	0	0	0
diff --git a/calendar/egroupware.org/holidays.LU.csv b/calendar/egroupware.org/holidays.LU.csv
new file mode 100644
index 0000000000..7df050f5d7
--- /dev/null
+++ b/calendar/egroupware.org/holidays.LU.csv
@@ -0,0 +1,19 @@
+charset	utf-8
+
+regular (year=0):
+LU	Nouvel an	1	1	0	0	1
+LU	Fête du travail	1	5	0	0	1
+LU	Fête nationale	23	6	0	0	1
+LU	Assomption	15	8	0	0	1
+LU	Toussaint	1	11	0	0	1
+LU	Noël	25	12	0	0	0
+LU	Saint Etienne	26	12	0	0	0
+LU	Saint Sylvestre	31	12	0	0	0
+
+2009:
+LU	Pâques	12	4	2009	0	0
+LU	Lundi de Pâques	13	4	2009	0	0
+LU	Ascension	21	5	2009	0	0
+LU	Pentecôte	31	5	2009	0	0
+LU	Lundi de Pentecôte	1	6	2009	0	0
+LU	Fête des mères	14	6	2009	0	0
diff --git a/calendar/egroupware.org/holidays.SG.csv b/calendar/egroupware.org/holidays.SG.csv
new file mode 100644
index 0000000000..3280286fa7
--- /dev/null
+++ b/calendar/egroupware.org/holidays.SG.csv
@@ -0,0 +1,14 @@
+charset	utf-8
+
+2009:
+SG	New Year Day	1	1	2009	0	1
+SG	Chinese New Year	26	1	2009	0	1
+SG	Chinese New Year	27	1	2009	0	1
+SG	Good Friday	10	4	2009	0	1
+SG	Labour Day	1	5	2009	0	1
+SG	Vesak Day	9	5	2009	0	1
+SG	National Day	9	8	2009	0	1
+SG	Hari Raya Puasa	20	9	2009	0	1
+SG	Deepavali	15	11	2009	0	1
+SG	Hari Raya Haji	27	11	2009	0	1
+SG	Christmas Day	25	12	2009	0	1
diff --git a/calendar/egroupware.org/holidays.SI.csv b/calendar/egroupware.org/holidays.SI.csv
new file mode 100644
index 0000000000..3e73e6377e
--- /dev/null
+++ b/calendar/egroupware.org/holidays.SI.csv
@@ -0,0 +1,18 @@
+charset	utf-8
+
+regular (year=0):
+SI	Novo leto	1	1	0	0	0
+SI	Novo leto (državni praznik)	2	1	0	0	0
+SI	Slovenski kulturni praznik	8	2	0	0	0
+SI	Dan upora proti ukopatorju	27	4	0	0	0
+SI	Praznik dela	1	5	0	0	0
+SI	Praznik dela	2	5	0	0	0
+SI	Dan državnosti	25	6	0	0	0
+SI	Marijino vnebovzetje	15	8	0	0	0
+SI	Dan reformacije	31	10	0	0	0
+SI	Dan spomina na mrtve	1	11	0	0	0
+SI	Boži�	25	12	0	0	0
+SI	Dan samostojnosti in enotnosti	26	12	0	0	0
+
+2009:
+SI	Velikono�ni ponedeljek	13	4	2009	0	0
diff --git a/calendar/egroupware.org/holidays.ST.csv b/calendar/egroupware.org/holidays.ST.csv
new file mode 100644
index 0000000000..494729e093
--- /dev/null
+++ b/calendar/egroupware.org/holidays.ST.csv
@@ -0,0 +1,13 @@
+
+regular (year=0):
+ST	Dia do Rei Amador	4	1	0	0	0
+ST	Martires da Liberdade	3	2	0	0	0
+ST	Dia Internacional dos Trabalhaores	1	5	0	0	0
+ST	Dia da Independência Nacional	12	7	0	0	0
+ST	Dia das Forças Armadas	6	9	0	0	0
+ST	Dia da Internacionalização das Roças	30	9	0	0	0
+ST	Dia de São Tomé	21	12	0	0	0
+ST	Dia da Família	25	12	0	0	0
+
+2008:
+ST	Confraternização Universal	1	1	2008	0	0
diff --git a/calendar/egroupware.org/holidays.UA.csv b/calendar/egroupware.org/holidays.UA.csv
new file mode 100644
index 0000000000..9c7e7b04cb
--- /dev/null
+++ b/calendar/egroupware.org/holidays.UA.csv
@@ -0,0 +1,15 @@
+charset	utf-8
+
+regular (year=0):
+UA	�ОВЫЙ ГОД	1	1	0	0	1
+UA	Рожде�тво Хри�тово	7	1	0	0	1
+UA	8 Марта	8	3	0	0	1
+UA	День Труда	1	5	0	0	1
+UA	День Труда	2	5	0	0	1
+UA	День Победы	9	5	0	0	1
+UA	День Кон�титуции	28	6	0	0	1
+UA	День �езави�имо�ти	24	8	0	0	1
+
+2008:
+UA	Па�ха	27	4	2008	0	1
+UA	Троица	15	6	2008	0	1

From b0521b0b1432409a1bfea4b23e8622af7caebad3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 07:35:06 +0000
Subject: [PATCH 180/510] "- newer DK holidays thanks to Marius Madsen -
 converted to utf-8 and sorted by year"

---
 calendar/egroupware.org/holidays.DK.csv | 117 +++++++++++++++++-------
 1 file changed, 85 insertions(+), 32 deletions(-)

diff --git a/calendar/egroupware.org/holidays.DK.csv b/calendar/egroupware.org/holidays.DK.csv
index 400851a9dc..621d31db7a 100644
--- a/calendar/egroupware.org/holidays.DK.csv
+++ b/calendar/egroupware.org/holidays.DK.csv
@@ -1,35 +1,88 @@
-charset	iso-8859-1
-DK	Nytårsdag	1	1	0	0	0
-DK	Palmesøndag	20	3	2005	0	0
-DK	Skærtorsdag	24	3	2005	0	0
-DK	Langfredag	25	3	2005	0	0
-DK	Påskedag	27	3	2005	0	0
-DK	2. Påskedag	28	3	2005	0	0
-DK	Palmesøndag	1	4	2007	0	0
-DK	Skærtorsdag	5	4	2007	0	0
-DK	Langfredag	6	4	2007	0	0
-DK	Påskedag	8	4	2007	0	0
-DK	Palmesøndag	9	4	2006	0	0
-DK	2. Påskedag	9	4	2007	0	0
-DK	Skærtorsdag	13	4	2006	0	0
-DK	Langfredag	14	4	2006	0	0
-DK	Påskedag	16	4	2006	0	0
-DK	2. Påskedag	17	4	2006	0	0
-DK	St. Bededag	22	4	2005	0	0
-DK	1. maj	1	5	0	0	0
-DK	St. Bededag	4	5	2007	0	0
-DK	Kristi Himmelfartsdag	5	5	2005	0	0
-DK	St. Bededag	12	5	2006	0	0
-DK	Pinsedag	15	5	2005	0	0
-DK	2. Pinsedag	16	5	2005	0	0
-DK	Kristi Himmelfartsdag	17	5	2007	0	0
-DK	Kristi Himmelfartsdag	25	5	2006	0	0
-DK	Pinsedag	27	5	2007	0	0
-DK	2. Pinsedag	28	5	2007	0	0
-DK	Pinsedag	4	6	2006	0	0
-DK	Grundlovsdag	5	6	0	0	0
-DK	2. Pinsedag	5	6	2006	0	0
+charset	utf-8
+
+regular:
+DK	Nytårsdag	1	1	0	0	0
+DK	1. Maj	1	5	0	0	0
 DK	Juleaften	24	12	0	0	0
 DK	Juledag	25	12	0	0	0
 DK	2. Juledag	26	12	0	0	0
-DK	Nytår	31	12	0	0	0
+DK	Nytår	31	12	0	0	0
+DK	Anden juledag	26	12	0	0	0
+
+2005:
+DK	Palmesøndag	20	3	2005	0	0
+DK	Skærtorsdag	24	3	2005	0	0
+DK	Langfredag	25	3	2005	0	0
+DK	PÃ¥skedag	27	3	2005	0	0
+DK	2. PÃ¥skedag	28	3	2005	0	0
+DK	St. Bededag	22	4	2005	0	0
+DK	Pinsedag	15	5	2005	0	0
+DK	2. Pinsedag	16	5	2005	0	0
+DK	Kristi Himmelfartsdag	5	5	2005	0	0
+DK	Grundlovsdag	5	6	0	0	0
+
+2006:
+DK	Palmesøndag	9	4	2006	0	0
+DK	Skærtorsdag	13	4	2006	0	0
+DK	Langfredag	14	4	2006	0	0
+DK	PÃ¥skedag	16	4	2006	0	0
+DK	2. PÃ¥skedag	17	4	2006	0	0
+DK	St. Bededag	12	5	2006	0	0
+DK	Kristi Himmelfartsdag	25	5	2006	0	0
+DK	Pinsedag	4	6	2006	0	0
+DK	2. Pinsedag	5	6	2006	0	0
+
+2007:
+DK	Palmesøndag	1	4	2007	0	0
+DK	Skærtorsdag	5	4	2007	0	0
+DK	Langfredag	6	4	2007	0	0
+DK	PÃ¥skedag	8	4	2007	0	0
+DK	2. PÃ¥skedag	9	4	2007	0	0
+DK	St. Bededag	4	5	2007	0	0
+DK	Kristi Himmelfartsdag	17	5	2007	0	0
+DK	Pinsedag	27	5	2007	0	0
+DK	2. Pinsedag	28	5	2007	0	0
+
+2009:
+DK	Palmesøndag	5	4	2009	0	0
+DK	Skærtorsdag	9	4	2009	0	0
+DK	Langfredag	10	4	2009	0	0
+DK	PÃ¥skedag	12	4	2009	0	0
+DK	Anden påskedag	13	4	2009	0	0
+DK	Store bededag	8	5	2009	0	0
+DK	Kristi himmelfartsdag	21	5	2009	0	0
+DK	Pinsedag	31	5	2009	0	0
+DK	Anden pinsedag	1	6	2009	0	0
+
+2010:
+DK	Palmesøndag	28	3	2010	0	0
+DK	Skærtorsdag	1	4	2010	0	0
+DK	Langfredag	2	4	2010	0	0
+DK	PÃ¥skedag	4	4	2010	0	0
+DK	Anden påskedag	5	4	2010	0	0
+DK	Store bededag	30	4	2010	0	0
+DK	Kristi himmelfartsdag	13	5	2010	0	0
+DK	Pinsedag	23	5	2010	0	0
+DK	Anden pinsedag	24	5	2010	0	0
+
+2011:
+DK	Palmesøndag	17	4	2011	0	0
+DK	Skærtorsdag	21	4	2011	0	0
+DK	Langfredag	22	4	2011	0	0
+DK	PÃ¥skedag	24	4	2011	0	0
+DK	Anden påskedag	25	4	2011	0	0
+DK	Store bededag	20	5	2011	0	0
+DK	Kristi himmelfartsdag	2	6	2011	0	0
+DK	Pinsedag	12	6	2011	0	0
+DK	Anden pinsedag	13	6	2011	0	0
+
+2012:
+DK	Palmesøndag	1	4	2012	0	0
+DK	Skærtorsdag	5	4	2012	0	0
+DK	Langfredag	6	4	2012	0	0
+DK	PÃ¥skedag	8	4	2012	0	0
+DK	Anden påskedag	9	4	2012	0	0
+DK	Store bededag	4	5	2012	0	0
+DK	Kristi himmelfartsdag	17	5	2012	0	0
+DK	Pinsedag	27	5	2012	0	0
+DK	Anden pinsedag	28	5	2012	0	0

From 5291d0ac396d9a659566a77b4778767a5d77ccae Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 08:11:24 +0000
Subject: [PATCH 181/510] Fixing the fix ;-) shadowLastChange has to be an
 integer

---
 phpgwapi/inc/class.accounts_ldap.inc.php | 2 +-
 phpgwapi/inc/class.auth_ldap.inc.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index 0d9f1599ea..cb8c1d6f67 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -556,7 +556,7 @@ class accounts_ldap
 				$data['account_passwd'] = auth::encrypt_ldap($data['account_passwd']);
 			}
 			$to_write['userpassword'] = $data['account_passwd'];
-			$to_write['shadowLastChange'] = (time()-$utc_diff) / (24*3600);
+			$to_write['shadowLastChange'] = round((time()-$utc_diff) / (24*3600));
 		}
 		// both status and expires are encoded in the single shadowexpire value in LDAP
 		// - if it's unset an account is enabled AND does never expire
diff --git a/phpgwapi/inc/class.auth_ldap.inc.php b/phpgwapi/inc/class.auth_ldap.inc.php
index 70410fa2bd..babf99e236 100644
--- a/phpgwapi/inc/class.auth_ldap.inc.php
+++ b/phpgwapi/inc/class.auth_ldap.inc.php
@@ -136,7 +136,7 @@ class auth_
 		$allValues = ldap_get_entries($ds, $sri);
 
 		$entry['userpassword'] = auth::encrypt_password($new_passwd);
-		$entry['shadowLastChange'] = (time()-date('Z')) / (24*3600);
+		$entry['shadowLastChange'] = round((time()-date('Z')) / (24*3600));
 
 		$dn = $allValues[0]['dn'];
 

From 592488908e5244e6c1c8d287872978c0dad5b24a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 11:49:16 +0000
Subject: [PATCH 182/510] "fixed filemanger bug: actions dont work for
 filenames containing commas --> allow to enclose comma-separated checkbox and
 radio-button option values in quotes (\"), so they can contain commas eg.
 file-names containing commas in the filemanager"

---
 etemplate/inc/class.boetemplate.inc.php | 48 +++++++++++++++++++++++--
 etemplate/inc/class.etemplate.inc.php   |  4 +--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 94750d4012..3648e7a60e 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -166,7 +166,7 @@ class boetemplate extends soetemplate
 			$row_cont = $cont[$row];
 			$col_row_cont = $cont[$col.$row];
 
-			eval('$name = "'.$name.'";');
+			eval('$name = "'.addslashes($name).'";');
 		}
 		if ($is_index_in_content)
 		{
@@ -684,6 +684,50 @@ class boetemplate extends soetemplate
 		return $extra['widgets'];
 	}
 
+	/**
+	 * Split a $delimiter-separated options string, which can contain parts with delimiters enclosed in $enclosure
+	 *
+	 * Examples:
+	 * - csv_split('"1,2,3",2,3') === array('1,2,3','2','3')
+	 * - csv_split('1,2,3',2) === array('1','2,3')
+	 * - csv_split('"1,2,3",2,3',2) === array('1,2,3','2,3')
+	 *
+	 * @param string $str
+	 * @param int $num=null in how many parts to split maximal, parts over this number end up (unseparated) in the last part
+	 * @param string $delimiter=','
+	 * @param string $enclosure='"'
+	 * @return array
+	 */
+	static function csv_split($str,$num=null,$delimiter=',',$enclosure='"')
+	{
+		if (strpos($str,$enclosure) === false)
+		{
+			return explode($delimiter,$str,$num);	// no need to run this more expensive code
+		}
+		$parts = explode($delimiter,$str);
+		for($n = 0; isset($parts[$n]); ++$n)
+		{
+			$part =& $parts[$n];
+			if ($part[0] === $enclosure)
+			{
+				while (isset($parts[$n+1]) && substr($part,-1) !== $enclosure)
+				{
+					$part .= $delimiter.$parts[++$n];
+					unset($parts[$n]);
+				}
+				$part = substr($part,1,-1);
+			}
+		}
+		$parts = array_values($parts);	// renumber the parts (in case we had to concat them)
+
+		if ($num > 0 && count($parts) > $num)
+		{
+			$parts[$num-1] = implode($delimiter,array_slice($parts,$num-1,count($parts)-$num+1));
+			$parts = array_slice($parts,0,$num);
+		}
+		return $parts;
+	}
+
 	/**
 	 * generated a file-name from an eTemplates, name, template(-set) and lang
 	 *
@@ -926,4 +970,4 @@ if (!function_exists('set_cell_attribute_helper'))
 	}
 }
 // just in case someone still uses the old var
-$GLOBALS['egw_info']['flags']['etemplate']['loop'] =& boetemplate::$loop;
\ No newline at end of file
+$GLOBALS['egw_info']['flags']['etemplate']['loop'] =& boetemplate::$loop;
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 8e69ba5bd2..66b47d8c5a 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1176,7 +1176,7 @@ class etemplate extends boetemplate
 				$set_val = 1; $unset_val = 0;
 				if (!empty($cell_options))
 				{
-					list($set_val,$unset_val,$ro_true,$ro_false) = explode(',',$cell_options);
+					list($set_val,$unset_val,$ro_true,$ro_false) = self::csv_split($cell_options);
 					if (!$set_val && !$unset_val) $set_val = 1;
 					$value = $value == $set_val;
 				}
@@ -1216,7 +1216,7 @@ class etemplate extends boetemplate
 				}
 				break;
 			case 'radio':		// size: value if checked, readonly set, readonly unset
-				list($set_val,$ro_true,$ro_false) = explode(',',$cell_options);
+				list($set_val,$ro_true,$ro_false) = self::csv_split($cell_options);
 				$set_val = $this->expand_name($set_val,$show_c,$show_row,$content['.c'],$content['.row'],$content);
 
 				if ($value == $set_val)

From 95a0339cc9fe9070bf6b1c083ab4e2eff324cabb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 12:44:56 +0000
Subject: [PATCH 183/510] "fixing the fix ;-) addslashes does to much --> now
 quoting only quotes"

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

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 3648e7a60e..1bcfa9e9b6 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -166,7 +166,7 @@ class boetemplate extends soetemplate
 			$row_cont = $cont[$row];
 			$col_row_cont = $cont[$col.$row];
 
-			eval('$name = "'.addslashes($name).'";');
+			eval('$name = "'.str_replace('"','\\"',$name).'";');
 		}
 		if ($is_index_in_content)
 		{

From 3795ae9a9835dc4c07e8fa371a32738a01ff05fd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 13:24:34 +0000
Subject: [PATCH 184/510] "fix for bug #1867: Several problems with non-ascii
 as first char in filename: that char is skiped in dir creation, rename or
 filecreation"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index e4691a3532..d9fef2e0eb 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -202,7 +202,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 			$stmt = self::$pdo->prepare($query);
 			$values = array(
-				'fs_name' => basename($path),
+				'fs_name' => egw_vfs::basename($path),
 				'fs_dir'  => $dir_stat['ino'],
 				// we use the mode of the dir, so files in group dirs stay accessible by all members
 				'fs_mode' => $dir_stat['mode'] & 0666,
@@ -582,7 +582,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_dir=:fs_dir,fs_name=:fs_name WHERE fs_id=:fs_id');
 		return $stmt->execute(array(
 			'fs_dir'  => $to_dir_stat['ino'],
-			'fs_name' => basename($path_to),
+			'fs_name' => egw_vfs::basename($path_to),
 			'fs_id'   => $from_stat['ino'],
 		));
 	}
@@ -655,8 +655,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		unset(self::$stat_cache[$path]);
 		$stmt = self::$pdo->prepare('INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_creator'.
 					') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_size,:fs_mime,:fs_created,:fs_modified,:fs_creator)');
-		return  $stmt->execute(array(
-			'fs_name' => basename($path),
+		return $stmt->execute(array(
+			'fs_name' => egw_vfs::basename($path),
 			'fs_dir'  => $parent['ino'],
 			'fs_mode' => $parent['mode'],
 			'fs_uid'  => $parent['uid'],
@@ -1148,7 +1148,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		unset(self::$stat_cache[$link]);
 
 		return !!$stmt->execute(array(
-			'fs_name' => basename($link),
+			'fs_name' => egw_vfs::basename($link),
 			'fs_dir'  => $dir_stat['ino'],
 			'fs_mode' => ($dir_stat['mode'] & 0666),
 			'fs_uid'  => $dir_stat['uid'] ? $dir_stat['uid'] : egw_vfs::$user,

From 74fd4858b681599c08ae4e6e418012c60b5f551d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Apr 2009 14:05:14 +0000
Subject: [PATCH 185/510] - ability to add links via clipboard - grayed out
 icons, if dir is not writable - switch recursive list off, when moving up

---
 filemanager/inc/class.filemanager_ui.inc.php  |  31 ++++++++++++++++--
 filemanager/setup/egw_de.lang                 |   6 +++-
 filemanager/setup/egw_en.lang                 |   4 +++
 filemanager/setup/etemplates.inc.php          |   6 ++--
 .../default/images/createdir_disabled.png     | Bin 0 -> 1118 bytes
 .../default/images/editpaste_disabled.png     | Bin 0 -> 781 bytes
 .../default/images/link_disabled.png          | Bin 0 -> 658 bytes
 .../templates/default/images/linkpaste.png    | Bin 0 -> 1148 bytes
 .../default/images/linkpaste_disabled.png     | Bin 0 -> 1062 bytes
 filemanager/templates/default/index.xet       |   9 ++---
 10 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 filemanager/templates/default/images/createdir_disabled.png
 create mode 100644 filemanager/templates/default/images/editpaste_disabled.png
 create mode 100644 filemanager/templates/default/images/link_disabled.png
 create mode 100644 filemanager/templates/default/images/linkpaste.png
 create mode 100644 filemanager/templates/default/images/linkpaste_disabled.png

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index a6cf3e66bd..ae6568adb2 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -148,6 +148,8 @@ class filemanager_ui
 					if ($content['nm']['path'] != '/')
 					{
 						$content['nm']['path'] = dirname($content['nm']['path']);
+						// switch recusive display off
+						if (!$content['nm']['filter']) $content['nm']['filter'] = '1';
 					}
 					break;
 				case 'home':
@@ -176,7 +178,7 @@ class filemanager_ui
 					$target = $content['nm']['path'];
 					$ses = $GLOBALS['egw']->session->appsession('index','filemanager');
 					$content['nm']['path'] = $ses['path'];
-					$link = egw_vfs::concat($content['nm']['path'],basename($target));
+					$link = egw_vfs::concat($content['nm']['path'],egw_vfs::basename($target));
 					$abs_target = $target[0] == '/' ? $target : egw_vfs::concat($content['nm']['path'],$target);
 					if (!egw_vfs::stat($abs_target))
 					{
@@ -189,6 +191,9 @@ class filemanager_ui
 				case 'paste':
 					$content['nm']['msg'] = self::action($clipboard_type.'_paste',$clipboard_files,$content['nm']['path']);
 					break;
+				case 'linkpaste':
+					$content['nm']['msg'] = self::action('link_paste',$clipboard_files,$content['nm']['path']);
+					break;
 				case 'upload':
 					if (!$content['upload'])
 					{
@@ -234,10 +239,12 @@ class filemanager_ui
 		}
 		$content['paste_tooltip'] = $clipboard_files ? '<p><b>'.lang('%1 the following files into current directory',
 			$clipboard_type=='copy'?lang('Copy'):lang('Move')).':</b><br />'.implode('<br />',$clipboard_files).'</p>' : '';
+		$content['linkpaste_tooltip'] = $clipboard_files ? '<p><b>'.lang('%1 the following files into current directory',
+			lang('link')).':</b><br />'.implode('<br />',$clipboard_files).'</p>' : '';
 		$content['upload_size'] = self::max_upload_size_message();
 		//_debug_array($content);
 
-		$readonlys['button[paste]'] = !$clipboard_files;
+		$readonlys['button[linkpaste]'] = $readonlys['button[paste]'] = !$clipboard_files || !$dir_is_writable;
 		$readonlys['button[createdir]'] = !$dir_is_writable;
 		$readonlys['button[symlink]'] = !$dir_is_writable;
 		$readonlys['button[upload]'] = $readonlys['upload'] = !$dir_is_writable;
@@ -474,6 +481,26 @@ class filemanager_ui
 					return lang('%1 errors moving (%2 files moved)!',$errs,$files);
 				}
 				return lang('%1 files moved.',$files);
+
+			case 'link_paste':
+				foreach($selected as $path)
+				{
+					$to = egw_vfs::concat($dir,egw_vfs::basename($path));
+					if ($path != $to && egw_vfs::symlink($path,$to))
+					{
+						++$files;
+					}
+					else
+					{
+						++$errs;
+					}
+				}
+				$ret = lang('%1 elements linked.',$files);
+				if ($errs)
+				{
+					$ret = lang('%1 errors linking (%2)!',$errs,$ret);
+				}
+				return $ret." egw_vfs::symlink('$to','$path')";
 		}
 		return "Unknown action '$action'!";
 	}
diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index 492dd6b4c1..cd9219ed6a 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -1,8 +1,10 @@
 %1 already exists as a file	filemanager	de	%1 existiert schon als Datei
 %1 directories and %2 files copied.	filemanager	de	%1 Verzeichnisse und %2 Dateien kopiert.
 %1 directories and %2 files deleted.	filemanager	de	%1 Verzeichnisse und %2 Dateien gelöscht.
+%1 elements linked.	filemanager	de	%1 Elemente verküpft.
 %1 errors copying (%2 diretories and %3 files copied)!	filemanager	de	%1 Fehler beim Kopieren (%2 Verzeichnisse und %3 Dateien kopiert)!
 %1 errors deleteting (%2 directories and %3 files deleted)!	filemanager	de	%1 Fehler beim Löschen (%2 Verzeichnisse und %3 Dateien gelöscht)!
+%1 errors linking (%2)!	filemanager	de	%1 Fehler beim Verküpfen (%2)!
 %1 errors moving (%2 files moved)!	filemanager	de	%1 Fehler beim Verschieben (%2 Dateien verschoben)!
 %1 failed, %2 succeded	filemanager	de	%1 fehlgeschlagen, %2 erfolgreich
 %1 files copied.	filemanager	de	%1 Dateien kopiert.
@@ -27,6 +29,7 @@ comment	filemanager	de	Kommentar
 comments cannot contain "%1"	filemanager	de	Kommentare dürfen "%1" nicht enthalten
 copied	filemanager	de	kopiert
 copied %1 to %2	filemanager	de	%1 nach %2 kopiert
+copy	filemanager	de	kopieren
 copy to	filemanager	de	Copieren nach
 copy to clipboard	filemanager	de	Kopieren in die Zwischenablage
 could not copy %1 to %2	filemanager	de	Konnte %1 nicht nach %2 kopieren
@@ -96,6 +99,7 @@ go to your home directory	filemanager	de	Zu Ihrem Heimverzeichnis wechseln
 go up	filemanager	de	in das darüber liegende Verzeichnis wechseln
 id	filemanager	de	Id
 inherited	filemanager	de	Geerbt
+link	filemanager	de	verküpfen
 link %1: %2	filemanager	de	%1. Verknüpfung: %2
 link target %1 not found!	filemanager	de	Verküpfungsziel %1 nicht gefunden!
 location	filemanager	de	Ort
@@ -106,7 +110,7 @@ mime type	filemanager	de	MIME-Typ
 modified	filemanager	de	Verändert
 modified between	filemanager	de	verändert zwischen
 modify all subdirectories and their content	filemanager	de	Änderungen auf alle Unterverzeichnisse und ihre Inhalte anwenden
-move	filemanager	de	Verschieben
+move	filemanager	de	verschieben
 move to	filemanager	de	Verschieben nach
 moved %1 to %2	filemanager	de	%1 nach %2 verschoben
 no access	filemanager	de	Kein Zugriff
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index c12d24edca..c92de12fc0 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -1,8 +1,10 @@
 %1 already exists as a file	filemanager	en	%1 already exists as a file
 %1 directories and %2 files copied.	filemanager	en	%1 directories and %2 files copied.
 %1 directories and %2 files deleted.	filemanager	en	%1 directories and %2 files deleted.
+%1 elements linked.	filemanager	en	%1 elements linked.
 %1 errors copying (%2 diretories and %3 files copied)!	filemanager	en	%1 errors copying (%2 diretories and %3 files copied)!
 %1 errors deleteting (%2 directories and %3 files deleted)!	filemanager	en	%1 errors deleteting (%2 directories and %3 files deleted)!
+%1 errors linking (%2)!	filemanager	en	%1 errors linking (%2)!
 %1 errors moving (%2 files moved)!	filemanager	en	%1 errors moving (%2 files moved)!
 %1 failed, %2 succeded	filemanager	en	%1 failed, %2 succeded
 %1 files copied.	filemanager	en	%1 files copied.
@@ -27,6 +29,7 @@ comment	filemanager	en	Comment
 comments cannot contain "%1"	filemanager	en	Comments cannot contain "%1"
 copied	filemanager	en	copied
 copied %1 to %2	filemanager	en	Copied %1 to %2
+copy	filemanager	en	Copy
 copy to	filemanager	en	Copy to
 copy to clipboard	filemanager	en	Copy to clipboard
 could not copy %1 to %2	filemanager	en	Could not copy %1 to %2
@@ -96,6 +99,7 @@ go to your home directory	filemanager	en	Go to your home directory
 go up	filemanager	en	go up
 id	filemanager	en	Id
 inherited	filemanager	en	Inherited
+link	filemanager	en	Link
 link %1: %2	filemanager	en	Link %1: %2
 link target %1 not found!	filemanager	en	Link target %1 not found!
 location	filemanager	en	Location
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index 4826591693..981767eac5 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-03-19 16:18
+	* generated by soetemplate::dump4setup() 2009-04-09 15:57
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -54,9 +54,9 @@ $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '
 
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1235658193',);
 
-$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:12:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"9";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"link";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
+$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:13:{s:4:"type";s:4:"hbox";s:4:"size";s:2:"10";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:35:"button_createdir,createdir_disabled";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:18:"link,link_disabled";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:28:"editpaste,editpaste_disabled";s:4:"help";s:20:"$cont[paste_tooltip]";}i:10;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[linkpaste]";s:4:"size";s:28:"linkpaste,linkpaste_disabled";s:4:"help";s:24:"$cont[linkpaste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:5:"label";s:15:"$row_cont[mime]";s:4:"name";s:12:"${row}[icon]";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"size";s:14:",@${row}[link]";s:4:"name";s:12:"${row}[name]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[hsize]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:5:"label";s:16:"$row_cont[perms]";s:4:"span";s:6:",perms";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[user]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[group]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=400,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:15:"$row_cont[path]";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
-$templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:15:"$row_cont[path]";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
+$templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:17:""$row_cont[path]"";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
diff --git a/filemanager/templates/default/images/createdir_disabled.png b/filemanager/templates/default/images/createdir_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a23ed913edfc723dfbe071f59118ea2f784b139
GIT binary patch
literal 1118
zcmV-k1flzhP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ(
z4K@pBd)1==00Z7hL_t(I%e9ruOB`7ghrh0_YBhrN5EB(#3}hoj(xz4tZ1I7hiv%aT
zG)QQ0A#NtCJm|#?f!+v#SqfS7BLBcZl1)Gm1wn<T&7u(+d?aFPFm%(FU5{J$-dSX<
zAx=o<K`tDs>ek`Mt?!)ktC*CM@39QN(~8-){g0D}hK7<_>w;xj)6Hh{=ElZG>0-|2
z=H|aU@$m5QbZcwt?!9~WrswD9kx~}EmT!JbaBOVsN2OGuzrTOv&Ye5Bu8V1!jE|2G
z2q7N4ef##eFQSlAGBY!yFTQy3;zjK7<Hrv=Iy!#2d-ra#x3?GH_oHZOX<=bup<b)i
zZkEgCy^APfnM_7!G8u#rNGTCQaB^}&rBY#dc$mq_NdSZp2q7Y2Aq354lV{JK{l2}u
z{nJHZGm%IzFff3W65sb(UtcE-LmobSNKa1>T5CMd10bKzb9i`&QVOj#hGFpW<HzZ?
zwl=M`u6v&ML&R9?PZUm0PFPx6B9%&!$z=Y<?8%cSNGW;r=n;)ZgCGd-eILUxSY2IZ
zWo0G#8RMy`DSi3!WgN%BvMerLx`a|HI+aoi*LAsi^(y!8-=|b6ae8`+>$-TJ$I;Od
z`}_O&zE2PYu?R(XcQ?<UKSwFW!NCE&y}d{&@jMU5ac~@mX0u7HR%3g6JE}#a(O_?H
z58JjmI5+^Hudi<eSdLIAr4T~kx-OMUg)3LC@ZrM;j*gC~R;$$Ob?WsxjYfmBvons5
zkEzvajEsyhJ39-&>({RVem)mAlu`g_t?BISWOsL$a=A>oT&7Z~@c#XK-o1MlUAw!x
zNu^Q|%S0j(-S_qNP3QA@9Sz8NM^vj-48ve&X9vr&2*Z#d2oORLh9TFlUniT*vbD7Z
zfNk4Ymc_X(*tSh7l_H<dYf~wOl#*(-isLwFtqH@B)6-L=lt?KF!;mlxDV0hT3I*oo
z=18a0n5Kzg7>tgNl1``beV@g}MRK`ZEPmt0jbA4wCIE=X<5-qOYilb?DcalHqdn6!
zX=!QU`1qKeogIV_T)TFSL?VGwisj{HUcP)uE|-f%#Y-lWB$I!&VHk#Zp2ykQ8J_1w
zt>ybZ&1RFewY6{i@%ey!=1is;g=JY-mPI0wz%UHf*482vN-2UMKq*B!on~%sj?aqs
zMce!H)59>tG);sMym|A6Y&Ofr#s<Y=5!<#&r_-#iu13$<Z1z*}z9t-x$B|Ovx-O36
zaO>7B3WZNL+||`Zu~=kqaFAlL$g5Yc04NrV<Z`)~S*cVQ931>lzn|N;ZxaMTGzaH}
k<GhFePdt74RDWsz4~$cD3Fa-$a{vGU07*qoM6N<$f*8sXPyhe`

literal 0
HcmV?d00001

diff --git a/filemanager/templates/default/images/editpaste_disabled.png b/filemanager/templates/default/images/editpaste_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e741c31fbe3c9404dfe66f54d168ee88bc89c27
GIT binary patch
literal 781
zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ(
z4K@xJ5g{x900NCkL_t(I%av3yOCv!TeY-oWh7hoeg++cs3@9f_Fd_(cmST0++G#21
zK~hWVYjQs$RVvwBA!zJUrLa;YWW{A?b|+uvio0ERa@jTaU|^Y<eZ22|?;E31sbC(}
zYPAiZoZM4N4f_55`TX6xyE`lbo8PEZDnAQ_!q---rR`r`T{X70w$>jW9=?4>3IN9C
z<>fkn@0MkiUtV6;*Vfj`?RFck>uMK0&%@2l4TKPbVzKBF(V*38ou?67+uPf}c6N4-
zcXxM7kB^TVdwY9OO5y$eU0XpAAfM0U>FH_X^z^ip%jLdwI-TRg!^0m7t;px|<^BDA
z0KjZE0{{$%!_*Rq2&Ga9o12@szrQc1-D9)a48HG2O+&BOLl$ba8hqbJ5CoV`r|BMF
zTwJKLv$IUH(P)%;?l=yvudfYFu@C}55a2T$92~^ooO4JiF&>X$nkE3C*=(vLxfzBb
zgb<l)9=2`6vMez6k=A;>j%Kr|Vqzf#q?DO!5lqvBWm&Nmx3{;kasXgb%7v<y0b>kO
zN}QaW;Pv$t<M9}S!QjuCQVL-hYW{J~K}2!<ip8QH{=Z61(}Zo?cz%9{=XtPgTOa8#
z3_(P2T{pFKElS2m0Hl-%!w@SgE3uH6m~)QFWRjW7#AAf0FK=&e@O>Y-Tn<Vp?SH0}
zg6q2RkbFi;M37R#^E?nyT>f-A)hb~`gvn&GRI?1jfRqxP^Eh@|`HA>3B3jCVNR<#G
zRu&CM)Wl?em{Mw~$%}}I=-(&OvNYxKNOR7$GSZNYWfZwIQLNkT8b?P*YISurm9Wuh
zXv9$yBlU}_U;xnVc8x5hy<Sfx`w)2?mA}x6WxRD92ae<X*SP-%=dzxn<UN=<00000
LNkvXXu0mjf#9m?F

literal 0
HcmV?d00001

diff --git a/filemanager/templates/default/images/link_disabled.png b/filemanager/templates/default/images/link_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..facfd456dca5c398b86925e265a80077c31bef95
GIT binary patch
literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ(
z4L2`BV*oP%000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0005)Nkl<Z
zILnojKWi#M6vcnDD~bOgMPj39A@~O|2*E&f3mdHzl8<5IhwyXQq)csLDK=u76oR0g
zfvv1;l-1pxnO8hqUZR1Q1H-^&?%~`s=Zb#6uWj4rHxNRQ&*$lOyM)&3HO*#|hlhv%
zCRi*MjK^b^%OxRz`}=zeg#uDaX0sW#ZR2?!p6B8FK1wM}(<GTp(&=<C41>vJg5x-U
z2~IFglWMife!pil8nM}IP)Y>^mSvr(F}@eV;V^f1cfqWuTL?k5T0J8OeJ^}`d@vXc
zI2;a`ris=Xtu@hTlwz@n)*7W0TI+KKQc8xyAyP_&5X9qgo}ZtIL?WcqX`<06$Kw&t
z^DZm+{QP9Q-C~+1u~>{=uSY7CV!2#WE|&vCrIeQm9LGT^g%E<LrzbL*3{pxSA0H`|
zO1Q2IfbaX43DW5_S65d!j)UvENGWk$ms+hBG)gJIDEQ*R&CLy#WnmZw^Z6XxwgW#-
znK+#vzwzbeg;uMDl#;<<!2A0<$Kx@W-SfPkJvfD_-ELE<RG81_EEWsa>ovJtj%+rI
zQtI4;-EMalkVGOuqtT#VujBhZhr=Og-tBfl4npyGoY&V^-rn9WF3#!Uzi?fb>+5R_
s!$7Q7D?Ob~aUADYD}8%=OQllb59w+HH9@azy#N3J07*qoM6N<$f_vf_%K!iX

literal 0
HcmV?d00001

diff --git a/filemanager/templates/default/images/linkpaste.png b/filemanager/templates/default/images/linkpaste.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3988f63e461b756c97f993ea7132f3eaa481844
GIT binary patch
literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ(
z3JND9AJ#em00aC<L_t(I%Z-#xY*bYg$A53$n~%;+J1unv3IdfPqopzO6*Nd<R6<Ay
zhPW|=L=sIfabaTEsBCm$T&N38WT6|yl`9jX3o*tJB2jEKX)97HFaibofz$bV@4k26
zJuYULnU<mPpPZNbZqEJZfB)y)W6=S}kDnOGX8S%_y*m4XWwrJTg`3}vjs0=#)Txsf
z=jU%5mVtA3apB|PJ{`)c$;!s`ghXH4xpQRy)~$K0Hs;aM3wz4t@<;C;e&n6)1AS#}
zWM<b}7v}(3N^Aq1e}DLiM1S^&o}taJyNL})GHZ5h9T^#l`hI}tsb*v{-L{Cep+Dmu
zdN|+vij6+BXH&HB=XLMO?S&w`N3rsGY31%+>v{&)TDL|ubA^y%vE1>B#+XQIa8+tx
z_d25E-RZ=Yxi@k>(euD`yK)DhT$4m%Ma+`mUt*4CeC%f?|N3<ip)@{$*6iO05;%m)
zL;2RKKuf%%$EB)Z0uQl6hBw0SF@WH{g%LoMPf)4h`BeMUv3q>36W1VA9-$SoENmM~
zKrkSnM5vU*@<29Kfw@Jgk)~qhA-;S62s}i&7*$0)7f~+0(v+)4KKSf_bhM&e1rvA}
z$5}?M)n<eR5er}Wl&T<s+qsXcUPH0%G|vhGM%pUZ;1<BLzyj@gcuFKW_<3i=B47fA
z@pXOI(}?RgiKXrsp`FIjB|;~KZEDCuwXR{gmuGwrgN2kla2I!k8(G79rDObd+oGq-
zSzMumJiYf|oxI{{p3nF4>W=KeW|k<Auo^(sZ`ycQi?MyCW@>zR;4$*K6ql|oFk5s{
zS`&l@$Byvm+CFA{!&hf7ac$afDGp0zjOW*VS%T2^Fe2pAQC1`!9?B&-eeN<}d_T@?
zxk4_J;>$Ppk?rpW5sJlPv}HxHg0VUeEMxnNjJz>Z<-*lF_(6yXp*Iz0(}R6X*EAs9
zx^*+%BCggjv863g{|{}|youI^liyBKn6B{Lwm}l{2+2f@uC4^CQ~^LK)oNVjDx&qr
z3Ro?R1&pJR2JxMe;>Jvc&4c~CePla@nF^t?@HMDlNmqnMCeBX8t3xZjRHS{fH{d70
zr0VN*GD;>Lr>{FfJRT#zK1*mU+yGR#gn0Cy;)#-%mUEM-Ek-1|lsL0`MX$fpeg<%o
z35OT=ZshCJfAixn*LiZwT4J#%e$Y@XZNz7$W@~4rW<LeGfoPk-031Dfc*I!FE@|XH
z_4okU-W0!2&hyjxYYeS_fLyi*rCSwp+6I8zh<lLFZ_7>DwtO=_$A<ncL_ljG*MrtD
zwxICmXSsZ*hFyQ{IQ$Q2ZFqTmj&oOTQn;!Y%@1koBN5@*^(m6&B>w?{1R884`vBko
O0000<MNUMnLSTYet0SfW

literal 0
HcmV?d00001

diff --git a/filemanager/templates/default/images/linkpaste_disabled.png b/filemanager/templates/default/images/linkpaste_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a1f58962c1f59a61d80b3aaa69597d19691dd3c
GIT binary patch
literal 1062
zcmV+>1ljwEP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ(
z4L1>k0v(tD00X8;L_t(I%Z*e`ODjnfJ^kgRV+$rm6BWgP5;0jMt_H$j7*s^u$ozl-
zcQPv<{()J#d7FWmzc4G8Mi9xyO_+_Kqr`<tG#X=K7D--rS9Mp_Y)n66@|<^}psBij
z>fBT3UTJxG8Sf*ROil)a!9S*^rhbtm$=ffLN=KzqX}?mb6oe2QAB5Wd*x1+zxUL)N
zbUFrO?6-6}y|uo+4q2AH<m2PxwQM%~d3bpE_lb##Hs}2L?Ch)oKnw)VWHLXFjEwv}
zIXO92tJNgG-|vgZ<4Uz!?MaTu<65m&Td&vaKh4a{h{wmrdNP^(ba8Q!WsH$NU`pw)
zD=RCru~<yX<#M>YyTjAd)4&oP$B}1eXNR}8wvf-~jr;riPpYc^!x(#f%UlHj%d&i-
zP)H(#Kv5K2U0tD2DD;5}A;3Au>gp;8As~dnah!+{;)j7!Se6A!DJZ2#rBX<xQux0x
zO%t6?2d?XWQ52<5=dKj6Z5wYLFens7>0!<ogK3&=UDrF7W%cCB06++VZQCC%N+}2-
zuq+FvX~MSct{mdv;9#&T9LIre+t4%(-y4!7c^A5_JJ`pr>w*vhRaJWq2mRocD$5{*
zfH5X^cXtOf7D9kh>M^z~3xp7G&igcWT^FjVf-#16yA2_P_^|T`A&_MmtyT-RZTA6|
z%VkunRp`3jbGEd!l<7LcwrwO532bj~Z}$M(whhxX!8wO4%N}DzQBbefv9q&-`T2QV
zUS6WnXn;}*$8n%(8e*{++U+)uj*f71bMuvPtJMNy41+3TjDd5GU@(Y4Ab@Bziqq3m
z<nwt@O5yYQu)n{La5xMAXfzs{2i)m&dIrw>hkAQqu~<Z<Qh^WxLI`M@hQ-B2yu7>s
z04kM=;Q?Eg^-a4eisAuNN^y92h-R~iXf%qUp&|HuK8%izdh>-4^3`AOAMEXXcw0%W
zRztJdL^vGA-rgR{<uVv!-W$EQ+rPKBw_gH*!0@29)-=sy90&xU>pBd>fZy*&B9Q=N
z43=f}_+EY0_b<knsMqT$0DXEGhA|q6M1BUK8is+*%}r#pS!A<WWHK4(y6&}jmq54k
z%yzr|CxDSx;2zpzV`B+PlG5G$wY4>jkB{U0{2V7ICy2#jn4X@7<2Zc{A^=#gt1sr}
z<|a(j6uDdug+c+Gb2yHJP$&e)aq#f)fKsW1=jUf{LaN_0a9r0#I-SP#^)-sc;y3d+
g=U7-+fN7fe4=@BGlQ&`ZFaQ7m07*qoM6N<$f;;-?{Qv*}

literal 0
HcmV?d00001

diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index c10d0cd4cc..6bc9e8a0c8 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -47,7 +47,7 @@
 					<hbox align="right">
 						<button image="edit" label="Edit settings" id="edit[$row_cont[path]]" statustext="Rename, change permissions or ownership" onclick="window.open(egw::link('/index.php','menuaction=filemanager.filemanager_ui.file&amp;path=$row_cont[path]'),'fileprefs','dependent=yes,width=495,height=425,scrollbars=yes,status=yes'); return false;"/>
 						<button id="delete[$row_cont[path]]" image="delete" label="Delete" statustext="Delete this file or directory" onclick="return confirm('Delete this file or directory');" align="center"/>
-						<checkbox id="checked[]" align="right" options="$row_cont[path]"/>
+						<checkbox id="checked[]" align="right" options="&quot;$row_cont[path]&quot;"/>
 					</hbox>
 				</row>
 			</rows>
@@ -72,9 +72,10 @@
 						<button id="button[go]" image="key_enter" label="Go to"/>
 						<image src="buttonseparator"/>
 						<button image="edit" label="Edit settings" id="edit[{$cont[nm][path]}]" statustext="Rename, change permissions or ownership" onclick="window.open(egw::link('/index.php','menuaction=filemanager.filemanager_ui.file&amp;path={$cont[nm][path]}'),'fileprefs','dependent=yes,width=495,height=425,scrollbars=yes,status=yes'); return false;"/>
-						<button id="button[createdir]" image="button_createdir" label="Create directory" onclick="var dir = prompt(egw::lang('New directory')); if (!dir) return false; document.getElementById(form::name('nm[path]')).value=dir;"/>
-						<button image="link" label="Create a link" id="button[symlink]" onclick="var link = prompt(egw::lang('Link target')); if (!link) return false; document.getElementById(form::name('nm[path]')).value=link;"/>
-						<button id="button[paste]" image="editpaste" statustext="$cont[paste_tooltip]"/>
+						<button id="button[createdir]" image="button_createdir" ro_image="createdir_disabled" label="Create directory" onclick="var dir = prompt(egw::lang('New directory')); if (!dir) return false; document.getElementById(form::name('nm[path]')).value=dir;"/>
+						<button image="link" ro_image="link_disabled" label="Create a link" id="button[symlink]" onclick="var link = prompt(egw::lang('Link target')); if (!link) return false; document.getElementById(form::name('nm[path]')).value=link;"/>
+						<button id="button[paste]" image="editpaste" ro_image="editpaste_disabled" statustext="$cont[paste_tooltip]"/>
+						<button id="button[linkpaste]" image="linkpaste" ro_image="linkpaste_disabled" statustext="$cont[linkpaste_tooltip]"/>
 					</hbox>
 				</row>
 				<row>

From e20bd1703b89bfe514e08042611631f79827b108 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 07:50:14 +0000
Subject: [PATCH 186/510] "fix for bug #2041: Postrgresql error when I try to
 access a file in sqlfs \"CEST ERROR:  argument of AND must be type boolean,
 not type integer\" "

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index d9fef2e0eb..48f046c7d9 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -1046,8 +1046,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			{
 				$memberships[] = abs($gid);	// sqlfs stores the gid's positiv
 			}
-			$sql_read_acl = '(fs_mode & 04 OR fs_mode & 0400 AND fs_uid='.(int)egw_vfs::$user.
-				' OR fs_mode & 040 AND fs_gid IN('.implode(',',$memberships).'))';
+			$sql_read_acl = '((fs_mode & 04)=04 OR (fs_mode & 0400)=0400 AND fs_uid='.(int)egw_vfs::$user.
+				' OR (fs_mode & 040)=040 AND fs_gid IN('.implode(',',$memberships).'))';
 		}
 		return $sql_read_acl;
 	}

From 68f15f6c5a1a3772bc2f7bdf6ffdaa4ad810260f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 09:11:03 +0000
Subject: [PATCH 187/510] "fixed bug reported on German list: all new calendar
 events in trunk are private"

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

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 1bcfa9e9b6..0c93b6f516 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -702,7 +702,7 @@ class boetemplate extends soetemplate
 	{
 		if (strpos($str,$enclosure) === false)
 		{
-			return explode($delimiter,$str,$num);	// no need to run this more expensive code
+			return is_null($num) ? explode($delimiter,$str) : explode($delimiter,$str,$num);	// no need to run this more expensive code
 		}
 		$parts = explode($delimiter,$str);
 		for($n = 0; isset($parts[$n]); ++$n)

From 2b73958407c181c07c7fd3a720996d95f067e15e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 09:16:04 +0000
Subject: [PATCH 188/510] "title for ro-image of buttons"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 66b47d8c5a..1a44471b5e 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1277,7 +1277,7 @@ class etemplate extends boetemplate
 					}
 					$html .= !$readonly ? html::submit_button($form_name,$label,$onclick,
 						strlen($label) <= 1 || $cell['no_lang'],$options,$img,$app,$type == 'buttononly' ? 'button' : 'submit') :
-						html::image($app,$ro_img);
+						html::image($app,$ro_img,'',$options);
 				}
 				$extra_label = False;
 				if (!$readonly && $type != 'buttononly')	// input button, are never submitted back!

From 03e7348896906926fe1eac557b5ece09ac9c8b6c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 11:21:44 +0000
Subject: [PATCH 189/510] "fixing commit r26783/4 for mysql: using octal
 numbers with mysql leads to funny results: select 384 & 0400 --> 384 not
 256=0400 --> converted 0400, 040 and 04 to 256, 32 and 4 for mysql"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 48f046c7d9..87938dbbd8 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -1046,8 +1046,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			{
 				$memberships[] = abs($gid);	// sqlfs stores the gid's positiv
 			}
-			$sql_read_acl = '((fs_mode & 04)=04 OR (fs_mode & 0400)=0400 AND fs_uid='.(int)egw_vfs::$user.
-				' OR (fs_mode & 040)=040 AND fs_gid IN('.implode(',',$memberships).'))';
+			// using octal numbers with mysql leads to funny results (select 384 & 0400 --> 384 not 256=0400)
+			// 256 = 0400, 32 = 040
+			$sql_read_acl = '((fs_mode & 4)=4 OR (fs_mode & 256)=256 AND fs_uid='.(int)egw_vfs::$user.
+				' OR (fs_mode & 32)=32 AND fs_gid IN('.implode(',',$memberships).'))';
 		}
 		return $sql_read_acl;
 	}

From 6f3425773070540fa7da51649375f36827b230a7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 21:06:41 +0000
Subject: [PATCH 190/510] "allow to specifiy an onclick handler for vfs widget
 (instead of using download-url or filemanager to display dirs)"

---
 etemplate/inc/class.vfs_widget.inc.php | 35 ++++++++++++++++++--------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index cc1339c678..be8583d371 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -70,7 +70,7 @@ class vfs_widget
 		$readonly = $cell['readonly'] || $readonlys;
 
 		// check if we have a path and not the raw value, in that case we have to do a stat first
-		if (in_array($type,array('vfs-size','vfs-mode','vfs-uid','vfs-gid')) && !is_numeric($value))
+		if (in_array($type,array('vfs-size','vfs-mode','vfs-uid','vfs-gid')) && !is_numeric($value) || $type == 'vfs' && !$value)
 		{
 			if (!$value || !($stat = egw_vfs::stat($value)))
 			{
@@ -123,16 +123,16 @@ class vfs_widget
 				$cell['name'] = '';
 				$cell['type'] = 'hbox';
 				$cell['size'] = '0,,0,0';
-				foreach($comps=explode('/',$name) as $n => $component)
+				foreach($name != '/' ? explode('/',$name) : array('') as $n => $component)
 				{
-					if ($n)
+					if ($n > (int)($path === '/'))
 					{
 						$sep = soetemplate::empty_cell('label','',array('label' => '/'));
 						soetemplate::add_child($cell,$sep);
 						unset($sep);
 					}
-					$value['c'.$n] = $component;
-					$path .= '/'.$component;
+					$value['c'.$n] = $component !== '' ? $component : '/';
+					$path .= ($path != '/' ? '/' : '').$component;
 					// replace id's in /apps again with human readable titles
 					$path_parts = explode('/',$path);
 					if ($path_parts[1] == 'apps')
@@ -163,14 +163,29 @@ class vfs_widget
 							$target = ',,,_blank';
 						}
 					}
-					$comp = etemplate::empty_cell('label',$cell_name.'[c'.$n.']',array(
-						'size'    => ',@'.$cell_name.'[l'.$n.']'.$target,
-						'no_lang' => true,
-						'span'    => ',vfsFilename'
-					));
+					if ($cell['onclick'])
+					{
+						$comp = etemplate::empty_cell('button',$cell_name.'[c'.$n.']',array(
+							'size'    => '1',
+							'no_lang' => true,
+							'span'    => ',vfsFilename',
+							'label'   => $value['c'.$n],
+							'onclick' => str_replace('$path',"'".addslashes($path)."'",$cell['onclick']),
+						));
+					}
+					else
+					{
+						$comp = etemplate::empty_cell('label',$cell_name.'[c'.$n.']',array(
+							'size'    => ',@'.$cell_name.'[l'.$n.']'.$target,
+							'no_lang' => true,
+							'span'    => ',vfsFilename',
+						));
+					}
 					etemplate::add_child($cell,$comp);
 					unset($comp);
 				}
+				unset($cell['onclick']);	// otherwise it's handled by the grid too
+				//_debug_array($comps); _debug_array($cell); _debug_array($value);
 				break;
 
 			case 'vfs-mime':

From 823a3ab4c0c0c910984b73aad22efff8a3c382a5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 21:07:33 +0000
Subject: [PATCH 191/510] "allow to disable one of multiple checkboxes"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 1a44471b5e..4f4da615d7 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1180,6 +1180,10 @@ class etemplate extends boetemplate
 					if (!$set_val && !$unset_val) $set_val = 1;
 					$value = $value == $set_val;
 				}
+				if (($multiple = substr($cell['name'],-2) == '[]') && !$readonly)
+				{
+					$readonly = $readonlys[substr($cell['name'],0,-1).$set_val.']'];
+				}
 				if ($readonly)
 				{
 					if (count(explode(',',$cell_options)) < 3)
@@ -1195,7 +1199,7 @@ class etemplate extends boetemplate
 				{
 					if ($value) $options .= ' checked="checked"';
 
-					if (($multiple = substr($cell['name'],-2) == '[]'))
+					if ($multiple)
 					{
 						// add the set_val to the id to make it unique
 						$options = str_replace('id="'.$form_name,'id="'.substr($form_name,0,-2)."[$set_val]",$options);

From 9e346585992bf6429232ec098646bab4d67a180d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 21:09:04 +0000
Subject: [PATCH 192/510] "fixed not working egw_vfs::dirname if result should
 be '/', eg. egw_vfs::dirname('/home)"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 9cb7e6e5f4..82fc1cd4fa 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -977,12 +977,13 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		if ($url == '/' || $url[0] != '/' && parse_url($url,PHP_URL_PATH) == '/')
 		{
+			//error_log(__METHOD__."($url) returning FALSE: already in root!");
 			return false;
 		}
 		$parts = explode('/',$url);
 		if (substr($url,-1) == '/') array_pop($parts);
 		array_pop($parts);
-		if ($url[0] != '/' && count($parts) == 3)
+		if ($url[0] != '/' && count($parts) == 3 || count($parts) == 1 && $parts[0] === '')
 		{
 			array_push($parts,'');	// scheme://host is wrong (no path), has to be scheme://host/
 		}

From e7fd6b2cca9bbe2504494564d430e922037cae8d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 21:09:48 +0000
Subject: [PATCH 193/510] need lstat

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

diff --git a/filemanager/cli.php b/filemanager/cli.php
index 84055cf6de..49daae26f1 100755
--- a/filemanager/cli.php
+++ b/filemanager/cli.php
@@ -603,7 +603,7 @@ function do_stat($url,$long=false,$numeric=false,$full_path=false)
 	{
 		$bname = basename($bname);
 	}
-	if (!file_exists($url) || !($stat = stat($url)))
+	if (!file_exists($url) || !($stat = lstat($url)))
 	{
 		echo "$bname: no such file or directory!\n";
 	}

From 060339db1e0c878792e0533e9de27d5620e01164 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 21:11:06 +0000
Subject: [PATCH 194/510] not used

---
 filemanager/templates/default/search.xet | 119 -----------------------
 1 file changed, 119 deletions(-)
 delete mode 100644 filemanager/templates/default/search.xet

diff --git a/filemanager/templates/default/search.xet b/filemanager/templates/default/search.xet
deleted file mode 100644
index 59d5fbe908..0000000000
--- a/filemanager/templates/default/search.xet
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id$ -->
-<overlay>
-	<template id="filemanager.search.rows" template="" lang="" group="0" version="1.5.001">
-		<grid width="100%" height="auto">
-			<columns>
-				<column width="20"/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-				<column/>
-			</columns>
-			<rows>
-				<row class="th">
-					<nextmatch-sortheader label="Type" id="vfs_mime_type"/>
-					<nextmatch-sortheader label="Id" id="vfs_file_id"/>
-					<nextmatch-sortheader label="File" id="fulldir"/>
-					<nextmatch-sortheader label="Directory" id="vfs_directory"/>
-					<nextmatch-sortheader label="name" id="vfs_name"/>
-					<nextmatch-header label="mime type" id="mime_type"/>
-					<nextmatch-sortheader label="Size" id="vfs_size"/>
-					<nextmatch-sortheader label="comment" id="vfs_comment"/>
-					<nextmatch-sortheader label="created" id="vfs_created"/>
-					<nextmatch-accountfilter options="Created by" id="vfs_createdby_id"/>
-					<nextmatch-sortheader label="modified" id="vfs_modified"/>
-					<nextmatch-accountfilter options="Modified by" id="vfs_modifiedby_id"/>
-				</row>
-				<row class="row">
-					<image label="$row_cont[vfs_mime_type]" src="${row}[icon]" align="center"/>
-					<description id="${row}[vfs_file_id]" no_lang="1"/>
-					<description id="${row}[file]" no_lang="1" options=",$row_cont[file_link]"/>
-					<description id="${row}[vfs_directory]" no_lang="1" options=",$row_cont[dir_link]"/>
-					<description id="${row}[vfs_name]" no_lang="1" options=",$row_cont[file_link]"/>
-					<description id="${row}[vfs_mime_type]"/>
-					<description id="${row}[vfs_size]" align="right"/>
-					<description id="${row}[vfs_comment]" no_lang="1"/>
-					<date-time id="${row}[vfs_created]" options="Y-m-d H:i:s" readonly="true"/>
-					<menulist>
-						<menupopup type="select-account" id="${row}[vfs_createdby_id]" readonly="true"/>
-					</menulist>
-					<date-time id="${row}[vfs_modified]" options="Y-m-d H:i:s" readonly="true"/>
-					<menulist>
-						<menupopup type="select-account" id="${row}[vfs_modifiedby_id]" readonly="true"/>
-					</menulist>
-				</row>
-			</rows>
-		</grid>
-	</template>
-	<template id="filemanager.search" template="" lang="" group="0" version="1.3.001">
-		<groupbox id="debuginfos" disabled="true">
-			<caption label="Debuginfos"/>
-			<textbox multiline="true" id="message" readonly="true"/>
-			<description/>
-			<description/>
-			<description/>
-		</groupbox>
-		<grid>
-			<columns>
-				<column/>
-				<column/>
-				<column width="120"/>
-				<column width="120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<description value="searchstring" id="searchstringlabel"/>
-					<textbox span="2" id="searchstring"/>
-					<button label="start search" id="start_search"/>
-					<description/>
-				</row>
-				<row>
-					<description value="mime type"/>
-					<checkbox id="checkall"/>
-					<description value="All" id="alllabel"/>
-					<description rows="1" cols="1"/>
-					<description/>
-				</row>
-				<row>
-					<description/>
-					<checkbox id="checkonlyfiles"/>
-					<description value="files" id="filelabel"/>
-					<button label="clear search" id="clear_search" onclick="menuaction=filemanager.uifilemanager.index&amp;action=search&amp;actioncd=clear"/>
-					<description/>
-				</row>
-				<row>
-					<description/>
-					<checkbox id="checkonlydirs"/>
-					<description value="directory" id="dirlabel"/>
-					<checkbox label="Debug" id="debug" disabled="true"/>
-					<description/>
-				</row>
-				<row>
-					<description value="created between" id="createdlabel"/>
-					<checkbox id="searchcreated"/>
-					<date id="datecreatedfrom" options=",8"/>
-					<date id="datecreatedto" options=",8"/>
-					<textbox multiline="true" id="searchcreatedtext" readonly="true" no_lang="1"/>
-				</row>
-				<row>
-					<description value="modified between" id="modifiedlabel"/>
-					<checkbox id="searchmodified"/>
-					<date id="datemodifiedfrom" options=",8"/>
-					<date id="datemodifiedto" options=",8"/>
-					<textbox multiline="true" id="searchmodifiedtext" readonly="true" no_lang="1"/>
-				</row>
-			</rows>
-		</grid>
-		<hrule/>
-		<nextmatch options="filemanager.search.rows" id="nm"/>
-	</template>
-</overlay>
\ No newline at end of file

From a50e1cc2ec72675efdc49bf95b6e9729b5f871ce Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 21:11:57 +0000
Subject: [PATCH 195/510] allow to attach (multiple) files from filemanager in
 fmail compose

---
 .../inc/class.filemanager_select.inc.php      | 164 ++++++++++++++++++
 filemanager/templates/default/app.css         |  10 ++
 filemanager/templates/default/select.xet      |  62 +++++++
 3 files changed, 236 insertions(+)
 create mode 100644 filemanager/inc/class.filemanager_select.inc.php
 create mode 100644 filemanager/templates/default/select.xet

diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
new file mode 100644
index 0000000000..8cdfac311e
--- /dev/null
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * eGroupWare - Filemanager - select file to open / save dialog
+ *
+ * @link http://www.egroupware.org
+ * @package filemanager
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+class filemanager_select
+{
+	/**
+	 * Methods callable via menuaction
+	 *
+	 * @var array
+	 */
+	var $public_functions = array(
+		'select' => true,
+	);
+
+	/**
+	 * Constructor
+	 *
+	 */
+	function __construct()
+	{
+		// strip slashes from _GET parameters, if someone still has magic_quotes_gpc on
+		if (get_magic_quotes_gpc() && $_GET)
+		{
+			$_GET = etemplate::array_stripslashes($_GET);
+		}
+	}
+
+	/**
+	 * Callback to fetch the rows for the nextmatch widget
+	 *
+	 * @param array $query
+	 * @param array &$rows
+	 * @param array &$readonlys
+	 */
+	function get_rows($query,&$rows,&$readonlys)
+	{
+
+	}
+
+	function select(array $content=null)
+	{
+		if (!is_array($content))
+		{
+			$content = array();
+			$content['mode'] = $_GET['mode'];
+			if (!in_array($content['mode'],array('open','open-multiple','saveas','select-dir')))
+			{
+				throw new egw_exception_wrong_parameter("Wrong or unset required mode parameter!");
+			}
+			$content['path'] = $_GET['path'];
+			if (!isset($content['path']) && ($content['path'] = egw_session::appsession('select_path','filemanger')) === false ||
+				!egw_vfs::is_dir($content['path']))
+			{
+				$content['path'] = filemanager_ui::get_home_dir();
+			}
+			$content['method'] = $_GET['method'];
+			$content['id']     = $_GET['id'];
+			$content['label'] = isset($_GET['label']) ? $_GET['label'] : lang('Open');
+			$content['mime']   = $_GET['mime'];
+		}
+		else
+		{
+			//_debug_array($content); die('Stop');
+			if ($content['button']) list($button) = each($content['button']);
+			switch($button)
+			{
+				case 'up':
+					if ($content['path'] != '/') $content['path'] = egw_vfs::dirname($content['path']);
+					break;
+				case 'home':
+					$content['path'] = filemanager_ui::get_home_dir();
+					break;
+				case 'ok':
+					switch($content['mode'])
+					{
+						case 'open-multiple':
+							foreach((array)$content['dir']['selected'] as $name)
+							{
+								$files[] = egw_vfs::concat($content['path'],$name);
+							}
+							break;
+						case 'select-dir':
+							$files = $content['path'];
+							break;
+						default:
+							$files = egw_vfs::concat($content['path'],$content['name']);
+							break;
+					}
+					$js = ExecMethod2($content['method'],$content['id'],$files);
+					echo "<html>\n<head>\n<script type='text/javascript'>\n$js\n</script>\n</head>\n</html>\n";
+					$GLOBALS['egw']->common->egw_exit();
+			}
+		}
+		if (!($d = egw_vfs::opendir($content['path'])))
+		{
+			$content['msg'] = lang("Can't open directory %1!",$content['path']);
+		}
+		else
+		{
+			$n = 0;
+			$content['dir'] = array('mode' => $content['mode']);
+			while (($name = readdir($d)))
+			{
+				$path = egw_vfs::concat($content['path'],$name);
+				$is_dir = egw_vfs::is_dir($path);
+				$content['dir'][$n] = array(
+					'name' => $name,
+					'path' => $path,
+					'onclick' => $is_dir ? "return select_goto('".addslashes($path)."');" :
+						($content['mode'] != 'open-multiple' ? "return select_show('".addslashes($name)."');" :
+						"return select_toggle('".addslashes($name)."');"),
+				);
+				if ($is_dir && $content['mode'] == 'open-multiple')
+				{
+					$readonlys['selected['.$name.']'] = true;
+				}
+				++$n;
+			}
+			closedir($d);
+		}
+		$content['name'] = '';
+		$content['js'] = '<script type="text/javascript">
+function select_goto(to)
+{
+	path = document.getElementById("exec[path]");
+	path.value = to;
+	path.form.submit();
+	return false;
+}
+function select_show(file)
+{
+	name = document.getElementById("exec[name]");
+	name.value = file;
+	return false;
+}
+function select_toggle(file)
+{
+	checkbox = document.getElementById("exec[dir][selected]["+file+"]");
+	if (checkbox) checkbox.checked = !checkbox.checked;
+	return false;
+}
+</script>
+';
+		//_debug_array($content);
+		//_debug_array($readonlys);
+		egw_session::appsession('select_path','filemanger',$content['path']);
+		$tpl = new etemplate('filemanager.select');
+		$tpl->exec('filemanager.filemanager_select.select',$content,$sel_options,$readonlys,array(
+			'mode'   => $content['mode'],
+			'method' => $content['method'],
+			'id'     => $content['id'],
+			'label'  => $content['label'],
+		),2);
+	}
+}
diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css
index a4df6f0ddc..e560fb8ff2 100644
--- a/filemanager/templates/default/app.css
+++ b/filemanager/templates/default/app.css
@@ -8,3 +8,13 @@
 .comment textarea { width: 100%; height: 35px; }
 .previewImage img { max-width: 430px; max-height: 275px; border: 1px solid black; }
 .previewText div { }
+
+/**
+ * Select file dialog
+ */
+.selectPath { font-weight: bold; }
+.selectName input { width: 100%; }
+.selectMime select { width: 100%; }
+.selectIcon img { height: 16px; }
+.displayNone input { display: none; }
+.selectFiles td div { border-style: groove; }
\ No newline at end of file
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
new file mode 100644
index 0000000000..afabb9c04f
--- /dev/null
+++ b/filemanager/templates/default/select.xet
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="filemanager.select" template="" lang="" group="0" version="1.7.001">
+		<grid width="600">
+			<columns>
+				<column width="32"/>
+				<column/>
+			</columns>
+			<rows>
+				<row valign="top">
+					<button image="home" id="button[home]" align="center"/>
+					<grid width="100%">
+						<columns>
+							<column/>
+						</columns>
+						<rows>
+							<row>
+								<hbox>
+									<html id="js"/>
+									<button id="button[up]" image="goup"/>
+									<vfs id="path" onclick="path=document.getElementById(form::name('path')); path.value=$path; path.form.submit();" class="selectPath"/>
+									<textbox id="path" class="displayNone"/>
+								</hbox>
+							</row>
+							<row class="selectFiles">
+								<grid width="100%" height="400" overflow="auto" id="dir">
+									<columns>
+										<column width="20"/>
+										<column/>
+										<column width="1%" disabled="!@mode=open-multiple"/>
+									</columns>
+									<rows>
+										<row class="row">
+											<vfs-mime id="${row}[path]" class="selectIcon" align="center"/>
+											<vfs id="$row" onclick="$row_cont[onclick]"/>
+											<checkbox options="&quot;$row_cont[name]&quot;" id="selected[]" align="right"/>
+										</row>
+									</rows>
+								</grid>
+							</row>
+							<row disabled="@mode=open-multiple">
+								<textbox id="name" class="selectName" needed="1"/>
+							</row>
+							<row>
+								<menulist class="selectMime">
+									<menupopup options="All" id="mime"/>
+								</menulist>
+							</row>
+							<row>
+								<hbox align="right">
+									<button label="@label" id="button[ok]"/>
+									<buttononly id="button[cancel]" label="Cancel" onclick="window.close();"/>
+								</hbox>
+							</row>
+						</rows>
+					</grid>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file

From 0e3557c1161c5fb2b0ed33cbe62956b0c70bab31 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Apr 2009 21:14:11 +0000
Subject: [PATCH 196/510] allow to attach (multiple) files from filemanager in
 fmail compose

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

diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index 981767eac5..bb54c5efa8 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-09 15:57
+	* generated by soetemplate::dump4setup() 2009-04-15 23:14
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -12,8 +12,6 @@
 
 $templ_version=1;
 
-$templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:54:"General|Permissions|Extended ACL|Preview|Custom fields";s:4:"name";s:33:"general|perms|eacl|preview|custom";s:4:"span";s:3:"all";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:15:"window.close();";}}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '.eaclAccount select,.eaclRights select { width: 160px; }','modified' => '1223224423',);
-
 $templ_data[] = array('name' => 'filemanager.file','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:54:"General|Permissions|Extended ACL|Preview|Custom fields";s:4:"name";s:33:"general|perms|eacl|preview|custom";s:4:"span";s:3:"all";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:4:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:15:"window.close();";}}i:2;a:6:{s:4:"type";s:10:"buttononly";s:5:"label";s:9:"Superuser";s:5:"align";s:5:"right";s:4:"help";s:48:"Enter setup user and password to get root rights";s:7:"onclick";s:121:"set_style_by_class(\'fieldset\',\'superuser\',\'display\',\'inline\'); document.getElementById(form::name(\'sudo[user]\')).focus();";s:4:"name";s:4:"sudo";}}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:29:"Enter setup user and password";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"User";s:4:"size";s:13:",,,sudo[user]";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"sudo[user]";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Password";s:4:"size";s:15:",,,sudo[passwd]";}s:1:"B";a:2:{s:4:"type";s:6:"passwd";s:4:"name";s:12:"sudo[passwd]";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Submit";s:4:"name";s:13:"button[setup]";}}}s:7:"options";a:0:{}s:4:"rows";i:3;s:4:"cols";i:2;}s:4:"span";s:10:",superuser";}}}s:4:"rows";i:4;s:4:"cols";i:1;}}','size' => '','style' => '.eaclAccount select,.eaclRights select { width: 160px; }
 .superuser { 
   position: absolute; 
@@ -50,8 +48,6 @@ $templ_data[] = array('name' => 'filemanager.file.perms','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.file.preview','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2:"c1";s:4:",top";s:2:"h1";s:16:",!@mime=/^image/";s:2:"h3";s:22:",@mime=/^(image|text)/";s:2:"h2";s:18:"280,!@text_content";s:2:"c2";s:4:",top";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:4:"link";s:4:"span";s:13:",previewImage";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:12:"text_content";s:4:"span";s:12:",previewText";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"No preview available";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:18:"450,300,,,10,,auto";s:7:"options";a:4:{i:0;s:3:"450";i:1;s:3:"300";i:6;s:4:"auto";i:4;s:2:"10";}}}','size' => '450,300,,,10,,auto','style' => '','modified' => '1204567479',);
 
-$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:4:"file";s:4:"name";s:6:"upload";s:4:"help";s:42:"Select file to upload in current directory";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1223226240',);
-
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1235658193',);
 
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:13:{s:4:"type";s:4:"hbox";s:4:"size";s:2:"10";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:35:"button_createdir,createdir_disabled";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:18:"link,link_disabled";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:28:"editpaste,editpaste_disabled";s:4:"help";s:20:"$cont[paste_tooltip]";}i:10;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[linkpaste]";s:4:"size";s:28:"linkpaste,linkpaste_disabled";s:4:"help";s:24:"$cont[linkpaste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
@@ -60,3 +56,5 @@ $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:17:""$row_cont[path]"";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
+$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:12:"button[home]";s:5:"align";s:6:"center";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:20:",@mode=open-multiple";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
+

From 5629c10e122ccb5f24d4f97007e3b961326a4c6a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 16 Apr 2009 07:38:16 +0000
Subject: [PATCH 197/510] "charset independent case-sensitive comparison for
 mysql, using BINARY operator now"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 87938dbbd8..cc7a3942a7 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -1447,7 +1447,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			case 'mysqli':
 			case 'mysqlt':
 			case 'mysql':
-				self::$case_sensitive_equal = ' COLLATE utf8_bin =';
+				self::$case_sensitive_equal = '= BINARY ';
 				self::$pdo_type = 'mysql';
 				break;
 			default:

From 7233f8741373b96f1a0f8e72c6efa994115c8c91 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 16 Apr 2009 16:32:30 +0000
Subject: [PATCH 198/510] "fixed not updated modification time, if file get's
 updated (eg. replaced via a new update in filemanager)"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index cc7a3942a7..b4af2d3992 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -316,15 +316,16 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				'fs_mime' => $mime_magic->filename2mime($this->opened_path),
 				'fs_id'   => $this->opened_fs_id,
 				'fs_modifier' => egw_vfs::$user,
+				'fs_modified' => self::_pdo_timestamp(time()),
 			);
 
 			if ($this->operation == self::STORE2FS)
 			{
-				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_size=:fs_size,fs_mime=:fs_mime,fs_modifier=:fs_modifier WHERE fs_id=:fs_id');
+				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_size=:fs_size,fs_mime=:fs_mime,fs_modifier=:fs_modifier,fs_modified=:fs_modified WHERE fs_id=:fs_id');
 			}
 			else
 			{
-				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_size=:fs_size,fs_mime=:fs_mime,fs_modifier=:fs_modifier,fs_content=:fs_content WHERE fs_id=:fs_id');
+				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_size=:fs_size,fs_mime=:fs_mime,fs_modifier=:fs_modifier,fs_modified=:fs_modified,fs_content=:fs_content WHERE fs_id=:fs_id');
 				$this->stream_seek(0,SEEK_SET);	// rewind to the start
 				$stmt->bindParam('fs_content', $this->opened_stream, PDO::PARAM_LOB);
 			}

From f12a0dc307e87069d109f9b91fee3e855a6dd7e5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Apr 2009 06:25:33 +0000
Subject: [PATCH 199/510] making whole mime_magic class static, for easier use
 and better caching by byte code caches

---
 phpgwapi/inc/class.mime_magic.inc.php         | 1765 +++++++++--------
 .../inc/class.sqlfs_stream_wrapper.inc.php    |    7 +-
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php |   10 +-
 3 files changed, 945 insertions(+), 837 deletions(-)

diff --git a/phpgwapi/inc/class.mime_magic.inc.php b/phpgwapi/inc/class.mime_magic.inc.php
index baa3dd32a1..b94043ed8a 100644
--- a/phpgwapi/inc/class.mime_magic.inc.php
+++ b/phpgwapi/inc/class.mime_magic.inc.php
@@ -1,856 +1,975 @@
 <?php
-  /********************************************************************\
-  * eGroupWare - eGroupWare API - mime magic                           *
-  * http://www.egroupware.org                                          *
-  * This program is part of the GNU project, see http://www.gnu.org    *
-  *                                                                    *
-  * Originally taken from the Horde Framework http://horde.org         *
-  *                                                                    *
-  * Copyright 1999-2003 Anil Madhavapeddy <anil@recoil.org>            *
-  * Copyright 2002-2003 Michael Slusarz <slusarz@bigworm.colorado.edu> *
-  * Copyright 2003 Free Software Foundation, Inc.                      *
-  *                                                                    *
-  * Ported to phpGroupWare by Dave Hall - dave.hall@mbox.com.au        *
-  * Note: this class was relicensed as GPL by Dave Hall - all mods GPL *
-  * --------------------------------------------                       *
-  *  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.               *
-  \********************************************************************/
+/**
+ * eGroupWare API - Mime Magic
+ *
+ * This program is part of the GNU project, see http://www.gnu.org
+ *
+ * Originally taken from the Horde Framework http://horde.org
+ *
+ * Copyright 1999-2003 Anil Madhavapeddy <anil@recoil.org>
+ * Copyright 2002-2003 Michael Slusarz <slusarz@bigworm.colorado.edu>
+ * Copyright 2003 Free Software Foundation, Inc.
+ *
+ * Ported to phpGroupWare by Dave Hall - dave.hall@mbox.com.au
+ * Note: this class was relicensed as GPL by Dave Hall - all mods GPL
+ *
+ * @link http://www.egroupware.org
+ * @package API
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-  /* $Id$ */
-
-	class mime_magic
+/**
+ * Mime Magic class
+ *
+ * All methods can be called static, no need to instanciate the class.
+ */
+class mime_magic
+{
+	/**
+	 * Convert a file extension to a MIME type
+	 *
+	 * This is the simplest MIME type guessing function - rough but fast.
+	 * If the MIME type is not found then 'application/octet-stream'
+	 * is returned.
+	 *
+	 * @param string $ext  The file extension to be mapped to a MIME type.
+	 * @return string  The MIME type of the file extension.
+	 */
+	public static function ext2mime($ext)
 	{
-		//extension to mime type map
-		var $mime_extension_map;
-
-		//map of file contents to mime type
-		var $mime_magic_file;
-
-		/**
-		* Wrapper to PHP5 Compatible Constructor
-		*
-		* @author skwashd
-
-		function mime_magic()
+		if (empty($ext))
 		{
-			$this->__constructor()
+			return 'text/plain';//assume no extension is a text file
 		}
-		*/
-
-		/**
-		* Constructor
-		*
-		* Load the map values into the instance arrays
-		* @author skwashd
-		*/
-		function mime_magic() //__constructor()
+		$ext = strtolower($ext);
+		if (!array_key_exists($ext, self::$mime_extension_map))
 		{
-			$this->mime_extension_map = $this->get_mime_ext_map();
-			$this->mime_magic_file = $this->get_mime_magic_file();
-		}
-
-		/**
-		* Attempt to convert a file extension to a MIME type
-		*
-		* This is the simplest MIME type guessing function - rough but fast.
-		* If the MIME type is not found then 'application/octet-stream'
-		* is returned.
-		*
-		* @access public
-		*
-		* @param string $ext  The file extension to be mapped to a MIME type.
-		*
-		* @return string  The MIME type of the file extension.
-		*/
-		function ext2mime($ext)
-		{
-			if (empty($ext))
-			{
-				return 'text/plain';//assume no extension is a text file
-			}
-			else
-			{
-				$ext = strtolower($ext);
-				if (!array_key_exists($ext, $this->mime_extension_map))
-				{
-					return 'application/octet-stream';
-				}
-				else
-				{
-					return $this->mime_extension_map[$ext];
-				}
-			}
-		}
-
-		/**
-		* Attempt to convert a filename to a MIME type, based on the
-		* global and application specific config files.
-		*
-		* Unlike ext2mime, this function will return
-		* 'application/octet-stream' for any unknown or empty extension
-		*
-		* @access public
-		*
-		* @param string $filename  The filename to be mapped to a MIME type.
-		*
-		* @return string  The MIME type of the filename.
-		* @author skwashd - changed it to make it work with file.tar.gz etc
-		*/
-		function filename2mime($filename)
-		{
-			$fn_parts = explode('.', $filename);
-			if (is_array($fn_parts))
-			{
-				return $this->ext2mime($fn_parts[count($fn_parts)-1]);
-			}
 			return 'application/octet-stream';
 		}
+		return self::$mime_extension_map[$ext];
+	}
 
-		/* temporary fix for apps using the old name */
-		function filename2mine($filename)
+	/**
+	 * Convert a filename to a MIME type, based on the
+	 * global and application specific config files.
+	 *
+	 * Unlike ext2mime, this function will return
+	 * 'application/octet-stream' for any unknown or empty extension
+	 *
+	 * @param string $filename  The filename to be mapped to a MIME type.
+	 * @return string  The MIME type of the filename.
+	 * @author skwashd - changed it to make it work with file.tar.gz etc
+	 */
+	public static function filename2mime($filename)
+	{
+		$fn_parts = explode('.', $filename);
+		if (is_array($fn_parts))
 		{
-			return $this->filename2mime($filename);
+			return self::ext2mime(array_pop($fn_parts));
 		}
+		return 'application/octet-stream';
+	}
 
-		/**
-		* Attempt to convert a MIME type to a file extension, based
-		* on the global Horde and application specific config files.
-		*
-		* If we cannot map the type to a file extension, we return false.
-		*
-		* @access public
-		*
-		* @param string $type  The MIME type to be mapped to a file extension.
-		*
-		* @return string  The file extension of the MIME type.
-		*/
-		function mime2ext($type)
+	/**
+	 *  temporary fix for apps using the old name
+	 *
+	 * @deprecated use filename2mime
+	 */
+	public static function filename2mine($filename)
+	{
+		return $this->filename2mime($filename);
+	}
+
+	/**
+	 * Convert a MIME type to a file extension, based
+	 * on the global Horde and application specific config files.
+	 *
+	 * If we cannot map the type to a file extension, we return false.
+	 *
+	 * @param string $type  The MIME type to be mapped to a file extension.
+	 * @return string  The file extension of the MIME type.
+	 */
+	public static function mime2ext($type)
+	{
+		$key = array_search($type, self::$mime_extension_map);
+		if (empty($type) || $key === false)
 		{
-			$key = array_search($type, $this->mime_extension_map);
-			if (empty($type) || ($key === false))
+			return false;
+		}
+		return $key;
+	}
+
+	/**
+	 * Uses variants of the UNIX "file" command to attempt to determine the
+	 * MIME type of an unknown file.
+	 *
+	 * @param string $filename The filename (including full path) to the file to analyze.
+	 *
+	 * @return string  The MIME type of the file.  Returns false if either
+	 *                 the file type isn't recognized or the file command is
+	 *                 not available.
+	 */
+	public static function analyze_file($path)
+	{
+		// If the PHP Mimetype extension is available, use that.
+		if (function_exists('mime_content_type'))
+		{
+			return mime_content_type($path);
+		}
+		else
+		{
+			// Use a built-in magic file.
+			if (!($fp = @fopen($path, 'rb')))
 			{
 				return false;
 			}
-			else
+			foreach (self::$mime_magic_file as $offset => $odata)
 			{
-				return $key;
-			}
-		}
-
-		/**
-		* Uses variants of the UNIX "file" command to attempt to determine the
-		* MIME type of an unknown file.
-		*
-		* @access public
-		*
-		* @param string $filename The filename (including full path) to the file to analyze.
-		*
-		* @return string  The MIME type of the file.  Returns false if either
-		*                 the file type isn't recognized or the file command is
-		*                 not available.
-		*/
-		function analyze_file($path)
-		{
-			/* If the PHP Mimetype extension is available, use that. */
-			if (function_exists('mime_content_type'))
-			{
-				return mime_content_type($path);
-			}
-			else
-			{
-				/* Use a built-in magic file. */
-				if (!($fp = @fopen($path, 'rb')))
+				foreach ($odata as $length => $ldata)
 				{
-					return false;
-				}
-				foreach ($this->mime_magic_file as $offset => $odata)
-				{
-					foreach ($odata as $length => $ldata)
+					@fseek($fp, $offset, SEEK_SET);
+					$lookup = @fread($fp, $length);
+					if (!empty($ldata[$lookup]))
 					{
-						@fseek($fp, $offset, SEEK_SET);
-						$lookup = @fread($fp, $length);
-						if (!empty($ldata[$lookup]))
-						{
-							fclose($fp);
-							return $ldata[$lookup];
-						}
+						fclose($fp);
+						return $ldata[$lookup];
 					}
 				}
-				fclose($fp);
 			}
+			fclose($fp);
+		}
+		return false;
+	}
+
+	/**
+	 * Instead of using an existing file a chunk of data is used for
+	 * testing.  Best to handle the file creation here, to make sure
+	 * it is secure and it is properly cleaned up.  Really just
+	 * a temp file creation and clean up method wrapper for analyze_file()
+	 *
+	 * @param string $data the data to analyze
+	 *
+	 * @param string MIME type false for none.
+	 *
+	 * @author skwashd
+	 */
+	public static function analyze_data($data)
+	{
+		if(!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
+		{
+			//nothing we can do but bail out
 			return false;
 		}
 
-		/**
-		* Instead of using an existing file a chunk of data is used for
-		* testing.  Best to handle the file creation here, to make sure
-		* it is secure and it is properly cleaned up.  Really just
-		* a temp file creation and clean up method wrapper for analyze_file()
-		*
-		* @param string $data the data to analyze
-		*
-		* @param string MIME type false for none.
-		*
-		* @author skwashd
-		*/
-		function analyze_data($data)
+		mt_srand(time());
+		$filename = $GLOBALS['egw_info']['server']['temp_dir'] . SEP
+			. md5( time() + mt_rand() ) . '.tmp';
+
+		$fp = @fopen($filename, 'ab');
+		if(!$fp || !$data)
 		{
-			if(!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
-			{
-				//nothing we can do but bail out
-				return false;
-			}
-
-			mt_srand(time());
-			$filename = $GLOBALS['egw_info']['server']['temp_dir'] . SEP
-				. md5( time() + mt_rand() ) . '.tmp';
-
-			$fp = @fopen($filename, 'ab');
-			if(!$fp || !$data)
-			{
-				//houston we have a problem - bail out
-				return false;
-			}
-
-			if(!fwrite($fp, $data))
-			{
-				//bail out again
-				return false;
-			}
-			fclose($fp);
-			chmod($filename, 0600); //just to be cautious
-
-			$mime = $this->analyze_file($filename);
-
-			unlink($filename);//remove the temp file
-
-			return $mime;
+			//houston we have a problem - bail out
+			return false;
 		}
 
-		/**
-		* Get an array containing a mapping of common file extensions to
-		* MIME types.
-		*
-		* Original array taken from http://horde.org
-		* added OpenOffice Extensions by KL@stylite.de
-		*
-		* @author skwashd
-		*
-		* @return array of extenstion to mime mappings
-		*/
-		function get_mime_ext_map()
+		if(!fwrite($fp, $data))
 		{
-			return array(
-				'ai'	=> 'application/postscript',
-				'aif'	=> 'audio/x-aiff',
-				'aifc'	=> 'audio/x-aiff',
-				'aiff'	=> 'audio/x-aiff',
-				'asc'	=> 'application/pgp', //changed by skwashd - was text/plain
-				'asf'	=> 'video/x-ms-asf',
-				'asx'	=> 'video/x-ms-asf',
-				'au'	=> 'audio/basic',
-				'avi'	=> 'video/x-msvideo',
-				'bcpio'	=> 'application/x-bcpio',
-				'bin'	=> 'application/octet-stream',
-				'bmp'	=> 'image/bmp',
-				'c'	=> 'text/plain', // or 'text/x-csrc', //added by skwashd
-				'c++'	=> 'text/plain', // or 'text/x-c++src', //added by skwashd
-				'cc'	=> 'text/plain', // or 'text/x-c++src', //added by skwashd
-				'cs'	=> 'text/plain', //added by skwashd - for C# src
-				'cpp'	=> 'text/x-c++src', //added by skwashd
-				'cxx'	=> 'text/x-c++src', //added by skwashd
-				'cdf'	=> 'application/x-netcdf',
-				'class'	=> 'application/octet-stream',//secure but application/java-class is correct
-				'com'	=> 'application/octet-stream',//added by skwashd
-				'cpio'	=> 'application/x-cpio',
-				'cpt'	=> 'application/mac-compactpro',
-				'csh'	=> 'application/x-csh',
-				'css'	=> 'text/css',
-				'csv'	=> 'text/comma-separated-values',//added by skwashd
-				'dcr'	=> 'application/x-director',
-				'diff'	=> 'text/diff',
-				'dir'	=> 'application/x-director',
-				'dll'	=> 'application/octet-stream',
-				'dms'	=> 'application/octet-stream',
-				'doc'	=> 'application/msword',
-				'dot'	=> 'application/msword',//added by skwashd
-				'dvi'	=> 'application/x-dvi',
-				'dxr'	=> 'application/x-director',
-				'eps'	=> 'application/postscript',
-				'etx'	=> 'text/x-setext',
-				'exe'	=> 'application/octet-stream',
-				'ez'	=> 'application/andrew-inset',
-				'gif'	=> 'image/gif',
-				'gtar'	=> 'application/x-gtar',
-				'gz'	=> 'application/x-gzip',
-				'h'	=> 'text/plain', // or 'text/x-chdr',//added by skwashd
-				'h++'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
-				'hh'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
-				'hpp'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
-				'hxx'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
-				'hdf'	=> 'application/x-hdf',
-				'hqx'	=> 'application/mac-binhex40',
-				'htm'	=> 'text/html',
-				'html'	=> 'text/html',
-				'ice'	=> 'x-conference/x-cooltalk',
-				'ics'	=> 'text/calendar',
-				'ief'	=> 'image/ief',
-				'ifb'	=> 'text/calendar',
-				'iges'	=> 'model/iges',
-				'igs'	=> 'model/iges',
-				'jar'	=> 'application/x-jar', //added by skwashd - alternative mime type
-				'java'	=> 'text/x-java-source', //added by skwashd
-				'jpe'	=> 'image/jpeg',
-				'jpeg'	=> 'image/jpeg',
-				'jpg'	=> 'image/jpeg',
-				'js'	=> 'application/x-javascript',
-				'kar'	=> 'audio/midi',
-				'latex'	=> 'application/x-latex',
-				'lha'	=> 'application/octet-stream',
-				'log'	=> 'text/plain',
-				'lzh'	=> 'application/octet-stream',
-				'm3u'	=> 'audio/x-mpegurl',
-				'man'	=> 'application/x-troff-man',
-				'me'	=> 'application/x-troff-me',
-				'mesh'	=> 'model/mesh',
-				'mid'	=> 'audio/midi',
-				'midi'	=> 'audio/midi',
-				'mif'	=> 'application/vnd.mif',
-				'mov'	=> 'video/quicktime',
-				'movie'	=> 'video/x-sgi-movie',
-				'mp2'	=> 'audio/mpeg',
-				'mp3'	=> 'audio/mpeg',
-				'mpe'	=> 'video/mpeg',
-				'mpeg'	=> 'video/mpeg',
-				'mpg'	=> 'video/mpeg',
-				'mpga'	=> 'audio/mpeg',
-				'ms'	=> 'application/x-troff-ms',
-				'msh'	=> 'model/mesh',
-				'mxu'	=> 'video/vnd.mpegurl',
-				'nc'	=> 'application/x-netcdf',
-				'oda'	=> 'application/oda',
-				'odb'	=> 'application/vnd.oasis.opendocument.database',
-				'odg'   => 'application/vnd.oasis.opendocument.graphics',
-				'odt'   => 'application/vnd.oasis.opendocument.text',
-				'odp'   => 'application/vnd.oasis.opendocument.presentation',
-				'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
-				'patch'	=> 'text/diff',
-				'pbm'	=> 'image/x-portable-bitmap',
-				'pdb'	=> 'chemical/x-pdb',
-				'pdf'	=> 'application/pdf',
-				'pgm'	=> 'image/x-portable-graymap',
-				'pgn'	=> 'application/x-chess-pgn',
-				'pgp'	=> 'application/pgp',//added by skwashd
-				'php'	=> 'application/x-httpd-php',
-				'php3'	=> 'application/x-httpd-php3',
-				'pl'	=> 'application/x-perl',
-				'pm'	=> 'application/x-perl',
-				'png'	=> 'image/png',
-				'pnm'	=> 'image/x-portable-anymap',
-				'po'	=> 'text/plain',
-				'ppm'	=> 'image/x-portable-pixmap',
-				'ppt'	=> 'application/vnd.ms-powerpoint',
-				'ps'	=> 'application/postscript',
-				'qt'	=> 'video/quicktime',
-				'ra'	=> 'audio/x-realaudio',
-				'ram'	=> 'audio/x-pn-realaudio',
-				'ras'	=> 'image/x-cmu-raster',
-				'rgb'	=> 'image/x-rgb',
-				'rm'	=> 'audio/x-pn-realaudio',
-				'roff'	=> 'application/x-troff',
-				'rpm'	=> 'audio/x-pn-realaudio-plugin',
-				'rtf'	=> 'text/rtf',
-				'rtx'	=> 'text/richtext',
-				'sgm'	=> 'text/sgml',
-				'sgml'	=> 'text/sgml',
-				'sh'	=> 'application/x-sh',
-				'shar'	=> 'application/x-shar',
-				'shtml'	=> 'text/html',
-				'silo'	=> 'model/mesh',
-				'sit'	=> 'application/x-stuffit',
-				'skd'	=> 'application/x-koan',
-				'skm'	=> 'application/x-koan',
-				'skp'	=> 'application/x-koan',
-				'skt'	=> 'application/x-koan',
-				'smi'	=> 'application/smil',
-				'smil'	=> 'application/smil',
-				'snd'	=> 'audio/basic',
-				'so'	=> 'application/octet-stream',
-				'spl'	=> 'application/x-futuresplash',
-				'src'	=> 'application/x-wais-source',
-				'stc'	=> 'application/vnd.sun.xml.calc.template',
-				'std'	=> 'application/vnd.sun.xml.draw.template',
-				'sti'	=> 'application/vnd.sun.xml.impress.template',
-				'stw'	=> 'application/vnd.sun.xml.writer.template',
-				'sv4cpio'	=> 'application/x-sv4cpio',
-				'sv4crc'	=> 'application/x-sv4crc',
-				'swf'	=> 'application/x-shockwave-flash',
-				'sxc'	=> 'application/vnd.sun.xml.calc',
-				'sxd'	=> 'application/vnd.sun.xml.draw',
-				'sxg'	=> 'application/vnd.sun.xml.writer.global',
-				'sxi'	=> 'application/vnd.sun.xml.impress',
-				'sxm'	=> 'application/vnd.sun.xml.math',
-				'sxw'	=> 'application/vnd.sun.xml.writer',
-				't'	=> 'application/x-troff',
-				'tar'	=> 'application/x-tar',
-				'tcl'	=> 'application/x-tcl',
-				'tex'	=> 'application/x-tex',
-				'texi'	=> 'application/x-texinfo',
-				'texinfo'	=> 'application/x-texinfo',
-				'tgz'	=> 'application/x-gtar',
-				'tif'	=> 'image/tiff',
-				'tiff'	=> 'image/tiff',
-				'tr'	=> 'application/x-troff',
-				'tsv'	=> 'text/tab-separated-values',
-				'txt'	=> 'text/plain',
-				'ustar'	=> 'application/x-ustar',
-				'vbs'	=> 'text/plain', //added by skwashd - for obvious reasons
-				'vcd'	=> 'application/x-cdlink',
-				'vcf'	=> 'text/x-vcard',
-				'vcs'	=> 'text/calendar',
-				'vfb'	=> 'text/calendar',
-				'vrml'	=> 'model/vrml',
-				'vsd'	=> 'application/vnd.visio',
-				'wav'	=> 'audio/x-wav',
-				'wax'	=> 'audio/x-ms-wax',
-				'wbmp'	=> 'image/vnd.wap.wbmp',
-				'wbxml'	=> 'application/vnd.wap.wbxml',
-				'wm'	=> 'video/x-ms-wm',
-				'wma'	=> 'audio/x-ms-wma',
-				'wmd'	=> 'application/x-ms-wmd',
-				'wml'	=> 'text/vnd.wap.wml',
-				'wmlc'	=> 'application/vnd.wap.wmlc',
-				'wmls'	=> 'text/vnd.wap.wmlscript',
-				'wmlsc'	=> 'application/vnd.wap.wmlscriptc',
-				'wmv'	=> 'video/x-ms-wmv',
-				'wmx'	=> 'video/x-ms-wmx',
-				'wmz'	=> 'application/x-ms-wmz',
-				'wrl'	=> 'model/vrml',
-				'wvx'	=> 'video/x-ms-wvx',
-				'xbm'	=> 'image/x-xbitmap',
-				'xht'	=> 'application/xhtml+xml',
-				'xhtml'	=> 'application/xhtml+xml',
-				'xls'	=> 'application/vnd.ms-excel',
-				'xlt'	=> 'application/vnd.ms-excel',
-				'xml'	=> 'application/xml',
-				'xpm'	=> 'image/x-xpixmap',
-				'xsl'	=> 'text/xml',
-				'xwd'	=> 'image/x-xwindowdump',
-				'xyz'	=> 'chemical/x-xyz',
-				'z'	=> 'application/x-compress',
-				'zip'	=> 'application/zip',
-			);
+			//bail out again
+			return false;
 		}
+		fclose($fp);
+		chmod($filename, 0600); //just to be cautious
 
-		/**
-		* Get the mime magic mapping file - last resort test
-		*
-		* Note Taken from horde.org - no copyright notice attached
-		*
-		* @author skwashd - converted to a function
-		*
-		* @return array mime magic data
-		*/
-		function get_mime_magic_file()
-		{
-			$mime_magic[0][30]["\145\166\141\154\40\42\145\170\145\143\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-	$mime_magic[0][24]["\145\166\141\154\40\42\145\170\145\143\40\57\165\163\162\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][23]["\103\157\155\155\157\156\40\163\165\142\144\151\162\145\143\164\157\162\151\145\163\72\40"] = 'text/x-patch';
-			$mime_magic[0][23]["\75\74\154\151\163\164\76\156\74\160\162\157\164\157\143\157\154\40\142\142\156\55\155"] = 'application/data';
-			$mime_magic[0][22]["\101\115\101\116\104\101\72\40\124\101\120\105\123\124\101\122\124\40\104\101\124\105"] = 'application/x-amanda-header';
-			$mime_magic[0][22]["\107\106\61\120\101\124\103\110\61\60\60\60\111\104\43\60\60\60\60\60\62\60"] = 'audio/x-gus-patch';
-			$mime_magic[0][22]["\107\106\61\120\101\124\103\110\61\61\60\60\111\104\43\60\60\60\60\60\62\60"] = 'audio/x-gus-patch';
-			$mime_magic[0][22]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\142\141\163\150"] = 'application/x-sh';
-			$mime_magic[0][22]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][22]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][22]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][22]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][22]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\142\141\163\150"] = 'application/x-sh';
-			$mime_magic[0][22]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][22]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][22]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][22]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][21]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\163\150"] = 'application/x-zsh';
-			$mime_magic[0][21]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\172\163\150"] = 'application/x-zsh';
-			$mime_magic[0][21]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\163\150"] = 'application/x-zsh';
-			$mime_magic[0][21]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\172\163\150"] = 'application/x-zsh';
-			$mime_magic[0][21]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\142\141\163\150"] = 'application/x-sh';
-			$mime_magic[0][21]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][21]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][21]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][21]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][20]["\145\166\141\154\40\42\145\170\145\143\40\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][20]["\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\145"] = 'text/script';
-			$mime_magic[0][20]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\145"] = 'text/script';
-			$mime_magic[0][20]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\163\150"] = 'application/x-sh';
-			$mime_magic[0][20]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\172\163\150"] = 'application/x-zsh';
-			$mime_magic[0][19]["\103\162\145\141\164\151\166\145\40\126\157\151\143\145\40\106\151\154\145"] = 'audio/x-voc';
-			$mime_magic[0][19]["\41\74\141\162\143\150\76\156\137\137\137\137\137\137\137\137\137\137\105"] = 'application/x-ar';
-			$mime_magic[0][19]["\41\74\141\162\143\150\76\156\137\137\137\137\137\137\137\137\66\64\105"] = 'application/data';
-			$mime_magic[0][19]["\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\145"] = 'text/script';
-			$mime_magic[0][18]["\106\151\114\145\123\164\101\162\124\146\111\154\105\163\124\141\122\164"] = 'text/x-apple-binscii';
-			$mime_magic[0][18]["\43\41\40\57\165\163\162\57\154\157\143\141\154\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][18]["\45\41\120\123\55\101\144\157\142\145\106\157\156\164\55\61\56\60"] = 'font/type1';
-			$mime_magic[0][17]["\43\41\57\165\163\162\57\154\157\143\141\154\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][16]["\105\170\164\145\156\144\145\144\40\115\157\144\165\154\145\72"] = 'audio/x-ft2-mod';
-			$mime_magic[0][16]["\123\164\141\162\164\106\157\156\164\115\145\164\162\151\143\163"] = 'font/x-sunos-news';
-			$mime_magic[0][16]["\43\41\11\57\165\163\162\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][16]["\43\41\11\57\165\163\162\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][16]["\43\41\11\57\165\163\162\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][16]["\43\41\40\57\165\163\162\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][16]["\43\41\40\57\165\163\162\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][16]["\43\41\40\57\165\163\162\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][16]["\74\115\141\153\145\162\104\151\143\164\151\157\156\141\162\171"] = 'application/x-framemaker';
-			$mime_magic[0][16]["\74\115\141\153\145\162\123\143\162\145\145\156\106\157\156\164"] = 'font/x-framemaker';
-			$mime_magic[0][15]["\43\41\11\57\165\163\162\57\142\151\156\57\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][15]["\43\41\40\57\165\163\162\57\142\151\156\57\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][15]["\43\41\57\165\163\162\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][15]["\43\41\57\165\163\162\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][15]["\43\41\57\165\163\162\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][14]["\41\74\141\162\143\150\76\156\144\145\142\151\141\156"] = 'application/x-dpkg';
-			$mime_magic[0][14]["\43\41\57\165\163\162\57\142\151\156\57\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][14]["\74\41\104\117\103\124\131\120\105\40\110\124\115\114"] = 'text/html';
-			$mime_magic[0][14]["\74\41\144\157\143\164\171\160\145\40\150\164\155\154"] = 'text/html';
-			$mime_magic[0][13]["\107\111\115\120\40\107\162\141\144\151\145\156\164"] = 'application/x-gimp-gradient';
-			$mime_magic[0][12]["\122\145\164\165\162\156\55\120\141\164\150\72"] = 'message/rfc822';
-			$mime_magic[0][12]["\43\41\11\57\142\151\156\57\142\141\163\150"] = 'application/x-sh';
-			$mime_magic[0][12]["\43\41\11\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][12]["\43\41\11\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][12]["\43\41\11\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][12]["\43\41\11\57\142\151\156\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][12]["\43\41\40\57\142\151\156\57\142\141\163\150"] = 'application/x-sh';
-			$mime_magic[0][12]["\43\41\40\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][12]["\43\41\40\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][12]["\43\41\40\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][12]["\43\41\40\57\142\151\156\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][11]["\43\41\11\57\142\151\156\57\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][11]["\43\41\11\57\142\151\156\57\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][11]["\43\41\11\57\142\151\156\57\153\163\150"] = 'application/x-ksh';
-			$mime_magic[0][11]["\43\41\40\57\142\151\156\57\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][11]["\43\41\40\57\142\151\156\57\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][11]["\43\41\40\57\142\151\156\57\153\163\150"] = 'application/x-ksh';
-			$mime_magic[0][11]["\43\41\57\142\151\156\57\142\141\163\150"] = 'application/x-sh';
-			$mime_magic[0][11]["\43\41\57\142\151\156\57\147\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][11]["\43\41\57\142\151\156\57\156\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][11]["\43\41\57\142\151\156\57\160\145\162\154"] = 'application/x-perl';
-			$mime_magic[0][11]["\43\41\57\142\151\156\57\164\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][10]["\102\151\164\155\141\160\146\151\154\145"] = 'image/unknown';
-			$mime_magic[0][10]["\123\124\101\122\124\106\117\116\124\40"] = 'font/x-bdf';
-			$mime_magic[0][10]["\43\41\11\57\142\151\156\57\162\143"] = 'text/script';
-			$mime_magic[0][10]["\43\41\11\57\142\151\156\57\163\150"] = 'application/x-sh';
-			$mime_magic[0][10]["\43\41\40\57\142\151\156\57\162\143"] = 'text/script';
-			$mime_magic[0][10]["\43\41\40\57\142\151\156\57\163\150"] = 'application/x-sh';
-			$mime_magic[0][10]["\43\41\57\142\151\156\57\141\167\153"] = 'application/x-awk';
-			$mime_magic[0][10]["\43\41\57\142\151\156\57\143\163\150"] = 'application/x-csh';
-			$mime_magic[0][10]["\43\41\57\142\151\156\57\153\163\150"] = 'application/x-ksh';
-			$mime_magic[0][10]["\74\115\141\153\145\162\106\151\154\145"] = 'application/x-framemaker';
-			$mime_magic[0][9]["\122\145\143\145\151\166\145\144\72"] = 'message/rfc822';
-			$mime_magic[0][9]["\123\164\141\162\164\106\157\156\164"] = 'font/x-sunos-news';
-			$mime_magic[0][9]["\211\114\132\117\0\15\12\32\12"] = 'application/data';
-			$mime_magic[0][9]["\43\41\57\142\151\156\57\162\143"] = 'text/script';
-			$mime_magic[0][9]["\43\41\57\142\151\156\57\163\150"] = 'application/x-sh';
-			$mime_magic[0][9]["\55\162\157\155\61\146\163\55\60"] = 'application/x-filesystem';
-			$mime_magic[0][9]["\74\102\157\157\153\106\151\154\145"] = 'application/x-framemaker';
-			$mime_magic[0][8]["\117\156\154\171\40\151\156\40"] = 'text/x-patch';
-			$mime_magic[0][8]["\147\151\155\160\40\170\143\146"] = 'application/x-gimp-image';
-			$mime_magic[0][8]["\155\163\147\143\141\164\60\61"] = 'application/x-locale';
-			$mime_magic[0][8]["\32\141\162\143\150\151\166\145"] = 'application/data';
-			$mime_magic[0][8]["\41\74\120\104\106\76\41\156"] = 'application/x-prof';
-			$mime_magic[0][8]["\74\115\111\106\106\151\154\145"] = 'application/x-framemaker';
-			$mime_magic[0][7]["\101\162\164\151\143\154\145"] = 'message/news';
-			$mime_magic[0][7]["\120\103\104\137\117\120\101"] = 'x/x-photo-cd-overfiew-file';
-			$mime_magic[0][7]["\351\54\1\112\101\115\11"] = 'application/data';
-			$mime_magic[0][7]["\41\74\141\162\143\150\76"] = 'application/x-ar';
-			$mime_magic[0][7]["\72\40\163\150\145\154\154"] = 'application/data';
-			$mime_magic[0][6]["\116\165\106\151\154\145"] = 'application/data';
-			$mime_magic[0][6]["\116\365\106\351\154\345"] = 'application/data';
-			$mime_magic[0][6]["\60\67\60\67\60\61"] = 'application/x-cpio';
-			$mime_magic[0][6]["\60\67\60\67\60\62"] = 'application/x-cpio';
-			$mime_magic[0][6]["\60\67\60\67\60\67"] = 'application/x-cpio';
-			$mime_magic[0][6]["\74\115\141\153\145\162"] = 'application/x-framemaker';
-			$mime_magic[0][6]["\74\124\111\124\114\105"] = 'text/html';
-			$mime_magic[0][6]["\74\164\151\164\154\145"] = 'text/html';
-			$mime_magic[0][5]["\0\1\0\0\0"] = 'font/ttf';
-			$mime_magic[0][5]["\0\4\36\212\200"] = 'application/core';
-			$mime_magic[0][5]["\102\101\102\131\114"] = 'message/x-gnu-rmail';
-			$mime_magic[0][5]["\102\105\107\111\116"] = 'application/x-awk';
-			$mime_magic[0][5]["\103\157\162\145\1"] = 'application/x-executable-file';
-			$mime_magic[0][5]["\104\61\56\60\15"] = 'font/x-speedo';
-			$mime_magic[0][5]["\106\162\157\155\72"] = 'message/rfc822';
-			$mime_magic[0][5]["\115\101\123\137\125"] = 'audio/x-multimate-mod';
-			$mime_magic[0][5]["\120\117\136\121\140"] = 'text/vnd.ms-word';
-			$mime_magic[0][5]["\120\141\164\150\72"] = 'message/news';
-			$mime_magic[0][5]["\130\162\145\146\72"] = 'message/news';
-			$mime_magic[0][5]["\144\151\146\146\40"] = 'text/x-patch';
-			$mime_magic[0][5]["\225\64\62\62\336"] = 'application/x-locale';
-			$mime_magic[0][5]["\336\62\62\64\225"] = 'application/x-locale';
-			$mime_magic[0][5]["\74\110\105\101\104"] = 'text/html';
-			$mime_magic[0][5]["\74\110\124\115\114"] = 'text/html';
-			$mime_magic[0][5]["\74\150\145\141\144"] = 'text/html';
-			$mime_magic[0][5]["\74\150\164\155\154"] = 'text/html';
-			$mime_magic[0][5]["\75\74\141\162\76"] = 'application/x-ar';
-			$mime_magic[0][4]["\0\0\0\314"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\0\0\0\4"] = 'font/x-snf';
-			$mime_magic[0][4]["\0\0\1\107"] = 'application/x-object-file';
-			$mime_magic[0][4]["\0\0\1\113"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\0\0\1\115"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\0\0\1\117"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\0\0\1\201"] = 'application/x-object-file';
-			$mime_magic[0][4]["\0\0\1\207"] = 'application/data';
-			$mime_magic[0][4]["\0\0\1\263"] = 'video/mpeg';
-			$mime_magic[0][4]["\0\0\1\272"] = 'video/mpeg';
-			$mime_magic[0][4]["\0\0\1\6"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\0\0\201\154"] = 'application/x-apl-workspace';
-			$mime_magic[0][4]["\0\0\377\145"] = 'application/x-library-file';
-			$mime_magic[0][4]["\0\0\377\155"] = 'application/data';
-			$mime_magic[0][4]["\0\0\3\347"] = 'application/x-library-file';
-			$mime_magic[0][4]["\0\0\3\363"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\0\144\163\56"] = 'audio/basic';
-			$mime_magic[0][4]["\0\1\22\127"] = 'application/core';
-			$mime_magic[0][4]["\0\22\326\207"] = 'image/x11';
-			$mime_magic[0][4]["\0\3\233\355"] = 'application/data';
-			$mime_magic[0][4]["\0\3\233\356"] = 'application/data';
-			$mime_magic[0][4]["\0\5\26\0"] = 'application/data';
-			$mime_magic[0][4]["\0\5\26\7"] = 'application/data';
-			$mime_magic[0][4]["\0\5\61\142"] = 'application/x-db';
-			$mime_magic[0][4]["\0\6\25\141"] = 'application/x-db';
-			$mime_magic[0][4]["\103\124\115\106"] = 'audio/x-cmf';
-			$mime_magic[0][4]["\105\115\117\104"] = 'audio/x-emod';
-			$mime_magic[0][4]["\106\106\111\114"] = 'font/ttf';
-			$mime_magic[0][4]["\106\117\116\124"] = 'font/x-vfont';
-			$mime_magic[0][4]["\107\104\102\115"] = 'application/x-gdbm';
-			$mime_magic[0][4]["\107\111\106\70"] = 'image/gif';
-			$mime_magic[0][4]["\10\16\12\17"] = 'application/data';
-			$mime_magic[0][4]["\110\120\101\113"] = 'application/data';
-			$mime_magic[0][4]["\111\111\116\61"] = 'image/tiff';
-			$mime_magic[0][4]["\111\111\52\0"] = 'image/tiff';
-			$mime_magic[0][4]["\114\104\110\151"] = 'application/data';
-			$mime_magic[0][4]["\114\127\106\116"] = 'font/type1';
-			$mime_magic[0][4]["\115\115\0\52"] = 'image/tiff';
-			$mime_magic[0][4]["\115\117\126\111"] = 'video/x-sgi-movie';
-			$mime_magic[0][4]["\115\124\150\144"] = 'audio/midi';
-			$mime_magic[0][4]["\115\247\356\350"] = 'font/x-hp-windows';
-			$mime_magic[0][4]["\116\124\122\113"] = 'audio/x-multitrack';
-			$mime_magic[0][4]["\120\113\3\4"] = 'application/zip';
-			$mime_magic[0][4]["\122\111\106\106"] = 'audio/x-wav';
-			$mime_magic[0][4]["\122\141\162\41"] = 'application/x-rar';
-			$mime_magic[0][4]["\123\121\123\110"] = 'application/data';
-			$mime_magic[0][4]["\124\101\104\123"] = 'application/x-tads-game';
-			$mime_magic[0][4]["\125\103\62\32"] = 'application/data';
-			$mime_magic[0][4]["\125\116\60\65"] = 'audio/x-mikmod-uni';
-			$mime_magic[0][4]["\12\17\10\16"] = 'application/data';
-			$mime_magic[0][4]["\131\246\152\225"] = 'x/x-image-sun-raster';
-			$mime_magic[0][4]["\145\377\0\0"] = 'application/x-ar';
-			$mime_magic[0][4]["\150\163\151\61"] = 'image/x-jpeg-proprietary';
-			$mime_magic[0][4]["\16\10\17\12"] = 'application/data';
-			$mime_magic[0][4]["\177\105\114\106"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\17\12\16\10"] = 'application/data';
-			$mime_magic[0][4]["\1\130\41\246"] = 'application/core';
-			$mime_magic[0][4]["\1\146\143\160"] = 'font/x-pcf';
-			$mime_magic[0][4]["\211\120\116\107"] = 'image/x-png';
-			$mime_magic[0][4]["\23\127\232\316"] = 'application/x-gdbm';
-			$mime_magic[0][4]["\23\172\51\104"] = 'font/x-sunos-news';
-			$mime_magic[0][4]["\23\172\51\107"] = 'font/x-sunos-news';
-			$mime_magic[0][4]["\23\172\51\120"] = 'font/x-sunos-news';
-			$mime_magic[0][4]["\23\172\51\121"] = 'font/x-sunos-news';
-			$mime_magic[0][4]["\24\2\131\31"] = 'font/x-libgrx';
-			$mime_magic[0][4]["\260\61\63\140"] = 'application/x-bootable';
-			$mime_magic[0][4]["\2\10\1\10"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\10\1\6"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\10\1\7"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\10\377\145"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\12\1\10"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\12\1\7"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\12\377\145"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\13\1\10"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\13\1\13"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\13\1\15"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\13\1\16"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\13\1\6"] = 'application/x-object-file';
-			$mime_magic[0][4]["\2\13\1\7"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\14\1\10"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\14\1\13"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\14\1\14"] = 'application/x-lisp';
-			$mime_magic[0][4]["\2\14\1\15"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\14\1\16"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\14\1\6"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\14\1\7"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\14\377\145"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\20\1\10"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\20\1\13"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\20\1\15"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\20\1\16"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\20\1\6"] = 'application/x-object-file';
-			$mime_magic[0][4]["\2\20\1\7"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\24\1\10"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\24\1\13"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\2\24\1\15"] = 'application/x-object-file';
-			$mime_magic[0][4]["\2\24\1\16"] = 'application/x-library-file';
-			$mime_magic[0][4]["\2\24\1\6"] = 'application/x-object-file';
-			$mime_magic[0][4]["\2\24\1\7"] = 'application/x-executable-file';
-			$mime_magic[0][4]["\361\60\100\273"] = 'image/x-cmu-raster';
-			$mime_magic[0][4]["\366\366\366\366"] = 'application/x-pc-floppy';
-			$mime_magic[0][4]["\377\106\117\116"] = 'font/x-dos';
-			$mime_magic[0][4]["\41\74\141\162"] = 'application/x-ar';
-			$mime_magic[0][4]["\43\41\11\57"] = 'text/script';
-			$mime_magic[0][4]["\43\41\40\57"] = 'text/script';
-			$mime_magic[0][4]["\52\123\124\101"] = 'application/data';
-			$mime_magic[0][4]["\52\52\52\40"] = 'text/x-patch';
-			$mime_magic[0][4]["\56\162\141\375"] = 'audio/x-pn-realaudio';
-			$mime_magic[0][4]["\56\163\156\144"] = 'audio/basic';
-			$mime_magic[0][4]["\61\143\167\40"] = 'application/data';
-			$mime_magic[0][4]["\61\276\0\0"] = 'text/vnd.ms-word';
-			$mime_magic[0][4]["\62\62\67\70"] = 'application/data';
-			$mime_magic[0][4]["\74\115\115\114"] = 'application/x-framemaker';
-			$mime_magic[0][4]["\74\141\162\76"] = 'application/x-ar';
-			$mime_magic[0][3]["\102\132\150"] = 'application/x-bzip2';
-			$mime_magic[0][3]["\106\101\122"] = 'audio/mod';
-			$mime_magic[0][3]["\115\124\115"] = 'audio/x-multitrack';
-			$mime_magic[0][3]["\123\102\111"] = 'audio/x-sbi';
-			$mime_magic[0][3]["\124\117\103"] = 'audio/x-toc';
-			$mime_magic[0][3]["\12\107\114"] = 'application/data';
-			$mime_magic[0][3]["\146\154\143"] = 'application/x-font';
-			$mime_magic[0][3]["\146\154\146"] = 'font/x-figlet';
-			$mime_magic[0][3]["\33\105\33"] = 'image/x-pcl-hp';
-			$mime_magic[0][3]["\33\143\33"] = 'application/data';
-			$mime_magic[0][3]["\377\377\174"] = 'application/data';
-			$mime_magic[0][3]["\377\377\176"] = 'application/data';
-			$mime_magic[0][3]["\377\377\177"] = 'application/data';
-			$mime_magic[0][3]["\43\41\40"] = 'text/script';
-			$mime_magic[0][3]["\43\41\57"] = 'text/script';
-			$mime_magic[0][3]["\4\45\41"] = 'application/postscript';
-			$mime_magic[0][3]["\55\150\55"] = 'application/data';
-			$mime_magic[0][3]["\61\143\167"] = 'application/data';
-			$mime_magic[0][2]["\0\0"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\102\115"] = 'image/x-bmp';
-			$mime_magic[0][2]["\102\132"] = 'application/x-bzip';
-			$mime_magic[0][2]["\111\103"] = 'image/x-ico';
-			$mime_magic[0][2]["\112\116"] = 'audio/x-669-mod';
-			$mime_magic[0][2]["\115\132"] = 'application/x-ms-dos-executable';
-			$mime_magic[0][2]["\120\61"] = 'image/x-portable-bitmap';
-			$mime_magic[0][2]["\120\62"] = 'image/x-portable-graymap';
-			$mime_magic[0][2]["\120\63"] = 'image/x-portable-pixmap';
-			$mime_magic[0][2]["\120\64"] = 'image/x-portable-bitmap';
-			$mime_magic[0][2]["\120\65"] = 'image/x-portable-graymap';
-			$mime_magic[0][2]["\120\66"] = 'image/x-portable-pixmap';
-			$mime_magic[0][2]["\151\146"] = 'audio/x-669-mod';
-			$mime_magic[0][2]["\161\307"] = 'application/x-cpio';
-			$mime_magic[0][2]["\166\377"] = 'application/data';
-			$mime_magic[0][2]["\1\110"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\111"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\124"] = 'application/data';
-			$mime_magic[0][2]["\1\125"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\160"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\161"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\175"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\177"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\20"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\203"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\21"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\210"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\217"] = 'application/x-object-file';
-			$mime_magic[0][2]["\1\224"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\227"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\1\332"] = 'x/x-image-sgi';
-			$mime_magic[0][2]["\1\36"] = 'font/x-vfont';
-			$mime_magic[0][2]["\1\6"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\307\161"] = 'application/x-bcpio';
-			$mime_magic[0][2]["\313\5"] = 'application/data';
-			$mime_magic[0][2]["\352\140"] = 'application/x-arj';
-			$mime_magic[0][2]["\367\131"] = 'font/x-tex';
-			$mime_magic[0][2]["\367\203"] = 'font/x-tex';
-			$mime_magic[0][2]["\367\312"] = 'font/x-tex';
-			$mime_magic[0][2]["\36\1"] = 'font/x-vfont';
-			$mime_magic[0][2]["\375\166"] = 'application/x-lzh';
-			$mime_magic[0][2]["\376\166"] = 'application/data';
-			$mime_magic[0][2]["\377\145"] = 'application/data';
-			$mime_magic[0][2]["\377\155"] = 'application/data';
-			$mime_magic[0][2]["\377\166"] = 'application/data';
-			$mime_magic[0][2]["\377\330"] = 'image/jpeg';
-			$mime_magic[0][2]["\377\37"] = 'application/data';
-			$mime_magic[0][2]["\37\213"] = 'application/x-gzip';
-			$mime_magic[0][2]["\37\235"] = 'application/compress';
-			$mime_magic[0][2]["\37\236"] = 'application/data';
-			$mime_magic[0][2]["\37\237"] = 'application/data';
-			$mime_magic[0][2]["\37\240"] = 'application/data';
-			$mime_magic[0][2]["\37\36"] = 'application/data';
-			$mime_magic[0][2]["\37\37"] = 'application/data';
-			$mime_magic[0][2]["\37\377"] = 'application/data';
-			$mime_magic[0][2]["\45\41"] = 'application/postscript';
-			$mime_magic[0][2]["\4\66"] = 'font/linux-psf';
-			$mime_magic[0][2]["\57\57"] = 'text/cpp';
-			$mime_magic[0][2]["\5\1"] = 'application/x-locale';
-			$mime_magic[0][2]["\6\1"] = 'application/x-executable-file';
-			$mime_magic[0][2]["\6\2"] = 'application/x-alan-adventure-game';
-			$mime_magic[0][2]["\7\1"] = 'application/x-executable-file';
-			$mime_magic[1][3]["\120\116\107"] = 'image/x-png';
-			$mime_magic[1][3]["\127\120\103"] = 'text/vnd.wordperfect';
-			$mime_magic[2][6]["\55\154\150\64\60\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\150\144\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\150\60\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\150\61\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\150\62\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\150\63\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\150\64\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\150\65\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\172\163\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\172\64\55"] = 'application/x-lha';
-			$mime_magic[2][5]["\55\154\172\65\55"] = 'application/x-lha';
-			$mime_magic[2][2]["\0\21"] = 'font/x-tex-tfm';
-			$mime_magic[2][2]["\0\22"] = 'font/x-tex-tfm';
-			$mime_magic[4][4]["\155\144\141\164"] = 'video/quicktime';
-			$mime_magic[4][4]["\155\157\157\166"] = 'video/quicktime';
-			$mime_magic[4][4]["\160\151\160\145"] = 'application/data';
-			$mime_magic[4][4]["\160\162\157\146"] = 'application/data';
-			$mime_magic[4][2]["\257\21"] = 'video/fli';
-			$mime_magic[4][2]["\257\22"] = 'video/flc';
-			$mime_magic[6][18]["\45\41\120\123\55\101\144\157\142\145\106\157\156\164\55\61\56\60"] = 'font/type1';
-			$mime_magic[7][22]["\357\20\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60"] = 'application/core';
-			$mime_magic[7][4]["\0\105\107\101"] = 'font/x-dos';
-			$mime_magic[7][4]["\0\126\111\104"] = 'font/x-dos';
-			$mime_magic[8][4]["\23\172\53\105"] = 'font/x-sunos-news';
-			$mime_magic[8][4]["\23\172\53\110"] = 'font/x-sunos-news';
-			$mime_magic[10][25]["\43\40\124\150\151\163\40\151\163\40\141\40\163\150\145\154\154\40\141\162\143\150\151\166\145"] = 'application/x-shar';
-			$mime_magic[20][4]["\107\111\115\120"] = 'application/x-gimp-brush';
-			$mime_magic[20][4]["\107\120\101\124"] = 'application/x-gimp-pattern';
-			$mime_magic[20][4]["\375\304\247\334"] = 'application/x-zoo';
-			$mime_magic[21][8]["\41\123\103\122\105\101\115\41"] = 'audio/x-st2-mod';
-			$mime_magic[24][4]["\0\0\352\153"] = 'application/x-dump';
-			$mime_magic[24][4]["\0\0\352\154"] = 'application/x-dump';
-			$mime_magic[24][4]["\0\0\352\155"] = 'application/data';
-			$mime_magic[24][4]["\0\0\352\156"] = 'application/data';
-			$mime_magic[65][4]["\106\106\111\114"] = 'font/ttf';
-			$mime_magic[65][4]["\114\127\106\116"] = 'font/type1';
-			$mime_magic[257][8]["\165\163\164\141\162\40\40\60"] = 'application/x-gtar';
-			$mime_magic[257][6]["\165\163\164\141\162\60"] = 'application/x-tar';
-			$mime_magic[0774][2]["\332\276"] = 'application/data';
-			$mime_magic[1080][4]["\103\104\70\61"] = 'audio/x-oktalyzer-mod';
-			$mime_magic[1080][4]["\106\114\124\64"] = 'audio/x-startracker-mod';
-			$mime_magic[1080][4]["\115\41\113\41"] = 'audio/x-protracker-mod';
-			$mime_magic[1080][4]["\115\56\113\56"] = 'audio/x-protracker-mod';
-			$mime_magic[1080][4]["\117\113\124\101"] = 'audio/x-oktalyzer-mod';
-			$mime_magic[1080][4]["\61\66\103\116"] = 'audio/x-taketracker-mod';
-			$mime_magic[1080][4]["\63\62\103\116"] = 'audio/x-taketracker-mod';
-			$mime_magic[1080][4]["\64\103\110\116"] = 'audio/x-fasttracker-mod';
-			$mime_magic[1080][4]["\66\103\110\116"] = 'audio/x-fasttracker-mod';
-			$mime_magic[1080][4]["\70\103\110\116"] = 'audio/x-fasttracker-mod';
-			$mime_magic[2048][7]["\120\103\104\137\111\120\111"] = 'x/x-photo-cd-pack-file';
-			$mime_magic[2080][29]["\115\151\143\162\157\163\157\146\164\40\105\170\143\145\154\40\65\56\60\40\127\157\162\153\163\150\145\145\164"] = 'application/vnd.ms-excel';
-			$mime_magic[2080][27]["\115\151\143\162\157\163\157\146\164\40\127\157\162\144\40\66\56\60\40\104\157\143\165\155\145\156\164"] = 'text/vnd.ms-word';
-			$mime_magic[2080][26]["\104\157\143\165\155\145\156\164\157\40\115\151\143\162\157\163\157\146\164\40\127\157\162\144\40\66"] = 'text/vnd.ms-word';
-			$mime_magic[2112][9]["\115\123\127\157\162\144\104\157\143"] = 'text/vnd.ms-word';
-			$mime_magic[2114][5]["\102\151\146\146\65"] = 'application/vnd.ms-excel';
-			$mime_magic[4098][7]["\104\117\123\106\117\116\124"] = 'font/x-dos';
-			$mime_magic[68158480][2]["\23\177"] = 'application/x-filesystem';
-			$mime_magic[68158480][2]["\23\217"] = 'application/x-filesystem';
-			$mime_magic[68158480][2]["\44\150"] = 'application/x-filesystem';
-			$mime_magic[68158480][2]["\44\170"] = 'application/x-filesystem';
-			$mime_magic[70779960][2]["\357\123"] = 'application/x-linux-ext2fs';
+		$mime = self::analyze_file($filename);
 
-			return $mime_magic;
-		}
+		unlink($filename);//remove the temp file
+
+		return $mime;
 	}
-?>
+
+	/**
+	 * Get an array containing a mapping of common file extensions to
+	 * MIME types.
+	 *
+	 * Original array taken from http://horde.org
+	 * added OpenOffice Extensions by KL@stylite.de
+	 *
+	 * @author skwashd
+	 * @author ralfbecker - convert to a static array ;-)
+	 *
+	 * @var array of extenstion to mime mappings
+	 */
+	static $mime_extension_map = array(
+		'ai'	=> 'application/postscript',
+		'aif'	=> 'audio/x-aiff',
+		'aifc'	=> 'audio/x-aiff',
+		'aiff'	=> 'audio/x-aiff',
+		'asc'	=> 'application/pgp', //changed by skwashd - was text/plain
+		'asf'	=> 'video/x-ms-asf',
+		'asx'	=> 'video/x-ms-asf',
+		'au'	=> 'audio/basic',
+		'avi'	=> 'video/x-msvideo',
+		'bcpio'	=> 'application/x-bcpio',
+		'bin'	=> 'application/octet-stream',
+		'bmp'	=> 'image/bmp',
+		'c'	=> 'text/plain', // or 'text/x-csrc', //added by skwashd
+		'c++'	=> 'text/plain', // or 'text/x-c++src', //added by skwashd
+		'cc'	=> 'text/plain', // or 'text/x-c++src', //added by skwashd
+		'cs'	=> 'text/plain', //added by skwashd - for C# src
+		'cpp'	=> 'text/x-c++src', //added by skwashd
+		'cxx'	=> 'text/x-c++src', //added by skwashd
+		'cdf'	=> 'application/x-netcdf',
+		'class'	=> 'application/octet-stream',//secure but application/java-class is correct
+		'com'	=> 'application/octet-stream',//added by skwashd
+		'cpio'	=> 'application/x-cpio',
+		'cpt'	=> 'application/mac-compactpro',
+		'csh'	=> 'application/x-csh',
+		'css'	=> 'text/css',
+		'csv'	=> 'text/comma-separated-values',//added by skwashd
+		'dcr'	=> 'application/x-director',
+		'diff'	=> 'text/diff',
+		'dir'	=> 'application/x-director',
+		'dll'	=> 'application/octet-stream',
+		'dms'	=> 'application/octet-stream',
+		'doc'	=> 'application/msword',
+		'dot'	=> 'application/msword',//added by skwashd
+		'dvi'	=> 'application/x-dvi',
+		'dxr'	=> 'application/x-director',
+		'eps'	=> 'application/postscript',
+		'etx'	=> 'text/x-setext',
+		'exe'	=> 'application/octet-stream',
+		'ez'	=> 'application/andrew-inset',
+		'gif'	=> 'image/gif',
+		'gtar'	=> 'application/x-gtar',
+		'gz'	=> 'application/x-gzip',
+		'h'	=> 'text/plain', // or 'text/x-chdr',//added by skwashd
+		'h++'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
+		'hh'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
+		'hpp'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
+		'hxx'	=> 'text/plain', // or 'text/x-c++hdr', //added by skwashd
+		'hdf'	=> 'application/x-hdf',
+		'hqx'	=> 'application/mac-binhex40',
+		'htm'	=> 'text/html',
+		'html'	=> 'text/html',
+		'ice'	=> 'x-conference/x-cooltalk',
+		'ics'	=> 'text/calendar',
+		'ief'	=> 'image/ief',
+		'ifb'	=> 'text/calendar',
+		'iges'	=> 'model/iges',
+		'igs'	=> 'model/iges',
+		'jar'	=> 'application/x-jar', //added by skwashd - alternative mime type
+		'java'	=> 'text/x-java-source', //added by skwashd
+		'jpeg'	=> 'image/jpeg',
+		'jpg'	=> 'image/jpeg',
+		'jpe'	=> 'image/jpeg',
+		'js'	=> 'application/x-javascript',
+		'kar'	=> 'audio/midi',
+		'latex'	=> 'application/x-latex',
+		'lha'	=> 'application/octet-stream',
+		'log'	=> 'text/plain',
+		'lzh'	=> 'application/octet-stream',
+		'm3u'	=> 'audio/x-mpegurl',
+		'man'	=> 'application/x-troff-man',
+		'me'	=> 'application/x-troff-me',
+		'mesh'	=> 'model/mesh',
+		'mid'	=> 'audio/midi',
+		'midi'	=> 'audio/midi',
+		'mif'	=> 'application/vnd.mif',
+		'mov'	=> 'video/quicktime',
+		'movie'	=> 'video/x-sgi-movie',
+		'mp2'	=> 'audio/mpeg',
+		'mp3'	=> 'audio/mpeg',
+		'mpe'	=> 'video/mpeg',
+		'mpeg'	=> 'video/mpeg',
+		'mpg'	=> 'video/mpeg',
+		'mpga'	=> 'audio/mpeg',
+		'ms'	=> 'application/x-troff-ms',
+		'msh'	=> 'model/mesh',
+		'mxu'	=> 'video/vnd.mpegurl',
+		'nc'	=> 'application/x-netcdf',
+		'oda'	=> 'application/oda',
+		'odb'	=> 'application/vnd.oasis.opendocument.database',
+		'odg'   => 'application/vnd.oasis.opendocument.graphics',
+		'odt'   => 'application/vnd.oasis.opendocument.text',
+		'odp'   => 'application/vnd.oasis.opendocument.presentation',
+		'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
+		'patch'	=> 'text/diff',
+		'pbm'	=> 'image/x-portable-bitmap',
+		'pdb'	=> 'chemical/x-pdb',
+		'pdf'	=> 'application/pdf',
+		'pgm'	=> 'image/x-portable-graymap',
+		'pgn'	=> 'application/x-chess-pgn',
+		'pgp'	=> 'application/pgp',//added by skwashd
+		'php'	=> 'application/x-httpd-php',
+		'php3'	=> 'application/x-httpd-php3',
+		'pl'	=> 'application/x-perl',
+		'pm'	=> 'application/x-perl',
+		'png'	=> 'image/png',
+		'pnm'	=> 'image/x-portable-anymap',
+		'po'	=> 'text/plain',
+		'ppm'	=> 'image/x-portable-pixmap',
+		'ppt'	=> 'application/vnd.ms-powerpoint',
+		'ps'	=> 'application/postscript',
+		'qt'	=> 'video/quicktime',
+		'ra'	=> 'audio/x-realaudio',
+		'ram'	=> 'audio/x-pn-realaudio',
+		'ras'	=> 'image/x-cmu-raster',
+		'rgb'	=> 'image/x-rgb',
+		'rm'	=> 'audio/x-pn-realaudio',
+		'roff'	=> 'application/x-troff',
+		'rpm'	=> 'audio/x-pn-realaudio-plugin',
+		'rtf'	=> 'text/rtf',
+		'rtx'	=> 'text/richtext',
+		'sgm'	=> 'text/sgml',
+		'sgml'	=> 'text/sgml',
+		'sh'	=> 'application/x-sh',
+		'shar'	=> 'application/x-shar',
+		'shtml'	=> 'text/html',
+		'silo'	=> 'model/mesh',
+		'sit'	=> 'application/x-stuffit',
+		'skd'	=> 'application/x-koan',
+		'skm'	=> 'application/x-koan',
+		'skp'	=> 'application/x-koan',
+		'skt'	=> 'application/x-koan',
+		'smi'	=> 'application/smil',
+		'smil'	=> 'application/smil',
+		'snd'	=> 'audio/basic',
+		'so'	=> 'application/octet-stream',
+		'spl'	=> 'application/x-futuresplash',
+		'src'	=> 'application/x-wais-source',
+		'stc'	=> 'application/vnd.sun.xml.calc.template',
+		'std'	=> 'application/vnd.sun.xml.draw.template',
+		'sti'	=> 'application/vnd.sun.xml.impress.template',
+		'stw'	=> 'application/vnd.sun.xml.writer.template',
+		'sv4cpio'	=> 'application/x-sv4cpio',
+		'sv4crc'	=> 'application/x-sv4crc',
+		'swf'	=> 'application/x-shockwave-flash',
+		'sxc'	=> 'application/vnd.sun.xml.calc',
+		'sxd'	=> 'application/vnd.sun.xml.draw',
+		'sxg'	=> 'application/vnd.sun.xml.writer.global',
+		'sxi'	=> 'application/vnd.sun.xml.impress',
+		'sxm'	=> 'application/vnd.sun.xml.math',
+		'sxw'	=> 'application/vnd.sun.xml.writer',
+		't'	=> 'application/x-troff',
+		'tar'	=> 'application/x-tar',
+		'tcl'	=> 'application/x-tcl',
+		'tex'	=> 'application/x-tex',
+		'texi'	=> 'application/x-texinfo',
+		'texinfo'	=> 'application/x-texinfo',
+		'tgz'	=> 'application/x-gtar',
+		'tif'	=> 'image/tiff',
+		'tiff'	=> 'image/tiff',
+		'tr'	=> 'application/x-troff',
+		'tsv'	=> 'text/tab-separated-values',
+		'txt'	=> 'text/plain',
+		'ustar'	=> 'application/x-ustar',
+		'vbs'	=> 'text/plain', //added by skwashd - for obvious reasons
+		'vcd'	=> 'application/x-cdlink',
+		'vcf'	=> 'text/x-vcard',
+		'vcs'	=> 'text/calendar',
+		'vfb'	=> 'text/calendar',
+		'vrml'	=> 'model/vrml',
+		'vsd'	=> 'application/vnd.visio',
+		'wav'	=> 'audio/x-wav',
+		'wax'	=> 'audio/x-ms-wax',
+		'wbmp'	=> 'image/vnd.wap.wbmp',
+		'wbxml'	=> 'application/vnd.wap.wbxml',
+		'wm'	=> 'video/x-ms-wm',
+		'wma'	=> 'audio/x-ms-wma',
+		'wmd'	=> 'application/x-ms-wmd',
+		'wml'	=> 'text/vnd.wap.wml',
+		'wmlc'	=> 'application/vnd.wap.wmlc',
+		'wmls'	=> 'text/vnd.wap.wmlscript',
+		'wmlsc'	=> 'application/vnd.wap.wmlscriptc',
+		'wmv'	=> 'video/x-ms-wmv',
+		'wmx'	=> 'video/x-ms-wmx',
+		'wmz'	=> 'application/x-ms-wmz',
+		'wrl'	=> 'model/vrml',
+		'wvx'	=> 'video/x-ms-wvx',
+		'xbm'	=> 'image/x-xbitmap',
+		'xht'	=> 'application/xhtml+xml',
+		'xhtml'	=> 'application/xhtml+xml',
+		'xls'	=> 'application/vnd.ms-excel',
+		'xlt'	=> 'application/vnd.ms-excel',
+		'xml'	=> 'application/xml',
+		'xpm'	=> 'image/x-xpixmap',
+		'xsl'	=> 'text/xml',
+		'xwd'	=> 'image/x-xwindowdump',
+		'xyz'	=> 'chemical/x-xyz',
+		'z'	=> 'application/x-compress',
+		'zip'	=> 'application/zip',
+	);
+
+	/**
+	 * @deprecated use static parameter mime_magic::$mime_extension_map
+	 * @return array
+	 */
+	public static function get_mime_ext_map()
+	{
+		return self::$mime_extension_map;
+	}
+
+	/**
+	 * Get the mime magic mapping file - last resort test
+	 *
+	 * Note Taken from horde.org - no copyright notice attached
+	 *
+	 * @author skwashd - converted to a function
+	 * @author ralfbecker - convert to a static array ;-)
+	 *
+	 * @var array mime magic data
+	 */
+	static $mime_magic_file = array(
+		0 => array(
+			30 => array(
+				"\145\166\141\154\40\42\145\170\145\143\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+			),
+			24 => array(
+				"\145\166\141\154\40\42\145\170\145\143\40\57\165\163\162\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+			),
+			23 => array(
+				"\103\157\155\155\157\156\40\163\165\142\144\151\162\145\143\164\157\162\151\145\163\72\40" => 'text/x-patch',
+				"\75\74\154\151\163\164\76\156\74\160\162\157\164\157\143\157\154\40\142\142\156\55\155" => 'application/data',
+			),
+			22 => array(
+				"\101\115\101\116\104\101\72\40\124\101\120\105\123\124\101\122\124\40\104\101\124\105" => 'application/x-amanda-header',
+				"\107\106\61\120\101\124\103\110\61\60\60\60\111\104\43\60\60\60\60\60\62\60" => 'audio/x-gus-patch',
+				"\107\106\61\120\101\124\103\110\61\61\60\60\111\104\43\60\60\60\60\60\62\60" => 'audio/x-gus-patch',
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\142\141\163\150" => 'application/x-sh',
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\164\143\163\150" => 'application/x-csh',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\142\141\163\150" => 'application/x-sh',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\164\143\163\150" => 'application/x-csh',
+			),
+			21 => array(
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\163\150" => 'application/x-zsh',
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\172\163\150" => 'application/x-zsh',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\163\150" => 'application/x-zsh',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\172\163\150" => 'application/x-zsh',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\142\141\163\150" => 'application/x-sh',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\164\143\163\150" => 'application/x-csh',
+			),
+			20 => array(
+				"\145\166\141\154\40\42\145\170\145\143\40\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\11\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\145" => 'text/script',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\145" => 'text/script',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\163\150" => 'application/x-sh',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\172\163\150" => 'application/x-zsh',
+			),
+			19 => array(
+				"\103\162\145\141\164\151\166\145\40\126\157\151\143\145\40\106\151\154\145" => 'audio/x-voc',
+				"\41\74\141\162\143\150\76\156\137\137\137\137\137\137\137\137\137\137\105" => 'application/x-ar',
+				"\41\74\141\162\143\150\76\156\137\137\137\137\137\137\137\137\66\64\105" => 'application/data',
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\142\151\156\57\141\145" => 'text/script',
+			),
+			18 => array(
+				"\106\151\114\145\123\164\101\162\124\146\111\154\105\163\124\141\122\164" => 'text/x-apple-binscii',
+				"\43\41\40\57\165\163\162\57\154\157\143\141\154\57\164\143\163\150" => 'application/x-csh',
+				"\45\41\120\123\55\101\144\157\142\145\106\157\156\164\55\61\56\60" => 'font/type1',
+			),
+			17 => array(
+				"\43\41\57\165\163\162\57\154\157\143\141\154\57\164\143\163\150" => 'application/x-csh',
+			),
+			16 => array(
+				"\105\170\164\145\156\144\145\144\40\115\157\144\165\154\145\72" => 'audio/x-ft2-mod',
+				"\123\164\141\162\164\106\157\156\164\115\145\164\162\151\143\163" => 'font/x-sunos-news',
+				"\43\41\11\57\165\163\162\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\11\57\165\163\162\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\11\57\165\163\162\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\40\57\165\163\162\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\165\163\162\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\165\163\162\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\74\115\141\153\145\162\104\151\143\164\151\157\156\141\162\171" => 'application/x-framemaker',
+				"\74\115\141\153\145\162\123\143\162\145\145\156\106\157\156\164" => 'font/x-framemaker',
+			),
+			15 => array(
+				"\43\41\11\57\165\163\162\57\142\151\156\57\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\165\163\162\57\142\151\156\57\141\167\153" => 'application/x-awk',
+				"\43\41\57\165\163\162\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\57\165\163\162\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\57\165\163\162\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+			),
+			14 => array(
+				"\41\74\141\162\143\150\76\156\144\145\142\151\141\156" => 'application/x-dpkg',
+				"\43\41\57\165\163\162\57\142\151\156\57\141\167\153" => 'application/x-awk',
+				"\74\41\104\117\103\124\131\120\105\40\110\124\115\114" => 'text/html',
+				"\74\41\144\157\143\164\171\160\145\40\150\164\155\154" => 'text/html',
+			),
+			13 => array(
+				"\107\111\115\120\40\107\162\141\144\151\145\156\164" => 'application/x-gimp-gradient',
+			),
+			12 => array(
+				"\122\145\164\165\162\156\55\120\141\164\150\72" => 'message/rfc822',
+				"\43\41\11\57\142\151\156\57\142\141\163\150" => 'application/x-sh',
+				"\43\41\11\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\11\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\11\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\11\57\142\151\156\57\164\143\163\150" => 'application/x-csh',
+				"\43\41\40\57\142\151\156\57\142\141\163\150" => 'application/x-sh',
+				"\43\41\40\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\40\57\142\151\156\57\164\143\163\150" => 'application/x-csh',
+			),
+			11 => array(
+				"\43\41\11\57\142\151\156\57\141\167\153" => 'application/x-awk',
+				"\43\41\11\57\142\151\156\57\143\163\150" => 'application/x-csh',
+				"\43\41\11\57\142\151\156\57\153\163\150" => 'application/x-ksh',
+				"\43\41\40\57\142\151\156\57\141\167\153" => 'application/x-awk',
+				"\43\41\40\57\142\151\156\57\143\163\150" => 'application/x-csh',
+				"\43\41\40\57\142\151\156\57\153\163\150" => 'application/x-ksh',
+				"\43\41\57\142\151\156\57\142\141\163\150" => 'application/x-sh',
+				"\43\41\57\142\151\156\57\147\141\167\153" => 'application/x-awk',
+				"\43\41\57\142\151\156\57\156\141\167\153" => 'application/x-awk',
+				"\43\41\57\142\151\156\57\160\145\162\154" => 'application/x-perl',
+				"\43\41\57\142\151\156\57\164\143\163\150" => 'application/x-csh',
+			),
+			10 => array(
+				"\102\151\164\155\141\160\146\151\154\145" => 'image/unknown',
+				"\123\124\101\122\124\106\117\116\124\40" => 'font/x-bdf',
+				"\43\41\11\57\142\151\156\57\162\143" => 'text/script',
+				"\43\41\11\57\142\151\156\57\163\150" => 'application/x-sh',
+				"\43\41\40\57\142\151\156\57\162\143" => 'text/script',
+				"\43\41\40\57\142\151\156\57\163\150" => 'application/x-sh',
+				"\43\41\57\142\151\156\57\141\167\153" => 'application/x-awk',
+				"\43\41\57\142\151\156\57\143\163\150" => 'application/x-csh',
+				"\43\41\57\142\151\156\57\153\163\150" => 'application/x-ksh',
+				"\74\115\141\153\145\162\106\151\154\145" => 'application/x-framemaker',
+			),
+			9 => array(
+				"\122\145\143\145\151\166\145\144\72" => 'message/rfc822',
+				"\123\164\141\162\164\106\157\156\164" => 'font/x-sunos-news',
+				"\211\114\132\117\0\15\12\32\12" => 'application/data',
+				"\43\41\57\142\151\156\57\162\143" => 'text/script',
+				"\43\41\57\142\151\156\57\163\150" => 'application/x-sh',
+				"\55\162\157\155\61\146\163\55\60" => 'application/x-filesystem',
+				"\74\102\157\157\153\106\151\154\145" => 'application/x-framemaker',
+			),
+			8 => array(
+				"\117\156\154\171\40\151\156\40" => 'text/x-patch',
+				"\147\151\155\160\40\170\143\146" => 'application/x-gimp-image',
+				"\155\163\147\143\141\164\60\61" => 'application/x-locale',
+				"\32\141\162\143\150\151\166\145" => 'application/data',
+				"\41\74\120\104\106\76\41\156" => 'application/x-prof',
+				"\74\115\111\106\106\151\154\145" => 'application/x-framemaker',
+			),
+			7 => array(
+				"\101\162\164\151\143\154\145" => 'message/news',
+				"\120\103\104\137\117\120\101" => 'x/x-photo-cd-overfiew-file',
+				"\351\54\1\112\101\115\11" => 'application/data',
+				"\41\74\141\162\143\150\76" => 'application/x-ar',
+				"\72\40\163\150\145\154\154" => 'application/data',
+			),
+			6 => array(
+				"\116\165\106\151\154\145" => 'application/data',
+				"\116\365\106\351\154\345" => 'application/data',
+				"\60\67\60\67\60\61" => 'application/x-cpio',
+				"\60\67\60\67\60\62" => 'application/x-cpio',
+				"\60\67\60\67\60\67" => 'application/x-cpio',
+				"\74\115\141\153\145\162" => 'application/x-framemaker',
+				"\74\124\111\124\114\105" => 'text/html',
+				"\74\164\151\164\154\145" => 'text/html',
+			),
+			5 => array(
+				"\0\1\0\0\0" => 'font/ttf',
+				"\0\4\36\212\200" => 'application/core',
+				"\102\101\102\131\114" => 'message/x-gnu-rmail',
+				"\102\105\107\111\116" => 'application/x-awk',
+				"\103\157\162\145\1" => 'application/x-executable-file',
+				"\104\61\56\60\15" => 'font/x-speedo',
+				"\106\162\157\155\72" => 'message/rfc822',
+				"\115\101\123\137\125" => 'audio/x-multimate-mod',
+				"\120\117\136\121\140" => 'text/vnd.ms-word',
+				"\120\141\164\150\72" => 'message/news',
+				"\130\162\145\146\72" => 'message/news',
+				"\144\151\146\146\40" => 'text/x-patch',
+				"\225\64\62\62\336" => 'application/x-locale',
+				"\336\62\62\64\225" => 'application/x-locale',
+				"\74\110\105\101\104" => 'text/html',
+				"\74\110\124\115\114" => 'text/html',
+				"\74\150\145\141\144" => 'text/html',
+				"\74\150\164\155\154" => 'text/html',
+				"\75\74\141\162\76" => 'application/x-ar',
+			),
+			4 => array(
+				"\0\0\0\314" => 'application/x-executable-file',
+				"\0\0\0\4" => 'font/x-snf',
+				"\0\0\1\107" => 'application/x-object-file',
+				"\0\0\1\113" => 'application/x-executable-file',
+				"\0\0\1\115" => 'application/x-executable-file',
+				"\0\0\1\117" => 'application/x-executable-file',
+				"\0\0\1\201" => 'application/x-object-file',
+				"\0\0\1\207" => 'application/data',
+				"\0\0\1\263" => 'video/mpeg',
+				"\0\0\1\272" => 'video/mpeg',
+				"\0\0\1\6" => 'application/x-executable-file',
+				"\0\0\201\154" => 'application/x-apl-workspace',
+				"\0\0\377\145" => 'application/x-library-file',
+				"\0\0\377\155" => 'application/data',
+				"\0\0\3\347" => 'application/x-library-file',
+				"\0\0\3\363" => 'application/x-executable-file',
+				"\0\144\163\56" => 'audio/basic',
+				"\0\1\22\127" => 'application/core',
+				"\0\22\326\207" => 'image/x11',
+				"\0\3\233\355" => 'application/data',
+				"\0\3\233\356" => 'application/data',
+				"\0\5\26\0" => 'application/data',
+				"\0\5\26\7" => 'application/data',
+				"\0\5\61\142" => 'application/x-db',
+				"\0\6\25\141" => 'application/x-db',
+				"\103\124\115\106" => 'audio/x-cmf',
+				"\105\115\117\104" => 'audio/x-emod',
+				"\106\106\111\114" => 'font/ttf',
+				"\106\117\116\124" => 'font/x-vfont',
+				"\107\104\102\115" => 'application/x-gdbm',
+				"\107\111\106\70" => 'image/gif',
+				"\10\16\12\17" => 'application/data',
+				"\110\120\101\113" => 'application/data',
+				"\111\111\116\61" => 'image/tiff',
+				"\111\111\52\0" => 'image/tiff',
+				"\114\104\110\151" => 'application/data',
+				"\114\127\106\116" => 'font/type1',
+				"\115\115\0\52" => 'image/tiff',
+				"\115\117\126\111" => 'video/x-sgi-movie',
+				"\115\124\150\144" => 'audio/midi',
+				"\115\247\356\350" => 'font/x-hp-windows',
+				"\116\124\122\113" => 'audio/x-multitrack',
+				"\120\113\3\4" => 'application/zip',
+				"\122\111\106\106" => 'audio/x-wav',
+				"\122\141\162\41" => 'application/x-rar',
+				"\123\121\123\110" => 'application/data',
+				"\124\101\104\123" => 'application/x-tads-game',
+				"\125\103\62\32" => 'application/data',
+				"\125\116\60\65" => 'audio/x-mikmod-uni',
+				"\12\17\10\16" => 'application/data',
+				"\131\246\152\225" => 'x/x-image-sun-raster',
+				"\145\377\0\0" => 'application/x-ar',
+				"\150\163\151\61" => 'image/x-jpeg-proprietary',
+				"\16\10\17\12" => 'application/data',
+				"\177\105\114\106" => 'application/x-executable-file',
+				"\17\12\16\10" => 'application/data',
+				"\1\130\41\246" => 'application/core',
+				"\1\146\143\160" => 'font/x-pcf',
+				"\211\120\116\107" => 'image/x-png',
+				"\23\127\232\316" => 'application/x-gdbm',
+				"\23\172\51\104" => 'font/x-sunos-news',
+				"\23\172\51\107" => 'font/x-sunos-news',
+				"\23\172\51\120" => 'font/x-sunos-news',
+				"\23\172\51\121" => 'font/x-sunos-news',
+				"\24\2\131\31" => 'font/x-libgrx',
+				"\260\61\63\140" => 'application/x-bootable',
+				"\2\10\1\10" => 'application/x-executable-file',
+				"\2\10\1\6" => 'application/x-executable-file',
+				"\2\10\1\7" => 'application/x-executable-file',
+				"\2\10\377\145" => 'application/x-library-file',
+				"\2\12\1\10" => 'application/x-executable-file',
+				"\2\12\1\7" => 'application/x-executable-file',
+				"\2\12\377\145" => 'application/x-library-file',
+				"\2\13\1\10" => 'application/x-executable-file',
+				"\2\13\1\13" => 'application/x-executable-file',
+				"\2\13\1\15" => 'application/x-library-file',
+				"\2\13\1\16" => 'application/x-library-file',
+				"\2\13\1\6" => 'application/x-object-file',
+				"\2\13\1\7" => 'application/x-executable-file',
+				"\2\14\1\10" => 'application/x-executable-file',
+				"\2\14\1\13" => 'application/x-executable-file',
+				"\2\14\1\14" => 'application/x-lisp',
+				"\2\14\1\15" => 'application/x-library-file',
+				"\2\14\1\16" => 'application/x-library-file',
+				"\2\14\1\6" => 'application/x-executable-file',
+				"\2\14\1\7" => 'application/x-executable-file',
+				"\2\14\377\145" => 'application/x-library-file',
+				"\2\20\1\10" => 'application/x-executable-file',
+				"\2\20\1\13" => 'application/x-executable-file',
+				"\2\20\1\15" => 'application/x-library-file',
+				"\2\20\1\16" => 'application/x-library-file',
+				"\2\20\1\6" => 'application/x-object-file',
+				"\2\20\1\7" => 'application/x-executable-file',
+				"\2\24\1\10" => 'application/x-executable-file',
+				"\2\24\1\13" => 'application/x-executable-file',
+				"\2\24\1\15" => 'application/x-object-file',
+				"\2\24\1\16" => 'application/x-library-file',
+				"\2\24\1\6" => 'application/x-object-file',
+				"\2\24\1\7" => 'application/x-executable-file',
+				"\361\60\100\273" => 'image/x-cmu-raster',
+				"\366\366\366\366" => 'application/x-pc-floppy',
+				"\377\106\117\116" => 'font/x-dos',
+				"\41\74\141\162" => 'application/x-ar',
+				"\43\41\11\57" => 'text/script',
+				"\43\41\40\57" => 'text/script',
+				"\52\123\124\101" => 'application/data',
+				"\52\52\52\40" => 'text/x-patch',
+				"\56\162\141\375" => 'audio/x-pn-realaudio',
+				"\56\163\156\144" => 'audio/basic',
+				"\61\143\167\40" => 'application/data',
+				"\61\276\0\0" => 'text/vnd.ms-word',
+				"\62\62\67\70" => 'application/data',
+				"\74\115\115\114" => 'application/x-framemaker',
+				"\74\141\162\76" => 'application/x-ar',
+			),
+			3 => array(
+				"\102\132\150" => 'application/x-bzip2',
+				"\106\101\122" => 'audio/mod',
+				"\115\124\115" => 'audio/x-multitrack',
+				"\123\102\111" => 'audio/x-sbi',
+				"\124\117\103" => 'audio/x-toc',
+				"\12\107\114" => 'application/data',
+				"\146\154\143" => 'application/x-font',
+				"\146\154\146" => 'font/x-figlet',
+				"\33\105\33" => 'image/x-pcl-hp',
+				"\33\143\33" => 'application/data',
+				"\377\377\174" => 'application/data',
+				"\377\377\176" => 'application/data',
+				"\377\377\177" => 'application/data',
+				"\43\41\40" => 'text/script',
+				"\43\41\57" => 'text/script',
+				"\4\45\41" => 'application/postscript',
+				"\55\150\55" => 'application/data',
+				"\61\143\167" => 'application/data',
+			),
+			2 => array(
+				"\0\0" => 'application/x-executable-file',
+				"\102\115" => 'image/x-bmp',
+				"\102\132" => 'application/x-bzip',
+				"\111\103" => 'image/x-ico',
+				"\112\116" => 'audio/x-669-mod',
+				"\115\132" => 'application/x-ms-dos-executable',
+				"\120\61" => 'image/x-portable-bitmap',
+				"\120\62" => 'image/x-portable-graymap',
+				"\120\63" => 'image/x-portable-pixmap',
+				"\120\64" => 'image/x-portable-bitmap',
+				"\120\65" => 'image/x-portable-graymap',
+				"\120\66" => 'image/x-portable-pixmap',
+				"\151\146" => 'audio/x-669-mod',
+				"\161\307" => 'application/x-cpio',
+				"\166\377" => 'application/data',
+				"\1\110" => 'application/x-executable-file',
+				"\1\111" => 'application/x-executable-file',
+				"\1\124" => 'application/data',
+				"\1\125" => 'application/x-executable-file',
+				"\1\160" => 'application/x-executable-file',
+				"\1\161" => 'application/x-executable-file',
+				"\1\175" => 'application/x-executable-file',
+				"\1\177" => 'application/x-executable-file',
+				"\1\20" => 'application/x-executable-file',
+				"\1\203" => 'application/x-executable-file',
+				"\1\21" => 'application/x-executable-file',
+				"\1\210" => 'application/x-executable-file',
+				"\1\217" => 'application/x-object-file',
+				"\1\224" => 'application/x-executable-file',
+				"\1\227" => 'application/x-executable-file',
+				"\1\332" => 'x/x-image-sgi',
+				"\1\36" => 'font/x-vfont',
+				"\1\6" => 'application/x-executable-file',
+				"\307\161" => 'application/x-bcpio',
+				"\313\5" => 'application/data',
+				"\352\140" => 'application/x-arj',
+				"\367\131" => 'font/x-tex',
+				"\367\203" => 'font/x-tex',
+				"\367\312" => 'font/x-tex',
+				"\36\1" => 'font/x-vfont',
+				"\375\166" => 'application/x-lzh',
+				"\376\166" => 'application/data',
+				"\377\145" => 'application/data',
+				"\377\155" => 'application/data',
+				"\377\166" => 'application/data',
+				"\377\330" => 'image/jpeg',
+				"\377\37" => 'application/data',
+				"\37\213" => 'application/x-gzip',
+				"\37\235" => 'application/compress',
+				"\37\236" => 'application/data',
+				"\37\237" => 'application/data',
+				"\37\240" => 'application/data',
+				"\37\36" => 'application/data',
+				"\37\37" => 'application/data',
+				"\37\377" => 'application/data',
+				"\45\41" => 'application/postscript',
+				"\4\66" => 'font/linux-psf',
+				"\57\57" => 'text/cpp',
+				"\5\1" => 'application/x-locale',
+				"\6\1" => 'application/x-executable-file',
+				"\6\2" => 'application/x-alan-adventure-game',
+				"\7\1" => 'application/x-executable-file',
+			),
+		),
+		1 => array(
+			3 => array(
+				"\120\116\107" => 'image/x-png',
+				"\127\120\103" => 'text/vnd.wordperfect',
+			),
+		),
+		2 => array(
+			6 => array(
+				"\55\154\150\64\60\55" => 'application/x-lha',
+			),
+			5 => array(
+				"\55\154\150\144\55" => 'application/x-lha',
+				"\55\154\150\60\55" => 'application/x-lha',
+				"\55\154\150\61\55" => 'application/x-lha',
+				"\55\154\150\62\55" => 'application/x-lha',
+				"\55\154\150\63\55" => 'application/x-lha',
+				"\55\154\150\64\55" => 'application/x-lha',
+				"\55\154\150\65\55" => 'application/x-lha',
+				"\55\154\172\163\55" => 'application/x-lha',
+				"\55\154\172\64\55" => 'application/x-lha',
+				"\55\154\172\65\55" => 'application/x-lha',
+			),
+			2 => array(
+				"\0\21" => 'font/x-tex-tfm',
+				"\0\22" => 'font/x-tex-tfm',
+			),
+		),
+		4 => array(
+			4 => array(
+				"\155\144\141\164" => 'video/quicktime',
+				"\155\157\157\166" => 'video/quicktime',
+				"\160\151\160\145" => 'application/data',
+				"\160\162\157\146" => 'application/data',
+			),
+			2 => array(
+				"\257\21" => 'video/fli',
+				"\257\22" => 'video/flc',
+			),
+		),
+		6 => array(
+			18 => array(
+				"\45\41\120\123\55\101\144\157\142\145\106\157\156\164\55\61\56\60" => 'font/type1',
+			),
+		),
+		7 => array(
+			22 => array(
+				"\357\20\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60\60" => 'application/core',
+			),
+			4 => array(
+				"\0\105\107\101" => 'font/x-dos',
+				"\0\126\111\104" => 'font/x-dos',
+			),
+		),
+		8 => array(
+			4 => array(
+				"\23\172\53\105" => 'font/x-sunos-news',
+				"\23\172\53\110" => 'font/x-sunos-news',
+			),
+		),
+		10 => array(
+			25 => array(
+				"\43\40\124\150\151\163\40\151\163\40\141\40\163\150\145\154\154\40\141\162\143\150\151\166\145" => 'application/x-shar',
+			),
+		),
+		20 => array(
+			4 => array(
+				"\107\111\115\120" => 'application/x-gimp-brush',
+				"\107\120\101\124" => 'application/x-gimp-pattern',
+				"\375\304\247\334" => 'application/x-zoo',
+			),
+		),
+		21 => array(
+			8 => array(
+			"\41\123\103\122\105\101\115\41" => 'audio/x-st2-mod',
+			),
+		),
+		24 => array(
+			4 => array(
+				"\0\0\352\153" => 'application/x-dump',
+				"\0\0\352\154" => 'application/x-dump',
+				"\0\0\352\155" => 'application/data',
+				"\0\0\352\156" => 'application/data',
+			),
+		),
+		65 => array(
+			4 => array(
+				"\106\106\111\114" => 'font/ttf',
+				"\114\127\106\116" => 'font/type1',
+			),
+		),
+		257 => array(
+			8 => array(
+				"\165\163\164\141\162\40\40\60" => 'application/x-gtar',
+			),
+			6 => array(
+				"\165\163\164\141\162\60" => 'application/x-tar',
+			),
+		),
+		0774 => array(
+			2 => array(
+				"\332\276" => 'application/data',
+			),
+		),
+		1080 => array(
+			4 => array(
+				"\103\104\70\61" => 'audio/x-oktalyzer-mod',
+				"\106\114\124\64" => 'audio/x-startracker-mod',
+				"\115\41\113\41" => 'audio/x-protracker-mod',
+				"\115\56\113\56" => 'audio/x-protracker-mod',
+				"\117\113\124\101" => 'audio/x-oktalyzer-mod',
+				"\61\66\103\116" => 'audio/x-taketracker-mod',
+				"\63\62\103\116" => 'audio/x-taketracker-mod',
+				"\64\103\110\116" => 'audio/x-fasttracker-mod',
+				"\66\103\110\116" => 'audio/x-fasttracker-mod',
+				"\70\103\110\116" => 'audio/x-fasttracker-mod',
+			),
+		),
+		2048 => array(
+			7 => array(
+				"\120\103\104\137\111\120\111" => 'x/x-photo-cd-pack-file',
+			),
+		),
+		2080 => array(
+			29 => array(
+				"\115\151\143\162\157\163\157\146\164\40\105\170\143\145\154\40\65\56\60\40\127\157\162\153\163\150\145\145\164" => 'application/vnd.ms-excel',
+			),
+			27 => array(
+				"\115\151\143\162\157\163\157\146\164\40\127\157\162\144\40\66\56\60\40\104\157\143\165\155\145\156\164" => 'text/vnd.ms-word',
+			),
+			26 => array(
+				"\104\157\143\165\155\145\156\164\157\40\115\151\143\162\157\163\157\146\164\40\127\157\162\144\40\66" => 'text/vnd.ms-word',
+			),
+		),
+		2112 => array(
+			9 => array(
+				"\115\123\127\157\162\144\104\157\143" => 'text/vnd.ms-word',
+			),
+		),
+		2114 => array(
+			5 => array(
+				"\102\151\146\146\65" => 'application/vnd.ms-excel',
+			),
+		),
+		4098 => array(
+			7 => array(
+				"\104\117\123\106\117\116\124" => 'font/x-dos',
+			),
+		),
+		68158480 => array(
+			2 => array(
+				"\23\177" => 'application/x-filesystem',
+				"\23\217" => 'application/x-filesystem',
+				"\44\150" => 'application/x-filesystem',
+				"\44\170" => 'application/x-filesystem',
+			),
+		),
+		70779960 => array(
+			2 => array(
+				"\357\123" => 'application/x-linux-ext2fs',
+			),
+		),
+	);
+
+	/**
+	 * @deprecated use static parameter mime_magic::$mime_magic_file
+	 * @return array
+	 */
+	public static function get_mime_magic_file()
+	{
+		return self::$mime_magic_file;
+	}
+}
diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index b4af2d3992..b5da3b50a3 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -304,16 +304,11 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			$this->stream_seek(0,SEEK_END);
 
-			static $mime_magic;
-			if (is_null($mime_magic))
-			{
-				$mime_magic = new mime_magic();
-			}
 			// we need to update the mime-type, size and content (if STORE2DB)
 			$values = array(
 				'fs_size' => $this->stream_tell(),
 				// todo: analyse the file for the mime-type
-				'fs_mime' => $mime_magic->filename2mime($this->opened_path),
+				'fs_mime' => mime_magic::filename2mime($this->opened_path),
 				'fs_id'   => $this->opened_fs_id,
 				'fs_modifier' => egw_vfs::$user,
 				'fs_modified' => self::_pdo_timestamp(time()),
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 3b53a6175f..e0bb50c003 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -617,15 +617,9 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			$mime = mime_content_type($path);
 		}
 		// using eGW's own mime magic
-		// ToDo: rework mime_magic as all methods cound be static!
 		if (!$mime)
 		{
-			static $mime_magic;
-			if (is_null($mime_magic))
-			{
-				$mime_magic = new mime_magic();
-			}
-			$mime = $mime_magic->filename2mime(parse_url($url,PHP_URL_PATH));
+			$mime = mime_magic::filename2mime(parse_url($url,PHP_URL_PATH));
 		}
 		//error_log(__METHOD__."($path) mime=$mime");
 		return $mime;
@@ -855,7 +849,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 * @param boolean $do_symlink=true is a direct match allowed, default yes (must be false for a lstat or readlink!)
 	 * @return string target or path, if path not found
 	 */
-	static protected function symlinkCache_resolve($path,$do_symlink=true)
+	static public function symlinkCache_resolve($path,$do_symlink=true)
 	{
 		// remove vfs scheme, but no other schemes (eg. filesystem!)
 		if ($path[0] != '/' && parse_url($path,PHP_URL_SCHEME) == self::SCHEME)

From 3c18478f866a1a297dd7a4bf187e5935b8751928 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Apr 2009 06:28:19 +0000
Subject: [PATCH 200/510] - more docu for file selection dialog - added mime
 type filter - added more user friendly mime type names:   application/pdf -->
 PDF file (application/pdf)

---
 etemplate/inc/class.vfs_widget.inc.php        |  9 ++-
 .../inc/class.filemanager_select.inc.php      | 55 +++++++++++++++----
 filemanager/setup/egw_de.lang                 |  3 +
 filemanager/setup/egw_en.lang                 |  3 +
 filemanager/setup/etemplates.inc.php          |  4 +-
 filemanager/templates/default/select.xet      |  4 +-
 6 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index be8583d371..f5d71c3506 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -212,7 +212,14 @@ class vfs_widget
 				}
 				//error_log(__METHOD__."() type=vfs-mime: value=".array2string($value).": mime=$mime, path=$path");
 				$cell['type'] = 'image';
-				$cell['label'] = $mime;
+				if ($mime == egw_vfs::DIR_MIME_TYPE)
+				{
+					$cell['label'] = lang('Directory');
+				}
+				else
+				{
+					$cell['label'] = lang('%1 file',strtoupper(mime_magic::mime2ext($mime))).' ('.$mime.')';
+				}
 				list($mime_main,$mime_sub) = explode('/',$mime);
 				if ($mime_main == 'egw')
 				{
diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index 8cdfac311e..78f12a97d9 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGroupWare - Filemanager - select file to open / save dialog
+ * eGroupWare - Filemanager - select file to open or save dialog
  *
  * @link http://www.egroupware.org
  * @package filemanager
@@ -10,6 +10,25 @@
  * @version $Id$
  */
 
+/**
+ * Select file to open or save dialog
+ *
+ * This dialog can be called from applications to open or store files from the VFS.
+ *
+ * There are the following ($_GET) parameters:
+ * - menuaction=filemanager.filemanager_select.select   (required)
+ * - mode=(open|open-multiple|saveas|select-dir)        (required)
+ * - method=app.class.method                            (required callback, gets called with id and selected file(s))
+ * - id=...                                             (optional parameter passed to callback)
+ * - path=...                                           (optional start path in VFS)
+ * - mime=...                                           (optional mime-type to limit display to given type)
+ * - label=...                                          (optional label for submit button, default "Open")
+ *
+ * The application calls this method in a popup with size: 640x580 px
+ * After the user selected one or more files (depending on the mode parameter), the "method" callback gets
+ * called on server (!) side. Parameters are the id plus the selected files as 1. and 2. parameter.
+ * The callback returns javascript to eg. update it's UI AND (!) to close the current popup ("window.close();").
+ */
 class filemanager_select
 {
 	/**
@@ -35,17 +54,10 @@ class filemanager_select
 	}
 
 	/**
-	 * Callback to fetch the rows for the nextmatch widget
+	 * File selector
 	 *
-	 * @param array $query
-	 * @param array &$rows
-	 * @param array &$readonlys
+	 * @param array $content
 	 */
-	function get_rows($query,&$rows,&$readonlys)
-	{
-
-	}
-
 	function select(array $content=null)
 	{
 		if (!is_array($content))
@@ -65,7 +77,22 @@ class filemanager_select
 			$content['method'] = $_GET['method'];
 			$content['id']     = $_GET['id'];
 			$content['label'] = isset($_GET['label']) ? $_GET['label'] : lang('Open');
-			$content['mime']   = $_GET['mime'];
+			if (($content['options-mime'] = isset($_GET['mime'])))
+			{
+				$content['options-mime'] = array();
+				foreach((array)$_GET['mime'] as $key => $value)
+				{
+					if (is_numeric($key))
+					{
+						$content['options-mime'][$value] = lang('%1 files',strtoupper(mime_magic::mime2ext($value))).' ('.$value.')';
+					}
+					else
+					{
+						$content['options-mime'][$key] = lang('%1 files',strtoupper($value)).' ('.$key.')';
+					}
+				}
+				list($content['mime']) = each($content['options-mime']);
+			}
 		}
 		else
 		{
@@ -112,6 +139,10 @@ class filemanager_select
 			{
 				$path = egw_vfs::concat($content['path'],$name);
 				$is_dir = egw_vfs::is_dir($path);
+				if ($content['mime'] && !$is_dir && egw_vfs::mime_content_type($path) != $content['mime'])
+				{
+					continue;	// does not match mime-filter --> ignore
+				}
 				$content['dir'][$n] = array(
 					'name' => $name,
 					'path' => $path,
@@ -159,6 +190,8 @@ function select_toggle(file)
 			'method' => $content['method'],
 			'id'     => $content['id'],
 			'label'  => $content['label'],
+			'mime'   => $content['mime'],
+			'options-mime' => $content['options-mime'],
 		),2);
 	}
 }
diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index cd9219ed6a..03a5cfb146 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -7,6 +7,7 @@
 %1 errors linking (%2)!	filemanager	de	%1 Fehler beim Verküpfen (%2)!
 %1 errors moving (%2 files moved)!	filemanager	de	%1 Fehler beim Verschieben (%2 Dateien verschoben)!
 %1 failed, %2 succeded	filemanager	de	%1 fehlgeschlagen, %2 erfolgreich
+%1 files	common	de	%1 Dateien
 %1 files copied.	filemanager	de	%1 Dateien kopiert.
 %1 files deleted.	filemanager	de	%1 Dateien gelöscht.
 %1 files moved.	filemanager	de	%1 Dateien verschoben.
@@ -18,8 +19,10 @@ accessrights	filemanager	de	Zugangsberechtigungen
 acl added.	filemanager	de	Zugrifsrecht hinzugefügt.
 acl deleted.	filemanager	de	Zugrifsrecht gelöscht.
 actions	filemanager	de	Befehle
+all files	common	de	Alle Dateien
 allow a maximum of the above configured folderlinks to be configured in settings	admin	de	erlaube das oben eingestellte Maximum an Einstellunge für Verzeichnisverweise
 and all it's childeren	filemanager	de	und alle seine Kinder
+applications	common	de	Anwendungen
 basedirectory	filemanager	de	Basisverzeichnis
 cancel editing %1 without saving	filemanager	de	Beende das Bearbeiten von %1 ohne zu Speichern
 cannot create directory because it begins or ends in a space	filemanager	de	Die Erstellung des Verzeichnisses schlug fehl, da es mit einem Leerzeichen beginnt oder endet
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index c92de12fc0..5d9410a622 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -7,6 +7,7 @@
 %1 errors linking (%2)!	filemanager	en	%1 errors linking (%2)!
 %1 errors moving (%2 files moved)!	filemanager	en	%1 errors moving (%2 files moved)!
 %1 failed, %2 succeded	filemanager	en	%1 failed, %2 succeded
+%1 files	common	en	%1 files
 %1 files copied.	filemanager	en	%1 files copied.
 %1 files deleted.	filemanager	en	%1 files deleted.
 %1 files moved.	filemanager	en	%1 files moved.
@@ -18,8 +19,10 @@ accessrights	filemanager	en	Accessrights
 acl added.	filemanager	en	ACL added.
 acl deleted.	filemanager	en	ACL deleted.
 actions	filemanager	en	Actions
+all files	common	en	All files
 allow a maximum of the above configured folderlinks to be configured in settings	admin	en	allow a maximum of the above configured folderlinks to be configured in settings
 and all it's childeren	filemanager	en	and all it's childeren
+applications	common	en	Applications
 basedirectory	filemanager	en	Basedirectory
 cancel editing %1 without saving	filemanager	en	Cancel editing %1 without saving
 cannot create directory because it begins or ends in a space	filemanager	en	Cannot create directory because it begins or ends in a space
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index bb54c5efa8..8ed79fa676 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-15 23:14
+	* generated by soetemplate::dump4setup() 2009-04-17 08:26
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -56,5 +56,5 @@ $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:17:""$row_cont[path]"";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
-$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:12:"button[home]";s:5:"align";s:6:"center";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:20:",@mode=open-multiple";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
+$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:12:"button[home]";s:5:"align";s:6:"center";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:20:",@mode=open-multiple";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
 
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index afabb9c04f..b3778a13df 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -42,9 +42,9 @@
 							<row disabled="@mode=open-multiple">
 								<textbox id="name" class="selectName" needed="1"/>
 							</row>
-							<row>
+							<row disabled="!@options-mime">
 								<menulist class="selectMime">
-									<menupopup options="All" id="mime"/>
+									<menupopup options="All files" id="mime" onchange="1"/>
 								</menulist>
 							</row>
 							<row>

From 5e88f9b5631f921cc970cbb5d9dbce04389541da Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Apr 2009 07:27:12 +0000
Subject: [PATCH 201/510] "allow to specify app in image name"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 4f4da615d7..652e1d2c4e 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1246,6 +1246,7 @@ class etemplate extends boetemplate
 			case 'cancel':	// cancel button
 				list($app) = explode('.',$this->name);
 				list($img,$ro_img) = explode(',',$cell_options);
+				if (strpos($img,'/') !== false) list($app,$img) = explode('/',$img,2);	// allow to specify app in image name
 				$title = strlen($label) <= 1 || $cell['no_lang'] ? $label : lang($label);
 				if ($cell['onclick'] &&
 					($onclick = $this->expand_name($cell['onclick'],$show_c,$show_row,$content['.c'],$content['.row'],$content)))

From 25d1f106ab0c1661fe4bc02d676508728c7fe05f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Apr 2009 07:37:12 +0000
Subject: [PATCH 202/510] shortcuts to application directories

---
 .../inc/class.filemanager_select.inc.php      | 43 ++++++++++++++++---
 filemanager/setup/etemplates.inc.php          |  4 +-
 filemanager/templates/default/select.xet      | 14 +++++-
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index 78f12a97d9..c090fec9cf 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -69,10 +69,9 @@ class filemanager_select
 				throw new egw_exception_wrong_parameter("Wrong or unset required mode parameter!");
 			}
 			$content['path'] = $_GET['path'];
-			if (!isset($content['path']) && ($content['path'] = egw_session::appsession('select_path','filemanger')) === false ||
-				!egw_vfs::is_dir($content['path']))
+			if (!isset($content['path']))
 			{
-				$content['path'] = filemanager_ui::get_home_dir();
+				$content['path'] = egw_session::appsession('select_path','filemanger');
 			}
 			$content['method'] = $_GET['method'];
 			$content['id']     = $_GET['id'];
@@ -94,10 +93,10 @@ class filemanager_select
 				list($content['mime']) = each($content['options-mime']);
 			}
 		}
-		else
+		elseif(isset($content['button']))
 		{
-			//_debug_array($content); die('Stop');
-			if ($content['button']) list($button) = each($content['button']);
+			list($button) = each($content['button']);
+			unset($content['button']);
 			switch($button)
 			{
 				case 'up':
@@ -127,6 +126,23 @@ class filemanager_select
 					$GLOBALS['egw']->common->egw_exit();
 			}
 		}
+		elseif(isset($content['apps']))
+		{
+			list($app) = each($content['apps']);
+			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
+		}
+		$content['apps'] = array_keys(self::get_apps());
+		array_unshift($content['apps'],false);	// index starting from 1
+
+		if (isset($app) && isset($content['apps'][$app]))
+		{
+			$content['path'] = '/apps/'.$content['apps'][$app];
+		}
+
+		if (!$content['path'] || !egw_vfs::is_dir($content['path']))
+		{
+			$content['path'] = filemanager_ui::get_home_dir();
+		}
 		if (!($d = egw_vfs::opendir($content['path'])))
 		{
 			$content['msg'] = lang("Can't open directory %1!",$content['path']);
@@ -194,4 +210,19 @@ function select_toggle(file)
 			'options-mime' => $content['options-mime'],
 		),2);
 	}
+
+	/**
+	 * Get a list off all apps having an application directory in VFS
+	 *
+	 * @return array
+	 */
+	static function get_apps()
+	{
+		$apps = egw_link::app_list('query');
+
+		unset($apps['mydms']);	// they do NOT support adding files to VFS
+		unset($apps['wiki']);
+
+		return $apps;
+	}
 }
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index 8ed79fa676..dfbfb759dc 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-17 08:26
+	* generated by soetemplate::dump4setup() 2009-04-17 09:36
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -56,5 +56,5 @@ $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:17:""$row_cont[path]"";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
-$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:12:"button[home]";s:5:"align";s:6:"center";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:20:",@mode=open-multiple";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
+$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:2:"40";s:2:"h2";s:2:"40";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:4:"home";s:5:"align";s:6:"center";s:5:"label";s:4:"Home";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:20:",@mode=open-multiple";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
 
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index b3778a13df..d2811b2ec6 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -9,7 +9,19 @@
 			</columns>
 			<rows>
 				<row valign="top">
-					<button image="home" id="button[home]" align="center"/>
+					<grid id="apps">
+						<columns>
+							<column/>
+						</columns>
+						<rows>
+							<row height="40">
+								<button image="home" id="home" align="center" label="Home"/>
+							</row>
+							<row height="40">
+								<button image="$row_cont/navbar" label="$row_cont" align="center" id="${row}"/>
+							</row>
+						</rows>
+					</grid>
 					<grid width="100%">
 						<columns>
 							<column/>

From f0896ccd09c5691f9a157b523bd23db6ecc49dee Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Apr 2009 08:22:31 +0000
Subject: [PATCH 203/510] saving attachments to vfs

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

diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index c090fec9cf..b5e321794d 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -73,6 +73,7 @@ class filemanager_select
 			{
 				$content['path'] = egw_session::appsession('select_path','filemanger');
 			}
+			$content['name'] = (string)$_GET['name'];
 			$content['method'] = $_GET['method'];
 			$content['id']     = $_GET['id'];
 			$content['label'] = isset($_GET['label']) ? $_GET['label'] : lang('Open');
@@ -174,7 +175,6 @@ class filemanager_select
 			}
 			closedir($d);
 		}
-		$content['name'] = '';
 		$content['js'] = '<script type="text/javascript">
 function select_goto(to)
 {

From a6946628389c78744bd23422d228fee2357c5ee8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Apr 2009 09:51:51 +0000
Subject: [PATCH 204/510] "file_exists for vfs"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 82fc1cd4fa..6c1eb45dc3 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -227,6 +227,17 @@ class egw_vfs extends vfs_stream_wrapper
 		return $path[0] == '/' && is_link(self::PREFIX.$path);
 	}
 
+	/**
+	 * file_exists() version working only inside the vfs
+	 *
+	 * @param string $path
+	 * @return boolean
+	 */
+	static function file_exists($path)
+	{
+		return $path[0] == '/' && file_exists(self::PREFIX.$path);
+	}
+
 	/**
 	 * Mounts $url under $path in the vfs, called without parameter it returns the fstab
 	 *

From 1a8b605c17951b281ef6d93cb319aff83fa08edd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Apr 2009 09:53:36 +0000
Subject: [PATCH 205/510] method to create user friendly label for a mime type,
 eg. "PDF file (application/pdf)"

---
 etemplate/inc/class.vfs_widget.inc.php | 10 ++--------
 phpgwapi/inc/class.mime_magic.inc.php  | 24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index f5d71c3506..cbcce7242f 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -212,14 +212,8 @@ class vfs_widget
 				}
 				//error_log(__METHOD__."() type=vfs-mime: value=".array2string($value).": mime=$mime, path=$path");
 				$cell['type'] = 'image';
-				if ($mime == egw_vfs::DIR_MIME_TYPE)
-				{
-					$cell['label'] = lang('Directory');
-				}
-				else
-				{
-					$cell['label'] = lang('%1 file',strtoupper(mime_magic::mime2ext($mime))).' ('.$mime.')';
-				}
+				$cell['label'] = mime_magic::mime2label($mime);
+
 				list($mime_main,$mime_sub) = explode('/',$mime);
 				if ($mime_main == 'egw')
 				{
diff --git a/phpgwapi/inc/class.mime_magic.inc.php b/phpgwapi/inc/class.mime_magic.inc.php
index b94043ed8a..3f4a937310 100644
--- a/phpgwapi/inc/class.mime_magic.inc.php
+++ b/phpgwapi/inc/class.mime_magic.inc.php
@@ -26,6 +26,27 @@
  */
 class mime_magic
 {
+	/**
+	 * Get a user friendly label for a mime type: e.g. "PDF file (application/pdf)"
+	 *
+	 * @param string $mime
+	 * @return string
+	 */
+	public function mime2label($mime)
+	{
+		$mime = strtolower($mime);
+
+		if ($mime == egw_vfs::DIR_MIME_TYPE)
+		{
+			return lang('Directory');
+		}
+		elseif (!($ext = self::mime2ext($mime)))
+		{
+			return $mime;
+		}
+		return lang('%1 file',strtoupper($ext)).' ('.$mime.')';
+	}
+
 	/**
 	 * Convert a file extension to a MIME type
 	 *
@@ -92,6 +113,7 @@ class mime_magic
 	 */
 	public static function mime2ext($type)
 	{
+		$type = strtolower($type);
 		$key = array_search($type, self::$mime_extension_map);
 		if (empty($type) || $key === false)
 		{
@@ -294,7 +316,7 @@ class mime_magic
 		'odt'   => 'application/vnd.oasis.opendocument.text',
 		'odp'   => 'application/vnd.oasis.opendocument.presentation',
 		'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
-		'patch'	=> 'text/diff',
+		'patch'	=> 'text/x-diff',
 		'pbm'	=> 'image/x-portable-bitmap',
 		'pdb'	=> 'chemical/x-pdb',
 		'pdf'	=> 'application/pdf',

From f08024b9e023b0e361d09c3749f10b704e83af81 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Apr 2009 10:13:12 +0000
Subject: [PATCH 206/510] disable name row for select-dir mode too

---
 filemanager/setup/etemplates.inc.php     | 4 ++--
 filemanager/templates/default/select.xet | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index dfbfb759dc..c75abd77b9 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-17 09:36
+	* generated by soetemplate::dump4setup() 2009-04-18 12:11
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -56,5 +56,5 @@ $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:17:""$row_cont[path]"";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
-$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:2:"40";s:2:"h2";s:2:"40";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:4:"home";s:5:"align";s:6:"center";s:5:"label";s:4:"Home";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:20:",@mode=open-multiple";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
+$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:2:"40";s:2:"h2";s:2:"40";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:4:"home";s:5:"align";s:6:"center";s:5:"label";s:4:"Home";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:35:",@mode=/(open-multiple|select-dir)/";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
 
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index d2811b2ec6..33d9dfa97f 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -51,7 +51,7 @@
 									</rows>
 								</grid>
 							</row>
-							<row disabled="@mode=open-multiple">
+							<row disabled="@mode=/(open-multiple|select-dir)/">
 								<textbox id="name" class="selectName" needed="1"/>
 							</row>
 							<row disabled="!@options-mime">

From 70f2d64273231e5b9432da6ca0a79e028a091754 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Apr 2009 10:54:39 +0000
Subject: [PATCH 207/510] "missing static"

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

diff --git a/phpgwapi/inc/class.mime_magic.inc.php b/phpgwapi/inc/class.mime_magic.inc.php
index 3f4a937310..4dae27f6ae 100644
--- a/phpgwapi/inc/class.mime_magic.inc.php
+++ b/phpgwapi/inc/class.mime_magic.inc.php
@@ -32,7 +32,7 @@ class mime_magic
 	 * @param string $mime
 	 * @return string
 	 */
-	public function mime2label($mime)
+	public static function mime2label($mime)
 	{
 		$mime = strtolower($mime);
 

From a9b1d295750ae3f54f7f4664dc4e90f70a69e9e1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Apr 2009 17:34:40 +0000
Subject: [PATCH 208/510] "allow other apps to hook into sidebox menu of an
 app, hook-name: sidebox_$app"

---
 .../idots/class.idots_framework.inc.php        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index 8f1759ad51..e372089434 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -60,7 +60,7 @@ class idots_framework extends egw_framework
 	* @param string $template='idots' name of the template
 	* @return idots_framework
 	*/
-	function idots_framework($template='idots')
+	function __construct($template='idots')
 	{
 		$GLOBALS['egw_info']['flags']['include_xajax'] = True;
 		$this->egw_framework($template);		// call the constructor of the extended class
@@ -69,6 +69,14 @@ class idots_framework extends egw_framework
 		$this->tplsav2->set_tpl_path(EGW_SERVER_ROOT.SEP.'phpgwapi'.SEP.'templates'.SEP.'idots');
 	}
 
+	/**
+	* @deprecated use __construct()
+	*/
+	function idots_framework($template='idots')
+	{
+		self::__construct($template);
+	}
+
 	/**
 	* Returns the html-header incl. the opening body tag
 	*
@@ -169,6 +177,10 @@ class idots_framework extends egw_framework
 			$this->sidebox('',$menu_title,$file);
 		}
 
+		// allow other apps to hook into sidebox menu of an app, hook-name: sidebox_$app
+		$GLOBALS['egw']->hooks->process('sidebox_'.$GLOBALS['egw_info']['flags']['currentapp'],
+			array($GLOBALS['egw_info']['flags']['currentapp']),true);	// true = call independent of app-permissions
+		// calling the old hook
 		$GLOBALS['egw']->hooks->single('sidebox_menu',$GLOBALS['egw_info']['flags']['currentapp']);
 
 		if($this->sidebox_content)
@@ -182,7 +194,7 @@ class idots_framework extends egw_framework
 
 				$content .= $this->tpl->parse('out','sidebox_hide_footer');
 
-				$var['sideboxcolstart']='';
+				$var['sideboxcolstart'] = '';
 
 				$this->tpl->set_var($var);
 				$content .= $this->tpl->parse('out','appbox');
@@ -729,7 +741,7 @@ class idots_framework extends egw_framework
 			if(isset($item_link['icon']))
 			{
 				$app = isset($item_link['app']) ? $item_link['app'] : $GLOBALS['egw_info']['flags']['currentapp'];
-				$var['icon_or_star'] = $item_link['icon'] ? '<img style="margin:0px 2px 0px 2px" src="'.$GLOBALS['egw']->common->image($app,$item_link['icon']).'"/>' : False;
+				$var['icon_or_star'] = $item_link['icon'] ? '<img style="margin:0px 2px 0px 2px; height: 16px;" src="'.$GLOBALS['egw']->common->image($app,$item_link['icon']).'"/>' : False;
 			}
 			$var['lang_item'] = isset($item_link['no_lang']) && $item_link['no_lang'] ? $item_link['text'] : lang($item_link['text']);
 			$var['item_link'] = $item_link['link'];

From 107d5dbbe9ab117b59a48b6c2c6b3121f648bf36 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 19 Apr 2009 07:20:22 +0000
Subject: [PATCH 209/510] "added somehow missing png type, preventing
 thumbnails being displayed for png images"

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

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index cbcce7242f..f92cbf7b9d 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -223,7 +223,7 @@ class vfs_widget
 					$class .= ($class ? ' ' : '') . 'vfsMimeIcon';
 					$cell['span'] = $span.','.$class;
 				}
-				elseif($path && $mime_main == 'image' && in_array($mime_sub,array('gif','jpeg','jpg','gif','bmp')) &&
+				elseif($path && $mime_main == 'image' && in_array($mime_sub,array('png','jpeg','jpg','gif','bmp')) &&
 					(string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
 					(string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
 					// check the size of the image, as too big images get no icon, but a PHP Fatal error:  Allowed memory size exhausted

From 8a014ce016bde3fc0a6073d0c4b47665a2c0f540 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 19 Apr 2009 07:22:00 +0000
Subject: [PATCH 210/510] "imediatly closing the sesson, as there's no need to
 keep it open (and preventing parallel calls)"

---
 etemplate/thumbnail.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etemplate/thumbnail.php b/etemplate/thumbnail.php
index d331fa9bb0..3e90dd9dfb 100644
--- a/etemplate/thumbnail.php
+++ b/etemplate/thumbnail.php
@@ -33,6 +33,9 @@ $GLOBALS['egw_info']['flags'] = array(
 );
 include ('../header.inc.php');
 
+// no need to keep the session open (it stops other parallel calls)
+$GLOBALS['egw']->session->commit_session();
+
 if (isset($_GET['path']))
 {
 	$g_srcfile = $_GET['path'];

From 7ae9317be11f4af0666a82d33a2174413ccf942c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 19 Apr 2009 07:30:26 +0000
Subject: [PATCH 211/510] "fixed not working stream_open() $mode == 'rb', was
 requiring write rights as != 'r'"

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

diff --git a/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php b/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
index 4d8e44d19c..d5809ab4f1 100644
--- a/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
@@ -118,6 +118,7 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 	function stream_open ( $url, $mode, $options, &$opened_path )
 	{
 		$this->opened_stream = $this->opened_stream_url = null;
+		$read_only = str_replace('b','',$mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
 		if (!($stat = self::url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
@@ -135,7 +136,7 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 				return false;
 			}
 		}
-		elseif ($mode != 'r' && !egw_vfs::check_access($url,egw_vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !egw_vfs::check_access($url,egw_vfs::WRITABLE,$stat))	// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
 			if (!($options & STREAM_URL_STAT_QUIET))
@@ -144,7 +145,7 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 			}
 			return false;
 		}
-		if ($mode != 'r' && self::deny_script($url))
+		if (!$read_only && self::deny_script($url))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
 			if (!($options & STREAM_URL_STAT_QUIET))

From 619bad7b28ffc43fc9ef89129f62c4490ee01ff0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 19 Apr 2009 08:07:23 +0000
Subject: [PATCH 212/510] some new and some nicer ;-) mime type icons

---
 .../images/mime16_application_postscript.png     | Bin 0 -> 740 bytes
 .../default/images/mime16_application_x-gtar.png | Bin 0 -> 863 bytes
 .../images/mime16_application_x-httpd-php.png    | Bin 0 -> 797 bytes
 .../default/images/mime16_application_x-sh.png   | Bin 0 -> 731 bytes
 .../default/images/mime16_application_x-tar.png  | Bin 0 -> 863 bytes
 .../templates/default/images/mime16_audio.gif    | Bin 121 -> 0 bytes
 .../templates/default/images/mime16_audio.png    | Bin 0 -> 771 bytes
 .../default/images/mime16_text_calendar.png      | Bin 0 -> 873 bytes
 .../default/images/mime16_text_x-vcard.png       | Bin 0 -> 851 bytes
 .../templates/default/images/mime16_video.gif    | Bin 363 -> 0 bytes
 .../templates/default/images/mime16_video.png    | Bin 0 -> 784 bytes
 .../default/images/mime16_video_quicktime.png    | Bin 0 -> 842 bytes
 etemplate/templates/default/images/mime16up.png  | Bin 1055 -> 0 bytes
 13 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 etemplate/templates/default/images/mime16_application_postscript.png
 create mode 100644 etemplate/templates/default/images/mime16_application_x-gtar.png
 create mode 100644 etemplate/templates/default/images/mime16_application_x-httpd-php.png
 create mode 100644 etemplate/templates/default/images/mime16_application_x-sh.png
 create mode 100644 etemplate/templates/default/images/mime16_application_x-tar.png
 delete mode 100644 etemplate/templates/default/images/mime16_audio.gif
 create mode 100644 etemplate/templates/default/images/mime16_audio.png
 create mode 100644 etemplate/templates/default/images/mime16_text_calendar.png
 create mode 100644 etemplate/templates/default/images/mime16_text_x-vcard.png
 delete mode 100644 etemplate/templates/default/images/mime16_video.gif
 create mode 100644 etemplate/templates/default/images/mime16_video.png
 create mode 100644 etemplate/templates/default/images/mime16_video_quicktime.png
 delete mode 100644 etemplate/templates/default/images/mime16up.png

diff --git a/etemplate/templates/default/images/mime16_application_postscript.png b/etemplate/templates/default/images/mime16_application_postscript.png
new file mode 100644
index 0000000000000000000000000000000000000000..06dbfa7b7fb4170a3ecb3655c1f87fdcf29ab1c9
GIT binary patch
literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;T1iAfRCwBA?C<aY&p-hH2p|>^QBY98z_4&31H*v>
z3=EGSGcbJl!ocwHBLl;S4-oqMcTAoC|1(UOFo6Le0MBBK0ssgDu_$hSOX&ZfQ>?8w
zh(nfyj4#Y!EyyI?iM=6$I)@a!H4vp<n&;cD074ibApxfT05v^-{hEP`hlc^=x8Fd6
zJ_B9E#>&bd4pj3ODE|*=2n+xO5DTWufTpvvGYIkWGW-SF{PpWshF?Ij|3Fv$2YTf{
z$N-=?15gbJ00a<*0U*;swtfdH{s{E{w{PEoLGgis2k0V3kQac4f#hKTAb?N}0J{0p
z$4?B;pFd}K_wF6Tj~_q4E&v(C3iJXeCnp0pH#dqFfB=FU@bkw{hWoGXGw^WoFc=sZ
zfL#K@pfCa12%>)iy#aC!vLOHg1UKOGhtCY3nLjgdadI&*0KNF{KO~?)HnXv@f!Rz<
zOkkIR41ocF0D>Fv=EEBXadvSAzF&L{Z-2f8i-G(M3s?{v6sREYfcP)~5I}GPKu)~<
z^ftr3efz+Q*`c8fGYAxzpnx<pGh>jJmWIm#1Q6T+etv$2d-v`!+`fIA!Q0!LL0(=S
z?Dt>4eu3%BmoGCYD=Ra+eft)SFI~C>)&~$k44}LK0ze!7zkmP!KhO|hl>Y>a0i*K&
zn>TO%KYH}&|G9JL{;ycE;y(;P^N<8U0I?uD6BJFLKm(<L@6hzm%*@Qd$Hxa|-@0`R
zOoQ@3VPT;lkof^1fZzsjaBzTWWWOT=m^@T750Lp4#0Ll<7MLKh0H_%hr|_f*5MTgd
W)h`*W`sOPD0000<MNUMnLSTZtCo8=G

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_application_x-gtar.png b/etemplate/templates/default/images/mime16_application_x-gtar.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bdfa8a0fc02947e24a4544d8ffdf95e4f4ba11d
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;)k#D_RCwBA?C<aY&p-hH2ta`t+W-i|0L%k7aaT^s
z%sZ$z^aMr*)F^FIL|JUv+Yb@ptck~@RO4=ejY%6X))Vu-yxMcU<niD-c2t#50I|SK
zGEiV<`1hZQ!B~lp;XeZtkj=>O>&q*KKfnJoFmo$0{Q2{f;qTwS4FCT9WBB_I;b?#W
zf*Zig$p|DFA)Mb|8GgUN#_;dYQ=sBM4F7+sFmOreGyMDe8)yKK{~uuhKmf5I`{&=U
zuM9t5UtswE>lp*9pa=sKy9fh2w=lz(mv<Rn-ul46D`&~T$jHd>_s?GjHV%j$fB=FU
z@c+**hVS>+F|e`!VqoUvV_^94j^W3L=M0}ezGYzMlVV`}`i0@er56k$8lDXQ84;EO
z1Q5c2zdsq6S^qPz@{2Gqyn6&Pk%9U9dj|GDpBetV{ldV;#Kyq><u1dss~il{1|Dz&
z00IbM04U&qUSRkQ<gfvS-#lPo`1po_i;I_mk>wu)1M?rCA&d;~z5^{{M)({cfSBO^
z2ZrpwUtfSuf5pH6wDmtXKLaZ(BhcwDfMTD3;mgeMpP36tvj7c%YhwTiAh=QAfBt6p
z^9`tw;}-+N-~SAZ|NjBiG6UIc3=HhNKyhBM-~WCFMk^D-0Du63vsl=<8U6@5GrW2F
zk>US$pshdOK%$ic7@%A{Kr<N`o;~}<@Sla7;pfjEa037W2<`$V#(xX~$_@-4*hLv0
z-<ZK5#dV8;g-;HckeC@>zxc!O>X#_PjSuP!3?Du*+}^wqZU8_4!Ck-va@N0J3_^0+
z47?_F3=h5<F+6_qm*MVbJ%;}Z$qaJlv0!!K;o)HX{P}Z+!oossfB<4aF#sHze;D|M
zMHyIasu;cj(}0A890My06T_D;U*NWa@&HgXE0FmIAb{Wou&|&cN(LTYUND9ME-o%)
p&G4iI5I`(2L1F>2W)J`fFaW+D2sLf5`91&u002ovPDHLkV1l(Hd{O`a

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_application_x-httpd-php.png b/etemplate/templates/default/images/mime16_application_x-httpd-php.png
new file mode 100644
index 0000000000000000000000000000000000000000..61cebe5ce99b4fdfbc791a1868922f0b303f6fb0
GIT binary patch
literal 797
zcmV+&1LFLNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;lSxEDRCwBA?C<aY&p-hH2p|>^QBY98aOmg{h9BSm
zFx<ZLmErw|9}K^L{bBg|<2S?4pT8M?fM_uL7nuL;+b@P~TRj*iOqjp`5I`(2lk~J%
z8UFoeVK6r0U|?kU&+zZxe}=#R{xSUf3&cPgg$<-(03d+i1_%f+qdD$B68;A^5NyEz
z{|x{CBYX`Ifa^Kd0RVylAbLqf)Bpce7D@>=`@7-N|KtN|nY11pw{8%af#!us;2x+x
zzXcH7fUjTwF}!&Bo8imXpA0O_%nZydtPCIC-(uk5kpgPsVR-rK2gCn=e;I^@Ss8=`
z|H3T<2q3rthmU>$n);LB^~+NXz(8OS5m9G&@!}=}BjYUw85skHH?MCp{Q2{n;rs=8
z25l{A21^TwK7as%8*t{#I|do)w+xRSUSnWoV+V#b6T`Q!e;JsV{xSUdeVgIt&9e+2
zKE7dKVX+0qgaFV05wJdh0D>Fv=+Q@p7tgK$C0_xZY01FIB*yUf&nKYsnHe5Gxy^9(
z$_)lyJ`)BmZdnF?z8`Qe00a=+fUppLhTVIF8NU7SV7Pgkn}Lb(8_+g(1}0`!1};t!
z25Ff%px1;M^z|4SJlsX$1^@&Q+yDm$X$CDV0fvhgUo+gf^O51*JD}5nVa3e+n}Ls4
z78nkk4C?A!42p_^z;HoC9zX!WS%3a8GKh)sGkAFLfurr`&p$x1e?Y|yz$j#6`2PJH
z!`7|48E)J_jdp+lf*ZgHRQVU2(ttV`n840wfy(~>&j<|EKVWuvcsQ5_CF8=vLVkb%
zf*ZiZ#Dp`$fDA_lP|X}b=1+hCf*Zif%8EDF@$&K_YX&I>I|(3wSYU$00-$ClXa)fT
bfB*vk<kb9SwMmt=00000NkvXXu0mjfwVzbG

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_application_x-sh.png b/etemplate/templates/default/images/mime16_application_x-sh.png
new file mode 100644
index 0000000000000000000000000000000000000000..b560ad5b519e46c7075cc4374bb1ba1b9439bdee
GIT binary patch
literal 731
zcmV<10wn#3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;QAtEWRCwBA?C<aY&p-hH2p|>^QBY98aO~C}hHpRq
zF?{;|o8j%3KMYUa{$jZG^gF}%Uw;_B{shYX`pfX`Cy4!<;q&*u49{nqGEA5-fdL=@
zk7IBG00_je3WsaBf%~tfTw4!8KY8R460bBzK=snx3jigoEl31yh`x>#lKBsg06dJb
z2>>t%z@l9WLjV7>qoS>gWD6uSz%Lb!sQ#$_quA}GXmTYe1dbh>><J*a0Utkp0&4un
z@Z-l122M^+24-ev4FCTA{hNWEot@#utG5iwyaHe`fB=FUz{bYLuzkl41}31!5AWYI
zeEIwtMKdEKBg2Oe9~eA6JsDJ0RpH_Q0R%SyWaBTO4N3|M401|J4885`K!5*bU<29+
z(hLG17g}3egIxjx00D&Jg12wqGOS*^mf_v&*9?-<(hTez91J(FU1Rw5>leeHKYtj$
zeEGuQ@9z&c5Ci}M2yOri3k$=OM~@hGZQI5mA|k@T$;HLM3KaYD^(({oZ{HX`1HJV9
z`**NG$OZre5DT&&xqzB@d3nJGe0cW`>@7h70R~Q>OF(Q826+S70Du5uK@KQ!ad8G6
z9UTTKDJigFAXkC>`wi#<PyoJz8VcgW06+l24FEYYAt8YwJUkq%=|3>>`~?Og$jKl+
z$p4RkUIc-2=gxsK2mk~S+yGGgf}98P0!T9q!@T$D(<iV2APYbMl#B}t3)uhy2yOt#
z$>{M815CiwiOh#;1`7ZL5K2102SBM4T{8#(1P}{MkXV4M83X_V3;+Qn`dQ-CVNn18
N002ovPDHLkV1jD=9Mk{+

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_application_x-tar.png b/etemplate/templates/default/images/mime16_application_x-tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bdfa8a0fc02947e24a4544d8ffdf95e4f4ba11d
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;)k#D_RCwBA?C<aY&p-hH2ta`t+W-i|0L%k7aaT^s
z%sZ$z^aMr*)F^FIL|JUv+Yb@ptck~@RO4=ejY%6X))Vu-yxMcU<niD-c2t#50I|SK
zGEiV<`1hZQ!B~lp;XeZtkj=>O>&q*KKfnJoFmo$0{Q2{f;qTwS4FCT9WBB_I;b?#W
zf*Zig$p|DFA)Mb|8GgUN#_;dYQ=sBM4F7+sFmOreGyMDe8)yKK{~uuhKmf5I`{&=U
zuM9t5UtswE>lp*9pa=sKy9fh2w=lz(mv<Rn-ul46D`&~T$jHd>_s?GjHV%j$fB=FU
z@c+**hVS>+F|e`!VqoUvV_^94j^W3L=M0}ezGYzMlVV`}`i0@er56k$8lDXQ84;EO
z1Q5c2zdsq6S^qPz@{2Gqyn6&Pk%9U9dj|GDpBetV{ldV;#Kyq><u1dss~il{1|Dz&
z00IbM04U&qUSRkQ<gfvS-#lPo`1po_i;I_mk>wu)1M?rCA&d;~z5^{{M)({cfSBO^
z2ZrpwUtfSuf5pH6wDmtXKLaZ(BhcwDfMTD3;mgeMpP36tvj7c%YhwTiAh=QAfBt6p
z^9`tw;}-+N-~SAZ|NjBiG6UIc3=HhNKyhBM-~WCFMk^D-0Du63vsl=<8U6@5GrW2F
zk>US$pshdOK%$ic7@%A{Kr<N`o;~}<@Sla7;pfjEa037W2<`$V#(xX~$_@-4*hLv0
z-<ZK5#dV8;g-;HckeC@>zxc!O>X#_PjSuP!3?Du*+}^wqZU8_4!Ck-va@N0J3_^0+
z47?_F3=h5<F+6_qm*MVbJ%;}Z$qaJlv0!!K;o)HX{P}Z+!oossfB<4aF#sHze;D|M
zMHyIasu;cj(}0A890My06T_D;U*NWa@&HgXE0FmIAb{Wou&|&cN(LTYUND9ME-o%)
p&G4iI5I`(2L1F>2W)J`fFaW+D2sLf5`91&u002ovPDHLkV1l(Hd{O`a

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_audio.gif b/etemplate/templates/default/images/mime16_audio.gif
deleted file mode 100644
index 063356c08b717997796d243b1e5d6c267f453202..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 121
zcmZ?wbhEHb6krfySj5I~=FFLyGiUz)|357)&DhwOfq?<Y29k<DSr{1@*cfzxYzB~8
z24=gAU28&hXMOJ|*%D{fmgmo&A{J2*8EB;GSd;VAFH1$=Anvkdnr)NZTXl{n9ySq*
V9K~xV?dHx`3$<7s;l{*Z4FHUyC-?vW

diff --git a/etemplate/templates/default/images/mime16_audio.png b/etemplate/templates/default/images/mime16_audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfe6022c8c34c344e4aaf086d18cc99c4317f049
GIT binary patch
literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;c}YY;RCwBA?C<aY&p-hH2p|>^QBY98u;aon21bVe
z3@pt589x8`%kbpwFNPDhzA$|L{)ge)&)-1&m*MNrKS2DO;nVlO3@_)HGEA5-fdL?Z
zSYRgEXs|N;`~M$^85o$Em>3usxfwz&cp3iv`^Uft<p2KthvC=nUkrc${$u$2AK_?#
z0D>F9!@&q7LHIwzhxhLoo;`oY@Z;Mz29Qz?c6J6aF;NC7F=2-PAWQ!Kg&P16KrG1q
z`ThGh!_})-8E)LT!Eo!=Eru5_UVt@7NJucKs;V+5Dk?H)YHBjDu&^+&LG=Ix5Q+gH
zjSn9_WVm<l9s?sIBZI!aKA3*>>J`KN`}Y|*IXS_a)zsABdH@0lZov2N-x*%Nehv1s
zl#~>Mwzf7{;g26b7;fLb4K@@c_wnOLhA&^fF!1y9gY^Lf5ZnNe<mb<y8KkA98AL=x
z7~Z{m$8hrGNrpdv{xJOf`IA9GK>_T7=g*&mT?GRG0mKAjaB*>g!vJI>$e$b>91Pd4
zT?1nt9v%iQEiG_(eEs?r%!dJh0AfK7Kx1QLhK(CHf^9W5HDxd|G6K5{r18?FOAP1F
zpJ(v!@Bq661^@yGZU9J=oSYnkudgq|?Afy!Hf-3yproV(b_vK<kjvcM+!$nJWWam@
z0RgZ+fB=FUzywSzAVWZ55FQ@Ruw%y#hHt=hpscLSz|GAKwiOhRAdCzE0tm$b5C8=b
zC<Z`r4zdXZ*w`Sk{^-#ou;Cy8O2&nSg=_!;gkb;-fT9V6LH-BHy?_56E(g^NjtYPP
zf*SxzAlLvb%0S*g*9-yx0mK3mBo-iR1_6Ko0|3Lb{^TK*5Uv0K002ovPDHLkV1ix>
BKT7}r

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_text_calendar.png b/etemplate/templates/default/images/mime16_text_calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fb7ca883fa70f3f68166bb131289ebf61b54857
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;-$_J4RCwBA?C<aY&p-hH2p|>^QBY98aOnDPhF2f|
zFkHCzo#E4uKMdb~g79C4@4tZb@81kxfnr~O{AKtG6#w+?H^YlLW(*T1Oke;AAQqTO
zCd#Y~tjw$oUPc@Y|Nj4HU<8W&1Zw^cG~~yxe+)l<|7BnRin9TAfaGBSAb{Wo{QB{W
z;n{~@41fPK0yQu&eEj-{;pd<KV9ks`(?kS08TdH=GyMJag+Wc07j6JR0KpAdvHml|
zwU_)1qAEb4-#-}+AHTxz`_C^1RiI*fBQXYbc^-xz-@Y<@`|+FM*Pnk39IOz1009Iy
z;13rQ!&@ds2DZ;XfzEl)AR+jlK~{{1L71PJ;m7w63^(t5W8h@^!eF2&2lg5VCqy4W
z0KpA#H2TZ%=EXJ!bs=$vGdDgma4|D7umYXV!pg$H$Ii&W&d$QX{GWy4-@m`WpkRV~
z0U&_j21p4rGe~p4W#Hu$VQ{mOXAlz;V&LUrV-Vf3fr05eGs8y%Z-%$;fU)x9Cj%!3
z2iyRF0D>F9$jHRN#KOVA1@xS)r78mx&^!O<&ShXZa)jZJsw%@z#{UeQoE$&{zB4eh
z2*V8k2q3sy{`~&KARs8fz|GCUzyj3FIAsb0b9FT^%KkC1T)o1;_3jk|I~NzjkDtF7
zSXh|h1^@&Q+y$(xtPI>h1^m2R48Q+@;+uuxSAG!#gM>K4`w!n4e)CH(u>AkS@axxa
zhA&^fG6)K?f%O3d5ZnMzVEz3I^yAlW49viQV#vr~*nZ|U!|i)-7-SSU7$l#(Vt8@y
z99ZqW+c)4Y00<zs0nAKH46on3W#9(-^Zmz9z-VG;Fp&7ipe-W6AS%cW4EaAm0~i>>
z!^6SqLCLtVu#goXfDkSKI@wTH6PS4ZGW`4r32A9@A+XCp;PdA%a9g38L8+YqAb?N|
z(AU+*nd`WK;e)Oj1ONhv1tv%=K-LTb009O7UJv=`m7C?P00000NkvXXu0mjf%UFTq

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_text_x-vcard.png b/etemplate/templates/default/images/mime16_text_x-vcard.png
new file mode 100644
index 0000000000000000000000000000000000000000..8210b43eb12353cc6f993947f5fea5d1641d99cb
GIT binary patch
literal 851
zcmV-Z1FZasP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;$w@>(RCwBA?C<aY&p-hH2p|>^QBY98z;HI3f#D}3
z1H*rA1_o9>28O3c7#QyFfT%*Z0>m%*&oE)a1O|WrJdC>y03Z-TUt#4aI+Lq7xSod;
z#)3}>P=44aWWovX4{ey1eWDP13CVCLt@X{W074kRA&z3h=N}9Vm!JJ**m;MML0OQ2
zA=-=yWE|LhhTp&8N&x~0Zoto<e;HnW`pa<f(Qk$;FaI-~e9pvh^)nm8ooCDp%A7wL
zJOpkth<-o8@RNas;g@140|O^3SRX(D!3~&o^bf=R&rA#-{;)E<`^(1g5-9WPJy7C1
z1H)Tpc7_`#`xwO7=QFT=6=V3suFb&5XA0H_5I{^Y1H?FAGI)ueWpHC$&G7g4H-=mH
z85lmjgvjv$y>RKL2?N6m1_oxvuMBMO4#K?v5I}Gj@V?r>;G%Yf;p5lK3^Q-ZGQ9g}
z#~>@kz+kKNkHJBSk%9laC&P;?QVbG29~n6Qo`D+x5I}GP4!)LV5EA5Pc*#-1;9;P~
zVE64SgNncphHqcKF!23kV&Gr{2Aq-)1B19Q0~@O_+yH<8f*YWq;LIRv63k!#j32wt
zzZkY3eZ;`S@P$D~`VWK9>zfRce||8qv0E@OeBfgE$Hm3~^E*HQ!40sK{loD7`Fn<!
zzyC0>JUz_dX{5uzC#KE7{OJt?!^c|;zyEMByyq8Z_{qx7@P}8JK?bT1Ab{WosK{_L
zynX)}m<ZVzL|CL4*uMQ>_;vp-!?&N`8UD%XF??s|V>o#1I8^mB28MH&!7P9Pf*Zib
z#>^lsAqY-{|M(0UzJB_^z`(@Fz{11Nz|6|V!1(nGSY3E{IG6?{<HEv1E`R`n8^FZK
z1W)FSEG!Hh!lKYr2^9JN4{R_DKsAH({sjmixB)CIEO>JrH#ax3X1I9(0mK3mBo-iR
d1_6Ko0|4SW*7X~+Jplj!002ovPDHLkV1nV3al`-s

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_video.gif b/etemplate/templates/default/images/mime16_video.gif
deleted file mode 100644
index 956ef89db058b73f7fb19399e87b682b56bf4436..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 363
zcmZ?wbhEHb6krfwxN6K`X=!O_XjnaG?fdu7EuF4;6~DiC?b_0<Tb<V4o3i$tQ_%ah
zd+z~(goH$L^0}zwdtN=yuid+*DDhsA<J_^W#{@W@D+b-$d+gl%=g)(Rzei>7javJ?
zXU^W1z1Omf_fDB}u4T&eDQovyDjxId*{f;ze9Dw#)h)*)Bm^WBC5n@eUAuO#xcHo6
z_H(bb?*#+|qN1V{6%`p682*C+kU<bA{$ycfU@&IT0jUJ}iGi)-KqL=aw`BkEnL!%N
zC*}o2`s|W9wCIB7)R!hbQ3AZl86i=I9Zp%SN+%N5&Dc5fMnDRa|5KqGQPx~WifU|P
zs=S584BV_*{_HyJwM9-Y%#tcHOdP_38l5pl%=|(ud`j|@(_A6~3Z{5$bgwhg-@1KU
e{(`9Of%>a_w&@?*zCO*(#Xw!}Okt`cgEatwSBU%o

diff --git a/etemplate/templates/default/images/mime16_video.png b/etemplate/templates/default/images/mime16_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c5f692d79d7b65656e0da9a9d5a3c0850adf217
GIT binary patch
literal 784
zcmV+r1MmEaP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;hDk(0RCwBA?C<aY&p-hH2td{x8UX-<01S-iz>LBO
ztiVWkEC-HWbxp*ZoEH(n-RW*JlbONHhzP2R-T(1SRk;F)1twr`Z_n`e?_Y*LfBrBq
zGBPrRgoJ?k?Ck7dd6411fByz+{P*u4+#rAef*T+pAb{10%a<=_xO4k9LqTC711~Qx
z*aBo10R#{eKL1UgJegtYlqn34pS=KjGoRu4^Jff9OiW-e!T>-3;WVJVy^Ue|w5be<
zS)~j$-P0Ice1aKD%gPvT-MYoV#>NI$2M|CQ27vroSy90-efkUr|By%qDLG|^|3EMM
z26!`MWaTmdV~yd;mCJDT00D$z04T)EfVOmWb}~dJW-=7j)H86h{9|}>=Q_iWZww4J
zmgWos{QL|TE?k7`0SF*?AijI|4y<|gnl%iOF$oMpLZS?Re*R-HGS_E#eD4v%qgxjl
zCahh>ASW-+5FH&2Hvk}j;4YXoYZk-m)vFo0yL%XxEuPPytgOH=f6gq1+qa%E+_`a;
zVb+YP463SX44IjkC|(8#Ah-)+V`ISq^z_M7hEG5LGWhtoFsxkjiy<o^n1SKnUxtdx
zN(MhaKZY+~zJSvK2L}gOA3y-X4Um$OV(9JdWvHsGU}$Y@WbhA*XE=3eHv=0B6GKyT
z8-uN_EyEh1_s{`A0D(gFKM4H%`SU-}<p1Bkef?inR{Gz?#pQocVBr7r=g))XKYaM`
zf5nOw|6u@{hd2NN2yOr{`oI`u2r!}iU%Phg|LfPUgXMrp`v0d-pWp^SH8X=801!ZM
zFR-w{nc(yv6cmIAX<+K(;^G3cK^ds9u#gcZ2M|CkFhODgvSttf2rvLTIWD_NG7abe
O0000<MNUMnLSTZUp-0#N

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16_video_quicktime.png b/etemplate/templates/default/images/mime16_video_quicktime.png
new file mode 100644
index 0000000000000000000000000000000000000000..90418af51e8900b4c2b708b46b0f660605499c64
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;z)3_wRCwBA?C<aY&p-hH2p|>^QBY98u>ICghR5&z
zF#P`Wk74JvuMD5Q{bl(2^B=>P?|&J-0NH>4A?*1JWWMZGVVE#s0s}w*vA_gPrCGoj
zsGlLsfQy0Q|9^(>zy5&b7=apo{Qk@E=kGtD@P9Cd0e}F48z92X3>Uof;v2)w=Rbgk
zK@{?FFfi!Laxe(-vN8Pm{g2__zkhJG00G2;?4KXM{xYmT^N!*D4@L$)P8P6DjEoEn
zAAT}29KZXH!C9Sy!B~Nt;U~}#HV%j$fB<4bHekcqw+zp}F)=U#9mDkR2ZOx8Uj|Xm
zUkpEgd|^-#{?D-C;x~q?PrfoRGa_675I}GjJbC+-;pUsa47^;-3~Is*49+?tAm1~b
zd+?Rv&9{FH-+{LB3-B@=zyFm%Q5fM}fB=FU05bXKe`W?jrhg1JY61)&zy4!bc>FB`
z12Z#2pf)GNi;t`fPaZHZy#3C=@a;D+T%h^@0tjxv|NlT+{xJd7GXkCXpWzoUI(UHL
zU?|1HAS=ku@Cg{5zyE{W1e9k&_#7aB;07oP08M58&+z^q3&X7!-x)L|*chUXxEYuj
zA%S}h=$N0tz)|F5WZ>aIcmW`Q;0DNv@-UdZ`^4~wft}&h`@am||NmwX<78s^4UEb=
zpMXwh;$#rw{K+82@sHu}pFeN|00IbZ01GQCgQWr&1K0CU3_p1U7~XRN<D88VoUj;p
z|1(Jc`^fO^<}QY>K<?JNh?oNiAh-dbG$X*r&0xXC!tnInXNF%tSr{1qGJ{j3(7(S7
zjI7@oE&|nshlhjJgOYJ!VW9{>0KpAl0tO5yg|c&SFsMkgGyDW5<3GSe4-5hZ4q&SJ
z^_vxJ0Fq{IAoCkQ0KpAl1$qG)aB`yZ8JU@pHG}m11@Qp_hy^A{EI`%_0ssL90CdRt
U*r`c-ga7~l07*qoM6N<$f?jZOBme*a

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/mime16up.png b/etemplate/templates/default/images/mime16up.png
deleted file mode 100644
index 500baa65890562dea0a392dc2ec3c6a243702d65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1055
zcmV+)1mOFLP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#u}MThRCwBA
zWQbv4U|<1aCNO4Z_`_fc#NiCA49-Bl3L{YX|8Isn4Br{{GB7f%1gbp_6#B~m1pooW
zh-82mP`HtSmmxz_Ta3X_O`kziSQuy`1H-)!Ul=Z2zs7L>;ys4HZy9C)4X+0ZzXBNm
z5I`^kB!HS1aceNR7I+0S#ApUHsIl2F`~q6}@Bd#07Dgt9*9=z~*4$Xb(6ezd!;`bW
zb~CUs!~u1_00<yv20ftmzYOi1>I@O}5n&Aeihc|~{xC4?d$NMz<>$K$zy5z?c=qQm
z!@HmF7&L^{7<4qm8BV-7r~KvFKQ5s2b^!zcK>)u00{|)jIROp;mtIsh06ZHo0O$DP
z0MFyX02=})07oBk02v7{009960M_)q0Ok1J022xk02mkt0LRweHU0Gfx&nxa;U7bU
zxCRG<k{l<)^{-bMj@>`VpzvRx!B3@<ft8sP>`N&&Z3bh$Achw|A2A$wv5(;q$72RA
z6&8?G1V8|>FmN(Bizu=(y!!s0;pvk*4F0^)452!Wz(8e&hB5>wa#%9B2qZIvpA2ER
z{p}yae?FifP%l6LF*BGj^otlUGJj|L%3#N6%aCC(3#gfiVdLEv20?ZyhChto8Fswv
zVvy(3Wsu=CX86tco?++HlaOeC$RGd^KujPj-u(T=aO3MohK~Zj8J_&P$}st55kt$}
z28Lh%elxHGUD9=D3PbY62!==BFEf1o_X*-GCWy-b0tgfXcV2(^ugT2Cz|ekwGsFBB
zn;BmJWMB~c22#Ta#w={y3@h&KXV~*vpW!V~j)4P+zXI_;hC2WO!~{xV{~t3j{P_<|
zalrKT{4<dK1Hy&@W>9dj16>M?-v2;0BNr$I05MQ6KmdVaVFlv@1_s^_3=9Hn3=Dig
z1zbRyhm{GKfLIt<nAm_~tPJd|Kslhe08ldz&=SUnU>B?a2q0z#eTL^i=ZLT~F_=my
zu`uwmF*9%jQ{F$8zYJ;uatv>NKV{hRY7JPm00#>LH!y&|oc_n~^8v#&U=o}I5I~F!
zQD9d}05i}cQA1`|1ygngK2dgtUqAmdeEt0msO>)kH!CLt2Rk#vCt%<_IQ^61_4&WM
zfttZd86bd|8Fax0d;x~m&Tr5D^L}{p$K?N){|x*b%nSlRjlBQa8UB6v&+z2J4~DzP
zelUEz^KS-Fa~@F7OOQr@0D`#y9$w(=%)}7R!p-2!#LTDy68!h~|D8Wyf!X;VW_AV$
ZFaVGgBJgY+wp0KB002ovPDHLkV1kZryUYLp


From fd9856ebf53b421f0e0f1027a85e8b4412ce9ff8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 20 Apr 2009 11:50:45 +0000
Subject: [PATCH 213/510] Class to manage caching in eGroupware:

It allows to cache on 4 levels:
a) tree:     for all instances/domains runining on a certain source path
b) instance: for all sessions on a given instance
c) session:  for all requests of a session, same as egw_session::appsession()
d) request:  just for this request (same as using a static variable)

There's a get, a set and a unset method for each level: eg. getTree()
or setInstance(), as well as a variant allowing to specify the level as first
parameter: eg. unsetCache()

getXXX($app,$location,$callback=null,array $callback_params,$expiration=0)
has three optional parameters allowing to specify:
3. a callback if requested data is not yes stored. In that case the
   callback is called and it's value is stored in the cache AND retured
4. parameters to pass to the callback as array, see call_user_func_array
5. an expiration time in seconds to specify how long data should be cached,
   default 0 means infinit (this time is not garantied and not
   supported for all levels!)

Data is stored under an application name and a location, like
egw_session::appsession().
In fact data stored at cache level egw_cache::SESSION, is stored in
the same way as egw_session::appsession() so both methods can be used
with each other.

The $app parameter should be either the app or the class name, which
both are unique.

The tree and instance wide cache uses a certain provider class, to
store the data eg. in memcached or if there's nothing else configured
in the filesystem (eGW's temp_dir).
---
 phpgwapi/inc/class.egw_cache.inc.php       | 519 +++++++++++++++++++++
 phpgwapi/inc/class.egw_cache_files.inc.php | 148 ++++++
 2 files changed, 667 insertions(+)
 create mode 100644 phpgwapi/inc/class.egw_cache.inc.php
 create mode 100644 phpgwapi/inc/class.egw_cache_files.inc.php

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
new file mode 100644
index 0000000000..6b82be8c22
--- /dev/null
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -0,0 +1,519 @@
+<?php
+/**
+ * eGroupWare API: Caching data
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage cache
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @version $Id$
+ */
+
+/**
+ * Class to manage caching in eGroupware.
+ *
+ * It allows to cache on 4 levels:
+ * a) tree:     for all instances/domains runining on a certain source path
+ * b) instance: for all sessions on a given instance
+ * c) session:  for all requests of a session, same as egw_session::appsession()
+ * d) request:  just for this request (same as using a static variable)
+ *
+ * There's a get, a set and a unset method for each level: eg. getTree() or setInstance(),
+ * as well as a variant allowing to specify the level as first parameter: eg. unsetCache()
+ *
+ * getXXX($app,$location,$callback=null,array $callback_params,$expiration=0)
+ * has three optional parameters allowing to specify:
+ * 3. a callback if requested data is not yes stored. In that case the callback is called
+ *    and it's value is stored in the cache AND retured
+ * 4. parameters to pass to the callback as array, see call_user_func_array
+ * 5. an expiration time in seconds to specify how long data should be cached,
+ *    default 0 means infinit (this time is not garantied and not supported for all levels!)
+ *
+ * Data is stored under an application name and a location, like egw_session::appsession().
+ * In fact data stored at cache level egw_cache::SESSION, is stored in the same way as
+ * egw_session::appsession() so both methods can be used with each other.
+ *
+ * The $app parameter should be either the app or the class name, which both are unique.
+ *
+ * The tree and instance wide cache uses a certain provider class, to store the data
+ * eg. in memcached or if there's nothing else configured in the session.
+ */
+class egw_cache
+{
+	/**
+	 * tree-wide storage
+	 */
+	const TREE = 'Tree';
+	/**
+	 * instance-wide storage
+	 */
+	const INSTANCE = 'Instance';
+	/**
+	 * session-wide storage
+	 */
+	const SESSION = 'Session';
+	/**
+	 * request-wide storage
+	 */
+	const REQUEST = 'Request';
+
+	/**
+	 * Default provider for tree and instance data
+	 *
+	 * Can be specified eg. in the header.inc.php by setting:
+	 * $GLOBALS['egw_info']['server']['cache_provider_instance'] and optional
+	 * $GLOBALS['egw_info']['server']['cache_provider_tree'] (defaults to instance)
+	 *
+	 * @var array
+	 */
+	static $default_provider = array('egw_cache_files');// array('egw_cache_memcache','localhost',11211);
+
+	/**
+	 * Set some data in the cache
+	 *
+	 * @param string $level use egw_cache::(TREE|INSTANCE|SESSION|REQUEST)
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param mixed $data
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return boolean true if data could be stored, false otherwise
+	 */
+	static public function setCache($level,$app,$location,$data,$expiration=0)
+	{
+		switch($level)
+		{
+			case self::SESSION:
+			case self::REQUEST:
+				return call_user_func(array(__CLASS__,'set'.$level),$app,$location,$data,$expiration);
+
+			case self::INSTANCE:
+			case self::TREE:
+				if (!($provider = self::get_provider($level)))
+				{
+					return false;
+				}
+				return $provider->set(self::keys($level,$app,$location),$data);
+		}
+		throw new egw_exception_wrong_parameter(__METHOD__."() unknown level '$level'!");
+	}
+
+	/**
+	 * Get some data from the cache
+	 *
+	 * @param string $level use egw_cache::(TREE|INSTANCE|SESSION|REQUEST)
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param array $callback_params=null array with parameters for the callback
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return mixed NULL if data not found in cache (and no callback specified)
+	 */
+	static public function getCache($level,$app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	{
+		switch($level)
+		{
+			case self::SESSION:
+			case self::REQUEST:
+				return call_user_func(array(__CLASS__,'get'.$level),$app,$location,$callback,$callback_params,$expiration);
+
+			case self::INSTANCE:
+			case self::TREE:
+				if (!($provider = self::get_provider($level)))
+				{
+					return null;
+				}
+				$data = $provider->get($keys=self::keys($level,$app,$location));
+				if (is_null($data))
+				{
+					//error_log(__METHOD__."($level,$app,$location,".array2string($callback).','.array2string($callback_params).",$expiration) calling calback to create data.");
+					$data = call_user_func_array($callback,$callback_params);
+					$provider->set($keys,$data);
+				}
+				return $data;
+		}
+		throw new egw_exception_wrong_parameter(__METHOD__."() unknown level '$level'!");
+	}
+
+	/**
+	 * Unset some data in the cache
+	 *
+	 * @param string $level use egw_cache::(TREE|INSTANCE|SESSION|REQUEST)
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @return boolean true if data was set, false if not (like isset())
+	 */
+	static public function unsetCache($level,$app,$location)
+	{
+		switch($level)
+		{
+			case self::SESSION:
+			case self::REQUEST:
+				return call_user_func(array(__CLASS__,'unset'.$level),$app,$location);
+
+			case self::INSTANCE:
+			case self::TREE:
+				if (!($provider = self::get_provider($level)))
+				{
+					return false;
+				}
+				return $provider->delete(self::keys($level,$app,$location));
+		}
+		throw new egw_exception_wrong_parameter(__METHOD__."() unknown level '$level'!");
+	}
+
+	/**
+	 * Set some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param mixed $data
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return boolean true if data could be stored, false otherwise
+	 */
+	static public function setTree($app,$location,$data,$expiration=0)
+	{
+		return self::setCache(self::TREE,$app,$location,$data,$expiration);
+	}
+
+	/**
+	 * Get some data from the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param array $callback_params=null array with parameters for the callback
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return mixed NULL if data not found in cache (and no callback specified)
+	 */
+	static public function getTree($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	{
+		return self::getCache(self::TREE,$app,$location,$callback,$callback_params,$expiration);
+	}
+
+	/**
+	 * Unset some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @return boolean true if data was set, false if not (like isset())
+	 */
+	static public function unsetTree($app,$location)
+	{
+		return self::unsetCache(self::TREE,$app,$location);
+	}
+
+	/**
+	 * Set some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param mixed $data
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return boolean true if data could be stored, false otherwise
+	 */
+	static public function setInstance($app,$location,$data,$expiration=0)
+	{
+		return self::setCache(self::INSTANCE,$app,$location,$data,$expiration);
+	}
+
+	/**
+	 * Get some data from the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param array $callback_params=null array with parameters for the callback
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return mixed NULL if data not found in cache (and no callback specified)
+	 */
+	static public function getInstance($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	{
+		return self::getCache(self::INSTANCE,$app,$location,$callback,$callback_params,$expiration);
+	}
+
+	/**
+	 * Unset some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @return boolean true if data was set, false if not (like isset())
+	 */
+	static public function unsetInstance($app,$location)
+	{
+		return self::getCache(self::INSTANCE,$app,$location);
+	}
+
+	/**
+	 * Set some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param mixed $data
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return boolean true if data could be stored, false otherwise
+	 */
+	static public function setSession($app,$location,$data,$expiration=0)
+	{
+		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
+		{
+			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			return false;	// can no longer store something in the session, eg. because commit_session() was called
+		}
+		$_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location] = $data;
+
+		return true;
+	}
+
+	/**
+	 * Get some data from the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param array $callback_params=null array with parameters for the callback
+	 * @param int $expiration=0 expiration time in seconds, default 0 = never
+	 * @return mixed NULL if data not found in cache (and no callback specified)
+	 */
+	static public function getSession($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	{
+		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
+		{
+			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			return null;	// can no longer store something in the session, eg. because commit_session() was called
+		}
+		if (!isset($_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location]) && !is_null($callback))
+		{
+			$_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location] = call_user_func_array($callback,$callback_params);
+		}
+		return $_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location];
+	}
+
+	/**
+	 * Unset some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @return boolean true if data was set, false if not (like isset())
+	 */
+	static public function unsetSession($app,$location)
+	{
+		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
+		{
+			if (egw_session::ERROR_LOG_DEBUG) error_log(__METHOD__.' called after session was encrypted --> ignored!');
+			return false;	// can no longer store something in the session, eg. because commit_session() was called
+		}
+		if (!isset($_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location]))
+		{
+			return false;
+		}
+		unset($_SESSION[egw_session::EGW_APPSESSION_VAR][$app][$location]);
+
+		return true;
+	}
+
+	/**
+	 * Static varible to cache request wide
+	 *
+	 * @var array
+	 */
+	private static $request_cache = array();
+
+	/**
+	 * Set some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param mixed $data
+	 * @param int $expiration=0 expiration time is NOT used for REQUEST!
+	 * @return boolean true if data could be stored, false otherwise
+	 */
+	static public function setRequest($app,$location,$data,$expiration=0)
+	{
+		self::$request_cache[$app][$location] = $data;
+
+		return true;
+	}
+
+	/**
+	 * Get some data from the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @param callback $callback=null callback to get/create the value, if it's not cache
+	 * @param array $callback_params=null array with parameters for the callback
+	 * @param int $expiration=0 expiration time is NOT used for REQUEST!
+	 * @return mixed NULL if data not found in cache (and no callback specified)
+	 */
+	static public function getRequest($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	{
+		if (!isset(self::$request_cache[$app][$location]) && !is_null($callback))
+		{
+			self::$request_cache[$app][$location] = call_user_func_array($callback,$callback_params);
+		}
+		return self::$request_cache[$app][$location];
+	}
+
+	/**
+	 * Unset some data in the cache for the whole source tree (all instances)
+	 *
+	 * @param string $app application storing data
+	 * @param string $location location name for data
+	 * @return boolean true if data was set, false if not (like isset())
+	 */
+	static public function unsetRequest($app,$location)
+	{
+		if (!isset(self::$request_cache[$app][$location]))
+		{
+			return false;
+		}
+		unset(self::$request_cache[$app][$location]);
+
+		return $ret;
+	}
+
+	/**
+	 * Get a caching provider for tree or instance level
+	 *
+	 * The returned provider already has an opened connection
+	 *
+	 * @param string $level egw_cache::(TREE|INSTANCE)
+	 * @return egw_cache_provider
+	 */
+	static protected function get_provider($level)
+	{
+		static $providers = array();
+
+		if (!isset($providers[$level]))
+		{
+			$params = $GLOBALS['egw_info']['server']['cache_provider_'.strtolower($level)];
+			if (!isset($params) && $level == self::INSTANCE && isset(self::$default_provider))
+			{
+				$params = self::$default_provider;
+			}
+			if (!isset($params))
+			{
+				if ($level == self::TREE)	// if no tree level provider use the instance level one
+				{
+					$providers[$level] = self::get_provider(self::INSTANCE);
+				}
+				else
+				{
+					$providers[$level] = false;	// no provider specified
+					$reason = 'no provider specified';
+				}
+			}
+			elseif (!$params)
+			{
+					$providers[$level] = false;	// cache for $level disabled
+					$reason = "cache for $level disabled";
+			}
+			else
+			{
+				if (!is_array($params)) $params = (array)$params;
+
+				$class = array_shift($params);
+				if (!class_exists($class))
+				{
+					$providers[$level] = false;	// provider class not found
+					$reason = "provider $class not found";
+				}
+				else
+				{
+					try
+					{
+						$providers[$level] = new $class($params);
+					}
+					catch(Exception $e)
+					{
+						$providers[$level] = false;	// eg. could not open connection to backend
+						$reason = "error instanciating provider $class: ".$e->getMessage();
+					}
+				}
+			}
+			if (!$providers[$level]) error_log(__METHOD__."($level) no provider found ($reason)!");
+		}
+		return $providers[$level];
+	}
+
+	/**
+	 * Get keys array from $level, $app and $location
+	 *
+	 * @param string $level egw_cache::(TREE|INSTANCE)
+	 * @param string $app
+	 * @param string $location
+	 * @return array
+	 */
+	static protected function keys($level,$app,$location)
+	{
+		static $bases = array();
+
+		if (!isset($bases[$level]))
+		{
+			switch($level)
+			{
+				case self::TREE:
+					$bases[$level] = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT);
+					break;
+				case self::INSTANCE:
+					$bases[$level] = $level.'-'.$GLOBALS['egw_info']['server']['install_id'];
+					break;
+			}
+		}
+		return array($bases[$level],$app,$location);
+	}
+
+	/**
+	 * Let everyone know the methods of this class should be used only statically
+	 *
+	 */
+	function __construct()
+	{
+		throw new egw_exception_wrong_parameter("All methods of class ".__CLASS__." should be called static!");
+	}
+}
+
+/**
+ * Interface for a caching provider for tree and instance level
+ *
+ * The provider can eg. create subdirs under /tmp for each key
+ * to store data as a file or concat them with a separator to
+ * get a single string key to eg. store data in memcached
+ */
+interface egw_cache_provider
+{
+	/**
+	 * Constructor, eg. opens the connection to the backend
+	 *
+	 * @throws Exception if connection to backend could not be established
+	 * @param array $params eg. array(host,port) or array(directory) depending on the provider
+	 */
+	function __construct(array $params);
+
+	/**
+	 * Stores some data in the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @param mixed $data
+	 * @param int $expiration=0
+	 * @return boolean true on success, false on error
+	 */
+	function set(array $keys,$data,$expiration=0);
+
+	/**
+	 * Get some data from the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @return mixed data stored or NULL if not found in cache
+	 */
+	function get(array $keys);
+
+	/**
+	 * Delete some data from the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @return boolean true on success, false on error (eg. $key not set)
+	 */
+	function delete(array $keys);
+}
diff --git a/phpgwapi/inc/class.egw_cache_files.inc.php b/phpgwapi/inc/class.egw_cache_files.inc.php
new file mode 100644
index 0000000000..a38d4cfc82
--- /dev/null
+++ b/phpgwapi/inc/class.egw_cache_files.inc.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * eGroupWare API: Caching provider storing data to files
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage cache
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @version $Id$
+ */
+
+/**
+ * Caching provider storing data in files
+ *
+ * The provider creates subdirs under a given path
+ * for each values in $key
+ */
+class egw_cache_files implements egw_cache_provider
+{
+	/**
+	 * Extension of file used to store expiration > 0
+	 */
+	const EXPIRATION_EXTENSION = '.expiration';
+
+	/**
+	 * Path of base-directory for the cache, set via parameter to the constructor or defaults to temp_dir
+	 *
+	 * @var string
+	 */
+	protected $base_path;
+
+	/**
+	 * Constructor, eg. opens the connection to the backend
+	 *
+	 * @throws Exception if connection to backend could not be established
+	 * @param array $params eg. array(host,port) or array(directory) depending on the provider
+	 */
+	function __construct(array $params)
+	{
+		if ($params)
+		{
+			$this->base_path = $params[0];
+		}
+		else
+		{
+			if(!isset($GLOBALS['egw_info']['server']['temp_dir']))
+			{
+				if (isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db))
+				{
+					$GLOBALS['egw_info']['server']['temp_dir'] = $GLOBALS['egw_setup']->db->select(config::TABLE,'config_value',array(
+						'config_app'	=> 'phpgwapi',
+						'config_name'	=> 'temp_dir',
+					),__LINE__,__FILE__)->fetchColumn();
+				}
+				if (!$GLOBALS['egw_info']['server']['temp_dir'])
+				{
+					throw new Exception (__METHOD__."() server/temp_dir is NOT set!");
+				}
+			}
+			$this->base_path = $GLOBALS['egw_info']['server']['temp_dir'].'/egw_cache';
+		}
+		if (!isset($this->base_path) || !file_exists($this->base_path) && !mkdir($this->base_path,0700,true))
+		{
+			throw new Exception (__METHOD__."() can't create basepath $this->base_path!");
+		}
+	}
+
+	/**
+	 * Stores some data in the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @param mixed $data
+	 * @param int $expiration=0
+	 * @return boolean true on success, false on error
+	 */
+	function set(array $keys,$data,$expiration=0)
+	{
+		if ($ret = file_put_contents($fname=$this->filename($keys,true),serialize($data),LOCK_EX) > 0)
+		{
+			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
+		}
+		return $ret;
+	}
+
+	/**
+	 * Get some data from the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @return mixed data stored or NULL if not found in cache
+	 */
+	function get(array $keys)
+	{
+		if (!file_exists($fname = $this->filename($keys)))
+		{
+			return null;
+		}
+		if (file_exists($fname_expiration=$fname.self::EXPIRATION_EXTENSION) &&
+			($expiration = (int)file_get_contents($fname_expiration)) &&
+			filemtime($fname) < time()-$expiration)
+		{
+			unlink($fname);
+			unlink($fname_expiration);
+			return null;
+		}
+		return unserialize(file_get_contents($fname));
+	}
+
+	/**
+	 * Delete some data from the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @return boolean true on success, false on error (eg. $key not set)
+	 */
+	function delete(array $keys)
+	{
+		if (!file_exists($fname = $this->filename($keys)))
+		{
+			//error_log(__METHOD__.'('.array2string($keys).") file_exists('$fname') == FALSE!");
+			return false;
+		}
+		if (file_exists($$fname_expiration=$fname.self::EXPIRATION_EXTENSION))
+		{
+			unlink($fname_expiration);
+		}
+		//error_log(__METHOD__.'('.array2string($keys).") calling unlink('$fname')");
+		return unlink($fname);
+	}
+
+	/**
+	 * Create a path from $keys and $basepath
+	 *
+	 * @param array $keys
+	 * @param boolean $mkdir=false should we create the directory
+	 * @return string
+	 */
+	private function filename(array $keys,$mkdir=false)
+	{
+		$fname = $this->base_path.'/'.implode('/',$keys);
+
+		if ($mkdir && !file_exists($dirname=dirname($fname)))
+		{
+			mkdir($dirname,0700,true);
+		}
+		return $fname;
+	}
+}

From bf036043b2418ffc967192805c3923644c414945 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 20 Apr 2009 11:59:39 +0000
Subject: [PATCH 214/510] - making all methods of translation class static -
 caching the phrases in new egw_cache on Tree level --> a good speed
 improvment on my devel system - also added a global function
 check_load_extension($extension,$throw=false)

---
 phpgwapi/inc/class.egw.inc.php            |  18 +-
 phpgwapi/inc/class.egw_cache.inc.php      |   2 +-
 phpgwapi/inc/class.translation.inc.php    | 650 ++++++++++++----------
 phpgwapi/inc/common_functions.inc.php     |  28 +-
 setup/inc/class.setup_translation.inc.php | 287 +++++-----
 setup/lang.php                            |  10 +-
 6 files changed, 517 insertions(+), 478 deletions(-)

diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php
index 7d66bbd67b..416a4a4466 100644
--- a/phpgwapi/inc/class.egw.inc.php
+++ b/phpgwapi/inc/class.egw.inc.php
@@ -49,7 +49,7 @@ class egw extends egw_minimal
 	 * @var common
 	 */
 	var $common;
-	
+
 	private $cat_cache;
 
 	/**
@@ -128,6 +128,7 @@ class egw extends egw_minimal
 		//$GLOBALS['egw_info']['server'] = config::read('phpgwapi'); would unserialize arrays
 
 		// setup the other subclasses
+		// translation class is here only for backward compatibility, as all it's methods can be called static now
 		$this->translation    = new translation();
 		$this->common         = new common();
 		$this->accounts       = accounts::getInstance();
@@ -154,7 +155,7 @@ class egw extends egw_minimal
 			$this->check_app_rights();
 
 			$this->load_optional_classes();
-			
+
 			$this->cat_cache =& categories::init_cache();
 		}
 		else	// set the defines for login, in case it's more then just login
@@ -182,7 +183,7 @@ class egw extends egw_minimal
 		register_shutdown_function(array($this, 'shutdown'));
 
 		$this->define_egw_constants();
-		
+
 		categories::init_cache($this->cat_cache);
 	}
 
@@ -200,7 +201,8 @@ class egw extends egw_minimal
 		{
 			$this->template->set_root(EGW_APP_TPL);
 		}
-		$this->translation->add_app($GLOBALS['egw_info']['flags']['currentapp']);
+		// init the translation class, necessary as own wakeup would run before our's
+		translation::init();
 
 		// verify the session
 		$GLOBALS['egw']->verify_session();
@@ -439,20 +441,20 @@ class egw extends egw_minimal
 	/**
 	 * Shortcut to translation class
 	 *
-	 * This function is a basic wrapper to translation->translate()
+	 * This function is a basic wrapper to translation::translate()
 	 *
 	 * @deprecated only used in the old timetracker
 	 * @param  string	The key for the phrase
-	 * @see	translation->translate()
+	 * @see	translation::translate()
 	 */
-	function lang($key,$args=null)
+	static function lang($key,$args=null)
 	{
 		if (!is_array($args))
 		{
 			$args = func_get_args();
 			array_shift($args);
 		}
-		return $this->translation->translate($key,$args);
+		return translation::translate($key,$args);
 	}
 
 	/**
diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index 6b82be8c22..10e846b2cd 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -38,7 +38,7 @@
  * The $app parameter should be either the app or the class name, which both are unique.
  *
  * The tree and instance wide cache uses a certain provider class, to store the data
- * eg. in memcached or if there's nothing else configured in the session.
+ * eg. in memcached or if there's nothing else configured in the filesystem (eGW's temp_dir).
  */
 class egw_cache
 {
diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index f238e1fdc4..addb57c360 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * eGroupWare API - Translations
- * 
+ *
  * @link http://www.egroupware.org
  * @author Joseph Engo <jengo@phpgroupware.org>
  * @author Dan Kuykendall <seek3r@phpgroupware.org>
@@ -11,83 +11,87 @@
  * @version $Id$
  */
 
-// define the maximal length of a message_id, all message_ids have to be unique
-// in this length, our column is varchar 128
-if (!defined('MAX_MESSAGE_ID_LENGTH'))
-{
-	define('MAX_MESSAGE_ID_LENGTH',128);
-}
-// some constanst for pre php4.3
-if (!defined('PHP_SHLIB_SUFFIX'))
-{
-	define('PHP_SHLIB_SUFFIX',strtoupper(substr(PHP_OS, 0,3)) == 'WIN' ? 'dll' : 'so');
-}
-if (!defined('PHP_SHLIB_PREFIX'))
-{
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
-}
-
-// Define prefix for langfiles (historically 'phpgw_')
-define('EGW_LANGFILE_PREFIX', 'egw_');
-define('PHPGW_LANGFILE_PREFIX', 'phpgw_');
-
 /**
  * eGroupWare API - Translations
+ *
+ * All methods of this class can now be called static.
+ *
+ * Translations are cached tree-wide via egw_cache class.
  */
 class translation
 {
-	var $userlang = 'en';
-	var $loaded_apps = array();
-	var $line_rejected = array();
-	var $lang_array = array();
-	var $lang_table = 'egw_lang';
-	var $languages_table = 'egw_languages';
-	var $config_table = 'egw_config';
 	/**
-	 * Instance of the db-class
-	 *
-	 * @var egw_db
-	 */
-	var $db;
-	/**
-	 * Mark untranslated strings with an asterisk (*), values '' or 'yes'
+	 * Language of current user, will be set by init()
 	 *
 	 * @var string
 	 */
-	var $markunstranslated;
+	static $userlang = 'en';
 
 	/**
-	 * Constructor, sets up a copy of the db-object, gets the system-charset and tries to load the mbstring extension
+	 * Already loaded translations by applicaton
+	 *
+	 * @var array $app => $lang pairs
 	 */
-	function translation($warnings = False)
-	{
-		for ($i = 1; $i <= 9; $i++) {
-			$this->placeholders[] = '%'.$i;
-		}
-		$this->db = is_object($GLOBALS['egw']->db) ? $GLOBALS['egw']->db : $GLOBALS['egw_setup']->db;
+	static $loaded_apps = array();
 
-		if (!isset($GLOBALS['egw_setup'])) {
-			$this->system_charset = @$GLOBALS['egw_info']['server']['system_charset'];
-		} else {
-			$this->system_charset =& $GLOBALS['egw_setup']->system_charset;
-		}
+	/**
+	 * Loaded phrases
+	 *
+	 * @var array $message_id => $translation pairs
+	 */
+	static $lang_arr = array();
 
-		if (extension_loaded('mbstring') || @dl(PHP_SHLIB_PREFIX.'mbstring.'.PHP_SHLIB_SUFFIX)) {
-			$this->mbstring = true;
-			if(!empty($this->system_charset)) {
-				ini_set('mbstring.internal_encoding',$this->system_charset);
-			}
-			if (ini_get('mbstring.func_overload') < 7) {
-				if ($warnings) {
-					echo "<p>Warning: Please set <b>mbstring.func_overload = 7</b> in your php.ini for useing <b>$this->system_charset</b> as your charset !!!</p>\n";
-				}
-			}
-		} else {
-			if ($warnings) {
-				echo "<p>Warning: Please get and/or enable the <b>mbstring extension</b> in your php.ini for useing <b>$this->system_charset</b> as your charset, we are defaulting to <b>iconv</b> for now !!!</p>\n";
-			}
-		}
-	}
+	/**
+	 * Tables used by this class
+	 */
+	const LANG_TABLE = 'egw_lang';
+	const LANGUAGES_TABLE = 'egw_languages';
+
+	/**
+	 * Prefix of language files (historically 'phpgw_')
+	 */
+	const LANGFILE_PREFIX = 'egw_';
+	const OLD_LANGFILE_PREFIX = 'phpgw_';
+
+	/**
+	 * Maximal length of a message_id, all message_ids have to be unique in this length,
+	 * our column is varchar 128
+	 */
+	const MAX_MESSAGE_ID_LENGTH = 128;
+
+
+	/**
+	 * Reference to global db-class
+	 *
+	 * @var egw_db
+	 */
+	static $db;
+	/**
+	 * Mark untranslated strings with an asterisk (*)
+	 *
+	 * @var boolean
+	 */
+	static $markuntranslated=false;
+
+	/**
+	 * System charset
+	 *
+	 * @var string
+	 */
+	static $system_charset;
+
+	/**
+	 * Is the mbstring extension available
+	 *
+	 * @var boolean
+	 */
+	static $mbstring;
+	/**
+	 * Internal encoding / charset of mbstring (if loaded)
+	 *
+	 * @var string
+	 */
+	static $mbstring_internal_encoding;
 
 	/**
 	 * returns the charset to use (!$lang) or the charset of the lang-files or $lang
@@ -95,64 +99,85 @@ class translation
 	 * @param string/boolean $lang=False return charset of the active user-lang, or $lang if specified
 	 * @return string charset
 	 */
-	function charset($lang=False)
+	static function charset($lang=False)
 	{
+		static $charsets = array();
+
 		if ($lang)
 		{
-			if (!isset($this->charsets[$lang]))
+			if (!isset($charsets[$lang]))
 			{
-				if (!($this->charsets[$lang] = $this->db->select($this->lang_table,'content',array(
+				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE,'content',array(
 					'lang'		=> $lang,
 					'message_id'=> 'charset',
 					'app_name'	=> 'common',
-				),__LINE__,__FILE__)->fetchSingle()))
+				),__LINE__,__FILE__)->fetchColumn()))
 				{
-					$this->charsets[$lang] = 'iso-8859-1';
+					$charsets[$lang] = 'utf-8';
 				}
 			}
-			return $this->charsets[$lang];
+			return $charsets[$lang];
 		}
-		if ($this->system_charset)	// do we have a system-charset ==> return it
+		if (self::$system_charset)	// do we have a system-charset ==> return it
 		{
-			$charset = $this->system_charset;
+			$charset = self::$system_charset;
 		}
 		else
 		{
 			// if no translations are loaded (system-startup) use a default, else lang('charset')
-			$charset = !is_array(@$this->lang_arr) ? 'iso-8859-1' : strtolower($this->translate('charset'));
+			$charset = !self::$lang_arr ? 'utf-8' : strtolower(self::translate('charset'));
 		}
 		// we need to set our charset as mbstring.internal_encoding if mbstring.func_overlaod > 0
 		// else we get problems for a charset is different from the default utf-8
-		if (ini_get('mbstring.func_overload') && $this->mbstring_internal_encoding != $charset)
+		if (ini_get('mbstring.func_overload') && self::$mbstring_internal_encoding != $charset)
 		{
-			ini_set('mbstring.internal_encoding',$this->mbstring_internal_encoding = $charset);
-		}			
+			ini_set('mbstring.internal_encoding',self::$mbstring_internal_encoding = $charset);
+		}
 		return $charset;
 	}
 
 	/**
 	 * Initialises global lang-array and loads the 'common' and app-spec. translations
+	 *
+	 * @param boolean $load_translations=true should we also load translations for common and currentapp
 	 */
-	function init()
+	static function init($load_translations=true)
 	{
-		if (!is_array(@$this->lang_arr))
+		if (!isset(self::$db))
 		{
-			$this->lang_arr = array();
+			self::$db = isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 		}
+		if (!isset($GLOBALS['egw_setup']))
+		{
+			self::$system_charset = $GLOBALS['egw_info']['server']['system_charset'];
+		}
+		else
+		{
+			self::$system_charset =& $GLOBALS['egw_setup']->system_charset;
+		}
+		if ((self::$mbstring = check_load_extension('mbstring')))
+		{
+			if(!empty(self::$system_charset))
+			{
+				ini_set('mbstring.internal_encoding',self::$system_charset);
+			}
+		}
+		self::$markuntranslated = (boolean) $GLOBALS['egw_info']['server']['markuntranslated'];
 
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'])
+		if ($load_translations)
 		{
-			$this->userlang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
+			if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'])
+			{
+				self::$userlang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
+			}
+			self::add_app('common');
+			if (!count(self::$lang_arr))
+			{
+				self::$userlang = 'en';
+				self::add_app('common');
+			}
+			self::add_app($GLOBALS['egw_info']['flags']['currentapp']);
 		}
-		$this->add_app('common');
-		if (!count($this->lang_arr))
-		{
-			$this->userlang = 'en';
-			$this->add_app('common');
-		}
-		$this->add_app($GLOBALS['egw_info']['flags']['currentapp']);
-		
-		$this->markunstranslated = $GLOBALS['egw_info']['server']['markuntranslated'];
 	}
 
 	/**
@@ -163,34 +188,36 @@ class translation
 	 * @param string $not_found='*' what to add to not found phrases, default '*'
 	 * @return string with translation
 	 */
-	function translate($key, $vars=false, $not_found='*' )
+	static function translate($key, $vars=false, $not_found='*' )
 	{
-		if (!is_array(@$this->lang_arr) || !count($this->lang_arr))
+		static $placeholders = array('%1','%2','%3','%4','%5','%6','%7','%8','%9','%10');
+
+		if (!self::$lang_arr)
 		{
-			$this->init();
+			self::init();
 		}
 		$ret = $key;				// save key if we dont find a translation
-		if ($not_found && $this->markunstranslated) $ret .= $not_found;
+		if ($not_found && self::$markuntranslated) $ret .= $not_found;
 
-		if (isset($this->lang_arr[$key]))
+		if (isset(self::$lang_arr[$key]))
 		{
-			$ret = $this->lang_arr[$key];
+			$ret = self::$lang_arr[$key];
 		}
 		else
 		{
-			$new_key = strtolower(trim(substr($key,0,MAX_MESSAGE_ID_LENGTH)));
+			$new_key = strtolower(trim(substr($key,0,self::MAX_MESSAGE_ID_LENGTH)));
 
-			if (isset($this->lang_arr[$new_key]))
+			if (isset(self::$lang_arr[$new_key]))
 			{
 				// we save the original key for performance
-				$ret = $this->lang_arr[$key] =& $this->lang_arr[$new_key];
+				$ret = self::$lang_arr[$key] =& self::$lang_arr[$new_key];
 			}
 		}
 		if (is_array($vars) && count($vars))
 		{
 			if (count($vars) > 1)
 			{
-				$ret = str_replace($this->placeholders,$vars,$ret);
+				$ret = str_replace($placeholders,$vars,$ret);
 			}
 			else
 			{
@@ -201,47 +228,77 @@ class translation
 	}
 
 	/**
-	 * adds translations for an application from the database to the lang-array
+	 * Adds translations for an application
+	 *
+	 * By default the translations are read from the tree-wide cache
 	 *
 	 * @param string $app name of the application to add (or 'common' for the general translations)
-	 * @param string/boolean $lang=false 2 or 5 char lang-code or false for the users language
+	 * @param string|boolean $lang=false 2 or 5 char lang-code or false for the users language
 	 */
-	function add_app($app,$lang=False)
+	static function add_app($app,$lang=False)
 	{
-		$lang = $lang ? $lang : $this->userlang;
+		$lang = $lang ? $lang : self::$userlang;
 
-		if (!isset($this->loaded_apps[$app]) || $this->loaded_apps[$app] != $lang)
+		if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang)
 		{
-			if ($app == 'setup') return $this->add_setup($lang);
+			//$start = microtime(true);
+			$loaded =& egw_cache::getTree(__CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang));
 
-			foreach($this->db->select($this->lang_table,'message_id,content',array(
+			self::$lang_arr = self::$lang_arr ? array_merge(self::$lang_arr,$loaded) : $loaded;
+			self::$loaded_apps[$app] = $lang;
+			//error_log(__METHOD__."($app,$lang) took ".(1000*(microtime(true)-$start))." ms, loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr).": ".function_backtrace());
+		}
+	}
+
+	/**
+	 * Loads translations for an application from the database or direct from the lang-file for setup
+	 *
+	 * Never use directly, use add_app(), which employes caching (it has to be public, to act as callback for the cache!).
+	 *
+	 * @param string $app name of the application to add (or 'common' for the general translations)
+	 * @param string $lang=false 2 or 5 char lang-code or false for the users language
+	 * @return array the loaded strings
+	 */
+	static function &load_app($app,$lang)
+	{
+		//$start = microtime(true);
+		if ($app == 'setup')
+		{
+			$loaded =& self::load_setup($lang);
+		}
+		else
+		{
+			$loaded = array();
+			foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
 				'lang'		=> $lang,
 				'app_name'	=> $app,
 			),__LINE__,__FILE__) as $row)
 			{
-				$this->lang_arr[strtolower ($row['message_id'])] = $row['content'];
+				$loaded[strtolower($row['message_id'])] = $row['content'];
 			}
-			$this->loaded_apps[$app] = $lang;
 		}
+		//error_log(__METHOD__."($app,$lang) took ".(1000*(microtime(true)-$start))." ms");
+		return $loaded;
 	}
 
 	/**
 	 * Adds setup's translations, they are not in the DB!
 	 *
 	 * @param string $lang 2 or 5 char lang-code
+	 * @return array with loaded phrases
 	 */
-	function add_setup($lang)
+	protected static function &load_setup($lang)
 	{
 		foreach(array(
-			EGW_SERVER_ROOT.'/setup/lang/' . EGW_LANGFILE_PREFIX . $lang . '.lang',
-			EGW_SERVER_ROOT.'/setup/lang/' . PHPGW_LANGFILE_PREFIX . $lang . '.lang',
-			EGW_SERVER_ROOT.'/setup/lang/' . EGW_LANGFILE_PREFIX . 'en.lang',
-			EGW_SERVER_ROOT.'/setup/lang/' . PHPGW_LANGFILE_PREFIX . 'en.lang',
+			EGW_SERVER_ROOT.'/setup/lang/' . self::LANGFILE_PREFIX . $lang . '.lang',
+			EGW_SERVER_ROOT.'/setup/lang/' . self::OLD_LANGFILE_PREFIX . $lang . '.lang',
+			EGW_SERVER_ROOT.'/setup/lang/' . self::LANGFILE_PREFIX . 'en.lang',
+			EGW_SERVER_ROOT.'/setup/lang/' . self::OLD_LANGFILE_PREFIX . 'en.lang',
 		) as $fn)
 		{
-			if (file_exists($fn))
+			if (file_exists($fn) && ($fp = fopen($fn,'r')))
 			{
-				$fp = fopen($fn,'r');
+				$phrases = array();
 				while ($data = fgets($fp,8000))
 				{
 					// explode with "\t" and removing "\n" with str_replace, needed to work with mbstring.overload=7
@@ -249,15 +306,11 @@ class translation
 					$phrases[strtolower(trim($message_id))] = str_replace("\n",'',$content);
 				}
 				fclose($fp);
-				
-				foreach($phrases as $message_id => $content)
-				{
-					$this->lang_arr[$message_id] = $this->convert($content,$phrases['charset']);
-				}
+
+				return self::convert($phrases,$phrases['charset']);
 			}
-			break;
 		}
-		$this->loaded_apps['setup'] = $lang;
+		return array(); // nothing found (should never happen, as the en translations always exist)
 	}
 
 	/**
@@ -265,7 +318,7 @@ class translation
 	 *
 	 * @var array
 	 */
-	var $langs;
+	static $langs;
 
 	/**
 	 * returns a list of installed langs
@@ -273,27 +326,27 @@ class translation
 	 * @param boolean $force_read=false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	function get_installed_langs($force_read=false)
+	static function get_installed_langs($force_read=false)
 	{
-		if (!is_array($this->langs) || $force_read)
+		if (!is_array(self::$langs) || $force_read)
 		{
-			$this->langs = array();
-			foreach($this->db->select($this->lang_table,'DISTINCT lang,lang_name','lang = lang_id',__LINE__,__FILE__,
-				false,'',false,0,','.$this->languages_table) as $row)
+			self::$langs = array();
+			foreach(self::$db->select(self::LANG_TABLE,'DISTINCT lang,lang_name','lang = lang_id',__LINE__,__FILE__,
+				false,'',false,0,','.self::LANGUAGES_TABLE) as $row)
 			{
-				$this->langs[$row['lang']] = $row['lang_name'];
+				self::$langs[$row['lang']] = $row['lang_name'];
 			}
-			if (!$this->langs)
+			if (!self::$langs)
 			{
 				return false;
 			}
-			foreach($this->langs as $lang => $name)
+			foreach(self::$langs as $lang => $name)
 			{
-				$this->langs[$lang] = $this->translate($name,False,'');
+				self::$langs[$lang] = self::translate($name,False,'');
 			}
-			uasort($this->langs,'strcasecmp');
+			uasort(self::$langs,'strcasecmp');
 		}
-		return $this->langs;
+		return self::$langs;
 	}
 
 	/**
@@ -302,13 +355,13 @@ class translation
 	 * @param string $lang
 	 * @return string/false language or false if not found
 	 */
-	function lang2language($lang)
+	static function lang2language($lang)
 	{
-		if (isset($this->langs[$lang]))	// no need to query the DB
+		if (isset(self::$langs[$lang]))	// no need to query the DB
 		{
-			return $this->langs[$lang];
+			return self::$langs[$lang];
 		}
-		return $this->db->select($this->languages_table,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchSingle();
+		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
 	}
 
 	/**
@@ -316,9 +369,9 @@ class translation
 	 *
 	 * @return array with lang_id => lang_name pairs
 	 */
-	function list_langs()
+	static function list_langs()
 	{
-		$languages = $this->get_installed_langs();	// used translated installed languages
+		$languages = self::get_installed_langs();	// used translated installed languages
 
 		$availible = array();
 		$f = fopen(EGW_SERVER_ROOT.'/setup/lang/languages','rb');
@@ -329,9 +382,9 @@ class translation
 		}
 		fclose($f);
 		$availible = "('".implode("','",$availible)."')";
-		
+
 		// this shows first the installed, then the available and then the rest
-		foreach($this->db->select($this->languages_table,array(
+		foreach(self::$db->select(self::LANGUAGES_TABLE,array(
 			'lang_id','lang_name',
 			"CASE WHEN lang_id IN $availible THEN 1 ELSE 0 END AS availible",
 		),"lang_id NOT IN ('".implode("','",array_keys($languages))."')",__LINE__,__FILE__,false,' ORDER BY availible DESC,lang_name') as $row)
@@ -341,55 +394,29 @@ class translation
 		return $languages;
 	}
 
-	/**
-	 * Cached charsets
-	 *
-	 * @var array
-	 */
-	var $charsets;
-
 	/**
 	 * returns a list of installed charsets
 	 *
 	 * @return array with charset as key and comma-separated list of langs useing the charset as data
 	 */
-	function get_installed_charsets()
+	static function get_installed_charsets()
 	{
-		if (!is_array($this->charsets))
-		{
-			$this->get_installed_langs();
+		static $charsets;
 
-			$distinct = $this->db->capabilities['distinct_on_text'] ? 'DISTINCT' : '';
-			$this->charsets = array();
-			foreach($this->db->select($this->lang_table,$distinct.' lang,lang_name,content AS charset',array(
-				'message_id' => 'charset',
-			),__LINE__,__FILE__,false,'',false,0,",$this->languages_table WHERE lang = lang_id") as $row)
-			{
-				$data = &$this->charsets[$charset = strtolower($row['charset'])];
-				$lang = $this->langs[$row['lang']].' ('.$row['lang'].')';
-				if ($distinct || strpos($data,$lang) === false)
-				{
-					$data .= ($data ? ', ' : $charset.': ').$lang;
-				}						
-			}
-			if (!$this->charsets)
-			{
-				return False;
-			}
-			// add the old charsets, to provide some alternatives to utf-8 while importing
-			foreach(array(
+		if (!isset($charsets))
+		{
+			$charsets = array(
+				'utf-8'      => lang('all languages'),
 				'iso-8859-1' => 'Western european',
 				'iso-8859-2' => 'Eastern european',
 				'iso-8859-7' => 'Greek',
 				'euc-jp'     => 'Japanese',
 				'euc-kr'     => 'Korean',
-				'koi8-r'     => 'Russian',				
-				'windows-1251' => 'Bulgarian') as $charset => $lang)
-			{
-				$this->charsets[$charset] .= (!isset($this->charsets[$charset]) ? $charset.': ' : ', ') . $lang;
-			}
+				'koi8-r'     => 'Russian',
+				'windows-1251' => 'Bulgarian',
+			);
 		}
-		return $this->charsets;
+		return $charsets;
 	}
 
 	/**
@@ -398,66 +425,64 @@ class translation
 	 * @param string/array $data string(s) to convert
 	 * @param string/boolean $from charset $data is in or False if it should be detected
 	 * @param string/boolean $to charset to convert to or False for the system-charset the converted string
+	 * @param boolean $check_to_from=true internal to bypass all charset replacements
 	 * @return string/array converted string(s) from $data
 	 */
-	function convert($data,$from=False,$to=False)
+	static function convert($data,$from=False,$to=False,$check_to_from=true)
 	{
+		if ($check_to_from)
+		{
+			if ($from) $from = strtolower($from);
+
+			if ($to) $to = strtolower($to);
+
+			if (!$from)
+			{
+				$from = self::$mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
+				if($from == 'ascii')
+				{
+					$from = 'iso-8859-1';
+				}
+				//echo "<p>autodetected charset of '$data' = '$from'</p>\n";
+			}
+			/*
+				 php does not seem to support gb2312
+				 but seems to be able to decode it as EUC-CN
+			*/
+			switch($from)
+			{
+				case 'gb2312':
+				case 'gb18030':
+					$from = 'EUC-CN';
+					break;
+				case 'us-ascii':
+				case 'macroman':
+				case 'iso8859-1':
+				case 'windows-1258':
+				case 'windows-1252':
+					$from = 'iso-8859-1';
+					break;
+				case 'windows-1250':
+					$from = 'iso-8859-2';
+					break;
+			}
+			if (!$to)
+			{
+				$to = self::charset();
+			}
+			if ($from == $to || !$from || !$to || !$data)
+			{
+				return $data;
+			}
+		}
 		if (is_array($data))
 		{
 			foreach($data as $key => $str)
 			{
-				$ret[$key] = $this->convert($str,$from,$to);
+				$ret[$key] = self::convert($str,$from,$to,false);	// false = bypass the above checks, as they are already done
 			}
 			return $ret;
 		}
-
-		if ($from)
-		{
-			$from = strtolower($from);
-		}
-		if ($to)
-		{
-			$to = strtolower($to);
-		}
-
-		if (!$from)
-		{
-			$from = $this->mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
-			if($from == 'ascii')
-			{
-				$from = 'iso-8859-1';
-			}
-			//echo "<p>autodetected charset of '$data' = '$from'</p>\n";
-		}
-		/*
-			 php does not seem to support gb2312
-			 but seems to be able to decode it as EUC-CN
-		*/
-		switch($from)
-		{
-			case 'gb2312':
-			case 'gb18030':
-				$from = 'EUC-CN';
-				break;
-			case 'us-ascii':
-			case 'macroman':
-			case 'iso8859-1':
-			case 'windows-1258':
-			case 'windows-1252':
-				$from = 'iso-8859-1';
-				break;
-			case 'windows-1250':
-				$from = 'iso-8859-2';
-				break;
-		}
-		if (!$to)
-		{
-			$to = $this->charset();
-		}
-		if ($from == $to || !$from || !$to || !$data)
-		{
-			return $data;
-		}
 		if ($from == 'iso-8859-1' && $to == 'utf-8')
 		{
 			return utf8_encode($data);
@@ -466,22 +491,22 @@ class translation
 		{
 			return utf8_decode($data);
 		}
-		if ($this->mbstring && @mb_convert_encoding($data,$to,$from)!="")
+		if (self::$mbstring && ($data = mb_convert_encoding($data,$to,$from)) != '')
 		{
-			return @mb_convert_encoding($data,$to,$from);
+			return $data;
 		}
-		if(function_exists('iconv'))
+		if (function_exists('iconv'))
 		{
 			// iconv can not convert from/to utf7-imap
-			if ($to == 'utf7-imap' && function_exists(imap_utf7_encode)) 
+			if ($to == 'utf7-imap' && function_exists(imap_utf7_encode))
 			{
 				$convertedData = iconv($from, 'iso-8859-1', $data);
 				$convertedData = imap_utf7_encode($convertedData);
-				
+
 				return $convertedData;
 			}
 
-			if ($from == 'utf7-imap' && function_exists(imap_utf7_decode)) 
+			if ($from == 'utf7-imap' && function_exists(imap_utf7_decode))
 			{
 				$convertedData = imap_utf7_decode($data);
 				$convertedData = iconv('iso-8859-1', $to, $convertedData);
@@ -490,26 +515,30 @@ class translation
 			}
 
 			// the following is to workaround patch #962307
-			// if using EUC-CN, for iconv it strickly follow GB2312 and fail 
-			// in an email on the first Traditional/Japanese/Korean character, 
-			// but in reality when people send mails in GB2312, UMA mostly use 
+			// if using EUC-CN, for iconv it strickly follow GB2312 and fail
+			// in an email on the first Traditional/Japanese/Korean character,
+			// but in reality when people send mails in GB2312, UMA mostly use
 			// extended GB13000/GB18030 which allow T/Jap/Korean characters.
-			if($from=='EUC-CN') 
+			if($from == 'EUC-CN')
 			{
-				$from='gb18030';
+				$from = 'gb18030';
 			}
 
-			if (($convertedData = iconv($from,$to,$data))) 
+			if (($convertedData = iconv($from,$to,$data)))
 			{
 				return $convertedData;
 			}
 		}
-		#die("<p>Can't convert from charset '$from' to '$to' without the <b>mbstring extension</b> !!!</p>");
-
-		// this is not good, not convert did succed
 		return $data;
 	}
 
+	/**
+	 * rejected lines from install_langs()
+	 *
+	 * @var array
+	 */
+	static $line_rejected = array();
+
 	/**
 	 * installs translations for the selected langs into the database
 	 *
@@ -517,16 +546,20 @@ class translation
 	 * @param string $upgrademethod='dumpold' 'dumpold' (recommended & fastest), 'addonlynew' languages, 'addmissing' phrases
 	 * @param string/boolean $only_app=false app-name to install only one app or default false for all
 	 */
-	function install_langs($langs,$upgrademethod='dumpold',$only_app=False)
+	static function install_langs($langs,$upgrademethod='dumpold',$only_app=False)
 	{
+		if (is_null(self::$db))
+		{
+			self::init(false);
+		}
 		@set_time_limit(0);	// we might need some time
 		//echo "<p>translation_sql::install_langs(".print_r($langs,true).",'$upgrademthod','$only_app')</p>\n";
 		if (!isset($GLOBALS['egw_info']['server']) && $upgrademethod != 'dumpold')
 		{
-			if (($ctimes = $this->db->select($this->config_table,'config_value',array(
+			if (($ctimes = self::$db->select(config::TABLE,'config_value',array(
 				'config_app'	=> 'phpgwapi',
 				'config_name'	=> 'lang_ctimes',
-			),__LINE__,__FILE__)->fetchSingle()))
+			),__LINE__,__FILE__)->fetchColumn()))
 			{
 				$GLOBALS['egw_info']['server']['lang_ctimes'] = unserialize(stripslashes($ctimes));
 			}
@@ -536,12 +569,12 @@ class translation
 		{
 			return;
 		}
-		$this->db->transaction_begin();
+		self::$db->transaction_begin();
 
 		if ($upgrademethod == 'dumpold')
 		{
 			// dont delete the custom main- & loginscreen messages every time
-			$this->db->delete($this->lang_table,array("app_name!='mainscreen'","app_name!='loginscreen'"),__LINE__,__FILE__);
+			self::$db->delete(self::LANG_TABLE,array("app_name!='mainscreen'","app_name!='loginscreen'"),__LINE__,__FILE__);
 			//echo '<br>Test: dumpold';
 			$GLOBALS['egw_info']['server']['lang_ctimes'] = array();
 		}
@@ -552,9 +585,9 @@ class translation
 			if ($upgrademethod == 'addonlynew')
 			{
 				//echo "<br>Test: addonlynew - select count(*) from egw_lang where lang='".$lang."'";
-				if (!$this->db->select($this->lang_table,'COUNT(*)',array(
+				if (!self::$db->select(self::LANG_TABLE,'COUNT(*)',array(
 					'lang' => $lang,
-				),__LINE__,__FILE__)->fetchSingle())
+				),__LINE__,__FILE__)->fetchColumn())
 				{
 					//echo '<br>Test: addonlynew - True';
 					$addlang = True;
@@ -566,7 +599,7 @@ class translation
 				if (!is_object($GLOBALS['egw_setup']))
 				{
 					$GLOBALS['egw_setup'] =& CreateObject('setup.setup');
-					$GLOBALS['egw_setup']->db = clone($this->db);
+					$GLOBALS['egw_setup']->db = clone(self::$db);
 				}
 				$setup_info = $GLOBALS['egw_setup']->detection->get_versions();
 				$setup_info = $GLOBALS['egw_setup']->detection->get_db_versions($setup_info);
@@ -575,8 +608,8 @@ class translation
 				// Visit each app/setup dir, look for a egw_lang file
 				foreach($apps as $app)
 				{
-					$appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . EGW_LANGFILE_PREFIX . strtolower($lang) . '.lang';
-					$old_appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . PHPGW_LANGFILE_PREFIX . strtolower($lang) . '.lang';
+					$appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . self::LANGFILE_PREFIX . strtolower($lang) . '.lang';
+					$old_appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . self::OLD_LANGFILE_PREFIX . strtolower($lang) . '.lang';
 					//echo '<br>Checking in: ' . $app;
 					if($GLOBALS['egw_setup']->app_registered($app) && (file_exists($appfile) || file_exists($appfile=$old_appfile)))
 					{
@@ -591,12 +624,12 @@ class translation
 							{
 								$line_display = str_replace(array("\t","\n"),
 									array("<font color='red'><b>\\t</b></font>","<font color='red'><b>\\n</b></font>"), $line);
-								$this->line_rejected[] = array(
+								self::$line_rejected[] = array(
 									'appfile' => $appfile,
 									'line'    => $line_display,
 								);
 							}
-							$message_id = substr(strtolower(chop($message_id)),0,MAX_MESSAGE_ID_LENGTH);
+							$message_id = substr(strtolower(chop($message_id)),0,self::MAX_MESSAGE_ID_LENGTH);
 							$app_name = chop($app_name);
 							$raw[$app_name][$message_id] = $content;
 						}
@@ -604,29 +637,29 @@ class translation
 						{
 							$GLOBALS['egw_info']['server']['lang_ctimes'] = unserialize($GLOBALS['egw_info']['server']['lang_ctimes']);
 						}
-						$GLOBALS['egw_info']['server']['lang_ctimes'][$lang][$app] = filectime($appfile);
+						$GLOBALS['egw_info']['server']['lang_ctimes'][$lang][$app] = filemtime($appfile);
 					}
 				}
-				$charset = strtolower(@$raw['common']['charset'] ? $raw['common']['charset'] : $this->charset($lang));
-				//echo "<p>lang='$lang', charset='$charset', system_charset='$this->system_charset')</p>\n";
+				$charset = strtolower(@$raw['common']['charset'] ? $raw['common']['charset'] : self::charset($lang));
+				//echo "<p>lang='$lang', charset='$charset', system_charset='self::$system_charset')</p>\n";
 				//echo "<p>raw($lang)=<pre>".print_r($raw,True)."</pre>\n";
 				foreach($raw as $app_name => $ids)
 				{
 					foreach($ids as $message_id => $content)
 					{
-						if ($this->system_charset)
+						if (self::$system_charset)
 						{
-							$content = $this->convert($content,$charset,$this->system_charset);
+							$content = self::convert($content,$charset,self::$system_charset);
 						}
 						$addit = False;
 						//echo '<br>APPNAME:' . $app_name . ' PHRASE:' . $message_id;
 						if ($upgrademethod == 'addmissing')
 						{
 							//echo '<br>Test: addmissing';
-							$rs = $this->db->select($this->lang_table,"content,CASE WHEN app_name IN ('common') THEN 1 ELSE 0 END AS in_api",array(
+							$rs = self::$db->select(self::LANG_TABLE,"content,CASE WHEN app_name IN ('common') THEN 1 ELSE 0 END AS in_api",array(
 								'message_id' 	=> $message_id,
 								'lang'			=> $lang,
-								$this->db->expression($this->lang_table,'(',array(
+								self::$db->expression(self::LANG_TABLE,'(',array(
 									'app_name' => $app_name
 								)," OR app_name='common') ORDER BY in_api DESC")),__LINE__,__FILE__);
 
@@ -646,7 +679,7 @@ class translation
 									$addit = $content != ($row2 ? $row2['content'] : $row['content']);
 									if ($addit)	// if we want to add/update it ==> delete it
 									{
-										$this->db->delete($this->lang_table,array(
+										self::$db->delete(self::LANG_TABLE,array(
 											'message_id'	=> $message_id,
 											'lang'			=> $lang,
 											'app_name'		=> $app_name,
@@ -661,7 +694,7 @@ class translation
 							if($message_id && $content)
 							{
 								// echo "<br>adding - insert into egw_lang values ('$message_id','$app_name','$lang','$content')";
-								$result = $this->db->insert($this->lang_table,array(
+								$result = self::$db->insert(self::LANG_TABLE,array(
 									'message_id'	=> $message_id,
 									'app_name'		=> $app_name,
 									'lang'			=> $lang,
@@ -675,10 +708,13 @@ class translation
 							}
 						}
 					}
+					// delete the cache
+					egw_cache::unsetTree(__CLASS__,$app_name.':'.$lang);
+					//error_log(__METHOD__.'('.array2string($langs).",$upgrademethod,$only_app) deleted cache for app=$app_name and lang=$lang.");
 				}
 			}
 		}
-		$this->db->transaction_commit();
+		self::$db->transaction_commit();
 
 		// update the ctimes of the installed langsfiles for the autoloading of the lang-files
 		//
@@ -688,7 +724,7 @@ class translation
 	/**
 	 * re-loads all (!) langfiles if one langfile for the an app and the language of the user has changed
 	 */
-	function autoload_changed_langfiles()
+	static function autoload_changed_langfiles()
 	{
 		//echo "<h1>check_langs()</h1>\n";
 		if ($GLOBALS['egw_info']['server']['lang_ctimes'] && !is_array($GLOBALS['egw_info']['server']['lang_ctimes']))
@@ -702,8 +738,8 @@ class translation
 		$apps['phpgwapi'] = True;	// check the api too
 		foreach($apps as $app => $data)
 		{
-			$fname = EGW_SERVER_ROOT . "/$app/setup/" . EGW_LANGFILE_PREFIX . "$lang.lang";
-			$old_fname = EGW_SERVER_ROOT . "/$app/setup/" . PHPGW_LANGFILE_PREFIX . "$lang.lang";
+			$fname = EGW_SERVER_ROOT . "/$app/setup/" . self::LANGFILE_PREFIX . "$lang.lang";
+			$old_fname = EGW_SERVER_ROOT . "/$app/setup/" . self::OLD_LANGFILE_PREFIX . "$lang.lang";
 
 			if (file_exists($fname) || file_exists($fname = $old_fname))
 			{
@@ -717,9 +753,9 @@ class translation
 				if ($ctime != $ltime)
 				{
 					// update all langs
-					$installed = $this->get_installed_langs();
+					$installed = self::get_installed_langs();
 					//echo "<p>install_langs(".print_r($installed,True).")</p>\n";
-					$this->install_langs($installed ? array_keys($installed) : array());
+					self::install_langs($installed ? array_keys($installed) : array());
 					break;
 				}
 			}
@@ -734,17 +770,17 @@ class translation
 	 * @param boolean $DEBUG=false debug messages or not, default not
 	 * @return array with installed langs
 	 */
-	function get_langs($DEBUG=False)
+	static function get_langs($DEBUG=False)
 	{
 		if($DEBUG)
 		{
 			echo '<br>get_langs(): checking db...' . "\n";
 		}
-		if (!$this->langs)
+		if (!self::$langs)
 		{
-			$this->get_installed_langs();
+			self::get_installed_langs();
 		}
-		return $this->langs ? array_keys($this->langs) : array();
+		return self::$langs ? array_keys(self::$langs) : array();
 	}
 
 	/**
@@ -754,17 +790,17 @@ class translation
 	 * @param boolean $DEBUG=false debug messages or not, default not
 	 * @return boolean true if $appname had translations installed, false otherwise
 	 */
-	function drop_langs($appname,$DEBUG=False)
+	static function drop_langs($appname,$DEBUG=False)
 	{
 		if($DEBUG)
 		{
 			echo '<br>drop_langs(): Working on: ' . $appname;
 		}
-		if ($this->db->select($this->lang_table,'COUNT(*)',array(
+		if (self::$db->select(self::LANG_TABLE,'COUNT(*)',array(
 			'app_name' => $appname
-		),__LINE__,__FILE__)->fetchSingle())
+		),__LINE__,__FILE__)->fetchColumn())
 		{
-			$this->db->delete($this->lang_table,array(
+			self::$db->delete(self::LANG_TABLE,array(
 				'app_name' => $appname
 			),__LINE__,__FILE__);
 			return True;
@@ -779,9 +815,9 @@ class translation
 	 * @param boolean $DEBUG=false debug messages or not, default not
 	 * @param array/boolean $force_langs=false array with langs to install anyway (beside the allready installed ones), or false for none
 	 */
-	function add_langs($appname,$DEBUG=False,$force_langs=False)
+	static function add_langs($appname,$DEBUG=False,$force_langs=False)
 	{
-		$langs = $this->get_langs($DEBUG);
+		$langs = self::get_langs($DEBUG);
 		if(is_array($force_langs))
 		{
 			foreach($force_langs as $lang)
@@ -799,9 +835,9 @@ class translation
 			_debug_array($langs);
 		}
 
-		$this->install_langs($langs,'addmissing',$appname);
+		self::install_langs($langs,'addmissing',$appname);
 	}
-	
+
 	/**
 	 * insert/update one phrase in the lang-table
 	 *
@@ -810,9 +846,9 @@ class translation
 	 * @param string $message_id
 	 * @param string $content
 	 */
-	function write($lang,$app_name,$message_id,$content)
+	static function write($lang,$app_name,$message_id,$content)
 	{
-		$this->db->insert($this->lang_table,array(
+		self::$db->insert(self::LANG_TABLE,array(
 			'content' => $content,
 		),array(
 			'lang' => $lang,
@@ -829,15 +865,15 @@ class translation
 	 * @param string $message_id
 	 * @return string/boolean content or false if not found
 	 */
-	function read($lang,$app_name,$message_id)
+	static function read($lang,$app_name,$message_id)
 	{
-		return $this->db->select($this->lang_table,'content',array(
+		return self::$db->select(self::LANG_TABLE,'content',array(
 			'lang' => $lang,
 			'app_name' => $app_name,
 			'message_id' => $message_id,
-		),__LINE__,__FILE__)->fetchSingle();
+		),__LINE__,__FILE__)->fetchColumn();
 	}
-	
+
 	/**
 	 * Return the message_id of a given translation
 	 *
@@ -846,14 +882,14 @@ class translation
 	 * @param string $lang='' default check all langs
 	 * @return string
 	 */
-	function get_message_id($translation,$app=null,$lang=null)
+	static function get_message_id($translation,$app=null,$lang=null)
 	{
-		$like = $this->db->Type == 'pgsql' ? 'ILIKE' : 'LIKE';
-		$where = array('content '.$like.' '.$this->db->quote($translation));	// like to be case-insensitive
+		$like = self::$db->Type == 'pgsql' ? 'ILIKE' : 'LIKE';
+		$where = array('content '.$like.' '.self::$db->quote($translation));	// like to be case-insensitive
 		if ($app) $where['app_name'] = $app;
 		if ($lang) $where['lang'] = $lang;
-		
-		return $this->db->select($this->lang_table,'message_id',$where,__LINE__,__FILE__)->fetchSingle();
+
+		return self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
 	}
 
 	/**
@@ -863,26 +899,32 @@ class translation
 	 * @param string $displayCharset the charset parameter specifies the character set to represent the result by (if iconv_mime_decode is to be used)
 	 * @return string
 	 */
-	function decodeMailHeader($_string, $displayCharset='utf-8')
+	static function decodeMailHeader($_string, $displayCharset='utf-8')
 	{
 		//error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset");
-		if(function_exists(imap_mime_header_decode)) {
+		if(function_exists(imap_mime_header_decode))
+		{
 			$newString = '';
 
 			$string = preg_replace('/\?=\s+=\?/', '?= =?', $_string);
 
 			$elements=imap_mime_header_decode($string);
 
-			foreach((array)$elements as $element) {
-				if ($element->charset == 'default')
-					$element->charset = 'iso-8859-1';
+			foreach((array)$elements as $element)
+			{
+				if ($element->charset == 'default') $element->charset = 'iso-8859-1';
+
 				$newString .= self::convert($element->text,$element->charset);
 			}
 			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
-		} elseif(function_exists(mb_decode_mimeheader)) {
+		}
+		elseif(function_exists(mb_decode_mimeheader))
+		{
 			$string = $_string;
-			if(preg_match_all('/=\?.*\?Q\?.*\?=/iU', $string, $matches)) {
-				foreach($matches[0] as $match) {
+			if(preg_match_all('/=\?.*\?Q\?.*\?=/iU', $string, $matches))
+			{
+				foreach($matches[0] as $match)
+				{
 					$fixedMatch = str_replace('_', ' ', $match);
 					$string = str_replace($match, $fixedMatch, $string);
 				}
@@ -891,7 +933,9 @@ class translation
 			}
 			$string = mb_decode_mimeheader($string);
 			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
-		} elseif(function_exists(iconv_mime_decode)) {
+		}
+		elseif(function_exists(iconv_mime_decode))
+		{
 			// continue decoding also if an error occurs
 			$string = @iconv_mime_decode($_string, 2, $displayCharset);
 			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 0591e8f145..07008b6f88 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -59,6 +59,28 @@ function array2string($var)
 	return 'UNKNOWN TYPE!';
 }
 
+/**
+ * Check if a given extension is loaded or load it if possible (requires sometimes disabled dl function)
+ *
+ * @param string $extension
+ * @param boolean $throw=false should we throw an exception, if $extension could not be loaded, default false = no
+ * @return boolean true if loaded now, false otherwise
+ */
+function check_load_extension($extension,$throw=false)
+{
+	if (!defined('PHP_SHLIB_PREFIX'))
+	{
+		define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
+	}
+	$loaded = extension_loaded($extension) || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
+
+	if (!($loaded))
+	{
+		throw new Exception ("PHP extension '$ext' not loaded AND can NOT be loaded via dl('$dl')!");
+	}
+	return $loaded;
+}
+
 /**
  * @internal Not to be used directly. Should only be used by print_debug()
  */
@@ -1325,7 +1347,7 @@ if (!function_exists('lang'))	// setup declares an own version
 			$vars = func_get_args();
 			array_shift($vars);	// remove $key
 		}
-		return $GLOBALS['egw']->translation->translate($key,$vars);
+		return translation::translate($key,$vars);
 	}
 }
 
@@ -1348,9 +1370,7 @@ function try_lang($key,$vars=null)
 		$vars = func_get_args();
 		array_shift($vars);	// remove $key
 	}
-	return is_object($GLOBALS['egw'])  && isset($GLOBALS['egw']->translations) ?
-		$GLOBALS['egw']->translation->translate($key,$vars) :
-		str_replace($varnames,$vars,$key);
+	return class_exists(translations,false) ? translation::translate($key,$vars) : str_replace($varnames,$vars,$key);
 }
 
 /**
diff --git a/setup/inc/class.setup_translation.inc.php b/setup/inc/class.setup_translation.inc.php
index 0a193ee94e..5f82a25074 100644
--- a/setup/inc/class.setup_translation.inc.php
+++ b/setup/inc/class.setup_translation.inc.php
@@ -11,177 +11,152 @@
  * @version $Id$
  */
 
-	if (!defined('MAX_MESSAGE_ID_LENGTH'))
+if (!defined('MAX_MESSAGE_ID_LENGTH'))
+{
+	define('MAX_MESSAGE_ID_LENGTH',128);
+}
+
+// Define prefix for langfiles (historically 'phpgw_')
+define('EGW_LANGFILE_PREFIX', 'egw_');
+
+class setup_translation
+{
+	var $langarray = array();
+
+	var $no_translation_marker = '*';
+
+	/**
+	 * constructor for the class, loads all phrases into langarray
+	 *
+	 * @param $lang	user lang variable (defaults to en)
+	 */
+	function __construct()
 	{
-		define('MAX_MESSAGE_ID_LENGTH',128);
+		$ConfigLang = get_var('ConfigLang',Array('POST','COOKIE'));
+
+		if(!$ConfigLang)
+		{
+			$lang = 'en';
+		}
+		else
+		{
+			$lang = $ConfigLang;
+		}
+
+		$fn = '.' . SEP . 'lang' . SEP . EGW_LANGFILE_PREFIX . $lang . '.lang';
+		if (!file_exists($fn))
+		{
+			$fn = '.' . SEP . 'lang' . SEP . EGW_LANGFILE_PREFIX .'en.lang';
+		}
+		if (file_exists($fn) && ($fp = fopen($fn,'r')))
+		{
+			while (($data = fgets($fp,8000)))
+			{
+				// explode with "\t" and removing "\n" with str_replace, needed to work with mbstring.overload=7
+				list($message_id,,,$content) = explode("\t",$data);
+				$this->langarray[strtolower(trim($message_id))] = str_replace("\n",'',$content);
+			}
+			fclose($fp);
+
+			if (!$GLOBALS['egw_setup']->system_charset)
+			{
+				$GLOBALS['egw_setup']->system_charset = $this->langarray['charset'];
+			}
+		}
 	}
 
-	// Define prefix for langfiles (historically 'phpgw_')
-	define('EGW_LANGFILE_PREFIX', 'egw_');
-
-	class setup_translation
+	/**
+	 * Translate phrase to user selected lang
+	 *
+	 * @param $key  phrase to translate
+	 * @param $vars vars sent to lang function, passed to us
+	 */
+	function translate($key, $vars=False)
 	{
-		var $langarray = array();
-		
-		var $no_translation_marker = '*';
+		static $placeholders = array('%1','%2','%3','%4','%5','%6','%7','%8','%9','%10');
 
-		/**
-		 * constructor for the class, loads all phrases into langarray
-		 *
-		 * @param $lang	user lang variable (defaults to en)
-		 */
-		function setup_translation()
+		$ret = $key . $this->no_translation_marker;
+		$key = strtolower(trim($key));
+		if (isset($this->langarray[$key]))
 		{
-			$ConfigLang = get_var('ConfigLang',Array('POST','COOKIE'));
+			$ret = $this->langarray[$key];
+		}
+		if ($GLOBALS['egw_setup']->system_charset != $this->langarray['charset'])
+		{
+			$ret = translation::convert($ret,$this->langarray['charset']);
+		}
+		if (is_array($vars))
+		{
+			$ret = str_replace($placeholders, $vars, $ret);
+		}
+		return $ret;
+	}
 
-			if(!$ConfigLang)
+	function get_langs($DEBUG=False)
+	{
+		return translaton::get_langs($DEBUG);
+	}
+
+	function drop_langs($appname,$DEBUG=False)
+	{
+		return translaton::drop_langs($appname,$DEBUG);
+	}
+
+	function add_langs($appname,$DEBUG=False,$force_langs=False)
+	{
+		return translaton::add_langs($appname,$DEBUG,$force_langs);
+	}
+
+	function drop_add_all_langs($langs=False)
+	{
+		if (!$langs && !count($langs = translation::get_langs()))
+		{
+			$langs[] = 'en';
+		}
+		return translation::install_langs($langs,'dumpold');
+	}
+
+	/**
+	 * List availible charsets and it's supported languages
+	 * @param boolean/string $name=false name for selectbox or false to return an array
+	 * @param string $selected selected charset
+	 * @return string/array html for a selectbox or array with charset / languages pairs
+	 */
+	function get_charsets($name=false,$selected='')
+	{
+		$charsets = array(
+			'utf-8' => 'utf-8: '.lang('all languages (incl. not listed ones)'),
+		);
+		if (($f = fopen('lang/languages','r')))
+		{
+			while(($line = fgets($f)) !== false)
 			{
-				$lang = 'en';
-			}
-			else
-			{
-				$lang = $ConfigLang;
-			}
-			
-			$fn = '.' . SEP . 'lang' . SEP . EGW_LANGFILE_PREFIX . $lang . '.lang';
-			if (!file_exists($fn))
-			{
-				$fn = '.' . SEP . 'lang' . SEP . EGW_LANGFILE_PREFIX .'en.lang';
-			}
-			if (file_exists($fn))
-			{
-				$fp = fopen($fn,'r');
-				while ($data = fgets($fp,8000))
+				list($lang,$language) = explode("\t",trim($line));
+				if ($lang && ($lf = @fopen("../phpgwapi/setup/" . EGW_LANGFILE_PREFIX . "$lang.lang",'r')))
 				{
-					// explode with "\t" and removing "\n" with str_replace, needed to work with mbstring.overload=7
-					list($message_id,,,$content) = explode("\t",$data);
-					$this->langarray[strtolower(trim($message_id))] = str_replace("\n",'',$content);
-				}
-				fclose($fp);
-				
-				if (!$GLOBALS['egw_setup']->system_charset)
-				{
-					$GLOBALS['egw_setup']->system_charset = $this->langarray['charset'];
-				}
-			}
-		}
-
-		/**
-		 * Translate phrase to user selected lang
-		 *
-		 * @param $key  phrase to translate
-		 * @param $vars vars sent to lang function, passed to us
-		 */
-		function translate($key, $vars=False) 
-		{
-			$ret = $key . $this->no_translation_marker;
-			$key = strtolower(trim($key));
-			if (isset($this->langarray[$key]))
-			{
-				$ret = $this->langarray[$key];
-			}
-			if ($GLOBALS['egw_setup']->system_charset != $this->langarray['charset'])
-			{
-				if (!is_object($this->sql))
-				{
-					$this->setup_translation_sql();
-				}
-				$ret = $this->sql->convert($ret,$this->langarray['charset']);
-			}
-			if (is_array($vars))
-			{
-				foreach($vars as $n => $var)
-				{
-					$ret = str_replace( '%'.($n+1), $var, $ret );
-				}
-			}
-			return $ret;
-		}
-
-		// the following functions have been moved to phpgwapi/tanslation_sql
-
-		function setup_translation_sql()
-		{
-			if (!is_object($this->sql) || is_object($GLOBALS['egw_setup']->db) && !is_object($this->sql->db))
-			{
-				include_once(EGW_API_INC.'/class.translation.inc.php');
-				$this->sql =& new translation;
-			}
-		}
-
-		function get_langs($DEBUG=False)
-		{
-			$this->setup_translation_sql();
-			return $this->sql->get_langs($DEBUG);
-		}
-
-		function drop_langs($appname,$DEBUG=False)
-		{
-			$this->setup_translation_sql();
-			return $this->sql->drop_langs($appname,$DEBUG);
-		}
-
-		function add_langs($appname,$DEBUG=False,$force_langs=False)
-		{
-			$this->setup_translation_sql();
-			return $this->sql->add_langs($appname,$DEBUG,$force_langs);
-		}
-		
-		function drop_add_all_langs($langs=False)
-		{
-			$this->setup_translation_sql();
-
-			if (!$langs && !count($langs = $this->sql->get_langs()))
-			{
-				$langs[] = 'en';
-			}
-			return $this->sql->install_langs($langs,'dumpold');
-		}
-		
-		/**
-		 * List availible charsets and it's supported languages
-		 * @param boolean/string $name=false name for selectbox or false to return an array
-		 * @param string $selected selected charset
-		 * @return string/array html for a selectbox or array with charset / languages pairs
-		 */
-		function get_charsets($name=false,$selected='')
-		{
-			$charsets = array(
-				'utf-8' => 'utf-8: '.lang('all languages (incl. not listed ones)'),
-			);
-			if (($f = fopen('lang/languages','r')))
-			{
-				while(($line = fgets($f)) !== false)
-				{
-					list($lang,$language) = explode("\t",trim($line));
-					if ($lang && ($lf = @fopen("../phpgwapi/setup/" . EGW_LANGFILE_PREFIX . "$lang.lang",'r')))
+					while(($line = fgets($lf)) !== false)
 					{
-						while(($line = fgets($lf)) !== false)
+						list($phrase,,,$charset) = explode("\t",$line);
+						if ($phrase == 'charset')
 						{
-							list($phrase,,,$charset) = explode("\t",$line);
-							if ($phrase == 'charset')
+							$charset = trim(strtolower($charset));
+
+							if ($charset != 'utf-8')
 							{
-								$charset = trim(strtolower($charset));
-								
-								if ($charset != 'utf-8')
-								{
-									$charsets[$charset] .= (isset($charsets[$charset]) ? ', ' : $charset.': ') . $language;
-								}
-								break;
+								$charsets[$charset] .= (isset($charsets[$charset]) ? ', ' : $charset.': ') . $language;
 							}
+							break;
 						}
-						fclose($lf);
 					}
+					fclose($lf);
 				}
-				fclose($f);
 			}
-			if (!$name)
-			{
-				return $charsets;
-			}
-			$html =& CreateObject('phpgwapi.html');
-			
-			return $html->select($name,trim(strtolower($selected)),$charsets,true);
-		}								
+			fclose($f);
+		}
+		if (!$name)
+		{
+			return $charsets;
+		}
+		return html::select($name,trim(strtolower($selected)),$charsets,true);
 	}
-?>
+}
diff --git a/setup/lang.php b/setup/lang.php
index 64974a1589..4081f0d40d 100644
--- a/setup/lang.php
+++ b/setup/lang.php
@@ -22,11 +22,9 @@ $GLOBALS['egw_setup']->loaddb();
 
 if (@$_POST['submit'])
 {
-	$GLOBALS['egw_setup']->translation->setup_translation_sql();
-	$GLOBALS['egw_setup']->translation->sql->install_langs(@$_POST['lang_selected'],@$_POST['upgrademethod']);
+	translation::install_langs(@$_POST['lang_selected'],@$_POST['upgrademethod']);
 
-
-	if( !$GLOBALS['egw_setup']->translation->sql->line_rejected )
+	if(!translation::$line_rejected )
 	{
 		Header('Location: index.php');
 		exit;
@@ -89,10 +87,10 @@ else
 }
 
 // Rejected Lines
-if($_POST['debug'] && count($GLOBALS['egw_setup']->translation->sql->line_rejected))
+if($_POST['debug'] && count(translation::$line_rejected))
 {
 	$str = '';
-	foreach($GLOBALS['egw_setup']->translation->sql->line_rejected as $badline)
+	foreach(translation::$line_rejected as $badline)
 	{
 		$_f_buffer = split("[/\\]", $badline['appfile']);
 		$str .= lang('Application: %1, File: %2, Line: "%3"','<b>'.$_f_buffer[count($_f_buffer)-3].'</b>',

From aca05a32e30a70036a7d7277534e9f7c25172792 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 20 Apr 2009 12:43:44 +0000
Subject: [PATCH 215/510] using new check_load_extension function

---
 calendar/inc/gradient.php                     | 38 ++++++-------------
 calendar/inc/round_corners.php                | 38 ++++++-------------
 etemplate/inc/class.etemplate_request.inc.php |  4 +-
 phpgwapi/inc/class.egw_db.inc.php             | 14 +------
 phpgwapi/inc/class.egw_session.inc.php        | 12 +-----
 .../inc/class.egw_session_memcache.inc.php    |  6 +--
 .../inc/class.sqlfs_stream_wrapper.inc.php    |  5 +--
 setup/check_install.php                       |  4 +-
 setup/inc/class.setup_header.inc.php          | 12 +-----
 9 files changed, 33 insertions(+), 100 deletions(-)

diff --git a/calendar/inc/gradient.php b/calendar/inc/gradient.php
index 113cf3689f..d79593d5ce 100644
--- a/calendar/inc/gradient.php
+++ b/calendar/inc/gradient.php
@@ -1,31 +1,16 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - calendar: rounded corners                                      *
-	* http://www.egroupware.org                                                *
-	* Written by RalfBecker@outdoor-training.de                                *
-	* --------------------------------------------                             *
-	*  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.                                              *
-	\**************************************************************************/
+/**
+ * eGroupWare Calendar: rounded corners
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @package calendar
+ * @copyright (c) 2004-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
-
-// some constanst for pre php4.3
-if (!defined('PHP_SHLIB_SUFFIX'))
-{
-	define('PHP_SHLIB_SUFFIX',strtoupper(substr(PHP_OS, 0,3)) == 'WIN' ? 'dll' : 'so');
-}
-if (!defined('PHP_SHLIB_PREFIX'))
-{
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
-}
-
-if (!extension_loaded('gd') && !@dl(PHP_SHLIB_PREFIX.'gd.'.PHP_SHLIB_SUFFIX))
-{
-	die("Can't load the needed php-extension 'gd' !!!");
-}
+check_load_extension('gd',true);	// true = throw exception if not loadable
 
 foreach(array('width'=>1,'height'=>1,'color1'=>'000080','color2'=>'ffffff') as $name => $default)
 {
@@ -84,4 +69,3 @@ else
 	imagepng($image);
 }
 imagedestroy($image);
-?>
diff --git a/calendar/inc/round_corners.php b/calendar/inc/round_corners.php
index c8bd42491d..9ee50443c4 100644
--- a/calendar/inc/round_corners.php
+++ b/calendar/inc/round_corners.php
@@ -1,31 +1,16 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - calendar: rounded corners                                      *
-	* http://www.egroupware.org                                                *
-	* Written by RalfBecker@outdoor-training.de                                *
-	* --------------------------------------------                             *
-	*  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.                                              *
-	\**************************************************************************/
+/**
+ * eGroupWare Calendar: rounded corners
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @package calendar
+ * @copyright (c) 2004-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
-
-// some constanst for pre php4.3
-if (!defined('PHP_SHLIB_SUFFIX'))
-{
-	define('PHP_SHLIB_SUFFIX',strtoupper(substr(PHP_OS, 0,3)) == 'WIN' ? 'dll' : 'so');
-}
-if (!defined('PHP_SHLIB_PREFIX'))
-{
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
-}
-
-if (!extension_loaded('gd') && !@dl(PHP_SHLIB_PREFIX.'gd.'.PHP_SHLIB_SUFFIX))
-{
-	die("Can't load the needed php-extension 'gd' !!!");
-}
+check_load_extension('gd',true);	// true = throw exception if not loadable
 
 foreach(array('width'=>-20,'height'=>40,'border'=>1,'color'=>'000080','bgcolor'=>'0000FF') as $name => $default)
 {
@@ -85,4 +70,3 @@ else
 	imagepng($image);
 }
 imagedestroy($image);
-?>
diff --git a/etemplate/inc/class.etemplate_request.inc.php b/etemplate/inc/class.etemplate_request.inc.php
index 9d3935411f..17ca4ab6a8 100644
--- a/etemplate/inc/class.etemplate_request.inc.php
+++ b/etemplate/inc/class.etemplate_request.inc.php
@@ -103,7 +103,7 @@ class etemplate_request
 	{
 		if (is_null(self::$request_class))
 		{
-			self::$request_class = extension_loaded('mcrypt') && function_exists('gzcompress') &&
+			self::$request_class = check_load_extension('mcrypt') && function_exists('gzcompress') &&
 				self::init_crypt() ? __CLASS__ : 'etemplate_request_session';
 		}
 		if (self::$request_class != __CLASS__)
@@ -342,7 +342,7 @@ class etemplate_request
 			{
 				$key = $GLOBALS['egw_info']['server']['db_pass'].EGW_SERVER_ROOT;
 			}
-			if (!extension_loaded('mcrypt') && (!function_exists('dl') || !@dl(PHP_SHLIB_PREFIX.'mcrypt'.'.'.PHP_SHLIB_SUFFIX)))
+			if (!check_load_extension('mcrypt'))
 			{
 				error_log(__METHOD__."() required PHP extension mcrypt not loaded and can not be loaded, eTemplate requests get NOT encrypted!");
 				return false;
diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 88a8f6adbb..32ac272a50 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -7,7 +7,7 @@
  * @package api
  * @subpackage db
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2003-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @version $Id$
  */
 
@@ -46,15 +46,6 @@
  *		}
  */
 
-// some constanst for pre php4.3
-if (!defined('PHP_SHLIB_SUFFIX'))
-{
-	define('PHP_SHLIB_SUFFIX',strtoupper(substr(PHP_OS, 0,3)) == 'WIN' ? 'dll' : 'so');
-}
-if (!defined('PHP_SHLIB_PREFIX'))
-{
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
-}
 if(empty($GLOBALS['egw_info']['server']['db_type']))
 {
 	$GLOBALS['egw_info']['server']['db_type'] = 'mysql';
@@ -406,8 +397,7 @@ class egw_db
 					$this->Host != $GLOBALS['egw']->db->Host ||
 					$this->Port != $GLOBALS['egw']->db->Port)))
 			{
-				if (!extension_loaded($php_extension) && (!function_exists('dl') ||
-					!dl(PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX)))
+				if (!check_load_extension($php_extension))
 				{
 					$this->halt("Necessary php database support for $this->Type (".PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX.") not loaded and can't be loaded, exiting !!!");
 					return null;	// in case error-reporting = 'no'
diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index ab44c844f4..8233e5c55f 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -20,16 +20,6 @@
  * @version $Id$
  */
 
-// some constants for pre php4.3
-if (!defined('PHP_SHLIB_SUFFIX'))
-{
-	define('PHP_SHLIB_SUFFIX',$is_windows ? 'dll' : 'so');
-}
-if (!defined('PHP_SHLIB_PREFIX'))
-{
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
-}
-
 /**
  * eGW session handling
  *
@@ -381,7 +371,7 @@ class egw_session
 		}
 		if (is_null(self::$mcrypt))
 		{
-			if (!extension_loaded('mcrypt') && (!function_exists('dl') || !@dl(PHP_SHLIB_PREFIX.'mcrypt'.'.'.PHP_SHLIB_SUFFIX)))
+			if (!check_load_extension('mcrypt'))
 			{
 				error_log(__METHOD__."() required PHP extension mcrypt not loaded and can not be loaded, sessions get NOT encrypted!");
 				return false;
diff --git a/phpgwapi/inc/class.egw_session_memcache.inc.php b/phpgwapi/inc/class.egw_session_memcache.inc.php
index 51c7339e20..f064d0acd6 100644
--- a/phpgwapi/inc/class.egw_session_memcache.inc.php
+++ b/phpgwapi/inc/class.egw_session_memcache.inc.php
@@ -70,10 +70,8 @@ class egw_session_memcache
 	 */
 	public static function open($save_path, $session_name)
 	{
-		if (!extension_loaded('memcache') && !dl(PHP_SHLIB_PREFIX.'memcache.'.PHP_SHLIB_SUFFIX))
-		{
-			throw new Exception("Required PHP extension 'memcache' not loaded AND can NOT be loaded!");
-		}
+		check_load_extension('memcache',true);	// true = throw exception if not loadable
+
 		self::$memcache = new Memcache;
 		foreach(explode(',',$save_path) as $path)
 		{
diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index b5da3b50a3..32b7853c3b 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -1462,10 +1462,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			foreach(array('pdo','pdo_'.self::$pdo_type) as $ext)
 			{
-				if (!extension_loaded($ext) && function_exists('dl') && !dl($dl=PHP_SHLIB_PREFIX.$ext.'.'.PHP_SHLIB_SUFFIX))
-				{
-					throw new Exception ("PHP extension '$ext' not loaded AND can NOT be loaded via dl('$dl')!");
-				}
+				check_load_extension($ext,true);	// true = throw Exception
 			}
 			$pdo_available = true;
 		}
diff --git a/setup/check_install.php b/setup/check_install.php
index 5bac423c13..ce863e3b69 100644
--- a/setup/check_install.php
+++ b/setup/check_install.php
@@ -176,7 +176,7 @@ $checks = array(
 		'func' => 'php_ini_check',
 		'value' => 7,
 		'warning' => '<div class="setup_info">' . lang('The mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "</div>",
-		'change' => extension_loaded('mbstring')  || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.'mbstring.'.PHP_SHLIB_SUFFIX) ? 'mbstring.func_overload = 7' : '',
+		'change' => check_load_extension('mbstring') ? 'mbstring.func_overload = 7' : '',
 	),
 	'ldap' => array(
 		'func' => 'extension_check',
@@ -422,7 +422,7 @@ function extension_check($name,$args)
 		return True;	// check only under windows
 	}
 	// we check for the existens of 'dl', as multithreaded webservers dont have it !!!
-	$available = extension_loaded($name) || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.$name.'.'.PHP_SHLIB_SUFFIX);
+	$available = check_load_extension($name);
 
 	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking extension %1 is loaded or loadable',$name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
diff --git a/setup/inc/class.setup_header.inc.php b/setup/inc/class.setup_header.inc.php
index 5014bbe4e1..169a96ffd3 100644
--- a/setup/inc/class.setup_header.inc.php
+++ b/setup/inc/class.setup_header.inc.php
@@ -75,7 +75,6 @@ class setup_header
 
 		$GLOBALS['egw_info']['server']['show_domain_selectbox'] = false;
 		$GLOBALS['egw_info']['server']['db_persistent'] = True;
-		$GLOBALS['egw_info']['server']['sessions_type'] = !$this->check_load_extension('session') ? 'db' :'php4';
 		$GLOBALS['egw_info']['login_template_set'] = 'idots';
 		$GLOBALS['egw_info']['server']['mcrypt_enabled'] = False;
 		$GLOBALS['egw_info']['server']['versions']['mcrypt'] = '';
@@ -228,15 +227,6 @@ class setup_header
 		return $iv;
 	}
 
-	/**
-	 * checks if a named extension is loaded or loadable
-	 */
-	function check_load_extension($extension)
-	{
-		return extension_loaded($extension) ||
-			function_exists('dl') && @dl(PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
-	}
-
 	function check_db_support(&$detected)
 	{
 		$supported_db = $detected = array();
@@ -254,7 +244,7 @@ class setup_header
 			$ext = array_shift($data);
 			$func_to_check = array_shift($data);
 			$name = isset($this->db_fullnames[$db]) ? $this->db_fullnames[$db] : strtoupper($db);
-			if ($this->check_load_extension($ext) || $func_to_check && function_exists($func_to_check))
+			if (check_load_extension($ext) || $func_to_check && function_exists($func_to_check))
 			{
 				$detected[] = lang('You appear to have %1 support.',$name);
 				$supported_db = array_merge($supported_db,$data);

From 8a144dec62c15a6a025a0ce54fa71ac372fc1a03 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 20 Apr 2009 14:06:13 +0000
Subject: [PATCH 216/510] handling unset/uninitalized selectcols

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

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index e626be33b5..b03ce95fe1 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -606,7 +606,7 @@ class timesheet_ui extends timesheet_bo
 		if (!$have_cats || $query['cat_id']) $rows['no_cat_id'] = true;
 		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
 		$rows['no_owner_col'] = $query['no_owner_col'];
-		if (!$rows['no_owner_col'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
+		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
 		if ($query['filter'])
 		{
 			$rows += $this->summary;
@@ -616,9 +616,9 @@ class timesheet_ui extends timesheet_bo
 		if (!$rows['ts_viewtype']) {
 			#_debug_array($query['selectcols']);
 			#ts_quantity,ts_unitprice,ts_total
-			if (strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
-			if (strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
-			if (strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
 		}
 		$rows['no_ts_status'] = $query['no_status'];
 		return $total;
@@ -697,7 +697,7 @@ class timesheet_ui extends timesheet_bo
 		}
 		$read_grants = $this->grant_list(EGW_ACL_READ);
 		$content['nm']['no_owner_col'] = count($read_grants) == 1;
-
+		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows']) $content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
 		$sel_options = array(
 		'ts_owner'   => $read_grants,
 		'pm_id'      => array(lang('No project')),

From 2d438c6dc54f030689528c62af04019b05823cf8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 20 Apr 2009 14:33:31 +0000
Subject: [PATCH 217/510] Caching provider for memcached using PHP's memcache
 extension

---
 phpgwapi/inc/class.egw_cache.inc.php          |   2 +-
 phpgwapi/inc/class.egw_cache_memcache.inc.php | 119 ++++++++++++++++++
 2 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 phpgwapi/inc/class.egw_cache_memcache.inc.php

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index 10e846b2cd..20ac7b6a87 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -68,7 +68,7 @@ class egw_cache
 	 *
 	 * @var array
 	 */
-	static $default_provider = array('egw_cache_files');// array('egw_cache_memcache','localhost',11211);
+	static $default_provider = array('egw_cache_files');// array('egw_cache_memcache','localhost');
 
 	/**
 	 * Set some data in the cache
diff --git a/phpgwapi/inc/class.egw_cache_memcache.inc.php b/phpgwapi/inc/class.egw_cache_memcache.inc.php
new file mode 100644
index 0000000000..9e5a3979b5
--- /dev/null
+++ b/phpgwapi/inc/class.egw_cache_memcache.inc.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * eGroupWare API: Caching provider storing data in memcached via PHP's memcache extension
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage cache
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @version $Id$
+ */
+
+/**
+ * Caching provider storing data in memcached via PHP's memcache extension
+ *
+ * The provider concats all $keys with '::' to get a single string.
+ *
+ * To use this provider set in your header.inc.php:
+ * $GLOBALS['egw_info']['server']['cache_provider_instance'] = array('egw_cache_memcache','localhost'[,'otherhost:port']);
+ * and optional also $GLOBALS['egw_info']['server']['cache_provider_tree'] (defaults to instance)
+ *
+ * You can set more then one server and specify a port, if it's not the default one 11211.
+ */
+class egw_cache_memcache implements egw_cache_provider
+{
+	/**
+	 * Instance of Memcache
+	 *
+	 * @var Memcache
+	 */
+	private $memcache;
+
+	/**
+	 * Flags used to store content
+	 *
+	 */
+	const STORE_FLAGS = MEMCACHE_COMPRESSED;
+
+	/**
+	 * Constructor, eg. opens the connection to the backend
+	 *
+	 * @throws Exception if connection to backend could not be established
+	 * @param array $params eg. array('localhost'[,'localhost:11211',...])
+	 */
+	function __construct(array $params)
+	{
+		check_load_extension('memcache',true);
+		$this->memcache = new Memcache();
+
+		if (!$params) $params = array('localhost');	// some reasonable default
+
+		$ok = false;
+		foreach($params as $host_port)
+		{
+			list($host,$port) = explode(':',$host_port);
+			if (!$port) $port = 11211;	// default port
+
+			$ok = $this->memcache->addServer($host,$port) || $ok;
+			//error_log(__METHOD__."(".array2string($params).") memcache->addServer('$host',$port) = ".(int)$ok);
+		}
+		if (!$ok)
+		{
+			throw new Exception (__METHOD__.'('.array2string($params).") Can't open connection to any memcached server!");
+		}
+	}
+
+	/**
+	 * Stores some data in the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @param mixed $data
+	 * @param int $expiration=0
+	 * @return boolean true on success, false on error
+	 */
+	function set(array $keys,$data,$expiration=0)
+	{
+		return $this->memcache->set(self::key($keys),serialize($data),self::STORE_FLAGS,$expiration);
+	}
+
+	/**
+	 * Get some data from the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @return mixed data stored or NULL if not found in cache
+	 */
+	function get(array $keys)
+	{
+		if (($data = $this->memcache->get($key=self::key($keys))) === false)
+		{
+			//error_log(__METHOD__."(".array2string($keys).") key='$key' NOT found!");
+			return null;
+		}
+		//error_log(__METHOD__."(".array2string($keys).") key='$key' found ".bytes($data)." bytes).");
+		return unserialize($data);
+	}
+
+	/**
+	 * Delete some data from the cache
+	 *
+	 * @param array $keys eg. array($level,$app,$location)
+	 * @return boolean true on success, false on error (eg. $key not set)
+	 */
+	function delete(array $keys)
+	{
+		return $this->memcache->delete(self::key($keys));
+	}
+
+	/**
+	 * Create a single key from $keys
+	 *
+	 * @param array $keys
+	 * @return string
+	 */
+	private function key(array $keys)
+	{
+		return implode('::',$keys);
+	}
+}

From 9e3c1df37a08fb8854555624f3cc8a29c972a6d2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 20 Apr 2009 15:44:24 +0000
Subject: [PATCH 218/510] "bugfixes for sidebox menu under prefs or admin: - do
 NOT process the $_REQUEST vars - if user changes selectboxes, go to default
 calendar view"

---
 calendar/inc/class.calendar_ui.inc.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index f24d3f2d03..21908ee525 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2004-8 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2004-9 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -119,7 +119,7 @@ class calendar_ui
 	 * @var int $last last day of the shown view
 	 */
 	var $last;
-	
+
 	/**
 	 * @var array $states_to_save all states that will be saved to the user prefs
 	 */
@@ -252,16 +252,16 @@ class calendar_ui
 	function manage_states($set_states=NULL)
 	{
 		$states = $states_session = $GLOBALS['egw']->session->appsession('session_data','calendar');
-		
+
 		// retrieve saved states from prefs
 		if(!$states)
 		{
-			$states = unserialize($this->bo->cal_prefs['saved_states']);		
+			$states = unserialize($this->bo->cal_prefs['saved_states']);
 		}
-
+		// only look at _REQUEST, if we are in the calendar (prefs and admin show our sidebox menu too!)
 		if (is_null($set_states))
 		{
-			$set_states = $_REQUEST;
+			$set_states = substr($_GET['menuaction'],0,9) == 'calendar.' ? $_REQUEST : array();
 		}
 		if (!$states['date'] && $states['year'] && $states['month'] && $states['day'])
 		{
@@ -336,7 +336,7 @@ class calendar_ui
 			$states['view'] = $this->view = 'planner';
 		}
 		// set the actual view as return_to
-		if ($_GET['menuaction'] && $_GET['menuaction'])
+		if (isset($_GET['menuaction']))
 		{
 			list($app,$class,$func) = explode('.',$_GET['menuaction']);
 			if ($func == 'index')
@@ -455,7 +455,7 @@ class calendar_ui
 	{
 		if ($baseurl)	// we append the value to the baseurl
 		{
-			$baseurl .= strpos($baseurl,'?') === False ? '?' : '&';
+			if (substr($baseurl,-1) != '=') $baseurl .= strpos($baseurl,'?') === False ? '?' : '&';
 			$onchange="location='$baseurl'+this.value;";
 		}
 		else			// we add $name=value to the actual location
@@ -681,15 +681,21 @@ class calendar_ui
 			$link['week'],lang('show this week'),$link['month'],lang('show this month'));
 		$file[++$n] = array('text' => $jscalendar,'no_lang' => True,'link' => False,'icon' => False);
 
+		// set a baseurl for selectboxes, if we are not running inside calendar (eg. prefs or admin)
+		if (substr($_GET['menuaction'],0,9) != 'calendar.')
+		{
+			$baseurl = egw::link('/index.php',array('menuaction'=>'calendar.calendar_uiviews.index'));
+		}
 		// Category Selection
 		$file[++$n] = $this->_select_box('Category','cat_id',
 			'<option value="0">'.lang('All categories').'</option>'.
-		$this->cats->formatted_list('select','all',$this->cat_id,'True'));
+		$this->cats->formatted_list('select','all',$this->cat_id,'True'),$baseurl ? $baseurl.'&cat_id=' : '');
 
 		// Filter all or hideprivate
 		$file[] = $this->_select_box('Filter','filter',
 			'<option value="all"'.($this->filter=='all'?' selected="selected"':'').'>'.lang('No filter').'</option>'."\n".
-			'<option value="hideprivate"'.($this->filter=='hideprivate'?' selected="selected"':'').'>'.lang('Hide private infos').'</option>'."\n");
+			'<option value="hideprivate"'.($this->filter=='hideprivate'?' selected="selected"':'').'>'.lang('Hide private infos').'</option>'."\n",
+			$baseurl ? $baseurl.'&filter=' : '');
 
 		// Calendarselection: User or Group
 		if(count($this->bo->grants) > 0 && $this->accountsel->account_selection != 'none')

From 3da870320292af42c3402d33cccddce8a771c570 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 21 Apr 2009 05:20:04 +0000
Subject: [PATCH 219/510] "fix for bug #2049: PHP Extention error since last
 SVC update..."

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

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 07008b6f88..c2b59a1f9b 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -60,7 +60,7 @@ function array2string($var)
 }
 
 /**
- * Check if a given extension is loaded or load it if possible (requires sometimes disabled dl function)
+ * Check if a given extension is loaded or load it if possible (requires sometimes disabled or unavailable dl function)
  *
  * @param string $extension
  * @param boolean $throw=false should we throw an exception, if $extension could not be loaded, default false = no
@@ -72,11 +72,12 @@ function check_load_extension($extension,$throw=false)
 	{
 		define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
 	}
+	// we check for the existens of 'dl', as multithreaded webservers dont have it and some hosters disable it !!!
 	$loaded = extension_loaded($extension) || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
 
-	if (!($loaded))
+	if (!$loaded && $throw)
 	{
-		throw new Exception ("PHP extension '$ext' not loaded AND can NOT be loaded via dl('$dl')!");
+		throw new Exception ("PHP extension '$extension' not loaded AND can NOT be loaded via dl('$dl')!");
 	}
 	return $loaded;
 }

From a45c874f720c493457f3dc4d35498ed9bc7b16a7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 21 Apr 2009 13:26:40 +0000
Subject: [PATCH 220/510] "added explicit init(false) calls for methods called
 by setup (they dont call init() as eGW does)"

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index addb57c360..054301e8f5 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -330,6 +330,8 @@ class translation
 	{
 		if (!is_array(self::$langs) || $force_read)
 		{
+			if (is_null(self::$db)) self::init(false);
+
 			self::$langs = array();
 			foreach(self::$db->select(self::LANG_TABLE,'DISTINCT lang,lang_name','lang = lang_id',__LINE__,__FILE__,
 				false,'',false,0,','.self::LANGUAGES_TABLE) as $row)
@@ -548,10 +550,8 @@ class translation
 	 */
 	static function install_langs($langs,$upgrademethod='dumpold',$only_app=False)
 	{
-		if (is_null(self::$db))
-		{
-			self::init(false);
-		}
+		if (is_null(self::$db)) self::init(false);
+
 		@set_time_limit(0);	// we might need some time
 		//echo "<p>translation_sql::install_langs(".print_r($langs,true).",'$upgrademthod','$only_app')</p>\n";
 		if (!isset($GLOBALS['egw_info']['server']) && $upgrademethod != 'dumpold')
@@ -796,6 +796,8 @@ class translation
 		{
 			echo '<br>drop_langs(): Working on: ' . $appname;
 		}
+		if (is_null(self::$db)) self::init(false);
+
 		if (self::$db->select(self::LANG_TABLE,'COUNT(*)',array(
 			'app_name' => $appname
 		),__LINE__,__FILE__)->fetchColumn())

From 86b126ef3a9622e894bc3a1d5465bf32c1099f7b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 22 Apr 2009 04:33:12 +0000
Subject: [PATCH 221/510] "quietent \"Warning: mb_convert_encoding()
 [function.mb-convert-encoding]: Illegal character encoding\" reported on the
 devel list"

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 054301e8f5..8d802ccd83 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -493,7 +493,7 @@ class translation
 		{
 			return utf8_decode($data);
 		}
-		if (self::$mbstring && ($data = mb_convert_encoding($data,$to,$from)) != '')
+		if (self::$mbstring && ($data = @mb_convert_encoding($data,$to,$from)) != '')
 		{
 			return $data;
 		}

From e6762bf009fe386620f636ef73ad629b9a9b4c4f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 22 Apr 2009 05:52:07 +0000
Subject: [PATCH 222/510] "fixed last commit r26803  \"allow to specify app in
 image name\": thumbnails or other direct url's as image in buttons were no
 longer displayed"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 652e1d2c4e..83e579004c 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1246,7 +1246,10 @@ class etemplate extends boetemplate
 			case 'cancel':	// cancel button
 				list($app) = explode('.',$this->name);
 				list($img,$ro_img) = explode(',',$cell_options);
-				if (strpos($img,'/') !== false) list($app,$img) = explode('/',$img,2);	// allow to specify app in image name
+				if ($img[0] != '/' && strpos($img,'/') !== false && count($img_parts = explode('/',$img)) == 2)
+				{
+					list($app,$img) = $img_parts;	// allow to specify app in image name (eg. img='addressbook/navbar')
+				}
 				$title = strlen($label) <= 1 || $cell['no_lang'] ? $label : lang($label);
 				if ($cell['onclick'] &&
 					($onclick = $this->expand_name($cell['onclick'],$show_c,$show_row,$content['.c'],$content['.row'],$content)))

From 660ab416613809aca5c8906969ec7907e0c92950 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 22 Apr 2009 10:02:18 +0000
Subject: [PATCH 223/510] "- egw_vfs::check_access() using resolved symlink to
 call check_extended_acl on backend - mime_magic"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 6c1eb45dc3..81ee14a484 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -686,7 +686,7 @@ class egw_vfs extends vfs_stream_wrapper
 			}
 		}
 		// check backend for extended acls (only if path given)
-		$ret = $path && self::_call_on_backend('check_extended_acl',array($path,$check),true);	// true = fail silent if backend does not support
+		$ret = $path && self::_call_on_backend('check_extended_acl',array(isset($stat['url'])?$stat['url']:$path,$check),true);	// true = fail silent if backend does not support
 
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) ".($ret ? 'backend extended acl granted access.' : 'no access!!!'));
 		return $ret;
@@ -949,7 +949,7 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			return 'etemplate/'.$icon;
 		}
-		return html::image('etemplate',$icon,lang($mime_type));
+		return html::image('etemplate',$icon,mime_magic::mime2label($mime_type));
 	}
 
 	/**

From 561f5e5aac6fe3c72a23121219a5996a4b2f766b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 22 Apr 2009 10:35:31 +0000
Subject: [PATCH 224/510] needed for check_load_extension (session-handler gets
 included before regular include via the header.inc.php)

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

diff --git a/phpgwapi/inc/class.egw_session_memcache.inc.php b/phpgwapi/inc/class.egw_session_memcache.inc.php
index f064d0acd6..2cd4151083 100644
--- a/phpgwapi/inc/class.egw_session_memcache.inc.php
+++ b/phpgwapi/inc/class.egw_session_memcache.inc.php
@@ -25,6 +25,9 @@
  * @version $Id$
  */
 
+// needed for check_load_extension (session-handler gets included before regular include via the header.inc.php)
+require_once(EGW_API_INC.'/common_functions.inc.php');
+
 /**
  * File based php sessions or all other build in handlers configures via session_module_name() or php.ini: session.save_handler
  *
@@ -282,4 +285,4 @@ function init_session_handler()
 		array($ses,'gc'));
 	if (!$ret) error_log(__METHOD__.'() session_set_save_handler(...)='.(int)$ret.', session_module_name()='.session_module_name().' *******************************');
 }
-init_session_handler();
\ No newline at end of file
+init_session_handler();

From d4f228cdfb3e759353a687cfe0b77030a9454322 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 23 Apr 2009 06:05:48 +0000
Subject: [PATCH 225/510] "handling if user clicks on a link in filemanager -
 reset lettersearch as it confuses users (they think the dir is empty) -
 switch recusive display off "

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

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index ae6568adb2..ce424b0c4a 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -110,6 +110,10 @@ class filemanager_ui
 				{
 					$msg .= lang('The requested path %1 is not available.',$path);
 				}
+				// reset lettersearch as it confuses users (they think the dir is empty)
+				$content['nm']['searchletter'] = false;
+				// switch recusive display off
+				if (!$content['nm']['filter']) $content['nm']['filter'] = '1';
 			}
 		}
 		// check if we have a failed upload AND upload_max_filesize >= post_max_size --> no $_POST array

From defe88e0cf738974f8cb51b5a658255a3c5f66e7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 23 Apr 2009 06:24:58 +0000
Subject: [PATCH 226/510] "fixed not / only partialy working lettersearch in
 Admin >> Manage groups"

---
 phpgwapi/inc/class.accounts_ldap.inc.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index cb8c1d6f67..796acf9174 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -716,9 +716,12 @@ class accounts_ldap
 				// if we do not have a start, or want the members of a certain group, we want all, that way we dont want to or the uids
 				// since if we have a whole lot of members, it slows the query down
 				// if you work with very big groups, it may present a problem
-				if (is_numeric($start) || is_numeric($param['type'])) {
+				if (is_numeric($start) || is_numeric($param['type']))
+				{
 					$filter = "(" . "&(objectclass=posixaccount)" . '(|(uid='.implode(')(uid=',$relevantAccounts).'))' . $this->account_filter . ")";
-				} else {
+				}
+				else
+				{
 					$filter = "(" . "&(objectclass=posixaccount)" . $this->account_filter . ")";
 				}
 
@@ -759,7 +762,19 @@ class accounts_ldap
 				}
 				else
 				{
-					$filter = "(&(objectclass=posixgroup)(cn=*$query*))";
+					switch($param['query_type'])
+					{
+						case 'all':
+						default:
+							$query = '*'.$query;
+							// fall-through
+						case 'start':
+							$query .= '*';
+							// fall-through
+						case 'exact':
+							break;
+					}
+					$filter = "(&(objectclass=posixgroup)(cn=$query))";
 				}
 				$sri = ldap_search($this->ds, $this->group_context, $filter,array('cn','gidNumber'));
 				$allValues = ldap_get_entries($this->ds, $sri);

From affce3e5bcc5d7a61e49ef395a2dd471f1914cc2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 23 Apr 2009 08:38:20 +0000
Subject: [PATCH 227/510] update to work with "new" translation class: class
 constants and static calls

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

diff --git a/etemplate/inc/class.solangfile.inc.php b/etemplate/inc/class.solangfile.inc.php
index 4ba5583f0d..d67f59bbdb 100644
--- a/etemplate/inc/class.solangfile.inc.php
+++ b/etemplate/inc/class.solangfile.inc.php
@@ -254,7 +254,7 @@ class solangfile
 
 		$langarray = array();
 		$fd = EGW_SERVER_ROOT . SEP . $app . SEP . ($app == 'setup' ? 'lang' : 'setup');
-		$fn = $fd . SEP . EGW_LANGFILE_PREFIX . $userlang . '.lang';
+		$fn = $fd . SEP . translation::LANGFILE_PREFIX . $userlang . '.lang';
 
 		if (@is_writeable($fn) || is_writeable($fd))
 		{
@@ -262,8 +262,8 @@ class solangfile
 		}
 		if (!$target) $this->src_apps = array();
 
-		$from = $GLOBALS['egw']->translation->charset($userlang);
-		$to = $GLOBALS['egw']->translation->charset();
+		$from = translation::charset($userlang);
+		$to = translation::charset();
 		//echo "<p>solangfile::load_app('$app','$userlang') converting from charset('$userlang')='$from' to '$to'</p>\n";
 
 		if (file_exists($fn))
@@ -291,7 +291,7 @@ class solangfile
 						$this->src_apps[$app_name] = $app_name;
 					}
 					$langarray[$_mess_id]['content']    =
-						$GLOBALS['egw']->translation->convert(trim($content),$from,$to);
+						translation::convert(trim($content),$from,$to);
 				 }
 				 fclose($fp);
 			}
@@ -321,11 +321,11 @@ class solangfile
 
 	function write_file($app_name,$langarray,$userlang,$which='target')
 	{
-		$to = $GLOBALS['egw']->translation->charset($userlang);
-		$from = $GLOBALS['egw']->translation->charset();
+		$to = translation::charset($userlang);
+		$from = translation::charset();
 		//echo "<p>solangfile::write_file('$app_name',,'$userlang') converting from '$from' to charset('$userlang')='$to'</p>\n";
 
-		$fn = EGW_SERVER_ROOT . SEP . $app_name . SEP . ($app_name == 'setup' ? 'lang' : 'setup') . SEP . EGW_LANGFILE_PREFIX . $userlang . '.lang';
+		$fn = EGW_SERVER_ROOT . SEP . $app_name . SEP . ($app_name == 'setup' ? 'lang' : 'setup') . SEP . translation::LANGFILE_PREFIX . $userlang . '.lang';
 		if (file_exists($fn))
 		{
 			$backup = $fn . '.old';
@@ -335,7 +335,7 @@ class solangfile
 		$fp = fopen($fn,'wb');
 		while(list($mess_id,$data) = @each($langarray))
 		{
-			$data['content'] = $GLOBALS['egw']->translation->convert(trim($data['content']),$from,$to);
+			$data['content'] = translation::convert(trim($data['content']),$from,$to);
 
 			// dont write empty content
 			if (!empty($data['content']))
@@ -362,7 +362,7 @@ class solangfile
 		{
 			$userlangs = array($userslangs => $userlangs);
 		}
-		$GLOBALS['egw']->translation->install_langs($userlangs,'addmissing',$app_name);
+		translation::install_langs($userlangs,'addmissing',$app_name);
 
 		return lang('done');
 	}

From 94190a81f7bce516c39a1a92df98fc658c6192e2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 23 Apr 2009 09:47:22 +0000
Subject: [PATCH 228/510] "also cache the languages"

---
 phpgwapi/inc/class.translation.inc.php | 44 ++++++++++++++++++++------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 8d802ccd83..32e04d931b 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -242,7 +242,7 @@ class translation
 		if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang)
 		{
 			//$start = microtime(true);
-			$loaded =& egw_cache::getTree(__CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang));
+			$loaded =& egw_cache::getTree(__CLASS__,$app.':'.$lang,__CLASS__.'::load_app',array($app,$lang));
 
 			self::$lang_arr = self::$lang_arr ? array_merge(self::$lang_arr,$loaded) : $loaded;
 			self::$loaded_apps[$app] = $lang;
@@ -287,7 +287,7 @@ class translation
 	 * @param string $lang 2 or 5 char lang-code
 	 * @return array with loaded phrases
 	 */
-	protected static function &load_setup($lang)
+	static protected function &load_setup($lang)
 	{
 		foreach(array(
 			EGW_SERVER_ROOT.'/setup/lang/' . self::LANGFILE_PREFIX . $lang . '.lang',
@@ -332,12 +332,9 @@ class translation
 		{
 			if (is_null(self::$db)) self::init(false);
 
-			self::$langs = array();
-			foreach(self::$db->select(self::LANG_TABLE,'DISTINCT lang,lang_name','lang = lang_id',__LINE__,__FILE__,
-				false,'',false,0,','.self::LANGUAGES_TABLE) as $row)
-			{
-				self::$langs[$row['lang']] = $row['lang_name'];
-			}
+			// we only cache the translation installed for the instance, not the return of this method, which is user-language dependent
+			self::$langs = egw_cache::getInstance(__CLASS__,'installed_langs',__CLASS__.'::read_installed_langs');
+
 			if (!self::$langs)
 			{
 				return false;
@@ -351,6 +348,24 @@ class translation
 		return self::$langs;
 	}
 
+	/**
+	 * Read the installed languages from the db
+	 *
+	 * Never use directly, use get_installed_langs(), which employes caching (it has to be public, to act as callback for the cache!).
+	 *
+	 * @return array
+	 */
+	static function &read_installed_langs()
+	{
+		$langs = array();
+		foreach(self::$db->select(self::LANG_TABLE,'DISTINCT lang,lang_name','lang = lang_id',__LINE__,__FILE__,
+			false,'',false,0,','.self::LANGUAGES_TABLE) as $row)
+		{
+			$langs[$row['lang']] = $row['lang_name'];
+		}
+		return $langs;
+	}
+
 	/**
 	 * translates a 2 or 5 char lang-code into a (verbose) language
 	 *
@@ -367,12 +382,17 @@ class translation
 	}
 
 	/**
-	 * List all languages, first the installed ones, then the availible ones and last the rest
+	 * List all languages, first the installed ones, then the available ones and last the rest
 	 *
+	 * @param boolean $force_read=false
 	 * @return array with lang_id => lang_name pairs
 	 */
-	static function list_langs()
+	static function list_langs($force_read=false)
 	{
+		if (!$force_read)
+		{
+			return egw_cache::getInstance(__CLASS__,'list_langs',__METHOD__,array(true));
+		}
 		$languages = self::get_installed_langs();	// used translated installed languages
 
 		$availible = array();
@@ -714,6 +734,10 @@ class translation
 				}
 			}
 		}
+		// delete the cache
+		egw_cache::unsetInstance(__CLASS__,'installed_langs');
+		egw_cache::unsetInstance(__CLASS__,'list_langs');
+
 		self::$db->transaction_commit();
 
 		// update the ctimes of the installed langsfiles for the autoloading of the lang-files

From 4245df1f299fd694a4d0424bd757fee4b58ac33a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 23 Apr 2009 09:48:03 +0000
Subject: [PATCH 229/510] "only check callback, if defined"

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

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index 20ac7b6a87..53389a8c9e 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -125,7 +125,7 @@ class egw_cache
 					return null;
 				}
 				$data = $provider->get($keys=self::keys($level,$app,$location));
-				if (is_null($data))
+				if (is_null($data) && !is_null($callback))
 				{
 					//error_log(__METHOD__."($level,$app,$location,".array2string($callback).','.array2string($callback_params).",$expiration) calling calback to create data.");
 					$data = call_user_func_array($callback,$callback_params);

From 9aed38299f1d41913dda32c843fe37d2296fd886 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 23 Apr 2009 11:18:51 +0000
Subject: [PATCH 230/510] "fixed fatal error: creating custom fields delete
 application config: caused by a missing config::read_repository() before
 calling config::save_repository(), which then only stores the custom fields,
 but not the rest of the config"

---
 admin/inc/class.customfields.inc.php | 680 +++++++++++++--------------
 1 file changed, 339 insertions(+), 341 deletions(-)

diff --git a/admin/inc/class.customfields.inc.php b/admin/inc/class.customfields.inc.php
index 03ea52277e..4eb1594743 100644
--- a/admin/inc/class.customfields.inc.php
+++ b/admin/inc/class.customfields.inc.php
@@ -1,381 +1,379 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - admin: Custom fields                                        *
-	* http://www.egroupware.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.                                              *
-	\**************************************************************************/
+/**
+ * eGgroupWare admin - UI for adding custom fields
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Cornelius Weiss <nelius-AT-von-und-zu-weiss.de>
+ * @package admin
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
+/**
+* Custiomfields class -  manages customfield definitions in egw_config table
+*
+* The repository name (config_name) is 'customfields'.
+*/
+class customfields
+{
 
 	/**
-	* Custiomfields class -  manages customfield definitions in egw_config table
+	* appname of app which want to add / edit its customfields
 	*
-	* The repository name (config_name) is 'customfields'.
-	*
-	* @license GPL
-	* @author Ralf Becker <ralfbecker-AT-outdoor-training.de>
-	* @author Cornelius Weiss <nelius-AT-von-und-zu-weiss.de>
-	* @package admin
+	* @var string
 	*/
-	class customfields
+	var $appname;
+
+	/**
+	* userdefiened types e.g. type of infolog
+	*
+	* @var array
+	*/
+	var $types2 = array();
+	var $content_types,$fields;
+
+	var $public_functions = array(
+		'edit' => True
+	);
+	/**
+	 * Instance of etemplate class
+	 *
+	 * @var etemplate
+	 */
+	var $tmpl;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $appname
+	 */
+	function __construct($appname='')
 	{
-	
-		/**
-		* appname of app which want to add / edit its customfields
-		* 
-		* @var string
-		*/
-		var $appname;
-		
-		/**
-		* userdefiened types e.g. type of infolog
-		* 
-		* @var array
-		*/
-		var $types2 = array();
-		var $content_types,$fields;
-		
-		var $public_functions = array(
-			'edit' => True
-		);
-		/**
-		 * Instance of the config class for the instancated applications
-		 *
-		 * @var config
-		 */
-		var $config;
-
-		function customfields($appname='')
+		if (($this->appname = $appname))
 		{
-			$this->config =& new config($this->appname=$appname);
+			$this->fields = config::get_customfields($this->appname,true);
+			$this->content_types = config::get_content_types($this->appname);
+		}
+	}
 
-			if ($appname)
-			{
-				$this->fields = $this->get_customfields(true);
-				$this->content_types = $this->get_content_types();
-			}
+	/**
+	 * Edit/Create Custom fields with type
+	 *
+	 * @author Ralf Becker <ralfbecker-AT-outdoor-training.de>
+	 * @param array $content Content from the eTemplate Exec
+	 */
+	function edit($content = null)
+	{
+		$GLOBALS['egw']->translation->add_app('infolog');       // til we move the translations
+
+		// determine appname
+		$this->appname = $_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false);
+		if(!$this->appname) die(lang('Error! No appname found'));
+
+		$GLOBALS['egw']->translation->add_app('infolog');	// til we move the translations
+		$this->tmpl = new etemplate();
+		// do we manage content-types?
+		if($this->tmpl->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+
+		$this->fields = config::get_customfields($this->appname,true);
+		$this->tmpl->read('admin.customfields');
+
+		if($this->manage_content_types) $this->content_types = $this->get_content_types();
+		else
+		{
+			$this->tmpl->children[0]['data'][2]['A']['disabled'] = true;
+			$this->tmpl->children[0]['data'][3]['A']['disabled'] = true;
 		}
 
-		/**
-		 * Edit/Create Custom fields with type
-		 *
-		 * @author Ralf Becker <ralfbecker-AT-outdoor-training.de>
-		 * @param array $content Content from the eTemplate Exec
-		 */
-		function edit($content = null)
+		if (is_array($content))
 		{
-			$GLOBALS['egw']->translation->add_app('infolog');       // til we move the translations
-
-			// determine appname
-			$this->appname = $_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false);
-			if(!$this->appname) die(lang('Error! No appname found'));
-			
-			$GLOBALS['egw']->translation->add_app('infolog');	// til we move the translations
-			$this->tmpl =& CreateObject('etemplate.etemplate');
-			$this->config =& CreateObject('phpgwapi.config',$this->appname);
-			// do we manage content-types?
-			if($this->tmpl->read($this->appname.'.admin.types')) $this->manage_content_types = true;
-			
-			$this->fields = $this->get_customfields(true);
-			$this->tmpl->read('admin.customfields');
-			
-			if($this->manage_content_types) $this->content_types = $this->get_content_types();
-			else
-			{
-				$this->tmpl->children[0]['data'][2]['A']['disabled'] = true;
-				$this->tmpl->children[0]['data'][3]['A']['disabled'] = true;
-			}
-			
-			if (is_array($content))
-			{
-				//echo '<pre style="text-align: left;">'; print_r($content); echo "</pre>\n";
-				if($this->manage_content_types)
-				{
-					$this->content_type = $content['content_types']['types'];
-				}
-
-				if($content['content_types']['delete']) $this->delete_content_type($content);
-				elseif($content['content_types']['create']) $this->create_content_type($content);
-				elseif($content['fields']['delete']) $this->delete_field($content);
-				elseif($content['fields']['create']) $this->create_field($content);
-				else
-				{
-					list($action) = @each($content['button']);
-					switch($action)
-					{
-						default:
-							if (!$content['fields']['create'] && !$content['fields']['delete'])
-							{
-								break;	// type change
-							}
-						case 'save':
-						case 'apply':
-							$this->update($content);
-							if ($action != 'save')
-							{
-								break;
-							}
-						case 'cancel':
-							$GLOBALS['egw']->redirect_link($content['referer'] ? $content['referer'] : '/admin/index.php');
-							exit;
-					}
-				}
-				$referer = $content['referer'];
-			}
-			else
-			{
-				if($this->manage_content_types)
-				{
-					$content_types = array_keys($this->content_types);
-					$this->content_type = $content_types[0];
-				}
-				$content['use_private'] = (boolean)$_GET['use_private'];
-
-				$referer = $GLOBALS['egw']->common->get_referer();
-			}
-			$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
-			$readonlys = array();
-			
+			//echo '<pre style="text-align: left;">'; print_r($content); echo "</pre>\n";
 			if($this->manage_content_types)
 			{
-				$content['content_types']['app-name'] = $this->appname;
-				foreach($this->content_types as $type => $entry)
-				{
-					$this->types2[$type] = $entry['name'];
-				}
-				$content['content_types']['options-types'] = $this->types2;
-				$this->tmpl->children[0]['data'][3]['A']['name'] = $this->appname.'.admin.types';
-				$this->tmpl->children[0]['data'][3]['A']['size'] = 'content_type_options';
-				$content['content_type_options'] = $this->content_types[$this->content_type]['options'];
-				$content['content_type_options']['type'] = $this->content_types[$this->content_type]['name'];
-				if ($this->content_types[$this->content_type]['non_deletable'])
-				{
-					$content['content_types']['non_deletable'] = true;
-				}
+				$this->content_type = $content['content_types']['types'];
 			}
-			
-			//echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n";
-			$content['fields'] = array('use_private' => $content['use_private']);
-			$n = 0;
-			foreach($this->fields as $name => $data)
-			{
-				if(!is_array($data))
-				{
-					$data = array();
-					$data['label'] = $name;
-					$data['order'] = ($n+1) * 10;
-				}
-				if (is_array($data['values']))
-				{
-					$values = '';
-					foreach($data['values'] as $var => $value)
-					{
-						$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
-					}
-					$data['values'] = $values;
-				}
-				$content['fields'][++$n] = (array)$data + array(
-					'name'   => $name
-				);
-				$preserv_fields[$n]['old_name'] = $name;
-				$readonlys['fields']["create$name"] = True;
-			}
-			$content['fields'][++$n] = array('name'=>'','order' => 10 * $n);	// new line for create
-			if($this->manage_content_types) $content['fields']['type2'] = 'enable';
 
-			$readonlys['fields']["delete[]"] = True;
-			//echo '<p>uicustomfields.edit(content = <pre style="text-align: left;">'; print_r($content); echo "</pre>\n";
-			//echo 'readonlys = <pre style="text-align: left;">'; print_r($readonlys); echo "</pre>\n";
-			$sel_options = array(
-				'type2' => $this->types2 + array('tmpl' => 'template'),
-			);
-			$this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array(
-				'fields' => $preserv_fields,
-				'appname' => $this->appname,
-				'referer' => $referer,
-				'use_private' => $content['use_private'],
-			));
+			if($content['content_types']['delete']) $this->delete_content_type($content);
+			elseif($content['content_types']['create']) $this->create_content_type($content);
+			elseif($content['fields']['delete']) $this->delete_field($content);
+			elseif($content['fields']['create']) $this->create_field($content);
+			else
+			{
+				list($action) = @each($content['button']);
+				switch($action)
+				{
+					default:
+						if (!$content['fields']['create'] && !$content['fields']['delete'])
+						{
+							break;	// type change
+						}
+					case 'save':
+					case 'apply':
+						$this->update($content);
+						if ($action != 'save')
+						{
+							break;
+						}
+					case 'cancel':
+						$GLOBALS['egw']->redirect_link($content['referer'] ? $content['referer'] : '/admin/index.php');
+						exit;
+				}
+			}
+			$referer = $content['referer'];
+		}
+		else
+		{
+			if($this->manage_content_types)
+			{
+				$content_types = array_keys($this->content_types);
+				$this->content_type = $content_types[0];
+			}
+			$content['use_private'] = (boolean)$_GET['use_private'];
+
+			$referer = $GLOBALS['egw']->common->get_referer();
+		}
+		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
+		$readonlys = array();
+
+		if($this->manage_content_types)
+		{
+			$content['content_types']['app-name'] = $this->appname;
+			foreach($this->content_types as $type => $entry)
+			{
+				$this->types2[$type] = $entry['name'];
+			}
+			$content['content_types']['options-types'] = $this->types2;
+			$this->tmpl->children[0]['data'][3]['A']['name'] = $this->appname.'.admin.types';
+			$this->tmpl->children[0]['data'][3]['A']['size'] = 'content_type_options';
+			$content['content_type_options'] = $this->content_types[$this->content_type]['options'];
+			$content['content_type_options']['type'] = $this->content_types[$this->content_type]['name'];
+			if ($this->content_types[$this->content_type]['non_deletable'])
+			{
+				$content['content_types']['non_deletable'] = true;
+			}
 		}
 
-		function update_fields(&$content)
+		//echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n";
+		$content['fields'] = array('use_private' => $content['use_private']);
+		$n = 0;
+		foreach($this->fields as $name => $data)
 		{
-			foreach($content['fields'] as $field)
+			if(!is_array($data))
 			{
-				$name = trim($field['name']);
-				$old_name = $field['old_name'];
+				$data = array();
+				$data['label'] = $name;
+				$data['order'] = ($n+1) * 10;
+			}
+			if (is_array($data['values']))
+			{
+				$values = '';
+				foreach($data['values'] as $var => $value)
+				{
+					$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
+				}
+				$data['values'] = $values;
+			}
+			$content['fields'][++$n] = (array)$data + array(
+				'name'   => $name
+			);
+			$preserv_fields[$n]['old_name'] = $name;
+			$readonlys['fields']["create$name"] = True;
+		}
+		$content['fields'][++$n] = array('name'=>'','order' => 10 * $n);	// new line for create
+		if($this->manage_content_types) $content['fields']['type2'] = 'enable';
 
-				if (!empty($delete) && $delete == $old_name)
+		$readonlys['fields']["delete[]"] = True;
+		//echo '<p>uicustomfields.edit(content = <pre style="text-align: left;">'; print_r($content); echo "</pre>\n";
+		//echo 'readonlys = <pre style="text-align: left;">'; print_r($readonlys); echo "</pre>\n";
+		$sel_options = array(
+			'type2' => $this->types2 + array('tmpl' => 'template'),
+		);
+		$this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array(
+			'fields' => $preserv_fields,
+			'appname' => $this->appname,
+			'referer' => $referer,
+			'use_private' => $content['use_private'],
+		));
+	}
+
+	function update_fields(&$content)
+	{
+		foreach($content['fields'] as $field)
+		{
+			$name = trim($field['name']);
+			$old_name = $field['old_name'];
+
+			if (!empty($delete) && $delete == $old_name)
+			{
+				unset($this->fields[$old_name]);
+				continue;
+			}
+			if (isset($field['old_name']))
+			{
+				if (empty($name))	// empty name not allowed
+				{
+					$content['error_msg'] = lang('Name must not be empty !!!');
+					$name = $old_name;
+				}
+				if (!empty($name) && $old_name != $name)	// renamed
 				{
 					unset($this->fields[$old_name]);
-					continue;
-				}
-				if (isset($field['old_name']))
-				{
-					if (empty($name))	// empty name not allowed
-					{
-						$content['error_msg'] = lang('Name must not be empty !!!');
-						$name = $old_name;
-					}
-					if (!empty($name) && $old_name != $name)	// renamed
-					{
-						unset($this->fields[$old_name]);
-					}
-				}
-				elseif (empty($name))		// new item and empty ==> ignore it
-				{
-					continue;
-				}
-				$values = array();
-				if (!empty($field['values']))
-				{
-					foreach(explode("\n",$field['values']) as $line)
-					{
-						list($var,$value) = split('=',trim($line),2);
-						$var = trim($var);
-						$values[$var] = empty($value) ? $var : $value;
-					}
-				}
-				$this->fields[$name] = array(
-					'type'  => $field['type'],
-					'type2'	=> $field['type2'],
-					'label' => empty($field['label']) ? $name : $field['label'],
-					'help'  => $field['help'],
-					'values'=> $values,
-					'len'   => $field['len'],
-					'rows'  => (int)$field['rows'],
-					'order' => (int)$field['order'],
-					'private' => $field['private'],
-				);
-				if(!$this->fields[$name]['type2'] && $this->manage_content_types)
-				{
-					$this->fields[$name]['type2'] = (string)0;
 				}
 			}
-			if (!function_exists('sort_by_order'))
+			elseif (empty($name))		// new item and empty ==> ignore it
 			{
-				function sort_by_order($arr1,$arr2)
+				continue;
+			}
+			$values = array();
+			if (!empty($field['values']))
+			{
+				foreach(explode("\n",$field['values']) as $line)
 				{
-					return $arr1['order'] - $arr2['order'];
+					list($var,$value) = split('=',trim($line),2);
+					$var = trim($var);
+					$values[$var] = empty($value) ? $var : $value;
 				}
 			}
-			uasort($this->fields,sort_by_order);
-
-			$n = 0;
-			foreach($this->fields as $name => $data)
+			$this->fields[$name] = array(
+				'type'  => $field['type'],
+				'type2'	=> $field['type2'],
+				'label' => empty($field['label']) ? $name : $field['label'],
+				'help'  => $field['help'],
+				'values'=> $values,
+				'len'   => $field['len'],
+				'rows'  => (int)$field['rows'],
+				'order' => (int)$field['order'],
+				'private' => $field['private'],
+			);
+			if(!$this->fields[$name]['type2'] && $this->manage_content_types)
 			{
-				$this->fields[$name]['order'] = ($n += 10);
+				$this->fields[$name]['type2'] = (string)0;
 			}
 		}
-
-
-		function update(&$content)
+		if (!function_exists('sort_by_order'))
 		{
-			$this->update_fields($content);
-			$this->content_types[$this->content_type]['options'] = $content['content_type_options'];
-			// save changes to repository
-			$this->save_repository();
-		}
-
-		/**
-		* deletes custom field from customfield definitions
-		*/
-		function delete_field(&$content)
-		{
-			unset($this->fields[key($content['fields']['delete'])]);
-			// save changes to repository
-			$this->save_repository();
-		}
-		
-		function delete_content_type(&$content)
-		{
-			unset($this->content_types[$content['content_types']['types']]);
-			// save changes to repository
-			$this->save_repository();
-		}
-		
-		/**
-		* create a new custom field
-		*/
-		function create_field(&$content)
-		{
-			$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
-			if (empty($new_name) || isset($this->fields[$new_name]))
+			function sort_by_order($arr1,$arr2)
 			{
-				$content['error_msg'] .= empty($new_name) ?
-					lang('You have to enter a name, to create a new field!!!') :
-					lang("Field '%1' already exists !!!",$new_name);
-			}
-			else
-			{
-				$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-				if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
-				$this->save_repository();
-			}
-		}
-		
-		function create_content_type(&$content)
-		{
-			$new_name = trim($content['content_types']['name']);
-			if (empty($new_name) || isset($this->fields[$new_name]))
-			{
-				$content['error_msg'] .= empty($new_name) ?
-					lang('You have to enter a name, to create a new type!!!') :
-					lang("type '%1' already exists !!!",$new_name);
-			}
-			else
-			{
-				// search free type character
-				for($i=97;$i<=122;$i++)
-				{
-					if(!$this->content_types[chr($i)])
-					{
-						$new_type = chr($i);
-						break;
-					}
-				}
-				$this->content_types[$new_type] = array('name' => $new_name);
-				$this->save_repository();
+				return $arr1['order'] - $arr2['order'];
 			}
 		}
+		uasort($this->fields,sort_by_order);
 
-		/**
-		* save changes to repository
-		*/
-		function save_repository()
+		$n = 0;
+		foreach($this->fields as $name => $data)
 		{
-			//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
-			$this->config->value('customfields',$this->fields);
-			$this->config->value('types',$this->content_types);
-			$this->config->save_repository();
+			$this->fields[$name]['order'] = ($n += 10);
 		}
-		
-		/**
-		* get customfields of using application
-		*
-		* @deprecated use config::get_customfields() direct, no need to instanciate this UI class
-		* @author Cornelius Weiss
-		* @param boolean $all_private_too=false should all the private fields be returned too
-		* @return array with customfields
-		*/
-		function get_customfields($all_private_too=false)
-		{
-			return config::get_customfields($this->appname,$all_private_too);
-		}
-		
-		/**
-		* get_content_types of using application
-		*
-		* @deprecated use config::get_content_types() direct, no need to instanciate this UI class
-		* @author Cornelius Weiss
-		* @return array with content-types
-		*/
-		function get_content_types()
-		{
-			return config::get_content_types($this->appname);
-		}
-
 	}
+
+
+	function update(&$content)
+	{
+		$this->update_fields($content);
+		$this->content_types[$this->content_type]['options'] = $content['content_type_options'];
+		// save changes to repository
+		$this->save_repository();
+	}
+
+	/**
+	* deletes custom field from customfield definitions
+	*/
+	function delete_field(&$content)
+	{
+		unset($this->fields[key($content['fields']['delete'])]);
+		// save changes to repository
+		$this->save_repository();
+	}
+
+	function delete_content_type(&$content)
+	{
+		unset($this->content_types[$content['content_types']['types']]);
+		// save changes to repository
+		$this->save_repository();
+	}
+
+	/**
+	* create a new custom field
+	*/
+	function create_field(&$content)
+	{
+		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
+		if (empty($new_name) || isset($this->fields[$new_name]))
+		{
+			$content['error_msg'] .= empty($new_name) ?
+				lang('You have to enter a name, to create a new field!!!') :
+				lang("Field '%1' already exists !!!",$new_name);
+		}
+		else
+		{
+			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
+			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			$this->save_repository();
+		}
+	}
+
+	function create_content_type(&$content)
+	{
+		$new_name = trim($content['content_types']['name']);
+		if (empty($new_name) || isset($this->fields[$new_name]))
+		{
+			$content['error_msg'] .= empty($new_name) ?
+				lang('You have to enter a name, to create a new type!!!') :
+				lang("type '%1' already exists !!!",$new_name);
+		}
+		else
+		{
+			// search free type character
+			for($i=97;$i<=122;$i++)
+			{
+				if(!$this->content_types[chr($i)])
+				{
+					$new_type = chr($i);
+					break;
+				}
+			}
+			$this->content_types[$new_type] = array('name' => $new_name);
+			$this->save_repository();
+		}
+	}
+
+	/**
+	* save changes to repository
+	*/
+	function save_repository()
+	{
+		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
+		$config = new config($this->appname);
+		$config->read_repository();
+		$config->value('customfields',$this->fields);
+		$config->value('types',$this->content_types);
+		$config->save_repository();
+	}
+
+	/**
+	* get customfields of using application
+	*
+	* @deprecated use config::get_customfields() direct, no need to instanciate this UI class
+	* @author Cornelius Weiss
+	* @param boolean $all_private_too=false should all the private fields be returned too
+	* @return array with customfields
+	*/
+	function get_customfields($all_private_too=false)
+	{
+		return config::get_customfields($this->appname,$all_private_too);
+	}
+
+	/**
+	* get_content_types of using application
+	*
+	* @deprecated use config::get_content_types() direct, no need to instanciate this UI class
+	* @author Cornelius Weiss
+	* @return array with content-types
+	*/
+	function get_content_types()
+	{
+		return config::get_content_types($this->appname);
+	}
+
+}

From e003dfd82a4acc90229cb9b41e719c0c2d883521 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 23 Apr 2009 11:49:44 +0000
Subject: [PATCH 231/510] "fixed an other accounts_ldap problem: too many
 entries returned on 2. and further pages"

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

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index 796acf9174..c8fbcc9dba 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -627,7 +627,7 @@ class accounts_ldap
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
 		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $start + $maxmatchs;
+		if (!($offset = $param['offset'])) $offset = $maxmatchs;
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);

From c5ba464ffa5674b84ec2bbadce9943476a9a80bf Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 23 Apr 2009 14:47:26 +0000
Subject: [PATCH 232/510] Handling completion via fastlink action button better
 by offering close and close_all buttons. Preventing setting the status to
 done if that status does not exist for the given infolog type. Listview
 (offering the fastlink action button for closing): Regarding an infolog as
 done if it is cancelled. Regarding an infolog as done if the stati
 done/billed/cancelled do not exist for that type, but the percentage is 100

---
 infolog/inc/class.infolog_bo.inc.php          |  40 +++++++++++--
 infolog/inc/class.infolog_ui.inc.php          |  56 +++++++++++++-----
 infolog/setup/etemplates.inc.php              |   8 ++-
 infolog/templates/default/images/done_all.png | Bin 0 -> 639 bytes
 4 files changed, 84 insertions(+), 20 deletions(-)
 create mode 100644 infolog/templates/default/images/done_all.png

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index 9b2f7cdaac..cd2d1d0586 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -522,9 +522,9 @@ class infolog_bo
 			{
 				$responsible =& $values['info_responsible'];
 			}
-			if (!($status_only = in_array($this->user, $responsible)))	// responsible has implicit right to change status
+			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
 			{
-				$status_only = !!array_intersect($responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
+				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
@@ -554,7 +554,23 @@ class infolog_bo
 			{
 				$values['info_datecompleted'] = $this->user_time_now;
 				$values['info_percent'] = '100%';
-				if (!in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = 'done';
+				$forcestatus = true;
+				$status = 'done';
+				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+					$forcestatus = false;
+					echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
+					if (isset($this->status[$values['info_type']]['done'])) {
+						$forcestatus = true;
+						$status = 'done';
+					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+						$forcestatus = true;
+						$status = 'billed';
+					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+						$forcestatus = true;
+						$status = 'cancelled';
+					}
+				}
+				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
 			}
 			$check_defaults = False;
 		}
@@ -571,7 +587,22 @@ class infolog_bo
 			}
 			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'],array('done','billed','cancelled')))
 			{
-				$values['info_status'] = 'done';
+				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
+				//$values['info_status'] = 'done';
+				$status = 'done';
+				if (isset($values['info_type'])) {
+					if (isset($this->status[$values['info_type']]['done'])) {
+                        $status = 'done';
+					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+						$status = 'billed';
+					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+						$status = 'cancelled';
+					} else {
+						// since the comlete stati above do not exist for that type, dont change it
+						$status = $values['info_status'];
+					}
+				}
+				$values['info_status'] = $status;
 			}
 			if ($values['info_responsible'] && $values['info_status'] == 'offer')
 			{
@@ -611,6 +642,7 @@ class infolog_bo
 		{
 			$values['info_modifier'] = $this->so->user;
 		}
+		//_debug_array($values);
 		$to_write = $values;
 		if ($status_only && !$undelete) $values = array_merge($backup_values,$values);
 		// convert user- to system-time
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index af1853d586..3e41864253 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -65,7 +65,8 @@ class infolog_ui
 			'edit'      => 'edit.gif',      'edit_alt'      => 'Edit',
 			'addfile'   => 'addfile.gif',   'addfile_alt'   => 'Add a file',
 			'delete'    => 'delete.gif',    'delete_alt'    => 'Delete',
-			'close'     => 'done.gif',      'close_alt'     => 'Close' ),
+			'close'     => 'done.gif',      'close_alt'     => 'Close' ,
+			'close_all' => 'done_all.gif',  'close_all_alt' => 'Close' ),
 		'status' => array(
 			'billed'    => 'billed.gif',    'billed_alt'    => 'billed',
 			'done'      => 'done.gif',      'done_alt'      => 'done',
@@ -162,7 +163,10 @@ class infolog_ui
 			$info = $this->bo->read($info);
 		}
 		$id = $info['info_id'];
-		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed';
+		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
+		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
+		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ; 
 		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{
@@ -171,13 +175,18 @@ class infolog_ui
 		if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
 		$this->bo->link_id2from($info,$action,$action_id);	// unset from for $action:$action_id
 		$info['info_percent'] = (int) $info['info_percent'].'%';
-
-		$readonlys["edit[$id]"] = !($this->bo->check_access($info,EGW_ACL_EDIT) || // edit rights or more then standard responsible rights
-			$this->bo->is_responsible($info) && array_diff($this->bo->responsible_edit,array('info_status','info_percent','info_datecompleted')));
+		$editrights = $this->bo->check_access($info,EGW_ACL_EDIT);
+		$isresposible = $this->bo->is_responsible($info);
+		$readonlys["edit[$id]"] = !($editrights || // edit rights or more then standard responsible rights
+			$isresposible && array_diff($this->bo->responsible_edit,array('info_status','info_percent','info_datecompleted')));
 		$readonlys["close[$id]"] = $done || ($readonlys["edit_status[$id]"] =
-			!($this->bo->check_access($info,EGW_ACL_EDIT) || $this->bo->is_responsible($info)));
+			!($editrights || $isresposible));
+		$readonlys["close_all[$id]"] = ($done) || !$info['info_anz_subs'] || ($readonlys["edit_status[$id]"] =
+			!($editrights || $isresposible)); // this one is supressed, when you are not allowed to edit, or not responsible, or the entry is closed
+			// and has no children. If you want that this one is shown if there are children regardless of the status of the current or its childs,
+			// then modify ($done) to ($done && !$info['info_anz_subs'])
 		$readonlys["edit_status[$id]"] = $readonlys["edit_percent[$id]"] =
-			!$this->bo->check_access($info,EGW_ACL_EDIT) && !$this->bo->is_responsible($info) &&
+			!$editrights && !$isresposible &&
 			!$this->bo->check_access($info,EGW_ACL_UNDELETE);	// undelete is handled like status edit
 		$readonlys["delete[$id]"] = !$this->bo->check_access($info,EGW_ACL_DELETE);
 		$readonlys["sp[$id]"] = !$this->bo->check_access($info,EGW_ACL_ADD);
@@ -551,7 +560,9 @@ class infolog_ui
 						}
 						break;
 					case 'close':
-						$this->close($do_id,$called_as);
+						$closesingle=true;
+					case 'close_all':
+						$this->close($do_id,$called_as,$closesingle);
 						break;
 					case 'sp':
 						return $this->edit(0,'sp',$do_id,'',$called_as);
@@ -647,28 +658,43 @@ class infolog_ui
 	 * @param int|array $values=0 info_id (default _GET[info_id])
 	 * @param string $referer=''
 	 */
-	function close($values=0,$referer='')
+	function close($values=0,$referer='',$closesingle=false)
 	{
-		//echo "<p>".__METHOD__."($values,$referer)</p>\n";
+		//echo "<p>".__METHOD__."($values,$referer,$closeall)</p>\n";
 		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $referer;
 
 		if ($info_id)
 		{
+			$info = $this->bo->read($info_id);
+			#_debug_array($info);
+			$status = $info['info_status'];
+			// closed stati assumed array('done','billed','cancelled')
+			if (isset($this->bo->status[$info['info_type']]['done'])) {
+				$status ='done';
+			} elseif (isset($this->bo->status[$info['info_type']]['billed'])) {
+				$status ='billed';
+			} elseif (isset($this->bo->status[$info['info_type']]['cancelled'])) {
+				$status ='cancelled';
+			}
+			#_debug_array($status);
 			$values = array(
 				'info_id'     => $info_id,
-				'info_status' => 'done',
+				'info_type'   => $info['info_type'],
+				'info_status' => $status,
 				'info_percent'=> 100,
 				'info_datecompleted' => $this->bo->now_su,
 			);
 			$this->bo->write($values);
 
 			$query = array('action'=>'sp','action_id'=>$info_id);
-			foreach((array)$this->bo->search($query) as $info)
-			{
-				if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
+			if (!$closesingle) {
+				foreach((array)$this->bo->search($query) as $info)
 				{
-					$this->close($info['info_id'],$referer);	// we call ourselfs recursive to process subs from subs too
+					if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
+					{
+						$this->close($info['info_id'],$referer,$closeall);	// we call ourselfs recursive to process subs from subs too
+					}
 				}
 			}
 		}
diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index f88506996c..f05cabbd93 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-12-12 10:43
+	* generated by soetemplate::dump4setup() 2009-04-23 16:34
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -12,6 +12,8 @@
 
 $templ_version=1;
 
+$templ_data[] = array('name' => 'infolog.close','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"h4";s:2:"50";s:2:"c3";s:7:",bottom";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:5:"align";s:6:"center";s:4:"name";s:27:"infolog.index.rows-noheader";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:44:"Are you shure you want to close this entry ?";s:5:"align";s:6:"center";}}i:4;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"Yes - Close";s:4:"name";s:5:"close";s:4:"help";s:30:"Sub-entries will not be closed";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:33:"Yes - Close including sub-entries";s:4:"name";s:10:"close_subs";s:4:"help";s:43:"Close this entry and all listed sub-entries";}s:5:"align";s:6:"center";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"No - Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:22:"Abort without deleting";}}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1240392317',);
+
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:3:"typ";s:8:"onchange";s:1:"1";s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1061729975',);
 
@@ -123,6 +125,8 @@ $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1229074929',);
 
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401028',);
+
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:34:"8%,@no_info_onwer_info_responsible";s:1:"F";s:25:"12%,@no_info_datemodified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:37:",@no_info_used_time_info_planned_time";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
@@ -131,6 +135,8 @@ $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
 
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1240401005',);
+
 $templ_data[] = array('name' => 'infolog.Lebert.Baienfurt.Kopf','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:17:"Lebert + Co. GmbH";s:4:"span";s:11:",my_heading";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:23:"International Spedition";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Eisenbahnstrasse 4";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"88255 Baienfurt";}}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:8:"logo.png";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:14:"100%,,,my_form";s:7:"options";a:2:{i:3;s:7:"my_form";i:0;s:4:"100%";}}}','size' => '100%,,,my_form','style' => '.xmy_form td { font-size: 20pt; }
 .my_heading { font-size: 120%; font-weight: bold; }','modified' => '1158752011',);
 
diff --git a/infolog/templates/default/images/done_all.png b/infolog/templates/default/images/done_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..7df66bc11c0c090da9b82b33d95564bb21e33478
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*#s5~9SQUDa-9GG0t`t+
zK~y-)#nU}#m3J5g@ZbA+F9}v9G?FhRL<x%3V$rCBP^(L&TdW`sqEVc*xQKM9;8Gl{
z=q8kk+C?2K6w;x%S!g9-i`XG8XcUF3CNVYUChvXkzk`A<x;S{I^9<)4csM5tA$S+W
z-Vu@S^k}$e8qYC<22$k6UgPP@JJ*+2>`f9MrAj|(_!`4+jS6V$#2yX%=Njr!YI_`)
zagkNC3ksjUQ8=d!M;3H1xYp6#aomhCvo_<;I8230Z7bT^s*9`V)ol>HCN3;eI*@jy
z*So&x`gVTL{QlZ#ZP=_YMeaiyCc};K`uJQt7<U`@qdNw1+nn8&*d1+*2J*GJ$=@eU
z4^Ll~*sp5x)f0!bTVmK()~MkJ|C;f{ChM%nhq#KLozmi%d7jEqC2AqnRP&EN{B4bX
z?9eCHrvn8}D~&j*;;2LkGP&H&B=K=<7SG)9mr@NCwBjz#QdNDBt<FXyN<p4{kZf;X
z)jraiwr*`qIg<JhrQh82#47DF+{aaQqYf6^ir(;9IH#u927{LSWa5{JGsVN=aMY=h
zSc=kP&wXy0UXO9vgi(i7d>?9|2m@irfGsLI!^QATbF6t(r)HFq=tYU3M`5!OkBr$R
zbw!4{M=JK2QgP8?3!Sj=MJrzz^dUk}_t1bTLsGwrURJk7;enNIIc1TvG9<4IqW8YW
Z{{g4qv#s1y!Cn9W002ovPDHLkV1mn9CLsU-

literal 0
HcmV?d00001


From bda5c07cb1cce7f5ae8ff5878d4577136413ae03 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 24 Apr 2009 16:12:41 +0000
Subject: [PATCH 233/510] "fixed translation of Portugal"

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

diff --git a/phpgwapi/setup/egw_de.lang b/phpgwapi/setup/egw_de.lang
index 3814db90d9..4c5838a0fc 100644
--- a/phpgwapi/setup/egw_de.lang
+++ b/phpgwapi/setup/egw_de.lang
@@ -454,7 +454,7 @@ please set your global preferences	common	de	Bitte editieren Sie Ihre globalen E
 please set your preferences for this application	common	de	Bitte editieren Sie Ihre Einstellungen für diese Anwendung !
 please wait...	common	de	Bitte warten...
 poland	common	de	POLEN
-portugal	common	de	PORTUGA
+portugal	common	de	PORTUGAL
 postal	common	de	Postadresse
 powered by	common	de	Powered by
 powered by egroupware version %1	common	de	Powered by <a href="http://www.egroupware.org" target="_blank">eGroupWare</a> version %1
@@ -533,6 +533,7 @@ showing %1 - %2 of %3	common	de	%1 - %2 von %3 Einträgen
 sierra leone	common	de	SIERRA LEONE
 simple	common	de	Einfach
 singapore	common	de	SINGAPUR
+site configuration	common	de	Konfiguration der Anwendung
 slovakia	common	de	SLOVAKEI
 slovenia	common	de	SLOVENIEN
 solomon islands	common	de	SOLOMON INSELN
@@ -658,4 +659,3 @@ your session could not be verified.	login	de	Ihre Sitzung konnte nicht verifizie
 your settings have been updated	common	de	Ihre Einstellungen wurden aktualisiert
 zambia	common	de	ZAMBIA
 zimbabwe	common	de	ZIMBABWE
-site configuration	common	de	Konfiguration der Anwendung

From e2b6cdc800e67e04f3a5c8bca4f8620fa4f3e573 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 24 Apr 2009 21:33:47 +0000
Subject: [PATCH 234/510] Clearer translation for the prompt "do you want to
 edit serialevent als exception?"

---
 calendar/setup/egw_en.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar/setup/egw_en.lang b/calendar/setup/egw_en.lang
index 2f970693f3..af1cf6ddb9 100644
--- a/calendar/setup/egw_en.lang
+++ b/calendar/setup/egw_en.lang
@@ -89,7 +89,7 @@ displayed view	calendar	en	displayed view
 displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	en	Displays your default calendar view on the startpage (page you get when you enter eGroupWare or click on the homepage icon)?
 do you want a weekview with or without weekend?	calendar	en	Do you want a weekview with or without weekend?
 do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	en	Do you want to be notified about new or changed appointments? You be notified about changes you make yourself.<br>You can limit the notifications to certain changes only. Each item includes all the notification listed above it. All modifications include changes of title, description, participants, but no participant responses. If the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.
-do you want to edit serialevent als exception? - ok = edit exception, abort = edit serial	calendar	en	Do you want to edit serialevent als exception? - Ok = Edit Exception, Abort = Edit Serial
+do you want to edit serialevent als exception? - ok = edit exception, abort = edit serial	calendar	en	Do you want to change the event for this particular day, or for all days?\nOK = Make a one-time change (create an Exception)\nCANCEL = Change the event for all scheduled days
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	en	Do you want to receive a regulary summary of your appointsments via email?<br>The summary is sent to your standard email-address on the morning of that day or on Monday for weekly summarys.<br>It is only sent when you have any appointments on that day or week.
 do you wish to autoload calendar holidays files dynamically?	admin	en	Do you wish to autoload calendar holidays files dynamically?
 download	calendar	en	Download

From 10c390a654220d4dd0d7b3c1280fd7016efed3af Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 25 Apr 2009 06:56:42 +0000
Subject: [PATCH 235/510] "allow 'test' in  template name for application ==
 'test'"

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

diff --git a/etemplate/inc/class.soetemplate.inc.php b/etemplate/inc/class.soetemplate.inc.php
index 9c107a575f..c7248763fb 100644
--- a/etemplate/inc/class.soetemplate.inc.php
+++ b/etemplate/inc/class.soetemplate.inc.php
@@ -959,7 +959,7 @@ class soetemplate
 		{
 			if (($keys['name'] != $last['name'] ||		// write only newest version
 					$keys['template'] != $last['template']) &&
-					strpos($keys['name'],'test') === false)
+					(strpos($keys['name'],'test') === false || $app == 'test'))
 			{
 				$tpl->read($keys);
 				$to_trans += $tpl->getToTranslate();

From 94ddea7b21160213801e8dfb5ee99bebfddda980 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 26 Apr 2009 05:51:26 +0000
Subject: [PATCH 236/510] changed "php_value mbstring.func_overload X" to
 "php_admin_value mbstring.func_overload X" for php5.2.9

---
 doc/rpm-build/egroupware_fedora.tar.bz2 | Bin 1426 -> 1443 bytes
 doc/rpm-build/egroupware_suse.tar.bz2   | Bin 1447 -> 1462 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/doc/rpm-build/egroupware_fedora.tar.bz2 b/doc/rpm-build/egroupware_fedora.tar.bz2
index be8af2553928ea510823dd6eb075168e272cb8c6..b551f832af62616a04342b4111ad3c41d8c159cb 100644
GIT binary patch
literal 1443
zcmV;U1zh?<T4*^jL0KkKSq=IW*Z=|Se}wF?0Z?7{|NpP=-=F{g|N8&}f(TFrxQv-W
zJx=Ym?%lB1!IBA-)bdXx^)S(@c~5Cfk4R|92AfkM=^ml#4KqoJ?J1B+Bzhq;Q&jX|
znx29H02%?NfB*mnO#n!QLS;6pdU~g%^%$9oVE`VXrhp7UFhdAwqeF&<jG8oP(?cU6
zgaMEPAk#nq41tgYl1&;kn3*&M4^z}VPf?+u02%<$0005%J7N3?^ZI|Y{GFO9t|Oq^
z0nID~M%2<lIV2=5P9@Ufe1$;yGz|g>6MN|r+F)Z1TN}fN5xE9V&D=|1aD#0$+XOIe
zA)qBhlAwf$uw$<!O=0hJTK<?+)45kS2P_ZvHSt5D`UEJ7$2=V|qxo_EX=7%VwkZX&
z9lL6RO$2~7fJ6i!CIUd62?JLjHM|FIUU{aCFAr6_n>X`2sdcQEI^;|wF@n&~d;;dQ
zXQ~9C^zlCdY95-6=9ACU9M|i_#{0Y}U>)rJE%LXNcrBq&jpnfwRY8pbRWx5HTI~C=
z$rx(Fhl7`XESV$3I}nYYCU`SWEHS!1ve%vk`2v8B*YbcQbQo0+Zo%k5l?7d)RfFfe
z5`d~(H(Z!|1PyA~=q1Az6aIz%c<@3l@9gULQQ7o0-qhN2@?A$yTTcBjWigQ(;+&@I
za)s;}r7~%xU56XEj$g+xAkilavIk%30V(dn0W%-~nYgrXi+{SRt0J`J_W}r%CnmsA
z1xl3W1R)<Wwhmn%JQo3$2oz9Z1_-i-403Qxw$n@W{L5E))v&B=nONU4LNKx1t&&>B
zL@Z_dGYD5G#KJ2HDo8Q~nn$&JlFQv9Fv=|~p70b^T6T{UG2arPi`hnVPGJyS*kZ~d
zBMhq87`M~o>1!RoU)(Te_r(OWqeGwXKcIiUhoo}K_-Uh3*b=&w5GL1(#`7x(gSP1#
zUOes2_pSF%VG!$&bE@j%%*nIsiDVrjw;hX#UrK{Ye6*?*R=87M5)DelV#@U;AqQ*K
zTk0Y0oY-jJ-yR2da$QwyV~WJnM11MPBW;3K*o-7Q;_Rga;aNzH4IxQfLO_4bVDbQ1
zZ;p7kWe>=CIXcWxFo|FR=c%e3;4lEd!wK&5T2Bb%w7{8M6k=D>l=$)v`jZsq8xn&B
zkJ7|MN{le=K(Ptvz*2A;cIj0vomPp96A&yWnAuMiFSTpJ93gUZS(?E`Og?B`q1p2}
zvBBqh^RYIGx@645HS8oklBGh9T%`Aq*vMwj5{0$*0w<kH4&(y>#WhV`pwn&etw?Hd
zG}4}$5pY@O#^}yK+rks>^g_zUnIM@1pg89Zq|4N6yK!?&h6tHpSj*vXj=gdSc-LW)
zXb1})tfih~0mMdwWy%(~8tWuzL`cf!rg5wuWOWe<Rv_MmV7UQ+UNoabHE!3dm!55i
zQMl9tHiFTEi=8XA>I>P^18ia<U7ExY0&v3MR_BOr&N-?W!kCiMOtk8DIfYCt(Au(a
zJfNYt(RL_;$wDE6aNV)V4_TWoBwehGAx4~_@^F}`7-kAK@(Jm5A;t8BlCh^fXvpi(
zi_DNo8EGy-6sBa!sA0nhFF~QE(M3x!Qm%tYZI#0&G~R%bU^3WnDtvO9=0Z0iaRUnp
zKy%Q;1d(KzL!`HrLWn^FnFy7UT>@yeR2j-m0Oe?nqC3!A#$?(9gJ!_jR@^=9yM<IO
zypIRVIh}kDS5uA7%fM%j0%Vz93AV7+K^(b~D-*y;sM<d=By8bA8Zw6_yA!nXHNsUS
z#buZZNb1We6_jLKJ&jBRQ6&qNq*E=K;X-}<GYr@4CUWfzSWi+2MzXgONBBwjsTI@E
x$Ql4T$Q(#H1tv5iF;F`$9bO=yy~f8#rEZnQt)q01<Dg6aF64@Ep&%RdDX@e!n%MvV

literal 1426
zcmV;D1#S95T4*^jL0KkKS!DbE<^Tcge}wF?0YF{%|NpP=-=F{g|N8&}f(TFrxQv@c
zVdpw)v%3h8$pDFnC#b<Nr?jV}{ZM*_fEhFgsp=l1O+8OZgDH?nA)*A)Ou(Um4F-T3
z0MG+K01TP{ks$<0?NjwK8jOdj>Hq)$Gz~Nj4H^JFLqnM~(8vH{G7NwkV1bARjWhsc
z4FCxggHvi`$&pVcQIOCBKmY(V0001J+YgwH{JYQA=+QQ_8x61=rmGPclSu@v5RkL+
zvl*f1CgL;Iq#8jY5_hCYw7|9+s@g+`5sd^q4wVU78o=94Ho*)VNN5D8l2j0pCJJV)
zt*kitZ1kAa)7{sn*U0F4n+Y{wK!p-YQro$uNODuhLmNGKvDOxdep@$zH;DjL0T2*?
zml6fUBn_VJHn5%Q|H<c-H%Fq?y}TLU&bYS=-)=?{7{O%GiUEPH8R~&ZJhp!UavoJ1
z?MJ`UJovR{WPRQxEgkIrE&{it_-=}dH`>HTsF@HIN;s(tou77jXAE$Qsq4Wf4-B}+
zS`oLz%k<~EHk$2UYZY#}elVaWwf(*Yce;f~**WDwWd^>$sDv(VguE3)XXveqtU0Y)
z9_sj{#DCGl%Pttkzh4J4-i@ve+zX6G#jBR)?xe4q22G5Jyi&GRENT}xwJ5~8=uLxV
zrX#DpXb>(*puB)~JK!Z2_b?L3z)L5O>DV&wXwjo)Hotw*2)uiE$U|U7>(n8k>9p9L
z9Qv?S11l;Ng(?K#tqzTY9F0jywwSjjrMoHBD(JT<W)cF)`=wY;(oqViw%lNaNfi`?
zsS;5u1!_k=ZV_SB(jiLWDov^GfkJbnu@1usI;<xIRYerTI!&VhSi~eb@iGri-Yhj$
z^QS0!34F>6L4ko6(^G&ZnFW#Lo)OW1V%QR8C?HIp3mfc+NFTjG$(KWPLJNh{oJcw)
z?{nQ;nb|&yqP=0vBKO#~lXWOGrf#K1imDXY1a`$^vADg7KtQZ`W@MrKc?Hbbgn$kz
zTZUYSF(7lJ41go9s3y}<gopg2x|sJ-TU%rug-9djm|j3rt)u0Sop63b%gEa=iEx!*
zPI{e$AO&DBV-)c7<uOKC@|C8q3iQ@HQmZD>54kej<7uieVV0{F2y|kHZUu->8%Z1{
zrsS1Nsa3*a#Ka2=(;DgKsrIdXLpV&0s|j=xiM>#%q0#B;#-{tbUc(TZn<{K?BN8Ub
zTB%;!m18Ni$Y#-DTK>yO5miaS+<;m!Dz8{L#--SyTA<R>Ytp|`D8LqPWOQgCUz{V-
z)(1{kQVFI5fH-R#NtDkEaKNOlp@Jz@tmbImBei@)NNp@podgCMEH<=^fIzTuWuy$<
z*QQi8A|$1A(HMEE>(vEihi}BNUVyk=7l^p6tJmR8xst%Cu)qyE%ElXe30bp<E_5aj
zYXU|3Z9xz*1<(bTVnMlxgRo`ElS4$fFwa1zVM9Y|gv%sMZZNL&$S9N|7&i^mC1|Cl
zU2D;;!$rXzOu+PTyiyou2<~MQ$<T-x?FhRXx-UjpW<oO?=%kGp%g{+GT4~hC3_+O&
zr%tM@T1ys6jga1=15CjqWr}54qSIZI%R$7Y2;|1{CCo}BCqo!bCX*2fvhu1@2%v*P
zC}_!0oSl^$1~X7WWf8n1zZKjxrqCJXAhy=r8wL7el!bpGsNHDVc4%thHd;1L0it%7
zlx2t$Y+<S-^Jhq`PXQ*5!TF&>UkVV@q&aoiov+H+1gc4j%Pk~N9WxVIhDF!wY1&N`
zP{6JxnQPyL3HU9@8gAN7g3WA^lL#Rim3O3ngr~z8uf<b9;sh;;!i*4OGoccaiP?b+
gm<2{?9B53aeJjkbR^bzrfiL*Gk}1N3gD2njFwy6X_5c6?

diff --git a/doc/rpm-build/egroupware_suse.tar.bz2 b/doc/rpm-build/egroupware_suse.tar.bz2
index 192e39b5012f66b12a5fcd5e99a8f679a32b5e23..0d74febb0a34fa1209f5c137c5c61cd3cef13e5a 100644
GIT binary patch
literal 1462
zcmV;n1xflsT4*^jL0KkKSs=4wp#TBw|EBD)0YF{%|NpP=-=F{Q|N9UC006)M00>Y8
z+3w`7YbF;c3In@#5=u2PWjr7z(5ItQ(^J%WKs`VP)Xhz#Y3c@ynWl;A21IBkl){aq
z^lA@knlPC#2*@*0lR&~6XgyC;O$3Pvq{%frDd{u~8Kh_igFpajpa3)gG&mYGVhtK(
z!VExSF*In=pba$80003ZiKaj!L7<vY^g-$x27mwn000N5-}eUak53Qc&r>X7<7)ug
za;T56V<Z9{=?M#3roM>Rli0pn6{t?CgA;j@B-&s^RIRo^V~gAbnPZehtqvgD2AJ4^
zq?$o0Nh%PLmu96c<h=8t_`i(NSnA~a`nq8+OG>(~;Xs8M?3W;pP8hjzelWYH%u(X1
zTSPueHw3o<2GElUK#*NzgR?(1zS_id*s&vCJ(OFqf07+f#brYc5;-BxHp(u%45X|h
zNkmnjpZWr_8S)s?Eo<is^zXo4Y*!;kvQ@NkiL_ypFgUo3X;BW7h2j8{-F7QmBXGj(
z7cE@N7kDJinp`HvMV<#^<hWLKE`2p-xdZ-D;Fi}#;HeB49*<>wtQe5?83^X!3Ed0f
zZr|?RpWy~)J}|juc4AJtPj=QC3>$RO<|f(Vy=BRZAv2G1*?FEyOElOrY-C1ZO6g}!
zbId79SG%;JS{;cSetW=$g(nMhFOWPttOTj;ix>$&z$NClpPBdhb@ga_S6w~<2*5Kk
z7+@-s3bIY`8)$TIyVDA#GKhqtmPE&uk+BML&nh_}N|)dy9t4#TU@&;+X&Amikj>ML
zQ*+>XmIo*bg&!uHkg}lEXUqVxLeNK{im0FlD?&tdYARKhIx9)W0?`z>Zm|JaR9prz
z$eCD`YEDEk-!*{1TY<?`i3p05tUYXcdRnsF+31$D3D$x3H(WFQQhP@IN?J0}PkYzd
z!c9nN-gsfVz8d*m87U4vBfMns>4QvBKNaN}A*x+HJ*UYmy2hExwGM(T^{uqp-YF*0
zt|9o@`JidXKN!^d@YdU<k9c@{4f)+E589cCxyQyh4A|*kmlGHmf(XY`PYjKdiBRTp
zA^5|gF>rf{60*WW#9WCmx6v_ff|}%?EIV2QT*rh<01`j0;vfqEVAB;)`LQmYyD=|K
zWEN^#?n;^LA^H`UZXUr+<yTWJ5hOicvn@(dxTyZlej1e*Z7&loP8%)_RXQs-tzR(I
z3kh7VF+nnNheB^2c;N56T=*FBXoHg`*xuHJRMKges$1J4mG{~lp~k|Cx~#zz=A;sl
z0HDgLlEbLgeybG69NsBo(kQ?!`FBYiNEq-4_&h+8k$s3G5IPPV#?obVLoD_cm)I~x
zYW29=JkmW}V^G6AQLbn~mRC5NfPra2Z=4N1iBEbzCf*7=d)$kPEmP@vt|fkjw5U{K
znbdSgIBmnOoH2UQCxMt6aw@ohc5q7mmIh3cVEXeeHSNI!z@Tb?EqpBxGK3xjF{Vo)
zEj#%Uo=C7wg&G@FP6vVsjm8z(nF2{c5MbOJa@{ma!%Z_r98r)*t3Z_G7z&|{gnT>2
zDx`!!+i*rq>BkgrhSVczzG)*%jL=$@Z8XBhKw=JCg1%N<ubI#|_dtM|;M#zSxYHAz
z^;@CetqAR&vsDD9LZmT-ZD}-!M^7%rXiWqdktU366Sd)C#JJ=TTEuq<_h!ALf^7l1
z+e0jyaCxH~whB@fUFS#W#`DylUZb(b+Ta{(xWt=U(4UQ!B3HwRD+Mf~B(Jc3WF#=$
zAcTZhMszHe^Agb}M4*_ef#MdUd_h_n5>2~bXn_qXkr(Ej3EHQWD5xvxsTFRq87+7r
z9F_XPf5KH~aI>Y21DFuXXJq=qC@(jm7tBk1GzRu1dEA0B@PkOygP9UkeSI@K)!HOt
Q5SRR2$rRy2K!VMRgpVVc$p8QV

literal 1447
zcmV;Y1z7q*T4*^jL0KkKS#c{ZU;qK^|EBD+0YF{%|NpP=-=F{Q|N9UC006)M00>Y8
zzUCB~3`|fc27@G-0igp^WK5^%Ddjy)G#;P;(`g=|r|OymCdATuLzy(t$N*w841gM7
zfrti;Gyr4`00|KjAtgM}Kur%vr~m;2Kzg20gn9_kfS!YyG|<QZVloVX8eoBl28}cT
zWDNib6iqY<iJ;Joq}d?Q&^=86000J_QJ~SaJAW|j5%+NMGw)?ATzUX)ILt?kF(LvT
zsR;{JjZqxgeEg?ZKEX>WjVH8`Ev5v;i(F<A688YBY{mq#4p271rZymHCLt9PN`ewC
zVedmO*_LwuXV_v>4-VdcZ}HdtjD5A~K!p*!2}7{AL?5mX#x?4i2y#~x5ci6E<eT6S
zA_Sl%(m=X|f!E2;Mgx#^TC~)>JyX$Yo>#TG1jXm4YRL;&-V@zW5u-ve^#_#2;?x63
zV&5AP=1Eht#eLB;IO{zU*pTNt1~s-G{xK?1?Rg?^CgKA0oi>dXb^S2Ygl)vuEk90<
zE-3Mh$VA+0&C76DTRJMQCC6OO6a;qqZvk27aH<{FbD$iEdkf*}E`;9-!pl14!MHlc
zIJcdxfw(x6{S+QqDTrP1#g~|l@x7Ya)AMO4b242QwDi_?sKJzDA~uCNPU35-Xi8@{
zmb43;@JR1?a{?BGoGtC0;QaUo0#$rCKnYU7ORIm)*%<i0&+qAn^*<-bAsqv43}9(5
z7D+d*+ey{EgTcZVN~Q@yQH7whB&-tYJ90xFFz_VR4V<MXmXKn+adNF=du5apY!?g^
zTEU)SOV=4`^=UYP7HZf!HE7Hgscghwt&)Q5v#S}2NXrow#BR_)S;DH<V;u?>WJzlk
zay;pXUhtd<!fS)w*yC$`6Ti{xmu7>z1hLv!M>aRs6ZaUlGuwX`r>{VffhAIc1k1x`
zI^hwAvwTNzcYGB)R1i4@;|OTi9a^{C4ViYTlvk`eL>eqml65FBrk<z+kfV}1l7+bl
zNA}~fyv*2wg0a&o;}3IW7c}V&0DH4CnDR54%rMBM#Bpnhaw_PHe%9bjd+5;Cq8_n|
zC55~+7XT_RsQ&Zp^MiEP&?SfxfA1n73_xJh6%hLGEuEQOT$;cu#c8!FvhNW6%1d?+
zP^R#sot6la9zNSFN>Q|+@*Le%Dwlq%gv%3yWr4|2B~N8btTzQDY*rV*j3{y_c<hG0
z*MBzR{tXavWt$t@Xhj-LGeW*yI+w#!L#%RfF1V?(2&<V$B_aV($|}KV=P|n))W;m1
z>0ibu&=!4LB#q<?_XK<$z><-5Xd@6fjvT{jGMXWVT8c}n7$TK&*lV6i9@X)nVU{tb
zXhDV+xSIfhVNkZt27c_PwH<A}3Of31Ca|ZCrZFk?tEz!i#WR@Vju6$ym0PcRQ753t
z4EPjUKsq-icN)V6Nick}Ei~)Uf?!k_z!sg>2c=O5pk^tNhTA)k*%VYwg<2a`OuUpE
zjMv#h3Z)2!4a06)=80Bko|I?37zBCq2~I(vR19n*)wEKgNJI^Ggk;V;??%{bLN%La
zk~6f)1&LDAOe<stAmOkn;a#ffoI`(>1O&}V9tJ3@Oz%0aqRh_qC`W#JOllID3J}H-
zv82)=9Q_*Afiw_eM4B(GPRF9Nd1=5Pw21PE_@=${a%};!%L5D>aCsv9H40J|9WJNq
z#^b|2Se*_wQvlyhrR3Vug!{Nv5}n(@Rw-c-C{f)!brl|FC_|=j^Xs)q;kDk9sU}ug
zX+cf%+)}d|F2A{|(v&1+q*ElM73-ETC#(%67%SaD2#(5#BH?Xt4`3>ctrk^Q&^dt&
zCUj4bMFqyxBH9GIL!>(IR-W_-WteC;K=dIMC*j&`e7#a7;u8PG+>uTcBpgc1SODFG
Bj_d#c


From 3121bb1106779b7307722532649e2173f2f7a5a9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 26 Apr 2009 05:55:31 +0000
Subject: [PATCH 237/510] newest version from openSUSE build service

---
 doc/rpm-build/egroupware-1.6.spec | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/doc/rpm-build/egroupware-1.6.spec b/doc/rpm-build/egroupware-1.6.spec
index b2843e2a87..f91b694774 100644
--- a/doc/rpm-build/egroupware-1.6.spec
+++ b/doc/rpm-build/egroupware-1.6.spec
@@ -1,15 +1,15 @@
 %define packagename eGroupware
 %define egwdirname egroupware
 %define egwversion 1.6
-%define packaging rc5
-#%define epoch 1
+%define packaging 001
+#define epoch 1
 %if 0%{?suse_version}
 	%define httpdroot /srv/www/htdocs
 	%define httpdconfd /etc/apache2/conf.d
 	%define source5 egroupware_suse.tar.bz2
 	%define distribution SUSE Linux %{?suse_version}
 	%define php php5
-	%define extra_requires apache2-mod_php5 php_any_db php5-dom
+	%define extra_requires apache2 apache2-mod_php5 php_any_db php5-dom
 	%define cron cron
 %endif
 %if 0%{?fedora_version}
@@ -29,7 +29,7 @@
 	%define source5 egroupware_fedora.tar.bz2
 	%define distribution Mandriva %{?mandriva_version}
 	%define php php
-	%define extra_requires apache2 php-mysql php-dom
+	%define extra_requires apache php-mysql php-dom
 	%define cron crontabs
 %endif
 %if 0%{?rhel_version}
@@ -37,7 +37,7 @@
 	%define httpdconfd /etc/httpd/conf.d
 	%define osversion %{?rhel_version}
 	%define source5 egroupware_fedora.tar.bz2
-	%define distribution Red Head %{?rhel_version}
+	%define distribution Red Hat %{?rhel_version}
 	%define php php
 	%define extra_requires httpd php-mysql php-xml
 	%define cron crontabs
@@ -99,12 +99,15 @@ Source2: %{packagename}-icalsrv-%{egwversion}.%{packaging}.tar.bz2
 Source3: %{packagename}-mydms-%{egwversion}.%{packaging}.tar.bz2
 Source4: %{packagename}-gallery-%{egwversion}.%{packaging}.tar.bz2
 Source5: %{?source5}
+Source6: %{name}-%{version}-rpmlintrc
 Patch0: class.uiasyncservice.inc.php.patch
 BuildRoot: /tmp/%{packagename}-buildroot
 Requires: %{php} %{php}-mbstring %{php}-imap %{php}-gd %{php}-pear %{extra_requires} %{cron} %{packagename}-egw-pear = %{egwversion}.%{packaging}
 Provides: egw-core egw-%{addressbook} egw-%{etemplate}
 Conflicts: %{packagename}-core %{packagename}-%{addressbook} %{packagename}-%{bookmarks} %{packagename}-%{calendar} %{packagename}-%{developer_tools} %{packagename}-%{emailadmin} %{packagename}-%{felamimail} %{packagename}-%{filemanager} %{packagename}-%{infolog} %{packagename}-%{importexport} %{packagename}-%{manual} %{packagename}-%{news_admin} %{packagename}-%{notifications} %{packagename}-%{phpbrain} %{packagename}-%{polls} %{packagename}-%{projectmanager} %{packagename}-%{registration} %{packagename}-%{resources} %{packagename}-%{sambaadmin} %{packagename}-%{sitemgr} %{packagename}-%{syncml} %{packagename}-%{timesheet} %{packagename}-%{wiki}
 Obsoletes: %{packagename}-%{icalsrv}
+#otherwise build fails because of jar files in G2
+BuildRequires: unzip
 
 Prefix: /usr/share
 Buildarch: noarch
@@ -473,6 +476,7 @@ rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/xmlrpc
 rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/messenger
 rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/workflow
 rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/jinn
+rm -f $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/admin/inc/*.orig
 
 find $RPM_BUILD_ROOT%{prefix}/%{egwdirname} -name .svn | xargs rm -rf
 
@@ -548,6 +552,8 @@ ln -s ../../../var/lib/egroupware/header.inc.php
 %attr(0644,root,root) /etc/cron.d/egroupware
 %config %attr(0644,root,root) %{httpdconfd}/egroupware.conf
 %if 0%{?suse_version}
+	%dir %attr(0755,root,root) /etc/apache2
+	%dir %attr(0755,root,root) %{httpdconfd}
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/files
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/backup
@@ -598,6 +604,8 @@ ln -s ../../../var/lib/egroupware/header.inc.php
 %attr(0644,root,root) /etc/cron.d/egroupware
 %config %attr(0644,root,root) %{httpdconfd}/egroupware.conf
 %if 0%{?suse_version}
+	%dir %attr(0755,root,root) /etc/apache2
+	%dir %attr(0755,root,root) %{httpdconfd}
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/files
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/backup
@@ -730,6 +738,9 @@ ln -s ../../../var/lib/egroupware/header.inc.php
 
 
 %changelog
+* Mon Nov 24 2008 Ralf Becker <RalfBecker@outdoor-training.de> 1.6.001
+- eGroupware 1.6.001 final 1.6 release
+
 * Sun Nov 16 2008 Ralf Becker <RalfBecker@outdoor-training.de> 1.6.rc5
 - eGroupware 1.6.rc5 5. release candidate for 1.6 release
 

From b52d29b7a73181e940675ef0959ede171fe501c7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 27 Apr 2009 10:31:23 +0000
Subject: [PATCH 238/510] New access log (created during an eGroupware
 application development workshop at Stylite GmbH for new developers)

---
 admin/inc/class.admin_accesslog.inc.php       | 144 ++++++++++++++++++
 .../class.admin_prefs_sidebox_hooks.inc.php   |  14 +-
 admin/inc/class.boaccess_history.inc.php      |  85 -----------
 admin/inc/class.soaccess_history.inc.php      |  66 --------
 admin/inc/class.uiaccess_history.inc.php      | 138 -----------------
 admin/inc/class.uiaccounts.inc.php            |   2 +-
 admin/inc/hook_sidebox_menu.inc.php           | 106 -------------
 admin/setup/egw_de.lang                       |  32 +++-
 admin/setup/egw_en.lang                       |  22 ++-
 admin/setup/etemplates.inc.php                |  12 +-
 admin/templates/default/accesslog.xet         |  72 +++++++++
 11 files changed, 279 insertions(+), 414 deletions(-)
 create mode 100644 admin/inc/class.admin_accesslog.inc.php
 delete mode 100644 admin/inc/class.boaccess_history.inc.php
 delete mode 100644 admin/inc/class.soaccess_history.inc.php
 delete mode 100644 admin/inc/class.uiaccess_history.inc.php
 delete mode 100644 admin/inc/hook_sidebox_menu.inc.php
 create mode 100644 admin/templates/default/accesslog.xet

diff --git a/admin/inc/class.admin_accesslog.inc.php b/admin/inc/class.admin_accesslog.inc.php
new file mode 100644
index 0000000000..0c2290f412
--- /dev/null
+++ b/admin/inc/class.admin_accesslog.inc.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * eGgroupWare admin - accesslog
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @package admin
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+/**
+ * Show eGroupware access log
+ */
+class admin_accesslog
+{
+	/**
+	 * Which methods of this class can be called as menuation
+	 *
+	 * @var array
+	 */
+	public $public_functions = array(
+		'index' => true,
+	);
+
+	/**
+	 * Our storage object
+	 *
+	 * @var so_sql
+	 */
+	protected $so;
+
+	/**
+	 * Name of our table
+	 */
+	const TABLE = 'egw_access_log';
+	/**
+	 * Name of app the table is registered
+	 */
+	const APP = 'phpgwapi';
+
+	/**
+	 * Constructor
+	 *
+	 */
+	function __construct()
+	{
+		if ($GLOBALS['egw']->acl->check('access_log_access',1,'admin'))
+		{
+			$GLOBALS['egw']->redirect_link('/index.php');
+		}
+		$this->so = new so_sql(self::APP,self::TABLE,null,'',true);
+	}
+
+	/**
+	 * query rows for the nextmatch widget
+	 *
+	 * @param array $query with keys 'start', 'search', 'order', 'sort', 'col_filter'
+	 * @param array &$rows returned rows/competitions
+	 * @param array &$readonlys eg. to disable buttons based on acl, not use here, maybe in a derived class
+	 * @return int total number of rows
+	 */
+	function get_rows($query,&$rows,&$readonlys)
+	{
+		$total = $this->so->get_rows($query,$rows,$readonlys);
+
+		foreach($rows as &$row)
+		{
+			if ($row['lo']) $row['total'] = ($row['lo'] - $row['li']) / 60;
+		}
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('View Access Log').
+			($query['col_filter']['account_id'] ? ': '.common::grab_owner_name($query['col_filter']['account_id']) : '');
+
+		return $total;
+	}
+
+	/**
+	 * Display the accesslog
+	 *
+	 * @param array $content
+	 */
+	function index(array $content=null)
+	{
+		//_debug_array($content);
+
+		if(!isset($content))
+		{
+			$content['nm'] = array(
+				'get_rows'       =>	'admin.admin_accesslog.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+				'no_filter'      => True,	// I  disable the 1. filter
+				'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
+				'no_cat'         => True,	// I  disable the cat-selectbox
+				'header_left'    =>	false,	// I  template to show left of the range-value, left-aligned (optional)
+				'header_right'   =>	false,	// I  template to show right of the range-value, right-aligned (optional)
+				'never_hide'     => True,	// I  never hide the nextmatch-line if less then maxmatch entries
+				'lettersearch'   => false,	// I  show a lettersearch
+				'start'          =>	0,		// IO position in list
+				'order'          =>	'li',	// IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
+				//'default_cols'   => 	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
+				'csv_fields'     =>	false,	// I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
+								//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
+			);
+			if ((int)$_GET['account_id'])
+			{
+				$content['nm']['col_filter']['account_id'] = (int)$_GET['account_id'];
+			}
+		}
+		elseif(isset($content['nm']['rows']['delete']))
+		{
+			list($sessionid) = each($content['nm']['rows']['delete']);
+			unset($content['nm']['rows']['delete']);
+			if ($sessionid && $this->so->delete(array('sessionid' => $sessionid)))
+			{
+				$content['msg'] = lang('%1 log entries deleted.',1);
+			}
+			else
+			{
+				$content['msg'] = lang('Error deleting log entry!');
+			}
+		}
+		elseif(isset($content['delete']))
+		{
+			unset($content['delete']);
+			if (($deleted = $this->so->delete(array('sessionid' => $content['nm']['rows']['selected']))))
+			{
+				$content['msg'] = lang('%1 log entries deleted.',$deleted);
+			}
+			else
+			{
+				$content['msg'] = lang('Error deleting log entry!');
+			}
+		}
+		$content['percent'] = 100.0 * $GLOBALS['egw']->db->query(
+			'SELECT ((SELECT COUNT(*) FROM '.self::TABLE.' WHERE lo != 0) / COUNT(*)) FROM '.self::TABLE,
+			__LINE__,__FILE__)->fetchColumn();
+
+		$tmpl = new etemplate('admin.accesslog');
+		$tmpl->exec('admin.admin_accesslog.index',$content,$sel_options,$readonlys,array(
+			'nm' => $content['nm'],
+		));
+	}
+}
\ No newline at end of file
diff --git a/admin/inc/class.admin_prefs_sidebox_hooks.inc.php b/admin/inc/class.admin_prefs_sidebox_hooks.inc.php
index 5a68de132a..4560469d57 100644
--- a/admin/inc/class.admin_prefs_sidebox_hooks.inc.php
+++ b/admin/inc/class.admin_prefs_sidebox_hooks.inc.php
@@ -35,11 +35,11 @@ class admin_prefs_sidebox_hooks
 	{
 		$appname = 'admin';
 		$location = is_array($args) ? $args['location'] : $args;
-				
+
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && $location != 'admins')
 		{
-			
+
 			if (! $GLOBALS['egw']->acl->check('site_config_access',1,'admin'))
 			{
 				$file['Site Configuration']         = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=admin');
@@ -80,10 +80,10 @@ class admin_prefs_sidebox_hooks
 			{
 				$file['View Sessions'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions');
 			}
-			
+
 			if (! $GLOBALS['egw']->acl->check('access_log_access',1,'admin'))
 			{
-				$file['View Access Log'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiaccess_history.list_history');
+				$file['View Access Log'] = egw::link('/index.php','menuaction=admin.admin_accesslog.index');
 			}
 
 			if (! $GLOBALS['egw']->acl->check('error_log_access',1,'admin'))
@@ -121,10 +121,10 @@ class admin_prefs_sidebox_hooks
 			{
 				display_sidebox($appname,lang('Admin'),$file);
 			}
-	
+
 		}
 	}
-	
+
 	/**
 	 * populates $GLOBALS['settings'] for the preferences
 	 */
@@ -134,7 +134,7 @@ class admin_prefs_sidebox_hooks
 
 		return true;	// otherwise prefs say it cant find the file ;-)
 	}
-	
+
 	/**
 	 * Check if reasonable default preferences are set and set them if not
 	 *
diff --git a/admin/inc/class.boaccess_history.inc.php b/admin/inc/class.boaccess_history.inc.php
deleted file mode 100644
index 52179070a4..0000000000
--- a/admin/inc/class.boaccess_history.inc.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Administration                                              *
-	* http://www.egroupware.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$ */
-
-	class boaccess_history
-	{
-		function boaccess_history()
-		{
-			$this->so       =& CreateObject('admin.soaccess_history');
-		}
-
-		function list_history($account_id,$start,$order,$sort)
-		{
-			$records = $this->so->list_history($account_id,$start,$order,$sort);
-			while (is_array($records) && list(,$record) = each($records))
-			{
-				if ($record['li'] && $record['lo'])
-				{
-					$total = ($record['lo'] - $record['li']);
-					if ($total > 86400 && $total > 172800)
-					{
-						$total = gmdate('z \d\a\y\s - G:i:s',$total);
-					}
-					else if ($total > 172800)
-					{
-						$total = gmdate('z \d\a\y - G:i:s',$total);
-					}
-					else
-					{
-						$total = gmdate('G:i:s',$total);
-					}
-				}
-
-				if ($record['li'])
-				{
-					$record['li'] = $GLOBALS['egw']->common->show_date($record['li']);
-				}
-
-				if ($record['lo'])
-				{
-					$record['lo'] = $GLOBALS['egw']->common->show_date($record['lo']);
-				}
-				else
-				{
-					$record['lo'] = '';		// dont show a 0 for not loged out
-				}
-
-				if (ereg('@',$record['loginid']))
-				{
-					$t = split('@',$record['loginid']);
-					$record['loginid'] = $t[0];
-				}
-
-				$_records[] = array(
-					'loginid'    => $record['loginid'],
-					'ip'         => $record['ip'],
-					'li'         => $record['li'],
-					'lo'         => $record['lo'],
-					'account_id' => $record['account_id'],
-					'sessionid'  => $record['sessionid'],     
-					'total'      => $total
-				);
-			}
-			return $_records;
-		}
-
-		function total($account_id)
-		{
-			return $this->so->total($account_id);
-		}
-
-		function return_logged_out($account_id)
-		{
-			return $this->so->return_logged_out($account_id);
-		}
-	}
diff --git a/admin/inc/class.soaccess_history.inc.php b/admin/inc/class.soaccess_history.inc.php
deleted file mode 100644
index 0a3c3ece8d..0000000000
--- a/admin/inc/class.soaccess_history.inc.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Administration                                              *
-	* http://www.egroupware.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$ */
-
-	class soaccess_history
-	{
-		var $db;
-		var $table = 'egw_access_log';
-
-		function soaccess_history()
-		{
-			$this->db = clone($GLOBALS['egw']->db);
-			$this->db->set_app('phpgwapi');
-		}
-
-		function test_account_id($account_id)
-		{
-			if ($account_id)
-			{
-				return array('account_id' => $account_id);
-			}
-			return false;
-		}
-
-		function &list_history($account_id,$start,$order,$sort)
-		{
-			$where = $this->test_account_id($account_id);
-
-			$this->db->select($this->table,'loginid,ip,li,lo,account_id,sessionid',$where,__LINE__,__FILE__,(int) $start,'ORDER BY li DESC');
-			while (($row = $this->db->row(true)))
-			{
-				$records[] = $row;
-			}
-			return $records;
-		}
-
-		function total($account_id)
-		{
-			$where = $this->test_account_id($account_id);
-
-			$this->db->select($this->table,'COUNT(*)',$where,__LINE__,__FILE__);
-
-			return $this->db->next_record() ? $this->db->f(0) : 0;
-		}
-
-		function return_logged_out($account_id)
-		{
-			$where = array('lo != 0');
-			if ($account_id)
-			{
-				$where['account_id'] = $account_id;
-			}
-			$this->db->select($this->table,'COUNT(*)',$where,__LINE__,__FILE__);
-			
-			return $this->db->next_record() ? $this->db->f(0) : 0;
-		}
-	}
diff --git a/admin/inc/class.uiaccess_history.inc.php b/admin/inc/class.uiaccess_history.inc.php
deleted file mode 100644
index 75b824e2f8..0000000000
--- a/admin/inc/class.uiaccess_history.inc.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Administration                                              *
-	* http://www.egroupware.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$ */
-
-	class uiaccess_history
-	{
-		var $template;
-		var $public_functions = array(
-			'list_history' => True
-		);
-
-		function uiaccess_history()
-		{
-			if ($GLOBALS['egw']->acl->check('access_log_access',1,'admin'))
-			{
-				$GLOBALS['egw']->redirect_link('/index.php');
-			}
-			
-			$this->bo         =& CreateObject('admin.boaccess_history');
-			$this->nextmatchs =& CreateObject('phpgwapi.nextmatchs');
-			$this->template   = $GLOBALS['egw']->template;
-			$this->template->set_file(
-				Array(
-					'accesslog' => 'accesslog.tpl'
-				)
-			);
-			$this->template->set_block('accesslog','list');
-			$this->template->set_block('accesslog','row');
-			$this->template->set_block('accesslog','row_empty');
-		}
-
-		function list_history()
-		{
-			$account_id = get_var('account_id',array('GET','POST'));
-			$start = get_var('start',array('POST'),0);
-			$sort = get_var('sort',array('POST'),0);
-			$order = get_var('order',array('POST'),0);
-			
-			$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('View access log');
-			$GLOBALS['egw']->js->validate_file('jscode','openwindow','admin');
-			$GLOBALS['egw']->common->egw_header();
-			echo parse_navbar();
-
-			$total_records = $this->bo->total($account_id);
-
-			$var = Array(
-				'th_bg'       => $GLOBALS['egw_info']['theme']['th_bg'],
-				'nextmatchs_left'  => $this->nextmatchs->left('/index.php',$start,$total_records,'&menuaction=admin.uiaccess_history.list_history&account_id=' . $account_id),
-				'nextmatchs_right' => $this->nextmatchs->right('/index.php',$start,$total_records,'&menuaction=admin.uiaccess_history.list_history&account_id=' . $account_id),
-				'showing'          => $this->nextmatchs->show_hits($total_records,$start),
-				'lang_loginid'     => lang('LoginID'),
-				'lang_ip'     => lang('IP'),
-				'lang_login'  => lang('Login'),
-				'lang_logout' => lang('Logout'),
-				'lang_total'  => lang('Total')
-			);
-
-			if ($account_id)
-			{
-				$var['link_return_to_view_account'] = '<a href="' . $GLOBALS['egw']->link('/index.php',
-					Array(
-						'menuaction' => 'admin.uiaccounts.view',
-						'account_id' => $account_id
-					)
-				) . '">' . lang('Return to view account') . '</a>';
-				$var['lang_last_x_logins'] = lang('Last %1 logins for %2',$total_records,$GLOBALS['egw']->common->grab_owner_name($account_id));
-			}
-			else
-			{
-				$var['lang_last_x_logins'] = lang('Last %1 logins',$total_records);
-			}
-
-			$this->template->set_var($var);
-
-			$records = $this->bo->list_history($account_id,$start,$order,$sort);
-			while (is_array($records) && list(,$record) = each($records))
-			{
-				$this->nextmatchs->template_alternate_row_color($this->template);
-
-				$var = array(
-					'row_loginid' => $record['loginid'],
-					'row_ip'      => $record['ip'],
-					'row_li'      => $record['li'],
-					'row_lo'      => $record['account_id'] ? $record['lo'] : '<b>'.lang($record['sessionid']).'</b>',
-					'row_total'   => ($record['lo']?$record['total']:'&nbsp;')
-				);
-				$this->template->set_var($var);
-				$this->template->fp('rows_access','row',True);
-			}
-
-			if (! $total_records && $account_id)
-			{
-				$this->nextmatchs->template_alternate_row_color($this->template);
-				$this->template->set_var('row_message',lang('No login history exists for this user'));
-				$this->template->fp('rows_access','row_empty',True);
-			}
-
-			$loggedout = $this->bo->return_logged_out($account_id);
-
-			if ($total_records)
-			{
-				$percent = round((10000 * ($loggedout / $total_records)) / 100);
-			}
-			else
-			{
-				$percent = '0';
-			}
-
-			$var = Array(
-				'bg_color'     => $GLOBALS['egw_info']['themes']['bg_color'],
-				'footer_total' => lang('Total records') . ': ' . $total_records
-			);
-			if ($account_id)
-			{
-				$var['lang_percent'] = lang('Percent this user has logged out') . ': ' . $percent . '%';
-			}
-			else
-			{
-				$var['lang_percent'] = lang('Percent of users that logged out') . ': ' . $percent . '%';
-			}
-
-			// create the menu on the left, if needed
-			$menuClass =& CreateObject('admin.uimenuclass');
-			$var['rows'] = $menuClass->createHTMLCode('view_account');
-
-			$this->template->set_var($var);
-			$this->template->pfp('out','list');
-		}
-	}
diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 19b3194dd3..79c6585b1f 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -810,7 +810,7 @@
 				$GLOBALS['menuData'][] = array(
 					'description' => 'Login History',
 					'url'         => '/index.php',
-					'extradata'   => 'menuaction=admin.uiaccess_history.list_history'
+					'extradata'   => 'menuaction=admin.admin_accesslog.index'
 				);
 			}
 			// not sure if this realy belongs here, or only in edit_user
diff --git a/admin/inc/hook_sidebox_menu.inc.php b/admin/inc/hook_sidebox_menu.inc.php
deleted file mode 100644
index ca874e572a..0000000000
--- a/admin/inc/hook_sidebox_menu.inc.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare                                                               *
-	* http://www.egroupware.org                                                *
-	* Written by Pim Snel <pim@lingewoud.nl>                                   *
-	* --------------------------------------------                             *
-	*  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$ */
-	{
-
-	/*
-		This hookfile is for generating an app-specific side menu used in the idots 
-		template set.
-
-		$menu_title speaks for itself
-		$file is the array with link to app functions
-
-		display_sidebox can be called as much as you like
-	*/
-
-		$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
-		$file = array();
-
-		if (! $GLOBALS['egw']->acl->check('site_config_access',1,'admin'))
-		{
-			$file['Site Configuration']         = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=admin');
-		}
-/*
-		if (! $GLOBALS['egw']->acl->check('peer_server_access',1,'admin'))
-		{
-			$file['Peer Servers']               = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiserver.list_servers');
-		}
-*/
-		if (! $GLOBALS['egw']->acl->check('account_access',1,'admin'))
-		{
-			$file['User Accounts']              = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiaccounts.list_users');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('group_access',1,'admin'))
-		{
-			$file['User Groups']                = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiaccounts.list_groups');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('applications_access',1,'admin'))
-		{
-			$file['Applications']               = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiapplications.get_list');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('global_categories_access',1,'admin'))
-		{
-			$file['Global Categories']          = $GLOBALS['egw']->link('/index.php','menuaction=admin.uicategories.index');
-		}
-
-		if (!$GLOBALS['egw']->acl->check('mainscreen_message_access',1,'admin') || !$GLOBALS['egw']->acl->check('mainscreen_message_access',2,'admin'))
-		{
-			$file['Change Main Screen Message'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('current_sessions_access',1,'admin'))
-		{
-			$file['View Sessions'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('access_log_access',1,'admin'))
-		{
-			$file['View Access Log'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiaccess_history.list_history');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('error_log_access',1,'admin'))
-		{
-			$file['View Error Log']  = $GLOBALS['egw']->link('/index.php','menuaction=admin.uilog.list_log');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('applications_access',16,'admin'))
-		{
-			$file['Find and Register all Application Hooks'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiapplications.register_all_hooks');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('asyncservice_access',1,'admin'))
-		{
-			$file['Asynchronous timed services'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.uiasyncservice.index');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('db_backup_access',1,'admin'))
-		{
-			$file['DB backup and restore'] = $GLOBALS['egw']->link('/index.php','menuaction=admin.admin_db_backup.index');
-		}
-
-		if (! $GLOBALS['egw']->acl->check('info_access',1,'admin'))
-		{
-			$file['phpInfo']         = "javascript:openwindow('" . $GLOBALS['egw']->link('/admin/phpinfo.php') . "')";
-		}
-
-		if($GLOBALS['egw_info']['flags']['currentapp'] =='admin')
-		{
-		   $menu_title = 'Administration';
-		   $file = array();
-
-		   display_sidebox($appname,$menu_title,$file);
-		}
-	 }
diff --git a/admin/setup/egw_de.lang b/admin/setup/egw_de.lang
index aa5bea5d58..a8dbb68ff5 100644
--- a/admin/setup/egw_de.lang
+++ b/admin/setup/egw_de.lang
@@ -4,6 +4,7 @@
 %1 class not instanciated	admin	de	%1 Klasse nicht instanziert
 %1 group %2	admin	de	%1 Gruppe %2
 %1 is no command!	admin	de	%1 ist kein Kommando!
+%1 log entries deleted.	admin	de	%1 Protokolleinträge gelöscht.
 %1 not found or not executable !!!	admin	de	%1 nicht gefunden oder nicht ausführbar!!!
 %1 rights for %2 and applications %3	admin	de	%1 Rechte für %2 und Anwendung(en) %3
 %1 user %2	admin	de	%1 Benutzer %2
@@ -29,13 +30,14 @@ activate wysiwyg-editor	admin	de	WYSIWYG Editor (formatierter Text) aktivieren
 add a category	admin	de	Eine Kategorie hinzufügen
 add a group	admin	de	Eine Gruppe hinzufügen
 add a new account.	admin	de	Neues Benutzerkonto anlegen
+add a new remote instance	admin	de	Eine neue entfernte Instanz hinzufügen
 add a subcategory	admin	de	Ein Unterkategorie hizufügen
 add a user	admin	de	Einen Benutzer hinzufügen
 add account	admin	de	Benutzerkonto hinzufügen
 add application	admin	de	Anwendung hinzufügen
 add auto-created users to this group ('default' will be attempted if this is empty.)	admin	de	Automatisch erzeuge Benutzer in diese Gruppe aufnehmen ("default" wird versucht wenn sie hier nichts eintragen.)
-add global category	admin	de	Globale Kategorie hinzuf&uuml;gen
-add global category for %1	admin	de	Globale Kategorie f&uuml;r %1 hinzuf&uuml;gen
+add global category	admin	de	Globale Kategorie hinzufügen
+add global category for %1	admin	de	Globale Kategorie für %1 hinzufügen
 add group	admin	de	Gruppe hinzufügen
 add new account	admin	de	Neues Benutzerkonto hinzufügen
 add new application	admin	de	Neue Anwendung hinzufügen
@@ -51,7 +53,7 @@ advanced options	admin	de	erweiterte Optionen
 after how many unsuccessful attempts to login, an account should be blocked (default 3) ?	admin	de	Nach wievielen erfolglosen Versuchen sich anzumelden, soll ein Benutzerkonto gesperrt werden (Vorgabe 3)?
 after how many unsuccessful attempts to login, an ip should be blocked (default 3) ?	admin	de	Nach wievielen erfolglosen Versuchen sich anzumelden soll eine IP-Adresse gesperrt werden (Vorgabe 3)?
 aliases	admin	de	E-Mail-Alias
-all records and account information will be lost!	admin	de	Alle Datens&auml;tze und Kontoinformationen sind dann verloren!
+all records and account information will be lost!	admin	de	Alle Datensätze und Kontoinformationen sind dann verloren!
 all users	admin	de	Alle Benutzer
 allow anonymous access to this app	admin	de	Anonymen Zugriff auf diese Anwendung zulassen
 allow remote administration from following install id's (comma separated)	admin	de	Erlaube die Remote-Verwaltung  identifiziert durch folgende (Komma separierte) Install IDs
@@ -69,6 +71,7 @@ applications	admin	de	Anwendungen
 applications list	admin	de	Liste der Anwendungen
 applications run rights updated.	admin	de	Anwendungsrechte aktualisiert.
 applies the changes	admin	de	übernimmt Änderungen
+apply the changes	admin	de	Änderungen übernehmen
 are you sure you want to delete the application %1 ?	admin	de	Sind Sie sicher, dass Sie die Anwendung %1 löschen wollen?
 are you sure you want to delete this account ?	admin	de	Sind Sie sicher, dass Sie dieses Konto löschen wollen?
 are you sure you want to delete this application ?	admin	de	Sind Sie sicher, dass Sie diese Applikation löschen möchten?
@@ -94,6 +97,7 @@ bottom	admin	de	unten
 calculate next run	admin	de	nächste Ausführung berechnen
 can change password	admin	de	Darf Passwort ändern
 cancel testjob!	admin	de	Testjob abbrechen!
+cancel this scheduled command	admin	de	Dieses geplante Komando abbrechen
 categories list	admin	de	Liste der Kategorien
 category %1 has been saved !	admin	de	Kategorie %1 wurde gespeichert
 category list	admin	de	Kategorieliste
@@ -135,10 +139,12 @@ delete application	admin	de	Anwendung löschen
 delete category	admin	de	Kategorie löschen
 delete group	admin	de	Gruppe löschen
 delete peer server	admin	de	Server von Serververbund löschen
+delete selected entries	admin	de	Ausgewählte Einträge löschen
 delete the category	admin	de	Kategorie löschen
 delete the group	admin	de	Gruppe löschen
 delete this category	admin	de	Kategorie löschen
 delete this group	admin	de	Gruppe löschen
+delete this log entry	admin	de	Diesen Protokolleintrag löschen
 delete this user	admin	de	Benutzer löschen
 deletes this field	admin	de	löscht dieses Feld
 deliver extern	admin	de	Extern ausliefern
@@ -164,7 +170,7 @@ disable wysiwyg-editor	admin	de	WYSIWYG Editor (formatierter Text) abschalten
 disabled (not recomended)	admin	de	abgeschaltet (nicht empfohlen)
 display	admin	de	Anzeigen
 do not delete the category and return back to the list	admin	de	Kategorie NICHT löschen und zurück zur Liste gehen
-do you also want to delete all global subcategories ?	admin	de	wollen Sie auch alle globalen Unterkategorien l&ouml;schen?
+do you also want to delete all global subcategories ?	admin	de	wollen Sie auch alle globalen Unterkategorien löschen?
 do you want to delete all global subcategories ?	admin	de	Möchten Sie alle Globale Unterkategorien löschen?
 do you want to move all global subcategories one level down ?	admin	de	Wollen sie alle globalen Unterkategorien eine Ebene nach unten verschieben?
 document root (default)	admin	de	Wurzelverzeichnis des Webservers (Vorgabe)
@@ -222,6 +228,7 @@ enter your smtp server port	admin	de	SMTP-Server Port
 error canceling timer, maybe there's none set !!!	admin	de	Fehler beim Abbrechen des Testjobs, eventuell läuft gar keiner!!!
 error changing the password for % !!!	admin	de	Fehler beim Ändern des Passworts für % !!!
 error changing the password for %1 !!!	admin	de	Fehler beim Ändern des Passworts für %1 !
+error deleting log entry!	admin	de	Fehler beim Löschen des Protokolleintrags!
 error saving	admin	de	Fehler beim Speichern
 error saving account!	admin	de	Fehler beim Speichern des Benutzerkontos!
 error saving the command!	admin	de	Fehler beim Speichern des Befehls!
@@ -269,8 +276,10 @@ in mbyte	admin	de	in MByte
 inbound	admin	de	eingehend
 initial	admin	de	Anfangsbuchstabe
 install crontab	admin	de	Crontab installieren
+install id	admin	de	Installations ID
 installed applications	common	de	Installierte Anwendungen
 installed crontab	admin	de	Installierte Crontab
+instance	admin	de	Instanz
 interface	admin	de	Schnittstelle
 invalid formated date "%1"!	admin	de	Ungültig formatiertes Datum "%1"!
 invalid remote id or name "%1"!	admin	de	Ungültige RemoteID oder Name "%1"!
@@ -295,17 +304,19 @@ ldap rootdn	admin	de	LDAP rootdn
 leave empty for no quota	admin	de	Leer lassen für keine Quota
 leave the category untouched and return back to the list	admin	de	Kategorie unverändert lassen und zur Liste zurückkehren
 leave the group untouched and return back to the list	admin	de	Gruppe unverändert lassen und zur Liste zurückkehren
+leave without saveing the entry	admin	de	beendet ohne den Eintrag zu speichern
 leaves without saveing	admin	de	beendet ohne zu speichern
 length<br>rows	admin	de	Länge<br>Zeilen
 list config settings	admin	de	Konfigurationseinstellungen auflisten
 list current sessions	admin	de	aktive Sitzungen anzeigen
 list of current users	admin	de	Liste der gegenwärtigen Benutzer
-login history	common	de	Login-Kontrolle
+login history	admin	de	Login-Kontrolle
 login message	admin	de	Meldung der Login-Seite
 login screen	admin	de	Login-Seite
 login shell	admin	de	Login-Komandointerpreter (Login-Shell)
-login time	admin	de	Login-Zeit
 loginid	admin	de	Login-ID
+logintime	admin	de	Anmeldezeit
+logoutime	admin	de	Abmeldezeit
 mail settings	admin	de	E-Mail-Einstellungen
 main email-address	admin	de	Stamm-E-Mail-Adresse
 main screen message	admin	de	Nachricht der Startseite
@@ -322,6 +333,7 @@ modified	admin	de	Geändert
 month	admin	de	Monat
 more secure	admin	de	sicherer
 name must not be empty !!!	admin	de	Name darf nicht leer sein !!!
+name of the egroupware instance, eg. default	admin	de	Name der eGroupware Instanz, z.B. default
 new group name	admin	de	Neuer Gruppenname
 new name	admin	de	neuer Name
 new password [ leave blank for no change ]	admin	de	Neues Passwort [ Feld leerlassen, wenn das Passwort nicht geändert werden soll ]
@@ -372,6 +384,7 @@ remote instance saved	admin	de	Remote Instanz gespeichert
 remove	admin	de	Entfernen
 remove all users from this group	admin	de	Entferne alle Benutzer aus dieser Gruppe
 remove all users from this group ?	admin	de	Entferne alle Benutzer aus dieser Gruppe
+requested	admin	de	Angefordert
 return to admin mainscreen	admin	de	zum Adminstrationsmenü zurückkehren
 return to view account	admin	de	Zurück zum Anzeigen des Benutzerkontos
 route all mails to	admin	de	Alle Mails senden an
@@ -379,11 +392,14 @@ run asynchronous services	admin	de	Asynchrone Dienste ausführen
 save the category	admin	de	Kategorie speichern
 save the category and return back to the list	admin	de	Kategorie speichern und zur Liste zurückkehren
 saves the changes made and leaves	admin	de	beendet und speichert die Änderungen
+saves this entry	admin	de	Speichert diesen Eintrag
+scheduled	admin	de	geplant
 search accounts	admin	de	Benutzerkonten durchsuchen
 search categories	admin	de	Kategorien durchsuchen
 search groups	admin	de	Gruppen durchsuchen
 search peer servers	admin	de	Serververbund durchsuchen
 security	admin	de	Sicherheit
+select accounts for which the custom field should be visible	admin	de	Benutzer auswählen, für die dieses benutzerdefinierte Feld sichtbar sein soll
 select group managers	admin	de	Gruppenmanager auswählen
 select permissions this group will have	admin	de	Wählen Sie die Zugriffsrechte für diese Gruppe.
 select the parent category. if this is a main category select no category	admin	de	Eine übergeordnete Kategorie auswählen. Wenn das eine Hauptkategorie ist, KEINE KATEGORIE auswählen.
@@ -434,6 +450,7 @@ that server name has been used already !	admin	de	Dieser Server-Name wird bereit
 the api is current	admin	de	Die API ist aktuell
 the api requires an upgrade	admin	de	Die API benötigt ein Upgrade
 the groups must include the primary group	admin	de	Die Gruppen müssen die primäre Gruppe beinhalten
+the install id of an instance can be found under admin > site configuration	admin	de	Id Installations ID für diese Instanz wird unter Addmin >> Konfiguration der Anwendung angezeigt
 the login and password can not be the same	admin	de	Benutzername und Passwort dürfen nicht identisch sein
 the loginid can not be more then 8 characters	admin	de	Der Benutzername darf nich länger als 8 Zeichen sein
 the name used internaly (<= 20 chars), changeing it makes existing data unavailible	admin	de	intern benutzer Name (<= 20 buchstaben), veränderungen machen existierende Daten unerreichbar
@@ -445,7 +462,7 @@ there already is a group with this name. userid's can not have the same name as
 they must be removed before you can continue	admin	de	Sie müssen zuvor aus dieser entfernt werden
 this application is current	admin	de	Diese Anwendung ist aktuell
 this application requires an upgrade	admin	de	Diese Anwednung benötigt ein Upgrade
-this category is currently being used by applications as a parent category	admin	de	Diese Kategorie wird gegenw&auml;rtig als &uuml;bergeordnete Kategorie benutzt.
+this category is currently being used by applications as a parent category	admin	de	Diese Kategorie wird gegenwärtig als übergeordnete Kategorie benutzt.
 timeout for application session data in seconds (default 86400 = 1 day)	admin	de	Zeit nach der Anwendungsdaten der Sitzung gelöscht werden in Sekunden (Vorgabe 86400 = 1 Tag)
 timeout for sessions in seconds (default 14400 = 4 hours)	admin	de	Zeit nach der Sitzungen verfallen (Vorgabe 14400 = 4 Stunden)
 times	admin	de	Zeiten
@@ -462,6 +479,7 @@ unknown account: %1 !!!	admin	de	Unbekanntes Benutzerkonto: %1 !!!
 unknown command %1!	admin	de	Unbekanntes Kommando %1 !
 unknown option %1	admin	de	Unbekannte Option %1
 updated	admin	de	aktualisiert
+url of the egroupware installation, eg. http://domain.com/egroupware	admin	de	URL der eGroupware Installation, z.B. http://domain.com/egroupware
 use cookies to pass sessionid	admin	de	SitzungsId in einem Cookie speichern
 use pure html compliant code (not fully working yet)	admin	de	Vollständig HTML kompatiblen Code verwenden (nicht vollständig implementiert)
 use theme	admin	de	Benutztes Farbschema
diff --git a/admin/setup/egw_en.lang b/admin/setup/egw_en.lang
index 6c9e976dc8..74cd9adf10 100644
--- a/admin/setup/egw_en.lang
+++ b/admin/setup/egw_en.lang
@@ -4,6 +4,7 @@
 %1 class not instanciated	admin	en	%1 class not instanciated
 %1 group %2	admin	en	%1 group %2
 %1 is no command!	admin	en	%1 is no command!
+%1 log entries deleted.	admin	en	%1 log entries deleted.
 %1 not found or not executable !!!	admin	en	%1 not found or not executable !!!
 %1 rights for %2 and applications %3	admin	en	%1 rights for %2 and applications %3
 %1 user %2	admin	en	%1 user %2
@@ -29,6 +30,7 @@ activate wysiwyg-editor	admin	en	activate WYSIWYG-editor
 add a category	admin	en	add a category
 add a group	admin	en	add a group
 add a new account.	admin	en	Add a new account.
+add a new remote instance	admin	en	Add a new remote instance
 add a subcategory	admin	en	add a subcategory
 add a user	admin	en	add a user
 add account	admin	en	Add account
@@ -69,6 +71,7 @@ applications	admin	en	Applications
 applications list	admin	en	Applications list
 applications run rights updated.	admin	en	Applications run rights updated.
 applies the changes	admin	en	applies the changes
+apply the changes	admin	en	Apply the changes
 are you sure you want to delete the application %1 ?	admin	en	Are you sure you want to delete the application %1 ?
 are you sure you want to delete this account ?	admin	en	Are you sure you want to delete this account ?
 are you sure you want to delete this application ?	admin	en	Are you sure you want to delete this application ?
@@ -94,6 +97,7 @@ bottom	admin	en	bottom
 calculate next run	admin	en	Calculate next run
 can change password	admin	en	Can change password
 cancel testjob!	admin	en	Cancel TestJob!
+cancel this scheduled command	admin	en	Cancel this scheduled command
 categories list	admin	en	Categories list
 category %1 has been saved !	admin	en	Category %1 has been saved !
 category list	admin	en	Category list
@@ -135,10 +139,12 @@ delete application	admin	en	Delete application
 delete category	admin	en	Delete category
 delete group	admin	en	Delete group
 delete peer server	admin	en	Delete peer server
+delete selected entries	admin	en	Delete selected entries
 delete the category	admin	en	delete the category
 delete the group	admin	en	delete the group
 delete this category	admin	en	delete this category
 delete this group	admin	en	delete this group
+delete this log entry	admin	en	Delete this log entry
 delete this user	admin	en	delete this user
 deletes this field	admin	en	deletes this field
 deliver extern	admin	en	deliver extern
@@ -220,6 +226,7 @@ enter your smtp server port	admin	en	Enter your SMTP server port
 error canceling timer, maybe there's none set !!!	admin	en	Error canceling timer, maybe there's none set !!!
 error changing the password for % !!!	admin	en	Error changing the password for % !!!
 error changing the password for %1 !!!	admin	en	Error changing the password for %1 !!!
+error deleting log entry!	admin	en	Error deleting log entry!
 error saving	admin	en	Error saving
 error saving account!	admin	en	Error saving account!
 error saving the command!	admin	en	Error saving the command!
@@ -267,8 +274,10 @@ in mbyte	admin	en	in MByte
 inbound	admin	en	inbound
 initial	admin	en	Initial
 install crontab	admin	en	Install crontab
+install id	admin	en	Install ID
 installed applications	common	en	Installed applications
 installed crontab	admin	en	Installed crontab
+instance	admin	en	Instance
 interface	admin	en	Interface
 invalid formated date "%1"!	admin	en	Invalid formated date "%1"!
 invalid remote id or name "%1"!	admin	en	Invalid remote id or name "%1"!
@@ -293,17 +302,19 @@ ldap rootdn	admin	en	LDAP rootdn
 leave empty for no quota	admin	en	leave empty for no quota
 leave the category untouched and return back to the list	admin	en	leave the category untouched and return back to the list
 leave the group untouched and return back to the list	admin	en	Leave the group untouched and return back to the list
+leave without saveing the entry	admin	en	leave without saveing the entry
 leaves without saveing	admin	en	leaves without saveing
 length<br>rows	admin	en	Length<br>Rows
 list config settings	admin	en	List config settings
 list current sessions	admin	en	List current sessions
 list of current users	admin	en	list of current users
-login history	common	en	Login History
+login history	admin	en	Login History
 login message	admin	en	Login message
 login screen	admin	en	Login screen
 login shell	admin	en	Login shell
-login time	admin	en	Login Time
 loginid	admin	en	LoginID
+logintime	admin	en	Logintime
+logoutime	admin	en	Logoutime
 mail settings	admin	en	Mail settings
 main email-address	admin	en	Main Email-Address
 main screen message	admin	en	Main screen message
@@ -320,6 +331,7 @@ modified	admin	en	Modified
 month	admin	en	Month
 more secure	admin	en	more secure
 name must not be empty !!!	admin	en	Name must not be empty !!!
+name of the egroupware instance, eg. default	admin	en	Name of the eGroupWare instance, eg. default
 new group name	admin	en	New group name
 new name	admin	en	new name
 new password [ leave blank for no change ]	admin	en	New password [ Leave blank for no change ]
@@ -370,6 +382,7 @@ remote instance saved	admin	en	Remote instance saved
 remove	admin	en	remove
 remove all users from this group	admin	en	Remove all users from this group
 remove all users from this group ?	admin	en	Remove all users from this group ?
+requested	admin	en	Requested
 return to admin mainscreen	admin	en	return to admin mainscreen
 return to view account	admin	en	Return to view account
 route all mails to	admin	en	Route all Mails to
@@ -377,11 +390,14 @@ run asynchronous services	admin	en	Run Asynchronous services
 save the category	admin	en	save the category
 save the category and return back to the list	admin	en	save the category and return back to the list
 saves the changes made and leaves	admin	en	saves the changes made and leaves
+saves this entry	admin	en	Saves this entry
+scheduled	admin	en	Scheduled
 search accounts	admin	en	Search accounts
 search categories	admin	en	Search categories
 search groups	admin	en	Search groups
 search peer servers	admin	en	Search peer servers
 security	admin	en	Security
+select accounts for which the custom field should be visible	admin	en	Select accounts for which the custom field should be visible
 select group managers	admin	en	Select Group Managers
 select permissions this group will have	admin	en	Select permissions this group will have
 select the parent category. if this is a main category select no category	admin	en	Select the parent category. If this is a main category select NO CATEGORY
@@ -432,6 +448,7 @@ that server name has been used already !	admin	en	That server name has been used
 the api is current	admin	en	The API is current
 the api requires an upgrade	admin	en	The API requires an upgrade
 the groups must include the primary group	admin	en	The groups must include the primary group
+the install id of an instance can be found under admin > site configuration	admin	en	The install ID of an instance can be found under Admin > Site configuration
 the login and password can not be the same	admin	en	The login and password can not be the same
 the loginid can not be more then 8 characters	admin	en	The loginid can not be more then 8 characters
 the name used internaly (<= 20 chars), changeing it makes existing data unavailible	admin	en	the name used internaly (<= 20 chars), changeing it makes existing data unavailible
@@ -460,6 +477,7 @@ unknown account: %1 !!!	admin	en	Unknown account: %1 !!!
 unknown command %1!	admin	en	Unknown command %1!
 unknown option %1	admin	en	Unknown option %1
 updated	admin	en	updated
+url of the egroupware installation, eg. http://domain.com/egroupware	admin	en	URL of the eGroupWare installation, eg. http://domain.com/egroupware
 use cookies to pass sessionid	admin	en	Use cookies to pass sessionid
 use pure html compliant code (not fully working yet)	admin	en	Use pure HTML compliant code (not fully working yet)
 use theme	admin	en	Use theme
diff --git a/admin/setup/etemplates.inc.php b/admin/setup/etemplates.inc.php
index d299d6ea35..96333831fd 100644
--- a/admin/setup/etemplates.inc.php
+++ b/admin/setup/etemplates.inc.php
@@ -1,8 +1,8 @@
 <?php
 /**
 	* eGroupWare - eTemplates for Application admin
-	* http://www.egroupware.org 
-	* generated by soetemplate::dump4setup() 2008-06-11 09:00
+	* http://www.egroupware.org
+	* generated by soetemplate::dump4setup() 2009-04-27 12:29
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package admin
@@ -14,8 +14,12 @@ $templ_version=1;
 
 $templ_data[] = array('name' => 'admin.accesslog','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:24:"admin.accesslog.get_rows";s:4:"name";s:2:"nm";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164479537',);
 
+$templ_data[] = array('name' => 'admin.accesslog','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:4:"rows";s:4:"name";s:2:"nm";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:32:"Percent of users that logged out";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:5:"float";s:4:"name";s:7:"percent";s:4:"size";s:4:",,,1";s:5:"label";s:6:": %s %";s:8:"readonly";s:1:"1";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:6:{s:4:"type";s:6:"button";s:4:"name";s:6:"delete";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:23:"Delete selected entries";s:7:"onclick";s:46:"return confirm(\'Delete the selected entries\');";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"size";s:9:"arrow_ltr";s:7:"onclick";s:71:"toggle_all(this.form,form::name(\'nm[rows][selected][]\')); return false;";s:4:"span";s:15:",selectAllArrow";}}}}s:4:"rows";i:3;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.selectAllArrow { padding-right: 12px; }','modified' => '1240661952',);
+
 $templ_data[] = array('name' => 'admin.accesslog.get_rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{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:3:"row";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"LoginID";s:4:"name";s:7:"loginid";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:2:"IP";s:4:"name";s:2:"ip";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Logintime";s:4:"name";s:2:"li";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Logoutime";s:4:"name";s:2:"lo";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[loginid]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"${row}[ip]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:10:"${row}[li]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:10:"${row}[lo]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1164479930',);
 
+$templ_data[] = array('name' => 'admin.accesslog.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"F";s:2:"1%";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"size";s:7:"LoginID";s:4:"name";s:10:"account_id";}s:1:"B";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:2:"IP";s:4:"name";s:2:"ip";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Login";s:4:"name";s:2:"li";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:6:"Logout";s:4:"name";s:2:"lo";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Total";s:4:"name";s:5:"total";}s:1:"F";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"size";s:5:"check";s:5:"label";s:10:"Select all";s:7:"onclick";s:61:"toggle_all(this.form,form::name(\'selected[]\')); return false;";}}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[account_id]";s:8:"readonly";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:10:"${row}[ip]";}s:1:"C";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:10:"${row}[li]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:10:"${row}[lo]";s:8:"readonly";s:1:"1";}s:1:"E";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:13:"${row}[total]";s:8:"readonly";s:1:"1";s:4:"size";s:6:",hm,24";}s:1:"F";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:28:"delete[$row_cont[sessionid]]";s:4:"help";s:21:"Delete this log entry";s:7:"onclick";s:40:"return confirm(\'Delete this log entry\');";}i:2;a:3:{s:4:"type";s:8:"checkbox";s:4:"size";s:20:"$row_cont[sessionid]";s:4:"name";s:10:"selected[]";}s:5:"align";s:6:"center";}}}s:4:"rows";i:2;s:4:"cols";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1240658367',);
+
 $templ_data[] = array('name' => 'admin.cmds','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:15:"admin.cmds.rows";s:4:"name";s:2:"nm";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1195518120',);
 
 $templ_data[] = array('name' => 'admin.cmds.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"h2";s:4:",!@1";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Title";s:4:"name";s:5:"title";}s:1:"B";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Requested";s:4:"name";s:9:"requested";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Scheduled";s:4:"name";s:13:"cmd_scheduled";}s:1:"D";a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Remote";s:4:"name";s:9:"remote_id";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:11:"cmd_created";}s:1:"F";a:3:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:7:"creator";s:4:"size";s:7:"Creator";}s:1:"G";a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"name";s:6:"status";s:4:"size";s:6:"Status";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:12:"cmd_modified";}s:1:"I";a:3:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"size";s:8:"Modifier";s:4:"name";s:8:"modifier";}s:1:"J";a:1:{s:4:"type";s:5:"label";}}i:2;a:10:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"B";a:4:{s:4:"type";s:9:"url-email";s:4:"name";s:17:"${row}[requested]";s:4:"size";s:29:",,,$row_cont[requested_email]";s:8:"readonly";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:17:"${row}[scheduled]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:6:"select";s:4:"name";s:17:"${row}[remote_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";}s:1:"F";a:4:{s:4:"type";s:9:"url-email";s:4:"name";s:15:"${row}[creator]";s:4:"size";s:27:",,,$row_cont[creator_email]";s:8:"readonly";s:1:"1";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[error]";s:4:"span";s:10:",redItalic";}}s:1:"H";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";}s:1:"I";a:4:{s:4:"type";s:9:"url-email";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";s:4:"size";s:28:",,,$row_cont[modifier_email]";}s:1:"J";a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Cancel";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"help";s:29:"Cancel this scheduled command";s:7:"onclick";s:48:"return confirm(\'Cancel this scheduled command\');";}}}s:4:"rows";i:2;s:4:"cols";i:10;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1195518170',);
@@ -25,6 +29,10 @@ $templ_data[] = array('name' => 'admin.customfields','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'admin.customfields','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:1:{s:1:"G";s:3:"80%";}i:1;a:7:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:9:"error_msg";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:13:"content_types";s:4:"span";s:3:"all";s:4:"name";s:24:"admin.customfields.types";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:3;a:7:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:4;a:7:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:25:"admin.customfields.fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:5;a:7:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:7;}}','size' => '','style' => '.redItalic { color: red; font-style: italics; }','modified' => '1131453292',);
 
+$templ_data[] = array('name' => 'admin.customfields.fields','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"C";s:8:",!@type2";}i:1;a:8:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:3:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:13:"${row}[type2]";}s:1:"D";a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"{$row}[type]";s:7:"no_lang";s:1:"1";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1130250309',);
+
+$templ_data[] = array('name' => 'admin.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"C";s:8:",!@type2";}i:1;a:8:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subtype";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:13:"${row}[type2]";s:7:"no_lang";s:1:"1";}s:1:"D";a:4:{s:4:"type";s:6:"select";s:4:"name";s:12:"{$row}[type]";s:4:"help";s:19:"Type of customfield";s:7:"no_lang";s:1:"1";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:36:"each value is a line like id[=label]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131454776',);
+
 $templ_data[] = array('name' => 'admin.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"C";s:8:",!@type2";}i:1;a:8:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subtype";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:13:"${row}[type2]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"{$row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:36:"each value is a line like id[=label]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131454776',);
 
 $templ_data[] = array('name' => 'admin.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"C";s:8:",!@type2";s:1:"E";s:14:",!@use_private";}i:1;a:9:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subtype";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"I";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:9:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"C";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:13:"${row}[type2]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"{$row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:5:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[private]";s:4:"help";s:60:"Select accounts for which the custom field should be visible";s:5:"align";s:6:"center";s:4:"size";s:6:"3,both";}s:1:"F";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:36:"each value is a line like id[=label]";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"H";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"I";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:9;s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131454776',);
diff --git a/admin/templates/default/accesslog.xet b/admin/templates/default/accesslog.xet
new file mode 100644
index 0000000000..d43121b3c2
--- /dev/null
+++ b/admin/templates/default/accesslog.xet
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="admin.accesslog.rows" template="" lang="" group="0" version="1.7.001">
+		<grid width="100%">
+			<columns>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column width="1%"/>
+			</columns>
+			<rows>
+				<row class="th">
+					<nextmatch-accountfilter options="LoginID" id="account_id"/>
+					<nextmatch-header label="IP" id="ip"/>
+					<nextmatch-sortheader label="Login" id="li"/>
+					<nextmatch-sortheader label="Logout" id="lo"/>
+					<nextmatch-header label="Total" id="total"/>
+					<hbox>
+						<description value="Action" align="center"/>
+						<buttononly options="check" label="Select all" onclick="toggle_all(this.form,form::name('selected[]')); return false;"/>
+					</hbox>
+				</row>
+				<row class="row">
+					<menulist>
+						<menupopup type="select-account" id="${row}[account_id]" readonly="true"/>
+					</menulist>
+					<description id="${row}[ip]"/>
+					<date-time id="${row}[li]" readonly="true"/>
+					<date-time id="${row}[lo]" readonly="true"/>
+					<date-duration id="${row}[total]" readonly="true" options=",hm,24"/>
+					<hbox options="0,0" align="center">
+						<button image="delete" label="Delete" id="delete[$row_cont[sessionid]]" statustext="Delete this log entry" onclick="return confirm('Delete this log entry');"/>
+						<checkbox options="$row_cont[sessionid]" id="selected[]"/>
+					</hbox>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="admin.accesslog" template="" lang="" group="0" version="1.7.001">
+		<grid width="100%">
+			<columns>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row disabled="!@msg">
+					<description span="all" class="redItalic" align="center" id="msg"/>
+					<description/>
+				</row>
+				<row>
+					<nextmatch options="admin.accesslog.rows" id="nm" span="all"/>
+				</row>
+				<row>
+					<hbox options="0,0">
+						<description value="Percent of users that logged out" readonly="true"/>
+						<textbox type="float" id="percent" precision="1" label=": %s %" readonly="true"/>
+					</hbox>
+					<hbox align="right">
+						<button id="delete" image="delete" label="Delete" statustext="Delete selected entries" onclick="return confirm('Delete the selected entries');"/>
+						<buttononly options="arrow_ltr" onclick="toggle_all(this.form,form::name('nm[rows][selected][]')); return false;" class="selectAllArrow"/>
+					</hbox>
+				</row>
+			</rows>
+		</grid>
+		<styles>
+			.selectAllArrow { padding-right: 12px; }
+		</styles>
+	</template>
+</overlay>
\ No newline at end of file

From a8bf31c274c2fde3a82c649b951fb01ec1dc421a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 27 Apr 2009 11:49:50 +0000
Subject: [PATCH 239/510] "fixed handling of query parts in dirname and
 basename"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 81ee14a484..dbe11c0479 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -973,6 +973,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function basename($path)
 	{
+		list($path,$query) = explode('?',$path);	// remove query
 		$parts = explode('/',$path);
 
 		return array_pop($parts);
@@ -986,6 +987,8 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function dirname($url)
 	{
+		list($url,$query) = explode('?',$url,2);	// strip the query first, as it can contain slashes
+
 		if ($url == '/' || $url[0] != '/' && parse_url($url,PHP_URL_PATH) == '/')
 		{
 			//error_log(__METHOD__."($url) returning FALSE: already in root!");
@@ -998,7 +1001,6 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			array_push($parts,'');	// scheme://host is wrong (no path), has to be scheme://host/
 		}
-		list(,$query) = explode('?',$url,2);
 		//error_log(__METHOD__."($url)=".implode('/',$parts).($query ? '?'.$query : ''));
 		return implode('/',$parts).($query ? '?'.$query : '');
 	}

From bd3e6ca818e26bbbfc7bb6d973509f4a0ce38f2e Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 27 Apr 2009 12:54:40 +0000
Subject: [PATCH 240/510] fixing check_default, setting info_percent to 100,
 when status is done or billed

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

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index cd2d1d0586..e083fb952d 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -583,7 +583,7 @@ class infolog_bo
 			}
 			if (in_array($values['info_status'],array('done','billed')))
 			{
-				$values['info_percent'] == '100%';
+				$values['info_percent'] = '100';
 			}
 			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'],array('done','billed','cancelled')))
 			{

From 6f556a23dffd79c764ca14dd15ad45dc98555d50 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 27 Apr 2009 13:08:42 +0000
Subject: [PATCH 241/510] "remove trailing slash, eg. from webdav"

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

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index e0bb50c003..e1f0cbe12e 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -692,6 +692,8 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components)");
 
+		if (substr($path,-1) == '/') $path = substr($path,0,-1);	// remove trailing slashes, eg. added by webdav
+
 		if (!($url = self::resolve_url($path,!($flags & STREAM_URL_STAT_LINK))))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!");

From e8577f10a71bafd46a5610444b4f0e08a959827b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 10:09:26 +0000
Subject: [PATCH 242/510] "removed not used query variable"

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

diff --git a/phpgwapi/inc/class.egw_exception.inc.php b/phpgwapi/inc/class.egw_exception.inc.php
index 29e726dbb6..18ccf8d0d4 100644
--- a/phpgwapi/inc/class.egw_exception.inc.php
+++ b/phpgwapi/inc/class.egw_exception.inc.php
@@ -147,12 +147,10 @@ class egw_exception_db extends egw_exception
 	 * Constructor
 	 *
 	 * @param string $msg=null message, default "Database error!"
-	 * @param unknown_type $code=100
+	 * @param int $code=100
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		$this->query = $query;
-
 		if (is_null($msg)) $msg = lang('Database error!');
 
 		parent::__construct($msg,$code);

From 96f5529abfddfdec3ec8a01e204e22286934ebe3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 10:39:57 +0000
Subject: [PATCH 243/510] "log failed login because of hook 'session_creation'
 with account_id, to not block the account in that case"

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

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index 8233e5c55f..ef3cb8c761 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -561,7 +561,7 @@ class egw_session
 				if ($reason)	// called hook requests to deny the session
 				{
 					$this->reason = $this->cd_reason = $reason;
-					$this->log_access($this->reason,$login,$user_ip,0		);		// log unsuccessfull login
+					$this->log_access($this->reason,$login,$user_ip,$this->account_id);		// log unsuccessfull login
 					return false;
 				}
 			}

From b31aa4ae625626f388cda3b43575e63cb74c71ba Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 12:48:27 +0000
Subject: [PATCH 244/510] need to include API's common_functions to use
 check_load_extension

---
 calendar/inc/gradient.php      | 1 +
 calendar/inc/round_corners.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/calendar/inc/gradient.php b/calendar/inc/gradient.php
index d79593d5ce..244a74121f 100644
--- a/calendar/inc/gradient.php
+++ b/calendar/inc/gradient.php
@@ -10,6 +10,7 @@
  * @version $Id$
  */
 
+include_once('../../phpgwapi/inc/common_functions.inc.php');
 check_load_extension('gd',true);	// true = throw exception if not loadable
 
 foreach(array('width'=>1,'height'=>1,'color1'=>'000080','color2'=>'ffffff') as $name => $default)
diff --git a/calendar/inc/round_corners.php b/calendar/inc/round_corners.php
index 9ee50443c4..7f7e3b1d87 100644
--- a/calendar/inc/round_corners.php
+++ b/calendar/inc/round_corners.php
@@ -10,6 +10,7 @@
  * @version $Id$
  */
 
+include_once('../../phpgwapi/inc/common_functions.inc.php');
 check_load_extension('gd',true);	// true = throw exception if not loadable
 
 foreach(array('width'=>-20,'height'=>40,'border'=>1,'color'=>'000080','bgcolor'=>'0000FF') as $name => $default)

From 722402277208702a8d4f7bbac3ae0cbca439e952 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 13:27:18 +0000
Subject: [PATCH 245/510] "fixed not working cache unset on instance level, if
 called within setup: this causes new installed languages to NOT appear"

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

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index 53389a8c9e..93ca5c3b8c 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -242,7 +242,7 @@ class egw_cache
 	 */
 	static public function unsetInstance($app,$location)
 	{
-		return self::getCache(self::INSTANCE,$app,$location);
+		return self::unsetCache(self::INSTANCE,$app,$location);
 	}
 
 	/**
@@ -434,6 +434,7 @@ class egw_cache
 			}
 			if (!$providers[$level]) error_log(__METHOD__."($level) no provider found ($reason)!");
 		}
+		//error_log(__METHOD__."($level) = ".array2string($providers[$level]).', cache_provider='.array2string($GLOBALS['egw_info']['server']['cache_provider_'.strtolower($level)]));
 		return $providers[$level];
 	}
 
@@ -457,6 +458,20 @@ class egw_cache
 					$bases[$level] = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT);
 					break;
 				case self::INSTANCE:
+					if(!isset($GLOBALS['egw_info']['server']['install_id']))
+					{
+						if (isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db))
+						{
+							$GLOBALS['egw_info']['server']['install_id'] = $GLOBALS['egw_setup']->db->select(config::TABLE,'config_value',array(
+								'config_app'	=> 'phpgwapi',
+								'config_name'	=> 'install_id',
+							),__LINE__,__FILE__)->fetchColumn();
+						}
+						if (!$GLOBALS['egw_info']['server']['install_id'])
+						{
+							throw new Exception (__METHOD__."($level,$app,$location) server/install_id is NOT set!");
+						}
+					}
 					$bases[$level] = $level.'-'.$GLOBALS['egw_info']['server']['install_id'];
 					break;
 			}

From ee45dc8567a88d3db85702582e3a02d41c14b0b1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 15:36:51 +0000
Subject: [PATCH 246/510] "fixed one byte to long key-size"

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

diff --git a/etemplate/inc/class.etemplate_request.inc.php b/etemplate/inc/class.etemplate_request.inc.php
index 17ca4ab6a8..abbf5e0ab7 100644
--- a/etemplate/inc/class.etemplate_request.inc.php
+++ b/etemplate/inc/class.etemplate_request.inc.php
@@ -357,7 +357,7 @@ class etemplate_request
 				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
 
 			$key_size = mcrypt_enc_get_key_size(self::$mcrypt);
-			if (strlen($key) > $key_size) $key = substr($key,0,$key_size);
+			if (strlen($key) > $key_size) $key = substr($key,0,$key_size-1);
 
 			if (mcrypt_generic_init(self::$mcrypt,$key, $iv) < 0)
 			{

From d5ee989859275f066c6240b6f4258cb92be25a74 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 15:56:04 +0000
Subject: [PATCH 247/510] "- caching loginscreen+mainscreen messages instance
 (NOT tree) specific - invalidating the cache also for translation::write (to
 be able to update the loginscreen message)"

---
 phpgwapi/inc/class.translation.inc.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 32e04d931b..c4bb56a4aa 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -93,6 +93,13 @@ class translation
 	 */
 	static $mbstring_internal_encoding;
 
+	/**
+	 * Application which translations have to be cached instance- and NOT tree-specific
+	 *
+	 * @var array
+	 */
+	static $instance_specific_translations = array('loginscreen','mainscreen');
+
 	/**
 	 * returns the charset to use (!$lang) or the charset of the lang-files or $lang
 	 *
@@ -242,7 +249,9 @@ class translation
 		if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang)
 		{
 			//$start = microtime(true);
-			$loaded =& egw_cache::getTree(__CLASS__,$app.':'.$lang,__CLASS__.'::load_app',array($app,$lang));
+			// for loginscreen we have to use a instance specific cache!
+			$loaded =& egw_cache::getCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE,
+				__CLASS__,$app.':'.$lang,__CLASS__.'::load_app',array($app,$lang));
 
 			self::$lang_arr = self::$lang_arr ? array_merge(self::$lang_arr,$loaded) : $loaded;
 			self::$loaded_apps[$app] = $lang;
@@ -868,19 +877,22 @@ class translation
 	 * insert/update one phrase in the lang-table
 	 *
 	 * @param string $lang
-	 * @param string $app_name
+	 * @param string $app
 	 * @param string $message_id
 	 * @param string $content
 	 */
-	static function write($lang,$app_name,$message_id,$content)
+	static function write($lang,$app,$message_id,$content)
 	{
 		self::$db->insert(self::LANG_TABLE,array(
 			'content' => $content,
 		),array(
 			'lang' => $lang,
-			'app_name' => $app_name,
+			'app_name' => $app,
 			'message_id' => $message_id,
 		),__LINE__,__FILE__);
+
+		// invalidate the cache
+		egw_cache::unsetCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE,__CLASS__,$app.':'.$lang);
 	}
 
 	/**

From d268d6d816eaa903cb863de9b2507284c35c1133 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 16:05:04 +0000
Subject: [PATCH 248/510] Using static translation methods

---
 importexport/inc/class.bodefinitions.inc.php | 57 ++++++++++----------
 importexport/setup/default_records.inc.php   |  4 --
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/importexport/inc/class.bodefinitions.inc.php b/importexport/inc/class.bodefinitions.inc.php
index d5fe3d566a..23cf2cee56 100644
--- a/importexport/inc/class.bodefinitions.inc.php
+++ b/importexport/inc/class.bodefinitions.inc.php
@@ -23,17 +23,17 @@ class bodefinitions {
 
 	const _appname = 'importexport';
 	const _defintion_talbe = 'egw_importexport_definitions';
-	
+
 	/**
 	 * @var so_sql holds so_sql
 	 */
 	private $so_sql;
-	
+
 	/**
 	 * @var array hold definitions
 	 */
 	private $definitions;
-	
+
 	public function __construct($_query=false)
 	{
 		$this->so_sql = new so_sql(self::_appname, self::_defintion_talbe );
@@ -44,16 +44,16 @@ class bodefinitions {
 			}
 		}
 	}
-	
+
 	/**
 	 * gets array of definition ids
-	 * 
+	 *
 	 * @return array
 	 */
 	public function get_definitions() {
 		return $this->definitions;
 	}
-	
+
 	/**
 	 * deletes a defintion
 	 *
@@ -66,7 +66,7 @@ class bodefinitions {
 			unset($this->definitions[array_search($key,$this->definitions)]);
 		}
 	}
-	
+
 	/**
 	 * checkes if user if permitted to access given definition
 	 *
@@ -87,7 +87,7 @@ class bodefinitions {
 		$alluser = array_intersect($allowed_user,$this_membership_array);
 		return in_array($this_user_id,$alluser) ? true : false;
 	}
-	
+
 	/**
 	 * exports definitions
 	 *
@@ -97,31 +97,31 @@ class bodefinitions {
 	{
 		$export_data = array('metainfo' => array(
 			'type' => 'importexport definitions',
-			'charset' => $GLOBALS['egw']->translation->charset(),
+			'charset' => translation::charset(),
 			'entries' => count($keys),
 		));
-		
+
 		$export_data['definitions'] = array();
 		foreach ($keys as $definition_id) {
 			$definition = new definition( $definition_id );
 			$export_data['definitions'][$definition->name] = $definition->get_record_array();
-			$export_data['definitions'][$definition->name]['allowed_users'] = 
-				import_export_helper_functions::account_id2name( 
-					$export_data['definitions'][$definition->name]['allowed_users'] 
+			$export_data['definitions'][$definition->name]['allowed_users'] =
+				import_export_helper_functions::account_id2name(
+					$export_data['definitions'][$definition->name]['allowed_users']
 				);
-			$export_data['definitions'][$definition->name]['owner'] = 
-				import_export_helper_functions::account_id2name( 
-					$export_data['definitions'][$definition->name]['owner'] 
+			$export_data['definitions'][$definition->name]['owner'] =
+				import_export_helper_functions::account_id2name(
+					$export_data['definitions'][$definition->name]['owner']
 				);
 			unset($export_data['definitions'][$definition->name]['definition_id']);
 			unset($definition);
 		}
-		
-		
+
+
 		$xml = new arrayxml();
 		return $xml->array2xml($export_data, 'importExportDefinitions');
 	}
-	
+
 	/**
 	 * imports definitions from file
 	 *
@@ -131,38 +131,37 @@ class bodefinitions {
 	 */
 	public static function import( $_import_file )
 	{
-		$translation = CreateObject('phpgwapi.translation');
 		if ( !is_file( $_import_file ) ) {
 			throw new Exception("'$_import_file' does not exist or is not readable" );
 		}
-		
+
 		$data = arrayxml::xml2array( file_get_contents( $_import_file ) );
-		
+
 		$metainfo = $data['importExportDefinitions']['metainfo'];
 		$definitions = $data['importExportDefinitions']['definitions'];
 		unset ( $data );
-		
+
 		// convert charset into internal used charset
-		$definitions = $translation->convert( 
+		$definitions = translation::convert(
 			$definitions,
 			$metainfo['charset'],
-			$translation->charset()
+			translation::charset()
 		);
-		
+
 		// save definition(s) into internal table
 		foreach ( $definitions as $name => $definition_data )
 		{
 			// convert allowed_user
 			$definition_data['allowed_users'] = import_export_helper_functions::account_name2id( $definition_data['allowed_users'] );
 			$definition_data['owner'] = import_export_helper_functions::account_name2id( $definition_data['owner'] );
-		
+
 			$definition = new definition( $definition_data['name'] );
 			$definition_id = $definition->get_identifier() ? $definition->get_identifier() : NULL;
-			
+
 			$definition->set_record( $definition_data );
 			$definition->save( $definition_id );
 		}
 	}
-	
+
 }
 
diff --git a/importexport/setup/default_records.inc.php b/importexport/setup/default_records.inc.php
index 3f9155104e..4efe3e79bf 100644
--- a/importexport/setup/default_records.inc.php
+++ b/importexport/setup/default_records.inc.php
@@ -19,10 +19,6 @@ require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.bodefinitions.inc.php');
 // This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 $GLOBALS['egw_setup']->setup_account_object();
 
-// Fetch translation object
-$GLOBALS['egw_setup']->translation->setup_translation_sql();
-if ( !is_object($GLOBALS['egw']->translation) ) $GLOBALS['egw']->translation = $GLOBALS['egw_setup']->translation->sql;
-
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
 while (false !== ($appdir = $egwdir->read())) {

From 1c9c65278b2d254bee108286f32c1a6c518b69bf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 16:06:18 +0000
Subject: [PATCH 249/510] "forward for not existing or empty header to setup"

---
 index.php | 253 +++++++++++++++++++++++++++---------------------------
 1 file changed, 127 insertions(+), 126 deletions(-)

diff --git a/index.php b/index.php
index f449b5ffda..5dfc837cf8 100755
--- a/index.php
+++ b/index.php
@@ -1,156 +1,157 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare                                                               *
-	* http://www.egroupware.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.                                              *
-	\**************************************************************************/
+/**************************************************************************\
+* eGroupWare                                                               *
+* http://www.egroupware.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$ */
+/* $Id$ */
 
-	if(!file_exists('header.inc.php'))
-	{
-		Header('Location: setup/index.php');
-		exit;
-	}
+// forward for not existing or empty header to setup
+if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
+{
+	Header('Location: setup/index.php');
+	exit;
+}
 
-	if(isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
-	{
-		$hasupdates = True;
-	}
+if(isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
+{
+	$hasupdates = True;
+}
 
-	/*
-		This is the menuaction driver for the multi-layered design
-	*/
-	if(isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/',$_GET['menuaction']))
+/*
+	This is the menuaction driver for the multi-layered design
+*/
+if(isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/',$_GET['menuaction']))
+{
+	list($app,$class,$method) = explode('.',$_GET['menuaction']);
+	if(! $app || ! $class || ! $method)
 	{
-		list($app,$class,$method) = explode('.',$_GET['menuaction']);
-		if(! $app || ! $class || ! $method)
-		{
-			$invalid_data = True;
-		}
-	}
-	else
-	{
-		$app = 'home';
 		$invalid_data = True;
 	}
+}
+else
+{
+	$app = 'home';
+	$invalid_data = True;
+}
 
-	if($app == 'phpgwapi')
-	{
-		$app = 'home';
-		$api_requested = True;
-	}
+if($app == 'phpgwapi')
+{
+	$app = 'home';
+	$api_requested = True;
+}
 
-	$GLOBALS['egw_info'] = array(
-		'flags' => array(
-			'noheader'   => True,
-			'nonavbar'   => True,
-			'currentapp' => $app
-		)
-	);
-	include('./header.inc.php');
+$GLOBALS['egw_info'] = array(
+	'flags' => array(
+		'noheader'   => True,
+		'nonavbar'   => True,
+		'currentapp' => $app
+	)
+);
+include('./header.inc.php');
 
-	// 	Check if we are using windows or normal webpage
-	$windowed = false;
-	$tpl_info = EGW_SERVER_ROOT . '/phpgwapi/templates/' . basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
+// 	Check if we are using windows or normal webpage
+$windowed = false;
+$tpl_info = EGW_SERVER_ROOT . '/phpgwapi/templates/' . basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
 
-	if(@file_exists($tpl_info))
-	{
-	   include_once($tpl_info);
+if(@file_exists($tpl_info))
+{
+   include_once($tpl_info);
 //	   if(isset($template_info))
 //	   {
-		  if($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
-		  {
-			 $windowed = true;
-		  }
+	  if($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
+	  {
+		 $windowed = true;
+	  }
 //	   }
+}
+
+if($app == 'home' && !$api_requested && !$windowed)
+{
+	if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice')
+	{
+		$GLOBALS['egw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['egw_info']['server']['force_default_app'];
 	}
-
-	if($app == 'home' && !$api_requested && !$windowed)
+	if($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
 	{
-		if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice')
-		{
-			$GLOBALS['egw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['egw_info']['server']['force_default_app'];
-		}
-		if($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
-		{
-			$GLOBALS['egw']->redirect(egw_framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']));
-		}
-		else
-		{
-		   $GLOBALS['egw']->redirect_link('/home/index.php');
-		}
-	 }
-
-	if($windowed && $_GET['cd'] == 'yes')
-	{
-		$GLOBALS['egw_info']['flags'] = array(
-			'noheader'   => False,
-			'nonavbar'   => False,
-			'currentapp' => 'eGroupWare'
-		);
-		$GLOBALS['egw']->common->egw_header();
-		$GLOBALS['egw']->common->egw_footer();
-
+		$GLOBALS['egw']->redirect(egw_framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']));
 	}
 	else
 	{
-		if($api_requested)
-		{
-			$app = 'phpgwapi';
-		}
+	   $GLOBALS['egw']->redirect_link('/home/index.php');
+	}
+ }
 
-		$obj = CreateObject($app.'.'.$class);
-		if((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
-		{
-			$obj->$method();
-			unset($app);
-			unset($class);
-			unset($method);
-			unset($invalid_data);
-			unset($api_requested);
-		}
-		else
-		{
-			if(!$app || !$class || !$method || $invalid_data)
-			{
-				if(@is_object($GLOBALS['egw']->log))
-				{
-					$GLOBALS['egw']->log->message(array(
-						'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
-						'p1'   => $menuaction,
-						'line' => __LINE__,
-						'file' => __FILE__
-					));
-				}
-			}
+if($windowed && $_GET['cd'] == 'yes')
+{
+	$GLOBALS['egw_info']['flags'] = array(
+		'noheader'   => False,
+		'nonavbar'   => False,
+		'currentapp' => 'eGroupWare'
+	);
+	$GLOBALS['egw']->common->egw_header();
+	$GLOBALS['egw']->common->egw_footer();
 
-			if(!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
-			{
-				if(@is_object($GLOBALS['egw']->log))
-				{
-					$GLOBALS['egw']->log->message(array(
-						'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
-						'p1'   => $method,
-						'line' => __LINE__,
-						'file' => __FILE__
-					));
-				}
-			}
+}
+else
+{
+	if($api_requested)
+	{
+		$app = 'phpgwapi';
+	}
+
+	$obj = CreateObject($app.'.'.$class);
+	if((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
+	{
+		$obj->$method();
+		unset($app);
+		unset($class);
+		unset($method);
+		unset($invalid_data);
+		unset($api_requested);
+	}
+	else
+	{
+		if(!$app || !$class || !$method || $invalid_data)
+		{
 			if(@is_object($GLOBALS['egw']->log))
 			{
-				$GLOBALS['egw']->log->commit();
+				$GLOBALS['egw']->log->message(array(
+					'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
+					'p1'   => $menuaction,
+					'line' => __LINE__,
+					'file' => __FILE__
+				));
 			}
-
-			$GLOBALS['egw']->redirect_link('/home/index.php');
 		}
 
-		if(!isset($GLOBALS['egw_info']['nofooter']))
+		if(!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
 		{
-			$GLOBALS['egw']->common->egw_footer();
+			if(@is_object($GLOBALS['egw']->log))
+			{
+				$GLOBALS['egw']->log->message(array(
+					'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
+					'p1'   => $method,
+					'line' => __LINE__,
+					'file' => __FILE__
+				));
+			}
 		}
+		if(@is_object($GLOBALS['egw']->log))
+		{
+			$GLOBALS['egw']->log->commit();
+		}
+
+		$GLOBALS['egw']->redirect_link('/home/index.php');
 	}
+
+	if(!isset($GLOBALS['egw_info']['nofooter']))
+	{
+		$GLOBALS['egw']->common->egw_footer();
+	}
+}

From eec6596e94afc0f111184c33f1acc8105a970c8e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 16:18:34 +0000
Subject: [PATCH 250/510] "__autoload() - fix for error_reporting E_ALL -
 disabling search over all apps: classes should either conform to new naming
 schema or use explicit includes"

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

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index c2b59a1f9b..071d87da44 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1388,15 +1388,14 @@ function __autoload($class)
 {
 	$components = explode('_',$class);
 	$app = array_shift($components);
-	$baseclass = $components[0];
 	// classes using the new naming schema app_class_name, eg. admin_cmd, but not app/inc/class.app.inc.php
 	if ($app != $class && file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$class.'.inc.php') ||
 		// classes using the new naming schema app_class_name, eg. admin_cmd
-		file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$app.'_'.$baseclass.'.inc.php') ||
+		isset($components[0]) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$app.'_'.$components[0].'.inc.php') ||
 		// eGW api classes using the old naming schema, eg. html
 		file_exists($file = EGW_API_INC.'/class.'.$class.'.inc.php') ||
 		// eGW api classes containing multiple classes in on file, eg. egw_exception
-		file_exists($file = EGW_API_INC.'/class.'.$app.'_'.$baseclass.'.inc.php') ||
+		isset($components[0]) && file_exists($file = EGW_API_INC.'/class.'.$app.'_'.$components[0].'.inc.php') ||
 		// eGW eTemplate classes using the old naming schema, eg. etemplate
 		file_exists($file = EGW_INCLUDE_ROOT.'/etemplate/inc/class.'.$class.'.inc.php') ||
 		// classes of the current application using the old naming schema
@@ -1410,6 +1409,7 @@ function __autoload($class)
 	{
 		call_user_func($GLOBALS['egw_info']['flags']['autoload'],$class);
 	}
+/*  disabling search over all apps: classes should either conform to new naming schema or use explicit includes
 	elseif (is_array($GLOBALS['egw_info']['apps']))
 	{
 		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
@@ -1421,6 +1421,7 @@ function __autoload($class)
 			}
 		}
 	}
+*/
 }
 
 /**

From e50f35cbad8688eefad16522d903228583d28fac Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 19:25:35 +0000
Subject: [PATCH 251/510] "- error_reporting E_ALL - fixed handling of
 session_save_path() returning nothing (was stalling the PEAR check AND
 failing) - removed not longer necessary constants (defined now in
 common_functions.inc.php)"

---
 setup/check_install.php | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/setup/check_install.php b/setup/check_install.php
index ce863e3b69..817c0487ae 100644
--- a/setup/check_install.php
+++ b/setup/check_install.php
@@ -201,9 +201,9 @@ $checks = array(
 		'only_if_exists' => @$GLOBALS['egw_info']['setup']['stage']['header'] != 10
 	),
 );
-if (extension_loaded('session') && ini_get('session.save_handler') == 'files')
+if (extension_loaded('session') && ini_get('session.save_handler') == 'files' && ($session_path = session_save_path()))
 {
-	$checks[session_save_path()] = array(
+	$checks[$session_path] = array(
 		'func' => 'permission_check',
 		'is_writable' => true,
 		'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()),
@@ -259,16 +259,6 @@ foreach(array('php_version','php_ini_check','extension_check','pear_check','gd_c
 if ($checks) $sorted_checks += $checks;
 $checks =& $sorted_checks;
 
-// some constants for pre php4.3
-if (!defined('PHP_SHLIB_SUFFIX'))
-{
-	define('PHP_SHLIB_SUFFIX',$is_windows ? 'dll' : 'so');
-}
-if (!defined('PHP_SHLIB_PREFIX'))
-{
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
-}
-
 function php_version($name,$args)
 {
 	global $passed_icon, $error_icon;
@@ -524,7 +514,7 @@ function permission_check($name,$args,$verbose=True)
 
 	// add a ../ for non-absolute pathes
 	$rel_name = $name;
-	if (substr($name,0,3) != '../' && $name{0} != '/' && $name{0} != '\\' && strpos($name,':') === false)
+	if ($name && substr($name,0,3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name,':') === false)
 	{
 		$name = '../'.$name;
 	}

From a1c7c87195e212e6248a3acf2ea8d1883ffa0fdf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 19:32:29 +0000
Subject: [PATCH 252/510] "- removed unneeded stripslashes while reading the
 configuration, as it \"eats\" the backslashed of windows pathes (eg. messes
 up the default cache path) - replaced depricated fetchSingle() with
 fetchColumn()"

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

diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php
index 416a4a4466..cd4a637ae4 100644
--- a/phpgwapi/inc/class.egw.inc.php
+++ b/phpgwapi/inc/class.egw.inc.php
@@ -86,9 +86,9 @@ class egw extends egw_minimal
 		// check if eGW is already setup, if not redirect to setup/
 		try {
 			$this->db->connect();
-			if (!($num_config = $this->db->select(config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchSingle()))
+			if (!($num_config = $this->db->select(config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn()))
 			{
-				$phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchSingle();
+				$phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
 			}
 		}
 		catch(Exception $e) {
@@ -115,7 +115,7 @@ class egw extends egw_minimal
 		$system_charset = $this->db->select(config::TABLE,'config_value',array(
 			'config_app'  => 'phpgwapi',
 			'config_name' => 'system_charset',
-		),__LINE__,__FILE__)->fetchSingle();
+		),__LINE__,__FILE__)->fetchColumn();
 		if ($system_charset)
 		{
 			$this->db->Link_ID->SetCharSet($system_charset);
@@ -123,7 +123,7 @@ class egw extends egw_minimal
 		// load up the $GLOBALS['egw_info']['server'] array
 		foreach($this->db->select(config::TABLE,'*',array('config_app'  => 'phpgwapi'),__LINE__,__FILE__) as $row)
 		{
-			$GLOBALS['egw_info']['server'][$row['config_name']] = stripslashes($row['config_value']);
+			$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 		}
 		//$GLOBALS['egw_info']['server'] = config::read('phpgwapi'); would unserialize arrays
 

From 1b5bd9a1fb7e3c564b54df8dd184860cbd9ac995 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Apr 2009 20:24:05 +0000
Subject: [PATCH 253/510] "explicit require bofelamimail, 'til it get a
 autoloading conform name"

---
 .../inc/class.notifications_ajax.inc.php      | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/notifications/inc/class.notifications_ajax.inc.php b/notifications/inc/class.notifications_ajax.inc.php
index a8be2354c9..5013a80bee 100644
--- a/notifications/inc/class.notifications_ajax.inc.php
+++ b/notifications/inc/class.notifications_ajax.inc.php
@@ -8,7 +8,7 @@
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>, Christian Binder <christian@jaytraxx.de>
  */
- 
+
 /**
  * Ajax methods for notifications
  */
@@ -17,52 +17,52 @@ class notifications_ajax {
 	 * Appname
 	 */
 	const _appname = 'notifications';
-	
+
 	/**
 	 * Mailappname
 	 */
 	const _mailappname = 'felamimail';
-	
+
 	/**
 	 * Notification table in SQL database
 	 */
 	const _notification_table = 'egw_notificationpopup';
-	
+
 	/**
 	 * holds account object for user to notify
 	 *
 	 * @var object
 	 */
 	private $recipient;
-	
+
 	/**
 	 * holds config object (sitewide application config)
 	 *
 	 * @var object
 	 */
 	private $config;
-	
+
 	/**
 	 * holds preferences array of user to notify
 	 *
 	 * @var array
 	 */
 	private $preferences;
-	
+
 	/**
 	 * reference to global db object
 	 *
 	 * @var db
 	 */
 	private $db;
-	
+
 	/**
 	 * holds the users session data
 	 *
 	 * @var array
 	 */
 	var $session_data;
-	
+
 	/**
 	 * holds the users session data defaults
 	 *
@@ -71,14 +71,14 @@ class notifications_ajax {
 	var $session_data_defaults = array(
 		'notified_mail_uids'	=> array(),
 	);
-	
+
 	/**
 	 * the xml response object
 	 *
 	 * @var response
 	 */
 	private $response;
-	
+
 	/**
 	 * constructor
 	 *
@@ -96,31 +96,31 @@ class notifications_ajax {
 
 		$this->db = $GLOBALS['egw']->db;
 	}
-	
+
 	/**
 	 * destructor
 	 *
 	 */
 	public function __destruct() {}
-	
+
 	/**
 	 * public AJAX trigger function to be called by the JavaScript client
 	 *
 	 * this function calls all other recurring AJAX notifications methods
 	 * to have ONE single recurring AJAX call per user
-	 * 
+	 *
 	 * @return xajax response
 	 */
 	public function get_notifications() {
 		$this->check_mailbox();
 		$this->get_egwpopup();
-		
+
 		return $this->response->getXML();
 	}
-	
+
 	/**
 	 * checks users mailbox and sends a notification if new mails have arrived
-	 * 
+	 *
 	 * @return boolean true or false
 	 */
 	private function check_mailbox() {
@@ -131,16 +131,18 @@ class notifications_ajax {
 		if(count($notify_folders) == 0) {
 			return true; //no folders configured for notifying - exit
 		}
-		
+		// explicit require bofelamimail, 'til it get a autoloading conform name
+		require_once(EGW_INCLUDE_ROOT.'/felamimail/inc/class.bofelamimail.inc.php');
+
 		$bofelamimail = new bofelamimail($GLOBALS['egw']->translation->charset());
 		if(!$bofelamimail->openConnection()) {
 			// TODO: This is ugly. Log a bit nicer!
 			error_log(self::_appname.' (user: '.$this->recipient->account_lid.'): cannot connect to mailbox. Please check your prefs!');
 			return false; // cannot connect to mailbox
 		}
-		
+
 		$this->restore_session_data();
-		
+
 		$recent_messages = array();
 		$folder_status = array();
 		foreach($notify_folders as $id=>$notify_folder) {
@@ -162,7 +164,7 @@ class notifications_ajax {
 				}
 			}
 		}
-		
+
 		if(count($recent_messages) > 0) {
 			// create notify message
 			$notification_subject = lang("You've got new mail");
@@ -180,12 +182,12 @@ class notifications_ajax {
 				// save notification status
 				$this->session_data['notified_mail_uids'][$recent_message['folder']][] = $recent_message['uid'];
 			}
-			
+
 			// create etemplate
 			$tpl = new etemplate();
 			$tpl->read('notifications.checkmailbox');
 			$notification_message = $tpl->exec(false, $values, false, false, false, 1);
-			
+
 			// send notification
 			$notification = new notifications();
 			$notification->set_receivers(array($this->recipient->account_id));
@@ -195,20 +197,20 @@ class notifications_ajax {
 			$notification->set_skip_backends(array('email'));
 			$notification->send();
 		}
-		
+
 		$this->save_session_data();
 		return true;
 	}
-	
+
 	/**
 	 * gets all egwpopup notifications for calling user
-	 * 
+	 *
 	 * @return boolean true or false
 	 */
 	private function get_egwpopup() {
 		$session_id = $GLOBALS['egw_info']['user']['sessionid'];
 		$message = '';
-		$rs = $this->db->select(self::_notification_table, 
+		$rs = $this->db->select(self::_notification_table,
 			'*', array(
 				'account_id' => $this->recipient->account_id,
 				'session_id' => $session_id,
@@ -222,7 +224,7 @@ class notifications_ajax {
 				'account_id' => $this->recipient->account_id,
 				'session_id' => $session_id,
 			),__LINE__,__FILE__,self::_appname);
-			
+
 			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
 				case 'low':
 					$this->response->addScript('notificationbell_switch("active");');
@@ -239,10 +241,10 @@ class notifications_ajax {
 		}
 		return true;
 	}
-	
+
 	/**
 	 * restores the users session data for notifications
-	 * 
+	 *
 	 * @return boolean true
 	 */
 	private function restore_session_data() {
@@ -252,13 +254,13 @@ class notifications_ajax {
 		} else {
 			$this->session_data = $this->session_data_defaults;
 		}
-		
+
 		return true;
 	}
 
 	/**
 	 * saves the users session data for notifications
-	 * 
+	 *
 	 * @return boolean true
 	 */
 	private function save_session_data() {

From 5e571b6f02821277a2bbcf073f009188261196ba Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 06:24:43 +0000
Subject: [PATCH 254/510] removed empty translation file

---
 preferences/setup/egw_lt.lang | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 preferences/setup/egw_lt.lang

diff --git a/preferences/setup/egw_lt.lang b/preferences/setup/egw_lt.lang
deleted file mode 100644
index 8b13789179..0000000000
--- a/preferences/setup/egw_lt.lang
+++ /dev/null
@@ -1 +0,0 @@
-

From b72236a663b92535fc21da4128924cb7e59017ad Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 06:26:04 +0000
Subject: [PATCH 255/510] allow "settings" hook to return the settings, instead
 of passing it via a global variable (depricated now)

---
 .../inc/class.addressbook_hooks.inc.php       | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php
index e6b592653b..791a235875 100644
--- a/addressbook/inc/class.addressbook_hooks.inc.php
+++ b/addressbook/inc/class.addressbook_hooks.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @package addressbook
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright (c) 2006-8 by Ralf Becker <RalfBecker@outdoor-training.de>
+ * @copyright (c) 2006-9 by Ralf Becker <RalfBecker@outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -104,11 +104,12 @@ class addressbook_hooks
 	}
 
 	/**
-	 * populates $GLOBALS['settings'] for the preferences
+	 * populates $settings for the preferences
 	 */
 	static function settings()
 	{
-		$GLOBALS['settings']['add_default'] = array(
+		$settings = array();
+		$settings['add_default'] = array(
 			'type'   => 'select',
 			'label'  => 'Default addressbook for adding contacts',
 			'name'   => 'add_default',
@@ -117,7 +118,7 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
-		$GLOBALS['settings']['mainscreen_showbirthdays'] = array(
+		$settings['mainscreen_showbirthdays'] = array(
 			'type'   => 'select',
 			'label'  => 'Show birthday reminders on main screen',
 			'name'   => 'mainscreen_showbirthdays',
@@ -132,7 +133,7 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
-		$GLOBALS['settings']['no_auto_hide'] = array(
+		$settings['no_auto_hide'] = array(
 			'type'   => 'check',
 			'label'  => 'Don\'t hide empty columns',
 			'name'   => 'no_auto_hide',
@@ -141,7 +142,7 @@ class addressbook_hooks
 			'admin'  => false,
 		);
 		// CSV Export
-		$GLOBALS['settings']['csv_fields'] = array(
+		$settings['csv_fields'] = array(
 			'type'   => 'select',
 			'label'  => 'Fields for the CSV export',
 			'name'   => 'csv_fields',
@@ -154,7 +155,7 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => false,
 		);
-		$GLOBALS['settings']['csv_charset'] = array(
+		$settings['csv_charset'] = array(
 			'type'   => 'select',
 			'label'  => 'Charset for the CSV export',
 			'name'   => 'csv_charset',
@@ -166,7 +167,7 @@ class addressbook_hooks
 
 		if ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
 		{
-			$GLOBALS['settings']['private_addressbook'] = array(
+			$settings['private_addressbook'] = array(
 				'type'   => 'check',
 				'label'  => 'Enable an extra private addressbook',
 				'name'   => 'private_addressbook',
@@ -175,7 +176,7 @@ class addressbook_hooks
 				'admin'  => False,
 			);
 		}
-		$GLOBALS['settings']['link_title'] = array(
+		$settings['link_title'] = array(
 			'type'   => 'select',
 			'label'  => 'Link title for contacts show',
 			'name'   => 'link_title',
@@ -190,7 +191,7 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => false,
 		);
-		$GLOBALS['settings']['addr_format'] = array(
+		$settings['addr_format'] = array(
 			'type'   => 'select',
 			'label'  => 'Default address format',
 			'name'   => 'addr_format',
@@ -202,7 +203,7 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => false,
 		);
-		$GLOBALS['settings']['fileas_default'] = array(
+		$settings['fileas_default'] = array(
 			'type'   => 'select',
 			'label'  => 'Default file as format',
 			'name'   => 'fileas_default',
@@ -211,7 +212,7 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => false,
 		);
-		$GLOBALS['settings']['hide_accounts'] = array(
+		$settings['hide_accounts'] = array(
 			'type'   => 'check',
 			'label'  => 'Hide accounts from addressbook',
 			'name'   => 'hide_accounts',
@@ -219,7 +220,7 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => false,
 		);
-		$GLOBALS['settings']['distributionListPreferredMail'] = array(
+		$settings['distributionListPreferredMail'] = array(
 			'type'   => 'select',
 			'label'  => 'Preferred email address to use in distribution lists',
 			'name'   => 'distributionListPreferredMail',
@@ -235,7 +236,7 @@ class addressbook_hooks
 		{
 			$link = $GLOBALS['egw']->link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements');
 
-			$GLOBALS['settings']['default_document'] = array(
+			$settings['default_document'] = array(
 				'type'   => 'input',
 				'size'   => 60,
 				'label'  => 'Default document to insert contacts',
@@ -247,7 +248,7 @@ class addressbook_hooks
 				'xmlrpc' => True,
 				'admin'  => False,
 			);
-			$GLOBALS['settings']['document_dir'] = array(
+			$settings['document_dir'] = array(
 				'type'   => 'input',
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert contacts',
@@ -260,7 +261,7 @@ class addressbook_hooks
 				'admin'  => False,
 			);
 		}
-		return true;	// otherwise prefs say it cant find the file ;-)
+		return $settings;
 	}
 
 	/**

From af286333bfd5c7ba3c00886c0493929e0aa85b8a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 06:26:58 +0000
Subject: [PATCH 256/510] allow "settings" hook to return the settings, instead
 of passing it via a global variable (depricated now)

---
 preferences/inc/class.bosettings.inc.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/preferences/inc/class.bosettings.inc.php b/preferences/inc/class.bosettings.inc.php
index a32d028b25..807cfce649 100644
--- a/preferences/inc/class.bosettings.inc.php
+++ b/preferences/inc/class.bosettings.inc.php
@@ -66,17 +66,27 @@
 		{
 			$this->appname = $appname;
 
-			$GLOBALS['egw']->translation->add_app($this->appname);
+			translation::add_app($this->appname);
 			if($this->appname != 'preferences')
 			{
-				$GLOBALS['egw']->translation->add_app('preferences');	// we need the prefs translations too
+				translation::add_app('preferences');	// we need the prefs translations too
 			}
 
-			if(!$GLOBALS['egw']->hooks->single('settings',$this->appname))
+			// calling the settings hook
+			$settings = $GLOBALS['egw']->hooks->single('settings',$this->appname);
+			// it either returns the settings or save it in $GLOBALS['settings'] (deprecated!)
+			if (isset($settings) && is_array($settings) && $settings)
 			{
-				return False;
+				$this->settings = array_merge($this->settings,$settings);
+			}
+			elseif(isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
+			{
+				$this->settings = array_merge($this->settings,$GLOBALS['settings']);
+			}
+			else
+			{
+				return False;	// no settings returned
 			}
-			$this->settings = array_merge($this->settings,$GLOBALS['settings']);
 
 			/* Remove ui-only settings */
 			if($this->xmlrpc)

From b9f7a44f57c8fae9f4cfea5cb39a83a62c2f9895 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 06:27:54 +0000
Subject: [PATCH 257/510] fix for bug #2060 - Passive Security bug:
 InformationLeakage

---
 preferences/inc/class.uisettings.inc.php | 14 +++++++-------
 preferences/setup/egw_ca.lang            |  1 -
 preferences/setup/egw_cs.lang            |  1 -
 preferences/setup/egw_da.lang            |  1 -
 preferences/setup/egw_de.lang            |  1 -
 preferences/setup/egw_en.lang            |  1 -
 preferences/setup/egw_es-es.lang         |  1 -
 preferences/setup/egw_eu.lang            |  1 -
 preferences/setup/egw_fa.lang            |  1 -
 preferences/setup/egw_fi.lang            |  1 -
 preferences/setup/egw_fr.lang            |  1 -
 preferences/setup/egw_hr.lang            |  1 -
 preferences/setup/egw_hu.lang            |  1 -
 preferences/setup/egw_it.lang            |  1 -
 preferences/setup/egw_iw.lang            |  1 -
 preferences/setup/egw_ko.lang            |  1 -
 preferences/setup/egw_lv.lang            |  1 -
 preferences/setup/egw_nl.lang            |  1 -
 preferences/setup/egw_no.lang            |  1 -
 preferences/setup/egw_pl.lang            |  1 -
 preferences/setup/egw_pt-br.lang         |  1 -
 preferences/setup/egw_pt.lang            |  1 -
 preferences/setup/egw_ru.lang            |  1 -
 preferences/setup/egw_sk.lang            |  1 -
 preferences/setup/egw_sl.lang            |  1 -
 preferences/setup/egw_sv.lang            |  1 -
 preferences/setup/egw_tr.lang            |  1 -
 preferences/setup/egw_uk.lang            |  1 -
 preferences/setup/egw_zh-tw.lang         |  1 -
 preferences/setup/egw_zh.lang            |  1 -
 30 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/preferences/inc/class.uisettings.inc.php b/preferences/inc/class.uisettings.inc.php
index 85eb28ee28..db70d069ea 100755
--- a/preferences/inc/class.uisettings.inc.php
+++ b/preferences/inc/class.uisettings.inc.php
@@ -19,6 +19,12 @@
 		var $show_help;
 		var $has_help;
 		var $prefix = '';
+		/**
+		 * Instance of business object
+		 *
+		 * @var bosettings
+		 */
+		var $bo;
 
 		function uisettings()
 		{
@@ -190,13 +196,7 @@
 			$this->notifies = array();
 			if(!$this->bo->call_hook($_GET['appname']))
 			{
-				$this->t->set_block('preferences','form','formhandle');	// skip the form
-				$this->t->set_var('formhandle','');
-
-				$this->t->set_var('messages',lang('Error: There was a problem finding the preference file for %1 in %2',
-					$GLOBALS['egw_info']['apps'][$_GET['appname']]['title'],
-					EGW_SERVER_ROOT . SEP . $_GET['appname'] . SEP . 'inc' . SEP . 'hook_settings.inc.php'
-				));
+				throw new egw_exception_wrong_parameter("Could not find settings for application: ".$_GET['appname']);
 			}
 
 			foreach($this->bo->settings as $key => $valarray)
diff --git a/preferences/setup/egw_ca.lang b/preferences/setup/egw_ca.lang
index 54a294f0cd..9bcf632fa7 100644
--- a/preferences/setup/egw_ca.lang
+++ b/preferences/setup/egw_ca.lang
@@ -26,7 +26,6 @@ enable drag and drop functionality (experimental)	common	ca	Habilita funcionalit
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	common	ca	Habilita o deshabilita funcions d'arrossegar i deixar anar a totes les aplicacions. Si el navegador no permet l'arrossegar i deixar anar, serà inhabilitat automàticament. Aquesta funció és experimental de moment.
 enter your new password	preferences	ca	Entreu la nova contrasenya
 enter your old password	preferences	ca	Escriu la contrasenya antiga
-error: there was a problem finding the preference file for %1 in %2	preferences	ca	Error: Hi ha un problema cercant el fitxer de preferències per a %1 en %2
 failed to change password.  please contact your administrator.	preferences	ca	Error al canviar la contrasenya. Contacteu amb el vostre Administrador.
 forced preferences	preferences	ca	Preferències forçades
 help off	preferences	ca	Sense ajuda
diff --git a/preferences/setup/egw_cs.lang b/preferences/setup/egw_cs.lang
index fd866bfe5a..af2424b16c 100644
--- a/preferences/setup/egw_cs.lang
+++ b/preferences/setup/egw_cs.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	addressbook	cs	Povolit funkcio
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	cs	Povoluje nebo zakazuje funkce táhni a pusť ve všech aplikacích. Pokud webový prohlíže� ovládání způsobem táhni a pusť nepodporuje, bude automaticky zakázáno. Tato vlastnost je v sou�asnosti v experimentálním stádiu.
 enter your new password	preferences	cs	Zadejte Vaše nové heslo
 enter your old password	preferences	cs	Zadejte Vaše staré heslo
-error: there was a problem finding the preference file for %1 in %2	preferences	cs	Chyba: Nepodařilo se nalézt soubor s předvolbami pro %1 v %2
 failed to change password.  please contact your administrator.	preferences	cs	Nepodařilo se změnit heslo. Kontaktujte prosím Vašeho administrátora.
 forced preferences	preferences	cs	Vynucené předvolby
 help off	preferences	cs	Vypnout nápovědu
diff --git a/preferences/setup/egw_da.lang b/preferences/setup/egw_da.lang
index 0eef55782a..cad9cde11e 100644
--- a/preferences/setup/egw_da.lang
+++ b/preferences/setup/egw_da.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	da	Ret valgfrie felter
 enter your new password	preferences	da	Indtast din nye adgangskode
 enter your old password	preferences	da	Indtast din gamle adgangskode
-error: there was a problem finding the preference file for %1 in %2	preferences	da	Fejl: Der var et problem i at finde præferencerne for fil %1 i %2
 failed to change password.  please contact your administrator.	preferences	da	Det lykkedes ikke at ændre adgangskoden. Kontakt din administrator.
 forced preferences	preferences	da	Tvungne præferencer
 help off	preferences	da	Ingen Hjælp
diff --git a/preferences/setup/egw_de.lang b/preferences/setup/egw_de.lang
index 2fb0bcbd62..64201200d5 100644
--- a/preferences/setup/egw_de.lang
+++ b/preferences/setup/egw_de.lang
@@ -23,7 +23,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	de	Benutzerdefinierte Felder editieren
 enter your new password	preferences	de	Neues Passwort eingeben
 enter your old password	preferences	de	Altes Passwort eingeben
-error: there was a problem finding the preference file for %1 in %2	preferences	de	Fehler: Es gab ein Problem, die Einstellungen für %1 in %2 zu finden
 failed to change password.  please contact your administrator.	preferences	de	Passwortänderung fehlgeschlagen. Bitte kontaktieren Sie Ihren Administrator!
 forced preferences	preferences	de	Erzwungene Einstellungen
 help off	preferences	de	Keine Hilfe
diff --git a/preferences/setup/egw_en.lang b/preferences/setup/egw_en.lang
index c0e908a1a8..5b3b0388bc 100644
--- a/preferences/setup/egw_en.lang
+++ b/preferences/setup/egw_en.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	addressbook	en	Enable drag and
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	en	Enables or disables drag and drop functions in all applications. If the browser does not support drag and drop, it will be disabled automatically. This feature is experimental at the moment.
 enter your new password	preferences	en	Enter your new password
 enter your old password	preferences	en	Enter your old password
-error: there was a problem finding the preference file for %1 in %2	preferences	en	Error: There was a problem finding the preference file for %1 in %2
 failed to change password.  please contact your administrator.	preferences	en	Failed to change password.  Please contact your administrator.
 forced preferences	preferences	en	Forced Preferences
 help off	preferences	en	Help off
diff --git a/preferences/setup/egw_es-es.lang b/preferences/setup/egw_es-es.lang
index f73b177a8b..7dfb243fdf 100644
--- a/preferences/setup/egw_es-es.lang
+++ b/preferences/setup/egw_es-es.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	addressbook	es-es	Activar la f
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	es-es	Activa o desactiva las funciones de arrastrar y soltar en todas las aplicaciones. Si el navegador no soporta arrastrar y soltar, se desactivará automáticamente. Esta característica es experimental en este instante.
 enter your new password	preferences	es-es	Introduzca la contraseña nueva
 enter your old password	preferences	es-es	Introduzca la contraseña anterior
-error: there was a problem finding the preference file for %1 in %2	preferences	es-es	Error: hubo un problema al buscar el fichero de preferencias para %1 en %2
 failed to change password.  please contact your administrator.	preferences	es-es	Fallo al cambiar la contraseña. Por favor, póngase en contacto con su administrador.
 forced preferences	preferences	es-es	Preferencias forzadas
 help off	preferences	es-es	Desactivar ayuda
diff --git a/preferences/setup/egw_eu.lang b/preferences/setup/egw_eu.lang
index 57f24210e8..90499cacd7 100644
--- a/preferences/setup/egw_eu.lang
+++ b/preferences/setup/egw_eu.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	eu	Eremu pertsonalizatuak editatu
 enter your new password	preferences	eu	Zure pasahitz berria sartu
 enter your old password	preferences	eu	Zure pasahitz zaharra sartu
-error: there was a problem finding the preference file for %1 in %2	preferences	eu	Errorea: arazo bat egon da %1entzako hobespenen fitxategia bilatzerakoan %2an.
 failed to change password.  please contact your administrator.	preferences	eu	Akatsa pasahitza aldatzerakoan. Mesedez jarri zure administratzailearekin kontaktuan.
 forced preferences	preferences	eu	Behartutako hobespenak
 help off	preferences	eu	Laguntza desaktibatu
diff --git a/preferences/setup/egw_fa.lang b/preferences/setup/egw_fa.lang
index c89ccf5e8b..e38d29947a 100755
--- a/preferences/setup/egw_fa.lang
+++ b/preferences/setup/egw_fa.lang
@@ -26,7 +26,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	fa	ویرایش �یلدهای س�ارشی
 enter your new password	preferences	fa	گذرواژه جدبد را وارد کنید
 enter your old password	preferences	fa	گذرواژه قبلی خود را وارد کنید
-error: there was a problem finding the preference file for %1 in %2	preferences	fa	خطا: مشکلی در یا�تن تنظیمات پرونده برای %1 در %2 رخ داد.
 failed to change password.  please contact your administrator.	preferences	fa	ناتوان از تغییر گذرواژه. لط�ا با مدیر سیستم تماس بگیرید
 forced preferences	preferences	fa	تنظیمات اجباری
 help off	preferences	fa	کمک خاموش
diff --git a/preferences/setup/egw_fi.lang b/preferences/setup/egw_fi.lang
index dab8a11b04..b384f551af 100644
--- a/preferences/setup/egw_fi.lang
+++ b/preferences/setup/egw_fi.lang
@@ -23,7 +23,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	fi	muokkaa omia kenttiä
 enter your new password	preferences	fi	Anna uusi salasana
 enter your old password	preferences	fi	Anna vanha salasana
-error: there was a problem finding the preference file for %1 in %2	preferences	fi	Virhe: Kohteelle %1 ei löytynyt asetustiedostoa kohteesta %2
 failed to change password.  please contact your administrator.	preferences	fi	Salasanan vaihto ei onnistunut. Ota yhteys pääkäyttäjään.
 forced preferences	preferences	fi	Pakotetut asetukset
 help off	preferences	fi	Piilota ohjeet
diff --git a/preferences/setup/egw_fr.lang b/preferences/setup/egw_fr.lang
index b4e7bfa4d2..c15a850211 100644
--- a/preferences/setup/egw_fr.lang
+++ b/preferences/setup/egw_fr.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	fr	Modifier les champs personnalisés
 enter your new password	preferences	fr	Entrez votre nouveau mot de passe
 enter your old password	preferences	fr	Entrez votre ancien mot de passe
-error: there was a problem finding the preference file for %1 in %2	preferences	fr	Erreur: il y a eu un problème pour trouver le fichier de préférence pour %1 dans %2
 failed to change password.  please contact your administrator.	preferences	fr	Erreur lors du changement de mot de passe. Veuillez contacter votre administrateur.
 forced preferences	preferences	fr	Préférences forcées
 help off	preferences	fr	Aide désactivée
diff --git a/preferences/setup/egw_hr.lang b/preferences/setup/egw_hr.lang
index f0159959a1..7387725543 100644
--- a/preferences/setup/egw_hr.lang
+++ b/preferences/setup/egw_hr.lang
@@ -22,7 +22,6 @@ description can not exceed 255 characters in length !	preferences	hr	Opis nemož
 do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	preferences	hr	Da li želite da vam se vrijeme prikazuje u 24 satnom formatu ili 12 satnom sa am/pm dodatkom.
 edit custom fields	preferences	hr	Uredi proizvoljna polja
 enter your new password	preferences	hr	Unesite vašu novu zaporku
-error: there was a problem finding the preference file for %1 in %2	preferences	hr	Greška:nisam mogao naći datoteku postavki za %1 u %2
 failed to change password.  please contact your administrator.	preferences	hr	Nisam mogao promijeniti zaporku. Molim vas kontaktirajte vašeg administratora
 forced preferences	preferences	hr	Prisiljene postavke
 help off	preferences	hr	Ugasi pomoć
diff --git a/preferences/setup/egw_hu.lang b/preferences/setup/egw_hu.lang
index 0ca77fdf2d..1a1895b337 100644
--- a/preferences/setup/egw_hu.lang
+++ b/preferences/setup/egw_hu.lang
@@ -26,7 +26,6 @@ enable drag and drop functionality (experimental)	common	hu	Drag and Drop funkci
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	common	hu	Engedélyezi vagy tiltja a Drag and Drop funkciókat az összes alkalmazásban. Ha a böngésző nem támogatja a Drag and Drop-ot, akkor automatikusan le lesz tiltva. Ez a tulajdonság egyelőre haladó.
 enter your new password	preferences	hu	Új jelszó megadása
 enter your old password	preferences	hu	Régi jelszó megadása
-error: there was a problem finding the preference file for %1 in %2	preferences	hu	Hiba: Egy problémát találtam a %1-val kapcsolatvan a %2 beállítás fájlban.
 failed to change password.  please contact your administrator.	preferences	hu	Sikertelen jelszó változtatás. Lépjen kapcsolatba az adminisztrátorral.
 forced preferences	preferences	hu	Kényszerített Tulajdonságok
 help off	preferences	hu	Segítség kikapcsolása
diff --git a/preferences/setup/egw_it.lang b/preferences/setup/egw_it.lang
index 4912b4885e..517bfbd313 100644
--- a/preferences/setup/egw_it.lang
+++ b/preferences/setup/egw_it.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	it	modifica campi personalizzati
 enter your new password	preferences	it	Inserisci la tua nuova password
 enter your old password	preferences	it	Inserisci la tua vecchia password
-error: there was a problem finding the preference file for %1 in %2	preferences	it	Errore: c'è stato un problema nel trovare il file delle preferenze per %1 in %2
 failed to change password.  please contact your administrator.	preferences	it	Impossibile cambiare la password. Prego contatta l'amministratore.
 forced preferences	preferences	it	Preferenze Forzate
 help off	preferences	it	Nessun Aiuto
diff --git a/preferences/setup/egw_iw.lang b/preferences/setup/egw_iw.lang
index 475f5d19ea..dd88b7b90e 100755
--- a/preferences/setup/egw_iw.lang
+++ b/preferences/setup/egw_iw.lang
@@ -22,7 +22,6 @@ description can not exceed 255 characters in length !	preferences	iw	!התי�ו
 do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	preferences	iw	.am/pm ה�� עדיף לך פורמט שעון בעל 24 שעות, �ו פורמט של 12 שעות בתוספת
 edit custom fields	preferences	iw	ערוך שדות מות�מות �ישית
 enter your new password	preferences	iw	ציין �ת סיסמתך החדשה
-error: there was a problem finding the preference file for %1 in %2	preferences	iw	שגי�ה: �ירעה תקלה במצי�ת קובץ העדיפויות של %1 בתוך %2
 failed to change password.  please contact your administrator.	preferences	iw	.ל� הצלחתי לשנות �ת הסיסמ�. נ� ליצור קשר ע� מנהל המערכת
 forced preferences	preferences	iw	הגדרות בכוח
 help off	preferences	iw	עזרה כבויה
diff --git a/preferences/setup/egw_ko.lang b/preferences/setup/egw_ko.lang
index 1b9c9e3b03..f5004583f6 100644
--- a/preferences/setup/egw_ko.lang
+++ b/preferences/setup/egw_ko.lang
@@ -23,7 +23,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	ko	사용�정� 필드를 편집
 email signature	preferences	ko	E-Mail 서명
 enter your new password	preferences	ko	새로운 암호를 입력
-error: there was a problem finding the preference file for %1 in %2	preferences	ko	오류: 설정 파� %2�서 %1� 찾는� 문제가 있습니다
 failed to change password.  please contact your administrator.	preferences	ko	암호를 바꾸는� 실패했습니다. 관리��게 문�하세요
 forced preferences	preferences	ko	강제 환경설정
 help off	preferences	ko	�움� �기
diff --git a/preferences/setup/egw_lv.lang b/preferences/setup/egw_lv.lang
index f57849f5f1..0ac1eca6bf 100644
--- a/preferences/setup/egw_lv.lang
+++ b/preferences/setup/egw_lv.lang
@@ -20,7 +20,6 @@ description can not exceed 255 characters in length !	preferences	lv	Apraksts ne
 do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	preferences	lv	Vai tev lab�k patīk 24stundu form�ts, vai arī 12, pievienojot am/pm?
 edit custom fields	preferences	lv	rediģēt klientu laukus
 enter your new password	preferences	lv	Ievadi jauno paroli
-error: there was a problem finding the preference file for %1 in %2	preferences	lv	Kļūda: Problēma meklējot iestatījumu datni %1 %2
 failed to change password.  please contact your administrator.	preferences	lv	Neizdev�d nomainīt paroli. Lūdzu sazinies ar savu administratoru
 forced preferences	preferences	lv	Vajadzīgie iestatījumi
 help off	preferences	lv	Palīgs izslēgts
diff --git a/preferences/setup/egw_nl.lang b/preferences/setup/egw_nl.lang
index dc27edd1ac..2f35105884 100644
--- a/preferences/setup/egw_nl.lang
+++ b/preferences/setup/egw_nl.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	addressbook	nl	Schakel drag an
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	nl	Schakel drag and drop functies in alle toepassingen in of uit. Indien de browser drag and drop niet ondersteund wordt, wordt het vanzelf uitgeschakeld. Deze functie is op dit moment experimenteel.
 enter your new password	preferences	nl	Voer uw nieuwe wachtwoord in
 enter your old password	preferences	nl	Voer uw oude wachtwoord in
-error: there was a problem finding the preference file for %1 in %2	preferences	nl	Fout: Er is een fout opgetreden bij het zoeken naar het voorkeurenbestand voor %1 in %2.
 failed to change password.  please contact your administrator.	preferences	nl	Wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.
 forced preferences	preferences	nl	Geforceerde voorkeuren
 help off	preferences	nl	Help uitgeschakeld
diff --git a/preferences/setup/egw_no.lang b/preferences/setup/egw_no.lang
index 58b249a268..a4c196f956 100644
--- a/preferences/setup/egw_no.lang
+++ b/preferences/setup/egw_no.lang
@@ -23,7 +23,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	no	endre egendefinerte felter
 enter your new password	preferences	no	Skriv inn ditt nye passord
 enter your old password	preferences	no	Skriv inn ditt gamle passord
-error: there was a problem finding the preference file for %1 in %2	preferences	no	Feil: Kan ikke finne preferansefil for %1 i %2
 failed to change password.  please contact your administrator.	preferences	no	Passordet kunne ikke endres.  Ta kontakt med EDB-ansvarlig.
 forced preferences	preferences	no	Overstyrte preferanser
 help off	preferences	no	Hjelp av
diff --git a/preferences/setup/egw_pl.lang b/preferences/setup/egw_pl.lang
index 7f9f1b3412..b9a2180050 100755
--- a/preferences/setup/egw_pl.lang
+++ b/preferences/setup/egw_pl.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	pl	Edytuj pola użytkownika
 enter your new password	preferences	pl	Wprowadź nowe hasło
 enter your old password	preferences	pl	Wprowadź stare hasło
-error: there was a problem finding the preference file for %1 in %2	preferences	pl	Wystąpił błąd: Nie znaleziono pliku z ustawieniami dla %1 w %2
 failed to change password.  please contact your administrator.	preferences	pl	Zmiana hasła nieudana. Proszę skontaktować się z administratorem.
 forced preferences	preferences	pl	Ustawienia wymuszone
 help off	preferences	pl	Wyłącz wyświetlanie pomocy
diff --git a/preferences/setup/egw_pt-br.lang b/preferences/setup/egw_pt-br.lang
index 2ff2eb1ae9..a5f7dd98a4 100644
--- a/preferences/setup/egw_pt-br.lang
+++ b/preferences/setup/egw_pt-br.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	addressbook	pt-br	Habilitar a
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	pt-br	Habilitar ou desabilitar funções de arrastar e soltar em todos os aplicativos. Se o navegador não suportar tal funcionalidade, esta será desabilitada automaticamente. Esta função é experimental no momento.
 enter your new password	preferences	pt-br	Digite sua nova senha
 enter your old password	preferences	pt-br	Digite sua antiga senha
-error: there was a problem finding the preference file for %1 in %2	preferences	pt-br	Erro: Houve um problema ao tentar encontrar o arquivo de preferencias para %1 em %2
 failed to change password.  please contact your administrator.	preferences	pt-br	Erro ao moudar a senha. Por favor contate seu administrador.
 forced preferences	preferences	pt-br	Preferências obrigatórias
 help off	preferences	pt-br	Desligar ajuda
diff --git a/preferences/setup/egw_pt.lang b/preferences/setup/egw_pt.lang
index 4e57707431..8cb60bab8b 100644
--- a/preferences/setup/egw_pt.lang
+++ b/preferences/setup/egw_pt.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	pt	Editar campos personalizados
 enter your new password	preferences	pt	Insira sua nova senha
 enter your old password	preferences	pt	Insira sua antiga senha
-error: there was a problem finding the preference file for %1 in %2	preferences	pt	Erro: Ocorreu um erro ao procurar o ficheiro de preferências %1 no/a %2
 failed to change password.  please contact your administrator.	preferences	pt	Não foi possível alterar a senha. Por favor, contacte o administrador.
 forced preferences	preferences	pt	Preferências obrigatórias
 help off	preferences	pt	Ajuda
diff --git a/preferences/setup/egw_ru.lang b/preferences/setup/egw_ru.lang
index 5e9f41b0ae..c989aa36b0 100644
--- a/preferences/setup/egw_ru.lang
+++ b/preferences/setup/egw_ru.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	addressbook	ru	Разреши
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	ru	Разрешить или запретить функции drug-n-drop во в�ех приложени�х. Е�ли браузер не поддерживает drug-n-drop, �то будет запрещено автоматиче�ки. Эта возможно�ть - �к�периментальна� на данный момент.
 enter your new password	preferences	ru	Введите новый пароль
 enter your old password	preferences	ru	введите прежний пароль
-error: there was a problem finding the preference file for %1 in %2	preferences	ru	Ошибка: проблема пои�ка файла параметров дл� %1 в %2
 failed to change password.  please contact your administrator.	preferences	ru	Ошибка при �мене парол�. Обратите�ь к админи�тратору.
 forced preferences	preferences	ru	Принудительные на�тройки
 help off	preferences	ru	Убрать под�казки
diff --git a/preferences/setup/egw_sk.lang b/preferences/setup/egw_sk.lang
index 85163b1ee0..afc1ab7734 100644
--- a/preferences/setup/egw_sk.lang
+++ b/preferences/setup/egw_sk.lang
@@ -29,7 +29,6 @@ enable drag and drop functionality (experimental)	addressbook	sk	Povoliť funkci
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	sk	Povolí alebo zakáže funkcie ťahaj-a-pusť vo všetkých aplikáciách. Ak váš prehliada� nepodporuje ťahaj-a-pusť, automaticky sa zakáže. Táto funkcia je v sú�asnosti iba na experimentálnej úrovni.
 enter your new password	preferences	sk	Zadajte vaše heslo
 enter your old password	preferences	sk	Zadajte staré heslo
-error: there was a problem finding the preference file for %1 in %2	preferences	sk	Chyba: Súbor predvolieb pre %1 v %2 sa nenašial
 failed to change password.  please contact your administrator.	preferences	sk	Nepodarilo sa zmeniť heslo. Prosím kontaktujte správcu systému.
 forced preferences	preferences	sk	Vynútené nastavenia
 help off	preferences	sk	Skryť Pomocníka
diff --git a/preferences/setup/egw_sl.lang b/preferences/setup/egw_sl.lang
index 32b58e17d0..ddeb3660f0 100644
--- a/preferences/setup/egw_sl.lang
+++ b/preferences/setup/egw_sl.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	addressbook	sl	Omogo�i "povle
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	addressbook	sl	Omogo�i ali onemogo�i "povleci in spusti" v vseh aplikacijah. Če brskalnik tega ne podpira, bo samodejno onemogo�eno. Ta funkcionalnost je trenutno v testni fazi.
 enter your new password	preferences	sl	Vpišite novo geslo
 enter your old password	preferences	sl	Vpišite staro geslo
-error: there was a problem finding the preference file for %1 in %2	preferences	sl	Napaka: ne morem najti datoteke z nastavitvami za %1 v %2
 failed to change password.  please contact your administrator.	preferences	sl	Napaka pri spreminjanju gesla. Obvestite oskrbnika.
 forced preferences	preferences	sl	Vsiljene nastavitve
 help off	preferences	sl	Izklju�i pomo�
diff --git a/preferences/setup/egw_sv.lang b/preferences/setup/egw_sv.lang
index 0002bbdad2..c967c019f4 100644
--- a/preferences/setup/egw_sv.lang
+++ b/preferences/setup/egw_sv.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	sv	Ändra anpassade fält
 enter your new password	preferences	sv	Nytt lösenord
 enter your old password	preferences	sv	Gamla lösenordet
-error: there was a problem finding the preference file for %1 in %2	preferences	sv	Fel: Konfigurations fil för %1 i %2 saknas
 failed to change password.  please contact your administrator.	preferences	sv	Kunde inte ändra lösenordet. Vänligen kontakta administratör.
 forced preferences	preferences	sv	Tvingade inställningar
 help off	preferences	sv	Hjälp av
diff --git a/preferences/setup/egw_tr.lang b/preferences/setup/egw_tr.lang
index bf49890bf1..6d65edf6f6 100644
--- a/preferences/setup/egw_tr.lang
+++ b/preferences/setup/egw_tr.lang
@@ -26,7 +26,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	tr	Do
 edit custom fields	tr	edit custom fields
 enter your new password	tr	Enter your new password
 enter your old password	tr	Enter your old password
-error: there was a problem finding the preference file for %1 in %2	tr	Error: There was a problem finding the preference file for %1 in %2
 failed to change password.  please contact your administrator.	tr	Failed to change password.  Please contact your administrator.
 forced preferences	tr	Forced Preferences
 help off	tr	Help off
diff --git a/preferences/setup/egw_uk.lang b/preferences/setup/egw_uk.lang
index ae2a0832d2..edbc8a2e2d 100644
--- a/preferences/setup/egw_uk.lang
+++ b/preferences/setup/egw_uk.lang
@@ -20,7 +20,6 @@ description can not exceed 255 characters in length !	preferences	uk	Довжи
 do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	preferences	uk	Ви викори�товуєте 24-х годинний формат ча�у, чи 12-и годинний з am/pm.
 edit custom fields	preferences	uk	Редагувати додаткові пол�
 enter your new password	preferences	uk	Введіть новий пароль
-error: there was a problem finding the preference file for %1 in %2	preferences	uk	Помилка: Є проблеми з пошуком файлу параметрів дл� %1 в %2
 forced preferences	preferences	uk	Фор�овані параметри
 help off	preferences	uk	Допомога
 hours	preferences	uk	години
diff --git a/preferences/setup/egw_zh-tw.lang b/preferences/setup/egw_zh-tw.lang
index 3e22c1bdfa..d723bcae48 100644
--- a/preferences/setup/egw_zh-tw.lang
+++ b/preferences/setup/egw_zh-tw.lang
@@ -24,7 +24,6 @@ do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	prefe
 edit custom fields	preferences	zh-tw	編輯自訂的欄�
 enter your new password	preferences	zh-tw	輸入您的新密碼
 enter your old password	preferences	zh-tw	輸入您的舊密碼
-error: there was a problem finding the preference file for %1 in %2	preferences	zh-tw	錯誤： �好設定在 %2 發生錯誤 %1
 failed to change password.  please contact your administrator.	preferences	zh-tw	密碼變更錯誤，請�絡管�員
 forced preferences	preferences	zh-tw	強制修改�好設定
 help off	preferences	zh-tw	關閉求助訊�
diff --git a/preferences/setup/egw_zh.lang b/preferences/setup/egw_zh.lang
index 259a5be73a..808dc73442 100644
--- a/preferences/setup/egw_zh.lang
+++ b/preferences/setup/egw_zh.lang
@@ -32,7 +32,6 @@ enable drag and drop functionality (experimental)	preferences	zh	�用拖放功
 enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	preferences	zh	在所有应用程�中�用或�用拖放功能。如果�览器�支�拖放，它将自动�用。这个特�目�是实验性的。
 enter your new password	preferences	zh	请输入您的新密�
 enter your old password	preferences	zh	请输入您的旧密�
-error: there was a problem finding the preference file for %1 in %2	preferences	zh	错误：在 %2 中为 %1 查找用户�置文件时出现问题。
 failed to change password.  please contact your administrator.	preferences	zh	更改密�失败。请�系系统管�员。
 forced preferences	preferences	zh	强制�数�置
 help off	preferences	zh	关闭�示信�

From 7f976bd883207f3d6f47e9a5cfe9c55021b8bd34 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 09:50:25 +0000
Subject: [PATCH 258/510] "fix for newly introduced bug reported on the lists:
 Fatal error: Class 'notifications' not found in  
 /home/domain/public_html/egw/etemplate/inc/class.bo_tracking.inc.php -->
 reverts an older commit fixing a problem between the (depracated and no
 longer working) browser app and the browser class in the API"

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

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 071d87da44..3167719f61 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1388,8 +1388,8 @@ function __autoload($class)
 {
 	$components = explode('_',$class);
 	$app = array_shift($components);
-	// classes using the new naming schema app_class_name, eg. admin_cmd, but not app/inc/class.app.inc.php
-	if ($app != $class && file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$class.'.inc.php') ||
+	// classes using the new naming schema app_class_name, eg. admin_cmd
+	if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$class.'.inc.php') ||
 		// classes using the new naming schema app_class_name, eg. admin_cmd
 		isset($components[0]) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$app.'_'.$components[0].'.inc.php') ||
 		// eGW api classes using the old naming schema, eg. html

From 76caa7db756f381264d82685aa1e4527daf78981 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 14:15:19 +0000
Subject: [PATCH 259/510] new ajax_submit() function with submitts the whole
 form via ajax to a given callback

---
 webdav.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/webdav.php b/webdav.php
index eba6104ba7..05aed7a4f3 100644
--- a/webdav.php
+++ b/webdav.php
@@ -68,8 +68,25 @@ $GLOBALS['egw_info'] = array(
 	)
 );
 // if you move this file somewhere else, you need to adapt the path to the header!
-include(dirname(__FILE__).'/header.inc.php');
-
+try
+{
+	include(dirname(__FILE__).'/header.inc.php');
+}
+catch (egw_exception_no_permission_app $e)
+{
+	if (isset($GLOBALS['egw_info']['user']['apps']['filemanager']))
+	{
+		$GLOBALS['egw_info']['currentapp'] = 'filemanager';
+	}
+	elseif (isset($GLOBALS['egw_info']['user']['apps']['sitemgr-site']))
+	{
+		$GLOBALS['egw_info']['currentapp'] = 'sitemgr-site';
+	}
+	else
+	{
+		throw $e;
+	}
+}
 $headertime = microtime(true);
 
 $webdav_server = new vfs_webdav_server();

From 0930d0a73913081345bd9d68b4206881ac4645f7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 14:15:35 +0000
Subject: [PATCH 260/510] new ajax_submit() function with submitts the whole
 form via ajax to a given callback

---
 etemplate/inc/class.etemplate.inc.php | 13 +++++++------
 etemplate/js/etemplate.js             |  8 ++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 83e579004c..ae4c5efdd6 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -439,7 +439,7 @@ class etemplate extends boetemplate
 		$content = $this->complete_array_merge(self::$request->changes,$content);
 		//echo "process_exec($this->name) merge(changes,content) ="; _debug_array($content);
 
-		if (self::$loop)
+		if (self::$loop && $type == 'regular')	// only loop for regular (not ajax_submit) requests
 		{
 			if (self::$request->hooked != '')	// set previous phpgw_body if we are called as hook
 			{
@@ -476,7 +476,8 @@ class etemplate extends boetemplate
 		else
 		{
 			//echo "<p>process_exec($this->name): calling $session_data[method]</p>\n";
-			return ExecMethod(self::$request->method,$this->complete_array_merge(self::$request->preserv,$content));
+			return ExecMethod($type == 'regular' ? self::$request->method : $_GET['menuaction'],
+				$this->complete_array_merge(self::$request->preserv,$content));
 		}
 	}
 
@@ -1879,11 +1880,11 @@ class etemplate extends boetemplate
 	* @internal
 	* @param array $content $_POST[$cname], on return the adjusted content
 	* @param array $to_process list of widgets/form-fields to process
-	* @param string $cname basename of our returnt content (same as in call to show)
-	* @param string $type type of request
+	* @param string $cname='' basename of our returnt content (same as in call to show)
+	* @param string $_type='regular' type of request
 	* @return int number of validation errors (the adjusted content is returned by the var-param &$content !)
 	*/
-	function process_show(&$content,$to_process,$cname='', $type = 'regular')
+	function process_show(&$content,$to_process,$cname='',$_type='regular')
 	{
 		if (!isset($content) || !is_array($content) || !is_array($to_process))
 		{
@@ -1916,7 +1917,7 @@ class etemplate extends boetemplate
 			$value = etemplate::get_array($content_in,$form_name,True,$GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' ? false : true );
 			// The comment below does only aplay to normal posts, not for xajax. Files are not supported anyway by xajax atm.
 			// not checked checboxes are not returned in HTML and file is in $_FILES and not in $content_in
-			if($value === false && $type == 'xajaxResponse' /*!in_array($type,array('checkbox','file'))*/) continue;
+			if($value === false && $_type == 'xajaxResponse' /*!in_array($type,array('checkbox','file'))*/) continue;
 
 			if (isset($attr['blur']) && $attr['blur'] == $value)
 			{
diff --git a/etemplate/js/etemplate.js b/etemplate/js/etemplate.js
index 8d55d8f353..2647a2cc2d 100644
--- a/etemplate/js/etemplate.js
+++ b/etemplate/js/etemplate.js
@@ -192,6 +192,14 @@ function values2url(form,names)
 	return url+'&etemplate_exec_id='+form['etemplate_exec_id'].value;
 }
 
+// submits the whole form via ajax to a given menuaction or the current one if '' passed
+function ajax_submit(form,menuaction)
+{
+	if(!menuaction) menuaction = form.action.replace(/.+menuaction=/,'');
+
+	xajax_doXMLHTTP(menuaction+'./etemplate/process_exec', xajax.getFormValues(form));
+}
+
 // sets value (v) of style property (p) for all given elements of type (t) and class (c)
 // eg. set_style_by_class('td','hide','visibility','visible')
 function set_style_by_class(t,c,p,v)

From a3adbcecd67954a8b2ae6e718390c5fd87110e4d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 14:17:46 +0000
Subject: [PATCH 261/510] fixed freetimesearch, which failed to work with new
 default etemplate requests stored directly in the form, using the new
 ajax_submit() function of etemplate

---
 calendar/inc/class.calendar_uiforms.inc.php | 125 +++++++++++++-------
 calendar/setup/etemplates.inc.php           |  24 +++-
 calendar/templates/default/edit.xet         |   6 +-
 3 files changed, 106 insertions(+), 49 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index dbbebdc198..c44f5daa1e 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -290,7 +290,7 @@ class calendar_uiforms extends calendar_ui
 								$bores =& CreateObject('resources.bo_resources');
 								$selectedres = $bores->read($id);
 								$cats = $bores->acl->get_cats(EGW_ACL_DIRECT_BOOKING);
-								if (is_array($cats) && $selectedres['bookable'] == 1 && 
+								if (is_array($cats) && $selectedres['bookable'] == 1 &&
 									$selectedres['cat_id'] && array_key_exists($selectedres['cat_id'],$cats))
 								{
 									if ($selectedres['quantity'] && $selectedres['quantity'] < $quantity) {
@@ -1109,6 +1109,81 @@ class calendar_uiforms extends calendar_ui
 		$etpl->exec('calendar.calendar_uiforms.process_edit',$content,false,false,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
 	}
 
+	/**
+	 * Callback for freetimesearch button in edit
+	 *
+	 * It stores the data of the submitted form in the session under 'freetimesearch_args_'.$edit_content['id'],
+	 * for later retrival of the freetimesearch method, called by the returned window.open() command.
+	 *
+	 * @param array $edit_content
+	 * @return string with xajaxResponse
+	 */
+	function ajax_freetimesearch(array $edit_content)
+	{
+		$response = new xajaxResponse();
+		//$response->addAlert(__METHOD__.'('.array2string($content).')');
+
+		if (!(int)$edit_content['id'])
+		{
+			throw new egw_exception_wrong_parameter(__METHOD__.'() missing id in request!');
+		}
+		if ($edit_content['duration'])
+		{
+			$edit_content['end'] = $edit_content['start'] + $edit_content['duration'];
+		}
+		if ($edit_content['whole_day'])
+		{
+			$arr = $this->bo->date2array($edit_content['start']);
+			$arr['hour'] = $arr['minute'] = $arr['second'] = 0; unset($arr['raw']);
+			$edit_content['start'] = $this->bo->date2ts($arr);
+			$arr = $this->bo->date2array($edit_content['end']);
+			$arr['hour'] = 23; $arr['minute'] = $arr['second'] = 59; unset($arr['raw']);
+			$edit_content['end'] = $this->bo->date2ts($arr);
+		}
+		$content = array(
+			'start'    => $edit_content['start'],
+			'duration' => $edit_content['end'] - $edit_content['start'],
+			'end'      => $edit_content['end'],
+			'cal_id'   => $edit_content['id'],
+			'recur_type'   => $edit_content['recur_type'],
+			'participants' => array(),
+		);
+		foreach($edit_content['participants'] as $key => $data)
+		{
+			if (is_numeric($key) && !$edit_content['participants']['delete'][$data['uid']])
+			{
+				$content['participants'][] = $data['uid'];
+			}
+			elseif ($key == 'account' && !is_array($data) && $data)
+			{
+				$content['participants'][] = $data;
+			}
+		}
+		// default search parameters
+		$content['start_time'] = $edit_content['whole_day'] ? 0 : $this->cal_prefs['workdaystarts'];
+		$content['end_time'] = $this->cal_prefs['workdayends'];
+		if ($this->cal_prefs['workdayends']*HOUR_s < $this->cal_prefs['workdaystarts']*HOUR_s+$content['duration'])
+		{
+			$content['end_time'] = 0;	// no end-time limit, as duration would never fit
+		}
+		$content['weekdays'] = MCAL_M_WEEKDAYS;
+
+		$content['search_window'] = 7 * DAY_s;
+
+		// store content in session
+		egw_cache::setSession('calendar','freetimesearch_args_'.$edit_content['id'],$content);
+
+		//menuaction=calendar.calendar_uiforms.freetimesearch&values2url('start,end,duration,participants,recur_type,whole_day'),ft_search,700,500
+		$link = egw::link('/index.php',array(
+			'menuaction' => 'calendar.calendar_uiforms.freetimesearch',
+			'cal_id'     => $edit_content['id'],
+		));
+
+		$response->addScriptCall('egw_openWindowCentered2',$link,'ft_search',700,500);
+
+		return $response->getXML();
+	}
+
 	/**
 	 * Freetime search
 	 *
@@ -1124,7 +1199,7 @@ class calendar_uiforms extends calendar_ui
 	 */
 	function freetimesearch($content = null)
 	{
-		$etpl =& CreateObject('etemplate.etemplate','calendar.freetimesearch');
+		$etpl = new etemplate('calendar.freetimesearch');
 
 		$sel_options['search_window'] = array(
 			7*DAY_s		=> lang('one week'),
@@ -1135,50 +1210,10 @@ class calendar_uiforms extends calendar_ui
 		);
 		if (!is_array($content))
 		{
-			$edit_content = $etpl->process_values2url();
+			// get content from session (and delete it immediatly)
+			$content = egw_cache::getSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
+			egw_cache::unsetSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
 
-			if ($edit_content['duration'])
-			{
-				$edit_content['end'] = $edit_content['start'] + $edit_content['duration'];
-			}
-			if ($edit_content['whole_day'])
-			{
-				$arr = $this->bo->date2array($edit_content['start']);
-				$arr['hour'] = $arr['minute'] = $arr['second'] = 0; unset($arr['raw']);
-				$edit_content['start'] = $this->bo->date2ts($arr);
-				$arr = $this->bo->date2array($edit_content['end']);
-				$arr['hour'] = 23; $arr['minute'] = $arr['second'] = 59; unset($arr['raw']);
-				$edit_content['end'] = $this->bo->date2ts($arr);
-			}
-			$content = array(
-				'start'    => $edit_content['start'],
-				'duration' => $edit_content['end'] - $edit_content['start'],
-				'end'      => $edit_content['end'],
-				'cal_id'   => $edit_content['id'],
-				'recur_type'   => $edit_content['recur_type'],
-				'participants' => array(),
-			);
-			foreach($edit_content['participants'] as $key => $data)
-			{
-				if (is_numeric($key) && !$edit_content['participants']['delete'][$data['uid']])
-				{
-					$content['participants'][] = $data['uid'];
-				}
-				elseif ($key == 'account' && $data)
-				{
-					$content['participants'][] = $data;
-				}
-			}
-			// default search parameters
-			$content['start_time'] = $edit_content['whole_day'] ? 0 : $this->cal_prefs['workdaystarts'];
-			$content['end_time'] = $this->cal_prefs['workdayends'];
-			if ($this->cal_prefs['workdayends']*HOUR_s < $this->cal_prefs['workdaystarts']*HOUR_s+$content['duration'])
-			{
-				$content['end_time'] = 0;	// no end-time limit, as duration would never fit
-			}
-			$content['weekdays'] = MCAL_M_WEEKDAYS;
-
-			$content['search_window'] = 7 * DAY_s;
 			// pick a searchwindow fitting the duration (search for a 10 day slot in a one week window never succeeds)
 			foreach($sel_options['search_window'] as $window => $label)
 			{
diff --git a/calendar/setup/etemplates.inc.php b/calendar/setup/etemplates.inc.php
index 5328a8c7ff..e94b9f5ce2 100644
--- a/calendar/setup/etemplates.inc.php
+++ b/calendar/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application calendar
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-01-14 10:14
+	* generated by soetemplate::dump4setup() 2009-04-29 16:16
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package calendar
@@ -14,34 +14,56 @@ $templ_version=1;
 
 $templ_data[] = array('name' => 'calendar.conflicts','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:3:{i:0;a:3:{s:4:"type";s:5:"label";s:5:"label";s:20:" Scheduling conflict";s:4:"span";s:9:",size120b";}i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:34:"conflicts[$row][icon_participants]";s:5:"label";s:38:"@conflicts[$row][tooltip_participants]";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:27:"conflicts[$row][icon_recur]";s:5:"label";s:28:"@conflicts[$row][text_recur]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:21:"conflicts[$row][time]";s:7:"no_lang";s:1:"1";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"name";s:22:"conflicts[$row][title]";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:41:"conflicts[$row][conflicting_participants]";s:7:"no_lang";s:1:"1";}s:4:"help";s:23:"conflict[$row][tooltip]";}}}s:4:"rows";i:1;s:4:"cols";i:4;}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Ignore conflict";s:4:"name";s:14:"button[ignore]";s:4:"help";s:37:"Saves the event ignoring the conflict";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reedit]";s:5:"label";s:13:"Re-Edit event";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Freetime search";s:4:"name";s:16:"button[freetime]";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}}','size' => '','style' => '','modified' => '1119080124',);
 
+$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:6:{s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:1:"A";s:3:"100";s:2:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"name";s:5:"title";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:63:"General|Description|Participants|Recurrence|Custom|Links|Alarms";s:4:"name";s:63:"general|description|participants|recurrence|custom|links|alarms";s:4:"help";s:158:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:5:"owner";s:8:"readonly";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:9:"date-time";s:5:"label";s:7:"Updated";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}}}i:5;a:3:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:3;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1181140110',);
+
 $templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.005','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:6:{s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:1:"A";s:3:"100";s:2:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"name";s:5:"title";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:63:"General|Description|Participants|Recurrence|Custom|Links|Alarms";s:4:"name";s:63:"general|description|participants|recurrence|custom|links|alarms";s:4:"help";s:158:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:5:"owner";s:8:"readonly";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:9:"date-time";s:5:"label";s:7:"Updated";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}}}i:5;a:3:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:3;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1199959741',);
 
 $templ_data[] = array('name' => 'calendar.edit.alarms','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"h1";s:16:"20,@no_add_alarm";s:2:"c2";s:4:",top";s:2:"h2";s:8:",!@alarm";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"B";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:4:",0,7";s:4:"name";s:15:"new_alarm[days]";s:4:"help";s:4:"days";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[days]";s:5:"label";s:4:"days";}i:3;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:16:"new_alarm[hours]";s:4:"size";s:5:",0,23";s:4:"help";s:5:"hours";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"size";s:19:",,,new_alarm[hours]";s:5:"label";s:5:"hours";}i:5;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:15:"new_alarm[mins]";s:4:"size";s:7:",0,55,5";s:4:"help";s:7:"Minutes";}i:6;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[mins]";s:5:"label";s:7:"Minutes";}i:7;a:5:{s:4:"type";s:6:"select";s:4:"name";s:16:"new_alarm[owner]";s:7:"no_lang";s:1:"1";s:5:"label";s:3:"for";s:4:"help";s:31:"Select who should get the alarm";}i:8;a:3:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[add_alarm]";s:5:"label";s:9:"Add alarm";}}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Alarms";}s:1:"B";a:6:{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:3:"row";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"All participants";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[time]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[offset]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:11:"${row}[all]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"E";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:27:"delete_alarm[$row_cont[id]]";s:4:"help";s:17:"Delete this alarm";s:7:"onclick";s:36:"return confirm(\'Delete this alarm\');";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:4:"name";s:5:"alarm";s:7:"options";a:0:{}}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118780740',);
 
+$templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118737582',);
+
 $templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1184167751',);
 
 $templ_data[] = array('name' => 'calendar.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:7:"row,top";s:1:"A";s:2:"95";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,description";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"12,70";s:4:"name";s:11:"description";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118480337',);
 
 $templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:257:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:4:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
 
+$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:85:"ajax_submit(this.form,\'calendar.calendar_uiforms.ajax_freetimesearch\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:4:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
+
 $templ_data[] = array('name' => 'calendar.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:2:"th";s:2:"h1";s:6:",@view";s:2:"c2";s:3:"row";s:2:"h2";s:6:",@view";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:7:"link-to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:4;s:4:"size";s:17:"100%,200,,,,,auto";}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1231922193',);
 
+$templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:22:"User or group,both,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1172430059',);
+
 $templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1172430059',);
 
 $templ_data[] = array('name' => 'calendar.edit.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1229280346',);
 
+$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:9:{s:2:"c1";s:2:"th";s:1:"A";s:2:"95";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:7:"row,top";s:1:"D";s:3:"50%";s:2:"h1";s:2:"12";s:2:"h2";s:2:"12";s:2:"h3";s:2:"12";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"be back soon ;-)";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_type";s:5:"label";s:11:"Repeat type";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:10:"recur_type";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,recur_interval";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";s:4:"size";s:9:"None,2,10";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:16:",,,recur_enddate";s:5:"label";s:8:"End date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:13:"recur_enddate";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_data";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:3:"6,1";s:4:"name";s:10:"recur_data";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:16:"@exception_label";s:4:"help";s:38:"Create an exception for the given date";s:7:"no_lang";s:1:"1";}}s:1:"D";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"size";s:6:"delete";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"help";s:21:"Delete this exception";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"rows";i:4;s:4:"cols";i:4;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118737412',);
+
 $templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:9:{s:2:"c1";s:2:"th";s:1:"A";s:2:"95";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:7:"row,top";s:1:"D";s:3:"50%";s:2:"h1";s:2:"12";s:2:"h2";s:2:"12";s:2:"h3";s:2:"12";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"be back soon ;-)";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_type";s:5:"label";s:11:"Repeat type";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:10:"recur_type";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,recur_interval";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";s:4:"size";s:9:"None,2,31";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:16:",,,recur_enddate";s:5:"label";s:8:"End date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:13:"recur_enddate";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_data";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:3:"6,1";s:4:"name";s:10:"recur_data";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:16:"@exception_label";s:4:"help";s:38:"Create an exception for the given date";s:7:"no_lang";s:1:"1";}}s:1:"D";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"size";s:6:"delete";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"help";s:21:"Delete this exception";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"rows";i:4;s:4:"cols";i:4;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1210321464',);
 
 $templ_data[] = array('name' => 'calendar.export','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:1:{s:2:"h5";s:2:",1";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,start";s:5:"label";s:5:"Start";}s:1:"B";a:3:{s:4:"type";s:4:"date";s:4:"name";s:5:"start";s:4:"help";s:23:"Startdate of the export";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:6:",,,end";s:5:"label";s:3:"End";}s:1:"B";a:3:{s:4:"type";s:4:"date";s:4:"name";s:3:"end";s:4:"help";s:21:"Enddate of the export";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,file";s:5:"label";s:8:"Filename";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"file";s:4:"help";s:24:"Filename of the download";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,version";s:5:"label";s:7:"Version";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:7:"version";}}i:6;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:8:"Download";s:4:"name";s:8:"download";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1130738737',);
 
+$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";s:4:"span";s:9:",end_hide";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"cancel";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
+.redItalic { color: red; font-style: italic; }
+.end_hide { visibility: hidden; }','modified' => '1102850646',);
+
+$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:92:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\');";s:4:"size";s:12:"Use end date";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";s:4:"span";s:9:",end_hide";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"cancel";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
+.redItalic { color: red; font-style: italic; }
+.end_hide { visibility: hidden; }','modified' => '1149297367',);
+
 $templ_data[] = array('name' => 'calendar.freetimesearch.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;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:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Select";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"size";s:3:",16";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[start]";s:4:"help";s:13:"select a time";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Select";s:4:"name";s:12:"select[$row]";s:4:"help";s:41:"use the selected time and close the popup";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1097183756',);
 
 $templ_data[] = array('name' => 'calendar.import','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"iCal file";}s:1:"B";a:3:{s:4:"type";s:4:"file";s:4:"name";s:9:"ical_file";s:6:"needed";s:1:"1";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131469789',);
 
+$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:18:"calendar.list.rows";s:4:"name";s:2:"nm";}}i:3;a:1:{s:1:"A";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";s:5:"align";s:5:"right";i:1;a:6:{s:4:"type";s:6:"button";s:4:"name";s:9:"deleteall";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:23:"Delete selected Envents";s:7:"onclick";s:43:"return confirm(\'Delete selected Envents?\');";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }','modified' => '1200671585',);
+
 $templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:18:"calendar.list.rows";s:4:"name";s:2:"nm";}}i:3;a:1:{s:1:"A";a:9:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";i:1;a:6:{s:4:"type";s:6:"button";s:4:"name";s:9:"deleteall";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:23:"Delete selected Envents";s:7:"onclick";s:43:"return confirm(\'Delete selected Envents?\');";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }','modified' => '1200671585',);
 
 $templ_data[] = array('name' => 'calendar.list.dates','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:4:"hbox";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}i:2;a:2:{s:4:"type";s:4:"date";s:4:"name";s:9:"startdate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"End";}i:4;a:2:{s:4:"type";s:4:"date";s:4:"name";s:7:"enddate";}s:4:"span";s:12:",custom_hide";}}','size' => '','style' => '.custom_hide { visibility: hidden; }','modified' => '1173420675',);
 
+$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:3:"40%";}i:1;a:12:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"cal_end";s:5:"label";s:3:"End";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}}s:1:"I";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}s:1:"K";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"L";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:12:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";}s:1:"F";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"G";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}}s:1:"I";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"L";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this event";s:7:"onclick";s:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this event";s:7:"onclick";s:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}s:4:"span";s:8:",noPrint";i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:12;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1200064350',);
+
 $templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:3:"40%";}i:1;a:12:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"cal_end";s:5:"label";s:3:"End";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}}s:1:"I";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}s:1:"K";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"L";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:12:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";}s:1:"F";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"G";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}}s:1:"I";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"L";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this event";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this event";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}s:4:"span";s:8:",noPrint";i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:12;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1200064350',);
 
 $templ_data[] = array('name' => 'calendar.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}}}i:4;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:7:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:6:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:20:"calendar.print.links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}','size' => '','style' => '','modified' => '1229596125',);
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 2a263d5adf..d82001c4a4 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="calendar.edit.general" template="" lang="" group="0" version="1.5.002">
+	<template id="calendar.edit.general" template="" lang="" group="0" version="1.7.001">
 		<hbox options="0,0">
 			<grid width="100%" height="200">
 				<columns>
@@ -27,7 +27,7 @@
 					</row>
 					<row>
 						<description/>
-						<buttononly label="Freetime search" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.freetimesearch')+values2url(this.form,'start,end,duration,participants,recur_type,whole_day'),'ft_search','dependent=yes,width=700,height=500,scrollbars=yes,status=yes'); return false;" width="0" id="freetime" statustext="Find free timeslots where the selected participants are availible for the given timespan"/>
+						<buttononly label="Freetime search" onclick="ajax_submit(this.form,'calendar.calendar_uiforms.ajax_freetimesearch'); return false;" width="0" id="freetime" statustext="Find free timeslots where the selected participants are availible for the given timespan"/>
 					</row>
 					<row class="row">
 						<description options=",,,location" value="Location" width="0"/>
@@ -276,7 +276,7 @@
 					<textbox size="80" maxlength="255" id="title" span="all" needed="1"/>
 				</row>
 				<row>
-					<tabbox span="all">
+					<tabbox span="all" id="general|description|participants|recurrence|custom|links|alarms">
 						<tabs>
 							<tab label="General" statustext="Location, Start- and Endtimes, ..."/>
 							<tab label="Description" statustext="Full description"/>

From 0439b8de3581b681f6a5ac99c0d92d9efffcf9c5 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 29 Apr 2009 14:29:57 +0000
Subject: [PATCH 262/510] handling checkbox values in listview, handling radio
 values display in listview

---
 .../inc/class.customfields_widget.inc.php     | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/etemplate/inc/class.customfields_widget.inc.php b/etemplate/inc/class.customfields_widget.inc.php
index 4ba34fed29..f63bf0118b 100644
--- a/etemplate/inc/class.customfields_widget.inc.php
+++ b/etemplate/inc/class.customfields_widget.inc.php
@@ -186,9 +186,15 @@ class customfields_widget
 				)));
 			} elseif ($type == 'customfields-list') {
 				if (isset($value[$this->prefix.$lname]) && $value[$this->prefix.$lname] !== '') {
-					etemplate::add_child($cell,$input =& etemplate::empty_cell('image','info.png',
-						array('label'=>/*lang("custom fields").": ".*/$field['label'],'width'=>"16px",
-							'onclick'=>"return alert('".lang("custom fields").": ".$field['label']."');")));
+					switch ((string)$field['type'])
+					{
+						case 'checkbox':
+							if ($value[$this->prefix.$lname]==0) break;
+						default:
+							etemplate::add_child($cell,$input =& etemplate::empty_cell('image','info.png',
+								array('label'=>/*lang("custom fields").": ".*/$field['label'],'width'=>"16px",
+									'onclick'=>"return alert('".lang("custom fields").": ".$field['label']."');")));
+					}
 				}
 			}
 
@@ -230,19 +236,25 @@ class customfields_widget
 					$row_class = 'th';
 					break;
 				case 'radio' :
+					$showthis = '#a#l#l#';
 					if (count($field['values']) == 1 && isset($field['values']['@']))
 					{
 						$field['values'] = $this->_get_options_from_file($field['values']['@']);
 					}
 					if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
-					$input =& etemplate::empty_cell('groupbox');
+					if ($readonly) {
+						$showthis = $value[$this->prefix.$lname];
+						$input =& etemplate::empty_cell('hbox');
+					} else {
+						$input =& etemplate::empty_cell('groupbox');
+					}
 					$m = 0;
 					foreach ($field['values'] as $key => $val)
 					{
 						$radio = etemplate::empty_cell('radio',$this->prefix.$lname);
 						$radio['label'] = $val;
 						$radio['size'] = $key;
-						etemplate::add_child($input,$radio);
+						if ($showthis == '#a#l#l#' || $showthis == $key) etemplate::add_child($input,$radio);
 						unset($radio);
 					}
 					break;

From 0275b183dd024e2d2e5c97c563569c501cacbebf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 14:31:58 +0000
Subject: [PATCH 263/510] "small fix of last commit for new (not already saved)
 events"

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

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index c44f5daa1e..e5a8578418 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1121,12 +1121,8 @@ class calendar_uiforms extends calendar_ui
 	function ajax_freetimesearch(array $edit_content)
 	{
 		$response = new xajaxResponse();
-		//$response->addAlert(__METHOD__.'('.array2string($content).')');
+		//$response->addAlert(__METHOD__.'('.array2string($edit_content).')');
 
-		if (!(int)$edit_content['id'])
-		{
-			throw new egw_exception_wrong_parameter(__METHOD__.'() missing id in request!');
-		}
 		if ($edit_content['duration'])
 		{
 			$edit_content['end'] = $edit_content['start'] + $edit_content['duration'];
@@ -1171,7 +1167,7 @@ class calendar_uiforms extends calendar_ui
 		$content['search_window'] = 7 * DAY_s;
 
 		// store content in session
-		egw_cache::setSession('calendar','freetimesearch_args_'.$edit_content['id'],$content);
+		egw_cache::setSession('calendar','freetimesearch_args_'.(int)$edit_content['id'],$content);
 
 		//menuaction=calendar.calendar_uiforms.freetimesearch&values2url('start,end,duration,participants,recur_type,whole_day'),ft_search,700,500
 		$link = egw::link('/index.php',array(

From b6eda8e39b5957deb50d42b17da130d3d887fb50 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 16:08:13 +0000
Subject: [PATCH 264/510] "replacing colons with dashes in filenames, as some
 windows installs seem to have problem with colons in filenames"

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

diff --git a/phpgwapi/inc/class.egw_cache_files.inc.php b/phpgwapi/inc/class.egw_cache_files.inc.php
index a38d4cfc82..8fa7e4c536 100644
--- a/phpgwapi/inc/class.egw_cache_files.inc.php
+++ b/phpgwapi/inc/class.egw_cache_files.inc.php
@@ -137,7 +137,7 @@ class egw_cache_files implements egw_cache_provider
 	 */
 	private function filename(array $keys,$mkdir=false)
 	{
-		$fname = $this->base_path.'/'.implode('/',$keys);
+		$fname = $this->base_path.'/'.str_replace(':','-',implode('/',$keys));
 
 		if ($mkdir && !file_exists($dirname=dirname($fname)))
 		{

From 14de24303ed5526a36d0bd155c208b9dfff13928 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Apr 2009 19:15:54 +0000
Subject: [PATCH 265/510] "prevent empty account-names from deleting whole
 /home"

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

diff --git a/phpgwapi/inc/class.vfs_home_hooks.inc.php b/phpgwapi/inc/class.vfs_home_hooks.inc.php
index 66a46961a1..7507e5e7b5 100644
--- a/phpgwapi/inc/class.vfs_home_hooks.inc.php
+++ b/phpgwapi/inc/class.vfs_home_hooks.inc.php
@@ -89,11 +89,15 @@ class vfs_home_hooks
 			// make the new owner the owner of the dir and it's content
 			egw_vfs::find($new_dir,array(),array('egw_vfs','chown'),$data['new_owner']);
 		}
-		else
+		elseif(!empty($data['account_lid']) && $data['account_lid'] != '/')
 		{
 			// delete the user-directory
 			egw_vfs::remove('/home/'.$data['account_lid']);
 		}
+		else
+		{
+			throw new egw_exception_assertion_failed(__METHOD__.'('.array2string($data).') account_lid NOT set!');
+		}
 		egw_vfs::$is_root = false;
 	}
 
@@ -147,6 +151,11 @@ class vfs_home_hooks
 	static function deleteGroup($data)
 	{
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
+
+		if(empty($data['account_name']) || $data['account_name'] == '/')
+		{
+			throw new egw_exception_assertion_failed(__METHOD__.'('.array2string($data).') account_name NOT set!');
+		}
 		// delete the group-directory
 		egw_vfs::$is_root = true;
 		egw_vfs::remove('/home/'.$data['account_name']);

From 1597cdc533a33b72908d1a073652d1ae73ce4886 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Apr 2009 07:36:07 +0000
Subject: [PATCH 266/510] "adding path (EGW_SERVER_ROOT) to hash for basic auth
 pseudo sesion id (otherwise different installs in different pathes using
 identical credentials would share the session, which is no good idea)"

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

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index ef3cb8c761..5ad87b7f1f 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -730,7 +730,7 @@ class egw_session
 			in_array(basename($_SERVER['SCRIPT_NAME']),array('webdav.php','groupdav.php')))
 		{
 			// we generate a pseudo-sessionid from the basic auth credentials
-			$sessionid = md5($_SERVER['PHP_AUTH_USER'].':'.$_SERVER['PHP_AUTH_PW'].':'.$_SERVER['HTTP_HOST']);
+			$sessionid = md5($_SERVER['PHP_AUTH_USER'].':'.$_SERVER['PHP_AUTH_PW'].':'.$_SERVER['HTTP_HOST'].':'.EGW_SERVER_ROOT);
 		}
 		elseif(!$only_basic_auth && isset($_REQUEST[self::EGW_SESSION_NAME]))
 		{

From 11283d4f77520ffeb18b23315edc72009b2ae1c6 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Apr 2009 07:41:46 +0000
Subject: [PATCH 267/510] "copied COPY from HTTP_WebDAV_Server_Filesystem: - it
 contained sql queries, which can not work in eGW - to add Location header
 shown in rfc2518 example (section 8.9.5)"

---
 phpgwapi/inc/class.vfs_webdav_server.inc.php | 124 ++++++++++++++++++-
 1 file changed, 123 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.vfs_webdav_server.inc.php b/phpgwapi/inc/class.vfs_webdav_server.inc.php
index 79eec1471a..d1b60fa737 100644
--- a/phpgwapi/inc/class.vfs_webdav_server.inc.php
+++ b/phpgwapi/inc/class.vfs_webdav_server.inc.php
@@ -113,7 +113,129 @@ class vfs_webdav_server extends HTTP_WebDAV_Server_Filesystem
 		return '204 No Content';
 	}
 
-	/**
+    /**
+     * COPY method handler
+     *
+     * @param  array  general parameter passing array
+     * @return bool   true on success
+     */
+    function COPY($options, $del=false)
+    {
+        // TODO Property updates still broken (Litmus should detect this?)
+
+        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+            return "415 Unsupported media type";
+        }
+
+        // no copying to different WebDAV Servers yet
+        if (isset($options["dest_url"])) {
+            return "502 bad gateway";
+        }
+
+        $source = $this->base .$options["path"];
+        if (!file_exists($source)) return "404 Not found";
+
+        $dest         = $this->base . $options["dest"];
+        $new          = !file_exists($dest);
+        $existing_col = false;
+
+        if (!$new) {
+            if ($del && is_dir($dest)) {
+                if (!$options["overwrite"]) {
+                    return "412 precondition failed";
+                }
+                $dest .= basename($source);
+                if (file_exists($dest)) {
+                    $options["dest"] .= basename($source);
+                } else {
+                    $new          = true;
+                    $existing_col = true;
+                }
+            }
+        }
+
+        if (!$new) {
+            if ($options["overwrite"]) {
+                $stat = $this->DELETE(array("path" => $options["dest"]));
+                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+                    return $stat;
+                }
+            } else {
+                return "412 precondition failed";
+            }
+        }
+
+        if (is_dir($source) && ($options["depth"] != "infinity")) {
+            // RFC 2518 Section 9.2, last paragraph
+            return "400 Bad request";
+        }
+
+        if ($del) {
+            if (!rename($source, $dest)) {
+                return "500 Internal server error";
+            }
+            $destpath = $this->_unslashify($options["dest"]);
+/*
+            if (is_dir($source)) {
+                $query = "UPDATE {$this->db_prefix}properties
+                                 SET path = REPLACE(path, '".$options["path"]."', '".$destpath."')
+                               WHERE path LIKE '".$this->_slashify($options["path"])."%'";
+                mysql_query($query);
+            }
+
+            $query = "UPDATE {$this->db_prefix}properties
+                             SET path = '".$destpath."'
+                           WHERE path = '".$options["path"]."'";
+            mysql_query($query);
+*/
+        } else {
+            if (is_dir($source)) {
+                $files = System::find($source);
+                $files = array_reverse($files);
+            } else {
+                $files = array($source);
+            }
+
+            if (!is_array($files) || empty($files)) {
+                return "500 Internal server error";
+            }
+
+
+            foreach ($files as $file) {
+                if (is_dir($file)) {
+                    $file = $this->_slashify($file);
+                }
+
+                $destfile = str_replace($source, $dest, $file);
+
+                if (is_dir($file)) {
+                    if (!is_dir($destfile)) {
+                        // TODO "mkdir -p" here? (only natively supported by PHP 5)
+                        if (!@mkdir($destfile)) {
+                            return "409 Conflict";
+                        }
+                    }
+                } else {
+                    if (!@copy($file, $destfile)) {
+                        return "409 Conflict";
+                    }
+                }
+            }
+
+/*
+           $query = "INSERT INTO {$this->db_prefix}properties
+                               SELECT *
+                                 FROM {$this->db_prefix}properties
+                                WHERE path = '".$options['path']."'";
+*/
+        }
+        // adding Location header as shown in example in rfc2518 section 8.9.5
+		header('Location: '.$this->base_uri.$options['dest']);
+
+        return ($new && !$existing_col) ? "201 Created" : "204 No Content";
+    }
+
+    /**
 	* Get properties for a single file/resource
 	*
 	* @param  string  resource path

From ecd9354d1d7da0d75cb8f9d5d746f3fc5bf0cfb0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Apr 2009 07:46:53 +0000
Subject: [PATCH 268/510] "fixed failed move or rename via WebDAV (eg. NetDrive
 on Windows): trailing slashes added to all collections caused a rename to an
 empty filename --> all training slashes get now removed prior to calling any
 backend functions"

---
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 54 +++++++++++++++----
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index e1f0cbe12e..9baaa05418 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -114,6 +114,8 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static function resolve_url_symlinks($path,$file_exists=true,$resolve_last_symlink=true)
 	{
+		$path = self::get_path($path);
+
 		if (!($stat = self::url_stat($path,$resolve_last_symlink?0:STREAM_URL_STAT_LINK)) && !$file_exists)
 		{
 			$ret = self::check_symlink_components($path,0,$url);
@@ -143,6 +145,8 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	{
 		static $cache = array();
 
+		$path = self::get_path($path);
+
 		// we do some caching here
 		if (isset($cache[$path]))
 		{
@@ -384,7 +388,12 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 			return false;
 		}
 		self::symlinkCache_remove($path_from);
-		return rename($url_from,$url_to);
+		$ret = rename($url_from,$url_to);
+		if (self::LOG_LEVEL > 1 || self::LOG_LEVEL && $ret)
+		{
+			error_log(__METHOD__."('$path_from','$path_to') url_from='$url_from', url_to='$url_to' returning ".array2string($ret));
+		}
+		return $ret;
 	}
 
 	/**
@@ -692,8 +701,6 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components)");
 
-		if (substr($path,-1) == '/') $path = substr($path,0,-1);	// remove trailing slashes, eg. added by webdav
-
 		if (!($url = self::resolve_url($path,!($flags & STREAM_URL_STAT_LINK))))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!");
@@ -714,7 +721,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 					$lpath = egw_vfs::concat(parse_url($path,PHP_URL_PATH),'../'.$lpath);
 				}
 				$url = egw_vfs::PREFIX.$lpath;
-				if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$flags) symlink found and resolved to $url");
+				if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$flags) symlif (substr($path,-1) == '/' && $path != '/') $path = substr($path,0,-1);	// remove trailing slash eg. added by WebDAVink found and resolved to $url");
 				// try reading the stat of the link
 				if ($stat = self::url_stat($lpath,STREAM_URL_STAT_QUIET))
 				{
@@ -818,7 +825,8 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static protected function symlinkCache_add($path,$target)
 	{
-		if ($path[0] != '/') $path = parse_url($path,PHP_URL_PATH);
+		$path = self::get_path($path,self::SCHEME);
+
 		if (isset(self::$symlink_cache[$path])) return;	// nothing to do
 
 		if ($target[0] != '/') $target = parse_url($target,PHP_URL_PATH);
@@ -837,9 +845,10 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static protected function symlinkCache_remove($path)
 	{
-		if ($path[0] != '/') $path = parse_url($path,PHP_URL_PATH);
+		$path = self::get_path($path,self::SCHEME);
+
 		unset(self::$symlink_cache[$path]);
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path) cache now ".array2string(self::$$symlink_cache));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path) cache now ".array2string(self::$symlink_cache));
 	}
 
 	/**
@@ -854,10 +863,8 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	static public function symlinkCache_resolve($path,$do_symlink=true)
 	{
 		// remove vfs scheme, but no other schemes (eg. filesystem!)
-		if ($path[0] != '/' && parse_url($path,PHP_URL_SCHEME) == self::SCHEME)
-		{
-			$path = parse_url($path,PHP_URL_PATH);
-		}
+		$path = self::get_path($path,self::SCHEME);
+
 		$strlen_path = strlen($path);
 
 		foreach(self::$symlink_cache as $p => $t)
@@ -1002,6 +1009,31 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		return str_replace('.','_',$scheme).'_stream_wrapper';
 	}
 
+	/**
+	 * Getting the path from an url (or path) AND removing trailing slashes
+	 *
+	 * @param string $path url or path (might contain trailing slash from WebDAV!)
+	 * @param string $only_remove_scheme=null if given only that scheme get's removed
+	 * @return string path without training slash
+	 */
+	static protected function get_path($path,$only_remove_scheme=null)
+	{
+		if ($path[0] != '/' && (!$only_remove_scheme || parse_url($path,PHP_URL_SCHEME) == $only_remove_scheme))
+		{
+			$path = parse_url($path,PHP_URL_PATH);
+		}
+		// remove trailing slashes eg. added by WebDAV
+		while (substr($path,-1) == '/' && $path != '/')
+		{
+			$path = substr($path,0,-1);
+		}
+		return $path;
+	}
+
+	/**
+	 * Init our static properties and register this wrapper
+	 *
+	 */
 	static function init_static()
 	{
 		stream_register_wrapper(self::SCHEME,__CLASS__);

From 69171b7928e71e5d94d5067a82422277da1c915f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Apr 2009 08:07:25 +0000
Subject: [PATCH 269/510] "image: using csv_split for options to allow options
 with commas, eg. filenames containing commas"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index ae4c5efdd6..5376ad8df2 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1485,7 +1485,7 @@ class etemplate extends boetemplate
 				}
 				if (!$readonly)
 				{
-					list($extra_link,$extra_link_target,$imagemap,$extra_link_popup,$id) = explode(',',$cell['size']);
+					list($extra_link,$extra_link_target,$imagemap,$extra_link_popup,$id) = self::csv_split($cell['size']);
 				}
 				$html .= html::image($app,$img,strlen($label) > 1 && !$cell['no_lang'] ? lang($label) : $label,
 					'border="0"'.($imagemap?' usemap="#'.html::htmlspecialchars($imagemap).'"':'').

From 5af287359880b1487df2acaf0f469168a90bee6f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Apr 2009 08:09:50 +0000
Subject: [PATCH 270/510] Using links for Up and Home Icons --> get requests
 avoid browser asking while using back button

---
 filemanager/inc/class.filemanager_ui.inc.php | 14 ++++++++++++++
 filemanager/setup/etemplates.inc.php         |  8 +++-----
 filemanager/templates/default/index.xet      |  6 +++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index ce424b0c4a..e697da8306 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -102,6 +102,15 @@ class filemanager_ui
 			if (isset($_GET['msg'])) $msg = $_GET['msg'];
 			if (isset($_GET['path']) && ($path = $_GET['path']))
 			{
+				switch($path)
+				{
+					case '..':
+						$path = egw_vfs::dirname($content['nm']['path']);
+						break;
+					case '~':
+						$path = self::get_home_dir();
+						break;
+				}
 				if ($path[0] == '/' && egw_vfs::stat($path,true) && egw_vfs::is_dir($path) && egw_vfs::check_access($path,egw_vfs::READABLE))
 				{
 					$content['nm']['path'] = $path;
@@ -530,6 +539,11 @@ class filemanager_ui
 			));
 		}
 		$rows = $dir_is_writable = array();
+		if ($query['searchletter'] && egw_vfs::stat($query['path'].'/'.$query['searchletter'].'*'))
+		{
+			$query['path'] .= '/'.$query['searchletter'].'*';
+			$query['searchletter'] = false;
+		}
 		if($query['searchletter'] && !empty($query['search']))
 		{
 			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index c75abd77b9..d199b6d0a8 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-18 12:11
+	* generated by soetemplate::dump4setup() 2009-04-30 10:08
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -38,8 +38,6 @@ $templ_data[] = array('name' => 'filemanager.file.custom','template' => '','lang
 
 $templ_data[] = array('name' => 'filemanager.file.eacl','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:4:",top";s:2:"c2";s:7:",bottom";s:2:"h2";s:11:",!@is_owner";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:4:"span";s:3:"all";s:5:"label";s:28:"Extended access control list";i:1;a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,200,,,,,auto";s:4:"data";a:3:{i:0;a:7:{s:1:"A";s:2:"80";s:1:"B";s:2:"80";s:1:"D";s:2:"16";s:2:"h2";s:4:",!@1";s:1:"C";s:3:"20%";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Rights";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Inherited";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[rights]";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[path]";}s:1:"D";a:5:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:39:"delete[$row_cont[ino]-$row_cont[owner]]";s:7:"onclick";s:43:"return confirm(\'Delete this extended ACL\');";}}}s:4:"name";s:4:"eacl";s:4:"rows";i:2;s:4:"cols";i:4;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:15:"select one,both";s:4:"name";s:11:"eacl[owner]";s:4:"span";s:12:",eaclAccount";s:5:"label";s:5:"Owner";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:12:"eacl[rights]";s:4:"span";s:11:",eaclRights";s:5:"label";s:6:"Rights";}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:12:"button[eacl]";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1207724932',);
 
-$templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:2:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";s:8:"onchange";s:94:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_rename_target\',document.location.href,this.value);";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:5:"hsize";s:5:"label";s:17:"%s ($cont[size]b)";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
-
 $templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:2:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:4:"size";s:4:"size";s:1:"1";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,comment";s:5:"label";s:7:"Comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:7:"comment";s:4:"span";s:8:",comment";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
 
 $templ_data[] = array('name' => 'filemanager.file.general','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:10:{i:0;a:4:{s:1:"A";s:2:"80";s:2:"h1";s:2:"60";s:2:"h3";s:10:",!@is_link";s:2:"h6";s:9:",@is_link";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:4:"icon";s:4:"span";s:9:",mimeHuge";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:6:"needed";s:1:"1";s:4:"span";s:9:",fileName";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Link";s:4:"size";s:10:",,,symlink";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"span";s:9:",fileName";s:4:"name";s:7:"symlink";s:8:"readonly";s:1:"1";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:4:"mime";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Directory";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"dir";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Size";}s:1:"B";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:4:"size";s:4:"size";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Created";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"ctime";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Modified";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"mtime";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,comment";s:5:"label";s:7:"Comment";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:7:"comment";s:4:"span";s:8:",comment";}}}s:4:"rows";i:9;s:4:"cols";i:2;s:4:"size";s:12:"450,300,,,10";s:7:"options";a:3:{i:0;s:3:"450";i:1;s:3:"300";i:4;s:2:"10";}}}','size' => '450,300,,,10','style' => '','modified' => '1204554817',);
@@ -48,10 +46,10 @@ $templ_data[] = array('name' => 'filemanager.file.perms','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.file.preview','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2:"c1";s:4:",top";s:2:"h1";s:16:",!@mime=/^image/";s:2:"h3";s:22:",@mime=/^(image|text)/";s:2:"h2";s:18:"280,!@text_content";s:2:"c2";s:4:",top";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:4:"link";s:4:"span";s:13:",previewImage";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:12:"text_content";s:4:"span";s:12:",previewText";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"No preview available";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:18:"450,300,,,10,,auto";s:7:"options";a:4:{i:0;s:3:"450";i:1;s:3:"300";i:6;s:4:"auto";i:4;s:2:"10";}}}','size' => '450,300,,,10,,auto','style' => '','modified' => '1204567479',);
 
-$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:16:"button_createdir";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:9:"editpaste";s:4:"help";s:20:"$cont[paste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1235658193',);
-
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:13:{s:4:"type";s:4:"hbox";s:4:"size";s:2:"10";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:35:"button_createdir,createdir_disabled";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:18:"link,link_disabled";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:28:"editpaste,editpaste_disabled";s:4:"help";s:20:"$cont[paste_tooltip]";}i:10;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[linkpaste]";s:4:"size";s:28:"linkpaste,linkpaste_disabled";s:4:"help";s:24:"$cont[linkpaste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
 
+$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:13:{s:4:"type";s:4:"hbox";s:4:"size";s:2:"10";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:2:"Up";s:4:"name";s:4:"goup";s:4:"size";s:40:"filemanager.filemanager_ui.index&path=..";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";s:4:"size";s:39:"filemanager.filemanager_ui.index&path=~";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:35:"button_createdir,createdir_disabled";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:18:"link,link_disabled";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:28:"editpaste,editpaste_disabled";s:4:"help";s:20:"$cont[paste_tooltip]";}i:10;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[linkpaste]";s:4:"size";s:28:"linkpaste,linkpaste_disabled";s:4:"help";s:24:"$cont[linkpaste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
+
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:5:"label";s:15:"$row_cont[mime]";s:4:"name";s:12:"${row}[icon]";s:5:"align";s:6:"center";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"size";s:14:",@${row}[link]";s:4:"name";s:12:"${row}[name]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[hsize]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:3:{s:4:"type";s:5:"label";s:5:"label";s:16:"$row_cont[perms]";s:4:"span";s:6:",perms";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[user]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[group]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=400,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:15:"$row_cont[path]";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
 
 $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:1:"B";s:3:"30%";s:1:"D";s:3:"120";s:1:"E";s:3:"120";s:1:"K";s:2:"70";}i:1;a:11:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Type";s:4:"name";s:4:"mime";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:4:"name";}s:1:"C";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Size";s:4:"name";s:4:"size";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Modified";s:4:"name";s:5:"mtime";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:5:"ctime";}s:1:"F";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Permissions";s:4:"name";s:4:"mode";}s:1:"G";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"uid";s:5:"label";s:5:"Owner";}s:1:"H";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"gid";s:5:"label";s:5:"Group";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Comment";s:4:"name";s:7:"comment";}s:1:"J";a:3:{s:4:"type";s:22:"nextmatch-customfields";s:8:"readonly";s:1:"1";s:4:"name";s:12:"customfields";}s:1:"K";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}}}i:2;a:11:{s:1:"A";a:3:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[mtime]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[ctime]";s:8:"readonly";s:1:"1";}s:1:"F";a:2:{s:4:"type";s:8:"vfs-mode";s:4:"name";s:12:"${row}[mode]";}s:1:"G";a:3:{s:4:"type";s:7:"vfs-uid";s:4:"name";s:11:"${row}[uid]";s:7:"no_lang";s:1:"1";}s:1:"H";a:3:{s:4:"type";s:7:"vfs-gid";s:4:"name";s:11:"${row}[gid]";s:7:"no_lang";s:1:"1";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[comment]";}s:1:"J";a:3:{s:4:"type";s:17:"customfields-list";s:8:"readonly";s:1:"1";s:4:"name";s:4:"$row";}s:1:"K";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:21:"edit[$row_cont[path]]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:192:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path=$row_cont[path]\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"name";s:23:"delete[$row_cont[path]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:29:"Delete this file or directory";s:7:"onclick";s:48:"return confirm(\'Delete this file or directory\');";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:5:"align";s:5:"right";s:4:"size";s:17:""$row_cont[path]"";}s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:11;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1204370567',);
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index 6bc9e8a0c8..61e76e3c7f 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -53,7 +53,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="filemanager.index" template="" lang="" group="0" version="1.7.001">
+	<template id="filemanager.index" template="" lang="" group="0" version="1.7.002">
 		<grid width="100%">
 			<columns>
 				<column width="250"/>
@@ -66,8 +66,8 @@
 				</row>
 				<row>
 					<hbox span="all">
-						<button image="goup" label="Up" id="button[up]"/>
-						<button id="button[home]" image="gohome" label="Go to your home directory"/>
+						<image label="Up" src="goup" options="filemanager.filemanager_ui.index&amp;path=.."/>
+						<image src="gohome" options="filemanager.filemanager_ui.index&amp;path=~" label="Go to your home directory"/>
 						<textbox id="nm[path]" size="80" label="Path" onchange="1" class="address"/>
 						<button id="button[go]" image="key_enter" label="Go to"/>
 						<image src="buttonseparator"/>

From b296a97e3114167a333e40a45cf8bdd084cd62f7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Apr 2009 11:21:56 +0000
Subject: [PATCH 271/510] always remove only our own scheme, as mounts require
 the other schemes to be kept

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

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 9baaa05418..cf854de98c 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -825,7 +825,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static protected function symlinkCache_add($path,$target)
 	{
-		$path = self::get_path($path,self::SCHEME);
+		$path = self::get_path($path);
 
 		if (isset(self::$symlink_cache[$path])) return;	// nothing to do
 
@@ -845,7 +845,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static protected function symlinkCache_remove($path)
 	{
-		$path = self::get_path($path,self::SCHEME);
+		$path = self::get_path($path);
 
 		unset(self::$symlink_cache[$path]);
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path) cache now ".array2string(self::$symlink_cache));
@@ -863,7 +863,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	static public function symlinkCache_resolve($path,$do_symlink=true)
 	{
 		// remove vfs scheme, but no other schemes (eg. filesystem!)
-		$path = self::get_path($path,self::SCHEME);
+		$path = self::get_path($path);
 
 		$strlen_path = strlen($path);
 
@@ -1013,10 +1013,10 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 * Getting the path from an url (or path) AND removing trailing slashes
 	 *
 	 * @param string $path url or path (might contain trailing slash from WebDAV!)
-	 * @param string $only_remove_scheme=null if given only that scheme get's removed
+	 * @param string $only_remove_scheme=self::SCHEME if given only that scheme get's removed
 	 * @return string path without training slash
 	 */
-	static protected function get_path($path,$only_remove_scheme=null)
+	static protected function get_path($path,$only_remove_scheme=self::SCHEME)
 	{
 		if ($path[0] != '/' && (!$only_remove_scheme || parse_url($path,PHP_URL_SCHEME) == $only_remove_scheme))
 		{

From 8651288b97d21bb04b719f6226cb7749b542f697 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 1 May 2009 07:55:18 +0000
Subject: [PATCH 272/510] "fixed sometimes double displayed header and/or
 navbar"

---
 .../idots/class.idots_framework.inc.php         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index e372089434..724a344879 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -40,11 +40,17 @@ class idots_framework extends egw_framework
 	*/
 	var $tplsav2;
 	/**
+	* true if $this->header() was called
+	*
+	* @var boolean
+	*/
+	static $header_done = false;
+	/**
 	* true if $this->navbar() was called
 	*
 	* @var boolean
 	*/
-	var $navbar_done;
+	static $navbar_done = false;
 
 	/**
 	* Contains array with linked icons in the topmenu
@@ -84,6 +90,10 @@ class idots_framework extends egw_framework
 	*/
 	function header()
 	{
+		// make sure header is output only once
+		if (self::$header_done) return '';
+		self::$header_done = true;
+
 		// add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
 		header('Content-type: text/html; charset='.$GLOBALS['egw']->translation->charset());
 
@@ -113,7 +123,8 @@ class idots_framework extends egw_framework
 	*/
 	function navbar()
 	{
-		$this->navbar_done = true;
+		if (self::$navbar_done) return '';
+		self::$navbar_done = true;
 
 		// the navbar
 		$this->tpl->set_file(array('navbar' => 'navbar.tpl'));
@@ -679,7 +690,7 @@ class idots_framework extends egw_framework
 
 			// do the template sets footer, former parse_navbar_end function
 			// this closes the application area AND renders the closing body- and html-tag
-			if ($this->navbar_done)
+			if (self::$navbar_done)
 			{
 				$this->tpl->set_file(array('footer' => 'footer.tpl'));
 				$this->tpl->set_var($this->_get_footer());

From 53a83a081e352f4cf8dadbc779ae356ccaebc552 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 1 May 2009 12:30:11 +0000
Subject: [PATCH 273/510] "testscript for VFS"

---
 filemanager/test.php | 94 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 filemanager/test.php

diff --git a/filemanager/test.php b/filemanager/test.php
new file mode 100644
index 0000000000..695f1c2503
--- /dev/null
+++ b/filemanager/test.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * eGroupWare - Filemanager - test script
+ *
+ * @link http://www.egroupware.org
+ * @package filemanager
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+$GLOBALS['egw_info']['flags'] = array(
+	'currentapp' => 'filemanager'
+);
+include('../header.inc.php');
+
+$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
+
+if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
+echo html::form("<p>Path: ".html::input('path',$path,'text','size="40"').
+	html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
+
+if (isset($path) && !empty($path))
+{
+	if ($path[0] != '/')
+	{
+		throw new egw_exception_wrong_userinput('Not an absolute path!');
+	}
+	echo "<h2>";
+	foreach(explode('/',$path) as $n => $part)
+	{
+		$p .= ($p != '/' ? '/' : '').$part;
+		echo ($n > 1 ? ' / ' : '').html::a_href($n ? $part : ' / ','/filemanager/test.php',array('path'=>$p));
+	}
+	echo "</h2>\n";
+
+	$is_dir = egw_vfs::is_dir($path);
+	echo "<p><b>is_dir('$path')</b>=".array2string($is_dir)."</p>\n";
+
+	$time = microtime(true);
+	$stat = egw_vfs::stat($path);
+	$time = number_format(1000*(microtime(true)-$time),1);
+
+	if ($is_dir && ($d = egw_vfs::opendir($path)))
+	{
+		$files = array();
+		while(($file = readdir($d)))
+		{
+			if (egw_vfs::is_readable($fpath=egw_vfs::concat($path,$file)))
+			{
+				$file = html::a_href($file,'/filemanager/test.php',array('path'=>$fpath));
+			}
+			$files[] = $file;
+		}
+		closedir($d);
+		echo ($files ? '<ul><li>'.implode("</li>\n<li>",$files).'</ul>' : '<p>Empty directory</p>')."\n";
+	}
+
+	echo "<p><b>stat('$path')</b> took $time ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.egw_vfs::int2mode($stat['mode']):'NULL').')';
+	if (is_array($stat))
+	{
+		_debug_array($stat);
+	}
+	else
+	{
+		echo "<p>".array2string($stat)."</p>\n";
+	}
+
+	echo "<p><b>egw_vfs::is_readable('$path')</b>=".array2string(egw_vfs::is_readable($path))."</p>\n";
+	echo "<p><b>egw_vfs::is_writable('$path')</b>=".array2string(egw_vfs::is_writable($path))."</p>\n";
+
+	echo "<p><b>is_link('$path')</b>=".array2string(egw_vfs::is_link($path))."</p>\n";
+	echo "<p><b>readlink('$path')</b>=".array2string(egw_vfs::readlink($path))."</p>\n";
+	$time = microtime(true);
+	$lstat = egw_vfs::lstat($path);
+	$time = number_format(1000*(microtime(true)-$time),1);
+	echo "<p><b>lstat('$path')</b> took $time ms (mode = ".(isset($lstat['mode'])?sprintf('%o',$lstat['mode']).' = '.egw_vfs::int2mode($lstat['mode']):'NULL').')';
+	if (is_array($lstat))
+	{
+		_debug_array($lstat);
+	}
+	else
+	{
+		echo "<p>".array2string($lstat)."</p>\n";
+	}
+	if (!$is_dir && $stat)
+	{
+		echo "<p><b>egw_vfs::mime_content_type('$path')</b>=".array2string(egw_vfs::mime_content_type($path))."</p>\n";
+		echo "<p><b>filesize(egw_vfs::PREFIX.'$path')</b>=".array2string(filesize(egw_vfs::PREFIX.$path))."</p>\n";
+		echo "<p><b>bytes(file_get_contents(egw_vfs::PREFIX.'$path'))</b>=".array2string(bytes(file_get_contents(egw_vfs::PREFIX.$path)))."</p>\n";
+	}
+}
+$GLOBALS['egw']->common->egw_footer();

From b71d829bca2b4077300f4ab9356d6554edffb5ae Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 1 May 2009 19:12:25 +0000
Subject: [PATCH 274/510] "fix for bug reported on the english user list: limit
 on the number of cascaded folders in Filemanager --> MySQL 5.0 has a nesting
 limit for subqueries --> working around that by limiting the nesting level to
 10"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 32b7853c3b..b2aa96891a 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -989,6 +989,19 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			}
 			elseif ($n < count($parts)-1)
 			{
+				// MySQL 5.0 has a nesting limit for subqueries
+				// --> we replace the so far cumulated subqueries with their result
+				// no idea about the other DBMS, but this does NOT hurt ...
+				if ($n > 1 && !(($n-1) % 10) && !($query = self::$pdo->query($query)->fetchColumn()))
+				{
+					if (self::LOG_LEVEL > 1)
+					{
+						self::_remove_password($url);
+						error_log(__METHOD__."('$url',$flags) file or directory not found!");
+					}
+					// we also store negatives (all methods creating new files/dirs have to unset the stat-cache!)
+					return self::$stat_cache[$path] = false;
+				}
 				$query = 'SELECT fs_id FROM '.self::TABLE.' WHERE fs_dir=('.$query.') AND fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name);
 
 				// if we are not root AND have no extended acl access, we need to make sure the user has the right to tranverse all parent directories (read-rights)

From eb7e801074f8f7864a9384d0a39eca5cd0417c6e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2009 09:37:19 +0000
Subject: [PATCH 275/510] - moved get_addressbooks method from ui to bo - fixed
 not removed '()' if org-name is empty

---
 addressbook/inc/class.addressbook_bo.inc.php | 48 ++++++++++++++++++--
 addressbook/inc/class.addressbook_ui.inc.php | 42 -----------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index fc851fb1bc..68b88d1517 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -246,6 +246,48 @@ class addressbook_bo extends addressbook_so
 		}
 	}
 
+	/**
+	 * Get the availible addressbooks of the user
+	 *
+	 * @param int $required=EGW_ACL_READ required rights on the addressbook
+	 * @param string $extra_label first label if given (already translated)
+	 * @return array with owner => label pairs
+	 */
+	function get_addressbooks($required=EGW_ACL_READ,$extra_label=null)
+	{
+		//echo "uicontacts::get_addressbooks($required,$include_all) grants="; _debug_array($this->grants);
+
+		$addressbooks = array();
+		if ($extra_label) $addressbooks[''] = $extra_label;
+		$addressbooks[$this->user] = lang('Personal');
+		// add all group addressbooks the user has the necessary rights too
+		foreach($this->grants as $uid => $rights)
+		{
+			if (($rights & $required) && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
+			{
+				$addressbooks[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
+			}
+		}
+		if (($this->grants[0] & $required) && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+		{
+			$addressbooks[0] = lang('Accounts');
+		}
+		// add all other user addressbooks the user has the necessary rights too
+		foreach($this->grants as $uid => $rights)
+		{
+			if ($uid != $this->user && ($rights & $required) && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
+			{
+				$addressbooks[$uid] = $GLOBALS['egw']->common->grab_owner_name($uid);
+			}
+		}
+		if ($this->private_addressbook)
+		{
+			$addressbooks[$this->user.'p'] = lang('Private');
+		}
+		//_debug_array($addressbooks);
+		return $addressbooks;
+	}
+
 	/**
 	 * calculate the file_as string from the contact and the file_as type
 	 *
@@ -265,8 +307,8 @@ class addressbook_bo extends addressbook_so
 				$contact['n_fn'],$contact['org_name'],$contact['org_unit'],$contact['adr_one_locality']),$type);
 
 		// removing empty delimiters, caused by empty contact fields
-		$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : '),array(': ',': ',': ',', ',': '),$fileas);
-		while ($fileas{0} == ':' ||  $fileas{0} == ',') $fileas = substr($fileas,2);
+		$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),array(': ',': ',': ',', ',': ',''),$fileas);
+		while ($fileas[0] == ':' ||  $fileas[0] == ',') $fileas = substr($fileas,2);
 		while (substr($fileas,-2) == ': ' || substr($fileas,-2) == ', ') $fileas = substr($fileas,0,-2);
 
 		//echo "<p align=right>bocontacts::fileas(,$type)='$fileas'</p>\n";
@@ -985,7 +1027,7 @@ class addressbook_bo extends addressbook_so
 		{
 			foreach($event['participants'] as $uid => $status)
 			{
-				if ($uid{0} != 'c' || ($status == 'R' && !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected']))
+				if ($uid[0] != 'c' || ($status == 'R' && !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected']))
 				{
 					continue;
 				}
diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 901b9e96e3..0f03b90f9a 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1157,48 +1157,6 @@ class addressbook_ui extends addressbook_bo
 		}
 	}
 
-	/**
-	 * Get the availible addressbooks of the user
-	 *
-	 * @param int $required=EGW_ACL_READ required rights on the addressbook
-	 * @param string $extra_label first label if given (already translated)
-	 * @return array with owner => label pairs
-	 */
-	function get_addressbooks($required=EGW_ACL_READ,$extra_label=null)
-	{
-		//echo "uicontacts::get_addressbooks($required,$include_all) grants="; _debug_array($this->grants);
-
-		$addressbooks = array();
-		if ($extra_label) $addressbooks[''] = $extra_label;
-		$addressbooks[$this->user] = lang('Personal');
-		// add all group addressbooks the user has the necessary rights too
-		foreach($this->grants as $uid => $rights)
-		{
-			if (($rights & $required) && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
-			{
-				$addressbooks[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
-			}
-		}
-		if (($this->grants[0] & $required) && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
-		{
-			$addressbooks[0] = lang('Accounts');
-		}
-		// add all other user addressbooks the user has the necessary rights too
-		foreach($this->grants as $uid => $rights)
-		{
-			if ($uid != $this->user && ($rights & $required) && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
-			{
-				$addressbooks[$uid] = $GLOBALS['egw']->common->grab_owner_name($uid);
-			}
-		}
-		if ($this->private_addressbook)
-		{
-			$addressbooks[$this->user.'p'] = lang('Private');
-		}
-		//_debug_array($addressbooks);
-		return $addressbooks;
-	}
-
 	/**
 	* Edit a contact
 	*

From edea73521e3c6bfe7b1ef0c4afbd3ef6b85897d1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2009 12:33:28 +0000
Subject: [PATCH 276/510] "quitent some warnings about not writable dirs, eg.
 if calling cli programms with users not having permissions for the cache dir"

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

diff --git a/phpgwapi/inc/class.egw_cache_files.inc.php b/phpgwapi/inc/class.egw_cache_files.inc.php
index 8fa7e4c536..cca2fc9845 100644
--- a/phpgwapi/inc/class.egw_cache_files.inc.php
+++ b/phpgwapi/inc/class.egw_cache_files.inc.php
@@ -77,7 +77,7 @@ class egw_cache_files implements egw_cache_provider
 	 */
 	function set(array $keys,$data,$expiration=0)
 	{
-		if ($ret = file_put_contents($fname=$this->filename($keys,true),serialize($data),LOCK_EX) > 0)
+		if ($ret = @file_put_contents($fname=$this->filename($keys,true),serialize($data),LOCK_EX) > 0)
 		{
 			if ((int)$expiration > 0) file_put_contents($fname.self::EXPIRATION_EXTENSION,(string)$expiration);
 		}
@@ -137,11 +137,11 @@ class egw_cache_files implements egw_cache_provider
 	 */
 	private function filename(array $keys,$mkdir=false)
 	{
-		$fname = $this->base_path.'/'.str_replace(':','-',implode('/',$keys));
+		$fname = $this->base_path.'/'.str_replace(array(':','*'),'-',implode('/',$keys));
 
 		if ($mkdir && !file_exists($dirname=dirname($fname)))
 		{
-			mkdir($dirname,0700,true);
+			@mkdir($dirname,0700,true);
 		}
 		return $fname;
 	}

From 0dd58f3038214badeca29c5d2f35f0457212873b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2009 12:45:06 +0000
Subject: [PATCH 277/510] "removing file_exists() again and suppressing the
 warning of lstat() if file does not exist, as file_exists calls stat(), which
 resolves sysmlinks first and costs more then double the time on dirs with
 many symlinks"

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

diff --git a/filemanager/cli.php b/filemanager/cli.php
index 49daae26f1..35f943207f 100755
--- a/filemanager/cli.php
+++ b/filemanager/cli.php
@@ -9,6 +9,8 @@
  * @copyright (c) 2007/8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
+ *
+ * @todo --domain does NOT work with --user root_* for domains other then the first in header.inc.php
  */
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
@@ -603,7 +605,7 @@ function do_stat($url,$long=false,$numeric=false,$full_path=false)
 	{
 		$bname = basename($bname);
 	}
-	if (!file_exists($url) || !($stat = lstat($url)))
+	if (!($stat = @lstat($url)))
 	{
 		echo "$bname: no such file or directory!\n";
 	}

From 287131565f0c9acb134117ae5e883094a0425825 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2009 14:00:31 +0000
Subject: [PATCH 278/510] Fixed follow option in find(): - if base is a symlink
 to a dir, this one is listed anyway - symlinks to dirs (beside the base) are
 only descended, if   $options['follow'] is specified - links are returned for
 type 'f' --> removed follow option from find() in filemanager_ui::get_rows()
 --> no more infinit symlink loops in filemanager GUI

---
 filemanager/inc/class.filemanager_ui.inc.php | 1 -
 phpgwapi/inc/class.egw_vfs.inc.php           | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index e697da8306..ffafce2427 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -570,7 +570,6 @@ class filemanager_ui
 			'limit' => (int)$query['num_rows'].','.(int)$query['start'],
 			'need_mime' => true,
 			'name_preg' => $namefilter,
-			'follow' => true,	// follow symlinks
 		),true) as $path => $row)
 		{
 			//echo $path; _debug_array($row);
diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index dbe11c0479..7bece1291f 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -388,11 +388,11 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			if (!$url) $path = egw_vfs::PREFIX . $path;
 
-			$is_dir = is_dir($path) && ($options['follow'] || !is_link($path));
 			if (!isset($options['remove']))
 			{
 				$options['remove'] = count($base) == 1 ? count(explode('/',$path))-3+(int)(substr($path,-1)!='/') : 0;
 			}
+			$is_dir = is_dir($path);
 			if ((int)$options['mindepth'] == 0 && (!$dirs_last || !$is_dir))
 			{
 				self::_check_add($options,$path,$result);
@@ -409,7 +409,8 @@ class egw_vfs extends vfs_stream_wrapper
 					{
 						self::_check_add($options,$file,$result);
 					}
-					if (is_dir($file) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
+					// only descend into subdirs, if it's a real dir (no link to a dir) or we should follow symlinks
+					if (is_dir($file) && ($options['follow'] || !is_link($file)) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
 					{
 						$opts = $options;
 						if ($opts['mindepth']) $opts['mindepth']--;
@@ -509,7 +510,7 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		$type = $options['type'];	// 'd' or 'f'
 
-		if ($type && ($type == 'd') !== is_dir($path))
+		if ($type && ($type == 'd') !== (is_dir($path) && !is_link($path)))
 		{
 			return;	// wrong type
 		}
@@ -525,7 +526,6 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			$stat['mime'] = self::mime_content_type($path);
 		}
-
 		if (isset($options['name_preg']) && !preg_match($options['name_preg'],$stat['name']) ||
 			isset($options['path_preg']) && !preg_match($options['path_preg'],$path))
 		{

From 9e88b1ba9dca97b5ccc9d18489bbd06aef940511 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2009 14:15:31 +0000
Subject: [PATCH 279/510] "using lstat in find and check type 'd' directly
 against mode from lstat for better performance"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 7bece1291f..9a16528ad2 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -510,14 +510,14 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		$type = $options['type'];	// 'd' or 'f'
 
-		if ($type && ($type == 'd') !== (is_dir($path) && !is_link($path)))
-		{
-			return;	// wrong type
-		}
-		if (!($stat = self::url_stat($path,0)))
+		if (!($stat = self::url_stat($path,STREAM_URL_STAT_LINK)))
 		{
 			return;	// not found, should not happen
 		}
+		if ($type && ($type == 'd') == !($stat['mode'] & sqlfs_stream_wrapper::MODE_DIR))	// != is_dir() which can be true for symlinks
+		{
+			return;	// wrong type
+		}
 		$stat = array_slice($stat,13);	// remove numerical indices 0-12
 		$stat['path'] = parse_url($path,PHP_URL_PATH);
 		$stat['name'] = $options['remove'] > 0 ? implode('/',array_slice(explode('/',$stat['path']),$options['remove'])) : self::basename($path);

From 0cd2993504bcf7555374e47d5135b2b0cd4037fc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2009 16:12:20 +0000
Subject: [PATCH 280/510] "'class::method' as php5.2+, array('class','method')
 works in php5.1+ "

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index c4bb56a4aa..272a1a8c69 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -251,7 +251,7 @@ class translation
 			//$start = microtime(true);
 			// for loginscreen we have to use a instance specific cache!
 			$loaded =& egw_cache::getCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE,
-				__CLASS__,$app.':'.$lang,__CLASS__.'::load_app',array($app,$lang));
+				__CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang));
 
 			self::$lang_arr = self::$lang_arr ? array_merge(self::$lang_arr,$loaded) : $loaded;
 			self::$loaded_apps[$app] = $lang;
@@ -342,7 +342,7 @@ class translation
 			if (is_null(self::$db)) self::init(false);
 
 			// we only cache the translation installed for the instance, not the return of this method, which is user-language dependent
-			self::$langs = egw_cache::getInstance(__CLASS__,'installed_langs',__CLASS__.'::read_installed_langs');
+			self::$langs = egw_cache::getInstance(__CLASS__,'installed_langs',array(__CLASS__,'read_installed_langs'));
 
 			if (!self::$langs)
 			{

From 34e9825a9109ac665358295f6cbbee2dc82ee22b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2009 16:45:38 +0000
Subject: [PATCH 281/510] "'class::method' is php5.2+, array('class','method')
 works in php5.1+ "

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 272a1a8c69..7865d14bd2 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -400,7 +400,7 @@ class translation
 	{
 		if (!$force_read)
 		{
-			return egw_cache::getInstance(__CLASS__,'list_langs',__METHOD__,array(true));
+			return egw_cache::getInstance(__CLASS__,'list_langs',array(__CLASS__,'list_langs'),array(true));
 		}
 		$languages = self::get_installed_langs();	// used translated installed languages
 

From 5a22640c82dabdf8af18a6cd9f98d877457203cf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 3 May 2009 18:36:38 +0000
Subject: [PATCH 282/510] - changed return value of search() to NULL instead
 false, if nothing   found, as this can be simply casted with (array) to work
 in foreach - documentation update

---
 etemplate/inc/class.so_sql.inc.php    | 36 +++++++++++++--------------
 etemplate/inc/class.so_sql_cf.inc.php |  8 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index 1ced670ae6..0c689f9953 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -134,7 +134,7 @@ class so_sql
 	 *
 	 * @param string $app should be set if table-defs to be read from <app>/setup/tables_current.inc.php
 	 * @param string $table should be set if table-defs to be read from <app>/setup/tables_current.inc.php
-	 * @param object/db $db database object, if not the one in $GLOBALS['egw']->db should be used, eg. for an other database
+	 * @param egw_db $db database object, if not the one in $GLOBALS['egw']->db should be used, eg. for an other database
 	 * @param string $colum_prefix='' column prefix to automatic remove from the column-name, if the column name starts with it
 	 * @param boolean $no_clone=false can we avoid to clone the db-object, default no
 	 * 	new code using appnames and foreach(select(...,$app) can set it to avoid an extra instance of the db object
@@ -274,7 +274,7 @@ class so_sql
 	 * This default implementation only converts the timestamps mentioned in $this->timestampfs from server to user time.
 	 * You can reimplement it in a derived class
 	 *
-	 * @param array $data if given works on that array and returns result, else works on internal data-array
+	 * @param array $data=null if given works on that array and returns result, else works on internal data-array
 	 */
 	function db2data($data=null)
 	{
@@ -301,7 +301,7 @@ class so_sql
 	 * This default implementation only converts the timestamps mentioned in $this->timestampfs from user to server time.
 	 * You can reimplement it in a derived class
 	 *
-	 * @param array $data if given works on that array and returns result, else works on internal data-array
+	 * @param array $data=null if given works on that array and returns result, else works on internal data-array
 	 */
 	function data2db($data=null)
 	{
@@ -324,7 +324,7 @@ class so_sql
 	/**
 	 * initializes data with the content of key
 	 *
-	 * @param array $keys array with keys in form internalName => value
+	 * @param array $keys=array() array with keys in form internalName => value
 	 * @return array internal data after init
 	 */
 	function init($keys=array())
@@ -342,9 +342,9 @@ class so_sql
 	 * reads row matched by key and puts all cols in the data array
 	 *
 	 * @param array $keys array with keys in form internalName => value, may be a scalar value if only one key
-	 * @param string/array $extra_cols string or array of strings to be added to the SELECT, eg. "count(*) as num"
-	 * @param string $join sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
-	 * @return array/boolean data if row could be retrived else False
+	 * @param string|array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $join='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
+	 * @return array|boolean data if row could be retrived else False
 	 */
 	function read($keys,$extra_cols='',$join='')
 	{
@@ -452,7 +452,7 @@ class so_sql
 	/**
 	 * saves the content of data to the db
 	 *
-	 * @param array $keys if given $keys are copied to data before saveing => allows a save as
+	 * @param array $keys=null if given $keys are copied to data before saveing => allows a save as
 	 * @param string|array $extra_where=null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
@@ -591,7 +591,7 @@ class so_sql
 	/**
 	 * deletes row representing keys in internal data or the supplied $keys if != null
 	 *
-	 * @param array $keys if given array with col => value pairs to characterise the rows to delete
+	 * @param array $keys=null if given array with col => value pairs to characterise the rows to delete
 	 * @param boolean $only_return_query=false return $query of delete call to db object, but not run it (used by so_sql_cf!)
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
@@ -637,11 +637,11 @@ class so_sql
 	 *
 	 * For a union-query you call search for each query with $start=='UNION' and one more with only $order_by and $start set to run the union-query.
 	 *
-	 * @param array/string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
-	 * @param boolean/string/array $only_keys=true True returns only keys, False returns all cols. or
+	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
+	 * @param boolean|string|array $only_keys=true True returns only keys, False returns all cols. or
 	 *	comma seperated list or array of columns to return
 	 * @param string $order_by='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string/array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string|array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard='' appended befor and after each criteria
 	 * @param boolean $empty=false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
@@ -650,7 +650,7 @@ class so_sql
 	 * @param string $join='' sql to do a join, added as is after the table-name, eg. "JOIN table2 ON x=y" or
 	 *	"LEFT JOIN table2 ON (x=y AND z=o)", Note: there's no quoting done on $join, you are responsible for it!!!
 	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
-	 * @return boolean/array of matching rows (the row is an array of the cols) or False
+	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
@@ -870,15 +870,15 @@ class so_sql
 			$arr[] = $this->db2data($data);
 			$n++;
 		}
-		return $n ? $arr : False;
+		return $n ? $arr : null;
 	}
 
 	/**
 	 * extract the requested columns from $only_keys and $extra_cols param of a search
 	 *
 	 * @internal
-	 * @param boolean/string $only_keys=true True returns only keys, False returns all cols. comma seperated list of keys to return
-	 * @param string/array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param boolean|string $only_keys=true True returns only keys, False returns all cols. comma seperated list of keys to return
+	 * @param string|array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @return array with columns as db-name => internal-name pairs
 	 */
 	function _get_columns($only_keys,$extra_cols)
@@ -940,7 +940,7 @@ class so_sql
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
 	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
 	 * @param mixed $only_keys=false, see search
-	 * @param string|array $extra_cols
+	 * @param string|array $extra_cols=array()
 	 * @return int total number of rows
 	 */
 	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
@@ -969,7 +969,7 @@ class so_sql
 	/**
 	 * Check if values for unique keys and the primary keys are unique are unique
 	 *
-	 * @param array $data data-set to check, defaults to $this->data
+	 * @param array $data=null data-set to check, defaults to $this->data
 	 * @return int 0: all keys are unique, 1: first key not unique, 2: ...
 	 */
 	function not_unique($data=null)
diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index 0aa90678c7..8062b8093a 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -362,11 +362,11 @@ class so_sql_cf extends so_sql
 	 *
 	 * Reimplemented to search, order and filter by custom fields
 	 *
-	 * @param array/string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
-	 * @param boolean/string/array $only_keys=true True returns only keys, False returns all cols. or
+	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
+	 * @param boolean|string/array $only_keys=true True returns only keys, False returns all cols. or
 	 *	comma seperated list or array of columns to return
 	 * @param string $order_by='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string/array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string|array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard='' appended befor and after each criteria
 	 * @param boolean $empty=false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
@@ -375,7 +375,7 @@ class so_sql_cf extends so_sql
 	 * @param string $join='' sql to do a join, added as is after the table-name, eg. "JOIN table2 ON x=y" or
 	 *	"LEFT JOIN table2 ON (x=y AND z=o)", Note: there's no quoting done on $join, you are responsible for it!!!
 	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
-	 * @return boolean/array of matching rows (the row is an array of the cols) or False
+	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{

From aef4125146a34c3b6967af4789d2ac60650e9ec3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 3 May 2009 18:48:36 +0000
Subject: [PATCH 283/510] "- using an ordered list to get a count of dir
 entries - caching the current path in session, for easier debugging"

---
 filemanager/test.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/filemanager/test.php b/filemanager/test.php
index 695f1c2503..833bc8d8db 100644
--- a/filemanager/test.php
+++ b/filemanager/test.php
@@ -15,8 +15,10 @@ $GLOBALS['egw_info']['flags'] = array(
 );
 include('../header.inc.php');
 
-$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
-
+if (!($path = egw_cache::getSession('filemanger','test')))
+{
+	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
+}
 if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
 echo html::form("<p>Path: ".html::input('path',$path,'text','size="40"').
 	html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
@@ -27,6 +29,8 @@ if (isset($path) && !empty($path))
 	{
 		throw new egw_exception_wrong_userinput('Not an absolute path!');
 	}
+	egw_cache::setSession('filemanger','test',$path);
+
 	echo "<h2>";
 	foreach(explode('/',$path) as $n => $part)
 	{
@@ -54,7 +58,7 @@ if (isset($path) && !empty($path))
 			$files[] = $file;
 		}
 		closedir($d);
-		echo ($files ? '<ul><li>'.implode("</li>\n<li>",$files).'</ul>' : '<p>Empty directory</p>')."\n";
+		echo ($files ? '<ol><li>'.implode("</li>\n<li>",$files).'</ol>' : '<p>Empty directory</p>')."\n";
 	}
 
 	echo "<p><b>stat('$path')</b> took $time ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.egw_vfs::int2mode($stat['mode']):'NULL').')';

From 24bbec6df1af65afaae6c438669bf9f33cc63232 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 3 May 2009 20:45:34 +0000
Subject: [PATCH 284/510] Adding a scrollbar to path in file select dialog, if
 it gets too long.

---
 filemanager/inc/class.filemanager_select.inc.php | 2 ++
 filemanager/setup/etemplates.inc.php             | 4 +++-
 filemanager/templates/default/app.css            | 1 +
 filemanager/templates/default/select.xet         | 6 ++++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index b5e321794d..d34cec57d1 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -197,6 +197,8 @@ function select_toggle(file)
 }
 </script>
 ';
+		// scroll to end of path
+		$GLOBALS['egw']->js->set_onload("document.getElementById('exec[path][c". (count(explode('/',$content['path']))-1) ."]').scrollIntoView();");
 		//_debug_array($content);
 		//_debug_array($readonlys);
 		egw_session::appsession('select_path','filemanger',$content['path']);
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index d199b6d0a8..41491d1d05 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-30 10:08
+	* generated by soetemplate::dump4setup() 2009-05-03 22:43
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -56,3 +56,5 @@ $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:2:"40";s:2:"h2";s:2:"40";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:4:"home";s:5:"align";s:6:"center";s:5:"label";s:4:"Home";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:35:",@mode=/(open-multiple|select-dir)/";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
 
+$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:2:"40";s:2:"h2";s:2:"40";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:4:"home";s:5:"align";s:6:"center";s:5:"label";s:4:"Home";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:35:",@mode=/(open-multiple|select-dir)/";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}s:4:"span";s:20:",selectPathContainer";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
+
diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css
index e560fb8ff2..6740b75fe8 100644
--- a/filemanager/templates/default/app.css
+++ b/filemanager/templates/default/app.css
@@ -13,6 +13,7 @@
  * Select file dialog
  */
 .selectPath { font-weight: bold; }
+.selectPathContainer { width: 480px; overflow: auto; }
 .selectName input { width: 100%; }
 .selectMime select { width: 100%; }
 .selectIcon img { height: 16px; }
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index 33d9dfa97f..a63df18eab 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="filemanager.select" template="" lang="" group="0" version="1.7.001">
+	<template id="filemanager.select" template="" lang="" group="0" version="1.7.002">
 		<grid width="600">
 			<columns>
 				<column width="32"/>
@@ -31,7 +31,9 @@
 								<hbox>
 									<html id="js"/>
 									<button id="button[up]" image="goup"/>
-									<vfs id="path" onclick="path=document.getElementById(form::name('path')); path.value=$path; path.form.submit();" class="selectPath"/>
+									<box class="selectPathContainer">
+										<vfs id="path" onclick="path=document.getElementById(form::name('path')); path.value=$path; path.form.submit();" class="selectPath"/>
+									</box>
 									<textbox id="path" class="displayNone"/>
 								</hbox>
 							</row>

From bc65324a7c6ecf1c2bf8c9ebc84c6c19a82df19c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 4 May 2009 16:37:10 +0000
Subject: [PATCH 285/510] new type F for egw_vfs::find to return only files or
 symlinks to files --> dont show symlinks to dirs as attachements /
 link-widget

---
 phpgwapi/inc/class.egw_link.inc.php | 2 +-
 phpgwapi/inc/class.egw_vfs.inc.php  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index a230d38ece..30ad4a0d4a 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -904,7 +904,7 @@ class egw_link extends solink
 		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
 
 		$attached = array();
-		if (($url2stats = egw_vfs::find($path,array('need_mime'=>true,'type'=>'f')+$extra,true)))
+		if (($url2stats = egw_vfs::find($path,array('need_mime'=>true,'type'=>'F')+$extra,true)))
 		{
 			$props = egw_vfs::propfind(array_keys($url2stats));	// get the comments
 			foreach($url2stats as $url => &$fileinfo)
diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 9a16528ad2..d7dcc92d58 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -311,7 +311,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 *
 	 * @param string/array $base base of the search
 	 * @param array $options=null the following keys are allowed:
-	 * - type => {d|f} d=dirs, f=files, default both
+	 * - type => {d|f|F} d=dirs, f=files (incl. symlinks), F=files (incl. symlinks to files), default all
 	 * - depth => {true|false(default)} put the contents of a dir before the dir itself
 	 * - dirsontop => {true(default)|false} allways return dirs before the files (two distinct blocks)
 	 * - mindepth,maxdepth minimal or maximal depth to be returned
@@ -337,7 +337,7 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		//error_log(__METHOD__."(".print_r($base,true).",".print_r($options,true).",".print_r($exec,true).",".print_r($exec_params,true).")\n");
 
-		$type = $options['type'];	// 'd' or 'f'
+		$type = $options['type'];	// 'd', 'f' or 'F'
 		$dirs_last = $options['depth'];	// put content of dirs before the dir itself
 		// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
 		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
@@ -514,7 +514,8 @@ class egw_vfs extends vfs_stream_wrapper
 		{
 			return;	// not found, should not happen
 		}
-		if ($type && ($type == 'd') == !($stat['mode'] & sqlfs_stream_wrapper::MODE_DIR))	// != is_dir() which can be true for symlinks
+		if ($type && (($type == 'd') == !($stat['mode'] & sqlfs_stream_wrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
+		    $type == 'F' && is_dir($path)))	// symlink to a directory
 		{
 			return;	// wrong type
 		}

From 6468dc8d776cf6347a4e32fa47453f58f21e7ba8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 4 May 2009 16:47:21 +0000
Subject: [PATCH 286/510] "setting the value to 7, after reports on the user
 list, thought MySQL 5.0.51 with MyISAM engine works up to 10"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index b2aa96891a..b3a6b176af 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -992,7 +992,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				// MySQL 5.0 has a nesting limit for subqueries
 				// --> we replace the so far cumulated subqueries with their result
 				// no idea about the other DBMS, but this does NOT hurt ...
-				if ($n > 1 && !(($n-1) % 10) && !($query = self::$pdo->query($query)->fetchColumn()))
+				// setting the value to 7, after reports on the user list, thought MySQL 5.0.51 with MyISAM engine works up to 10
+				if ($n > 1 && !(($n-1) % 7) && !($query = self::$pdo->query($query)->fetchColumn()))
 				{
 					if (self::LOG_LEVEL > 1)
 					{

From 2845873bae6b9eccac3a7713d7f4e5d22f5ef216 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 4 May 2009 22:39:27 +0000
Subject: [PATCH 287/510] - docu update - 2 new (optional) parameters for
 calendar_so::search()

---
 calendar/inc/class.calendar_bo.inc.php | 11 +++--
 calendar/inc/class.calendar_so.inc.php | 58 +++++++++++++++-----------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 8022bf0b29..0a675919d9 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -1540,7 +1540,9 @@ class calendar_bo
 		return $cats;
 	}
 
-	/* This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4 */
+	/**
+	 *  This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4
+	 */
 	function _list_cals_add($id,&$users,&$groups)
 	{
 		$name = $GLOBALS['egw']->common->grab_owner_name($id);
@@ -1560,9 +1562,10 @@ class calendar_bo
 	}
 
 	/**
-	* generate list of user- / group-calendars for the selectbox in the header
-	* @return alphabeticaly sorted array with groups first and then users
-	*/
+	 * generate list of user- / group-calendars for the selectbox in the header
+	 *
+	 * @return array alphabeticaly sorted array with groups first and then users: $name => array('grantor'=>$id,'value'=>['g_'.]$id,'name'=>$name)
+	 */
 	function list_cals()
 	{
 		$users = $groups = array();
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 83cf700852..aac6619884 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2005-8 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2005-9 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -105,9 +105,9 @@ class calendar_so
 	 *
 	 * All times (start, end and modified) are returned as timesstamps in servertime!
 	 *
-	 * @param int/array/string $ids id or array of id's of the entries to read, or string with a single uid
+	 * @param int|array/string $ids id or array of id's of the entries to read, or string with a single uid
 	 * @param int $recur_date=0 if set read the next recurrance at or after the timestamp, default 0 = read the initital one
-	 * @return array/boolean array with id => data pairs or false if entry not found
+	 * @return array|boolean array with id => data pairs or false if entry not found
 	 */
 	function read($ids,$recur_date=0)
 	{
@@ -214,7 +214,7 @@ class calendar_so
 	/**
 	 * generate SQL to filter after a given category (evtl. incl. subcategories)
 	 *
-	 * @param array/int $cat_id cat-id or array of cat-ids, or !$cat_id for none
+	 * @param array|int $cat_id cat-id or array of cat-ids, or !$cat_id for none
 	 * @return string SQL to include in the query
 	 */
 	function cat_filter($cat_id)
@@ -247,23 +247,29 @@ class calendar_so
 	 *
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
-	 * @param int/array $users user-id or array of user-id's, !$users means all entries regardless of users
+	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
 	 * @param int $cat_id=0 mixed category-id or array of cat-id's, default 0 = all
 	 *		Please note: only a single cat-id, will include all sub-cats (if the common-pref 'cats_no_subs' is False)
 	 * @param string $filter='' string filter-name, atm. all or hideprivate
 	 * @param string $query='' pattern so search for, if unset or empty all matching entries are returned (no search)
 	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 * @param int/bool $offset=False offset for a limited query or False (default)
+	 * @param int|boolean $offset=False offset for a limited query or False (default)
 	 * @param int $num_rows=0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param string $order='cal_start' column-names plus optional DESC|ASC separted by comma
 	 * @param boolean $show_rejected=true should the search return rejected invitations
-	 * @return array of cal_ids, or false if error in the parameters
+	 * @param string|array $_cols=null what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date"
+	 *                     if specified an iterator for the rows is returned
+	 * @param string $append='' SQL to append to the query before $order, eg. for a GROUP BY clause
+	 * @return array|boolean|iterator of cal_id => event pairs, or false if error in the parameters, or iterator if !is_null($_cols)
 	 *
 	 * ToDo: search custom-fields too
 	 */
-	function &search($start,$end,$users,$cat_id=0,$filter='',$query='',$offset=False,$num_rows=0,$order = 'cal_start',$show_rejected=true)
+	function &search($start,$end,$users,$cat_id=0,$filter='',$query='',$offset=False,$num_rows=0,$order = 'cal_start',$show_rejected=true,
+		$_cols=null,$append='')
 	{
-		//echo '<p>socal::search('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.print_r($users,true).','.print_r($cat_id,true).",'$filter',".print_r($query,true).",$offset,$num_rows)</p>\n";
+		//echo '<p>'.__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($query).",$offset,$num_rows,$order,$show_rejected,".array2string($_cols).",$append)</p>\n";
+
+		$cols = !is_null($_cols) ? $_cols : "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date";
 
 		$where = array();
 		if (is_array($query))
@@ -281,7 +287,7 @@ class calendar_so
 		if ($users)
 		{
 			$users_by_type = array();
-			foreach(is_array($users) ? $users : array($users) as $user)
+			foreach((array)$users as $user)
 			{
 				if (is_numeric($user))
 				{
@@ -289,7 +295,7 @@ class calendar_so
 				}
 				elseif (is_numeric(substr($user,1)))
 				{
-					$users_by_type[$user{0}][] = (int) substr($user,1);
+					$users_by_type[$user[0]][] = (int) substr($user,1);
 				}
 			}
 			$to_or = array();
@@ -320,9 +326,10 @@ class calendar_so
 			$select = array(
 				'table' => $this->cal_table,
 				'join'  => "JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id",
-				'cols'  => "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
+				'cols'  => $cols,
 				'where' => $where,
 				'app'   => 'calendar',
+				'append'=> $append,
 			);
 			$selects = array($select,$select);
 			$selects[0]['where'][] = 'recur_type IS NULL AND cal_recur_date=0';
@@ -351,11 +358,14 @@ class calendar_so
 					$where,__LINE__,__FILE__,false,'','calendar',0,
 					"JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id")->NumRows();
 			}
-			$rs = $this->db->select($this->cal_table,($this->db->capabilities['distinct_on_text'] ? 'DISTINCT ' : '').
-				"$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-				$where,__LINE__,__FILE__,$offset,'ORDER BY '.$order,'calendar',$num_rows,
+			$rs = $this->db->select($this->cal_table,($this->db->capabilities['distinct_on_text'] ? 'DISTINCT ' : '').$cols,
+				$where,__LINE__,__FILE__,$offset,$append.' ORDER BY '.$order,'calendar',$num_rows,
 				"JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id");
 		}
+		if (!is_null($_cols))
+		{
+			return $rs;	// if colums are specified we return the recordset / iterator
+		}
 		$events = $ids = $recur_dates = $recur_ids = array();
 		foreach($rs as $row)
 		{
@@ -473,7 +483,7 @@ ORDER BY cal_user_type, cal_usre_id
 	 * @param boolean &$set_recurrences on return: true if the recurrences need to be written, false otherwise
 	 * @param int $change_since=0 time from which on the repetitions should be changed, default 0=all
 	 * @param int &$etag etag=null etag to check or null, on return new etag
-	 * @return boolean/int false on error, 0 if etag does not match, cal_id otherwise
+	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
 	function save($event,&$set_recurrences,$change_since=0,&$etag=null)
 	{
@@ -487,7 +497,7 @@ ORDER BY cal_user_type, cal_usre_id
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
 		foreach($event as $col => $val)
 		{
-			if ($col{0} != '#' && substr($col,0,6) != 'recur_' && $col != 'alarm')
+			if ($col[0] != '#' && substr($col,0,6) != 'recur_' && $col != 'alarm')
 			{
 				$event['cal_'.$col] = $val;
 				unset($event[$col]);
@@ -658,10 +668,10 @@ ORDER BY cal_user_type, cal_usre_id
 	 * @param int $cal_id
 	 * @param int $start new starttime
 	 * @param int $end new endtime
-	 * @param int/boolean $change_since=0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param int|boolean $change_since=0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
 	 * @param int $old_start=0 old starttime or (default) 0, to query it from the db
 	 * @param int $old_end=0 old starttime or (default) 0
-	 * @return int/boolean number of moved recurrences or false on error
+	 * @return int|boolean number of moved recurrences or false on error
 	 */
 	function move($cal_id,$start,$end,$change_since=0,$old_start=0,$old_end=0)
 	{
@@ -751,9 +761,9 @@ ORDER BY cal_user_type, cal_usre_id
 	 *
 	 * @param int $cal_id
 	 * @param array $participants id => status pairs
-	 * @param int/boolean $change_since=0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param int|boolean $change_since=0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
 	 * @param int $recur_date=0 time of which repetitions should be updated, default 0=all
-	 * @return int/boolean number of updated recurrences or false on error
+	 * @return int|boolean number of updated recurrences or false on error
 	 */
 	function participants($cal_id,$participants,$change_since=0)
 	{
@@ -824,7 +834,7 @@ ORDER BY cal_user_type, cal_usre_id
 				foreach($recurrences as $recur_date)
 				{
 					$this->db->insert($this->user_table,array(
-						'cal_status'	  => $status !== true ? $status{0} : 'U',
+						'cal_status'	  => $status !== true ? $status[0] : 'U',
 						'cal_quantity'	  => substr($status,1) ? substr($status,1) : 1,
 					),array(
 						'cal_id'	      => $cal_id,
@@ -844,7 +854,7 @@ ORDER BY cal_user_type, cal_usre_id
 	 * @param int $cal_id
 	 * @param char $user_type 'u' regular user, 'r' resource, 'c' contact
 	 * @param int $user_id
-	 * @param int/char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
+	 * @param int|string $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
 	 * @param int $recur_date=0 date to change, or 0 = all since now
 	 * @return int number of changed recurrences
 	 */
@@ -915,7 +925,7 @@ ORDER BY cal_user_type, cal_usre_id
 
 			$this->split_user($uid,$type,$id);
 			$this->db->insert($this->user_table,array(
-				'cal_status'	 => $status !== true ? $status{0} : 'U',
+				'cal_status'	 => $status !== true ? $status[0] : 'U',
 				'cal_quantity'	=> substr($status,1) ? substr($status,1) : 1,
 			),array(
 				'cal_id'		 => $cal_id,

From 272817b1c784ff1eeb3e0f8b86f40c407d5cb4e3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 4 May 2009 22:52:48 +0000
Subject: [PATCH 288/510] "added cols and append parameter from
 calendar_so::search to calendar_bo::search too"

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

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 0a675919d9..ad2411823f 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -280,8 +280,10 @@ class calendar_bo
 	 *  show_rejected if set rejected invitation are shown only when true, otherwise it depends on the cal-pref or a running query
 	 *  ignore_acl if set and true no check_perms for a general EGW_ACL_READ grants is performed
 	 *  enum_groups boolean if set and true, group-members will be added as participants with status 'G'
-	 * @return 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
+	 *  cols string|array columns to select, if set the recordset/iterator will be returned
+	 *  append string to append to the query, eg. GROUP BY
+	 * @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)
 	{
@@ -373,7 +375,12 @@ class calendar_bo
 		}
 		// date2ts(,true) converts to server time, db2data converts again to user-time
 		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
-			$users,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
+			$users,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected,$params['cols'],$params['append']);
+
+		if (isset($params['cols']))
+		{
+			return $events;
+		}
 		$this->total = $this->so->total;
 		$this->db2data($events,isset($params['date_format']) ? $params['date_format'] : 'ts');
 

From 7bc380fab98f9cb1f6bcb148ea239ef5286a0c37 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 5 May 2009 12:48:38 +0000
Subject: [PATCH 289/510] Moved filter labels to BO

---
 infolog/inc/class.infolog_bo.inc.php | 25 +++++++++++++++++++++++++
 infolog/inc/class.infolog_ui.inc.php | 23 +++--------------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index e083fb952d..ae4ff0348a 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -95,6 +95,31 @@ class infolog_bo
 	 */
 	var $max_line_chars = 40;
 
+	/**
+	 * Available filters
+	 *
+	 * @var array filter => label pairs
+	 */
+	var $filters = array(
+		'none'                     => 'no Filter',
+		'done'                     => 'done',
+		'responsible'              => 'responsible',
+		'responsible-open-today'   => 'responsible open',
+		'responsible-open-overdue' => 'responsible overdue',
+		'responsible-upcoming'     => 'responsible upcoming',
+		'delegated'                => 'delegated',
+		'delegated-open-today'     => 'delegated open',
+		'delegated-open-overdue'   => 'delegated overdue',
+		'delegated-upcoming'       => 'delegated upcomming',
+		'own'                      => 'own',
+		'own-open-today'           => 'own open',
+		'own-open-overdue'         => 'own overdue',
+		'own-upcoming'             => 'own upcoming',
+		'open-today'               => 'open',
+		'open-overdue'             => 'overdue',
+		'upcoming'                 => 'upcoming',
+	);
+
 	/**
 	 * Constructor Infolog BO
 	 *
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 3e41864253..553b9751d2 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -75,25 +75,7 @@ class infolog_ui
 			'ongoing'   => 'ongoing.gif',   'ongoing_alt'   => 'ongoing',
 			'offer'     => 'offer.gif',     'offer_alt'     => 'offer' )
 	);
-	var $filters = array(
-		'none'                     => 'no Filter',
-		'done'                     => 'done',
-		'responsible'              => 'responsible',
-		'responsible-open-today'   => 'responsible open',
-		'responsible-open-overdue' => 'responsible overdue',
-		'responsible-upcoming'     => 'responsible upcoming',
-		'delegated'                => 'delegated',
-		'delegated-open-today'     => 'delegated open',
-		'delegated-open-overdue'   => 'delegated overdue',
-		'delegated-upcoming'       => 'delegated upcomming',
-		'own'                      => 'own',
-		'own-open-today'           => 'own open',
-		'own-open-overdue'         => 'own overdue',
-		'own-upcoming'             => 'own upcoming',
-		'open-today'               => 'open',
-		'open-overdue'             => 'overdue',
-		'upcoming'                 => 'upcoming',
-	);
+	var $filters;
 	var $messages = array(
 		'edit'    => 'InfoLog - Edit',
 		'add'     => 'InfoLog - New',
@@ -124,6 +106,7 @@ class infolog_ui
 			$this->duration_format = str_replace(',','',$pm_config['duration_units']).','.$pm_config['hours_per_workday'];
 			unset($pm_config);
 		}
+		$this->filters =& $this->bo->filters;
 		/* these are just for testing of the notifications
 		for($i = -1; $i <= 3; ++$i)
 		{
@@ -166,7 +149,7 @@ class infolog_ui
 		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
 		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
 		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
-			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ; 
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ;
 		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{

From 065e1dde5aff9f5f202e1c973c134f4fe765c4cd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 5 May 2009 12:49:15 +0000
Subject: [PATCH 290/510] - two new parameters to search(): cols and append -
 docu update

---
 infolog/inc/class.infolog_so.inc.php | 51 ++++++++++++++++++----------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index 0fea11f771..5f653e298e 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -97,7 +97,7 @@ class infolog_so
 	/**
 	 * checks if user has the $required_rights to access $info_id (private access is handled too)
 	 *
-	 * @param array/int $info data or info_id of InfoLog entry
+	 * @param array|int $info data or info_id of InfoLog entry
 	 * @param int $required_rights EGW_ACL_xyz anded together
 	 * @param boolean $implicit_edit=false responsible has only implicit read and add rigths, unless this is set to true
 	 * @return boolean True if access is granted else False
@@ -339,8 +339,8 @@ class infolog_so
 	 *
 	 * some cacheing is done to prevent multiple reads of the same entry
 	 *
-	 * @param $info_id id or uid of entry
-	 * @return array/boolean the entry as array or False on error (eg. entry not found)
+	 * @param int|string $info_id id or uid of entry
+	 * @return array|boolean the entry as array or False on error (eg. entry not found)
 	 */
 	function read($info_id)		// did _not_ ensure ACL
 	{
@@ -399,7 +399,7 @@ class infolog_so
 	 * delete InfoLog entry $info_id AND the links to it
 	 *
 	 * @param int $info_id id of log-entry
-	 * @param bool $delete_children delete the children, if not set there parent-id to $new_parent
+	 * @param boolean $delete_children delete the children, if not set there parent-id to $new_parent
 	 * @param int $new_parent new parent-id to set for subs
 	 */
 	function delete($info_id,$delete_children=True,$new_parent=0)  // did _not_ ensure ACL
@@ -495,7 +495,7 @@ class infolog_so
 	 *
 	 * @param array $values with the data of the log-entry
 	 * @param int $check_modified=0 old modification date to check before update (include in WHERE)
-	 * @return int/boolean info_id, false on error or 0 if the entry has been updated in the meantime
+	 * @return int|boolean info_id, false on error or 0 if the entry has been updated in the meantime
 	 */
 	function write($values,$check_modified=0)  // did _not_ ensure ACL
 	{
@@ -616,17 +616,19 @@ class infolog_so
 	/**
 	 * searches InfoLog for a certain pattern in $query
 	 *
-	 * @param $query[order] column-name to sort after
-	 * @param $query[sort] sort-order DESC or ASC
-	 * @param $query[filter] string with combination of acl-, date- and status-filters, eg. 'own-open-today' or ''
-	 * @param $query[cat_id] category to use or 0 or unset
-	 * @param $query[search] pattern to search, search is done in info_from, info_subject and info_des
-	 * @param $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
-	 * @param &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
-	 * @param $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
-	 * @param $query[subs] boolean return subs or not, if unset the user preference is used
-	 * @param $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs
-	 * @return array with id's as key of the matching log-entries
+	 * @param string $query[order] column-name to sort after
+	 * @param string $query[sort] sort-order DESC or ASC
+	 * @param string $query[filter] string with combination of acl-, date- and status-filters, eg. 'own-open-today' or ''
+	 * @param int $query[cat_id] category to use or 0 or unset
+	 * @param string $query[search] pattern to search, search is done in info_from, info_subject and info_des
+	 * @param string $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
+	 * @param int &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
+	 * @param array $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
+	 * @param boolean $query[subs] return subs or not, if unset the user preference is used
+	 * @param int $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs
+	 * @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned
+	 * @param string $query[append]=null get's appended to sql query, eg. for GROUP BY
+	 * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
 	 */
 	function search(&$query)
 	{
@@ -661,7 +663,9 @@ class infolog_so
 				}
 				else
 				{
-					$val = (substr($val,0,5) != 'info_' ? 'info_' : '').$val;
+					static $table_def;
+					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
 						if (!$this->db->capabilities['order_on_text']) continue;
@@ -685,6 +689,11 @@ class infolog_so
 		{
 			foreach($query['col_filter'] as $col => $data)
 			{
+				if (is_int($col))
+				{
+					$filtermethod .= ' AND '.$data;
+					continue;
+				}
 				if (substr($col,0,5) != 'info_' && substr($col,0,1)!='#') $col = 'info_'.$col;
 				if (!empty($data) && preg_match('/^[a-z_0-9]+$/i',$col))
 				{
@@ -788,7 +797,9 @@ class infolog_so
 				{
 					$query['start'] = 0;
 				}
-				$rs = $this->db->query($sql="SELECT $mysql_calc_rows $distinct main.* $info_customfield $sql_query $ordermethod",__LINE__,__FILE__,
+				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
+				if (is_array($cols)) $cols = implode(',',$cols);
+				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
 					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,egw_db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
 
@@ -800,6 +811,10 @@ class infolog_so
 			// check if start is behind total --> loop to set start=0
 			while (isset($query['start']) && $query['start'] > $query['total']);
 
+			if (isset($query['cols']))
+			{
+				return $rs;
+			}
 			foreach($rs as $info)
 			{
 				$info['info_responsible'] = $info['info_responsible'] ? explode(',',$info['info_responsible']) : array();

From 0923f55a9d82c19780602d48f7ed027cfe0f4318 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 6 May 2009 07:04:29 +0000
Subject: [PATCH 291/510] "fixed messed up formatting"

---
 timesheet/inc/class.timesheet_ui.inc.php | 135 ++++++++++++-----------
 1 file changed, 72 insertions(+), 63 deletions(-)

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index b03ce95fe1..1ec97e34f7 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -79,14 +79,14 @@ class timesheet_ui extends timesheet_bo
 			else	// new entry
 			{
 				$this->data = array(
-				'ts_start' => $this->today,
-				'end_time' => $this->now - $this->today,
-				'ts_owner' => $GLOBALS['egw_info']['user']['account_id'],
-				'cat_id'   => (int) $_REQUEST['cat_id'],
+					'ts_start' => $this->today,
+					'end_time' => $this->now - $this->today,
+					'ts_owner' => $GLOBALS['egw_info']['user']['account_id'],
+					'cat_id'   => (int) $_REQUEST['cat_id'],
 				);
 			}
 			$referer = preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] :
-			(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
+				(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
 		}
 		else
 		{
@@ -181,8 +181,8 @@ class timesheet_ui extends timesheet_bo
 						}
 					}
 					$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php',array(
-					'menuaction' => $referer,
-					'msg'        => $msg,
+						'menuaction' => $referer,
+						'msg'        => $msg,
 					))."';";
 					if ($button == 'apply') break;
 					if ($button == 'save_new')
@@ -231,22 +231,22 @@ class timesheet_ui extends timesheet_bo
 			}
 		}
 		$preserv = $this->data + array(
-		'view'    => $view,
-		'referer' => $referer,
-		'ts_title_blur' => $content['ts_title_blur'],
+			'view'    => $view,
+			'referer' => $referer,
+			'ts_title_blur' => $content['ts_title_blur'],
 		);
 		$content = array_merge($this->data,array(
-		'msg'  => $msg,
-		'view' => $view,
-		$tabs  => $content[$tabs],
-		'link_to' => array(
-		'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : $content['link_to']['to_id'],
-		'to_app' => TIMESHEET_APP,
-		),
-		'js' => "<script>\n$js\n</script>\n",
-		'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
-		'start_time' => $this->datetime2time($this->data['ts_start']),
-		'pm_integration' => $this->pm_integration,
+			'msg'  => $msg,
+			'view' => $view,
+			$tabs  => $content[$tabs],
+			'link_to' => array(
+				'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : $content['link_to']['to_id'],
+				'to_app' => TIMESHEET_APP,
+			),
+			'js' => "<script>\n$js\n</script>\n",
+			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
+			'start_time' => $this->datetime2time($this->data['ts_start']),
+			'pm_integration' => $this->pm_integration,
 		));
 		$links = array();
 		// create links specified in the REQUEST (URL)
@@ -301,11 +301,11 @@ class timesheet_ui extends timesheet_bo
 		$content['ts_title_blur'] = $preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur'];
 
 		$readonlys = array(
-		'button[delete]'   => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE),
-		'button[edit]'     => !$view || !$this->check_acl(EGW_ACL_EDIT),
-		'button[save]'     => $view,
-		'button[save_new]' => $view,
-		'button[apply]'    => $view,
+			'button[delete]'   => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE),
+			'button[edit]'     => !$view || !$this->check_acl(EGW_ACL_EDIT),
+			'button[save]'     => $view,
+			'button[save_new]' => $view,
+			'button[apply]'    => $view,
 		);
 		if ($view)
 		{
@@ -321,7 +321,7 @@ class timesheet_ui extends timesheet_bo
 			$readonlys['ts_owner'] = true;
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('timesheet').' - '.
-		($view ? lang('View') : ($this->data['ts_id'] ? lang('Edit') : lang('Add')));
+			($view ? lang('View') : ($this->data['ts_id'] ? lang('Edit') : lang('Add')));
 
 		// supress unknow widget 'projectmanager-*', if projectmanager is not installed or old
 		if (!@file_exists(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.projectmanager_widget.inc.php'))
@@ -337,8 +337,8 @@ class timesheet_ui extends timesheet_bo
 		if (!$this->customfields) $readonlys[$tabs]['customfields'] = true;	// suppress tab if there are not customfields
 
 		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,array(
-		'ts_owner'  => $edit_grants,
-		'ts_status' => $this->status_labels,
+			'ts_owner'  => $edit_grants,
+			'ts_status' => $this->status_labels,
 		),$readonlys,$preserv,2);
 	}
 
@@ -421,14 +421,16 @@ class timesheet_ui extends timesheet_bo
 			$query['col_filter']['ts_id'] = $this->get_ts_links($query['col_filter']['pm_id']);
 			if (!$query['col_filter']['ts_id']) $query['col_filter']['ts_id'] = 0;
 		}
-		if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] == '0') {
+		if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] == '0')
+		{
 			$query['col_filter']['ts_project'] = 0;
 			unset($query['col_filter']['ts_id']);
 		}
 		unset($query['col_filter']['pm_id']);
 
 		// filter for no project
-		if ((string)$query['col_filter']['ts_project'] == '0') {
+		if ((string)$query['col_filter']['ts_project'] == '0')
+		{
 			$query['col_filter']['ts_project'] = null;
 		}
 		#_debug_array($query['col_filter']);
@@ -520,18 +522,24 @@ class timesheet_ui extends timesheet_bo
 		$links3 = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
 		#_debug_array($links);
 		//as the full array is expected, we must supply the missing but needed (since expected further down) information
-		if (is_array($links3)) {
-			foreach ($links3 as $likey => $liarray) {
+		if (is_array($links3))
+		{
+			foreach ($links3 as $likey => $liarray)
+			{
 				#echo "$likey";_debug_array($liarray);echo"<br>";
-				if (is_array($liarray)) {
-					foreach ($liarray as $li2key => $lival) {
+				if (is_array($liarray))
+				{
+					foreach ($liarray as $li2key => $lival)
+					{
 						$links[$likey][$li2key]['id'] = $lival;
 						$links[$likey][$li2key]['app'] = 'projectmanager';
 					}
 				}
 			}
 			if (!is_array($links)) $links = array();
-		} else {
+		}
+		else
+		{
 			$links = array();
 		}
 		#_debug_array($links);
@@ -551,18 +559,18 @@ class timesheet_ui extends timesheet_bo
 				switch($row['ts_id'])
 				{
 					case 0:	// day-sum
-					$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.$GLOBALS['egw']->common->show_date($row['ts_start'],
-					$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
-					break;
+						$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.$GLOBALS['egw']->common->show_date($row['ts_start'],
+						$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
+						break;
 					case -1:	// week-sum
-					$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
-					break;
+						$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
+						break;
 					case -2:	// month-sum
-					$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
-					break;
+						$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
+						break;
 					case -3:	// year-sum
-					$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
-					break;
+						$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
+						break;
 				}
 				$row['ts_start'] = $row['ts_unitprice'] = '';
 				if (!$this->quantity_sum) $row['ts_quantity'] = '';
@@ -613,7 +621,8 @@ class timesheet_ui extends timesheet_bo
 		}
 		$rows['pm_integration'] = $this->pm_integration;
 		$rows['ts_viewtype'] =  $rows['no_ts_quantity'] =  $rows['no_ts_unitprice'] =  $rows['no_ts_total'] = $this->ts_viewtype == 'short';
-		if (!$rows['ts_viewtype']) {
+		if (!$rows['ts_viewtype'])
+		{
 			#_debug_array($query['selectcols']);
 			#ts_quantity,ts_unitprice,ts_total
 			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
@@ -671,8 +680,8 @@ class timesheet_ui extends timesheet_bo
 		}
 
 		$content = array(
-		'nm' => $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP),
-		'msg' => $msg,
+			'nm' => $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP),
+			'msg' => $msg,
 		);
 		if (!is_array($content['nm']))
 		{
@@ -684,25 +693,25 @@ class timesheet_ui extends timesheet_bo
 			$date_filters['custom'] = 'custom';
 
 			$content['nm'] = array(
-			'get_rows'       =>	TIMESHEET_APP.'.timesheet_ui.get_rows',
-			'options-filter' => $date_filters,
-			'options-filter2' => array('No details','Details'),
-			'order'          =>	'ts_start',// IO name of the column to sort after (optional for the sortheaders)
-			'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
-			'header_left'    => 'timesheet.index.dates',
-			'header_right'   => 'timesheet.index.add',
-			'filter_onchange' => "set_style_by_class('table','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();",
-			'filter2'        => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],
+				'get_rows'       =>	TIMESHEET_APP.'.timesheet_ui.get_rows',
+				'options-filter' => $date_filters,
+				'options-filter2' => array('No details','Details'),
+				'order'          =>	'ts_start',// IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
+				'header_left'    => 'timesheet.index.dates',
+				'header_right'   => 'timesheet.index.add',
+				'filter_onchange' => "set_style_by_class('table','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();",
+				'filter2'        => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],
 			);
 		}
 		$read_grants = $this->grant_list(EGW_ACL_READ);
 		$content['nm']['no_owner_col'] = count($read_grants) == 1;
 		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows']) $content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
 		$sel_options = array(
-		'ts_owner'   => $read_grants,
-		'pm_id'      => array(lang('No project')),
-		'cat_id'     => array(lang('None')),
-		'ts_status'  => $this->status_labels,
+			'ts_owner'   => $read_grants,
+			'pm_id'      => array(lang('No project')),
+			'cat_id'     => array(lang('None')),
+			'ts_status'  => $this->status_labels,
 		);
 		$content['nm']['no_status'] = !$sel_options['ts_status'];
 
@@ -818,8 +827,8 @@ class timesheet_ui extends timesheet_bo
 					break;
 				case 'cancel':
 					$GLOBALS['egw']->redirect_link('/index.php',array(
-					'menuaction' => 'timesheet.timesheet_ui.index',
-					'msg' => $msg,
+						'menuaction' => 'timesheet.timesheet_ui.index',
+						'msg' => $msg,
 					));
 					break;
 				case 'apply':

From 7ba0af7f28035bc325682012267f70e052352405 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 6 May 2009 08:12:51 +0000
Subject: [PATCH 292/510] "only add total automatically, if $only_keys ===
 false or show_sums"

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

diff --git a/timesheet/inc/class.timesheet_bo.inc.php b/timesheet/inc/class.timesheet_bo.inc.php
index 7441403bd6..dbe11d6d55 100644
--- a/timesheet/inc/class.timesheet_bo.inc.php
+++ b/timesheet/inc/class.timesheet_bo.inc.php
@@ -150,7 +150,7 @@ class timesheet_bo extends so_sql_cf
 		{
 			if ($grant & $required)
 			{
-				$result[$uid] = $GLOBALS['egw']->common->grab_owner_name($uid);
+				$result[$uid] = common::grab_owner_name($uid);
 			}
 		}
 		natcasesort($result);
@@ -294,8 +294,10 @@ class timesheet_bo extends so_sql_cf
 		{
 			$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
 		}
-		$extra_cols[] = $total_sql.' AS ts_total';
-
+		if ($only_keys === false || $this->show_sums && strpos($order_by,'ts_start') !== false)
+		{
+			$extra_cols[] = $total_sql.' AS ts_total';
+		}
 		if (!isset($filter['ts_owner']) || !count($filter['ts_owner']))
 		{
 			$filter['ts_owner'] = array_keys($this->grants);

From 0d28eb4ceaa12fea672d0903726948667689c910 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 6 May 2009 09:00:36 +0000
Subject: [PATCH 293/510] "egw_vfs::find() always use name as second sort
 criteria"

---
 phpgwapi/inc/class.egw_vfs.inc.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index d7dcc92d58..bf6142e85a 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -447,7 +447,10 @@ class egw_vfs extends vfs_stream_wrapper
 				case 'mode':
 				case 'ctime':
 				case 'mtime':
-					uasort($result,create_function('$a,$b',$c='return '.$dirsfirst.$sort.'($a[\''.$options['order'].'\']-$b[\''.$options['order'].'\']);'));
+					$code = $dirsfirst.$sort.'($a[\''.$options['order'].'\']-$b[\''.$options['order'].'\']);';
+					// always use name as second sort criteria
+					$code = '$cmp = '.$code.' return $cmp ? $cmp : strcasecmp($a[\'name\'],$b[\'name\']);';
+					uasort($result,create_function('$a,$b',$code));
 					break;
 
 				// sort alphanumerical
@@ -456,7 +459,17 @@ class egw_vfs extends vfs_stream_wrapper
 					// fall throught
 				case 'name':
 				case 'mime':
-					uasort($result,create_function('$a,$b',$c='return '.$dirsfirst.$sort.'strcasecmp($a[\''.$options['order'].'\'],$b[\''.$options['order'].'\']);'));
+					$code = $dirsfirst.$sort.'strcasecmp($a[\''.$options['order'].'\'],$b[\''.$options['order'].'\']);';
+					if ($options['order'] != 'name')
+					{
+						// always use name as second sort criteria
+						$code = '$cmp = '.$code.' return $cmp ? $cmp : strcasecmp($a[\'name\'],$b[\'name\']);';
+					}
+					else
+					{
+						$code = 'return '.$code;
+					}
+					uasort($result,create_function('$a,$b',$code));
 					break;
 			}
 			//echo "order='$options[order]', sort='$options[sort]' --> '$c'<br>\n";

From 772c9e57e8af63a1ea85a44dc09a421554f3ffdb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 6 May 2009 09:11:37 +0000
Subject: [PATCH 294/510] "docu update"

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

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index aac6619884..26ecc626e1 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -67,7 +67,7 @@ class calendar_so
 	var $extra_table,$repeats_table,$user_table,$dates_table,$all_tables;
 
 	/**
-	 * internal copy of the global db-object
+	 * reference to global db-object
 	 *
 	 * @var egw_db
 	 */

From 9e202e10f648704c580076bf815030c543ca5ba3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 6 May 2009 10:13:43 +0000
Subject: [PATCH 295/510] "fix for bug #2070"

---
 phpgwapi/inc/common_functions.inc.php | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 3167719f61..3220603c14 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -729,6 +729,7 @@ function &CreateObject($class)
 				'uiroles'           => 'projectmanager_roles_ui',
 				'uimilestones'      => 'projectmanager_milestones_ui',
 				'uipricelist'       => 'projectmanager_pricelist_ui',
+				'bowiki'            => 'wiki_bo',
 			);
 			if (isset($replace[$classname]))
 			{
@@ -737,6 +738,10 @@ function &CreateObject($class)
 				$classname = $replace[$classname];
 			}
 		}
+		if (!file_exists($f=EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
+		{
+			throw new egw_exception_assertion_failed(__FUNCTION__."($classname) file $f not found!");
+		}
 		// this will stop php with a 500, if the class does not exist or there are errors in it (syntax error go into the error_log)
 		require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
 	}
@@ -1397,31 +1402,18 @@ function __autoload($class)
 		// eGW api classes containing multiple classes in on file, eg. egw_exception
 		isset($components[0]) && file_exists($file = EGW_API_INC.'/class.'.$app.'_'.$components[0].'.inc.php') ||
 		// eGW eTemplate classes using the old naming schema, eg. etemplate
-		file_exists($file = EGW_INCLUDE_ROOT.'/etemplate/inc/class.'.$class.'.inc.php') ||
+		file_exists($file = EGW_INCLUDE_ROOT.'/etemplate/inc/class.'.$class.'.inc.php'))// ||
 		// classes of the current application using the old naming schema
-		file_exists($file = EGW_INCLUDE_ROOT.'/'.$GLOBALS['egw_info']['flags']['currentapp'].'/inc/class.'.$class.'.inc.php'))
+//		file_exists($file = EGW_INCLUDE_ROOT.'/'.$GLOBALS['egw_info']['flags']['currentapp'].'/inc/class.'.$class.'.inc.php'))
 	{
 		//error_log("autoloaded class $class from $file");
 		include_once($file);
 	}
-	// allow apps to define onw autoload method
+	// allow apps to define an own autoload method
 	elseif (isset($GLOBALS['egw_info']['flags']['autoload']) && is_callable($GLOBALS['egw_info']['flags']['autoload']))
 	{
 		call_user_func($GLOBALS['egw_info']['flags']['autoload'],$class);
 	}
-/*  disabling search over all apps: classes should either conform to new naming schema or use explicit includes
-	elseif (is_array($GLOBALS['egw_info']['apps']))
-	{
-		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
-		{
-			if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$class.'.inc.php'))
-			{
-				//error_log("autoloaded class $class from $file");
-				include_once($file);
-			}
-		}
-	}
-*/
 }
 
 /**

From 4c6b076c97be7b39be6901370f1943dd12057baa Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 6 May 2009 15:15:39 +0000
Subject: [PATCH 296/510] filemanager runs now for projectmanager with PM's
 sidebox menu

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

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index ffafce2427..6004383d68 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -100,6 +100,12 @@ class filemanager_ui
 				$content['nm']['path'] = self::get_home_dir();
 			}
 			if (isset($_GET['msg'])) $msg = $_GET['msg'];
+
+			// switch to projectmanager folders
+			if (isset($_GET['pm_id']))
+			{
+				$_GET['path'] = '/apps/projectmanager'.((int)$_GET['pm_id'] ? '/'.(int)$_GET['pm_id'] : '');
+			}
 			if (isset($_GET['path']) && ($path = $_GET['path']))
 			{
 				switch($path)
@@ -527,6 +533,11 @@ class filemanager_ui
 	 */
 	function get_rows($query,&$rows,&$readonlys)
 	{
+		// show projectmanager sidebox for projectmanager path
+		if (substr($query['path'],0,20) == '/apps/projectmanager' && isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
+		{
+			$GLOBALS['egw_info']['flags']['currentapp'] = 'projectmanager';
+		}
 		$GLOBALS['egw']->session->appsession('index','filemanager',$query);
 
 		if (!egw_vfs::stat($query['path'],true) || !egw_vfs::is_dir($query['path']) || !egw_vfs::check_access($query['path'],egw_vfs::READABLE))
@@ -539,11 +550,6 @@ class filemanager_ui
 			));
 		}
 		$rows = $dir_is_writable = array();
-		if ($query['searchletter'] && egw_vfs::stat($query['path'].'/'.$query['searchletter'].'*'))
-		{
-			$query['path'] .= '/'.$query['searchletter'].'*';
-			$query['searchletter'] = false;
-		}
 		if($query['searchletter'] && !empty($query['search']))
 		{
 			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
@@ -606,6 +612,21 @@ class filemanager_ui
 			}
 		}
 		//_debug_array($readonlys);
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'projectmanager')
+		{
+			$GLOBALS['egw_info']['flags']['app_header'] = lang('Projectmanager').' - '.lang('Filemanager');
+			// we need our app.css file
+			if (!file_exists(EGW_SERVER_ROOT.($css_file='/filemanager/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css')))
+			{
+				$css_file = '/filemanager/templates/default/app.css';
+			}
+			$GLOBALS['egw_info']['flags']['css'] .= "\n\t\t</style>\n\t\t".'<link href="'.$GLOBALS['egw_info']['server']['webserver_url'].
+				$css_file.'?'.filemtime(EGW_SERVER_ROOT.$css_file).'" type="text/css" rel="StyleSheet" />'."\n\t\t<style>\n\t\t\t";
+		}
+		else
+		{
+			$GLOBALS['egw_info']['flags']['app_header'] = lang('Filemanager').': '.$query['path'];
+		}
 		return egw_vfs::$find_total;
 	}
 

From e5ffe827f667e5ac2adc4a73540e50be8bc653e2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 8 May 2009 15:51:57 +0000
Subject: [PATCH 297/510] "extend readonly handling of button to images (images
 with a link have a similar function) setting their name in $readonlys,
 removes the image completly"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 5376ad8df2..f85b1a2144 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -951,9 +951,10 @@ class etemplate extends boetemplate
 		{
 			$cell['size'] = $this->expand_name($cell['size'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
 		}
-		if ($cell['disabled'] && $readonlys[$name] !== false || $readonly && ($cell['type'] == 'button' || $cell['type'] == 'buttononly') &&  strpos($cell['size'],',')===false)
+		if ($cell['disabled'] && $readonlys[$name] !== false || $readonly && in_array($cell['type'],array('button','buttononly','image')) &&  strpos($cell['size'],',')===false)
 		{
-			if ($this->rows == 1) {
+			if ($this->rows == 1)
+			{
 				return '';	// if only one row omit cell
 			}
 			$cell = $this->empty_cell('label','',array('span' => $cell['span'])); // show nothing (keep the css class!)

From 701fe5661b34fd89c7dc3ce2703ececf5801294c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 8 May 2009 16:01:33 +0000
Subject: [PATCH 298/510] - icon linking to filemanager of entry - configurable
 limit of height of describtion in list

---
 infolog/inc/class.infolog_hooks.inc.php    | 40 ++++++++++-------
 infolog/inc/class.infolog_ui.inc.php       | 10 +++++
 infolog/setup/egw_de.lang                  | 12 ++++-
 infolog/setup/egw_en.lang                  |  4 +-
 infolog/setup/etemplates.inc.php           |  8 ++--
 infolog/templates/default/app.css          |  3 +-
 infolog/templates/default/customfields.xet |  6 +--
 infolog/templates/default/index.xet        | 52 ++++++++++++++--------
 8 files changed, 91 insertions(+), 44 deletions(-)

diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php
index 43b6c6198f..160d606185 100644
--- a/infolog/inc/class.infolog_hooks.inc.php
+++ b/infolog/inc/class.infolog_hooks.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package infolog
- * @copyright (c) 2003-6 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -111,15 +111,17 @@ class infolog_hooks
 	}
 
 	/**
-	 * populates $GLOBALS['settings'] for the preferences
+	 * populates $settings for the preferences
+	 *
+	 * @return array
 	 */
 	static function settings()
 	{
 		/* Setup some values to fill the array of this app's settings below */
-		$ui = new infolog_ui();	// need some labels from
+		$info = new infolog_bo();	// need some labels from
 		$filters = $show_home = array();
 		$show_home[] = lang("DON'T show InfoLog");
-		foreach($ui->filters as $key => $label)
+		foreach($info->filters as $key => $label)
 		{
 			$show_home[$key] = $filters[$key] = lang($label);
 		}
@@ -144,7 +146,7 @@ class infolog_hooks
 		);
 
 		/* Settings array for this app */
-		$GLOBALS['settings'] = array(
+		$settings = array(
 			'defaultFilter' => array(
 				'type'   => 'select',
 				'label'  => 'Default Filter for InfoLog',
@@ -206,6 +208,15 @@ class infolog_hooks
 				'xmlrpc' => True,
 				'admin'  => False
 			),
+			'limit_des_lines' => array(
+				'type'   => 'input',
+				'size'   => 5,
+				'label'  => 'Limit number of description lines (default 5, 0 for no limit)',
+				'name'   => 'limit_des_lines',
+				'help'   => 'How many describtion lines should be directly visible. Further lines are available via a scrollbar.',
+				'xmlrpc' => True,
+				'admin'  => False
+			),
 			'set_start' => array(
 				'type'   => 'select',
 				'label'  => 'Startdate for new entries',
@@ -223,7 +234,7 @@ class infolog_hooks
 				'type'   => 'multiselect',
 				'label'  => 'Which types should the calendar show',
 				'name'   => 'cal_show',
-				'values' => $ui->bo->enums['type'],
+				'values' => $info->enums['type'],
 				'help'   => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.',
 				'xmlrpc' => True,
 				'admin'  => False
@@ -241,7 +252,7 @@ class infolog_hooks
 		);
 
 		// notification preferences
-		$GLOBALS['settings']['notify_creator'] = array(
+		$settings['notify_creator'] = array(
 			'type'   => 'check',
 			'label'  => 'Receive notifications about own items',
 			'name'   => 'notify_creator',
@@ -249,7 +260,7 @@ class infolog_hooks
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
-		$GLOBALS['settings']['notify_assigned'] = array(
+		$settings['notify_assigned'] = array(
 			'type'   => 'select',
 			'label'  => 'Receive notifications about items assigned to you',
 			'name'   => 'notify_assigned',
@@ -272,7 +283,7 @@ class infolog_hooks
 			'2d'  => lang('%1 days in advance',2),
 			'3d'  => lang('%1 days in advance',3),
 		);
-		$GLOBALS['settings']['notify_due_delegated'] = array(
+		$settings['notify_due_delegated'] = array(
 			'type'   => 'select',
 			'label'  => 'Receive notifications about due entries you delegated',
 			'name'   => 'notify_due_delegated',
@@ -281,7 +292,7 @@ class infolog_hooks
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
-		$GLOBALS['settings']['notify_due_responsible'] = array(
+		$settings['notify_due_responsible'] = array(
 			'type'   => 'select',
 			'label'  => 'Receive notifications about due entries you are responsible for',
 			'name'   => 'notify_due_responsible',
@@ -290,7 +301,7 @@ class infolog_hooks
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
-		$GLOBALS['settings']['notify_start_delegated'] = array(
+		$settings['notify_start_delegated'] = array(
 			'type'   => 'select',
 			'label'  => 'Receive notifications about starting entries you delegated',
 			'name'   => 'notify_start_delegated',
@@ -299,7 +310,7 @@ class infolog_hooks
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
-		$GLOBALS['settings']['notify_start_responsible'] = array(
+		$settings['notify_start_responsible'] = array(
 			'type'   => 'select',
 			'label'  => 'Receive notifications about starting entries you are responsible for',
 			'name'   => 'notify_start_responsible',
@@ -309,7 +320,7 @@ class infolog_hooks
 			'admin'  => False,
 		);
 
-		return true;	// otherwise prefs say it cant find the file ;-)
+		return $settings;
 	}
 
 	/**
@@ -346,10 +357,7 @@ class infolog_hooks
 		if ($data['prefs']['notify_due_delegated'] || $data['prefs']['notify_due_responsible'] ||
 			$data['prefs']['notify_start_delegated'] || $data['prefs']['notify_start_responsible'])
 		{
-			require_once(EGW_API_INC.'/class.asyncservice.inc.php');
-
 			$async =& new asyncservice();
-			//$async->cancel_timer('infolog-async-notification');
 
 			if (!$async->read('infolog-async-notification'))
 			{
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 553b9751d2..343fa3901d 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -420,6 +420,9 @@ class infolog_ui
 				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$title;
 			}
 		}
+		// disable filemanager icon, if user has no access to it
+		$readonlys['filemanager/navbar'] = !isset($GLOBALS['egw_info']['user']['apps']['filemanager']);
+
 		return $query['total'];
 	}
 
@@ -630,6 +633,13 @@ class infolog_ui
 		{
 			$values['css'] = '<style type="text/css">@import url('.$GLOBALS['egw_info']['server']['webserver_url'].'/infolog/templates/default/app.css);'."</style>";
 		}
+		// add scrollbar to long describtion, if user choose so in his prefs
+		if ($this->prefs['limit_des_lines'] > 0 || (string)$this->prefs['limit_des_lines'] == '')
+		{
+			$values['css'] .= '<style type="text/css">@media screen { .infoDes {  max-height: '.
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	// dono why em is not real lines
+				'em; overflow: auto; }}</style>';
+		}
 		return $this->tmpl->exec('infolog.infolog_ui.index',$values,array(
 			'info_type'     => $this->bo->enums['type'],
 		),$readonlys,$persist,$return_html ? -1 : 0);
diff --git a/infolog/setup/egw_de.lang b/infolog/setup/egw_de.lang
index a2e2c939c1..ceb3ddee47 100644
--- a/infolog/setup/egw_de.lang
+++ b/infolog/setup/egw_de.lang
@@ -56,6 +56,7 @@ cancel	infolog	de	Abbruch
 cancelled	infolog	de	abgesagt
 categories	infolog	de	Kategorien
 category	infolog	de	Kategorie
+change history	infolog	de	Änderungsverlauf
 change the status of an entry, eg. close it	infolog	de	Status eines Eintrags ändern, zB. ihn als erledigt markieren
 charset of file	infolog	de	Zeichensatz der Datei
 check to set startday	infolog	de	ankreutzen um Startdatum zu setzen
@@ -150,9 +151,12 @@ from	infolog	de	Von
 general	infolog	de	Allgemein
 group owner for	infolog	de	Gruppeneigentümer für
 high	infolog	de	hoch
+history	infolog	de	Historie
 history logging	infolog	de	Protokollierung der Historie
 history logging and deleting of items	infolog	de	Protokollierung der Historie und löschen von Einträgen
+how many describtion lines should be directly visible. further lines are available via a scrollbar.	infolog	de	Wieviele Zeilen der Beschreibung sollen direkt sichbar sein. Zusätzliche Zeilen können über einen Scrollbar erreicht werden.
 id	infolog	de	Id
+id#	infolog	de	Id#
 if a type has a group owner, all entries of that type will be owned by the given group and not the user who created it!	infolog	de	Wenn ein Typ einen Gruppeneigentümer hat, gehören alle Einträge dieses Typs der angegebenen Gruppe und NICHT dem Benutzer der sie angelegt hat!
 if not set, the line with search and filters is hidden for less entries then "max matches per page" (as defined in your common preferences).	infolog	de	Falls nicht gesetzt, wird die Suche und die Filter ausgeblendet für weniger Einträge als "maximale Treffer pro Seite" (in ihren allg. Einstellungen definiert).
 import	infolog	de	Import
@@ -175,10 +179,12 @@ invalid filename	infolog	de	Ungültiger Dateiname
 label<br>helptext	infolog	de	Beschriftung<br>Hilfetext
 last changed	infolog	de	letzte Änderung
 last modified	infolog	de	zuletzt geändert
+leave blank to get the used time calculated by timesheet entries	infolog	de	Leer lassen um die Zeit nach den Stundenzetteln zu bekommen
 leave it empty	infolog	de	leer lassen
 leave without saveing the entry	infolog	de	Abbruch ohne den Eintrag zu speichern
-leaves without saveing	infolog	de	Abbroch ohne speichern
+leaves without saveing	infolog	de	Abbruch ohne speichern
 length<br>rows	infolog	de	Länge<br />Zeilen
+limit number of description lines (default 5, 0 for no limit)	infolog	de	Begrenze Anzahl Beschreibungszeilen (Vorgabe 5, 0 für keine Grenze)
 link	infolog	de	Verknüpfung
 links	infolog	de	Verknüpfungen
 links of this entry	infolog	de	Verknüpfungen dieses Eintrags
@@ -188,6 +194,7 @@ location	infolog	de	Ort
 longer textual description	infolog	de	längere textliche Beschreibung
 low	infolog	de	niedrig
 max length of the input [, length of the inputfield (optional)]	infolog	de	max. Länge der Eingabe [, Länge des Eingabefeldes (optional)]
+modifierer	infolog	de	Geändert von
 name must not be empty !!!	infolog	de	Name darf nicht leer sein !!!
 name of new type to create	infolog	de	Name des neu anzulegenden Types
 never hide search and filters	infolog	de	Suche und Filter niemals ausblenden
@@ -245,6 +252,8 @@ priority	infolog	de	Priorität
 private	infolog	de	Privat
 project	infolog	de	Projekt
 project settings: price, times	infolog	de	Einstellungen zum Projekt: Preis, Zeiten
+re-planned	infolog	de	Umgeplant
+re-planned time	infolog	de	Umgeplante Zeit
 re:	infolog	de	Re:
 read one record by passing its id.	infolog	de	Einen Datensatz spezifiziert durch seine id lesen.
 read rights (default)	infolog	de	Leserechte (Vorgabe)
@@ -339,6 +348,7 @@ urgent	infolog	de	Dringend
 used time	infolog	de	benötigte Zeit
 valid path on clientside<br>eg. \\server\share or e:\	infolog	de	gültiger Pfad clientseitig<br>zB. \\Server\Share oder e:\
 valid path on clientside<br>eg. \servershare or e:	infolog	de	gültiger Pfad clientseitig<br>zB. \\Server\Share oder e:\
+valid path on clientside<br>eg. servershare or e:	infolog	de	gültiger Pfad clientseitig<br>zB. \\Server\Share oder e:\
 values for selectbox	infolog	de	Werte für die Auswahlbox
 view all subs of this entry	infolog	de	alle Untereinträge dieses Eintrag anzeigen
 view other subs	infolog	de	andere Untereinträge anzeigen
diff --git a/infolog/setup/egw_en.lang b/infolog/setup/egw_en.lang
index eea0a1b3e5..08eedc40b9 100644
--- a/infolog/setup/egw_en.lang
+++ b/infolog/setup/egw_en.lang
@@ -41,7 +41,6 @@ add:	infolog	en	Add:
 all	infolog	en	All
 all links and attachments	infolog	en	all links and attachments
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	en	allows to set the status of an entry, eg. set a ToDo to done if it's finished (values depend on entry-type)
-applies the changes	infolog	en	applies the changes
 apply the changes	infolog	en	Apply the changes
 archive	infolog	en	archive
 are you shure you want to delete this entry ?	infolog	en	Are you sure you want to delete this entry ?
@@ -155,6 +154,7 @@ high	infolog	en	high
 history	infolog	en	History
 history logging	infolog	en	History logging
 history logging and deleting of items	infolog	en	History logging and deleting of items
+how many describtion lines should be directly visible. further lines are available via a scrollbar.	infolog	en	How many describtion lines should be directly visible. Further lines are available via a scrollbar.
 id	infolog	en	Id
 id#	infolog	en	Id#
 if a type has a group owner, all entries of that type will be owned by the given group and not the user who created it!	infolog	en	If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!
@@ -184,6 +184,7 @@ leave it empty	infolog	en	leave it empty
 leave without saveing the entry	infolog	en	leave without saveing the entry
 leaves without saveing	infolog	en	leaves without saveing
 length<br>rows	infolog	en	Length<br>Rows
+limit number of description lines (default 5, 0 for no limit)	infolog	en	Limit number of description lines (default 5, 0 for no limit)
 link	infolog	en	Link
 links	infolog	en	Links
 links of this entry	infolog	en	Links of this entry
@@ -251,7 +252,6 @@ priority	infolog	en	Priority
 private	infolog	en	Private
 project	infolog	en	Project
 project settings: price, times	infolog	en	Project settings: price, times
-projectmanager	infolog	en	Projectmanager
 re-planned	infolog	en	Re-planned
 re-planned time	infolog	en	Re-planned time
 re:	infolog	en	Re:
diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index f05cabbd93..cee73d9102 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-04-23 16:34
+	* generated by soetemplate::dump4setup() 2009-05-08 17:55
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -20,7 +20,7 @@ $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' =
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1159943136',);
 
-$templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:3:{s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";s:1:"F";s:3:"80%";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:7:",header";s:5:"label";s:15:"Group owner for";s:4:"name";s:5:"type2";}i:2;a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:11:"None,groups";s:4:"name";s:11:"group_owner";s:4:"help";s:119:"If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!";s:4:"span";s:10:",lpadding5";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
+$templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:3:{s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";s:1:"F";s:3:"80%";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:7:",header";s:5:"label";s:15:"Group owner for";s:4:"name";s:5:"type2";}i:2;a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:11:"None,groups";s:4:"name";s:11:"group_owner";s:4:"help";s:119:"If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!";s:4:"span";s:10:",lpadding5";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:17:"apply the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1173687088',);
 
 $templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1061734964',);
@@ -127,6 +127,8 @@ $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401028',);
 
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:8:",infoDes";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"parent";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401028',);
+
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:34:"8%,@no_info_onwer_info_responsible";s:1:"F";s:25:"12%,@no_info_datemodified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:37:",@no_info_used_time_info_planned_time";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
@@ -135,7 +137,7 @@ $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
 
-$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1240401005',);
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1240401005',);
 
 $templ_data[] = array('name' => 'infolog.Lebert.Baienfurt.Kopf','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:17:"Lebert + Co. GmbH";s:4:"span";s:11:",my_heading";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:23:"International Spedition";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Eisenbahnstrasse 4";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"88255 Baienfurt";}}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:8:"logo.png";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:14:"100%,,,my_form";s:7:"options";a:2:{i:3;s:7:"my_form";i:0;s:4:"100%";}}}','size' => '100%,,,my_form','style' => '.xmy_form td { font-size: 20pt; }
 .my_heading { font-size: 120%; font-weight: bold; }','modified' => '1158752011',);
diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index b3e30bbe24..824b5e70dd 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -17,4 +17,5 @@ table.fullWidth { width: 100%; }
 .fixedHeight { line-height: 12px; }
 .noWrap { white-space: nowrap; }
 .user_filter select { width: 100px; }
-.inputFullWidth input { width: 100%; }
\ No newline at end of file
+.inputFullWidth input { width: 100%; }
+.image16 img { height: 16px; }
\ No newline at end of file
diff --git a/infolog/templates/default/customfields.xet b/infolog/templates/default/customfields.xet
index 429111b01d..69f8ad6709 100644
--- a/infolog/templates/default/customfields.xet
+++ b/infolog/templates/default/customfields.xet
@@ -104,13 +104,13 @@
 					<description span="all" value="Custom status for typ" id="typ"/>
 				</row>
 				<row>
-					<template content="status" span="all" id="infolog.customfields.status"/>
+					<template content="status" span="all" id="status"/>
 				</row>
 				<row class="header">
 					<description span="all" value="Custom fields"/>
 				</row>
 				<row>
-					<template content="fields" span="all" id="infolog.customfields.fields"/>
+					<template content="fields" span="all" id="fields"/>
 				</row>
 				<row>
 					<hbox options="0,0" span="all">
@@ -123,7 +123,7 @@
 				<row>
 					<hbox span="all">
 						<button label="Save" id="button[save]" statustext="saves the changes made and leaves"/>
-						<button label="Apply" id="button[apply]" statustext="applies the changes"/>
+						<button label="Apply" id="button[apply]" statustext="apply the changes"/>
 						<button label="Cancel" id="button[cancel]" statustext="leaves without saveing"/>
 					</hbox>
 				</row>
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 5ae706d1b7..6594f829f9 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -13,8 +13,8 @@
 			<button image="note" label="Note" id="add[note]" statustext="Add a new Note" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=note&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
 		</hbox>
 	</template>
-	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.5.004">
-		<grid>
+	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.001">
+		<grid width="100%" class="my_form">
 			<columns>
 				<column width="2%"/>
 				<column/>
@@ -123,16 +123,24 @@
 						<button image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
 						<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=infolog&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"/>
 					</vbox>
-					<hbox class="noPrint">
-						<button image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
-						<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
-					</hbox>
+					<vbox class="noPrint">
+						<hbox options="0,0" class="noPrint" orient="0">
+							<button image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
+							<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
+						</hbox>
+						<hbox options="0,0" class="noPrint" orient="0">
+							<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry to done"/>
+							<button image="done_all" label="Close all" id="close_all[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
+							<description/>
+							<description/>
+						</hbox>
+						<image src="filemanager/navbar" options="/index.php?menuaction=filemanager.filemanager_ui.index&amp;path=/apps/infolog/$row_cont[info_id]" class="image16" label="Filemanager"/>
+					</vbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.index.rows" template="" lang="" group="0" version="1.5.004">
+	<template id="infolog.index.rows" template="" lang="" group="0" version="1.7.002">
 		<grid>
 			<columns>
 				<column width="2%"/>
@@ -206,7 +214,9 @@
 							<description class="$row_cont[sub_class]" no_lang="1" id="${row}[info_subject]"/>
 							<description no_lang="1" align="right" id="{$row}[info_number]" class="infoId"/>
 						</hbox>
-						<description no_lang="1" id="${row}[info_des]" options=",,1"/>
+						<box class="infoDes">
+							<description no_lang="1" id="${row}[info_des]" options=",,1"/>
+						</box>
 						<link-string id="${row}[filelinks]"/>
 					</vbox>
 					<customfields-list class="customfields" id="$row"/>
@@ -247,15 +257,21 @@
 					</vbox>
 					<vbox options="0" align="center" class="noPrint" orient="0">
 						<button image="new" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;action=sp&amp;action_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
-						<button image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
+						<button image="view" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
+						<button image="parent" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
 						<button image="timesheet" label="Add timesheet entry" id="timesheet[$row_cont[info_id]]" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit&amp;link_app[]=infolog&amp;cat_id=$row_cont[info_cat]&amp;link_id[]=$row_cont[info_id]$row_cont[extra_links]'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;" align="center"/>
 					</vbox>
-					<hbox class="noPrint">
-						<button image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
-						<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
-						<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
-					</hbox>
+					<vbox options="0" class="noPrint" orient="0">
+						<hbox options="0,0" class="noPrint" orient="0">
+							<button image="edit" label="Edit" id="edit[$row_cont[info_id]]" statustext="Edit this entry" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;info_id=$row_cont[info_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
+							<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
+						</hbox>
+						<hbox options="0,0" class="noPrint" orient="0">
+							<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry to done"/>
+							<button image="done_all" label="Close all" id="close_all[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
+						</hbox>
+						<image src="filemanager/navbar" options="/index.php?menuaction=filemanager.filemanager_ui.index&amp;path=/apps/infolog/$row_cont[info_id]" class="image16" label="Filemanager"/>
+					</vbox>
 				</row>
 			</rows>
 		</grid>
@@ -275,8 +291,8 @@
 					<description/>
 				</row>
 				<row disabled="1">
-					<template id="infolog.index.header_left"/>
-					<template id="infolog.index.header_right"/>
+					<template id="header_left"/>
+					<template id="header_right"/>
 				</row>
 				<row disabled="!@main">
 					<template content="main" span="all" id="infolog.index.rows-noheader"/>

From c84a6fd78ac56c85a0d628b10448d3d6a0d11150 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 9 May 2009 07:57:25 +0000
Subject: [PATCH 299/510] "- search($criterial,...) was removing critera with
 numerical key 0 - pending postgres bugfix (got no feedback from list)"

---
 addressbook/inc/class.addressbook_sql.inc.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 6a6213de3a..30c602cea8 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -287,7 +287,7 @@ class addressbook_sql extends so_sql
 		{
 			foreach($criteria as $col => $val)
 			{
-				if ($col[0] == '#')	// search for a value in a certain custom field
+				if ($col[0] === '#')	// search for a value in a certain custom field
 				{
 					$valarray=array();
 					# val may be a list of values, constructed by multiple select fields, to be able to do the contains feature of adv-search
@@ -308,12 +308,12 @@ class addressbook_sql extends so_sql
 					}
 					$search_customfields = true;
 				}
-				elseif($col == 'cat_id')	// search in comma-sep. cat-column
+				elseif($col === 'cat_id')	// search in comma-sep. cat-column
 				{
 					$criteria = array_merge($criteria,$this->_cat_search($val));
 					unset($criteria[$col]);
 				}
-				elseif($col == 'contact_value')
+				elseif($col === 'contact_value')
 				{
 					if ($order_by[0] == '#')
 					{
@@ -400,10 +400,11 @@ class addressbook_sql extends so_sql
 				unset($criteria['owner']);
 			}
 			// postgres requires that expressions in order by appear in the columns of a distinct select
-			if ($this->db->Type != 'mysql' && preg_match("/(\w+<>'')/",$order_by,$matches))
+			if ($this->db->Type != 'mysql' && preg_match("/([a-zA-Z_.]+)<>''/",$order_by,$matches))
 			{
 				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
 				$extra_cols[] = $matches[1];
+				$extra_cols[] = $matches[1]."<>''";
 			}
 		}
 		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)

From 4634465bb8e0bcd826819e8782a5fb378bf6dda7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 9 May 2009 07:58:16 +0000
Subject: [PATCH 300/510] addressbook maintenance: set full name and file as in
 contacts of all users

---
 addressbook/inc/class.addressbook_bo.inc.php | 64 ++++++++++++++++++++
 addressbook/inc/class.addressbook_ui.inc.php | 31 ++++++++++
 addressbook/inc/hook_config.inc.php          | 34 ++++++++++-
 addressbook/setup/egw_de.lang                |  6 ++
 addressbook/setup/egw_en.lang                |  5 ++
 addressbook/templates/default/config.tpl     | 13 +++-
 6 files changed, 151 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index 68b88d1517..ed72bbc640 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -369,6 +369,70 @@ class addressbook_bo extends addressbook_so
 		return $options;
 	}
 
+	/**
+	 * Set n_fileas (and n_fn) in contacts of all users  (called by Admin >> Addressbook >> Site configuration (Admin only)
+	 *
+	 * If $all all fileas fields will be set, if !$all only empty ones
+	 *
+	 * @param string $fileas_type '' or type of $this->fileas_types
+	 * @param int $all=false update all contacts or only ones with empty values
+	 * @param int &$errors=null on return number of errors
+	 * @return int|boolean number of contacts updated, false for wrong fileas type
+	 */
+	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
+	{
+		if ($type != '' && !in_array($type,$this->fileas_types))
+		{
+			return false;
+		}
+		if ($ignore_acl)
+		{
+			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+		}
+		// to be able to work on huge contact repositories we read the contacts in chunks of 100
+		for($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
+			'n_fileas IS NULL',
+			"n_fileas=''",
+			'n_fn IS NULL',
+			"n_fn=''",
+		),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		{
+			foreach($contacts as $contact)
+			{
+				$old_fn     = $contact['n_fn'];
+				$old_fileas = $contact['n_fileas'];
+				$contact['n_fn'] = $this->fullname($contact);
+				// only update fileas if type is given AND (all should be updated or n_fileas is empty)
+				if ($fileas_type && ($all || empty($contact['n_fileas'])))
+				{
+					$contact['n_fileas'] = $this->fileas($contact,$fileas_type);
+				}
+				if ($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])
+				{
+					//echo "<p>('$old_fileas' != '{$contact['n_fileas']}' || '$old_fn' != '{$contact['n_fn']}')=".array2string($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])."</p>\n";
+					// only specify/write updated fields plus "keys"
+					$contact = array_intersect_key($contact,array(
+						'id' => true,
+						'owner' => true,
+						'private' => true,
+						'account_id' => true,
+						'uid' => true,
+					)+($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array())+($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
+					if ($this->save($contact,$ignore_acl))
+					{
+						$updated++;
+					}
+					else
+					{
+						$errors++;
+					}
+				}
+			}
+		}
+		return $updated;
+	}
+
+
 	/**
 	 * get full name from the name-parts
 	 *
diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 0f03b90f9a..6296783e4e 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -25,6 +25,7 @@ class addressbook_ui extends addressbook_bo
 		'photo'		=> True,
 		'emailpopup'=> True,
 		'migrate2ldap' => True,
+		'admin_set_fileas' => True,
 		'cat_add' => True,
 	);
 	/**
@@ -1934,6 +1935,10 @@ $readonlys['button[vcard]'] = true;
 </script>';
 	}
 
+	/**
+	 * Migrate contacts to or from LDAP (called by Admin >> Addressbook >> Site configuration (Admin only)
+	 *
+	 */
 	function migrate2ldap()
 	{
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Addressbook').' - '.lang('Migration to LDAP');
@@ -1952,6 +1957,32 @@ $readonlys['button[vcard]'] = true;
 		$GLOBALS['egw']->common->egw_footer();
 	}
 
+	/**
+	 * Set n_fileas (and n_fn) in contacts of all users  (called by Admin >> Addressbook >> Site configuration (Admin only)
+	 *
+	 * If $_GET[all] all fileas fields will be set, if !$_GET[all] only empty ones
+	 *
+	 */
+	function admin_set_fileas()
+	{
+		translation::add_app('admin');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Addressbook').' - '.lang('Contact maintenance');
+		$GLOBALS['egw']->common->egw_header();
+		parse_navbar();
+
+		// check if user has admin rights AND if a valid fileas type is given (Security)
+		if (!$this->is_admin() || $_GET['type'] != '' && !in_array($_GET['type'],$this->fileas_types))
+		{
+			echo '<h1>'.lang('Permission denied !!!')."</h1>\n";
+		}
+		else
+		{
+			$updated = parent::set_all_fileas($_GET['type'],(boolean)$_GET['all'],$errors,true);	// true = ignore acl
+			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).',$updated,$errors)."</b></p>\n";
+		}
+		$GLOBALS['egw']->common->egw_footer();
+	}
+
 	/**
 	 * Download a document with inserted contact(s)
 	 *
diff --git a/addressbook/inc/hook_config.inc.php b/addressbook/inc/hook_config.inc.php
index 6de0b93df3..f51df0f88b 100644
--- a/addressbook/inc/hook_config.inc.php
+++ b/addressbook/inc/hook_config.inc.php
@@ -1,6 +1,6 @@
 <?php
  /**
- * Addressbook - configuration
+ * eGroupware - Addressbook configuration
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
@@ -9,6 +9,12 @@
  * @version $Id$
  */
 
+/**
+ * Hook to query available contact repositories for addressbook config
+ *
+ * @param array $config
+ * @return string with options
+ */
 function contact_repositories($config)
 {
 	$repositories = array('sql' => 'SQL');
@@ -27,6 +33,26 @@ function contact_repositories($config)
 	return $options;
 }
 
+/**
+ * Hook to get available fileas types selectbox for addressbook config
+ *
+ * @param array $config
+ * @return string html
+ */
+function select_fileas($config)
+{
+	$bocontacts = new addressbook_bo();
+
+	return html::select('fileas','',array('' => lang('Set only full name'))+$bocontacts->fileas_options(),true);
+}
+
+
+/**
+ * Hook to get a multiselect box with all fieleds of onw-account-acl for addressbook config
+ *
+ * @param array $config
+ * @return string html
+ */
 function own_account_acl($config)
 {
 	$bocontacts = new addressbook_bo();
@@ -53,6 +79,12 @@ function own_account_acl($config)
 	return html::checkbox_multiselect('newsettings[own_account_acl]',$config['own_account_acl'],$fields,true,'',4);
 }
 
+/**
+ * Hook to get a multiselect box with all fields of org-fields-to-update for addressbook config
+ *
+ * @param array $config
+ * @return string html
+ */
 function org_fileds_to_update($config)
 {
 	$bocontacts = new addressbook_bo();
diff --git a/addressbook/setup/egw_de.lang b/addressbook/setup/egw_de.lang
index c6b5a16323..b1f4d16d51 100644
--- a/addressbook/setup/egw_de.lang
+++ b/addressbook/setup/egw_de.lang
@@ -1,6 +1,7 @@
 %1 added	addressbook	de	%1 hinzugefügt
 %1 contact(s) %2	addressbook	de	%1 Kontakt(e) %2
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	de	%1 Kontakt(e) %2, %3 nicht wegen fehlender Rechte !!!
+%1 contacts updated (%2 errors).	addressbook	de	%1 Kontakte aktualisiert (%2 Fehler).
 %1 fields in %2 other organisation member(s) changed	addressbook	de	%1 Felder in %2 Mitglied(ern) der Organisation geändert
 %1 records imported	addressbook	de	%1 Datensätze importiert
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	de	%1 Datensätze gelesen (noch nicht importiert, sie können %2zurück%3 gehen und Test-Import auschalten)
@@ -96,6 +97,7 @@ contact deleted	addressbook	de	Kontakt gelöscht
 contact fields to show	addressbook	de	Kontaktfelder die angezeigt werden sollen
 contact fields:	addressbook	de	Kontaktfelder:
 contact id	addressbook	de	Kontakt ID
+contact maintenance	admin	de	Kontakt Wartung
 contact modified by %1 at %2	addressbook	de	Kontakt geändert von %1 am %2
 contact not found!	addressbook	de	Kontakt nicht gefunden!
 contact repository	admin	de	Speicherort Kontakte
@@ -160,8 +162,10 @@ edit phonenumbers -	addressbook	de	Telefonnummern bearbeiten
 either the configured email addesses are wrong or the mail configuration.	addressbook	de	Entweder die konfigurierte Email Adresse ist falsch oder die Mail Konfiguration.
 email & internet	addressbook	de	E-Mail & Internet
 email addresses (comma separated) to send the contact data	addressbook	de	Email Adressen (Komma getrennt) zum Senden der Kontaktdaten
+empty	admin	de	leere
 empty for all	addressbook	de	leer für alle
 enable an extra private addressbook	addressbook	de	Privates Adressbuch einschalten
+enclosure	addressbook	de	Einschluss
 end	addressbook	de	Ende
 enter the path to the exported file here	addressbook	de	Bitte geben Sie den Pfad für die exportierte Datei an
 error deleting the contact !!!	addressbook	de	Fehler beim Löschen des Kontakts !!!
@@ -341,6 +345,8 @@ select the type of conversion:	addressbook	de	Typ der Umwandlung auswählen:
 select where you want to store / retrieve contacts	admin	de	Auswählen wo Sie Adressen speichern wollen
 selected contacts	addressbook	de	ausgewählte Kontakte
 seperator	addressbook	de	Feldtrenner
+set full name and file as field in contacts of all users (either all or only empty values)	admin	de	Setzt vollen Namen und eigene Sortierung in Kontakten aller Benutzer (entweder alle oder nur leere Werte)
+set only full name	addressbook	de	Nur vollen Namen setzen
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	de	Sollen die Spalten Foto und Privatadresse immer angezeigt werden, auch wenn sie leer sind.
 show	addressbook	de	Anzeigen
 show birthday reminders on main screen	addressbook	de	Geburtstagserinnerungen auf der Startseite anzeigen
diff --git a/addressbook/setup/egw_en.lang b/addressbook/setup/egw_en.lang
index d151097153..8e021bb0c7 100644
--- a/addressbook/setup/egw_en.lang
+++ b/addressbook/setup/egw_en.lang
@@ -1,6 +1,7 @@
 %1 added	addressbook	en	%1 added
 %1 contact(s) %2	addressbook	en	%1 contact(s) %2
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	en	%1 contact(s) %2, %3 failed because of insufficent rights !!!
+%1 contacts updated (%2 errors).	addressbook	en	%1 contacts updated (%2 errors).
 %1 fields in %2 other organisation member(s) changed	addressbook	en	%1 fields in %2 other organisation member(s) changed
 %1 records imported	addressbook	en	%1 records imported
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	en	%1 records read (not yet imported, you may go %2back%3 and uncheck Test Import)
@@ -96,6 +97,7 @@ contact deleted	addressbook	en	Contact deleted
 contact fields to show	addressbook	en	Contact fields to show
 contact fields:	addressbook	en	Contact fields:
 contact id	addressbook	en	Contact ID
+contact maintenance	admin	en	Contact maintenance
 contact modified by %1 at %2	addressbook	en	Contact modified by %1 at %2
 contact not found!	addressbook	en	Contact not found!
 contact repository	admin	en	Contact repository
@@ -160,6 +162,7 @@ edit phonenumbers -	addressbook	en	Edit Phonenumbers -
 either the configured email addesses are wrong or the mail configuration.	addressbook	en	Either the configured email addesses are wrong or the mail configuration.
 email & internet	addressbook	en	Email & Internet
 email addresses (comma separated) to send the contact data	addressbook	en	Email addresses (comma separated) to send the contact data
+empty	admin	en	Empty
 empty for all	addressbook	en	empty for all
 enable an extra private addressbook	addressbook	en	Enable an extra private addressbook
 enclosure	addressbook	en	Enclosure
@@ -342,6 +345,8 @@ select the type of conversion:	addressbook	en	Select the type of conversion:
 select where you want to store / retrieve contacts	admin	en	Select where you want to store / retrieve contacts
 selected contacts	addressbook	en	selected contacts
 seperator	addressbook	en	Seperator
+set full name and file as field in contacts of all users (either all or only empty values)	admin	en	Set full name and file as field in contacts of all users (either all or only empty values)
+set only full name	addressbook	en	Set only full name
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	en	Should the columns photo and home address always be displayed, even if they are empty.
 show	addressbook	en	Show
 show birthday reminders on main screen	addressbook	en	Show birthday reminders on main screen
diff --git a/addressbook/templates/default/config.tpl b/addressbook/templates/default/config.tpl
index f5070d9486..38a7b97db8 100644
--- a/addressbook/templates/default/config.tpl
+++ b/addressbook/templates/default/config.tpl
@@ -14,7 +14,7 @@
     <td colspan="2">&nbsp;<b>{lang_Telephony_integration}</b></td>
    </tr>
    <tr class="row_on">
-    <td>&nbsp;{lang_URL_to_link_telephone_numbers_to_(use_%1_=_number_to_call,_%u_=_account_name,_%t_=_account_phone)}:</td>
+    <td width="60%">&nbsp;{lang_URL_to_link_telephone_numbers_to_(use_%1_=_number_to_call,_%u_=_account_name,_%t_=_account_phone)}:</td>
     <td><input name="newsettings[call_link]" value="{value_call_link}" size="40"></td>
    </tr>
    <tr class="row_off">
@@ -67,6 +67,17 @@
     {lang_(empty_=_use_global_limit,_no_=_no_export_at_all)}:</td>
     <td><input name="newsettings[contact_export_limit]" value="{value_contact_export_limit}" size="5"></td>
    </tr>
+   <tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_Contact_maintenance}</b></td>
+   </tr>
+   <tr class="row_on">
+    <td>&nbsp;{lang_Set_full_name_and_file_as_field_in_contacts_of_all_users_(either_all_or_only_empty_values)}:</td>
+    <td>
+     {hook_select_fileas}
+     <input type="button" onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&all=1&type='+this.form.fileas.value;" value="{lang_All}" />
+     <input type="button" onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&type='+this.form.fileas.value;" value="{lang_Empty}" />
+    </td>
+   </tr>
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_Contact_repository}</b></td>
    </tr>

From 21a85af3d624fbf0332d2d36545f4c45125e3f16 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 10 May 2009 15:02:04 +0000
Subject: [PATCH 301/510] "fix for bug #2072: usergroups invisible after last
 svn update"

---
 phpgwapi/inc/class.accounts_sql.inc.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index ac8ccadfe5..a022cf4671 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -379,8 +379,6 @@ class accounts_sql
 					break;
 			}
 		}
-		$criteria[] = "egw_addressbook.account_id is not null ";
-
 		if (!is_object($GLOBALS['egw']->contacts)) throw new exception('No $GLOBALS[egw]->contacts!');
 
 		$accounts = array();

From 0220e3a99a0efff155571de9b66222118670c89f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 06:47:38 +0000
Subject: [PATCH 302/510] - added filemanager icon to index - named tabs in
 edit 'tabs'

---
 addressbook/inc/class.addressbook_ui.inc.php | 49 ++++++++++----------
 addressbook/setup/etemplates.inc.php         |  8 ++--
 addressbook/templates/default/app.css        |  3 ++
 addressbook/templates/default/edit.xet       |  4 +-
 addressbook/templates/default/index.xet      | 23 +++++----
 5 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 6296783e4e..53191104bd 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -5,7 +5,7 @@
  * @link www.egroupware.org
  * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2005-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @copyright (c) 2005/6 by Cornelius Weiss <egw@von-und-zu-weiss.de>
  * @package addressbook
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -17,7 +17,7 @@
  */
 class addressbook_ui extends addressbook_bo
 {
-	var $public_functions = array(
+	public $public_functions = array(
 		'search'	=> True,
 		'edit'		=> True,
 		'view'		=> True,
@@ -33,22 +33,21 @@ class addressbook_ui extends addressbook_bo
 	 *
 	 * @var boolean
 	 */
-	var $private_addressbook = false;
-	var $org_views;
+	protected $private_addressbook = false;
+	protected $org_views;
 
 	/**
 	 * Addressbook configuration (stored as phpgwapi = general server config)
 	 *
 	 * @var array
 	 */
-	var $config;
-	/**
-	 * Name(s) of the tabs in the edit dialog
-	 *
-	 * @var string
-	 */
-	var $tabs = 'general|cats|home|details|links|distribution_list|custom|custom_private';
+	protected $config;
 
+	/**
+	 * Constructor
+	 *
+	 * @param string $contact_app
+	 */
 	function __construct($contact_app='addressbook')
 	{
 		parent::__construct($contact_app);
@@ -312,6 +311,8 @@ class addressbook_ui extends addressbook_bo
 				$sel_options['col_filter[tid]'][$tid] = $data['name'];
 			}
 		}
+		// disable filemanger icon if user has no access to filemanager
+		$readonlys['filemanager/navbar'] = !isset($GLOBALS['egw_info']['user']['apps']['filemanager']);
 
 		// get the availible org-views plus the label of the contacts view of one org
 		$sel_options['org_view'] = $this->org_views;
@@ -1397,10 +1398,10 @@ class addressbook_ui extends addressbook_bo
 			$readonlys[$field] = true;
 		}
 		// disable not needed tabs
-		$readonlys[$this->tabs]['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
-		$readonlys[$this->tabs]['custom'] = !$this->customfields;
-		$readonlys[$this->tabs]['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
-		$readonlys[$this->tabs]['distribution_list'] = !$content['distrib_lists'];#false;
+		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
+		$readonlys['tabs']['custom'] = !$this->customfields;
+		$readonlys['tabs']['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
+		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['button[delete]'] = !$content['id'];
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
 
@@ -1633,10 +1634,10 @@ $readonlys['button[vcard]'] = true;
 			$content['owner'] .= 'p';
 		}
 		// disable not needed tabs
-		$readonlys[$this->tabs]['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
-		$readonlys[$this->tabs]['custom'] = !$this->customfields;
-		$readonlys[$this->tabs]['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
-		$readonlys[$this->tabs]['distribution_list'] = !$content['distrib_lists'];#false;
+		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
+		$readonlys['tabs']['custom'] = !$this->customfields;
+		$readonlys['tabs']['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
+		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
 
 		// last and next calendar date
@@ -1759,11 +1760,11 @@ $readonlys['button[vcard]'] = true;
 		// this setting will enable (and show) the search and cancel buttons, setting this to true will hide the before mentioned buttons completely
 		$readonlys['button'] = false;
 		// disable not needed tabs
-		$readonlys[$this->tabs]['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
-		$readonlys[$this->tabs]['custom'] = !$this->customfields;
-		$readonlys[$this->tabs]['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
-		$readonlys[$this->tabs]['links'] = true;
-		$readonlys[$this->tabs]['distribution_list'] = true;
+		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
+		$readonlys['tabs']['custom'] = !$this->customfields;
+		$readonlys['tabs']['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
+		$readonlys['tabs']['links'] = true;
+		$readonlys['tabs']['distribution_list'] = true;
 		// setting hidebuttons for content will hide the 'normal' addressbook edit dialog buttons
 		$content['hidebuttons'] = true;
 		$content['no_tid'] = true;
diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php
index 7f7c5c8483..0ea50e103a 100755
--- a/addressbook/setup/etemplates.inc.php
+++ b/addressbook/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application addressbook
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2008-10-20 22:00
+	* generated by soetemplate::dump4setup() 2009-05-11 08:46
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package addressbook
@@ -28,6 +28,8 @@ $templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => ''
 
 $templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.5.006','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:79:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private";s:4:"name";s:71:"general|cats|home|details|links|distribution_list|custom|custom_private";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1216641537',);
 
+$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:79:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private";s:4:"name";s:76:"tabs=general|cats|home|details|links|distribution_list|custom|custom_private";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1216641537',);
+
 $templ_data[] = array('name' => 'addressbook.edit.access','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"c2";s:4:",top";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Publish into groups:";}s:1:"B";a:3:{s:4:"type";s:6:"manual";s:7:"onclick";s:13:"return false;";s:4:"name";s:30:"ManualAddressbookPublishgroups";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"5";s:4:"name";s:16:"published_groups";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1140005589',);
 
 $templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1165513081',);
@@ -118,9 +120,9 @@ $templ_data[] = array('name' => 'addressbook.index.right_add','template' => '','
 
 $templ_data[] = array('name' => 'addressbook.index.right_add','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:6:"search";s:5:"label";s:15:"Advanced search";s:7:"onclick";s:170:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.search\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:3:"add";s:5:"label";s:3:"Add";s:4:"help";s:17:"Add a new contact";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:12:",rightPadAdd";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:6:"manual";s:4:"span";s:12:",rightPadAdd";}}}','size' => '','style' => '.rightPadAdd { width: 30px; }','modified' => '1169256471',);
 
-$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.006','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"N";s:2:"90";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_cell]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_home]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:9:"url-phone";s:4:"name";s:15:"${row}[tel_fax]";s:8:"readonly";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";s:4:"name";s:11:"${row}[url]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:8:"readonly";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1210170353',);
-
 $templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.007','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"N";s:2:"90";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_cell]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_home]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:9:"url-phone";s:4:"name";s:15:"${row}[tel_fax]";s:8:"readonly";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";s:4:"name";s:11:"${row}[url]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:8:"readonly";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1216641439',);
 
+$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";s:1:"N";s:2:"75";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_cell]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_home]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:9:"url-phone";s:4:"name";s:15:"${row}[tel_fax]";s:8:"readonly";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";s:4:"name";s:11:"${row}[url]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:8:"readonly";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,0";i:1;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"2,,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:91:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/addressbook/$row_cont[id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1216641439',);
+
 $templ_data[] = array('name' => 'addressbook.search','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:16:"addressbook.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:5:"label";s:8:"Operator";s:4:"name";s:8:"operator";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:6:"select";s:4:"name";s:11:"meth_select";s:7:"no_lang";s:1:"1";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{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:6:"button";s:5:"label";s:6:"Search";s:4:"name";s:14:"button[search]";s:7:"onclick";s:37:"xajax_eT_wrapper(this); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:29:"window.close(); return false;";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1161707411',);
 
diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 52c0ded4ff..a972e853e1 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -77,4 +77,7 @@ fieldset.emailGroup {
 .customfields td{
   white-space: nowrap;
   line-height: 12px;
+}
+.image16 img {
+  height: 16px;
 }
\ No newline at end of file
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 10242acd8f..6fa4367d1c 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -467,7 +467,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="addressbook.edit" template="" lang="" group="0" version="1.5.006">
+	<template id="addressbook.edit" template="" lang="" group="0" version="1.7.001">
 		<grid>
 			<columns>
 				<column width="450"/>
@@ -498,7 +498,7 @@
 					</grid>
 				</row>
 				<row valign="top">
-					<tabbox>
+					<tabbox id="tabs">
 						<tabs>
 							<tab label="General" statustext="Name, Address"/>
 							<tab label="Categories" statustext="Categories"/>
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index 94bce46514..a9aa87bc58 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -14,7 +14,7 @@
 		</hbox>
 		<styles>.rightPadAdd { width: 30px; }</styles>
 	</template>
-	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.5.007">
+	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column/>
@@ -30,7 +30,7 @@
 				<column disabled="@no_distribution_list"/>
 				<column/>
 				<column/>
-				<column width="90"/>
+				<column width="75"/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -161,13 +161,18 @@
 							<menupopup type="select-account" id="${row}[modifier]" readonly="true"/>
 						</menulist>
 					</vbox>
-					<hbox options="0" class="noPrint" orient="0">
-						<button id="document[$row_cont[id]]" image="new" label="Insert in document"/>
-						<image options="addressbook.addressbook_ui.view&amp;contact_id=$row_cont[id]" label="View" src="view"/>
-						<button image="edit" label="Edit" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$row_cont[id]'),'_blank','dependent=yes,width=850,height=460,scrollbars=yes,status=yes'); return false;" id="edit[$row_cont[id]]"/>
-						<button id="delete[$row_cont[id]]" image="delete" label="Delete" statustext="Delete this contact" onclick="return confirm('Delete this contact');"/>
-						<checkbox id="checked[]" options="$row_cont[id]" statustext="Select multiple contacts for a further action" align="right"/>
-					</hbox>
+					<vbox options="0,0" class="noPrint">
+						<hbox options="0">
+							<image options="addressbook.addressbook_ui.view&amp;contact_id=$row_cont[id]" label="View" src="view"/>
+							<button image="edit" label="Edit" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$row_cont[id]'),'_blank','dependent=yes,width=850,height=460,scrollbars=yes,status=yes'); return false;" id="edit[$row_cont[id]]"/>
+							<button id="delete[$row_cont[id]]" image="delete" label="Delete" statustext="Delete this contact" onclick="return confirm('Delete this contact');"/>
+							<checkbox id="checked[]" options="$row_cont[id]" statustext="Select multiple contacts for a further action" align="right"/>
+						</hbox>
+						<hbox options="0">
+							<button id="document[$row_cont[id]]" image="new" label="Insert in document"/>
+							<image src="filemanager/navbar" options="/index.php?menuaction=filemanager.filemanager_ui.index&amp;path=/apps/addressbook/$row_cont[id]" class="image16" label="Filemanager"/>
+						</hbox>
+					</vbox>
 				</row>
 			</rows>
 		</grid>

From 25368c1ca3f460f1364cebc001ba494cbfa4f8dc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 08:08:06 +0000
Subject: [PATCH 303/510] many missing German translations

---
 phpgwapi/setup/egw_de.lang | 116 ++++++++++++++++++++++++++++++++++---
 1 file changed, 109 insertions(+), 7 deletions(-)

diff --git a/phpgwapi/setup/egw_de.lang b/phpgwapi/setup/egw_de.lang
index 4c5838a0fc..635aa399b8 100644
--- a/phpgwapi/setup/egw_de.lang
+++ b/phpgwapi/setup/egw_de.lang
@@ -1,6 +1,9 @@
 %1 email addresses inserted	common	de	%1 E-Mail-Adressen eingefügt
+%1 file	common	de	%1 Datei
 %1 is not executable by the webserver !!!	common	de	%1 ist nicht ausführbar durch den Webserver !!!
-%1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4.	common	de	%1eGroupWare%2 ist eine, in %3PHP%4 programmierte, webbasierende, mehrbenutzer Groupware Suite.
+%1choose an other directory%2<br />or make %3 writeable by webserver	common	de	%1Anderes Verzeichnis auswählen%2<br />oder %3 vom Webserver beschreibbar machen
+%1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4.	common	de	%1EGroupware%2 ist eine, in %3PHP%4 programmierte, webbasierende, mehrbenutzer Groupware Suite.
+(session restored in %1 seconds)	common	de	(Sitzung in %1 Sekunden wiederhergestellt)
 (shift-)click or drag to change value	jscalendar	de	(Shift-) Klicken oder drücken  um den Wert zu ändern
 - click on any of the time parts to increase it	jscalendar	de	- Auf Uhrzeit clicken um sie zu erhöhen
 - hold mouse button on any of the above buttons for faster selection.	jscalendar	de	- für eine schnelle Auswahl die Maus gedrückt halten auf jedem der obigen Knöpfe
@@ -9,13 +12,17 @@
 - use the %1, %2 buttons to select month	jscalendar	de	- Benutzen Sie die %1, %2 Buttons um das Monat auszuwählen
 - use the %1, %2 buttons to select year	jscalendar	de	- Benutzen Sie die %1, %2 Buttons um das Jahr auszuwählen
 00 (disable)	admin	de	00 (deaktiviert)
+1 day	common	de	1 Tag
+1 hour	common	de	1 Stunde
+1 month	common	de	1 Monat
+1 week	common	de	1 Woche
 13 (ntp)	admin	de	13 (ntp)
 3 number of chars for day-shortcut	jscalendar	de	2
 3 number of chars for month-shortcut	jscalendar	de	3
 80 (http)	admin	de	80 (http)
 about	common	de	Ãœber
 about %1	common	de	Ãœber %1
-about egroupware	common	de	Ãœber eGroupWare
+about egroupware	common	de	Ãœber EGroupware
 about the calendar	jscalendar	de	Ãœber den Kalender
 access	common	de	Zugriff
 access not permitted	common	de	Zugriff verweigert
@@ -23,12 +30,14 @@ account has been created	common	de	Benutzerkennung wurde angelegt
 account has been deleted	common	de	Benutzerkennung wurde gelöscht
 account has been updated	common	de	Benutzerkennung wurde aktualisiert
 account is expired	common	de	Benutzerkennung ist abgelaufen
+accounts	common	de	Benutzerkonten
 acl	common	de	ACL
 action	common	de	Aktion
 active	common	de	Aktiv
 add	common	de	Hinzufügen
 add %1 category for	common	de	%1 Kategorie hinzufügen für
 add category	common	de	Kategorie hinzufügen
+add shortcut	common	de	Abkürzung hinzufügen
 add sub	common	de	Untergeordnete hinzufügen
 addressbook	common	de	Adressbuch
 admin	common	de	Admin
@@ -38,9 +47,11 @@ albania	common	de	ALBANIEN
 algeria	common	de	ALGERIEN
 all	common	de	alle
 all fields	common	de	alle Felder
+all languages	common	de	Alle Sprachen
 alphabet	common	de	a,ä,b,c,d,e,f,g,h,i,j,k,l,m,n,o,ö,p,q,r,s,t,u,ü,v,w,x,y,z
 alternate style-sheet:	common	de	Alternatives Stylesheet
 american samoa	common	de	AMERICANISCH SAMOA
+an error happend	common	de	Ein Fehler trat auf
 an existing and by the webserver readable directory enables the image browser and upload.	common	de	Ein existierendes UND vom Webserver lesbares Verzeichnis, schaltet den Bild Browser und Upload ein.
 andorra	common	de	ANDORRA
 angola	common	de	ANGOLA
@@ -68,6 +79,7 @@ azerbaijan	common	de	ASERBAIDSCHAN
 back	common	de	Zurück
 back to user login	common	de	Zurück zur Benutzer Anmeldung
 background color:	common	de	Hintergrund Farbe:
+backupdir '%1' is not writeable by the webserver	common	de	Backupverzeichnis '%1' ist nicht vom Webserver beschreibbar
 bad login or password	common	de	Falscher Benutzername oder Passwort
 bahamas	common	de	BAHAMAS
 bahrain	common	de	BAHRAIN
@@ -92,6 +104,7 @@ brazil	common	de	BRASILIEN
 british indian ocean territory	common	de	BRITISCH INDIEN OZEAN TERRITORIUM
 brunei darussalam	common	de	BRUNEI DARUSSALAM
 bulgaria	common	de	BULGARIEN
+bulgarian	common	de	Bulgarisch
 burkina faso	common	de	BURKINA FASO
 burundi	common	de	BURUNDI
 calendar	common	de	Kalender
@@ -99,6 +112,8 @@ cambodia	common	de	KAMBODSCHA
 cameroon	common	de	KAMERUN
 canada	common	de	KANADA
 cancel	common	de	Abbrechen
+cannot replace %1 because it is a directory	common	de	Kann %1 nicht ersetzen, da es ein Verzeichnis ist
+cant open '%1' for %2	common	de	Kann '%1' nicht zum %2 öffnen
 cape verde	common	de	KAP VERDE
 caption	common	de	Text
 categories	common	de	Kategorien
@@ -108,6 +123,7 @@ category %1 has been added !	common	de	Kategorie %1 wurde hinzugefügt !
 category %1 has been updated !	common	de	Kategorie %1 wurde überarbeitet !
 cayman islands	common	de	KAIMAN INSELN
 cc	common	de	Kopie
+centered	common	de	zentriert
 central african republic	common	de	ZENTRAL AFRIKANISCHE REPUBLIK
 chad	common	de	TSCHAD
 change	common	de	ändern
@@ -116,15 +132,23 @@ check installation	common	de	Installation überprüfen
 check now	common	de	jetzt überprüfen
 chile	common	de	CHILE
 china	common	de	CHINA
+choose a background color	common	de	Wählen Sie eine Hintergrundfarbe
+choose a background color for the icons	common	de	Wählen Sie eine Hintergrundfarbe für die Knöpfe
+choose a background image.	common	de	Wählen Sie ein Hintergrundbild.
+choose a background style.	common	de	Wählen Sie einen Hintergrundstil.
+choose a text color for the icons	common	de	Wählen Sie eine Textfarbe für die Knöpfe
 choose the category	common	de	Kategorie auswählen
 choose the parent category	common	de	Wählen der übergeordneten Kategorie
 christmas island	common	de	WEIHNACHTS INSEL
 clear	common	de	Zurücksetzen
 clear form	common	de	Eingaben löschen
 click	common	de	Klicken
+click here to resume your egroupware session.	common	de	Hier klicken um die EGroupware Sitzung wieder auf zu nehmen.
 click or mouse over to show menus	common	de	Klicken oder "mit dem Mauszeiger darüber fahren" um das Menü anzuzeigen.
 click or mouse over to show menus?	common	de	Klicken oder "mit dem Mauszeiger darüber fahren" um das Menü anzuzeigen?
+click this image on the navbar: %1	common	de	Klicken Sie auf dieses Symbol in der Navigation: %1
 close	common	de	Schließen
+close sidebox	common	de	Seitenmenü schließen
 cocos (keeling) islands	common	de	COCOS INSELN
 colombia	common	de	KOLUMBIEN
 common preferences	common	de	Allgemeine Einstellungen
@@ -132,10 +156,12 @@ comoros	common	de	KOMOREN
 company	common	de	Unternehmen
 congo	common	de	KONGO
 congo, the democratic republic of the	common	de	KONGO, DIE DEMOKRATISCHE REPUBLIK DES
+contacting server...	common	de	Kontaktiere Server...
 cook islands	common	de	COOK INSELN
 copy	common	de	Kopieren
 costa rica	common	de	COSTA RICA
 cote d ivoire	common	de	COTE D IVOIRE
+could not contact server. operation timed out!	common	de	Konnte Sever nicht kontaktieren. Die Zeit lief ab!
 create	common	de	Erstellen
 created by	common	de	Erstellt von
 croatia	common	de	KROATIEN
@@ -145,12 +171,16 @@ current	common	de	derzeit
 current users	common	de	Derzeit angemeldete Benutzer
 cyprus	common	de	ZYPERN
 czech republic	common	de	TSCHECHISCHE REPUBLIK
+database error	common	de	Datenbank Fehler
+database error!	common	de	Datenbank Fehler!
 date	common	de	Datum
 date due	common	de	fällig am
 date selection:	jscalendar	de	Datum auswählen:
 datetime port.<br>if using port 13, please set firewall rules appropriately before submitting this page.<br>(port: 13 / host: 129.6.15.28)	admin	de	Datum-Zeit Port.<br>Wenn sie Port 13 benützen, bitte die Regeln der Firewall entsprechend anpassen bevor sie die Seite speichern.<br>(Port: 13 / Host: 129.6.15.28)
 december	common	de	Dezember
 default category	common	de	Standard-Kategorie
+default height for the windows	common	de	Vorgabewert für Höhe des Fensters
+default width for the windows	common	de	Vorgabewert für Breite des Fensters
 delete	common	de	Löschen
 delete row	common	de	Zeile löschen
 denmark	common	de	DÄNEMARK
@@ -158,10 +188,13 @@ description	common	de	Beschreibung
 detail	common	de	Detail
 details	common	de	Details
 diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images?	common	de	Ausführen des Bugfix-Scripts für Internet Explorer 5.5 und höher, zum Darstellen von transparenten PNG-Bildern abschalten?
+direction left to right	common	de	Richtung links nach rechts
+directory	common	de	Verzeichnis
 directory does not exist, is not readable by the webserver or is not relative to the document root!	common	de	Verzeichnis existiert nicht, ist nicht vom Webserver lesbar oder ist nicht relative zur Dokumentroot!
 disable internet explorer png-image-bugfix	common	de	Internet Explorer PNG-Bilder-Bugfix abschalten
 disable slider effects	common	de	Schwebeeffekte des Navigationsmenüs abschalten
 disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this.	common	de	Die animierten Schwebeeffekte beim Anzeigen oder Verstecken des navigations Menüs in der Seite abschalten? Benutzer von Opera oder Konquerer müssen diese Funktion abschalten.
+disable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images?	common	de	Ausschalten des Fehlerbehebungsskripts für den Internetexplorer 5.5 und höher, um transparente PNG-Bilder anzuzeigen?
 disabled	common	de	Deaktiviert
 display %s first	jscalendar	de	%s zuerst anzeigen
 djibouti	common	de	DJIBOUTI
@@ -178,13 +211,15 @@ done	common	de	Fertig
 drag to move	jscalendar	de	Ziehen um zu Bewegen
 e-mail	common	de	E-Mail
 east timor	common	de	OST TIMOR
+eastern european	common	de	Östeuropäische
 ecuador	common	de	EQUADOR
 edit	common	de	Editieren
 edit %1 category for	common	de	%1 Kategorie editieren für
 edit categories	common	de	Kategorien editieren
 edit category	common	de	Kategorie editieren
-egroupware api version %1	common	de	eGroupWare API Version %1
-egroupware: login blocked for user '%1', ip %2	common	de	eGroupWare: Anmelden gesperrt für Benutzer '%1', IP %2
+egroupware	common	de	EGroupware
+egroupware api version	common	de	EGroupware API Version
+egroupware: login blocked for user '%1', ip %2	common	de	EGroupware: Anmelden gesperrt für Benutzer '%1', IP %2
 egypt	common	de	ÄGYPTEN
 el salvador	common	de	EL SALVADOR
 email	common	de	E-Mail
@@ -192,8 +227,9 @@ email-address of the user, eg. "%1"	common	de	E-Mail-Adresse des Benutzers, z.B.
 enabled	common	de	Verfügbar
 end date	common	de	Enddatum
 end time	common	de	Endzeit
-enter the location of egroupware's url.<br>example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br><b>no trailing slash</b>	admin	de	Bitte geben Sie die URL ein über welche Ihre eGroupWare erreichbar sein wird.<br>Beispiel: http://www.domain.de/egroupware   or   /egroupware<br><b> KEINEN Slash "/" am ende</b>
+enter the location of egroupware's url.<br>example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br><b>no trailing slash</b>	admin	de	Bitte geben Sie die URL ein über welche Ihre EGroupware erreichbar sein wird.<br>Beispiel: http://www.domain.de/egroupware   or   /egroupware<br><b> KEINEN Slash "/" am ende</b>
 entry has been deleted sucessfully	common	de	Eintrag wurde erfolgreich gelöscht
+entry not found!	common	de	Eintrag nicht gefunden!
 entry updated sucessfully	common	de	Eintrag wurde erfolgreich aktualisiert
 equatorial guinea	common	de	EQUATORIAL GUINEA
 eritrea	common	de	ERITREA
@@ -205,6 +241,7 @@ estonia	common	de	ESTONIEN
 ethiopia	common	de	ETHIOPIEN
 everything	common	de	Alles
 exact	common	de	exakt
+failed to contact server or invalid response from server. try to relogin. contact admin in case of faliure.	common	de	Konnte Server nicht erreichen oder ungültige Antwort vom Server. Versuchen Sie sich nochmals anzumelden. Benachrichtigen Sie Ihren Adminstrator wenn das fehlschlägt.
 falkland islands (malvinas)	common	de	FALKLAND INSELN (MALVINAS)
 faroe islands	common	de	FAROE INSELN
 fax number	common	de	Fax Nummer
@@ -220,7 +257,9 @@ first name of the user, eg. "%1"	common	de	Vorname des Benutzers, zB. "%1"
 first page	common	de	Erste Seite
 firstname	common	de	Vorname
 fixme!	common	de	KORREGIER MICH!
+folder already exists.	common	de	Verzeichnis existiert bereits.
 force selectbox	common	de	Auswahlfeld erzwingen
+forever	common	de	Für immer
 france	common	de	FRANKREICH
 french guiana	common	de	FRANZÖSISCH GUIANA
 french polynesia	common	de	FRANZÖSISCH POLYNESIEN
@@ -228,6 +267,7 @@ french southern territories	common	de	FRENCH SOUTHERN TERRITORIES
 friday	common	de	Freitag
 ftp	common	de	FTP
 fullname	common	de	Vor+Nachname
+fullscreen mode	common	de	Vollbild Modus
 gabon	common	de	GABON
 gambia	common	de	GAMBIA
 general menu	common	de	Hauptmenü
@@ -241,6 +281,7 @@ global public	common	de	Global Public
 go today	jscalendar	de	Heute setzen
 grant access	common	de	Zugriff gewähren
 greece	common	de	GRIECHENLAND
+greek	common	de	Griechisch
 greenland	common	de	GRÖNLAND
 grenada	common	de	GRENADA
 group	common	de	Gruppe
@@ -271,8 +312,12 @@ home email	common	de	private E-Mail
 honduras	common	de	HONDURAS
 hong kong	common	de	HONG KONG
 how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.	common	de	Wie viele Icons sollen in der Navigation angezeigt werden (die obere Nabigation). Weitere Applikationen werden über ein Auswahlmenü angeboten. Das Auswahlmenü kann über das rechte Icon geöffnet werden
+how to show the general egroupware menu ?	common	de	Wie soll das allgemeine EGroupware Menü angezeigt werden
 hungary	common	de	UNGARN
 iceland	common	de	ISLAND
+iespell not detected. click ok to go to download page.	common	de	ieSpell nicht gefunden. OK klicken um zur Download Seite zu gehen.
+if the clock is enabled would you like it to update it every second or every minute?	common	de	Wenn die Uhr eingeschaltet ist, wollen Sie dass sie sekündlich aktualisiert wird?
+if there are some images in the background folder you can choose the one you would like to see.	common	de	Wenn mehrere Bild im Hintergrund Ordner sind können Sie wählen welches Sie sehen wollen.
 image directory relative to document root (use / !), example:	common	de	Bildverzeichnis relative zur Dokumentroot (benutze / !), Beispliel:
 image url	common	de	Bild URL
 india	common	de	INDIEN
@@ -283,6 +328,7 @@ insert column before	common	de	Spalte davor einfügen
 insert row after	common	de	Zeile danach einfügen
 insert row before	common	de	Zeile davor einfügen
 international	common	de	International
+invalid filename	common	de	Ungültiger Dateiname
 invalid ip address	common	de	Ungültige IP Adresse
 invalid password	common	de	Ungültiges Passwort
 iran, islamic republic of	common	de	IRAN, ISLAMISCHE REPUBLIC
@@ -296,8 +342,10 @@ italy	common	de	ITALIEN
 jamaica	common	de	JAMAICA
 january	common	de	Januar
 japan	common	de	JAPAN
+japanese	common	de	Japanisch
 jordan	common	de	JORDANIEN
 july	common	de	Juli
+jun	common	de	Jun
 june	common	de	Juni
 justify center	common	de	Ausrichtung mittig
 justify full	common	de	Ausrichtung im Block
@@ -309,6 +357,7 @@ keywords	common	de	Schlüsselwort
 kiribati	common	de	KIRIBATI
 korea, democratic peoples republic of	common	de	KOREA, DEMOKRATISCHE VOLKSREPUBLIK
 korea, republic of	common	de	KOREA, REPUBLIK
+korean	common	de	Koreanisch
 kuwait	common	de	KUWAIT
 kyrgyzstan	common	de	KYRGYZSTAN
 language	common	de	Sprache
@@ -326,6 +375,8 @@ liberia	common	de	LYBIEN
 libyan arab jamahiriya	common	de	LIBYAN ARAB JAMAHIRIYA
 license	common	de	Lizenz
 liechtenstein	common	de	LIECHTENSTEIN
+line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>	common	de	Zeile %1: '%2'<br /><b>CSV enthalten ##last-check-run## der Tabelle %3 ==> ignoriert</b>
+line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	de	Zeile %1: '%2'<br /><b>CSV haben andere Spaltenanzahl als Tabelle %3 ==> ignoriert</b>
 list	common	de	Liste
 list members	common	de	Mitglieder anzeigen
 lithuania	common	de	LITAUEN
@@ -333,6 +384,8 @@ local	common	de	lokal
 login	common	de	Anmelden
 loginid	common	de	Benutzerkennung
 logout	common	de	Abmelden
+lost login id	common	de	Anmeldenamen vergessen
+lost password	common	de	Anmeldepasswort vergessen
 low	common	de	Niedrig
 lowest	common	de	Niedrigst
 luxembourg	common	de	LUXEMBURG
@@ -361,13 +414,16 @@ menu	common	de	Menü
 message	common	de	Nachricht
 mexico	common	de	MEXICO
 micronesia, federated states of	common	de	MICRONESIEN, VEREINIGTE STAATEN VON
+minute	common	de	Minute
 moldova, republic of	common	de	MOLDAVIEN, REPUBLIK
 monaco	common	de	MONACO
 monday	common	de	Montag
 mongolia	common	de	MONGOLEI
+montenegro	common	de	MONTENEGRO
 montserrat	common	de	MONTSERRA
 morocco	common	de	MAROCCO
 mozambique	common	de	MOZAMBIQUE
+multiple	common	de	mehrere
 myanmar	common	de	MYANMAR
 name	common	de	Name
 name of the user, eg. "%1"	common	de	Name des Benutzers, zB. "%1"
@@ -393,15 +449,20 @@ niue	common	de	NIUE
 no	common	de	Nein
 no entries found, try again ...	common	de	Keine Einträge gefunden, nochmal versuchen ...
 no history for this record	common	de	Keine Historie für diesen Datensatz
+no savant2 template directories were found in:	common	de	Kein Savant2 Vorlagen Verzeichnis gefunden in:
 no subject	common	de	Kein Betreff
 none	common	de	Keine
 norfolk island	common	de	NORFOLK INSELN
 normal	common	de	Normal
 northern mariana islands	common	de	NORTHERN MARIANA ISLANDS
 norway	common	de	NORWEGEN
+not	common	de	nicht
+not a user yet? register now	common	de	Noch kein Benutzer? Registrieren Sie sich jetzt
 not assigned	common	de	nicht zugewiesen
+not readable %1 entry of user %2	common	de	Nicht lesbarer %1 Eintrag des Benutzers %2
 note	common	de	Notiz
 notes	common	de	Notizen
+notifications	common	de	Benachrichtigungen
 notify window	common	de	Benachrichtigungsfenster
 notify your administrator to correct this situation	common	de	Benachrichtigen Sie Ihren Administration um diese Situation zu lösen
 november	common	de	November
@@ -413,8 +474,10 @@ on *nix systems please type: %1	common	de	Auf *nix systemen bitte %1 eingeben
 on mouse over	common	de	On Maus Over
 only private	common	de	nur private
 only yours	common	de	nur eigene
+oops! you caught us in the middle of system maintainance.	common	de	Hoppla! Sie haben uns in der Mitte einer Systemwartung erwischt.
 open notify window	common	de	Benachrichtigungsfenster öffnen
 open popup window	common	de	Popup Fenster öffnen
+open sidebox	common	de	Seitenmenü öffnen
 ordered list	common	de	Nummerierung
 original	common	de	Original
 other	common	de	Andere
@@ -439,12 +502,13 @@ password must contain at least %1 special characters	common	de	Das Passwort muss
 password must contain at least %1 uppercase letters	common	de	Das Passwort muss mindestens %1 Großbuchstaben enthalten
 password must have at least %1 characters	common	de	Das Passwort muss mindestens %1 Zeichen lang sein
 path to user and group files has to be outside of the webservers document-root!!!	common	de	Der Pfad für Benutzer oder Gruppen Ordner muss ausserhalb des Webserver Root Verzeichnisses liegen (Webserver Root = /var/www/html; Pfad für Benutzer/Gruppen Ordner /var/www
+permission denied!	common	de	Zugriff verweigert!
 permissions to the files/users directory	common	de	Zugriffsrechte zu den Dateien / Benutzerverzeichnissen
 personal	common	de	persönlich
 peru	common	de	PERU
 philippines	common	de	PHILIPPINEN
 phone number	common	de	Telefonnummer
-phpgwapi	common	de	eGroupWare API
+phpgwapi	common	de	EGroupware API
 pitcairn	common	de	PITCAIRN
 please %1 by hand	common	de	Bitte %1 per Hand
 please enter a name	common	de	Bitte geben Sie einen Namen ein !
@@ -453,11 +517,12 @@ please select	common	de	Bitte wählen
 please set your global preferences	common	de	Bitte editieren Sie Ihre globalen Einstellungen !
 please set your preferences for this application	common	de	Bitte editieren Sie Ihre Einstellungen für diese Anwendung !
 please wait...	common	de	Bitte warten...
+please, check back with us shortly.	common	de	Bitte schauen Sie bald wieder vorbei.
 poland	common	de	POLEN
 portugal	common	de	PORTUGAL
 postal	common	de	Postadresse
 powered by	common	de	Powered by
-powered by egroupware version %1	common	de	Powered by <a href="http://www.egroupware.org" target="_blank">eGroupWare</a> version %1
+powered by egroupware version %1	common	de	Powered by <a href="http://www.egroupware.org" target="_blank">EGroupware</a> version %1
 preferences	common	de	Einstellungen
 preferences for the idots template set	common	de	Einstellungen für das Idots Template
 prev. month (hold for menu)	jscalendar	de	Vorheriger Monat (halten für Menü)
@@ -467,15 +532,20 @@ primary style-sheet:	common	de	Haupt-Stylesheet:
 print	common	de	Drucken
 priority	common	de	Priorität
 private	common	de	Privat
+programs	common	de	Programme
 project	common	de	Projekt
 public	common	de	öffentlich
 puerto rico	common	de	PUERTO RICO
 qatar	common	de	QATAR
 read	common	de	Lesen
 read this list of methods.	common	de	Diese Liste der Methoden lesen.
+reading	common	de	lesen
+register	common	de	Registieren
 regular	common	de	Normal
 reject	common	de	Zurückweisen
+remember me	common	de	Mich erinnern
 remove selected accounts	common	de	Ausgewähle Benutzer entfernen
+remove shortcut	common	de	Abkürzung entfernen
 rename	common	de	Umbenennen
 replace	common	de	Ersetzen
 replace with	common	de	Ersetzem durch
@@ -485,6 +555,7 @@ returns struct of users application access	common	de	Liefert Strucktur mit Benut
 reunion	common	de	REUNION
 right	common	de	Rechts
 romania	common	de	RUMÄNIEN
+russian	common	de	Russisch
 russian federation	common	de	RUSSISCHE FÖDERATION
 rwanda	common	de	RWANDA
 saint helena	common	de	SANKT HELENA
@@ -497,10 +568,13 @@ san marino	common	de	SAN MARINO
 sao tome and principe	common	de	SAO TOME AND PRINCIPE
 saturday	common	de	Samstag
 saudi arabia	common	de	SAUDI ARABIEN
+savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants version: %2	common	de	Savant2 Version unterscheidet sich von Savant2 Wrapper<br />Diese Version: %1<br />Savant version: %2
 save	common	de	Speichern
 search	common	de	Suchen
 search %1 '%2'	common	de	Suche %1 '%2'
 search accounts	common	de	Benutzer suchen
+search or select accounts	common	de	Suchen und auswählen von Benutzern
+second	common	de	Sekunden
 section	common	de	Sektion
 select	common	de	Auswählen
 select all %1 %2 for %3	common	de	Alles auswählen %1 %2 von %3
@@ -510,13 +584,18 @@ select group	common	de	Gruppe auswählen
 select home email address	common	de	private E-Mail-Adresse auswählen
 select multiple accounts	common	de	mehrere Benutzer auswählen
 select one	common	de	Eine(n) auswählen
+select the default height for the application windows	common	de	Vorgabewert für Höhe des Anwendungsfensters auswählen
+select the default width for the application windows	common	de	Vorgabewert für Breite des Anwendungsfensters auswählen
 select user	common	de	Benutzer auswählen
 select work email address	common	de	geschäftl. E-Mail-Addresse auswählen
 selection	common	de	Auswahl
 send	common	de	Abschicken
 senegal	common	de	SENEGAL
 september	common	de	September
+serbia	common	de	SERBIEN
 server %1 has been added	common	de	Server %1 wurde zugefügt
+server answered. processing response...	common	de	Server antwortet. Bearbeite Antwort...
+server contacted. waiting for response...	common	de	Server kontaktiert. Warte auf Antwort...
 server name	common	de	Server Name
 session has been killed	common	de	Session wurde gelöscht
 setup	common	de	Setup
@@ -524,9 +603,16 @@ setup main menu	common	de	Setup Hauptmenü
 seychelles	common	de	SEYCHELLEN
 show all	common	de	alle anzeigen
 show all categorys	common	de	Alle Kategorien anzeigen
+show as topmenu	common	de	Menü oben anzeigen
+show clock?	common	de	Uhr anzeigen?
+show home and logout button in main application bar?	common	de	Zeige Start und Abmelde Knopf in Hauptnavigation Balken?
+show in sidebox	common	de	In Seitenmenü anzeigen
+show logo's on the desktop.	common	de	Logos auf der Arbeitsfläche anzeigen.
 show menu	common	de	Menü anzeigen
 show page generation time	common	de	Zeit zum Erstellen der Seite anzeigen
 show page generation time on the bottom of the page?	common	de	Zeit zum Erstellen der Seite in der Fußzeile anzeigen
+show page generation time?	common	de	Erstellungszeit der Seite anzeigen?
+show the logo's of egroupware and x-desktop on the desktop.	common	de	Zeige Logos von EGroupware und x-desktop auf der Arbeitsfläche.
 show_more_apps	common	de	Mehr Applikationen anzeigen
 showing %1	common	de	%1 Einträge
 showing %1 - %2 of %3	common	de	%1 - %2 von %3 Einträgen
@@ -546,7 +632,9 @@ sri lanka	common	de	SRI LANKA
 start date	common	de	Startdatum
 start time	common	de	Startzeit
 start with	common	de	beginnt mit
+starting up...	common	de	Starte...
 status	common	de	Status
+stretched	common	de	ausgedehnt
 subject	common	de	Betreff
 submit	common	de	Absenden
 substitutions and their meanings:	common	de	Ersetzungen und ihre Bedeutung
@@ -572,6 +660,7 @@ this application is current	common	de	Diese Anwendung ist aktuell
 this application requires an upgrade	common	de	Diese Anwendung benötigt eine Aktualisierung
 this name has been used already	common	de	Dieser Name ist bereits in Benutzung !
 thursday	common	de	Donnerstag
+tiled	common	de	gekachelt
 time	common	de	Zeit
 time selection:	jscalendar	de	Zeitauswahl:
 time zone	common	de	Zeitzone
@@ -589,6 +678,7 @@ tonga	common	de	TONGA
 too many unsucessful attempts to login: %1 for the user '%2', %3 for the ip %4	common	de	Zu viele ungültige Versuche sich anzumelden: %1 für den Benutzer '%2', %3 für die IP %4
 top	common	de	Oben
 total	common	de	Gesamt
+transparant bg for the icons?	common	de	Transparenter Hintergrund für Symbole
 trinidad and tobago	common	de	TRINIDAD AND TOBAGO
 tuesday	common	de	Dienstag
 tunisia	common	de	TUNISIEN
@@ -596,6 +686,7 @@ turkey	common	de	TÃœRKEI
 turkmenistan	common	de	TURKMENISTAN
 turks and caicos islands	common	de	TURKS AND CAICOS ISLANDS
 tuvalu	common	de	TUVALU
+type	common	de	Typ
 uganda	common	de	UGANDA
 ukraine	common	de	UKRAINE
 underline	common	de	Unterstrichen
@@ -605,6 +696,7 @@ united states	common	de	VEREINIGTE STAATEN VON AMERIKA
 united states minor outlying islands	common	de	UNITED STATES MINOR OUTLYING ISLANDS
 unknown	common	de	Unbekannt
 update	common	de	Aktualisieren
+update the clock per minute or per second	common	de	Uhr minütlich oder sekündlich aktualisieren
 upload	common	de	Hochladen
 upload directory does not exist, or is not writeable by webserver	common	de	Das Verzeichnis zum Hochladen existiert nicht oder ist nicht vom Webserver beschreibbar.
 upload requires the directory to be writable by the webserver!	common	de	Der Upload verlangt, dass das Verzeich vom Webserver beschreibbar ist!
@@ -631,11 +723,18 @@ virgin islands, u.s.	common	de	VIRGIN ISLANDS, U.S.
 wallis and futuna	common	de	WALLIS AND FUTUNA
 wednesday	common	de	Mittwoch
 welcome	common	de	Willkommen
+western european	common	de	Westeuropäisch
 western sahara	common	de	WEST SAHARA
+what color should all the blank space on the desktop have	common	de	Welche Farbe soll der freie Platz auf der Arbeitsfläche haben
+what style would you like the image to have?	common	de	Welchen Stil soll das Bild haben?
+when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	de	Wenn Sie das einschalten werden die Start und Abmelde Symbole als Anwendungen im oberen Anwendungsbalken angezeigt.
+where and how will the egroupware links like preferences, about and logout be displayed.	common	de	Wo und wie werden die EGroupware Verknüpfungen wie Einstellungen, Über ..., und Abmelden angezeigt.
 which groups	common	de	Welche Gruppen
 width	common	de	Breite
 wk	jscalendar	de	KW
 work email	common	de	geschäftliche E-Mail
+would you like to display the page generation time at the bottom of every window?	common	de	Wollen Sie die Zeit zur Erstellung der Seite am Ende jedes Fensters anzeigen?
+writing	common	de	schreiben
 written by:	common	de	Geschrieben von:
 year	common	de	Jahr
 yemen	common	de	YEMEN
@@ -651,6 +750,8 @@ you have selected an invalid date	common	de	Sie haben ein ungültiges Datum gew
 you have selected an invalid main category	common	de	Sie haben eine ungültige Hauptkategorie gewählt !
 you have successfully logged out	common	de	Sie haben sich erfolgreich abgemeldet
 you need to add the webserver user '%1' to the group '%2'.	common	de	Sie müssen den Webserver-User '%1' zur Gruppe '%2' hinzufügen.
+you need to be an egroupware administrator to access this functionality!	common	de	Sie müssen ein EGroupware administrator sein, um auf diese Funktion zuzugreifen!
+you've tried to open the egroupware application: %1, but you have no permission to access this application.	common	de	Sie haben versucht auf die EGroupware Anwendung %1 zuzugreifen, aber Sie haben keine Rechte dazu.
 your message could <b>not</b> be sent!<br>	common	de	Ihre Nachricht konnte <b>nicht</b> gesendet werden!<br>
 your message has been sent	common	de	Ihre Nachricht wurde versandt
 your search returned %1 matchs	common	de	Ihre Suche ergab %1 Treffer
@@ -659,3 +760,4 @@ your session could not be verified.	login	de	Ihre Sitzung konnte nicht verifizie
 your settings have been updated	common	de	Ihre Einstellungen wurden aktualisiert
 zambia	common	de	ZAMBIA
 zimbabwe	common	de	ZIMBABWE
+zoom	common	de	Zoomen

From fc141457cf01b27eebdaaaeaa29280aefc958026 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 08:10:05 +0000
Subject: [PATCH 304/510] added translated languages and visible charset to
 charset selection

---
 phpgwapi/inc/class.translation.inc.php | 16 ++++++++--------
 phpgwapi/setup/egw_en.lang             | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 7865d14bd2..65f1697126 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -437,14 +437,14 @@ class translation
 		if (!isset($charsets))
 		{
 			$charsets = array(
-				'utf-8'      => lang('all languages'),
-				'iso-8859-1' => 'Western european',
-				'iso-8859-2' => 'Eastern european',
-				'iso-8859-7' => 'Greek',
-				'euc-jp'     => 'Japanese',
-				'euc-kr'     => 'Korean',
-				'koi8-r'     => 'Russian',
-				'windows-1251' => 'Bulgarian',
+				'utf-8'      => lang('all languages').' (utf-8)',
+				'iso-8859-1' => lang('Western european').' (iso-8859-1)',
+				'iso-8859-2' => lang('Eastern european').' (iso-8859-2)',
+				'iso-8859-7' => lang('Greek').' (iso-8859-7)',
+				'euc-jp'     => lang('Japanese').' (euc-jp)',
+				'euc-kr'     => lang('Korean').' (euc-kr)',
+				'koi8-r'     => lang('Russian').' (koi8-r)',
+				'windows-1251' => lang('Bulgarian').' (windows-1251)',
 			);
 		}
 		return $charsets;
diff --git a/phpgwapi/setup/egw_en.lang b/phpgwapi/setup/egw_en.lang
index 8ea59f5250..e52071f14a 100644
--- a/phpgwapi/setup/egw_en.lang
+++ b/phpgwapi/setup/egw_en.lang
@@ -1,7 +1,6 @@
 %1 email addresses inserted	common	en	%1 email addresses inserted
+%1 file	common	en	%1 file
 %1 is not executable by the webserver !!!	common	en	%1 is not executable by the webserver !!!
-%1 manual	common	en	%1 manual
-%1 start	common	en	%1 start
 %1choose an other directory%2<br />or make %3 writeable by webserver	common	en	%1Choose an other directory%2<br />or make %3 writeable by webserver
 %1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4.	common	en	%1eGroupWare%2 is a multi-user, web-based groupware suite written in %3PHP%4.
 (session restored in %1 seconds)	common	en	(session restored in %1 seconds)
@@ -48,6 +47,7 @@ albania	common	en	ALBANIA
 algeria	common	en	ALGERIA
 all	common	en	All
 all fields	common	en	all fields
+all languages	common	en	all languages
 alphabet	common	en	a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
 alternate style-sheet:	common	en	Alternate style-sheet:
 american samoa	common	en	AMERICAN SAMOA
@@ -104,6 +104,7 @@ brazil	common	en	BRAZIL
 british indian ocean territory	common	en	BRITISH INDIAN OCEAN TERRITORY
 brunei darussalam	common	en	BRUNEI DARUSSALAM
 bulgaria	common	en	BULGARIA
+bulgarian	common	en	Bulgarian
 burkina faso	common	en	BURKINA FASO
 burundi	common	en	BURUNDI
 calendar	common	en	Calendar
@@ -188,6 +189,7 @@ detail	common	en	Detail
 details	common	en	Details
 diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images?	common	en	Diable the execution a bugfixscript for Internet Explorer 5.5 and higher to show transparency in PNG-images?
 direction left to right	common	en	Direction left to right
+directory	common	en	Directory
 directory does not exist, is not readable by the webserver or is not relative to the document root!	common	en	Directory does not exist, is not readable by the webserver or is not relative to the document root!
 disable internet explorer png-image-bugfix	common	en	Disable Internet Explorer png-image-bugfix
 disable slider effects	common	en	Disable slider effects
@@ -209,6 +211,7 @@ done	common	en	Done
 drag to move	jscalendar	en	Drag to move
 e-mail	common	en	E-Mail
 east timor	common	en	EAST TIMOR
+eastern european	common	en	Eastern european
 ecuador	common	en	ECUADOR
 edit	common	en	Edit
 edit %1 category for	common	en	Edit %1 category for
@@ -216,7 +219,6 @@ edit categories	common	en	Edit Categories
 edit category	common	en	Edit category
 egroupware	common	en	eGroupWare
 egroupware api version	common	en	eGroupWare API version
-egroupware api version %1	common	en	eGroupWare API version %1
 egroupware: login blocked for user '%1', ip %2	common	en	eGroupWare: login blocked for user '%1', IP %2
 egypt	common	en	EGYPT
 el salvador	common	en	EL SALVADOR
@@ -279,6 +281,7 @@ global public	common	en	Global Public
 go today	jscalendar	en	Go Today
 grant access	common	en	Grant Access
 greece	common	en	GREECE
+greek	common	en	Greek
 greenland	common	en	GREENLAND
 grenada	common	en	GRENADA
 group	common	en	Group
@@ -339,6 +342,7 @@ italy	common	en	ITALY
 jamaica	common	en	JAMAICA
 january	common	en	January
 japan	common	en	JAPAN
+japanese	common	en	Japanese
 jordan	common	en	JORDAN
 july	common	en	July
 jun	common	en	Jun
@@ -353,6 +357,7 @@ keywords	common	en	Keywords
 kiribati	common	en	KIRIBATI
 korea, democratic peoples republic of	common	en	KOREA, DEMOCRATIC PEOPLES REPUBLIC OF
 korea, republic of	common	en	KOREA, REPUBLIC OF
+korean	common	en	Korean
 kuwait	common	en	KUWAIT
 kyrgyzstan	common	en	KYRGYZSTAN
 language	common	en	Language
@@ -371,6 +376,7 @@ liberia	common	en	LIBERIA
 libyan arab jamahiriya	common	en	LIBYAN ARAB JAMAHIRIYA
 license	common	en	License
 liechtenstein	common	en	LIECHTENSTEIN
+line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>	common	en	Line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	en	Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>
 list	common	en	List
 list members	common	en	List members
@@ -499,7 +505,6 @@ password must have at least %1 characters	common	en	Password must have at least
 path to user and group files has to be outside of the webservers document-root!!!	common	en	Path to user and group files HAS TO BE OUTSIDE of the webservers document-root!!!
 permission denied!	common	en	Permission denied!
 permissions to the files/users directory	common	en	permissions to the files/users directory
-permisson denied!	common	en	Permisson denied!
 personal	common	en	Personal
 peru	common	en	PERU
 philippines	common	en	PHILIPPINES
@@ -551,6 +556,7 @@ returns struct of users application access	common	en	Returns struct of users app
 reunion	common	en	REUNION
 right	common	en	Right
 romania	common	en	ROMANIA
+russian	common	en	Russian
 russian federation	common	en	RUSSIAN FEDERATION
 rwanda	common	en	RWANDA
 saint helena	common	en	SAINT HELENA
@@ -614,6 +620,7 @@ showing %1 - %2 of %3	common	en	showing %1 - %2 of %3
 sierra leone	common	en	SIERRA LEONE
 simple	common	en	Simple
 singapore	common	en	SINGAPORE
+site configuration	common	en	Site configuration
 slovakia	common	en	SLOVAKIA
 slovenia	common	en	SLOVENIA
 solomon islands	common	en	SOLOMON ISLANDS
@@ -703,7 +710,6 @@ use button to search for project	common	en	use Button to search for Project
 user	common	en	User
 user accounts	common	en	user accounts
 user groups	common	en	user groups
-user openinstance	common	en	User Openinstance
 username	common	en	Username
 users	common	en	users
 users choice	common	en	Users Choice
@@ -718,6 +724,7 @@ virgin islands, u.s.	common	en	VIRGIN ISLANDS, U.S.
 wallis and futuna	common	en	WALLIS AND FUTUNA
 wednesday	common	en	Wednesday
 welcome	common	en	Welcome
+western european	common	en	Western european
 western sahara	common	en	WESTERN SAHARA
 what color should all the blank space on the desktop have	common	en	What color should all the blank space on the desktop have
 what style would you like the image to have?	common	en	What style would you like the image to have?
@@ -755,4 +762,3 @@ your settings have been updated	common	en	Your settings have been Updated
 zambia	common	en	ZAMBIA
 zimbabwe	common	en	ZIMBABWE
 zoom	common	en	Zoom
-site configuration	common	en	Site configuration

From 7209eac4301473f497c637cef365e27b29058353 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 08:11:08 +0000
Subject: [PATCH 305/510] calling translation class static and remove
 (unnecessary) extra utf-8 charset

---
 addressbook/csv_import.php | 10 ++++------
 calendar/csv_import.php    | 18 +++++++++---------
 infolog/csv_import.php     | 20 ++++++++++----------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index 066f4200f1..06e38080bc 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -119,9 +119,7 @@ switch($_POST['action'])
 		$GLOBALS['egw']->template->set_var('lang_fieldsep',lang('Fieldseparator'));
 		$GLOBALS['egw']->template->set_var('lang_charset',lang('Charset of file'));
 		$GLOBALS['egw']->template->set_var('select_charset',
-			html::select('charset','',
-			$GLOBALS['egw']->translation->get_installed_charsets()+
-			array('utf-8' => 'utf-8 (Unicode)'),True));
+			html::select('charset','',translation::get_installed_charsets(),True));
 		$GLOBALS['egw']->template->set_var('fieldsep',$_POST['fieldsep'] ? $_POST['fieldsep'] : ';');
 		$GLOBALS['egw']->template->set_var('submit',lang('Import'));
 		$GLOBALS['egw']->template->set_var('csvfile',$csvfile);
@@ -163,7 +161,7 @@ switch($_POST['action'])
 			$addr_name_options .= "<option value=\"$field\">".$GLOBALS['egw']->strip_html($name)."\n";
 		}
 		$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-		$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
+		$csv_fields = translation::convert($csv_fields,$_POST['charset']);
 		$csv_fields[] = 'no CSV 1'; // eg. for static assignments
 		$csv_fields[] = 'no CSV 2';
 		$csv_fields[] = 'no CSV 3';
@@ -251,7 +249,7 @@ switch($_POST['action'])
 		ini_set('auto_detect_line_endings',true);	// to allow to import files created eg. on a mac
 		$fp=fopen($csvfile,'r');
 		$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-		$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
+		$csv_fields = translation::convert($csv_fields,$_POST['charset']);
 		$csv_fields[] = 'no CSV 1'; // eg. for static assignments
 		$csv_fields[] = 'no CSV 2';
 		$csv_fields[] = 'no CSV 3';
@@ -316,7 +314,7 @@ switch($_POST['action'])
 			{
 				break;	// EOF
 			}
-			$fields = $GLOBALS['egw']->translation->convert($fields,$_POST['charset']);
+			$fields = translation::convert($fields,$_POST['charset']);
 
 			$log .= "\t</tr><tr><td>".($start+$anz)."</td>\n";
 
diff --git a/calendar/csv_import.php b/calendar/csv_import.php
index f79a560323..317f793db4 100644
--- a/calendar/csv_import.php
+++ b/calendar/csv_import.php
@@ -10,9 +10,11 @@
  * @version $Id$
  */
 
-$GLOBALS['egw_info']['flags'] = array(
-	'currentapp' => 'calendar',
-	'noheader'   => True
+$GLOBALS['egw_info'] = array(
+	'flags' => array(
+		'currentapp' => 'calendar',
+		'noheader'   => True
+	),
 );
 include('../header.inc.php');
 
@@ -137,9 +139,7 @@ case '':	// Start, ask Filename
 	$GLOBALS['egw']->template->set_var('lang_charset',lang('Charset of file'));
 	$GLOBALS['egw']->template->set_var('lang_help',lang('Please note: You can configure the field assignments AFTER you uploaded the file.'));
 	$GLOBALS['egw']->template->set_var('select_charset',
-		html::select('charset','',
-		$GLOBALS['egw']->translation->get_installed_charsets()+
-		array('utf-8' => 'utf-8 (Unicode)'),True));
+		html::select('charset','',translation::get_installed_charsets(),True));
 	$GLOBALS['egw']->template->set_var('fieldsep',$_POST['fieldsep'] ? $_POST['fieldsep'] : ';');
 	$GLOBALS['egw']->template->set_var('submit',lang('Import'));
 	$GLOBALS['egw']->template->set_var('enctype','ENCTYPE="multipart/form-data"');
@@ -201,7 +201,7 @@ case 'download':
 		$cal_name_options .= "<option value=\"$field\">".$GLOBALS['egw']->strip_html($name)."\n";
 	}
 	$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-	$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
+	$csv_fields = translation::convert($csv_fields,$_POST['charset']);
 	$csv_fields[] = 'no CSV 1';					// eg. for static assignments
 	$csv_fields[] = 'no CSV 2';
 	$csv_fields[] = 'no CSV 3';
@@ -290,7 +290,7 @@ case 'import':
 	@set_time_limit(0);
 	$fp=fopen($csvfile,'r');
 	$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-	$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
+	$csv_fields = translation::convert($csv_fields,$_POST['charset']);
 	$csv_fields[] = 'no CSV 1';						// eg. for static assignments
 	$csv_fields[] = 'no CSV 2';
 	$csv_fields[] = 'no CSV 3';
@@ -359,7 +359,7 @@ case 'import':
 		{
 			break;	// EOF
 		}
-		$fields = $GLOBALS['egw']->translation->convert($fields,$_POST['charset']);
+		$fields = translation::convert($fields,$_POST['charset']);
 
 		$log .= "\t<tr>\n\t\t<td>".($start+$anz)."</td>\n";
 
diff --git a/infolog/csv_import.php b/infolog/csv_import.php
index 30110ac94d..d7fdab1897 100644
--- a/infolog/csv_import.php
+++ b/infolog/csv_import.php
@@ -10,10 +10,12 @@
  * @version $Id$
  */
 
-$GLOBALS['egw_info']['flags'] = array(
-	'currentapp' => 'infolog',
-	'noheader'   => True,
-	'enable_contacts_class' => True,
+$GLOBALS['egw_info'] = array(
+	'flags' => array(
+		'currentapp' => 'infolog',
+		'noheader'   => True,
+		'enable_contacts_class' => True,
+	),
 );
 include('../header.inc.php');
 
@@ -171,9 +173,7 @@ case '':	// Start, ask Filename
 	$GLOBALS['egw']->template->set_var('lang_fieldsep',lang('Fieldseparator'));
 	$GLOBALS['egw']->template->set_var('lang_charset',lang('Charset of file'));
 	$GLOBALS['egw']->template->set_var('select_charset',
-		html::select('charset','',
-		$GLOBALS['egw']->translation->get_installed_charsets()+
-		array('utf-8' => 'utf-8 (Unicode)'),True));
+		html::select('charset','',translation::get_installed_charsets(),True));
 	$GLOBALS['egw']->template->set_var('fieldsep',$_POST['fieldsep'] ? $_POST['fieldsep'] : ';');
 	$GLOBALS['egw']->template->set_var('submit',lang('Import'));
 	$GLOBALS['egw']->template->set_var('enctype','ENCTYPE="multipart/form-data"');
@@ -259,7 +259,7 @@ case 'download':
 		$info_name_options .= "<option value=\"$field\">".$GLOBALS['egw']->strip_html($name)."\n";
 	}
 	$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-	$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
+	$csv_fields = translation::convert($csv_fields,$_POST['charset']);
 	$csv_fields[] = 'no CSV 1'; 						// eg. for static assignments
 	$csv_fields[] = 'no CSV 2';
 	$csv_fields[] = 'no CSV 3';
@@ -349,7 +349,7 @@ case 'import':
 	@set_time_limit(0);
 	$fp=fopen($csvfile,'r');
 	$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-	$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
+	$csv_fields = translation::convert($csv_fields,$_POST['charset']);
 	$csv_fields[] = 'no CSV 1'; 						// eg. for static assignments
 	$csv_fields[] = 'no CSV 2';
 	$csv_fields[] = 'no CSV 3';
@@ -413,7 +413,7 @@ case 'import':
 		{
 			break;	// EOF
 		}
-		$fields = $GLOBALS['egw']->translation->convert($fields,$_POST['charset']);
+		$fields = translation::convert($fields,$_POST['charset']);
 
 		$log .= "\t</tr><tr><td>".($start+$anz)."</td>\n";
 

From 1585a36fdf6df165409481887c7333d1018cd011 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 09:19:16 +0000
Subject: [PATCH 306/510] used&planned time or used,planned&replanned time
 incl. icons

---
 infolog/inc/class.infolog_ui.inc.php |  4 ++--
 infolog/setup/etemplates.inc.php     |  8 +++++---
 infolog/templates/default/index.xet  | 30 ++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 343fa3901d..5cfab4cfbb 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -337,12 +337,12 @@ class infolog_ui
 		if ($details)
 		{
 			$query['columnselection_pref'] = (is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details';
-			$query['default_cols'] = '!cat_id,info_used_time_info_planned_time_info_replanned_time,info_id';
+			$query['default_cols'] = '!cat_id,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
 		}
 		else
 		{
 			$query['columnselection_pref'] = 'infolog.index.rows';
-			$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time_info_replanned_time,info_id';
+			$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
 		}
 		// set old show_times pref, that get_info calculates the cumulated time of the timesheets
 		$this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time_info_replanned_time') !== false;
diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index cee73d9102..b32dfe0430 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-08 17:55
+	* generated by soetemplate::dump4setup() 2009-05-11 11:18
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -99,6 +99,8 @@ $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','g
 
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1223355813',);
 
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1242033158',);
+
 $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:16:",headertext bold";s:5:"label";s:7:"InfoLog";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:8:",,0,,0,0";}}','size' => ',,0,,0,0','style' => '.bold { font-weight: bold; }','modified' => '1056876864',);
 
 $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"span";s:16:",headertext bold";s:5:"label";s:7:"InfoLog";}}','size' => ',,0,,0,0','style' => '.bold { font-weight: bold; }','modified' => '1056876864',);
@@ -127,7 +129,7 @@ $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401028',);
 
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:8:",infoDes";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"parent";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401028',);
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:34:"8%,@no_info_owner_info_responsible";s:1:"I";s:3:"12%";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";s:1:"K";s:14:"3%,@no_actions";}i:1;a:11:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"I";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"K";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:11:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:8:",infoDes";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"I";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"J";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"parent";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"K";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:11;}}','size' => '','style' => '','modified' => '1240401028',);
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
 
@@ -137,7 +139,7 @@ $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
 
-$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1240401005',);
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"F";s:37:",@no_info_used_time_info_planned_time";s:1:"G";s:34:"8%,@no_info_onwer_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:25:"12%,@no_info_datemodified";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";s:1:"J";s:14:"3%,@no_actions";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401005',);
 
 $templ_data[] = array('name' => 'infolog.Lebert.Baienfurt.Kopf','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:17:"Lebert + Co. GmbH";s:4:"span";s:11:",my_heading";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:23:"International Spedition";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Eisenbahnstrasse 4";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"88255 Baienfurt";}}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:8:"logo.png";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:14:"100%,,,my_form";s:7:"options";a:2:{i:3;s:7:"my_form";i:0;s:4:"100%";}}}','size' => '100%,,,my_form','style' => '.xmy_form td { font-size: 20pt; }
 .my_heading { font-size: 120%; font-weight: bold; }','modified' => '1158752011',);
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 6594f829f9..3cd4b1d471 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -14,12 +14,13 @@
 		</hbox>
 	</template>
 	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.001">
-		<grid width="100%" class="my_form">
+		<grid>
 			<columns>
 				<column width="2%"/>
 				<column/>
 				<column disabled="@no_customfields"/>
 				<column width="120"/>
+				<column/>
 				<column disabled="@no_info_used_time_info_planned_time"/>
 				<column width="8%" disabled="@no_info_onwer_info_responsible"/>
 				<column width="12%" disabled="@no_info_datemodified"/>
@@ -58,6 +59,10 @@
 					<vbox>
 						<description value="Times"/>
 						<description class="planned" value="planned"/>
+					</vbox>
+					<vbox options="0,0">
+						<description value="Times"/>
+						<description class="planned" value="planned"/>
 						<description class="replanned" value="Re-planned"/>
 					</vbox>
 					<vbox>
@@ -91,13 +96,17 @@
 						<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
 					</vbox>
 					<vbox rows="3" cols="1">
+						<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+						<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
+					</vbox>
+					<vbox rows="3" cols="1" options="0,0">
 						<hbox options="1,0" id="l_used_time">
 							<image label="Times" src="timesheet"/>
 							<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
 							<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
 						</hbox>
 						<hbox options="1,0" id="lplanified">
-							<image label="planned time" src="k_alarm.png" readonly="true"/>
+							<image label="planned time" src="k_alarm.png"/>
 							<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
 						</hbox>
 						<hbox options="1,0" id="replanified">
@@ -149,6 +158,7 @@
 				<column/>
 				<column width="120"/>
 				<column/>
+				<column/>
 				<column width="8%" disabled="@no_info_owner_info_responsible"/>
 				<column width="12%"/>
 				<column width="3%" disabled="@no_actions"/>
@@ -188,7 +198,11 @@
 						<nextmatch-sortheader label="Enddate" id="info_enddate"/>
 						<nextmatch-sortheader id="info_datecompleted" label="Date completed"/>
 					</vbox>
-					<vbox rows="2" cols="1" options="2">
+					<vbox rows="2" cols="1">
+						<nextmatch-sortheader label="Times" id="info_used_time"/>
+						<nextmatch-sortheader id="info_planned_time" class="planned" label="planned"/>
+					</vbox>
+					<vbox rows="2" cols="1" options="0,0">
 						<nextmatch-sortheader label="Times" id="info_used_time"/>
 						<nextmatch-sortheader id="info_planned_time" class="planned" label="planned"/>
 						<nextmatch-sortheader id="info_replanned_time" class="replanned" label="Re-planned"/>
@@ -228,14 +242,18 @@
 						<date class="$row_cont[end_class] fixedHeight" id="${row}[info_enddate]" readonly="true"/>
 						<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
 					</vbox>
-					<vbox rows="3" cols="1">
+					<vbox rows="3" cols="1" options="0,0">
+						<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+						<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
+					</vbox>
+					<vbox rows="3" cols="1" options="0,0">
 						<hbox options="1,0" id="r_used_time">
 							<image label="Times" src="timesheet"/>
 							<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
 							<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
 						</hbox>
 						<hbox options="1,0" id="planified">
-							<image label="planned time" src="k_alarm.png" readonly="true"/>
+							<image label="planned time" src="k_alarm.png"/>
 							<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
 						</hbox>
 						<hbox options="1,0" id="replanified">
@@ -276,7 +294,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.index" template="" lang="" group="0" version="1.5.004">
+	<template id="infolog.index" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="90%"/>

From 4cd23bd2e483f39275c9fd8b86efa8292292a517 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 14:43:34 +0000
Subject: [PATCH 307/510] "fixed filemanger bug: deleting a symlink to an
 directory, deletes not just the symlink but the whole directory"

---
 filemanager/inc/class.filemanager_ui.inc.php | 38 +++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 6004383d68..0a0dea8707 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -403,19 +403,39 @@ class filemanager_ui
 		{
 			case 'delete':
 				$dirs = $files = $errs = 0;
-				foreach(egw_vfs::find($selected,array('depth'=>true)) as $path)
+				// we first delete all selected links (and files)
+				// feeding the links to dirs to egw_vfs::find() deletes the content of the dirs, not just the link!
+				foreach($selected as $key => $path)
 				{
-					if (($is_dir = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)) && egw_vfs::rmdir($path,0))
+					if (!egw_vfs::is_dir($path) || egw_vfs::is_link($path))
 					{
-						++$dirs;
+						if (egw_vfs::unlink($path))
+						{
+							++$files;
+						}
+						else
+						{
+							++$errs;
+						}
+						unset($selected[$key]);
 					}
-					elseif (!$is_dir && egw_vfs::unlink($path))
+				}
+				if ($selected)	// somethings left to delete
+				{
+					foreach(egw_vfs::find($selected,array('depth'=>true)) as $path)
 					{
-						++$files;
-					}
-					else
-					{
-						++$errs;
+						if (($is_dir = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)) && egw_vfs::rmdir($path,0))
+						{
+							++$dirs;
+						}
+						elseif (!$is_dir && egw_vfs::unlink($path))
+						{
+							++$files;
+						}
+						else
+						{
+							++$errs;
+						}
 					}
 				}
 				if ($errs)

From 85def60ffa7f62423e702cba4857bd3811ec64a9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 20:42:23 +0000
Subject: [PATCH 308/510] "option to ignore hidden files (name starts with a
 '.' or is 'Thumbs.db'), default is now to ignore them"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index bf6142e85a..73fca9eca9 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -328,6 +328,7 @@ class egw_vfs extends vfs_stream_wrapper
 	 * - sort => (ASC|DESC) sort, default ASC
 	 * - limit => N,[n=0] return N entries from position n on, which defaults to 0
 	 * - follow => {true|false(default)} follow symlinks
+	 * - hidden => {true|false(default)} include hidden files (name starts with a '.' or is Thumbs.db)
 	 * @param string/array/true $exec=null function to call with each found file/dir as first param and stat array as last param or
 	 * 	true to return file => stat pairs
 	 * @param array $exec_params=null further params for exec as array, path is always the first param and stat the last!
@@ -403,6 +404,8 @@ class egw_vfs extends vfs_stream_wrapper
 				{
 					if ($file == '.' || $file == '..') continue;	// ignore current and parent dir!
 
+					if (($file[0] == '.' || $file == 'Thumbs.db') && !$options['hidden']) continue;	// ignore hidden files
+
 					$file = self::concat($path,$file);
 
 					if ((int)$options['mindepth'] <= 1)

From ff50938aa7edf05b7300b54c6a3de956e3c0e4a2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 20:43:18 +0000
Subject: [PATCH 309/510] "special handling for favorites"

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

diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index d34cec57d1..42da742c2c 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -133,13 +133,17 @@ class filemanager_select
 			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
 		}
 		$content['apps'] = array_keys(self::get_apps());
-		array_unshift($content['apps'],false);	// index starting from 1
 
-		if (isset($app) && isset($content['apps'][$app]))
+		if (isset($app))
 		{
-			$content['path'] = '/apps/'.$content['apps'][$app];
+			$content['path'] = '/apps/'.(isset($content['apps'][$app]) ? $content['apps'][$app] : $app);
+		}
+		if ((substr($content['path'],0,strlen('/apps/favorites/')) == '/apps/favorites/' /*||	// favorites the imediatly resolved
+			egw_vfs::is_link($content['path'])*/) &&	// we could replace all symlinks with the link, to save space in the URL
+			$link = egw_vfs::readlink($content['path']))
+		{
+			$content['path'] = $link[0] == '/' ? $link : egw_vfs::concat($content['path'],'../'.$link);
 		}
-
 		if (!$content['path'] || !egw_vfs::is_dir($content['path']))
 		{
 			$content['path'] = filemanager_ui::get_home_dir();
@@ -199,7 +203,7 @@ function select_toggle(file)
 ';
 		// scroll to end of path
 		$GLOBALS['egw']->js->set_onload("document.getElementById('exec[path][c". (count(explode('/',$content['path']))-1) ."]').scrollIntoView();");
-		//_debug_array($content);
+
 		//_debug_array($readonlys);
 		egw_session::appsession('select_path','filemanger',$content['path']);
 		$tpl = new etemplate('filemanager.select');
@@ -220,7 +224,9 @@ function select_toggle(file)
 	 */
 	static function get_apps()
 	{
-		$apps = egw_link::app_list('query');
+		$apps = array(false);	// index starting from 1
+		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
+		$apps += egw_link::app_list('query');
 
 		unset($apps['mydms']);	// they do NOT support adding files to VFS
 		unset($apps['wiki']);

From 09c08541738dd5b0b2b7bc39c937461f0b8473e1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 20:45:29 +0000
Subject: [PATCH 310/510] "$stat[url] contains the reloved symlink"

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

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index cf854de98c..3206b268c0 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -748,7 +748,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		if (!$stat && $check_symlink_components)	// check if there's a symlink somewhere inbetween the path
 		{
 			$stat = self::check_symlink_components($path,$flags,$url);
-			if ($stat) self::symlinkCache_add($path,$url);
+			if ($stat && isset($stat['url'])) self::symlinkCache_add($path,$stat['url']);
 		}
 		elseif(is_array($stat) && !isset($stat['url']))
 		{

From d27a63033c4fcf407290bd16b77752cf9e4153dd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 20:48:09 +0000
Subject: [PATCH 311/510] special handling for favorites

---
 filemanager/setup/egw_de.lang                    |   4 ++--
 filemanager/setup/etemplates.inc.php             |   6 ++++--
 filemanager/templates/default/app.css            |   3 +++
 .../templates/default/images/favorites.png       | Bin 0 -> 1454 bytes
 filemanager/templates/default/select.xet         |   7 ++++---
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 filemanager/templates/default/images/favorites.png

diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index 03a5cfb146..60281004d4 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -16,8 +16,8 @@
 %1 the following files into current directory	filemanager	de	Die foldenden Dateien in das aktuelle Verzeichnis %1
 %1 urls %2 to clipboard.	filemanager	de	%1 Adressen in die Zwischenablage %2.
 accessrights	filemanager	de	Zugangsberechtigungen
-acl added.	filemanager	de	Zugrifsrecht hinzugefügt.
-acl deleted.	filemanager	de	Zugrifsrecht gelöscht.
+acl added.	filemanager	de	Zugriffsrecht hinzugefügt.
+acl deleted.	filemanager	de	Zugriffsrecht gelöscht.
 actions	filemanager	de	Befehle
 all files	common	de	Alle Dateien
 allow a maximum of the above configured folderlinks to be configured in settings	admin	de	erlaube das oben eingestellte Maximum an Einstellunge für Verzeichnisverweise
diff --git a/filemanager/setup/etemplates.inc.php b/filemanager/setup/etemplates.inc.php
index 41491d1d05..9fe0b3f1bc 100644
--- a/filemanager/setup/etemplates.inc.php
+++ b/filemanager/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application filemanager
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-03 22:43
+	* generated by soetemplate::dump4setup() 2009-05-11 22:46
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package filemanager
@@ -46,6 +46,8 @@ $templ_data[] = array('name' => 'filemanager.file.perms','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.file.preview','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:5:{s:2:"c1";s:4:",top";s:2:"h1";s:16:",!@mime=/^image/";s:2:"h3";s:22:",@mime=/^(image|text)/";s:2:"h2";s:18:"280,!@text_content";s:2:"c2";s:4:",top";}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:4:"link";s:4:"span";s:13:",previewImage";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"textarea";s:4:"name";s:12:"text_content";s:4:"span";s:12:",previewText";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"No preview available";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:18:"450,300,,,10,,auto";s:7:"options";a:4:{i:0;s:3:"450";i:1;s:3:"300";i:6;s:4:"auto";i:4;s:2:"10";}}}','size' => '450,300,,,10,,auto','style' => '','modified' => '1204567479',);
 
+$templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '0.1','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:13:{s:4:"type";s:4:"hbox";s:4:"size";s:2:"10";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:2:"Up";s:4:"name";s:4:"goup";s:4:"size";s:40:"filemanager.filemanager_ui.index&path=..";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";s:4:"size";s:39:"filemanager.filemanager_ui.index&path=~";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:5:{s:4:"type";s:3:"box";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:8:"nm[path]";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:14:",pathSelection";}s:4:"span";s:23:",pathSelectionContainer";i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"size";s:2:"16";}}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:35:"button_createdir,createdir_disabled";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:18:"link,link_disabled";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:28:"editpaste,editpaste_disabled";s:4:"help";s:20:"$cont[paste_tooltip]";}i:10;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[linkpaste]";s:4:"size";s:28:"linkpaste,linkpaste_disabled";s:4:"help";s:24:"$cont[linkpaste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1241620382',);
+
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:13:{s:4:"type";s:4:"hbox";s:4:"size";s:2:"10";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";s:4:"name";s:10:"button[up]";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:35:"button_createdir,createdir_disabled";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:18:"link,link_disabled";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:28:"editpaste,editpaste_disabled";s:4:"help";s:20:"$cont[paste_tooltip]";}i:10;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[linkpaste]";s:4:"size";s:28:"linkpaste,linkpaste_disabled";s:4:"help";s:24:"$cont[linkpaste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
 
 $templ_data[] = array('name' => 'filemanager.index','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:3:"250";s:2:"h1";s:10:",!@nm[msg]";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:7:"nm[msg]";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:13:{s:4:"type";s:4:"hbox";s:4:"size";s:2:"10";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:2:"Up";s:4:"name";s:4:"goup";s:4:"size";s:40:"filemanager.filemanager_ui.index&path=..";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";s:4:"size";s:39:"filemanager.filemanager_ui.index&path=~";s:5:"label";s:25:"Go to your home directory";}s:4:"span";s:3:"all";i:3;a:6:{s:4:"type";s:4:"text";s:4:"name";s:8:"nm[path]";s:4:"size";s:2:"80";s:5:"label";s:4:"Path";s:8:"onchange";i:1;s:4:"span";s:8:",address";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[go]";s:4:"size";s:9:"key_enter";s:5:"label";s:5:"Go to";}i:5;a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"buttonseparator";}i:6;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:13:"Edit settings";s:4:"name";s:23:"edit[{$cont[nm][path]}]";s:4:"help";s:39:"Rename, change permissions or ownership";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.file&path={$cont[nm][path]}\'),\'fileprefs\',\'dependent=yes,width=495,height=425,scrollbars=yes,status=yes\'); return false;";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[createdir]";s:4:"size";s:35:"button_createdir,createdir_disabled";s:5:"label";s:16:"Create directory";s:7:"onclick";s:128:"var dir = prompt(egw::lang(\'New directory\')); if (!dir) return false; document.getElementById(form::name(\'nm[path]\')).value=dir;";}i:8;a:5:{s:4:"type";s:6:"button";s:4:"size";s:18:"link,link_disabled";s:5:"label";s:13:"Create a link";s:4:"name";s:15:"button[symlink]";s:7:"onclick";s:129:"var link = prompt(egw::lang(\'Link target\')); if (!link) return false; document.getElementById(form::name(\'nm[path]\')).value=link;";}i:9;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[paste]";s:4:"size";s:28:"editpaste,editpaste_disabled";s:4:"help";s:20:"$cont[paste_tooltip]";}i:10;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[linkpaste]";s:4:"size";s:28:"linkpaste,linkpaste_disabled";s:4:"help";s:24:"$cont[linkpaste_tooltip]";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"filemanager.index.rows";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"file";s:4:"name";s:8:"upload[]";s:4:"help";s:42:"Select file to upload in current directory";s:8:"onchange";s:99:"xajax_doXMLHTTP(\'filemanager_ui::ajax_check_upload_target\',this.id,this.value,\'{$cont[nm][path]}\');";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Upload";s:4:"name";s:14:"button[upload]";}}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"size";s:16:"Select action...";s:8:"onchange";i:1;}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1237464702',);
@@ -56,5 +58,5 @@ $templ_data[] = array('name' => 'filemanager.index.rows','template' => '','lang'
 
 $templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:2:"40";s:2:"h2";s:2:"40";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:4:"home";s:5:"align";s:6:"center";s:5:"label";s:4:"Home";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:35:",@mode=/(open-multiple|select-dir)/";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
 
-$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:2:"40";s:2:"h2";s:2:"40";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"home";s:4:"name";s:4:"home";s:5:"align";s:6:"center";s:5:"label";s:4:"Home";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:35:",@mode=/(open-multiple|select-dir)/";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}s:4:"span";s:20:",selectPathContainer";}i:4;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
+$templ_data[] = array('name' => 'filemanager.select','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:1:"A";s:2:"32";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:5:"align";s:6:"center";s:4:"data";a:3:{i:0;a:2:{s:2:"h2";s:2:"40";s:2:"h1";s:4:",!@0";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:9:"favorites";s:5:"label";s:9:"Favorites";s:5:"align";s:6:"center";s:4:"name";s:9:"favorites";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"size";s:16:"$row_cont/navbar";s:5:"label";s:9:"$row_cont";s:5:"align";s:6:"center";s:4:"name";s:6:"${row}";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"name";s:4:"apps";s:7:"options";a:0:{}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"c2";s:11:"selectFiles";s:2:"h3";s:35:",@mode=/(open-multiple|select-dir)/";s:2:"h4";s:15:",!@options-mime";}i:1;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:10:"button[up]";s:4:"size";s:4:"goup";s:5:"label";s:2:"Up";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[home]";s:4:"size";s:6:"gohome";s:5:"label";s:25:"Go to your home directory";}i:4;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:4:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"path";s:7:"onclick";s:87:"path=document.getElementById(form::name(\'path\')); path.value=$path; path.form.submit();";s:4:"span";s:11:",selectPath";}s:4:"span";s:20:",selectPathContainer";}i:5;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"path";s:4:"span";s:12:",displayNone";}}}i:2;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:17:"100%,400,,,,,auto";s:4:"name";s:3:"dir";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:3:"row";s:1:"A";s:2:"20";s:1:"C";s:23:"1%,!@mode=open-multiple";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[path]";s:4:"span";s:11:",selectIcon";s:5:"align";s:6:"center";}s:1:"B";a:3:{s:4:"type";s:3:"vfs";s:4:"name";s:4:"$row";s:7:"onclick";s:18:"$row_cont[onclick]";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:17:""$row_cont[name]"";s:4:"name";s:10:"selected[]";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"400";i:6;s:4:"auto";}}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"span";s:11:",selectName";s:6:"needed";s:1:"1";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"All files";s:4:"name";s:4:"mime";s:4:"span";s:11:",selectMime";s:8:"onchange";i:1;}}i:5;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"@label";s:4:"name";s:10:"button[ok]";}i:2;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";}s:5:"align";s:5:"right";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:7:"options";a:1:{i:0;s:4:"100%";}s:4:"size";s:4:"100%";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:3:"600";s:7:"options";a:1:{i:0;s:3:"600";}}}','size' => '600','style' => '','modified' => '1239794780',);
 
diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css
index 6740b75fe8..716f3baf89 100644
--- a/filemanager/templates/default/app.css
+++ b/filemanager/templates/default/app.css
@@ -8,6 +8,9 @@
 .comment textarea { width: 100%; height: 35px; }
 .previewImage img { max-width: 430px; max-height: 275px; border: 1px solid black; }
 .previewText div { }
+.pathSelection { font-weight: bold; }
+.pathSelection a { font-weight: bold; font-size: 120%; }
+.pathSelectionContainer { width: 640px; overflow: auto; }
 
 /**
  * Select file dialog
diff --git a/filemanager/templates/default/images/favorites.png b/filemanager/templates/default/images/favorites.png
new file mode 100644
index 0000000000000000000000000000000000000000..028869cbe3734cca8c57700b57a125abb1d58e7c
GIT binary patch
literal 1454
zcmW+$dpMMN6#jkRH}j3gH<^u?k#<IQV^M~bk}?xQNvMr=n=vl4+m>4rp2^H8x@nq9
z#j?@1S#7q&ZrQ?&TvC+FCThiuEY@{Ip~ieW_K$PUbN)EzJ@0egb58mBdQ!-yWB>rg
z+si#b7nzHuhwA*Hw6qyrAP6|SH~`#faw4AoSC`Y1Jc5$;#Kj~XiAanFoTxZ{G}HTF
zgdjQ~IwC4H;YqX$07SO8J7;goYrY1@U6D=7K)bhETtp{yH)~fo_yGW)Ja0w<YXW(5
zkK^$^E}DhoG_y^&v<zk!1fY8N%eO_?d&~vHd^&!@M7aIHo@FqA+!OUQV|*hJF!`$b
zFFHF|UYh>|WRpE=8gYZB1i%L84Phcy$`05pmiUuSrq;Im?T*z01gf{Wy5gcgDA8=q
zKYJfsJnI}ZHhF3YV>sF2fJ{_Lafa97#d0H<-HeE*>=aR#$OB=7{(P*ZScPF@81uw(
znW1iidiVYPk?oyGaZR(Ign?l#SLl_$Rnx_rR$bNcAyC_w&b2qvz|0N!Or*K&2<$xw
zBM-l^t&@u|a;rYw@PC-QMe1T?+NtdVUZh#LQVV@+)g*YQa4!bs1>XB|B$6SU`k{D`
zo!sk$g%+n_h3B{<qJn2MgBQpSLlazsShnfoT9$BbwooM*T-H(mQ`y=05UZ5b0bwG}
zS7fsmj7`C?Z3P&1zy-r!rP660>m{opw_c|4u(*@D(;u(|+Fj9e<=;C5y*WqfqHBfo
zE$UCrCRvjP@?$QDwH;d;Ax;|+YhUA1=8rns@CJ%iQxTdSQfG^z=@zJ0RZo_w);MSU
z+8BkcS-O)AH{=Gg)F~tIs{)0?Q_SlSxQm50^w|h#;jv-O>W?!PG7F_SL}kkkY`l1v
zG5iTew}hbR3Vk%o)st3&rX$tU(o?F1iBW9#y_yKHy&10i12>H501&~Bq}?6i1JF+4
zY6{P5Bbc7M^Drkwo0%t3t<$fo=oHX;!{;dPQq5VzmP{K+kC~G(9Oufqfk)=HS~XZI
z#!4C#ijR3hu85B~E1l}5$Gd2~p&F#z#b5LcCl2p`V7=>K5H7z**`8wpBfc?jwvE&{
zZrNdrH=?z!>Fav9X_r)^J9$#@GWWqPoU14{V~Wd+8~Q@%6!FbuttbXX!UH2vl(Tk~
zzI9P+-ywU=(S<x!`)x~VGmfm`X1+<J0zGEI;o70q+aX?ZPis>xPcdZYE7Yq}MWy^c
z1=S4+FcbFW(b9UZt4>GHFUams;3QtvO5OmWq1mo~N*;%`_$Xa)vFslvpt5ZV)(ldz
z-#9*Pxnzl&fshzMcOd(xIwo;pU?vmNw<3s_kco1l@j(X8KYdIsXJ9Ux7Ucs~D5#vu
zFj>T)ri45h2G-7bmDiSnhbKP^iiM{?w2G)(NwPsAKjuYJ{qx6U+gLoqjT$WMC+K95
z@pyKr&jHy3iOR%CP70oxHK_Y#NbzW#Sow%gm4TRLUl*CNy6L&se!w*`O5m&+wTyRE
zE}oVu36y>45JaBXCoCeXE!rsTkL%msO}Z))dh`+%XHH=AaaZ9tknM-mOOlaFrgRY5
z&{-qom021Q0d)LtNJPiFIp%7!y+1p!s^FL2eKi?w=)m=DovE^4-v>Ls&EUGyMi@PO
zFJ<Z@1@lW%Hf&zBxx03KA!5FGmoF2Q9`+U`TDcuM^UR6YCdaXxT@rpKxuR?qTARgk
z1}no1%J;g<B%FZb5>?Ogct?8hL}M5gB2e|EV<c-SJv<%toG0;Ca;;nqE6hAmMdIfJ
zWr#pXHw>?iDG@E0c9co7VBbYFL+QOj$ciU!NU)Fv<m5~G5~FzK^Eg~|BTFt?=Lmo2
z=b!Cl0~4qge;#$)4~YSvPvhy9icA18Fpbx>pn?7^8=TyTSJ&tsF7Wp7b-%rhm+>F^
Csbfw6

literal 0
HcmV?d00001

diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index a63df18eab..8c98bdc84f 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -14,8 +14,8 @@
 							<column/>
 						</columns>
 						<rows>
-							<row height="40">
-								<button image="home" id="home" align="center" label="Home"/>
+							<row disabled="!@0">
+								<button image="favorites" label="Favorites" align="center" id="favorites"/>
 							</row>
 							<row height="40">
 								<button image="$row_cont/navbar" label="$row_cont" align="center" id="${row}"/>
@@ -30,7 +30,8 @@
 							<row>
 								<hbox>
 									<html id="js"/>
-									<button id="button[up]" image="goup"/>
+									<button id="button[up]" image="goup" label="Up"/>
+									<button id="button[home]" image="gohome" label="Go to your home directory"/>
 									<box class="selectPathContainer">
 										<vfs id="path" onclick="path=document.getElementById(form::name('path')); path.value=$path; path.form.submit();" class="selectPath"/>
 									</box>

From 5b2da78e325247d8bcfce4725f8484618107d8c5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 May 2009 20:58:53 +0000
Subject: [PATCH 312/510] "ignore hidden files"

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

diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index 42da742c2c..b851871e8d 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -158,6 +158,7 @@ class filemanager_select
 			$content['dir'] = array('mode' => $content['mode']);
 			while (($name = readdir($d)))
 			{
+				if ($name[0] == '.' || $name == 'Thumbs.db') continue;	// ignore hidden files
 				$path = egw_vfs::concat($content['path'],$name);
 				$is_dir = egw_vfs::is_dir($path);
 				if ($content['mime'] && !$is_dir && egw_vfs::mime_content_type($path) != $content['mime'])

From 6617bec9ef93fe7db54e643afaffca9d65ecedcd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 12 May 2009 07:21:57 +0000
Subject: [PATCH 313/510] Creating an own column (fs_link) for symlinks, as
 fs_content is a BLOB and therefore not aware of charsets

---
 .../inc/class.sqlfs_stream_wrapper.inc.php     | 18 ++++++++----------
 phpgwapi/setup/setup.inc.php                   |  3 ++-
 phpgwapi/setup/tables_current.inc.php          |  3 ++-
 phpgwapi/setup/tables_update.inc.php           | 13 +++++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index b3a6b176af..6c33e16ac0 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -901,9 +901,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			return false;
 		}
 		$this->opened_dir = array();
-		$query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.
-			",CASE fs_mime WHEN '".self::SYMLINK_MIME_TYPE."' THEN fs_content ELSE NULL END AS readlink FROM ".self::TABLE.
-			" WHERE fs_dir=? ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
+		$query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_link'.
+			' FROM '.self::TABLE." WHERE fs_dir=? ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
 		//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$options)".' */ '.$query;
 
@@ -971,9 +970,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			self::_pdo();
 		}
-		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.
-			",CASE fs_mime WHEN '".self::SYMLINK_MIME_TYPE."' THEN fs_content ELSE NULL END AS readlink FROM ".self::TABLE.
-			' WHERE fs_name'.self::$case_sensitive_equal.'? AND fs_dir=';
+		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_link'.
+			' FROM '.self::TABLE.' WHERE fs_name'.self::$case_sensitive_equal.'? AND fs_dir=';
 		$parts = explode('/',$path);
 
 		// if we have extendes acl access to the url, we dont need and can NOT include the sql for the readable check
@@ -1153,8 +1151,8 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!stat('$link') || !is_writable('$dir'))");
 			return false;	// $link already exists or parent dir does not
 		}
-		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_content'.
-			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_content)';
+		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_link'.
+			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_link)';
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 		$stmt = self::$pdo->prepare($query);
 		unset(self::$stat_cache[$link]);
@@ -1170,7 +1168,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			'fs_creator'  => egw_vfs::$user,
 			'fs_mime'     => self::SYMLINK_MIME_TYPE,
 			'fs_size'     => bytes($target),
-			'fs_content'  => $target,
+			'fs_link'     => $target,
 		));
 	}
 
@@ -1429,7 +1427,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			'nlink' => $info['fs_mime'] == self::DIR_MIME_TYPE ? 2 : 1,
 			// eGW addition to return some extra values
 			'mime'  => $info['fs_mime'],
-			'readlink' => $info['readlink'],
+			'readlink' => $info['fs_link'],
 		);
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($info[name]) = ".array2string($stat));
 		return $stat;
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index 0e4d20cd69..9cd05e6aef 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -12,7 +12,7 @@
 /* Basic information about this app */
 $setup_info['phpgwapi']['name']      = 'phpgwapi';
 $setup_info['phpgwapi']['title']     = 'eGroupWare API';
-$setup_info['phpgwapi']['version']   = '1.7.001';
+$setup_info['phpgwapi']['version']   = '1.7.002';
 $setup_info['phpgwapi']['versions']['current_header'] = '1.29';
 $setup_info['phpgwapi']['enable']    = 3;
 $setup_info['phpgwapi']['app_order'] = 1;
@@ -75,3 +75,4 @@ $setup_info['groupdav']['author'] = $setup_info['groupdav']['maintainer'] = arra
 	'email' => 'RalfBecker@outdoor-training.de'
 );
 $setup_info['groupdav']['license'] = 'GPL';
+
diff --git a/phpgwapi/setup/tables_current.inc.php b/phpgwapi/setup/tables_current.inc.php
index 79c2320e1b..9c321188d7 100644
--- a/phpgwapi/setup/tables_current.inc.php
+++ b/phpgwapi/setup/tables_current.inc.php
@@ -446,7 +446,8 @@ $phpgw_baseline = array(
 			'fs_creator' => array('type' => 'int','precision' => '4','nullable' => False),
 			'fs_modifier' => array('type' => 'int','precision' => '4'),
 			'fs_active' => array('type' => 'bool','nullable' => False,'default' => 't'),
-			'fs_content' => array('type' => 'blob')
+			'fs_content' => array('type' => 'blob'),
+			'fs_link' => array('type' => 'varchar','precision' => '255')
 		),
 		'pk' => array('fs_id'),
 		'fk' => array(),
diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index 79776917c8..acc596f248 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -27,3 +27,16 @@ function phpgwapi_upgrade1_6_001()
 {
 	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
 }
+
+function phpgwapi_upgrade1_7_001()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_sqlfs','fs_link',array(
+		'type' => 'varchar',
+		'precision' => '255'
+	));
+	// moving symlinks from fs_content to fs_link
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_sqlfs SET fs_link=fs_content,fs_content=NULL WHERE fs_mime='application/x-symlink'",__LINE__,__FILE__);
+
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.002';
+}
+

From 51284255c1852361d010efdcf10ac4d95da7ab11 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 13 May 2009 07:39:58 +0000
Subject: [PATCH 314/510] Edit and set comment field for colums in eGW's schema
 files

---
 etemplate/inc/class.db_tools.inc.php          | 70 +++++++++++++------
 etemplate/setup/etemplates.inc.php            | 10 +--
 etemplate/templates/default/db-tools.edit.xet | 22 ++++--
 3 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/etemplate/inc/class.db_tools.inc.php b/etemplate/inc/class.db_tools.inc.php
index 24bef28140..91462aca3b 100644
--- a/etemplate/inc/class.db_tools.inc.php
+++ b/etemplate/inc/class.db_tools.inc.php
@@ -4,7 +4,7 @@
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @copyright 2002-8 by RalfBecker@outdoor-training.de
+ * @copyright 2002-9 by RalfBecker@outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package etemplate
  * @subpackage tools
@@ -16,18 +16,47 @@
  */
 class db_tools
 {
-	var $public_functions = array
-	(
+	/**
+	 * Methods callable via menuaction
+	 *
+	 * @var array
+	 */
+	public $public_functions = array(
 		'edit'         => True,
 		'needs_save'   => True,
 	);
 
-	var $debug = 0;
-	var $editor;	// editor eTemplate
-	var $data;		// Table definitions
-	var $app;		// used app
-	var $table;		// used table
-	var $types = array(
+	/**
+	 * Debug Level: 0 = off, > 0 more diagnostics
+	 *
+	 * @var int
+	 */
+	protected $debug = 0;
+
+	/**
+	 * Table definitions
+	 *
+	 * @var array
+	 */
+	protected $data = array();
+	/**
+	 * Used app
+	 *
+	 * @var string
+	 */
+	protected $app;
+	/**
+	 * Used table
+	 *
+	 * @var string
+	 */
+	protected $table;
+	/**
+	 * Available colum types
+	 *
+	 * @var array
+	 */
+	protected $types = array(
 		'varchar'	=> 'varchar',
 		'int'		=> 'int',
 		'auto'		=> 'auto',
@@ -46,11 +75,8 @@ class db_tools
 	/**
 	 * constructor of class
 	 */
-	function db_tools()
+	function __construct()
 	{
-		$this->editor = new etemplate('etemplate.db-tools.edit');
-		$this->data = array();
-
 		if (!is_array($GLOBALS['egw_info']['apps']) || !count($GLOBALS['egw_info']['apps']))
 		{
 			ExecMethod('phpgwapi.applications.read_installed_apps');
@@ -61,8 +87,11 @@ class db_tools
 
 	/**
 	 * table editor (and the callback/submit-method too)
+	 *
+	 * @param array $content=null
+	 * @param string $msg=''
 	 */
-	function edit($content='',$msg = '')
+	function edit(array $content=null,$msg = '')
 	{
 		if (isset($_GET['app']))
 		{
@@ -209,7 +238,8 @@ class db_tools
 		{
 			echo 'editor.edit: content ='; _debug_array($content);
 		}
-		$this->editor->exec('etemplate.db_tools.edit',$content,$sel_options,$no_button,
+		$tpl = new etemplate('etemplate.db-tools.edit');
+		$tpl->exec('etemplate.db_tools.edit',$content,$sel_options,$no_button,
 			array('posted_table' => $this->table,'posted_app' => $this->app,'changes' => $this->changes));
 	}
 
@@ -456,7 +486,7 @@ class db_tools
 						case 'varchar': $col['precision'] = 255; break;
 					}
 				}
-				while (list($prop,$val) = each($col))
+				foreach($col as $prop => $val)
 				{
 					switch ($prop)
 					{
@@ -464,6 +494,7 @@ class db_tools
 						case 'type':	// selectbox ensures type is not empty
 						case 'precision':
 						case 'scale':
+						case 'comment':
 							if ($val != '')
 							{
 								$table['fd'][$name][$prop] = $prop=='default'&& $val=="''" ? '' : $val;
@@ -1004,16 +1035,15 @@ function $app"."_upgrade$old_version_()
 	 */
 	function normalize($table)
 	{
-		$all_props = array('type','precision','nullable','default');
-
 		foreach($table['fd'] as $col => $props)
 		{
 			$table['fd'][$col] = array(
-				'type' => ''.$props['type'],
+				'type' => (string)$props['type'],
 				'precision' => 0+$props['precision'],
 				'scale' => 0+$props['scale'],
 				'nullable' => !isset($props['nullable']) || !!$props['nullable'],
-				'default' => ''.$props['default']
+				'default' => (string)$props['default'],
+				'comment' => (string)$props['comment'],
 			);
 		}
 		return array(
diff --git a/etemplate/setup/etemplates.inc.php b/etemplate/setup/etemplates.inc.php
index 4ed1246e26..7dfe52e8dc 100644
--- a/etemplate/setup/etemplates.inc.php
+++ b/etemplate/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application etemplate
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-02-23 14:22
+	* generated by soetemplate::dump4setup() 2009-05-13 09:38
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package etemplate
@@ -71,14 +71,14 @@ $templ_data[] = array('name' => 'etemplate.db-tools.ask_save','template' => '','
 
 $templ_data[] = array('name' => 'etemplate.db-tools.ask_save','template' => '','lang' => '','group' => '0','version' => '1.0.0.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:6:{s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:7:"version";s:4:"size";s:2:"bi";s:4:"type";s:5:"label";s:5:"label";s:27:"Update from Version \'%s\' to";}s:1:"B";a:3:{s:4:"name";s:11:"new_version";s:4:"type";s:4:"text";s:4:"help";s:75:"enter the new version number here (> old_version), empty for no update-file";}}i:4;a:2:{s:1:"A";a:2:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:7:{s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:5:"table";s:4:"size";s:1:"b";s:4:"type";s:5:"label";s:5:"label";s:53:"Do you want to save the changes you made in table %s?";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:5:{s:5:"label";s:3:"Yes";s:5:"align";s:5:"right";s:4:"name";s:3:"yes";s:4:"type";s:6:"button";s:4:"help";s:39:"saves changes to tables_current.inc.php";}s:1:"B";a:4:{s:5:"label";s:2:"No";s:4:"name";s:2:"no";s:4:"type";s:6:"button";s:4:"help";s:15:"discard changes";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1112602648',);
 
-$templ_data[] = array('name' => 'etemplate.db-tools.cols','template' => '','lang' => '','group' => '0','version' => '0.9.15.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:12:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Precision";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Scale";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"NOT NULL";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Primary Key";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Indexed";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Foreign Key";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Default";}s:1:"L";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Add Column";s:5:"align";s:6:"center";s:4:"name";s:10:"add_column";s:4:"help";s:42:"Add a new column (after the existing ones)";}}i:2;a:12:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:12:"Row${row}[n]";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[name]";s:4:"help";s:127:"need to be unique in the table and no reseved word from SQL, best prefix all with a common 2-digit short for the app, eg. \'et_\'";}s:1:"C";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[type]";s:4:"help";s:18:"type of the column";}s:1:"D";a:4:{s:4:"type";s:3:"int";s:5:"align";s:6:"center";s:4:"name";s:20:"Row${row}[precision]";s:4:"help";s:64:"length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8";}s:1:"E";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"Row${row}[scale]";s:4:"help";s:15:"scale for float";}s:1:"F";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:18:"Row${row}[notnull]";s:4:"help";s:35:"can not have special SQL-value NULL";}s:1:"G";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[uc]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"H";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[pk]";s:4:"help";s:52:"Primary key for the table, gets automaticaly indexed";}s:1:"I";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[ix]";s:4:"help";s:81:"an indexed column speeds up querys using that column (cost space on the disk !!!)";}s:1:"J";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[fk]";s:4:"help";s:46:"name of other table where column is a key from";}s:1:"K";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:4:"name";s:18:"Row${row}[default]";s:4:"help";s:54:"enter \'\' for an empty default, nothing mean no default";}s:1:"L";a:5:{s:4:"type";s:6:"button";s:5:"label";s:13:"Delete Column";s:5:"align";s:6:"center";s:4:"name";s:12:"delete[$row]";s:4:"help";s:19:"Deletes this column";}}}s:4:"rows";i:2;s:4:"cols";i:12;}}','size' => '','style' => '','modified' => '1064452548',);
-
 $templ_data[] = array('name' => 'etemplate.db-tools.cols','template' => '','lang' => '','group' => '0','version' => '0.9.15.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:13:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Precision";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Scale";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"NOT NULL";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Primary Key";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Indexed";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Indexoptions";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Foreign Key";}s:1:"L";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Default";}s:1:"M";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Add Column";s:5:"align";s:6:"center";s:4:"name";s:10:"add_column";s:4:"help";s:42:"Add a new column (after the existing ones)";}}i:2;a:13:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:12:"Row${row}[n]";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"15";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[name]";s:4:"help";s:127:"need to be unique in the table and no reseved word from SQL, best prefix all with a common 2-digit short for the app, eg. \'et_\'";}s:1:"C";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[type]";s:4:"help";s:18:"type of the column";}s:1:"D";a:4:{s:4:"type";s:3:"int";s:5:"align";s:6:"center";s:4:"name";s:20:"Row${row}[precision]";s:4:"help";s:64:"length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8";}s:1:"E";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"Row${row}[scale]";s:4:"help";s:15:"scale for float";}s:1:"F";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:18:"Row${row}[notnull]";s:4:"help";s:35:"can not have special SQL-value NULL";}s:1:"G";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[pk]";s:4:"help";s:52:"Primary key for the table, gets automaticaly indexed";}s:1:"H";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[uc]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"I";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[ix]";s:4:"help";s:81:"an indexed column speeds up querys using that column (cost space on the disk !!!)";}s:1:"J";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"15";s:4:"name";s:18:"Row${row}[options]";s:4:"help";s:105:"DB-specific index options (comma-sep.), eg. mysql(FULLTEXT) or mysql(100) for the indexed length of a col";}s:1:"K";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[fk]";s:4:"help";s:46:"name of other table where column is a key from";}s:1:"L";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:4:"name";s:18:"Row${row}[default]";s:4:"help";s:54:"enter \'\' for an empty default, nothing mean no default";}s:1:"M";a:5:{s:4:"type";s:6:"button";s:5:"label";s:13:"Delete Column";s:5:"align";s:6:"center";s:4:"name";s:12:"delete[$row]";s:4:"help";s:19:"Deletes this column";}}}s:4:"rows";i:2;s:4:"cols";i:13;}}','size' => '','style' => '','modified' => '1067163210',);
 
-$templ_data[] = array('name' => 'etemplate.db-tools.edit','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:1:{s:1:"D";s:2:"1%";}i:1;a:7:{s:1:"A";a:6:{s:4:"type";s:5:"label";s:4:"size";s:2:"bi";s:4:"span";s:1:"6";s:5:"label";s:29:"Editable Templates - DB-Tools";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:5:{s:4:"type";s:6:"button";s:5:"label";s:16:"eTemplate Editor";s:5:"align";s:5:"right";s:4:"name";s:6:"editor";s:4:"help";s:29:"to start the eTemplate editor";}}i:2;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:3;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:4;a:7:{s:1:"A";a:7:{s:4:"type";s:10:"select-app";s:4:"size";s:19:"Select one ...,,all";s:5:"label";s:11:"Application";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:8:"onchange";s:1:"1";s:4:"help";s:40:"Select an application, (*) = uninstalled";}s:1:"B";a:6:{s:4:"type";s:6:"select";s:5:"label";s:9:"TableName";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"table_name";s:8:"onchange";s:1:"1";s:4:"help";s:34:"Select an table of the application";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:5:"right";s:4:"name";s:14:"new_table_name";s:4:"help";s:20:"Name of table to add";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Table";s:4:"name";s:9:"add_table";s:4:"help";s:38:"Create a new table for the application";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";s:4:"help";s:47:"Import table-definitions from existing db-table";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Drop Table";s:4:"name";s:10:"drop_table";s:8:"disabled";s:1:"1";s:4:"help";s:37:"Drop a table - this can NOT be undone";}s:1:"G";a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Write Tables";s:4:"name";s:12:"write_tables";s:4:"help";s:40:"Write <app>/setup/tables_current.inc.php";}}i:5;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:23:"etemplate.db-tools.cols";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1047991954',);
+$templ_data[] = array('name' => 'etemplate.db-tools.cols','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:14:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Precision";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Scale";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"NOT NULL";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Primary Key";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Indexed";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Default";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Comment";}s:1:"L";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Indexoptions";}s:1:"M";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Foreign Key";}s:1:"N";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Add Column";s:5:"align";s:6:"center";s:4:"name";s:10:"add_column";s:4:"help";s:42:"Add a new column (after the existing ones)";}}i:2;a:14:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:12:"Row${row}[n]";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"15";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[name]";s:4:"help";s:127:"need to be unique in the table and no reseved word from SQL, best prefix all with a common 2-digit short for the app, eg. \'et_\'";}s:1:"C";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[type]";s:4:"help";s:18:"type of the column";}s:1:"D";a:4:{s:4:"type";s:3:"int";s:5:"align";s:6:"center";s:4:"name";s:20:"Row${row}[precision]";s:4:"help";s:64:"length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8";}s:1:"E";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"Row${row}[scale]";s:4:"help";s:15:"scale for float";}s:1:"F";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:18:"Row${row}[notnull]";s:4:"help";s:35:"can not have special SQL-value NULL";}s:1:"G";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[pk]";s:4:"help";s:52:"Primary key for the table, gets automaticaly indexed";}s:1:"H";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[uc]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"I";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[ix]";s:4:"help";s:81:"an indexed column speeds up querys using that column (cost space on the disk !!!)";}s:1:"J";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:4:"name";s:18:"Row${row}[default]";s:4:"help";s:54:"enter \'\' for an empty default, nothing mean no default";}s:1:"K";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:4:"name";s:18:"Row${row}[comment]";}s:1:"L";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:4:"name";s:18:"Row${row}[options]";s:4:"help";s:105:"DB-specific index options (comma-sep.), eg. mysql(FULLTEXT) or mysql(100) for the indexed length of a col";}s:1:"M";a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[fk]";s:4:"help";s:46:"name of other table where column is a key from";}s:1:"N";a:5:{s:4:"type";s:6:"button";s:5:"label";s:13:"Delete Column";s:5:"align";s:6:"center";s:4:"name";s:12:"delete[$row]";s:4:"help";s:19:"Deletes this column";}}}s:4:"rows";i:2;s:4:"cols";i:14;}}','size' => '','style' => '','modified' => '1067163210',);
 
 $templ_data[] = array('name' => 'etemplate.db-tools.edit','template' => '','lang' => '','group' => '0','version' => '0.9.15.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:1:"D";s:2:"1%";}i:1;a:7:{s:1:"A";a:7:{s:4:"type";s:10:"select-app";s:4:"size";s:19:"Select one ...,,all";s:5:"label";s:11:"Application";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:8:"onchange";s:1:"1";s:4:"help";s:40:"Select an application, (*) = uninstalled";}s:1:"B";a:6:{s:4:"type";s:6:"select";s:5:"label";s:9:"TableName";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"table_name";s:8:"onchange";s:1:"1";s:4:"help";s:34:"Select an table of the application";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:5:"right";s:4:"name";s:14:"new_table_name";s:4:"help";s:20:"Name of table to add";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Table";s:4:"name";s:9:"add_table";s:4:"help";s:38:"Create a new table for the application";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";s:4:"help";s:47:"Import table-definitions from existing db-table";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Drop Table";s:4:"name";s:10:"drop_table";s:8:"disabled";s:1:"1";s:4:"help";s:37:"Drop a table - this can NOT be undone";}s:1:"G";a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Write Tables";s:4:"name";s:12:"write_tables";s:4:"help";s:40:"Write <app>/setup/tables_current.inc.php";}}i:2;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:23:"etemplate.db-tools.cols";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:3;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:26:"etemplate.db-tools.indices";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1067164025',);
 
+$templ_data[] = array('name' => 'etemplate.db-tools.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"D";s:2:"1%";s:2:"h1";s:6:",!@msg";}i:1;a:7:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:2;a:7:{s:1:"A";a:7:{s:4:"type";s:10:"select-app";s:4:"size";s:19:"Select one ...,,all";s:5:"label";s:11:"Application";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:8:"onchange";s:1:"1";s:4:"help";s:40:"Select an application, (*) = uninstalled";}s:1:"B";a:6:{s:4:"type";s:6:"select";s:5:"label";s:9:"TableName";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"table_name";s:8:"onchange";s:1:"1";s:4:"help";s:34:"Select an table of the application";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:5:"right";s:4:"name";s:14:"new_table_name";s:4:"help";s:20:"Name of table to add";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Table";s:4:"name";s:9:"add_table";s:4:"help";s:38:"Create a new table for the application";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";s:4:"help";s:47:"Import table-definitions from existing db-table";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Drop Table";s:4:"name";s:10:"drop_table";s:8:"disabled";s:1:"1";s:4:"help";s:37:"Drop a table - this can NOT be undone";}s:1:"G";a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Write Tables";s:4:"name";s:12:"write_tables";s:4:"help";s:40:"Write <app>/setup/tables_current.inc.php";}}i:3;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:23:"etemplate.db-tools.cols";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:4;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:26:"etemplate.db-tools.indices";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1242199350',);
+
 $templ_data[] = array('name' => 'etemplate.db-tools.indices','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";}i:1;a:8:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:19:"Multicolumn Indices";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}}i:2;a:8:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"H";a:5:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Index";s:5:"align";s:6:"center";s:4:"name";s:9:"add_index";s:4:"help";s:28:"Add a new multi-column index";}}i:3;a:8:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:14:"Index[$row][n]";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][0]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"C";a:6:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:14:"Index[$row][1]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"D";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][2]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"E";a:6:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:14:"Index[$row][3]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"F";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][4]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"G";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:19:"Index[$row][unique]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"H";a:5:{s:4:"type";s:6:"button";s:5:"label";s:12:"Delete Index";s:5:"align";s:6:"center";s:4:"name";s:18:"delete_index[$row]";s:4:"help";s:18:"Deletes this index";}}}s:4:"rows";i:3;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1067173445',);
 
 $templ_data[] = array('name' => 'etemplate.db-tools.indices','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:2:"th";s:2:"c3";s:3:"row";}i:1;a:10:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:19:"Multicolumn Indices";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}s:1:"I";a:1:{s:4:"type";s:5:"label";}s:1:"J";a:1:{s:4:"type";s:5:"label";}}i:2;a:10:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"J";a:5:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Index";s:5:"align";s:6:"center";s:4:"name";s:9:"add_index";s:4:"help";s:28:"Add a new multi-column index";}}i:3;a:10:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:14:"Index[$row][n]";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][0]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"C";a:6:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:14:"Index[$row][1]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"D";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][2]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"E";a:6:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:14:"Index[$row][3]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"F";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][4]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"G";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][5]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"H";a:5:{s:4:"type";s:6:"select";s:4:"size";s:4:"none";s:7:"no_lang";s:1:"1";s:4:"name";s:14:"Index[$row][6]";s:4:"help";s:49:"Select the indexed columns in their desired order";}s:1:"I";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:19:"Index[$row][unique]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"J";a:5:{s:4:"type";s:6:"button";s:5:"label";s:12:"Delete Index";s:5:"align";s:6:"center";s:4:"name";s:18:"delete_index[$row]";s:4:"help";s:18:"Deletes this index";}}}s:4:"rows";i:3;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1067173445',);
@@ -302,7 +302,7 @@ $templ_data[] = array('name' => 'etemplate.test.grid-export','template' => '','l
 
 $templ_data[] = array('name' => 'etemplate.test.grid-export','template' => '','lang' => '','group' => '0','version' => '2','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"some cell";}}i:2;a:1:{s:1:"A";a:6:{s:5:"class";s:9:"hboxClass";s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"size";s:1:"1";s:4:"type";s:5:"label";s:5:"label";s:2:"1.";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:2:"2.";}i:3;a:3:{s:5:"align";s:5:"right";s:4:"type";s:5:"label";s:5:"label";s:10:"last right";}}}}s:4:"cols";i:1;s:4:"rows";i:2;s:4:"size";s:16:"100%,,,gridClass";}}','size' => '100%,,,gridClass','style' => '','modified' => '1179507244',);
 
-$templ_data[] = array('name' => 'etemplate.test.table','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h1";s:4:",h,h";s:2:"h3";s:4:",f,f";s:2:"h2";s:3:",,h";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf2";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:12:"2. Kopfzeile";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer2";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body2";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body2";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:3:",,1";s:7:"options";a:1:{i:2;s:1:"1";}}}','size' => '','style' => '','modified' => '1235388984',);
+$templ_data[] = array('name' => 'etemplate.test.table','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h1";s:4:",h,h";s:2:"h3";s:4:",f,f";s:2:"h2";s:3:",,h";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf2";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:12:"2. Kopfzeile";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer2";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body2";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body2";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:3:",,1";s:7:"options";a:1:{i:2;s:1:"1";}}}','size' => ',,1','style' => '','modified' => '1235388984',);
 
 $templ_data[] = array('name' => 'etemplate.test.Ymd','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:4:"text";s:5:"label";s:19:"Date YYYYmmddHHiiss";s:4:"name";s:4:"date";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"date";s:4:"size";s:5:"YmdHi";s:5:"label";s:4:"Date";s:4:"name";s:4:"date";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-timeonly";s:4:"size";s:5:"YmdHi";s:5:"label";s:4:"Time";s:4:"name";s:4:"date";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1179320861',);
 
diff --git a/etemplate/templates/default/db-tools.edit.xet b/etemplate/templates/default/db-tools.edit.xet
index 4dba0ffad7..2c6f9e12f2 100644
--- a/etemplate/templates/default/db-tools.edit.xet
+++ b/etemplate/templates/default/db-tools.edit.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="etemplate.db-tools.cols" template="" lang="" group="0" version="0.9.15.003">
+	<template id="etemplate.db-tools.cols" template="" lang="" group="0" version="1.7.001">
 		<grid>
 			<columns>
 				<column/>
@@ -17,6 +17,7 @@
 				<column/>
 				<column/>
 				<column/>
+				<column/>
 			</columns>
 			<rows>
 				<row class="nmh">
@@ -29,9 +30,10 @@
 					<description value="Primary Key"/>
 					<description value="Unique"/>
 					<description value="Indexed"/>
+					<description value="Default"/>
+					<description value="Comment"/>
 					<description value="Indexoptions"/>
 					<description value="Foreign Key"/>
-					<description value="Default"/>
 					<button label="Add Column" align="center" id="add_column" statustext="Add a new column (after the existing ones)"/>
 				</row>
 				<row class="nmr">
@@ -46,9 +48,10 @@
 					<checkbox align="center" id="Row${row}[pk]" statustext="Primary key for the table, gets automaticaly indexed"/>
 					<checkbox align="center" id="Row${row}[uc]" statustext="DB ensures that every row has a unique value in that column"/>
 					<checkbox align="center" id="Row${row}[ix]" statustext="an indexed column speeds up querys using that column (cost space on the disk !!!)"/>
-					<textbox size="15" id="Row${row}[options]" statustext="DB-specific index options (comma-sep.), eg. mysql(FULLTEXT) or mysql(100) for the indexed length of a col"/>
-					<textbox size="20" align="center" id="Row${row}[fk]" statustext="name of other table where column is a key from"/>
 					<textbox size="8" id="Row${row}[default]" statustext="enter '' for an empty default, nothing mean no default"/>
+					<textbox size="20" id="Row${row}[comment]"/>
+					<textbox size="8" id="Row${row}[options]" statustext="DB-specific index options (comma-sep.), eg. mysql(FULLTEXT) or mysql(100) for the indexed length of a col"/>
+					<textbox size="8" align="center" id="Row${row}[fk]" statustext="name of other table where column is a key from"/>
 					<button label="Delete Column" align="center" id="delete[$row]" statustext="Deletes this column"/>
 				</row>
 			</rows>
@@ -113,7 +116,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="etemplate.db-tools.edit" template="" lang="" group="0" version="0.9.15.002">
+	<template id="etemplate.db-tools.edit" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column/>
@@ -125,6 +128,15 @@
 				<column/>
 			</columns>
 			<rows>
+				<row disabled="!@msg">
+					<description span="all" class="redItalic" id="msg"/>
+					<description/>
+					<description/>
+					<description/>
+					<description/>
+					<description/>
+					<description/>
+				</row>
 				<row>
 					<menulist>
 						<menupopup type="select-app" options="Select one ...,,all" label="Application" no_lang="1" id="app" onchange="1" statustext="Select an application, (*) = uninstalled"/>

From 95168d28bbcff6f6a5a66b10f5cbe1caf23b68fb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 13 May 2009 09:58:21 +0000
Subject: [PATCH 315/510] "method to access comments in schema definition"

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

diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index 0c689f9953..46a99f59f1 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -1078,4 +1078,24 @@ class so_sql
 		}
 		return $cache[$cache_key] =& $ret;
 	}
+
+	/**
+	 * Get comments for all columns or a specific one
+	 *
+	 * @param $column=null name of column or null for all (default)
+	 * @return array|string array with internal-name => comment pairs, or string with comment, if $column given
+	 */
+	public function get_comments($column=null)
+	{
+		static $comments;
+
+		if (is_null($comments))
+		{
+			foreach($this->db_cols as $db_col => $col)
+			{
+				$comments[$col] = $this->table_def['fd'][$db_col]['comment'];
+			}
+		}
+		return is_null($column) ? $comments : $comments[$column];
+	}
 }

From cf5fe6a10159f0501fec79d95a8a9c2bc4112109 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 13 May 2009 13:52:54 +0000
Subject: [PATCH 316/510] making sure the apps for ACL Management are sorted in
 Group-view

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

diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 79c6585b1f..70e0c108b0 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -1192,18 +1192,24 @@
 			}
 			reset($GLOBALS['egw_info']['apps']);
 			$sorted_apps = $GLOBALS['egw_info']['apps'];
-			@asort($sorted_apps);
-			@reset($sorted_apps);
-			while ($permission = each($sorted_apps))
+			foreach ($sorted_apps as $key => $values) {
+				$sortarray[$key] = strtolower($values['title']);
+			}
+			unset($key); unset($values);
+			@asort($sortarray);
+			@reset($sortarray);
+
+			foreach ($sortarray as $key => $value)
 			{
-				if ($permission[1]['enabled'] && $permission[1]['status'] != 3)
+				if ($sorted_apps[$key]['enabled'] && $sorted_apps[$key]['status'] != 3)
 				{
 					$perm_display[] = Array(
-						$permission[0],
-						$permission[1]['title']
+						$key,
+						$sorted_apps[$key]['title']
 					);
 				}
 			}
+			unset($key); unset($value);
 
 			$perm_html = '<td width="35%">'.lang('Application').'</td><td width="15%">'.lang('enabled').' / '.lang('ACL').'</td>';
 			$perm_html = '<tr class="th">'.

From 86f1dde06fd93bde246b4cac7270508cffe4f351 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 13 May 2009 14:33:36 +0000
Subject: [PATCH 317/510] configurable favicon, configurable vfs image store
 for images, logos, icons

---
 admin/templates/default/config.tpl       | 16 +++-
 phpgwapi/inc/class.common.inc.php        | 97 ++++++++++++------------
 phpgwapi/inc/class.egw_framework.inc.php | 14 +++-
 phpgwapi/inc/class.html.inc.php          |  5 +-
 4 files changed, 75 insertions(+), 57 deletions(-)

diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index f8a4c80ece..dc3cf039d0 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -75,6 +75,11 @@
     </td>
    </tr>
 
+   <tr class="row_off">
+    <td>{lang_Enter_the_VFS-Path_where_additional_images,_icons_or_logos_can be_placed_(and_found_by_EGroupwares_applications)._The_path_MUST_start_with_/,and_be_readable_by_all_users}:</td>
+    <td><input name="newsettings[vfs_image_dir]" value="{value_vfs_image_dir}"></td>
+   </tr>
+
   <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_appearance}</b></td>
    </tr>
@@ -100,6 +105,11 @@
    </tr>
 
    <tr class="row_on">
+    <td>{lang_Enter_the_URL_or_filename_(in_your_templates_image_directory)_of_your_favicon_(the_little_icon_that_appears_in_the_browsers_tabs)}:</td>
+    <td><input name="newsettings[favicon_file]" value="{value_favicon_file}"></td>
+   </tr>
+
+   <tr class="row_off">
     <td>{lang_Show_an_asterisk_(*)_to_mark_untranslated_strings}:</td>
     <td>
      <select name="newsettings[markuntranslated]">
@@ -109,14 +119,14 @@
     </td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_How_big_should_thumbnails_for_linked_images_be_(maximum_in_pixels)_?}:</td>
     <td>
      <input name="newsettings[link_list_thumbnail]" value="{value_link_list_thumbnail}" size="5">
     </td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_Enable_the_spellcheck_in_the_ritch_text_editor_?}:</td>
     <td>
      <select name="newsettings[enabled_spellcheck]">
@@ -126,7 +136,7 @@
     </td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Complete_path_to_aspell_program}:</td>
     <td>
      <input name="newsettings[aspell_path]" value="{value_aspell_path}" size="40">
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index a4347d74ba..a0e9c38e25 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -809,6 +809,7 @@ class common
 	function find_image($appname,$image)
 	{
 		$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
+		$vfs_imagedir = $GLOBALS['egw_info']['server']['vfs_image_dir'];
 
 		if (!@is_array(self::$found_files[$appname]))
 		{
@@ -853,6 +854,22 @@ class common
 				}
 				$d->close();
 			}
+
+			if (!isset(self::$found_files['vfs']) && egw_vfs::file_exists($vfs_imagedir) &&
+				egw_vfs::is_dir($vfs_imagedir) && ($d = egw_vfs::opendir($vfs_imagedir)))
+			{
+				while (($entry = readdir($d)) !== false)
+				{
+					if (!egw_vfs::is_dir($vfs_imagedir.'/'.$entry)) 
+					{
+						if (list($type,$subtype) = explode('/',egw_vfs::mime_content_type($vfs_imagedir.'/'.$entry)))// && $type == 'image')
+						{
+							if ($type == 'image' || $type == 'application') self::$found_files['vfs'][$entry] = $vfs_imagedir;
+						}
+					}
+				}
+				closedir($d);
+			}
 		}
 
 		if (!$GLOBALS['egw_info']['server']['image_type'])
@@ -865,64 +882,44 @@ class common
 			// priority: : PNG->JPG->GIF
 			$img_type=array('.png','.jpg','.gif');
 		}
+		$imgfile = '';
+		// first look in the instance specific image dir in vfs
+		foreach(array_merge($img_type,array('')) as $type)
+		{
+			// first look in the instance specific image dir in vfs
+			if(self::$found_files['vfs'][$image.$type]==$vfs_imagedir)
+			{
+				$imgfile = egw::link(egw_vfs::download_url(self::$found_files['vfs'][$image.$type].'/'.$image.$type));
+				break;
+			}
+			// then look in the selected template dir
+			if(self::$found_files[$appname][$image.$type]==$imagedir)
+			{
+				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$type].'/'.$image.$type;
+				break;
+			}
+			//then look everywhere else
+			if (isset(self::$found_files[$appname][$image.$type]))
+			{
+				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$type].'/'.$image.$type;
+				break;
+			}
+		}
 
-		// first look in the selected template dir
-		if(@self::$found_files[$appname][$image.$img_type[0]]==$imagedir)
-		{
-			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
-		}
-		elseif(@self::$found_files[$appname][$image.$img_type[1]]==$imagedir)
-		{
-			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[1]].'/'.$image.$img_type[1];
-		}
-		elseif(@self::$found_files[$appname][$image.$img_type[2]]==$imagedir)
-		{
-			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[2]].'/'.$image.$img_type[2];
-		}
-		// then look everywhere else
-		elseif(isset(self::$found_files[$appname][$image.$img_type[0]]))
-		{
-			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[0]].'/'.$image.$img_type[0];
-		}
-		elseif(isset(self::$found_files[$appname][$image.$img_type[1]]))
-		{
-			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[1]].'/'.$image.$img_type[1];
-		}
-		elseif(isset(self::$found_files[$appname][$image.$img_type[2]]))
-		{
-			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$img_type[2]].'/'.$image.$img_type[2];
-		}
-		elseif(isset(self::$found_files[$appname][$image]))
-		{
-			$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image].'/'.$image;
-		}
-		else
+		if (empty($imgfile)) 
 		{
 			// searching the image in the api-dirs
 			if (!isset(self::$found_files['phpgwapi']))
 			{
 				$this->find_image('phpgwapi','');
 			}
-
-			if(isset(self::$found_files['phpgwapi'][$image.$img_type[0]]))
+			foreach(array_merge($img_type,array('')) as $type)
 			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image.$img_type[0]].'/'.$image.$img_type[0];
-			}
-			elseif(isset(self::$found_files['phpgwapi'][$image.$img_type[1]]))
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image.$img_type[1]].'/'.$image.$img_type[1];
-			}
-			elseif(isset(self::$found_files['phpgwapi'][$image.$img_type[2]]))
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image.$img_type[2]].'/'.$image.$img_type[2];
-			}
-			elseif(isset(self::$found_files['phpgwapi'][$image]))
-			{
-				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image].'/'.$image;
-			}
-			else
-			{
-				$imgfile = '';
+				if(isset(self::$found_files['phpgwapi'][$image.$type]))
+				{
+					$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files['phpgwapi'][$image.$type].'/'.$image.$type;
+					break;
+				}
 			}
 		}
 		return $imgfile;
diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index e15e3eb528..69da1f8e20 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -241,10 +241,20 @@ abstract class egw_framework
 		}
 
 		if($app!='wiki') $robots ='<meta name="robots" content="none" />';
+		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
+		{
+			$var['favicon_file'] = $GLOBALS['egw_info']['server']['favicon_file'];
+		}
+		else
+		{
+			$var['favicon_file'] = $GLOBALS['egw']->common->image('phpgwapi',$GLOBALS['egw_info']['server']['favicon_file']?$GLOBALS['egw_info']['server']['favicon_file']:'favicon.ico');
+		}
 
 		return $this->_get_css()+array(
-			'img_icon'      	=> EGW_IMAGES_DIR . '/favicon.ico',
-			'img_shortcut'  	=> EGW_IMAGES_DIR . '/favicon.ico',
+			#'img_icon'      	=> EGW_IMAGES_DIR . '/favicon.ico',
+			'img_icon'			=> $var['favicon_file'],
+			#'img_shortcut'  	=> EGW_IMAGES_DIR . '/favicon.ico',
+			'img_shortcut'		=> $var['favicon_file'],
 			'pngfix'        	=> $pngfix,
 			'slider_effects'	=> $slider_effects,
 			'simple_show_hide'	=> $simple_show_hide,
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 435bcb0582..48f74926ca 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -889,8 +889,9 @@ class html
 		{
 			$name = $GLOBALS['egw']->link('/index.php',$name);
 		}
-		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')
+		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://' || stripos($name,'etemplate/thumbnail.php') )
 		{
+			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')) $name = '/'.$name;
 			$url = $name;
 		}
 		else	// no URL, so try searching the image
@@ -912,7 +913,7 @@ class html
 				$path = EGW_SERVER_ROOT.$url;
 			}
 
-			if (is_null($path) || !@is_readable($path))
+			if (is_null($path) || (!@is_readable($path) && stripos($path,'webdav.php')===false))
 			{
 				// if the image-name is a percentage, use a progressbar
 				if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))

From b8cfd7f85d6b968b1686aa7840228f52d6aef6fb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 13 May 2009 21:21:46 +0000
Subject: [PATCH 318/510] "allow to use same names for add() and edit() as
 returned by read_single() or return_array"

---
 phpgwapi/inc/class.categories.inc.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index 8c2a7f7adc..2bfef42650 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -424,7 +424,9 @@ class categories
 	}
 
 	/**
-	 * add a category
+	 * Add a category
+	 *
+	 * Owner and appname are set from the values used to instanciate the class!
 	 *
 	 * @param array $value cat-data
 	 * @return int new cat-id
@@ -436,21 +438,13 @@ class categories
 			$values['level'] = $this->id2name($values['parent'],'level')+1;
 			$values['main'] = $this->id2name($values['parent'],'main');
 		}
-
-		$values = array_merge(
-			array(
-				'app_name'	=> $this->app_name,
-				'access'	=> 'public',
-			),
-			$values);
-
 		$this->db->insert(self::TABLE,array(
 			'cat_parent'  => $values['parent'],
 			'cat_owner'   => $this->account_id,
-			'cat_access'  => $values['access'],
-			'cat_appname' => $values['app_name'],
+			'cat_access'  => isset($values['access']) ? $values['access'] : 'public',
+			'cat_appname' => $this->app_name,
 			'cat_name'    => $values['name'],
-			'cat_description' => $values['descr'],
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from returned one
 			'cat_data'    => $values['data'],
 			'cat_main'    => $values['main'],
 			'cat_level'   => $values['level'],
@@ -459,7 +453,7 @@ class categories
 
 		$id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE,'cat_id');
 
-		if (!(int)$values['parent'])
+		if (!(int)$values['parent'] && $id != $values['main'])
 		{
 			$this->db->update(self::TABLE,array('cat_main' => $id),array('cat_id' => $id),__LINE__,__FILE__);
 		}
@@ -531,6 +525,8 @@ class categories
 	/**
 	 * edit / update a category
 	 *
+	 * Owner and appname are set from the values used to instanciate the class!
+	 *
 	 * @param array $values array with cat-data (it need to be complete, as everything get's written)
 	 * @return int cat-id
 	 */
@@ -557,7 +553,7 @@ class categories
 		}
 		$this->db->update(self::TABLE,array(
 			'cat_name' => $values['name'],
-			'cat_description' => $values['descr'],
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from the one read
 			'cat_data' => $values['data'],
 			'cat_parent' => $values['parent'],
 			'cat_access' => $values['access'],

From 65e53bd1e87189be0f7ac500068bde2d3c8cd2ca Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 06:41:28 +0000
Subject: [PATCH 319/510] "fixed wrong webdav.php urls, if no vfs_image_dir
 set"

---
 phpgwapi/inc/class.common.inc.php | 37 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index a0e9c38e25..6ebdb8671f 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -806,7 +806,7 @@ class common
 	 * @param string $image
 	 * @return string url of the image
 	 */
-	function find_image($appname,$image)
+	static function find_image($appname,$image)
 	{
 		$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
 		$vfs_imagedir = $GLOBALS['egw_info']['server']['vfs_image_dir'];
@@ -860,7 +860,7 @@ class common
 			{
 				while (($entry = readdir($d)) !== false)
 				{
-					if (!egw_vfs::is_dir($vfs_imagedir.'/'.$entry)) 
+					if (!egw_vfs::is_dir($vfs_imagedir.'/'.$entry))
 					{
 						if (list($type,$subtype) = explode('/',egw_vfs::mime_content_type($vfs_imagedir.'/'.$entry)))// && $type == 'image')
 						{
@@ -871,23 +871,22 @@ class common
 				closedir($d);
 			}
 		}
-
 		if (!$GLOBALS['egw_info']['server']['image_type'])
 		{
 			// priority: GIF->JPG->PNG
-			$img_type=array('.gif','.jpg','.png');
+			$img_type = array('.gif','.jpg','.png','');
 		}
 		else
 		{
 			// priority: : PNG->JPG->GIF
-			$img_type=array('.png','.jpg','.gif');
+			$img_type = array('.png','.jpg','.gif','');
 		}
 		$imgfile = '';
 		// first look in the instance specific image dir in vfs
-		foreach(array_merge($img_type,array('')) as $type)
+		foreach($img_type as $type)
 		{
 			// first look in the instance specific image dir in vfs
-			if(self::$found_files['vfs'][$image.$type]==$vfs_imagedir)
+			if(isset(self::$found_files['vfs'][$image.$type]))
 			{
 				$imgfile = egw::link(egw_vfs::download_url(self::$found_files['vfs'][$image.$type].'/'.$image.$type));
 				break;
@@ -906,12 +905,12 @@ class common
 			}
 		}
 
-		if (empty($imgfile)) 
+		if (empty($imgfile))
 		{
 			// searching the image in the api-dirs
 			if (!isset(self::$found_files['phpgwapi']))
 			{
-				$this->find_image('phpgwapi','');
+				self::find_image('phpgwapi','');
 			}
 			foreach(array_merge($img_type,array('')) as $type)
 			{
@@ -922,6 +921,7 @@ class common
 				}
 			}
 		}
+		//echo "<p>".__METHOD__."($appname,$image) = $imgfile</p>\n";
 		return $imgfile;
 	}
 
@@ -934,7 +934,7 @@ class common
 	 * @param boolean $use_lang
 	 * @return string url of the image
 	 */
-	function image($appname,$image='',$ext='',$use_lang=True)
+	static function image($appname,$image='',$ext='',$use_lang=True)
 	{
 		if (!is_array($image))
 		{
@@ -942,28 +942,29 @@ class common
 			{
 				return '';
 			}
-			$image = array($image);
 		}
 		if ($use_lang)
 		{
-			while (list(,$img) = each($image))
+			foreach((array)$image as $img)
 			{
 				$lang_images[] = $img . '_' . $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 				$lang_images[] = $img;
 			}
 			$image = $lang_images;
 		}
-		while (empty($image_found) && list(,$img) = each($image))
+		foreach((array)$image as $img)
 		{
 			if(isset(self::$found_files[$appname][$img.$ext]))
 			{
-				$image_found = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$img.$ext].'/'.$img.$ext;
+				$image_found = self::$found_files[$appname][$img.$ext].'/'.$img.$ext;
 			}
 			else
 			{
-				$image_found = $this->find_image($appname,$img.$ext);
+				$image_found = self::find_image($appname,$img.$ext);
 			}
+			if ($image_found) break;
 		}
+		//echo "<p>".__METHOD__."($appname,".array2string($image).",$ext,$use_lang) = $image_found</p>\n";
 		return $image_found;
 	}
 
@@ -975,13 +976,13 @@ class common
 	 * @param string $extension
 	 * @return string url of the image
 	 */
-	function image_on($appname,$image,$extension='_on')
+	static function image_on($appname,$image,$extension='_on')
 	{
-		if (($with_extension = $this->image($appname,$image,$extension)))
+		if (($with_extension = self::image($appname,$image,$extension)))
 		{
 			return $with_extension;
 		}
-		if(($without_extension = $this->image($appname,$image)))
+		if(($without_extension = self::image($appname,$image)))
 		{
 			return $without_extension;
 		}

From c133b4b106eb5561911d6228aa5c059ee9a775ba Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 07:59:51 +0000
Subject: [PATCH 320/510] "- docu update - using public and private for class
 vars - __construct()"

---
 phpgwapi/inc/class.categories.inc.php | 28 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index 2bfef42650..15bba26460 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -35,38 +35,38 @@ class categories
 	 *
 	 * @var int
 	 */
-	var $account_id;
+	public $account_id;
 	/**
 	 * Application this class is instancated for ('phpgw' for application global cats)
 	 *
 	 * @var string
 	 */
-	var $app_name;
+	public $app_name;
 	/**
 	 * @var egw_db
 	 */
-	var $db;
+	private $db;
 	/**
 	 * Total number of records of return_(sorted_)array (returning only a limited number of rows)
 	 *
 	 * @var int
 	 */
-	var $total_records;
+	public $total_records;
 	/**
 	 * Grants from other users for account_id and app_name (init by return array)
 	 *
 	 * @var array
 	 */
-	var $grants;
+	public $grants;
 	/**
 	 * Name of the categories table
 	 */
 	const TABLE = 'egw_categories';
 	/**
-	 * @deprecated use categoris::TABLE
+	 * @deprecated use categories::TABLE
 	 * @var string
 	 */
-	var $table = self::TABLE;
+	public $table = self::TABLE;
 	/**
 	 * Cache holding all categories, set via init_cache() method
 	 *
@@ -74,14 +74,13 @@ class categories
 	 */
 	private static $cache;
 
-
 	/**
 	 * constructor for categories class
 	 *
 	 * @param int/string $accountid='' account id or lid, default to current user
 	 * @param string $app_name='' app name defaults to current app
 	 */
-	function categories($accountid='',$app_name = '')
+	function __construct($accountid='',$app_name = '')
 	{
 		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -95,6 +94,16 @@ class categories
 		}
 	}
 
+	/**
+	 * php4 constructor
+	 *
+	 * @deprecated
+	 */
+	function categories($accountid='',$app_name='')
+	{
+		self::__construct($accountid,$app_name);
+	}
+
 	/**
 	 * return_all_children
 	 * returns array with id's of all children from $cat_id and $cat_id itself!
@@ -268,7 +277,6 @@ class categories
 		}
 		while (count($parents))
 		{
-			$sub_select = ' AND cat_parent IN (' . implode(',',$parents) . ')';
 			if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents)))
 			{
 				break;

From fe03b91b548a46588becfe45accc080bcb0aed06 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 08:02:56 +0000
Subject: [PATCH 321/510] "- 5th option for select-cat: parent category -
 adding category desciption (if available) as option title"

---
 etemplate/inc/class.select_widget.inc.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/etemplate/inc/class.select_widget.inc.php b/etemplate/inc/class.select_widget.inc.php
index 8113c0a8e1..2ef63fcb07 100644
--- a/etemplate/inc/class.select_widget.inc.php
+++ b/etemplate/inc/class.select_widget.inc.php
@@ -152,7 +152,7 @@ class select_widget
 				$cell['no_lang'] = True;
 				break;
 
-			case 'select-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app
+			case 'select-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id
 				if ($readonly)	// for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
@@ -175,13 +175,13 @@ class select_widget
 				}
 				if (!$type3 || $type3 === $GLOBALS['egw']->categories->app_name)
 				{
-					$categories =& $GLOBALS['egw']->categories;
+					$categories = $GLOBALS['egw']->categories;
 				}
 				else	// we need to instanciate a new cat object for the correct application
 				{
-					$categories =& new categories('',$type3);
+					$categories = new categories('',$type3);
 				}
-				foreach((array)$categories->return_sorted_array(0,False,'','','',!$type) as $cat)
+				foreach((array)$categories->return_sorted_array(0,False,'','','',!$type,$type4) as $cat)
 				{
 					$s = str_repeat('&nbsp;',$cat['level']) . stripslashes($cat['name']);
 
@@ -189,14 +189,10 @@ class select_widget
 					{
 						$s .= ' &#9830;';
 					}
-					if (!$tmpl->xslt)
-					{
-						$cell['sel_options'][$cat['id']] = $s;	// 0.9.14 only
-					}
-					else
-					{
-						$cell['sel_options'][$cat['cat_id']] = $s;
-					}
+					$cell['sel_options'][$cat['id']] = empty($cat['description']) ? $s : array(
+						'label' => $s,
+						'title' => $cat['description'],
+					);
 				}
 				// preserv unavailible cats (eg. private user-cats)
 				if ($value && ($unavailible = array_diff(is_array($value) ? $value : explode(',',$value),array_keys((array)$cell['sel_options']))))

From 31cb95989eeaee12cb35478d743b008ae6c624fd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 10:22:13 +0000
Subject: [PATCH 322/510] "allow static get_rows callbacks, eg.
 'app_ui::get_rows': - on php5.3+ they get directly called via a variable:
 $callback($query,$rows,$readonlys) - on php < 5.3 we instancate the class, an
 call the method non-static: $obj->$method($query,$rows,$readonlys) --> allows
 application code to be prepared for static callbacks Note: - we can not use
 call_user_func, as it does NOT support passing by reverence, which is
 required for $rows and $readonlys parameter - static callbacks allow to NOT
 instanciate the class again for the callback (without current dirty methods
 like placing the object in $GLOBALS[$class])"

---
 etemplate/inc/class.nextmatch_widget.inc.php | 36 ++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 52b7d782f8..4da07089b1 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -269,9 +269,22 @@ class nextmatch_widget
 		if (!$value['filter_onchange']) $value['filter_onchange'] = 'this.form.submit();';
 		if (!$value['filter2_onchange']) $value['filter2_onchange'] = 'this.form.submit();';
 
-		list($app,$class,$method) = explode('.',$value['get_rows']);
-		if ($app && $class)
+		// allow static callbacks
+		if(strpos($method=$value['get_rows'],'::') !== false)
 		{
+			//  workaround for php < 5.3: do NOT call it static, but allow application code to specify static callbacks
+			if (version_compare(PHP_VERSION,'5.3','<')) list($class,$method) = explode('::',$method);
+		}
+		else
+		{
+			list($app,$class,$method) = explode('.',$value['get_rows']);
+		}
+		if ($class)
+		{
+			if (!$app && !is_object($GLOBALS[$class]))
+			{
+				$GLOBALS[$class] = new $class();
+			}
 			if (is_object($GLOBALS[$class]))	// use existing instance (put there by a previous CreateObject)
 			{
 				$obj =& $GLOBALS[$class];
@@ -309,19 +322,30 @@ class nextmatch_widget
 			$value['options-selectcols'] = array();
 		}
 		$rows = array();
-		if (!is_object($obj) || !method_exists($obj,$method))
+		if(is_callable($method))	// php5.3+ call
 		{
-			etemplate::set_validation_error($name,"nextmatch_widget::pre_process($cell[name]): '$value[get_rows]' is no valid method !!!");
+			$total = $extension_data['total'] = $value['total'] = $method($value['get_rows'],$value,$rows,$readonlys['rows']);
 		}
-		else
+		elseif(is_object($obj) && method_exists($obj,$method))
 		{
 			if (!is_array($readonlys)) $readonlys = array();
 			$total = $extension_data['total'] = $value['total'] = $obj->$method($value,$rows,$readonlys['rows']);
 		}
+		else
+		{
+			etemplate::set_validation_error($name,"nextmatch_widget::pre_process($cell[name]): '$value[get_rows]' is no valid method !!!");
+		}
 		if ($method && $total && $value['start'] >= $total)
 		{
 			$value['start'] = 0;
-			$total = $extension_data['total'] = $value['total'] = $obj->$method($value,$rows,$readonlys['rows']);
+			if (is_object($obj))
+			{
+				$total = $extension_data['total'] = $value['total'] = $obj->$method($value,$rows,$readonlys['rows']);
+			}
+			else
+			{
+				$total = $extension_data['total'] = $value['total'] = $method($value['get_rows'],$value,$rows,$readonlys['rows']);
+			}
 		}
 		// allow the get_rows function to override / set sel_options
 		if (isset($rows['sel_options']) && is_array($rows['sel_options']))

From 697b2b613c1d1ed1682f4c15c66f84d92cb88011 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 11:09:55 +0000
Subject: [PATCH 323/510] "fixed not saving option to show only the date (not
 year) of birthdays from contacts "

---
 calendar/templates/default/config.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar/templates/default/config.tpl b/calendar/templates/default/config.tpl
index 49d837da97..550576b8f7 100644
--- a/calendar/templates/default/config.tpl
+++ b/calendar/templates/default/config.tpl
@@ -54,7 +54,7 @@
     <td>
      <select name="newsettings[hide_birthdays]">
       <option value="">{lang_Yes}</option>
-      <option value="date_only"{selected_hide_birthdays_date_only}>{lang_Show_only_the_date,_not_the_year}</option>
+      <option value="dateonly"{selected_hide_birthdays_dateonly}>{lang_Show_only_the_date,_not_the_year}</option>
       <option value="yes"{selected_hide_birthdays_yes}>{lang_No}</option>
      </select>
     </td>

From e8b8d2859b6797ad98cb4457fb0c821505c2775f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 17:11:17 +0000
Subject: [PATCH 324/510] "- opening popup centered - using static egw::link()"

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

diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php
index 791a235875..d5427bcb86 100644
--- a/addressbook/inc/class.addressbook_hooks.inc.php
+++ b/addressbook/inc/class.addressbook_hooks.inc.php
@@ -30,21 +30,21 @@ class addressbook_hooks
 		{
 			$file = array(
 				array(
-					'text' => '<a class="textSidebox" href="'.$GLOBALS['egw']->link('/index.php',array('menuaction' => 'addressbook.addressbook_ui.edit')).
-						'" onclick="window.open(this.href,\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\');
+					'text' => '<a class="textSidebox" href="'.egw::link('/index.php',array('menuaction' => 'addressbook.addressbook_ui.edit')).
+						'" onclick="egw_openWindowCentered2(this.href,\'_blank\',850,440,\'yes\');
 						return false;">'.lang('Add').'</a>',
 					'no_lang' => true,
 					'link' => false
 				),
 				array(
-					'text' => '<a class="textSidebox" href="'.$GLOBALS['egw']->link('/index.php',array(
+					'text' => '<a class="textSidebox" href="'.egw::link('/index.php',array(
 						'menuaction' => 'addressbook.addressbook_ui.search',)).
-						'" onclick="window.open(this.href,\'advanced_search\',\'dependent=yes,width=850,height=480,scrollbars=yes,status=yes\');
+						'" onclick="egw_openWindowCentered2(this.href,\'advanced_search\',850,480,\'yes\');
 						return false;">'.lang('Advanced search').'</a>',
 					'no_lang' => true,
 					'link' => false
 				),
-				'CSV-Import'      => $GLOBALS['egw']->link('/addressbook/csv_import.php')
+				'CSV-Import'      => egw::link('/addressbook/csv_import.php')
 			);
 			display_sidebox($appname,lang('Addressbook menu'),$file);
 		}
@@ -52,9 +52,9 @@ class addressbook_hooks
 		if ($GLOBALS['egw_info']['user']['apps']['preferences'] && $location != 'admin')
 		{
 			$file = array(
-				'Preferences'     => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname='.$appname),
-				'Grant Access'    => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
-				'Edit Categories' => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True')
+				'Preferences'     => egw::link('/index.php','menuaction=preferences.uisettings.index&appname='.$appname),
+				'Grant Access'    => egw::link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
+				'Edit Categories' => egw::link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True')
 			);
 			if ($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' || $GLOBALS['egw_info']['server']['deny_user_grants_access'])
 			{
@@ -73,11 +73,11 @@ class addressbook_hooks
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && $location != 'preferences')
 		{
 			$file = Array(
-				'Site configuration' => $GLOBALS['egw']->link('/index.php',array(
+				'Site configuration' => egw::link('/index.php',array(
 					'menuaction' => 'admin.uiconfig.index',
 					'appname'    => $appname,
 				)),
-				'Global Categories'  => $GLOBALS['egw']->link('/index.php',array(
+				'Global Categories'  => egw::link('/index.php',array(
 					'menuaction' => 'admin.uicategories.index',
 					'appname'    => $appname,
 					'global_cats'=> True,
@@ -86,7 +86,7 @@ class addressbook_hooks
 			// custom fields are not availible in LDAP
 			if ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
 			{
-				$file['Custom fields'] = $GLOBALS['egw']->link('/index.php',array(
+				$file['Custom fields'] = egw::link('/index.php',array(
 					'menuaction' => 'admin.customfields.edit',
 					'appname'    => $appname,
 					'use_private'=> 1,
@@ -234,7 +234,7 @@ class addressbook_hooks
 		);
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
-			$link = $GLOBALS['egw']->link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements');
+			$link = egw::link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements');
 
 			$settings['default_document'] = array(
 				'type'   => 'input',
@@ -275,7 +275,7 @@ class addressbook_hooks
 			'description' => 'Addressbook',
 			'url'         => '/index.php',
 			'extradata'   => 'menuaction=addressbook.addressbook_ui.edit',
-			'options'     => "onclick=\"window.open(this,'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;\"".
+			'options'     => "onclick=\"egw_openWindowCentered2(this,'_blank',850,440,'yes'); return false;\"".
 				' title="'.htmlspecialchars(lang('Edit extra account-data in the addressbook')).'"',
 		);
 	}

From 5d7b9133f1d04005219ed1674701ac6fec0114ff Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 17:38:09 +0000
Subject: [PATCH 325/510] using is_readable

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

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index f92cbf7b9d..af0000f6bd 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -150,7 +150,7 @@ class vfs_widget
 								break;
 						}
 					}
-					if (egw_vfs::check_access($path,egw_vfs::READABLE))	// show link only if we have access to the file or dir
+					if (egw_vfs::is_readable($path))	// show link only if we have access to the file or dir
 					{
 						if ($n < count($comps)-1 || $mime == egw_vfs::DIR_MIME_TYPE || egw_vfs::is_dir($path))
 						{
@@ -163,6 +163,7 @@ class vfs_widget
 							$target = ',,,_blank';
 						}
 					}
+
 					if ($cell['onclick'])
 					{
 						$comp = etemplate::empty_cell('button',$cell_name.'[c'.$n.']',array(

From a94586bad4c595f1eb958ace5690ca850c58234c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 17:42:48 +0000
Subject: [PATCH 326/510] New syntax (@@name) to access values absolute to the
 content array ofs the request. Here's an example: $content['my-label'] = $id
 ? 'Edit' : 'Add'; You can use it now in the template of an nextmatch row for
 the label: @@my-label Saved the need to import these kind of data in the
 get_rows function into the rows.

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

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 0c93b6f516..84fb3fcd34 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -170,7 +170,14 @@ class boetemplate extends soetemplate
 		}
 		if ($is_index_in_content)
 		{
-			$name = boetemplate::get_array($cont,substr($name,1));
+			if ($name[1] == '@')
+			{
+				$name = self::get_array(self::$request->content,substr($name,2));
+			}
+			else
+			{
+				$name = self::get_array($cont,substr($name,1));
+			}
 		}
 		return $name;
 	}

From 2a03d32d810d5f812020dfbe7f62222ad1638206 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 17:45:00 +0000
Subject: [PATCH 327/510] Automatic import labels into the content of an edited
 template via a callback: ${app}_bo::labels(). They are set as
 $content['labels']

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

diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index 2274adf02c..85e3a33921 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -509,6 +509,13 @@ class editor
 					unserialize(substr($vals["A$r"],0,-5)) : $vals["A$r"];
 			}
 		}
+		// check if bo class of $app exists and has a labels method --> add labels to content to display them in the editor
+		if(class_exists($app.'_bo') && method_exists($app.'_bo','labels'))
+		{
+			$new_content['labels'] = ExecMethod($acm=$app.'.'.$app.'_bo.labels');
+			$new_content['cont']['labels'] =& $new_content['labels'];
+			//echo $acm; _debug_array($new_content['labels']);
+		}
 		$preserv['olds'] = $vals;
 		$preserv['old_keys'] = $this->etemplate->as_array(-1);	// in case we do a save as
 

From a083233c43417fa12f4f38b31c6e2d013fbfab29 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 15 May 2009 07:18:06 +0000
Subject: [PATCH 328/510] "allow to use now() beside current_timestamp, as
 Postgres backups contain it and it's easier to remember anyway"

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

diff --git a/phpgwapi/inc/class.schema_proc.inc.php b/phpgwapi/inc/class.schema_proc.inc.php
index efb768033e..56d29a4aa9 100644
--- a/phpgwapi/inc/class.schema_proc.inc.php
+++ b/phpgwapi/inc/class.schema_proc.inc.php
@@ -1030,7 +1030,8 @@ class schema_proc
 					break;
 				case 'date':
 					$ado_col = 'D';
-					if ($col_data['default'] == 'current_date')
+					// allow to use now() beside current_date, as Postgres backups contain it and it's easier to remember anyway
+					if (in_array($col_data['default'],array('current_date','now()')))
 					{
 						$ado_col .= ' DEFDATE';
 						unset($col_data['default']);
@@ -1064,7 +1065,8 @@ class schema_proc
 					break;
 				case 'timestamp':
 					$ado_col = 'T';
-					if ($col_data['default'] == 'current_timestamp')
+					// allow to use now() beside current_timestamp, as Postgres backups contain it and it's easier to remember anyway
+					if (in_array($col_data['default'],array('current_timestamp','now()')))
 					{
 						$ado_col .= ' DEFTIMESTAMP';
 						unset($col_data['default']);

From f4b09d620f07c5ee78613a567f4c6d45a91c70b9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 15 May 2009 07:35:58 +0000
Subject: [PATCH 329/510] "allow one-letter name/mailbox part in an email
 address"

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

diff --git a/etemplate/inc/class.url_widget.inc.php b/etemplate/inc/class.url_widget.inc.php
index 02854bf693..cb75e62ef2 100644
--- a/etemplate/inc/class.url_widget.inc.php
+++ b/etemplate/inc/class.url_widget.inc.php
@@ -61,7 +61,7 @@ class url_widget
 	 *
 	 * has to be used case insensitive: /i
 	 */
-	const EMAIL_PREG = '[a-z0-9][a-z0-9._-]*[a-z0-9]@(([a-z0-9]*[a-z0-9]\.)|([a-z0-9][a-z0-9_-]*[a-z0-9]\.))+[a-z0-9][a-z0-9_-]*[a-z0-9]';
+	const EMAIL_PREG = '([a-z0-9][a-z0-9._-]*)?[a-z0-9]@(([a-z0-9]*[a-z0-9]\.)|([a-z0-9][a-z0-9_-]*[a-z0-9]\.))+[a-z0-9][a-z0-9_-]*[a-z0-9]';
 
 	/**
 	 * pre-processing of the extension

From 67b0a09c15ac49bd3f74973415964a99c2d44cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Manuel=20G=C3=B3mez=20Senovilla?=
 <omgs@escomposlinux.org>
Date: Fri, 15 May 2009 15:33:15 +0000
Subject: [PATCH 330/510] update spanish translation

---
 addressbook/setup/egw_es-es.lang   | 20 +++++++++++++++-
 admin/setup/egw_es-es.lang         | 22 +++++++++++++++--
 filemanager/setup/egw_es-es.lang   | 15 ++++++++++++
 infolog/setup/egw_es-es.lang       |  9 ++++---
 notifications/setup/egw_es-es.lang | 24 ++++++++++++++++---
 phpgwapi/setup/egw_es-es.lang      | 22 ++++++++++-------
 setup/lang/egw_es-es.lang          |  8 +++----
 timesheet/setup/egw_es-es.lang     | 38 ++++++++++++++++++++++++++++++
 8 files changed, 135 insertions(+), 23 deletions(-)

diff --git a/addressbook/setup/egw_es-es.lang b/addressbook/setup/egw_es-es.lang
index 63884f718a..254a8fe25e 100644
--- a/addressbook/setup/egw_es-es.lang
+++ b/addressbook/setup/egw_es-es.lang
@@ -1,6 +1,7 @@
 %1 added	addressbook	es-es	%1 añadidos
 %1 contact(s) %2	addressbook	es-es	%1 contactos %2
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	es-es	%1 contactos %2, %3 fallaron debido a privilegios insuficientes.
+%1 contacts updated (%2 errors).	addressbook	es-es	Se han actualizado %1 contactos (%2 errores).
 %1 fields in %2 other organisation member(s) changed	addressbook	es-es	%1 campos en %2 miembros de otra organización cambiados
 %1 records imported	addressbook	es-es	Se han importado %1 registros
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	es-es	Se han leído %1 registros (no importados todavía, puede volver %2atrás%3 y desmarcar la prueba de importación)
@@ -35,6 +36,7 @@ address line 2	addressbook	es-es	Línea 2 de la dirección
 address type	addressbook	es-es	Tipo de dirección
 addressbook	common	es-es	Libreta de direcciones
 addressbook csv export	addressbook	es-es	Exportar a CSV la libreta de direcciones
+addressbook field	addressbook	es-es	Campo de la libreta de direcciones
 addressbook menu	addressbook	es-es	Menú de la libreta de direcciones
 addressbook preferences	addressbook	es-es	Preferencias de la libreta de direcciones
 addressbook the contact should be saved to	addressbook	es-es	Libreta de direcciones en la que guardar el contacto
@@ -95,6 +97,7 @@ contact deleted	addressbook	es-es	Se ha borrado el contacto
 contact fields to show	addressbook	es-es	Campos del contacto a mostrar
 contact fields:	addressbook	es-es	Campos del contacto:
 contact id	addressbook	es-es	ID del contacto
+contact maintenance	admin	es-es	Mantenimiento del contacto
 contact modified by %1 at %2	addressbook	es-es	Contacto modificado por %1 el %2
 contact not found!	addressbook	es-es	¡No se encontró el contacto!
 contact repository	admin	es-es	Repositorio de contactos
@@ -113,7 +116,8 @@ country	common	es-es	País
 create new links	addressbook	es-es	Crear enlaces nuevos
 created	addressbook	es-es	Creado
 credit	addressbook	es-es	Crédito
-csv-fieldname	addressbook	es-es	Campo CSV
+csv field	addressbook	es-es	Campo CSV
+csv-fieldname	addressbook	es-es	Nombre de campo CSV
 csv-filename	addressbook	es-es	Archivo CSV
 custom	addressbook	es-es	Personalizado
 custom etemplate for the contactform	addressbook	es-es	Plantilla personalizada para el formulario del contacto
@@ -140,6 +144,7 @@ display contact	addressbook	es-es	Mostrar contacto
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	es-es	Muestra un recordatorio para los cumpleaños en la página de inicio (la página que se ve al entrar en eGroupWare o pulsar en el icono de inicio).
 distribution list deleted	addressbook	es-es	Lista de distribución borrada
 distribution lists	addressbook	es-es	Listas de distribución
+distribution lists, ...	addressbook	es-es	Listas de distribución, ...
 do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	es-es	¿Desea una libreta de direcciones privada, que no pueden ver otros usuarios (a menos que conceda acceso a su libreta de direcciones personal)?
 do your really want to delete this contact?	addressbook	es-es	¿Realmente desea borrar este contacto?
 document '%1' does not exist or is not readable for you!	addressbook	es-es	El documento '%1' no existe o usted no tiene permiso para leerlo
@@ -157,8 +162,10 @@ edit phonenumbers -	addressbook	es-es	Editar números de teléfono -
 either the configured email addesses are wrong or the mail configuration.	addressbook	es-es	Las direcciones de correo electrónico configuradas o la configuración del correo es incorrecta
 email & internet	addressbook	es-es	Correo electrónico e Internet
 email addresses (comma separated) to send the contact data	addressbook	es-es	Direcciones de correo electrónico (separadas por comas) para enviar los datos del contacto
+empty	admin	es-es	Vacío
 empty for all	addressbook	es-es	vacío para todo
 enable an extra private addressbook	addressbook	es-es	Activar una libreta de direcciones privada extra
+enclosure	addressbook	es-es	Envoltura
 end	addressbook	es-es	Fin
 enter the path to the exported file here	addressbook	es-es	Introduzca aquí la ruta a los ficheros exportados
 error deleting the contact !!!	addressbook	es-es	¡Error al borrar el contacto!
@@ -176,6 +183,7 @@ export selection	addressbook	es-es	Exportar la selección
 exported	addressbook	es-es	exportada
 exports contacts from your addressbook into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	es-es	Exporta los contactos de su libreta de direcciones en un fichero CSV. CSV significa 'Comma Separated Values' (valores separados por comas). Sin embargo, en la pestaña de opciones se pueden elegir otros separadores.
 extra	addressbook	es-es	Extra
+extra private	addressbook	es-es	Extra privado
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	es-es	Fallo al cambiar %1 miembros de la organización ¡No tiene privilegios suficientes!
 fax	addressbook	es-es	Fax
 fax number	common	es-es	Número de fax
@@ -186,6 +194,7 @@ fields for the csv export	addressbook	es-es	Campos para exportar a CSV
 fields the user is allowed to edit himself	admin	es-es	Campos que el propio usuario puede editar
 fields to show in address list	addressbook	es-es	Campos a mostrar en la lista de direcciones
 fieldseparator	addressbook	es-es	Separador de campos
+fieldseperator	addressbook	es-es	Separador de campos
 for more then one contact in a document use the tag pagerepeat!	addressbook	es-es	para más de un contacto en un documento use la etiqueta pagerepeat
 for read only ldap	admin	es-es	para LDAP de sólo lectura
 for serial letter use this tag. put the content, you want to repeat between two tags.	addressbook	es-es	Para carta de serie use esta etiqueta. Ponga el contenido que quiera repetir entre dos etiquetas.
@@ -215,6 +224,7 @@ icon	addressbook	es-es	Icono
 if accounts are already in ldap	admin	es-es	si las cuentas ya están en LDAP
 if you specify a directory (full vfs path) here, addressbook displays an action for each document. that action allows to download the specified document with the contact data inserted.	addressbook	es-es	Si especifica un directorio (ruta completa vfs) aquí, la libreta de direcciones muestra una acción para cada documento. Esa acción permite descargar el documento especificado con los datos del contacto insertados.
 if you specify a document (full vfs path) here, addressbook displays an extra document icon for each address. that icon allows to download the specified document with the contact data inserted.	addressbook	es-es	Si especifica un documento (ruta completa vfs) aquí, la libreta de direcciones muestra un icono de documento extra para cada dirección. Ese icono permite descargar el documento especificado con los datos del contacto insertados.
+ignore first line	addressbook	es-es	Ignorar la primera línea
 import	addressbook	es-es	Importar
 import contacts	addressbook	es-es	Importar contactos
 import csv-file into addressbook	addressbook	es-es	Importar archivo CSV en la Libreta de direcciones
@@ -228,9 +238,11 @@ import_instructions	addressbook	es-es	Si usa Mozilla o Netscape, abra la libreta
 imports contacts into your addressbook from a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	es-es	Importa los contactos en la libreta de direcciones desde un fichero CSV. CSV significa 'Valores separados por comas'. Sin embargo, en la pestaña de opciones, también se pueden elegir otros separadores.
 in %1 days (%2) is %3's birthday.	addressbook	es-es	En %1 días (%2) es el cumpleaños de %3.
 income	addressbook	es-es	Ingresos
+infolog	addressbook	es-es	Registro de tareas
 insert in document	addressbook	es-es	Insertar en el documento
 insufficent rights to delete this list!	addressbook	es-es	No tiene privilegios suficientes para borrar esta lista
 international	addressbook	es-es	Internacional
+internet	addressbook	es-es	Internet
 label	addressbook	es-es	Etiqueta
 last date	addressbook	es-es	Última fecha
 last modified	addressbook	es-es	última modificación
@@ -301,6 +313,7 @@ preferred email address to use in distribution lists	addressbook	es-es	Direcció
 preferred phone	addressbook	es-es	teléfono preferido
 preferred type of email address to add for distribution lists	addressbook	es-es	Tipo preferido de dirección de correo electrónico para añadir a las listas de distribución
 prefix	addressbook	es-es	Prefijo
+private custom fields	addressbook	es-es	Campos personalizados privados
 public key	addressbook	es-es	Clave pública
 publish into groups:	addressbook	es-es	Publicar en los grupos:
 read a list / search for entries.	addressbook	es-es	Leer una lista / buscar entradas
@@ -309,6 +322,7 @@ read a single entry by passing the id and fieldlist.	addressbook	es-es	Leer una
 read only	addressbook	es-es	sólo lectura
 record access	addressbook	es-es	Acceso al registro
 record owner	addressbook	es-es	Propietario del registro
+region	addressbook	es-es	Región
 remove selected contacts from distribution list	addressbook	es-es	Eliminar los contactos seleccionados de la lista de distribución
 removed from distribution list	addressbook	es-es	eliminados de la lista de distribución
 repetition	addressbook	es-es	Repetición
@@ -322,6 +336,7 @@ select a view	addressbook	es-es	Seleccionar una vista
 select addressbook type	addressbook	es-es	Seleccionar el tipo de libreta de direcciones
 select all	addressbook	es-es	Seleccionar todo
 select an action or addressbook to move to	addressbook	es-es	Seleccionar una acción o libreta de direcciones a la que mover
+select an action or addressbook to move to...	addressbook	es-es	Seleccionar una acción o libreta de direcciones a la que mover...
 select migration type	admin	es-es	Seleccionar el tipo de migración
 select multiple contacts for a further action	addressbook	es-es	Seleccionar múltiples contactos para una acción posterior
 select phone number as prefered way of contact	addressbook	es-es	Seleccionar el número de teléfono como forma preferida de contacto
@@ -329,6 +344,9 @@ select the type of conversion	addressbook	es-es	Seleccione el tipo de conversió
 select the type of conversion:	addressbook	es-es	Seleccione el tipo de conversión:
 select where you want to store / retrieve contacts	admin	es-es	Seleccione dónde desea almacenar o recuperar contactos
 selected contacts	addressbook	es-es	Contactos seleccionados
+seperator	addressbook	es-es	Separador
+set full name and file as field in contacts of all users (either all or only empty values)	admin	es-es	Establecer el nombre completo y el fichero como campo de contactos de todos los usuarios (todos o sólo valores vacíos)
+set only full name	addressbook	es-es	Establecer sólo el nombre completo
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	es-es	¿Mostrar las columnas de foto y domicilio particular, incluso si están vacías?
 show	addressbook	es-es	Mostrar
 show birthday reminders on main screen	addressbook	es-es	Mostrar recordatorios de cumpleaños en la pantalla principal
diff --git a/admin/setup/egw_es-es.lang b/admin/setup/egw_es-es.lang
index 47e4610504..2428bd25cd 100644
--- a/admin/setup/egw_es-es.lang
+++ b/admin/setup/egw_es-es.lang
@@ -4,6 +4,7 @@
 %1 class not instanciated	admin	es-es	La clase %1 no está instanciada
 %1 group %2	admin	es-es	%1 grupo %2
 %1 is no command!	admin	es-es	¡%1 no es un comando!
+%1 log entries deleted.	admin	es-es	Se han borrado %1 entradas del log.
 %1 not found or not executable !!!	admin	es-es	No se encontró %1 o no es un ejecutable
 %1 rights for %2 and applications %3	admin	es-es	Derechos de %1 para %2 y aplicaciones %3
 %1 user %2	admin	es-es	%1 usuario %2
@@ -29,6 +30,7 @@ activate wysiwyg-editor	admin	es-es	activar editor WYSIWYG
 add a category	admin	es-es	añadir una categoría
 add a group	admin	es-es	añadir un grupo
 add a new account.	admin	es-es	Añadir una nueva cuenta.
+add a new remote instance	admin	es-es	Añadir una instancia remota nueva
 add a subcategory	admin	es-es	añadir una subcategoría
 add a user	admin	es-es	añadir un usuario
 add account	admin	es-es	Añadir una cuenta
@@ -69,6 +71,7 @@ applications	admin	es-es	Aplicaciones
 applications list	admin	es-es	Lista de aplicaciones
 applications run rights updated.	admin	es-es	Se han actualizado los derechos de ejecución.
 applies the changes	admin	es-es	aplica los cambios
+apply the changes	admin	es-es	Aplicar los cambios
 are you sure you want to delete the application %1 ?	admin	es-es	¿Está seguro de que quiere borrar la aplicación %1 ?
 are you sure you want to delete this account ?	admin	es-es	¿Está seguro de que quiere borrar esta cuenta?
 are you sure you want to delete this application ?	admin	es-es	¿Está seguro de que quiere borrar esta aplicación?
@@ -94,6 +97,7 @@ bottom	admin	es-es	parte inferior
 calculate next run	admin	es-es	Calcular la siguiente ejecución
 can change password	admin	es-es	Puede cambiar la contraseña
 cancel testjob!	admin	es-es	Cancelar trabajo de prueba
+cancel this scheduled command	admin	es-es	Cancelar este comando programado
 categories list	admin	es-es	Lista de categorías
 category %1 has been saved !	admin	es-es	La categoría %1 ha sido guardada
 category list	admin	es-es	Lista de categorías
@@ -135,10 +139,12 @@ delete application	admin	es-es	Borrar aplicación
 delete category	admin	es-es	Borrar categoría
 delete group	admin	es-es	Borrar grupo
 delete peer server	admin	es-es	Borrar servidor 'peer'
+delete selected entries	admin	es-es	Borrar las entradas seleccionadas
 delete the category	admin	es-es	borrar la categoría
 delete the group	admin	es-es	borrar el grupo
 delete this category	admin	es-es	borrar esta categoría
 delete this group	admin	es-es	borrar este grupo
+delete this log entry	admin	es-es	Borrar esta entrada del log
 delete this user	admin	es-es	borrar este usuario
 deletes this field	admin	es-es	borra este campo
 deliver extern	admin	es-es	entrega externa
@@ -222,6 +228,7 @@ enter your smtp server port	admin	es-es	Introduzca el puerto del servidor SMTP
 error canceling timer, maybe there's none set !!!	admin	es-es	Error al cancelar el temporizador ¡Puede que no haya ninguno!
 error changing the password for % !!!	admin	es-es	¡Error al cambiar la contraseña para %!
 error changing the password for %1 !!!	admin	es-es	¡Error al cambiar la contraseña para %1!
+error deleting log entry!	admin	es-es	¡Error al borrar la entrada del log!
 error saving	admin	es-es	Error al guardar
 error saving account!	admin	es-es	¡Error al guardar la cuenta!
 error saving the command!	admin	es-es	¡Error al guardar el comando!
@@ -269,8 +276,10 @@ in mbyte	admin	es-es	en Mbytes
 inbound	admin	es-es	entrantes
 initial	admin	es-es	Inicial
 install crontab	admin	es-es	Instalar crontab
+install id	admin	es-es	Instalar ID
 installed applications	common	es-es	Aplicaciones instaladas
 installed crontab	admin	es-es	Crontab instalado
+instance	admin	es-es	Instancia
 interface	admin	es-es	Interfaz
 invalid formated date "%1"!	admin	es-es	¡La fecha %1 no tiene un formato válido!
 invalid remote id or name "%1"!	admin	es-es	¡El nombre o id remoto %1 no es válido!
@@ -295,17 +304,19 @@ ldap rootdn	admin	es-es	rootdn LDAP
 leave empty for no quota	admin	es-es	dejar en blanco si no hay cuota
 leave the category untouched and return back to the list	admin	es-es	dejar la categoría intacta y volver a la lista
 leave the group untouched and return back to the list	admin	es-es	Dejar el grupo intacto y volver a la lista
+leave without saveing the entry	admin	es-es	salir sin guardar la entrada
 leaves without saveing	admin	es-es	sale sin guardar
 length<br>rows	admin	es-es	Longitud<br>Filas
 list config settings	admin	es-es	Lista de las opciones de configuración
 list current sessions	admin	es-es	Lista de las sesiones actuales
 list of current users	admin	es-es	Lista de usuarios actuales
-login history	common	es-es	Historial de accesos
+login history	admin	es-es	Historial de accesos
 login message	admin	es-es	Mensaje de inicio de sesión
 login screen	admin	es-es	Pantalla de inicio de sesión
 login shell	admin	es-es	Shell de inicio de sesión
-login time	admin	es-es	Hora de acceso
 loginid	admin	es-es	LoginID
+logintime	admin	es-es	Hora de inicio de sesión
+logoutime	admin	es-es	Hora de fin de sesión
 mail settings	admin	es-es	Configuración del correo electrónico
 main email-address	admin	es-es	Dirección de correo principal
 main screen message	admin	es-es	Mensaje de la pantalla principal
@@ -322,6 +333,7 @@ modified	admin	es-es	Modificado
 month	admin	es-es	Mes
 more secure	admin	es-es	más seguro
 name must not be empty !!!	admin	es-es	El nombre no debe estar vacío
+name of the egroupware instance, eg. default	admin	es-es	Nombre de la instancia de eGroupWare, p. ej., default
 new group name	admin	es-es	Nuevo nombre de grupo
 new name	admin	es-es	nuevo nombre
 new password [ leave blank for no change ]	admin	es-es	Nueva contraseña [ Dejar en blanco para no cambiar ]
@@ -372,6 +384,7 @@ remote instance saved	admin	es-es	Se ha guardado la instancia remota
 remove	admin	es-es	borrar
 remove all users from this group	admin	es-es	Borrar todos los usuarios de este grupo
 remove all users from this group ?	admin	es-es	¿Borrar todos los usuarios de este grupo?
+requested	admin	es-es	Requerido
 return to admin mainscreen	admin	es-es	volver a la pantalla principal de administración
 return to view account	admin	es-es	Volver a ver cuenta
 route all mails to	admin	es-es	dirigir todos los correos a
@@ -379,11 +392,14 @@ run asynchronous services	admin	es-es	Ejecutar servicios asíncronos
 save the category	admin	es-es	guardar la categoría
 save the category and return back to the list	admin	es-es	guardar la categoría y volver a la lista
 saves the changes made and leaves	admin	es-es	guarda los cambios y sale
+saves this entry	admin	es-es	Guarda esta entrada
+scheduled	admin	es-es	Programada
 search accounts	admin	es-es	Buscar cuentas
 search categories	admin	es-es	Buscar categorías
 search groups	admin	es-es	Buscar grupos
 search peer servers	admin	es-es	Buscar servidores 'peer'
 security	admin	es-es	Seguridad
+select accounts for which the custom field should be visible	admin	es-es	Seleccionar las cuentas para las que el campo personalizado debe estar visible
 select group managers	admin	es-es	Seleccionar administradores de grupo
 select permissions this group will have	admin	es-es	Seleccione los permisos que tendrá este grupo
 select the parent category. if this is a main category select no category	admin	es-es	Seleccione la categoría superior. Si ésta es una categoría principal seleccione SIN CATEGORIA
@@ -434,6 +450,7 @@ that server name has been used already !	admin	es-es	¡Ese nombre de servidor ya
 the api is current	admin	es-es	La API está al día
 the api requires an upgrade	admin	es-es	La API requiere ser actualizada
 the groups must include the primary group	admin	es-es	Los grupos deben incluir el grupo principal
+the install id of an instance can be found under admin > site configuration	admin	es-es	El ID de instalación de una instancia se puede encontrar en Administración -> Configuración del sitio
 the login and password can not be the same	admin	es-es	El usuario y la contraseña NO pueden ser iguales
 the loginid can not be more then 8 characters	admin	es-es	El nombre de usuario no puede superar 8 caracteres
 the name used internaly (<= 20 chars), changeing it makes existing data unavailible	admin	es-es	el nombre usado internamente (<= 20 caracteres). Si se cambia, los datos ya no están disponibles.
@@ -462,6 +479,7 @@ unknown account: %1 !!!	admin	es-es	¡¡La cuenta es desconocida: %1!!
 unknown command %1!	admin	es-es	Comando desconocido: %1
 unknown option %1	admin	es-es	Opción desconocida: %1
 updated	admin	es-es	actualizado
+url of the egroupware installation, eg. http://domain.com/egroupware	admin	es-es	La URL de la instalación de eGroupWare, p. ej. http://dominio.com/egroupware
 use cookies to pass sessionid	admin	es-es	Usar cookies para almacenar sesiones
 use pure html compliant code (not fully working yet)	admin	es-es	Usar codigo HTML puro (todavía no funciona completamente)
 use theme	admin	es-es	Usar tema
diff --git a/filemanager/setup/egw_es-es.lang b/filemanager/setup/egw_es-es.lang
index 5a7e8c219a..e0dca62ba7 100644
--- a/filemanager/setup/egw_es-es.lang
+++ b/filemanager/setup/egw_es-es.lang
@@ -1,22 +1,28 @@
 %1 already exists as a file	filemanager	es-es	%1 ya existe como fichero
 %1 directories and %2 files copied.	filemanager	es-es	%1 directorios y %2 ficheros copiados.
 %1 directories and %2 files deleted.	filemanager	es-es	%1 directorios y %2 ficheros borrados.
+%1 elements linked.	filemanager	es-es	%1 elementos enlazados.
 %1 errors copying (%2 diretories and %3 files copied)!	filemanager	es-es	%1 errores copiando (%2 directorios y %3 ficheros copiados)
 %1 errors deleteting (%2 directories and %3 files deleted)!	filemanager	es-es	%1 errores borrando (%2 directorios y %3 ficheros borrados)
+%1 errors linking (%2)!	filemanager	es-es	¡%1 errores al enlazar (%2)!
 %1 errors moving (%2 files moved)!	filemanager	es-es	%1 errores moviendo (%2 ficheros movidos)
 %1 failed, %2 succeded	filemanager	es-es	%1 fallaron, %2 correctos
+%1 files	common	es-es	%1 ficheros
 %1 files copied.	filemanager	es-es	%1 ficheros copiados.
 %1 files deleted.	filemanager	es-es	%1 ficheros borrados.
 %1 files moved.	filemanager	es-es	%1 ficheros movidos.
 %1 starts with '%2'	filemanager	es-es	%1 empieza por '%2'
+%1 successful uploaded.	filemanager	es-es	%1 subidos correctamente.
 %1 the following files into current directory	filemanager	es-es	%1 los siguientes ficheros en el directorio actual
 %1 urls %2 to clipboard.	filemanager	es-es	%1 URLs %2 al portapapeles
 accessrights	filemanager	es-es	Derechos de acceso
 acl added.	filemanager	es-es	Se ha añadido la ACL
 acl deleted.	filemanager	es-es	Se ha borrado la ACL
 actions	filemanager	es-es	Acciones
+all files	common	es-es	Todos los ficheros
 allow a maximum of the above configured folderlinks to be configured in settings	admin	es-es	permitir un máximo de los enlaces configurados arriba para configurarse en las preferencias
 and all it's childeren	filemanager	es-es	y todos los subdirectorios
+applications	common	es-es	Aplicaciones
 basedirectory	filemanager	es-es	Directorio base
 cancel editing %1 without saving	filemanager	es-es	Cancelar la edición %1 sin guardar
 cannot create directory because it begins or ends in a space	filemanager	es-es	No se puede crear el directorio porque empieza o acaba en un espacio
@@ -26,6 +32,7 @@ comment	filemanager	es-es	Comentario
 comments cannot contain "%1"	filemanager	es-es	Los comentarios no pueden contener "%1"
 copied	filemanager	es-es	copiado
 copied %1 to %2	filemanager	es-es	Se ha copiado "%1" a "%2"
+copy	filemanager	es-es	Copiar
 copy to	filemanager	es-es	Copiar a
 copy to clipboard	filemanager	es-es	Copiar al portapapeles
 could not copy %1 to %2	filemanager	es-es	No se pudo copiar "%1" a "%2"
@@ -36,6 +43,7 @@ could not move %1 to %2	filemanager	es-es	No se pudo mover %1 a %2
 could not move file because no destination directory is given	filemanager	es-es	No se pudo mover el fichero porque no se ha indicado un directorio de destino
 could not rename %1 to %2	filemanager	es-es	No se pudo renombrar %1 a %2
 could not save %1	filemanager	es-es	No se pudo guardar %1
+create a link	filemanager	es-es	Crear un enlace
 create directory	filemanager	es-es	Crear directorio
 create file	filemanager	es-es	Crear fichero
 create folder	filemanager	es-es	Crear directorio
@@ -57,6 +65,7 @@ directory names cannot contain "%1"	filemanager	es-es	Los nombres de directorio
 directory not found or no permission to access it!	filemanager	es-es	No se encontró el directorio, o no tiene permiso para acceder a él
 display and modification of content	filemanager	es-es	Mostrar y modificar el contenido
 display of content	filemanager	es-es	Mostar el contenido
+do you want to overwrite the existing file %1?	filemanager	es-es	¿Desea sobreescribir el fichero existente %1?
 download	filemanager	es-es	Descargar
 edit comments	filemanager	es-es	Editar comentarios
 edit settings	filemanager	es-es	Editar configuración
@@ -65,6 +74,7 @@ enter setup user and password to get root rights	filemanager	es-es	Introduzca us
 enter the complete vfs path to specify a fast access link to a folder	filemanager	es-es	Introduzca la ruta VFS completa para especificar un acceso rápido a una carpeta
 enter the complete vfs path to specify your desired start folder.	filemanager	es-es	Introduzca la ruta VFS completa para especificar la carpeta de inicio deseada.
 error adding the acl!	filemanager	es-es	¡Error al añadir la ACL!
+error creating symlink to target %1!	filemanager	es-es	¡Error al crear el enlace simbólico al destino %1!
 error deleting the acl entry!	filemanager	es-es	¡Error al borrar la entrada de la ACL!
 error uploading file!	filemanager	es-es	¡Error al subir el fichero!
 executable	filemanager	es-es	Ejecutable
@@ -92,7 +102,9 @@ go to your home directory	filemanager	es-es	Ir al directorio personal
 go up	filemanager	es-es	Subir
 id	filemanager	es-es	Id
 inherited	filemanager	es-es	heredado
+link	filemanager	es-es	Enlace
 link %1: %2	filemanager	es-es	Enlace %1: %2
+link target %1 not found!	filemanager	es-es	¡No se ha encontrado el enlace de destino %1!
 location	filemanager	es-es	Ubicación
 log out as superuser	filemanager	es-es	Cerrar sesión como superusuario
 max folderlinks	admin	es-es	Número máximo de enlaces a carpetas
@@ -144,8 +156,10 @@ show link to filemanagers basedirectory (/) in side box menu?	filemanager	es-es
 size	filemanager	es-es	Tamaño
 start search	filemanager	es-es	comenzar la búsqueda
 superuser	filemanager	es-es	Superusuario
+symlink to %1 created.	filemanager	es-es	Se ha creado el enlace simbólico a %1.
 the default start folder is your personal folder. the default is used, if you leave this empty, the path does not exist or you lack the neccessary access permissions.	filemanager	es-es	La carpeta predeterminada es su carpeta personal. Si se deja en blanco, no existe la ruta o no tiene los permisos necesarios, se usa la predeterminada.
 the requested path %1 is not available.	filemanager	es-es	La ruta solicitada %1 no está disponible.
+there's already a directory with that name!	filemanager	es-es	¡Ya existe un directorio con ese nombre!
 there's already a file with that name!	filemanager	es-es	¡Ya existe un fichero con ese nombre!
 to overwrite the existing file store again.	filemanager	es-es	Para sobreescribir el fichero existente, vuelva a guardar.
 total files	filemanager	es-es	Total ficheros
@@ -155,6 +169,7 @@ updated comment for %1	filemanager	es-es	Comentario actualizado para %1
 used space	filemanager	es-es	Espacio utilizado
 users and groups	filemanager	es-es	Usuarios y grupos
 wrong username or password!	filemanager	es-es	¡El usuario o contraseña son incorrectos!
+you are not allowed to upload a script!	filemanager	es-es	¡NO tiene permiso para subir un script!
 you do not have access to %1	filemanager	es-es	No tiene acceso a %1
 you need to select an owner!	filemanager	es-es	¡Necesita seleccionar un propietario!
 you need to select some files first!	filemanager	es-es	¡Necesita seleccionar antes algunos ficheros!
diff --git a/infolog/setup/egw_es-es.lang b/infolog/setup/egw_es-es.lang
index f8d76711bb..2f3f350ee1 100644
--- a/infolog/setup/egw_es-es.lang
+++ b/infolog/setup/egw_es-es.lang
@@ -41,7 +41,6 @@ add:	infolog	es-es	Añadir:
 all	infolog	es-es	Todos
 all links and attachments	infolog	es-es	todos los enlaces y ficheros adjuntos
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	es-es	permite establecer el estado de una entrada, p.e. poner una tarea pendiente cono finalizada si está terminada (los valores dependen del tipo de entrada)
-applies the changes	infolog	es-es	Aplica los cambios
 apply the changes	infolog	es-es	Aplicar los cambios
 archive	infolog	es-es	archivar
 are you shure you want to delete this entry ?	infolog	es-es	¿Está seguro de querer borrar esta entrada?
@@ -155,6 +154,7 @@ high	infolog	es-es	alta
 history	infolog	es-es	Historial
 history logging	infolog	es-es	Registro histórico
 history logging and deleting of items	infolog	es-es	Registro histórico y borrado de elementos
+how many describtion lines should be directly visible. further lines are available via a scrollbar.	infolog	es-es	Cuántas líneas de descripción deben estar visibles directamente. Las líneas siguientes se ven mediante una barra de desplazamiento.
 id	infolog	es-es	Id
 id#	infolog	es-es	Id nº
 if a type has a group owner, all entries of that type will be owned by the given group and not the user who created it!	infolog	es-es	Si un tipo tiene un propietario para el grupo, todas las entradas de ese tipo pertenecerán al grupo y NO al usuario que las creó.
@@ -184,6 +184,7 @@ leave it empty	infolog	es-es	dejar en blanco
 leave without saveing the entry	infolog	es-es	abandonar sin guardar la entrada
 leaves without saveing	infolog	es-es	abandonar sin guardar
 length<br>rows	infolog	es-es	Longitud<br>Filas
+limit number of description lines (default 5, 0 for no limit)	infolog	es-es	Limitar el número de líneas de la descripción (predeterminado: 5, 0 para ilimitadas)
 link	infolog	es-es	Enlace
 links	infolog	es-es	Enlaces
 links of this entry	infolog	es-es	Enlaces de la entrada
@@ -251,7 +252,6 @@ priority	infolog	es-es	Prioridad
 private	infolog	es-es	Privado
 project	infolog	es-es	Proyecto
 project settings: price, times	infolog	es-es	Configuración del proyecto: precio, tiempos
-projectmanager	infolog	es-es	Administrador de Proyectos
 re-planned	infolog	es-es	Replanificado
 re-planned time	infolog	es-es	Tiempo Replanificado
 re:	infolog	es-es	Re:
@@ -264,7 +264,7 @@ receive notifications about own items	infolog	es-es	Recibir notificaciones acerc
 receive notifications about starting entries you are responsible for	infolog	es-es	Recibir notificaciones acerca de las entradas que comienzan de las que usted es responsable
 receive notifications about starting entries you delegated	infolog	es-es	Recibir notificaciones acerca de las entradas que comienzan que usted ha delegado
 receive notifications as html-mails	infolog	es-es	Recibir notificaciones como correo html
-reg. expr. for local ip's<br>eg. ^192.168.1.	infolog	es-es	expresión regular para IPs locales<br>eg. ^192\.168\.1\.
+reg. expr. for local ip's<br>eg. ^192\.168\.1\.	infolog	es-es	expresión regular para IPs locales<br>ej. ^192\.168\.1\.
 remark	infolog	es-es	Comentario
 remove this link (not the entry itself)	infolog	es-es	Eliminar este enlace (no la entrada en sí)
 responsible	infolog	es-es	Responsable
@@ -345,8 +345,7 @@ upcoming	infolog	es-es	próxima
 urgency	infolog	es-es	Urgencia
 urgent	infolog	es-es	urgente
 used time	infolog	es-es	tiempo utilizado
-valid path on clientside<br>eg. \servershare or e:	infolog	es-es	ruta válida en el cliente<br>p. ej. \\seridor\recurso o e:\
-valid path on clientside<br>eg. servershare or e:	infolog	es-es	ruta válida en el cliente<br>p. ej. \\seridor\recurso o e:\
+valid path on clientside<br>eg. \\server\share or e:	infolog	es-es	ruta válida en el lado cliente<br>p. ej. \\servidor\recurso o e:\
 values for selectbox	infolog	es-es	Valores para lista desplegable
 view all subs of this entry	infolog	es-es	Ver todos los subs de esta entrada
 view other subs	infolog	es-es	ver otros subs
diff --git a/notifications/setup/egw_es-es.lang b/notifications/setup/egw_es-es.lang
index 5398242b46..b97f658dda 100644
--- a/notifications/setup/egw_es-es.lang
+++ b/notifications/setup/egw_es-es.lang
@@ -1,23 +1,41 @@
+all possible notification backends	notifications	es-es	todos los posibles backends de notificación
 choose a notification-chain. you will be notified over the backends included in the chain.<br />note: if a notification-chain is marked as "disabled", your administrator does not allow one or more of the backends included in the chain and notifications falls back to "e-mail" while notifying you.	notifications	es-es	Elija una cadena de notificación. Se le notiificará por los métodos incluidos en la cadena.<br />Nota: Si una cadena de notificación está marcada como "desactivada", su Administrador no permite una o más de los métodos incluidos en la cadena y la notificación falla volviendo a "Correo electrónico" mientras le notifica.
 common chains	notifications	es-es	Cadenas comunes
 disabled chains	notifications	es-es	Cadenas desactivadas
-don't notify me via popups in egroupware	notifications	es-es	No notificarme usando ventanas emergentes en eGroupWare
+do not notify me at all	notifications	es-es	no notificarme en ningún caso
+e-mail only	notifications	es-es	Sólo correo electrónico
 egroupware has notifications for you	notifications	es-es	eGroupWare tiene notificaciones para usted
+egroupware-popup and e-mail	notifications	es-es	Ventana emergente de eGroupWare y correo electrónico
+egroupware-popup and windows-popup	notifications	es-es	Ventanas emergentes de eGroupWare y Windows
 egroupware-popup backend	admin	es-es	Método ventana emergente de eGroupWare
+egroupware-popup first, if that fails notify me by e-mail	notifications	es-es	Primero, ventana emergente de eGroupWare, y si falla, notificarme por correo electrónico
+egroupware-popup first, if that fails notify me by sms	notifications	es-es	Primero, ventana emergente de eGroupWare, y si falla, notificarme por SMS
+egroupware-popup only	notifications	es-es	Sólo ventana emergente de eGroupWare
 egroupware-popup verbosity	notifications	es-es	Verbosidad de la ventana emergente de eGroupWare
 enable egroupware-popup backend	admin	es-es	Activar el método de ventanas emergentes de eGroupWare
 enable sms backend	admin	es-es	Activar el método SMS
 enable windows-popup backend	admin	es-es	Activar el método ventanas emergentes de Windows
 enabled chains	notifications	es-es	Cadenas activadas
-how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled !<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	es-es	Cómo debe ser el comportamiento de la ventana de eGroupWare sobre la cantidad de información enviada al usuario en una notificación:<br />baja: sólo muestra la campana de notificación en el menú superior (¡para lo que debe tener activado el menú superior!)<br />media: traer al frente la ventana de notiicación<br />alta: traer la ventana de notificación al frente y dejar al navegador que se anuncie por sus propios medios
+folder	notifications	es-es	Carpeta
+from	notifications	es-es	De
+how verbose should the egroupware-popup behave if a notification is sent to the user:<br />low: just display the notification bell in the topmenu - topmenu must be enabled!<br />medium: bring notification window to front<br />high: bring notification window to front and let the browser do something to announce itself	notifications	es-es	Cuánta cantidad de información debe enviar la ventana emergente de eGroupWare al usuario:<br />baja: sólo mostrar la campana de notificación en el menú superior (para lo cual hay que activar el menú superior)<br />media: traer la ventana de notificación al frente<br />alta: traer la ventana de notificación al frente y permitir al navegador hacer algo para anunciarse.
 if set, embedded links get rendered special for external clients	notifications	es-es	Si está activado, los enlaces embebidos se visualizan de una forma especial para los clientes externos
 linked entries:	notifications	es-es	Entradas vinculadas:
 maximum sms messages per notification	admin	es-es	Número máximo de mensajes SMS por notificación
 message from	notifications	es-es	Mensaje desde
+minutes	notifications	es-es	minutos
 notification	common	es-es	Notificaciones
 notify me by	notifications	es-es	Notificar por mí
 optimize e-mails for external mail client	notifications	es-es	Optimizar correos electrónicos para cliente de correos externo
+poll interval	notifications	es-es	Intervalo de muestreo
 preferences for notification	notifications	es-es	Preferencias para la notificación
+received	notifications	es-es	Recibido
 sms backend	admin	es-es	Método SMS
-this egroupware notification has been sent to you by mail because your	notifications	es-es	Se le ha enviado por correo esta notificación de eGroupWare porque su
+sms only	notifications	es-es	Sólo SMS
+this egroupware notification has been sent to you by mail because your chosen notification-chain has been disabled by the administrator. please choose another notification-chain in your preferences!	notifications	es-es	Esta notificación de eGroupWare le ha sido enviada por correo electrónico porque su cadena de notificaciones elegida ha sido desactivada por el administrador. ¡Por favor, elija otra cadena de notificación en sus preferencias!
+windows-popup and e-mail	notifications	es-es	Ventana emergente de Windows y correo electrónico
 windows-popup backend	admin	es-es	Método ventana emergente de Windows
+windows-popup first, if that fails notify me by e-mail	notifications	es-es	Primero, ventana emergente de Windows, y si falla, notificarme por correo electrónico.
+windows-popup first, if that fails notify me by sms	notifications	es-es	Primero, ventana emergente de Windows, y si falla, notificarme por SMS.
+windows-popup only	notifications	es-es	Sólo ventana emergente de Windows
+you've got new mail	notifications	es-es	Tiene correo nuevo
diff --git a/phpgwapi/setup/egw_es-es.lang b/phpgwapi/setup/egw_es-es.lang
index d2b158dae3..7812432c6f 100644
--- a/phpgwapi/setup/egw_es-es.lang
+++ b/phpgwapi/setup/egw_es-es.lang
@@ -1,7 +1,6 @@
 %1 email addresses inserted	common	es-es	Se han insertado %1 direcciones de correo
+%1 file	common	es-es	fichero %1
 %1 is not executable by the webserver !!!	common	es-es	%1 no tiene permiso de ejecución para el servidor web
-%1 manual	common	es-es	Manual de %1
-%1 start	common	es-es	inicio de %1
 %1choose an other directory%2<br />or make %3 writeable by webserver	common	es-es	%1Elegir otro directorio%2<br />o dar a %3 permiso de escritura para el servidor web
 %1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4.	common	es-es	%1eGroupWare%2 es una herramienta de trabajo en grupo, multiusuario y basada en web escrita en %3PHP%4
 (session restored in %1 seconds)	common	es-es	(la sesión se ha restaurado en %1 segundos)
@@ -48,6 +47,7 @@ albania	common	es-es	ALBANIA
 algeria	common	es-es	ARGELIA
 all	common	es-es	Todos
 all fields	common	es-es	todos los campos
+all languages	common	es-es	todos los idiomas
 alphabet	common	es-es	a,b,c,d,e,f,g,h,i,j,k,l,ll,m,n,ñ,o,p,q,r,s,t,u,v,w,x,y,z
 alternate style-sheet:	common	es-es	Hola de estilo alternativa:
 american samoa	common	es-es	AMERICAN SAMOA
@@ -104,6 +104,7 @@ brazil	common	es-es	BRASIL
 british indian ocean territory	common	es-es	BRITISH INDIAN OCEAN TERRITORY
 brunei darussalam	common	es-es	BRUNEI DARUSSALAM
 bulgaria	common	es-es	BULGARIA
+bulgarian	common	es-es	Búlgaro
 burkina faso	common	es-es	BURKINA FASO
 burundi	common	es-es	BURUNDI
 calendar	common	es-es	Calendario
@@ -188,6 +189,7 @@ detail	common	es-es	Detalle
 details	common	es-es	Detalles
 diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images?	common	es-es	¿Desactivar la ejecución del script que corrige el bug de IE 5.5 y superiores para mostrar transparencias en imágenes PNG?
 direction left to right	common	es-es	Dirección de izquierda a derecha
+directory	common	es-es	Directorio
 directory does not exist, is not readable by the webserver or is not relative to the document root!	common	es-es	¡El directorio no existe, el servidor web no lo puede leer o no es relativo a la raíz de los documentos!
 disable internet explorer png-image-bugfix	common	es-es	Desactivar el parche de IE para ver imágenes PNG
 disable slider effects	common	es-es	Desactivar efectos deslizantes
@@ -209,6 +211,7 @@ done	common	es-es	Hecho
 drag to move	jscalendar	es-es	Arrastre para mover
 e-mail	common	es-es	Correo electrónico
 east timor	common	es-es	EAST TIMOR
+eastern european	common	es-es	Europeo del este
 ecuador	common	es-es	ECUADOR
 edit	common	es-es	Editar
 edit %1 category for	common	es-es	Editar %1 categoría para
@@ -216,7 +219,6 @@ edit categories	common	es-es	Editar categorías
 edit category	common	es-es	Editar categoría
 egroupware	common	es-es	eGroupWare
 egroupware api version	common	es-es	Versión de la API eGroupWare
-egroupware api version %1	common	es-es	Versión de la API de eGroupWare: %1
 egroupware: login blocked for user '%1', ip %2	common	es-es	eGroupWare: inicio de sesión bloqueado para el usuario '%1', IP %2
 egypt	common	es-es	EGIPTO
 el salvador	common	es-es	EL SALVADOR
@@ -279,6 +281,7 @@ global public	common	es-es	Publico Global
 go today	jscalendar	es-es	Ir hoy
 grant access	common	es-es	Conceder acceso
 greece	common	es-es	GRECIA
+greek	common	es-es	Griego
 greenland	common	es-es	GREENLAND
 grenada	common	es-es	GRANADA
 group	common	es-es	Grupo
@@ -339,6 +342,7 @@ italy	common	es-es	ITALIA
 jamaica	common	es-es	JAMAICA
 january	common	es-es	Enero
 japan	common	es-es	JAPON
+japanese	common	es-es	Japonés
 jordan	common	es-es	JORDANIA
 july	common	es-es	Julio
 jun	common	es-es	Jun
@@ -351,8 +355,9 @@ kazakstan	common	es-es	KAZAKSTAN
 kenya	common	es-es	KENIA
 keywords	common	es-es	Palabras clave
 kiribati	common	es-es	KIRIBATI
-korea, democratic peoples republic of	common	es-es	KOREA, DEMOCRATIC PEOPLES REPUBLIC OF
-korea, republic of	common	es-es	KOREA, REPUBLIC OF
+korea, democratic peoples republic of	common	es-es	COREA, DEMOCRATIC PEOPLES REPUBLIC OF
+korea, republic of	common	es-es	COREA, REPUBLICA DE
+korean	common	es-es	Coreano
 kuwait	common	es-es	KUWAIT
 kyrgyzstan	common	es-es	KYRGYZSTAN
 language	common	es-es	Idioma
@@ -371,6 +376,7 @@ liberia	common	es-es	LIBERIA
 libyan arab jamahiriya	common	es-es	LIBYAN ARAB JAMAHIRIYA
 license	common	es-es	Licencia
 liechtenstein	common	es-es	LIECHTENSTEIN
+line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>	common	es-es	Línea %1: '%2'<br><b>los datos csv contienen ##last-check-run## de la tabla %3 ==> ignorado</b>
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	es-es	Línea %1: '%2'<br><b>los datos csv no coinciden con el número de columnas de la tabla %3 ==> ignorado</b>
 list	common	es-es	Lista
 list members	common	es-es	Lista de miembros
@@ -499,7 +505,6 @@ password must have at least %1 characters	common	es-es	La contraseña debe tener
 path to user and group files has to be outside of the webservers document-root!!!	common	es-es	¡¡La ruta a los ficheros de usuario y grupos DEBE ESTAR FUERA de la raíz de los documentos del servidor web!!
 permission denied!	common	es-es	¡Permiso denegado!
 permissions to the files/users directory	common	es-es	permisos a los directorios de archivos/usuarios
-permisson denied!	common	es-es	¡Permiso denegado!
 personal	common	es-es	Personal
 peru	common	es-es	PERU
 philippines	common	es-es	FILIPINAS
@@ -551,6 +556,7 @@ returns struct of users application access	common	es-es	Devuelve la estructura d
 reunion	common	es-es	REUNION
 right	common	es-es	Derecha
 romania	common	es-es	RUMANIA
+russian	common	es-es	Ruso
 russian federation	common	es-es	FEDERACION RUSA
 rwanda	common	es-es	RUANDA
 saint helena	common	es-es	SANTA ELENA
@@ -614,6 +620,7 @@ showing %1 - %2 of %3	common	es-es	mostrando %1 - %2 de %3
 sierra leone	common	es-es	SIERRA LEONA
 simple	common	es-es	Simple
 singapore	common	es-es	SINGAPUR
+site configuration	common	es-es	Configuración del sitio
 slovakia	common	es-es	ESLOVAQUIA
 slovenia	common	es-es	ESLOVENIA
 solomon islands	common	es-es	SOLOMON ISLANDS
@@ -703,7 +710,6 @@ use button to search for project	common	es-es	use el botón para buscar por proy
 user	common	es-es	Usuario
 user accounts	common	es-es	Cuentas de usuario
 user groups	common	es-es	Grupos de usuario
-user openinstance	common	es-es	Instancias abiertas del usuario
 username	common	es-es	Nombre de usuario
 users	common	es-es	usuarios
 users choice	common	es-es	A elegir por el usuario
@@ -718,6 +724,7 @@ virgin islands, u.s.	common	es-es	VIRGIN ISLANDS, U.S.
 wallis and futuna	common	es-es	WALLIS AND FUTUNA
 wednesday	common	es-es	Miércoles
 welcome	common	es-es	Página principal
+western european	common	es-es	Europeo occidental
 western sahara	common	es-es	SAHARA OCCIDENTAL
 what color should all the blank space on the desktop have	common	es-es	¿Qué color debe tener todo el espacio en blanco en el escritorio?
 what style would you like the image to have?	common	es-es	¿Qué estilo desea que tenga la imagen?
@@ -755,4 +762,3 @@ your settings have been updated	common	es-es	Sus preferencias fueron actualizada
 zambia	common	es-es	ZAMBIA
 zimbabwe	common	es-es	ZIMBAWE
 zoom	common	es-es	Escala
-site configuration	common	es-es	Configuración del sitio
diff --git a/setup/lang/egw_es-es.lang b/setup/lang/egw_es-es.lang
index f3670b29a5..aeef6c2f02 100644
--- a/setup/lang/egw_es-es.lang
+++ b/setup/lang/egw_es-es.lang
@@ -68,7 +68,7 @@ are you sure?	setup	es-es	¿ESTA SEGURO?
 at your request, this script is going to attempt to create the database and assign the db user rights to it	setup	es-es	A petición suya, este script intentará crear la base de datos y asignar permisos al usuario de la base de datos para ella
 at your request, this script is going to attempt to install a previous backup	setup	es-es	A petición suya, este script va a intentar instalar una copia de seguridad anterior
 at your request, this script is going to attempt to install the core tables and the admin and preferences applications for you	setup	es-es	A petición suya, este script va a intentar instalar las tablas principales y las aplicaciones de preferencias y administración.
-at your request, this script is going to attempt to upgrade your old applications to the current versions	setup	es-es	A petición suya, este script intentará actualizar sus antiguas apliaciones a las versiones actuales
+at your request, this script is going to attempt to upgrade your old applications to the current versions	setup	es-es	A petición suya, este script intentará actualizar sus antiguas aplicaciones a las versiones actuales
 at your request, this script is going to attempt to upgrade your old tables to the new format	setup	es-es	A petición suya, este script intentará actualizar sus tablas antiguas al nuevo formato
 at your request, this script is going to take the evil action of deleting your existing tables and re-creating them in the new format	setup	es-es	A petición suya, este script ejecutará la "malvada" acción de eliminar sus tablas actuales y volverlas a crear en el nuevo formato
 at your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data	setup	es-es	A petición suya, este script ejecutará la "malvada" acción de desinstalar todas sus aplicaciones, lo que eliminará todas sus tablas y datos actuales
@@ -216,7 +216,7 @@ domain '%1' does not exist !!!	setup	es-es	¡¡El dominio '%1' NO existe!!
 domain name	setup	es-es	Nombre del dominio
 domain select box on login	setup	es-es	Cuadro de selección de dominio en el inicio de sesión
 domain(all),[config user(admin)],password,[file-name(default: backup-dir/db_backup-yyyymmddhhii)]	setup	es-es	dominio (todos), [usuario de configuración (admin)], contraseña, [nombre de fichero (predeterminado: directorio_backup/db_backup-AAAAMMDDHHii)]
-domain(default),[config user(admin)],password,[backup to install],[charset(default depends on language)]	setup	es-es	dominio (predeterminado), [usuario de configuración (admin)], contraseña, [copia de segurida a instalar], [juego de caracteres (el predeterminado depende del idioma)]
+domain(default),[config user(admin)],password,[backup to install],[charset(default depends on language)]	setup	es-es	dominio (predeterminado), [usuario de configuración (admin)], contraseña, [copia de seguridad a instalar], [juego de caracteres (el predeterminado depende del idioma)]
 domain(default),[config user(admin)],password,[name=value,...] sets config values beside:	setup	es-es	dominio (predeterminado), [usuario de configuración (admin)], contraseña, [nombre=valor,...] establece valores de configuración junto a:
 domain-name	setup	es-es	nombre del dominio
 don't change, if you already stored files! you will loose them!	setup	es-es	¡No modificar si ya hay ficheros almacenados! ¡Los perderá!
@@ -342,7 +342,7 @@ ldap rootdn	setup	es-es	rootdn LDAP
 ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	es-es	Filtro de búsqueda LDAP para las cuentas. Predeterminado: "(uid=%user)", %domain=eGW-domain
 leave empty to keep current.	setup	es-es	Dejar en blanco para mantener el actual
 limit access	setup	es-es	Limitar aceso
-limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	es-es	Limitar el acceso a la instalación a las siguientes direcciones, redes o máquinas (p. ej. 127.0.0.1,10.1.1,myhost.dnydns.org)
+limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	es-es	Limitar el acceso a la instalación a las siguientes direcciones, redes o máquinas (p. ej. 127.0.0.1,10.1.1,myhost.dyndns.org)
 list availible values	setup	es-es	Listar valores disponibles
 list of availible translations	setup	es-es	Lista de traducciones disponibles
 login as user postgres, eg. by using su as root	setup	es-es	Iniciar sesión como usuario postgres, p. ej. usando su como root
@@ -431,7 +431,7 @@ please consult the %1.	setup	es-es	Por favor, consulte el %1
 please fix the above errors (%1) and warnings(%2)	setup	es-es	Por favor, corrija los errores de arriba (%1) y avisos (%2)
 please install	setup	es-es	Por favor, instale
 please login	setup	es-es	Por favor, inicie la sesión
-please login to egroupware and run the admin application for additional site configuration	setup	es-es	Por favor, inicie la sesión en eGroupWare y ejecute la aplicación de administración para conifguración adicional del sitio
+please login to egroupware and run the admin application for additional site configuration	setup	es-es	Por favor, inicie la sesión en eGroupWare y ejecute la aplicación de administración para configuración adicional del sitio
 please make the following change in your php.ini	setup	es-es	Por favor, haga el siguiente cambio en su php.ini
 please wait...	setup	es-es	Por favor, espere...
 pop/imap mail server hostname or ip address	setup	es-es	Nombre o dirección IP del servidor de correo POP/IMAP
diff --git a/timesheet/setup/egw_es-es.lang b/timesheet/setup/egw_es-es.lang
index 6d11c23414..eacfb8cfd4 100644
--- a/timesheet/setup/egw_es-es.lang
+++ b/timesheet/setup/egw_es-es.lang
@@ -1,13 +1,30 @@
+%1 timesheets(s) %2	timesheet	es-es	%1 hojas de tiempo %2
+%1 timesheets(s) %2, %3 failed because of insufficent rights !!!	timesheet	es-es	%1 hojas de tiempo %2, !!%2 fallaron por falta de permisos!!
+--> enter new name	timesheet	es-es	--> introduzca un nombre nuevo
 2 month ago	timesheet	es-es	Hace 2 meses
 2 years ago	timesheet	es-es	Hace 2 años
 3 years ago	timesheet	es-es	Hace 3 años
 actions	timesheet	es-es	Acciones
 all projects	timesheet	es-es	Todos los proyectos
+all status	timesheet	es-es	Todos los estados
+and its members	timesheet	es-es	y sus miembros
+applies the changes	timesheet	es-es	aplica los cambios
+apply the action on the whole query, not only the shown timesheets!!!	timesheet	es-es	¡Aplicar la acción a toda la consulta, NO sólo a las hojas de tiempo mostradas!
 both: allow to use projectmanager and free project-names	admin	es-es	Ambos: permitir usar nombres de proyectos del Administrador de proyectos y libres
 by	timesheet	es-es	por
+changed status	timesheet	es-es	estado cambiado
+check all	timesheet	es-es	Marcar todo
 create new links	timesheet	es-es	Crear enlaces nuevos
+creates a new field	timesheet	es-es	crea un campo nuevo
 creating new entry	timesheet	es-es	creando nueva entrada
 delete this entry	timesheet	es-es	Borrar esta entrada
+delete this status	timesheet	es-es	Borrar este estado
+delete timesheet	timesheet	es-es	Borrar hoja de tiempo
+deleted	timesheet	es-es	borrado
+deletes this field	timesheet	es-es	borra este campo
+determines the order the fields are displayed	timesheet	es-es	determina el orden en que se muestran los campos
+each value is a line like <id>[=<label>]	timesheet	es-es	cada valor es una línea como <id>[=<etiqueta>]
+edit status	timesheet	es-es	Editar estado
 edit this entry	timesheet	es-es	Editar esta entrada
 empty if identical to duration	timesheet	es-es	Vacío si es idéntico a la duración
 end	timesheet	es-es	Fin
@@ -16,6 +33,7 @@ entry saved	timesheet	es-es	Se ha guardado la entrada
 error deleting the entry!!!	timesheet	es-es	Error al borrar la entrada
 error saving the entry!!!	timesheet	es-es	¡Se ha producido un error al guardar la entrada!
 existing links	timesheet	es-es	Enlaces existentes
+export	timesheet	es-es	Exportar
 export to openoffice spreadsheet	timesheet	es-es	Exportar a hoja de cálculo de OpenOffice
 exports entries from your timesheet into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	timesheet	es-es	Exporta entradas desde la hoja de tiempos en un fichero CSV (valores separados por comas). Sin embargo, también se pueden elegir otros separadores en la pestaña de opciones.
 field must not be empty !!!	timesheet	es-es	¡El campo no debe estar vacío!
@@ -26,33 +44,53 @@ last month	timesheet	es-es	Último mes
 last week	timesheet	es-es	Última semana
 last year	timesheet	es-es	Último año
 leave it empty for a full week	timesheet	es-es	Dejar en blanco durante una semana completa
+leaves without saveing	timesheet	es-es	sale sin guardar
+length<br>rows	timesheet	es-es	Longitud<br>Filas
 links	timesheet	es-es	Enlaces
+max length of the input [, length of the inputfield (optional)]	timesheet	es-es	longitud máxima de la entrada [, longitud del campo de entrada (opcional)]
+modify the status of the timesheet	timesheet	es-es	Modificar el estado de la hoja de tiempos
 no details	timesheet	es-es	Sin detalles
 no project	timesheet	es-es	Sin proyecto
 none: use only free project-names	admin	es-es	Ninguno: usar sólo nombres de proyecto libres
+number of row for a multiline inputfield or line of a multi-select-box	timesheet	es-es	número de fila para un campo de entrada multilínea or línea de un campo de selección múltiple
 or endtime	timesheet	es-es	u hora de finalización
+order	timesheet	es-es	Orden
 permission denied!!!	timesheet	es-es	¡Se ha denegado el permiso!
 price	timesheet	es-es	Precio
 projectmanager integration	admin	es-es	Integración con el Administrador de proyectos
 quantity	timesheet	es-es	Cantidad
 save & new	timesheet	es-es	Guardar y crear
 saves the changes made	timesheet	es-es	Guardar los cambios realizados
+saves the changes made and leaves	timesheet	es-es	guarda los cambios realizados y sale
 saves this entry and add a new one	timesheet	es-es	Guarda esta entrada y añade una nueva
 select a price	timesheet	es-es	Seleccionar un precio
 select a project	timesheet	es-es	Seleccionar un proyecto
+select a status of the timesheet	timesheet	es-es	seleccionar un estado de una hoja de tiempo
+select action	timesheet	es-es	Seleccionar acción
+select multiple timeshhets for a further action	timesheet	es-es	Seleccionar múltiples hojas de tiempo para una acción posterior
 show a quantity sum (eg. to sum up negative overtime)	admin	es-es	Mostrar una suma de cantidades (p. ej. sumar tiempo extra negativo)
 start	timesheet	es-es	Inicio
 starttime	timesheet	es-es	Hora de inicio
 starttime has to be before endtime !!!	timesheet	es-es	¡La hora de comienzo tiene que ser antes que la hora de fin!
+status deleted.	timesheet	es-es	Se ha borrado el estado.
+status updated.	timesheet	es-es	Se ha actualizado el estado.
 sum %1:	timesheet	es-es	Suma %1:
+the name used internaly (<= 20 chars), changeing it makes existing data unavailible	timesheet	es-es	el nombre utilizado internamente (<= 20 caracteres), si se cambia, impide acceder a los datos
+the text displayed to the user	timesheet	es-es	el texto mostrado al usuario
 this month	timesheet	es-es	Este mes
 this week	timesheet	es-es	Esta semana
 this year	timesheet	es-es	Este año
 timesheet	common	es-es	Hoja de presencia
 timesheet csv export	timesheet	es-es	Exportar a CSV la hoja de presencia
 timesheet openoffice export	timesheet	es-es	Exportar a OpenOffice la hoja de presencia
+timesheet status-%1 '%2' added.	timesheet	es-es	Estado de la hoja de tiempo-%1 '%2' añadido.
+timesheet-%1 '%2' updated.	timesheet	es-es	Hoja de tiempo-%1 '%2' actualizado.
+timesheet-%1 deleted.	timesheet	es-es	Hoja de tiempo-%1 '%2' borrado.
 unitprice	timesheet	es-es	Precio por unidad
+values for selectbox	timesheet	es-es	Valores para la lista de selección.
 view this entry	timesheet	es-es	Ver esta entrada
 week	timesheet	es-es	Semana
+whole query	timesheet	es-es	la consulta completa
 yesterday	timesheet	es-es	Ayer
+you need to select some timesheets first	timesheet	es-es	Antes necesita seleccionar algunas hojas de tiempo
 your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database.	timesheet	es-es	La base de datos NO está actualizada (%1 vs %2). Por favor, ejecute %3setup%4 para actualizar la base de datos.

From 4890a25d99f26bc0dfcaa09b7f64407debf88392 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 16 May 2009 07:42:27 +0000
Subject: [PATCH 331/510] "fixed not working delete of directories, if they
 contain hidden files (which get not displayed in the UI)"

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

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 0a0dea8707..62d559a4c4 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -422,7 +422,10 @@ class filemanager_ui
 				}
 				if ($selected)	// somethings left to delete
 				{
-					foreach(egw_vfs::find($selected,array('depth'=>true)) as $path)
+					// now we use find to loop through all files and dirs: (selected only contains dirs now)
+					// - depth=true to get first the files and then the dir containing it
+					// - hidden=true to also return hidden files (eg. Thumbs.db), as we cant delete non-empty dirs
+					foreach(egw_vfs::find($selected,array('depth'=>true,'hidden'=>true)) as $path)
 					{
 						if (($is_dir = egw_vfs::is_dir($path) && !egw_vfs::is_link($path)) && egw_vfs::rmdir($path,0))
 						{

From 2408fbb0c969f9e5e19d980254374974dbfa37b7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 16 May 2009 08:22:20 +0000
Subject: [PATCH 332/510] "implemented dir() and scandir() for egw_vfs"

---
 phpgwapi/inc/class.egw_vfs.inc.php | 33 +++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 73fca9eca9..9cc2a4cd67 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -124,7 +124,7 @@ class egw_vfs extends vfs_stream_wrapper
 	}
 
 	/**
-	 * opendir working on just the eGW VFS
+	 * opendir working on just the eGW VFS: returns resource for readdir() etc.
 	 *
 	 * @param string $path filename with absolute path in the eGW VFS
 	 * @return resource
@@ -138,6 +138,37 @@ class egw_vfs extends vfs_stream_wrapper
 		return opendir(self::PREFIX.$path);
 	}
 
+	/**
+	 * dir working on just the eGW VFS: returns directory object
+	 *
+	 * @param string $path filename with absolute path in the eGW VFS
+	 * @return Directory
+	 */
+	static function dir($path)
+	{
+		if ($path[0] != '/')
+		{
+			throw new egw_exception_assertion_failed("Directory '$path' is not an absolute path!");
+		}
+		return dir(self::PREFIX.$path);
+	}
+
+	/**
+	 * scandir working on just the eGW VFS: returns array with filenames as values
+	 *
+	 * @param string $path filename with absolute path in the eGW VFS
+	 * @param int $sorting_order=0 !$sorting_order (default) alphabetical in ascending order, $sorting_order alphabetical in descending order.
+	 * @return array
+	 */
+	static function scandir($path,$sorting_order=0)
+	{
+		if ($path[0] != '/')
+		{
+			throw new egw_exception_assertion_failed("Directory '$path' is not an absolute path!");
+		}
+		return scandir(self::PREFIX.$path,$sorting_order);
+	}
+
 	/**
 	 * copy working on just the eGW VFS
 	 *

From 44ce0285925e69f1ffdbbb16d99a236b341a6163 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 16 May 2009 10:22:56 +0000
Subject: [PATCH 333/510] "fixed not always displayed icons (eg. old nextmatch
 in translation-tools) and some more caching"

---
 phpgwapi/inc/class.common.inc.php | 86 +++++++++++++++----------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 6ebdb8671f..caf24d4a6b 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -811,64 +811,64 @@ class common
 		$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
 		$vfs_imagedir = $GLOBALS['egw_info']['server']['vfs_image_dir'];
 
-		if (!@is_array(self::$found_files[$appname]))
+		if (!isset(self::$found_files[$appname]))
 		{
 			$imagedir_olddefault = '/'.$appname.'/templates/default/images';
 			$imagedir_default    = '/'.$appname.'/templates/idots/images';
 
-			if (@is_dir(EGW_INCLUDE_ROOT.$imagedir_olddefault))
+			if (file_exists(EGW_INCLUDE_ROOT.$imagedir_olddefault) && ($d = dir(EGW_INCLUDE_ROOT.$imagedir_olddefault)))
 			{
-				$d = dir(EGW_INCLUDE_ROOT.$imagedir_olddefault);
-				while (false != ($entry = $d->read()))
+				while (($entry = $d->read()))
 				{
-					if ($entry != '.' && $entry != '..')
+					if ($entry[0] != '.')
 					{
 						self::$found_files[$appname][$entry] = $imagedir_olddefault;
 					}
 				}
 				$d->close();
 			}
-
-			if (@is_dir(EGW_INCLUDE_ROOT.$imagedir_default))
+			if (file_exists(EGW_INCLUDE_ROOT.$imagedir_default) && ($d = dir(EGW_INCLUDE_ROOT.$imagedir_default)))
 			{
-				$d = dir(EGW_INCLUDE_ROOT.$imagedir_default);
-				while (false != ($entry = $d->read()))
+				while (($entry = $d->read()))
 				{
-					if ($entry != '.' && $entry != '..')
+					if ($entry[0] != '.')
 					{
 						self::$found_files[$appname][$entry] = $imagedir_default;
 					}
 				}
 				$d->close();
 			}
-
-			if (@is_dir(EGW_INCLUDE_ROOT.$imagedir))
+			if (file_exists(EGW_INCLUDE_ROOT.$imagedir) && ($d = dir(EGW_INCLUDE_ROOT.$imagedir)))
 			{
-				$d = dir(EGW_INCLUDE_ROOT.$imagedir);
-				while (false != ($entry = $d->read()))
+				while (($entry = $d->read()))
 				{
-					if ($entry != '.' && $entry != '..')
+					if ($entry[0] != '.')
 					{
 						self::$found_files[$appname][$entry] = $imagedir;
 					}
 				}
 				$d->close();
 			}
-
-			if (!isset(self::$found_files['vfs']) && egw_vfs::file_exists($vfs_imagedir) &&
+			//echo $appname; _debug_array(self::$found_files[$appname]);
+		}
+		if (!isset(self::$found_files['vfs']))
+		{
+			self::$found_files['vfs'] = array();	// so it get's scaned only once
+			if (egw_vfs::file_exists($vfs_imagedir) &&
 				egw_vfs::is_dir($vfs_imagedir) && ($d = egw_vfs::opendir($vfs_imagedir)))
 			{
 				while (($entry = readdir($d)) !== false)
 				{
 					if (!egw_vfs::is_dir($vfs_imagedir.'/'.$entry))
 					{
-						if (list($type,$subtype) = explode('/',egw_vfs::mime_content_type($vfs_imagedir.'/'.$entry)))// && $type == 'image')
+						if (list($type,$subtype) = explode('/',egw_vfs::mime_content_type($vfs_imagedir.'/'.$entry)) && $type == 'image')
 						{
-							if ($type == 'image' || $type == 'application') self::$found_files['vfs'][$entry] = $vfs_imagedir;
+							self::$found_files['vfs'][$entry] = $vfs_imagedir;
 						}
 					}
 				}
 				closedir($d);
+				//echo 'vfs'; _debug_array(self::$found_files['vfs']);
 			}
 		}
 		if (!$GLOBALS['egw_info']['server']['image_type'])
@@ -892,7 +892,7 @@ class common
 				break;
 			}
 			// then look in the selected template dir
-			if(self::$found_files[$appname][$image.$type]==$imagedir)
+			if(self::$found_files[$appname][$image.$type] == $imagedir)
 			{
 				$imgfile = $GLOBALS['egw_info']['server']['webserver_url'].self::$found_files[$appname][$image.$type].'/'.$image.$type;
 				break;
@@ -912,7 +912,7 @@ class common
 			{
 				self::find_image('phpgwapi','');
 			}
-			foreach(array_merge($img_type,array('')) as $type)
+			foreach($img_type as $type)
 			{
 				if(isset(self::$found_files['phpgwapi'][$image.$type]))
 				{
@@ -936,35 +936,35 @@ class common
 	 */
 	static function image($appname,$image='',$ext='',$use_lang=True)
 	{
-		if (!is_array($image))
+		static $cache;	// do some caching in the request
+
+		$image_found =& $cache[$appname.$image.$ext.$use_lang];
+
+		if (!isset($image_found))
 		{
-			if (empty($image))
+			if (!is_array($image))
 			{
-				return '';
+				if (empty($image))
+				{
+					return '';
+				}
+			}
+			if ($use_lang)
+			{
+				foreach((array)$image as $img)
+				{
+					$lang_images[] = $img . '_' . $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
+					$lang_images[] = $img;
+				}
+				$image = $lang_images;
 			}
-		}
-		if ($use_lang)
-		{
 			foreach((array)$image as $img)
 			{
-				$lang_images[] = $img . '_' . $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
-				$lang_images[] = $img;
+				if (($image_found = self::find_image($appname,$img.$ext))) break;
 			}
-			$image = $lang_images;
 		}
-		foreach((array)$image as $img)
-		{
-			if(isset(self::$found_files[$appname][$img.$ext]))
-			{
-				$image_found = self::$found_files[$appname][$img.$ext].'/'.$img.$ext;
-			}
-			else
-			{
-				$image_found = self::find_image($appname,$img.$ext);
-			}
-			if ($image_found) break;
-		}
-		//echo "<p>".__METHOD__."($appname,".array2string($image).",$ext,$use_lang) = $image_found</p>\n";
+		//else $cache_hit = ' *** CACHE ***';
+		//echo '<p>'.__METHOD__."($appname,".array2string($image).",$ext,$use_lang) = ".array2string($image_found)." $cache_hit</p>\n";
 		return $image_found;
 	}
 

From e8354276e1071c929c76ad2dfd7d47a3d6fdd615 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 16 May 2009 11:29:47 +0000
Subject: [PATCH 334/510] option to show hidden files

---
 filemanager/inc/class.filemanager_ui.inc.php | 2 ++
 filemanager/setup/egw_de.lang                | 2 ++
 filemanager/setup/egw_en.lang                | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 62d559a4c4..a4faebec3e 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -275,6 +275,7 @@ class filemanager_ui
 		$sel_options['filter'] = array(
 			'1' => 'Current directory',
 			'2' => 'Directories sorted in',
+			'3' => 'Show hidden files',
 			''  => 'Files from subdirectories',
 		);
 		$tpl->exec('filemanager.filemanager_ui.index',$content,$sel_options,$readonlys,array('nm' => $content['nm']));
@@ -599,6 +600,7 @@ class filemanager_ui
 			'limit' => (int)$query['num_rows'].','.(int)$query['start'],
 			'need_mime' => true,
 			'name_preg' => $namefilter,
+			'hidden' => $query['filter'] == 3,
 		),true) as $path => $row)
 		{
 			//echo $path; _debug_array($row);
diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index 60281004d4..8babf82688 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -24,6 +24,7 @@ allow a maximum of the above configured folderlinks to be configured in settings
 and all it's childeren	filemanager	de	und alle seine Kinder
 applications	common	de	Anwendungen
 basedirectory	filemanager	de	Basisverzeichnis
+can't open directory %1!	filemanager	de	Kann Verzeichnis %1 nicht öffnen!
 cancel editing %1 without saving	filemanager	de	Beende das Bearbeiten von %1 ohne zu Speichern
 cannot create directory because it begins or ends in a space	filemanager	de	Die Erstellung des Verzeichnisses schlug fehl, da es mit einem Leerzeichen beginnt oder endet
 check all	filemanager	de	Alle auswählen
@@ -152,6 +153,7 @@ searchstring	filemanager	de	Suchbegriff
 select action...	filemanager	de	Befehl auswählen...
 select file to upload in current directory	filemanager	de	Datei zum hochladen in das aktuelle Verzeichnis auswählen
 show	filemanager	de	Zeige
+show hidden files	filemanager	de	Zeige versteckte Dateien
 show link to filemanagers basedirectory (/) in side box menu?	filemanager	de	Zeige die Verknüpfung zum Basisverzeichnis (/) des Dateimanagers im Seitenmenu?
 size	filemanager	de	Größe
 start search	filemanager	de	Suche starten
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index 5d9410a622..61e00908a7 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -24,6 +24,7 @@ allow a maximum of the above configured folderlinks to be configured in settings
 and all it's childeren	filemanager	en	and all it's childeren
 applications	common	en	Applications
 basedirectory	filemanager	en	Basedirectory
+can't open directory %1!	filemanager	en	Can't open directory %1!
 cancel editing %1 without saving	filemanager	en	Cancel editing %1 without saving
 cannot create directory because it begins or ends in a space	filemanager	en	Cannot create directory because it begins or ends in a space
 check all	filemanager	en	Check all
@@ -152,6 +153,7 @@ searchstring	filemanager	en	searchstring
 select action...	filemanager	en	Select action...
 select file to upload in current directory	filemanager	en	Select file to upload in current directory
 show	filemanager	en	Show
+show hidden files	filemanager	en	Show hidden files
 show link to filemanagers basedirectory (/) in side box menu?	filemanager	en	Show link to filemanagers basedirectory (/) in side box menu?
 size	filemanager	en	Size
 start search	filemanager	en	start search

From 220492880da96110c5f31dcbb10ad9383975c38c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 17 May 2009 11:41:58 +0000
Subject: [PATCH 335/510] allow to load widget specific edit-template from the
 app the widget belongs too, eg. infolog-value -->
 infolog.widget.infolog-value

---
 etemplate/inc/class.editor.inc.php            |  4 +-
 etemplate/setup/etemplates.inc.php            | 16 +++----
 etemplate/templates/default/app.css           |  3 ++
 .../default/editor.widget.contact.xet         | 48 +++++++++++++++++++
 etemplate/templates/default/editor.widget.xet | 26 +++++-----
 5 files changed, 76 insertions(+), 21 deletions(-)
 create mode 100644 etemplate/templates/default/editor.widget.contact.xet

diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index 85e3a33921..8c6d9aed05 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -1341,7 +1341,9 @@ class editor
 		$type_tmpl =& new etemplate;
 
 		list($ext_type) = explode('-',$widget['type']);
-		if ($type_tmpl->read('etemplate.editor.widget.'.$widget['type']) ||
+		// allow to read template of app-specific widgets from their app: eg. "infolog-value" --> "infolog.widget.infolog-value"
+		if (isset($GLOBALS['egw_info']['apps'][$ext_type]) && $type_tmpl->read($ext_type.'.widget.'.$widget['type']) ||
+			$type_tmpl->read('etemplate.editor.widget.'.$widget['type']) ||
 			$type_tmpl->read('etemplate.editor.widget.'.$ext_type))
 		{
 			$editor->set_cell_attribute('etemplate.editor.widget.generic','obj',$type_tmpl);
diff --git a/etemplate/setup/etemplates.inc.php b/etemplate/setup/etemplates.inc.php
index 7dfe52e8dc..3f2aa8aefc 100644
--- a/etemplate/setup/etemplates.inc.php
+++ b/etemplate/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application etemplate
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-13 09:38
+	* generated by soetemplate::dump4setup() 2009-05-17 13:35
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package etemplate
@@ -151,23 +151,19 @@ $templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang
 
 $templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.0.1.006','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:1:{s:4:"type";s:5:"label";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1131206619',);
 
-$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"3";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:4:{s:4:"type";s:6:"select";s:5:"label";s:4:"Part";s:4:"name";s:14:"grid_row[part]";s:4:"help";s:61:"part of the table (header and footer have to be before body!)";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1235386301',);
-
-$templ_data[] = array('name' => 'etemplate.editor.widget.ajax_select','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:12:",@type=label";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"h8";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:5:"label";s:19:"AJAX Select options";s:7:"options";a:1:{i:0;s:1:"1";}s:4:"data";a:3:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"data";a:1:{i:0;a:0:{}}s:5:"label";s:11:"Data Source";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[0]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Title Source";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"ID Field";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[2]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Result row template";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[3]";}}}s:4:"rows";i:2;s:4:"cols";i:4;}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:8;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1163010571',);
+$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:6:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";s:8:"disabled";b:1;}i:4;a:6:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";s:8:"disabled";b:1;}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"3";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:4:{s:4:"type";s:6:"select";s:5:"label";s:4:"Part";s:4:"name";s:14:"grid_row[part]";s:4:"help";s:61:"part of the table (header and footer have to be before body!)";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1235386301',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.ajax_select','template' => '','lang' => '','group' => '0','version' => '0.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:12:",@type=label";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"h8";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:5:"label";s:19:"AJAX Select options";s:7:"options";a:1:{i:0;s:1:"1";}s:4:"data";a:4:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"data";a:1:{i:0;a:0:{}}s:5:"label";s:11:"Data Source";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[0]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Title Source";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"ID Field";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[2]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Result row template";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[3]";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Link";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[6]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Icon";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[7]";}}}s:4:"rows";i:3;s:4:"cols";i:4;}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:8;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1176828301',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.contact','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:5:{s:4:"type";s:14:"contact-fields";s:4:"name";s:4:"size";s:4:"help";s:21:"Contact field to show";s:4:"span";s:3:"all";s:5:"label";s:5:"Field";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";s:5:"label";s:11:"Span, Class";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1159998081',);
 
-$templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@type=button";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s onChange";s:5:"align";s:6:"center";s:4:"name";s:8:"onchange";s:4:"help";s:33:"enable JavaScript onChange submit";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"73";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"58";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1118499298',);
-
-$templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:12:",@type=label";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:14:",!@type=button";s:2:"c7";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1118499298',);
+$templ_data[] = array('name' => 'etemplate.editor.widget.contact','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:5:{s:4:"type";s:14:"contact-fields";s:4:"name";s:4:"size";s:4:"help";s:21:"Contact field to show";s:4:"span";s:3:"all";s:5:"label";s:5:"Field";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";s:5:"label";s:11:"Span, Class";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1242559642',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:12:",@type=label";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"c7";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1118499298',);
 
-$templ_data[] = array('name' => 'etemplate.editor.widget.grid','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:4:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,align";s:5:"label";s:5:"Align";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:4:"Span";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[3]";s:5:"label";s:5:"Class";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:10:"options[3]";s:4:"help";s:27:"CSS class for the table-tag";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[0]";s:5:"label";s:5:"Width";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:10:"options[0]";s:4:"help";s:71:" Width of the table in % or pixels for the table-tag and (optional) div";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[1]";s:5:"label";s:6:"Height";s:5:"align";s:5:"right";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:10:"options[1]";s:4:"help";s:72:" Height of the table in % or pixels for the table-tag and (optional) div";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[6]";s:5:"label";s:8:"Overflow";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"options[6]";s:4:"help";s:96:"what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[4]";s:5:"label";s:7:"Spacing";}s:1:"B";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:10:"options[4]";s:4:"help";s:29:"Cellspacing for the table-tag";s:4:"size";s:14:"Default,0,10,1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[5]";s:5:"label";s:7:"Padding";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:14:"Default,0,10,1";s:4:"name";s:10:"options[5]";s:4:"help";s:29:"Cellpadding for the table-tag";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[2]";s:5:"label";s:6:"Border";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:14:"Default,0,10,1";s:4:"name";s:10:"options[2]";s:4:"help";s:39:"Border-line-thickness for the table-tag";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1116599469',);
+$templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:12:",@type=label";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"c7";s:3:"row";s:1:"A";s:2:"70";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:18:"all,inputFullWidth";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1242559548',);
 
-$templ_data[] = array('name' => 'etemplate.editor.widget.infolog','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:2:"c1";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c2";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@type=button";s:2:"c3";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:6:{s:4:"type";s:14:"infolog-fields";s:4:"name";s:10:"options[0]";s:4:"help";s:21:"Contact field to show";s:4:"span";s:3:"all";s:5:"label";s:5:"Field";s:7:"options";a:0:{}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Compare";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";s:4:"help";s:69:"show a X if content equals this compare value, otherwise show nothing";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"span";s:3:"all";s:5:"label";s:12:"Alternatives";s:4:"name";s:10:"options[2]";s:4:"help";s:77:"colon (:) separated list of field names to use if value is empty or to sum up";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Contactfield";}s:1:"B";a:2:{s:4:"type";s:14:"contact-fields";s:4:"name";s:10:"options[3]";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:19:"Regular expression ";s:4:"name";s:10:"options[4]";s:4:"help";s:31:"first argument for preg_replace";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:11:"Replacement";s:4:"name";s:10:"options[5]";s:4:"help";s:33:"second parameter for preg_replace";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";s:5:"label";s:11:"Span, Class";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1187334168',);
+$templ_data[] = array('name' => 'etemplate.editor.widget.grid','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:4:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,align";s:5:"label";s:5:"Align";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:4:"Span";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[3]";s:5:"label";s:5:"Class";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:10:"options[3]";s:4:"help";s:27:"CSS class for the table-tag";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[0]";s:5:"label";s:5:"Width";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:10:"options[0]";s:4:"help";s:71:" Width of the table in % or pixels for the table-tag and (optional) div";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[1]";s:5:"label";s:6:"Height";s:5:"align";s:5:"right";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:10:"options[1]";s:4:"help";s:72:" Height of the table in % or pixels for the table-tag and (optional) div";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[6]";s:5:"label";s:8:"Overflow";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"options[6]";s:4:"help";s:96:"what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[4]";s:5:"label";s:7:"Spacing";}s:1:"B";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:10:"options[4]";s:4:"help";s:29:"Cellspacing for the table-tag";s:4:"size";s:14:"Default,0,10,1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[5]";s:5:"label";s:7:"Padding";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:14:"Default,0,10,1";s:4:"name";s:10:"options[5]";s:4:"help";s:29:"Cellpadding for the table-tag";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[2]";s:5:"label";s:6:"Border";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:14:"Default,0,10,1";s:4:"name";s:10:"options[2]";s:4:"help";s:39:"Border-line-thickness for the table-tag";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1116599469',);
 
 $templ_data[] = array('name' => 'etemplate.groupbox.test','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"2";s:5:"label";s:18:"Selection grouping";i:1;a:4:{s:4:"type";s:5:"radio";s:4:"size";s:1:"1";s:5:"label";s:18:"%s selection #1 or";s:4:"name";s:9:"selection";}i:2;a:4:{s:4:"type";s:5:"radio";s:4:"size";s:1:"2";s:5:"label";s:15:"%s selection #2";s:4:"name";s:9:"selection";}}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1107699792',);
 
@@ -302,6 +298,8 @@ $templ_data[] = array('name' => 'etemplate.test.grid-export','template' => '','l
 
 $templ_data[] = array('name' => 'etemplate.test.grid-export','template' => '','lang' => '','group' => '0','version' => '2','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"some cell";}}i:2;a:1:{s:1:"A";a:6:{s:5:"class";s:9:"hboxClass";s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"size";s:1:"1";s:4:"type";s:5:"label";s:5:"label";s:2:"1.";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:2:"2.";}i:3;a:3:{s:5:"align";s:5:"right";s:4:"type";s:5:"label";s:5:"label";s:10:"last right";}}}}s:4:"cols";i:1;s:4:"rows";i:2;s:4:"size";s:16:"100%,,,gridClass";}}','size' => '100%,,,gridClass','style' => '','modified' => '1179507244',);
 
+$templ_data[] = array('name' => 'etemplate.test.infolog','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:13:"infolog-value";s:4:"name";s:4:"test";s:7:"options";a:0:{}}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1242560130',);
+
 $templ_data[] = array('name' => 'etemplate.test.table','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h1";s:4:",h,h";s:2:"h3";s:4:",f,f";s:2:"h2";s:3:",,h";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Kopf2";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:12:"2. Kopfzeile";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Footer2";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Body2";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"2. Body2";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:3:",,1";s:7:"options";a:1:{i:2;s:1:"1";}}}','size' => ',,1','style' => '','modified' => '1235388984',);
 
 $templ_data[] = array('name' => 'etemplate.test.Ymd','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:4:"text";s:5:"label";s:19:"Date YYYYmmddHHiiss";s:4:"name";s:4:"date";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"date";s:4:"size";s:5:"YmdHi";s:5:"label";s:4:"Date";s:4:"name";s:4:"date";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-timeonly";s:4:"size";s:5:"YmdHi";s:5:"label";s:4:"Time";s:4:"name";s:4:"date";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:3;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1179320861',);
diff --git a/etemplate/templates/default/app.css b/etemplate/templates/default/app.css
index 214b51b066..988c1b5f20 100644
--- a/etemplate/templates/default/app.css
+++ b/etemplate/templates/default/app.css
@@ -21,6 +21,9 @@
 .leftPad5 {
 	padding-left: 5px;
 }
+.inputFullWidth input {
+	width: 100%;
+}
 
 /*
  * mark input as required
diff --git a/etemplate/templates/default/editor.widget.contact.xet b/etemplate/templates/default/editor.widget.contact.xet
new file mode 100644
index 0000000000..51fedf1cca
--- /dev/null
+++ b/etemplate/templates/default/editor.widget.contact.xet
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="etemplate.editor.widget.contact" template="" lang="" group="0" version="1.7.001">
+		<grid>
+			<columns>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row class="row">
+					<description options=",,,type" value="Type"/>
+					<menulist>
+						<menupopup id="type" onchange="1" statustext="type of the field (select Label if field should be empty)"/>
+					</menulist>
+					<contact-fields id="size" statustext="Contact field to show" span="all" label="Field"/>
+				</row>
+				<row class="row">
+					<description options=",,,label" value="Label"/>
+					<textbox id="label" statustext="displayed in front of input or input is inserted for a '%s' in the label (label of the Submitbutton or Image-filename)"/>
+					<textbox size="10" id="span" statustext="number of colums the field/cell should span or 'all' for the remaining columns, CSS-class name (for the TD tag)" label="Span, Class" span="2"/>
+					<description value="Align" align="center"/>
+					<menulist>
+						<menupopup id="align" statustext="alignment of label and input-field in table-cell"/>
+					</menulist>
+				</row>
+				<row class="row">
+					<description options=",,,name" value="Name"/>
+					<textbox id="name" statustext="index/name of returned content (name of the Template, Link / Method for Image)"/>
+					<checkbox label="%s disabled" id="disabled" statustext="if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell" span="all"/>
+				</row>
+				<row class="row" disabled="!@type=button">
+					<description options="onclick" value="onClick"/>
+					<hbox options="0,0" span="all">
+						<menulist>
+							<menupopup id="onclick_type" statustext="confirmation necesary or custom java-script"/>
+						</menulist>
+						<textbox span="all" class="leftPad5 inputFullWidth" id="onclick" statustext="confirmation message or custom javascript (returning true or false)" align="right"/>
+					</hbox>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file
diff --git a/etemplate/templates/default/editor.widget.xet b/etemplate/templates/default/editor.widget.xet
index 832846dc0d..de2a02eae1 100644
--- a/etemplate/templates/default/editor.widget.xet
+++ b/etemplate/templates/default/editor.widget.xet
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="etemplate.editor.widget.generic" template="" lang="" group="0" version="1.3.001">
-		<grid>
+	<template id="etemplate.editor.widget.generic" template="" lang="" group="0" version="1.7.001">
+		<grid width="100%">
 			<columns>
-				<column/>
+				<column width="70"/>
 				<column/>
 				<column/>
 				<column/>
@@ -50,31 +50,35 @@
 				</row>
 				<row class="row">
 					<description options=",,,help" value="Help"/>
-					<textbox size="71" span="all" id="help" statustext="displayed in statusline of browser if input-field gets focus"/>
+					<textbox size="71" span="all" class="inputFullWidth" id="help" statustext="displayed in statusline of browser if input-field gets focus"/>
+					<description/>
+					<description/>
+					<description/>
+					<description/>
 				</row>
 				<row class="row" disabled="@type=label">
 					<description value="onChange"/>
-					<hbox span="all">
+					<hbox options="0,0" span="all">
 						<menulist>
 							<menupopup id="onchange_type" statustext="Should the form be submitted or any custom javascript be executed"/>
 						</menulist>
-						<textbox size="50" span="all" id="onchange" statustext="custom javascript for onChange"/>
+						<textbox size="50" span="all" class="leftPad5 inputFullWidth" id="onchange" statustext="custom javascript for onChange" align="right"/>
 					</hbox>
 				</row>
 				<row class="row">
 					<description options="onclick" value="onClick"/>
-					<hbox span="all">
+					<hbox options="0,0" span="all">
 						<menulist>
 							<menupopup id="onclick_type" statustext="confirmation necesary or custom java-script"/>
 						</menulist>
-						<textbox size="53" span="all" id="onclick" statustext="confirmation message or custom javascript (returning true or false)"/>
+						<textbox size="53" span="all" class="leftPad5 inputFullWidth" id="onclick" statustext="confirmation message or custom javascript (returning true or false)" align="right"/>
 					</hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="etemplate.editor.widget" template="" lang="" group="0" version="1.7.001">
-		<grid>
+		<grid width="100%">
 			<columns>
 				<column/>
 				<column/>
@@ -89,10 +93,10 @@
 							<menupopup options="Box..." id="box_menu" onchange="1" statustext="all operations save the template!"/>
 						</menulist>
 						<menulist>
-							<menupopup options="Row..." id="row_menu" onchange="1" statustext="all operations save the template!"/>
+							<menupopup options="Row..." id="row_menu" onchange="1" statustext="all operations save the template!" disabled="true"/>
 						</menulist>
 						<menulist>
-							<menupopup options="Column..." id="column_menu" onchange="1" statustext="all operations save the template!"/>
+							<menupopup options="Column..." id="column_menu" onchange="1" statustext="all operations save the template!" disabled="true"/>
 						</menulist>
 					</hbox>
 				</row>

From 70e98e0553a2fa7321e1771a138ab06be7e701e2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 17 May 2009 11:44:15 +0000
Subject: [PATCH 336/510] allow to load widget specific edit-template from the
 app the widget belongs too, eg. infolog-value -->
 infolog.widget.infolog-value

---
 infolog/setup/etemplates.inc.php              | 58 +-----------------
 .../default/widget.infolog-value.xet          | 59 +++++++++++++++++++
 2 files changed, 61 insertions(+), 56 deletions(-)
 create mode 100644 infolog/templates/default/widget.infolog-value.xet

diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index b32dfe0430..587b39b0b7 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-11 11:18
+	* generated by soetemplate::dump4setup() 2009-05-17 13:43
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -14,17 +14,12 @@ $templ_version=1;
 
 $templ_data[] = array('name' => 'infolog.close','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"h4";s:2:"50";s:2:"c3";s:7:",bottom";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:5:"align";s:6:"center";s:4:"name";s:27:"infolog.index.rows-noheader";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:44:"Are you shure you want to close this entry ?";s:5:"align";s:6:"center";}}i:4;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"Yes - Close";s:4:"name";s:5:"close";s:4:"help";s:30:"Sub-entries will not be closed";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:33:"Yes - Close including sub-entries";s:4:"name";s:10:"close_subs";s:4:"help";s:43:"Close this entry and all listed sub-entries";}s:5:"align";s:6:"center";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"No - Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:22:"Abort without deleting";}}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1240392317',);
 
-$templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:3:"typ";s:8:"onchange";s:1:"1";s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
-.error_msg { color: red; font-style: italics; }','modified' => '1061729975',);
-
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1159943136',);
 
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:3:{s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";s:1:"F";s:3:"80%";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:7:",header";s:5:"label";s:15:"Group owner for";s:4:"name";s:5:"type2";}i:2;a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:11:"None,groups";s:4:"name";s:11:"group_owner";s:4:"help";s:119:"If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!";s:4:"span";s:10:",lpadding5";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:17:"apply the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1173687088',);
 
-$templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1061734964',);
-
 $templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;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:8:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"3";s:4:"name";s:13:"${row}[type2]";s:4:"help";s:41:"for which types should this field be used";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"${row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1061734964',);
 
 $templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;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:8:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"3";s:4:"name";s:13:"${row}[type2]";s:4:"help";s:41:"for which types should this field be used";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"${row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1061734964',);
@@ -37,14 +32,6 @@ $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','
 
 $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"h4";s:2:"50";s:2:"c3";s:7:",bottom";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:5:"align";s:6:"center";s:4:"name";s:27:"infolog.index.rows-noheader";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:45:"Are you shure you want to delete this entry ?";s:5:"align";s:6:"center";}}i:4;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Yes - Delete";s:4:"name";s:6:"delete";s:4:"help";s:75:"Sub-entries become subs of the parent or main entries, if there\'s no parent";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:34:"Yes - Delete including sub-entries";s:4:"name";s:11:"delete_subs";s:4:"help";s:44:"Delete this entry and all listed sub-entries";}s:5:"align";s:6:"center";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"No - Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:22:"Abort without deleting";}}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1131742953',);
 
-$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"span";s:3:"all";s:4:"name";s:9:"info_type";s:8:"onchange";s:1:"1";s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:6:"needed";s:1:"1";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142602276',);
-
-$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
-.link_select select { width: 250px; }','modified' => '1159943980',);
-
-$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
-.link_select select { width: 250px; }','modified' => '1159943980',);
-
 $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
 .link_select select { width: 250px; }
 .description textarea { width: 98%; }','modified' => '1207297595',);
@@ -67,10 +54,6 @@ $templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang
 
 $templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:2:"th";s:2:"c5";s:7:"row,top";s:2:"c6";s:3:"row";s:2:"h6";s:2:",1";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:7:"General";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:3:{s:4:"name";s:13:"info_priority";s:4:"type";s:6:"select";s:4:"help";s:31:"select a priority for this task";}}i:3;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"size";s:6:"80,255";s:4:"name";s:13:"info_location";s:4:"type";s:4:"text";}}i:4;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:10:"Delegation";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"size";s:19:",,,info_responsible";s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"info_responsible";s:4:"size";s:7:"10,both";s:4:"help";s:66:"select a responsible user: a person you want to delegate this task";}}i:6;a:2:{s:1:"A";a:3:{s:4:"size";s:15:",,,info_confirm";s:4:"type";s:5:"label";s:5:"label";s:7:"Confirm";}s:1:"B";a:3:{s:4:"name";s:12:"info_confirm";s:4:"type";s:6:"select";s:4:"help";s:87:"do you want a confirmation of the responsible on: accepting, finishing the task or both";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:8:"100%,245";}}','size' => '100%,245','style' => '','modified' => '1217409875',);
 
-$templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '0.9.15.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"15,80";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:7:"100%,,0";}}','size' => '100%,,0','style' => '','modified' => '1051391600',);
-
-$templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"13,75";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1051391600',);
-
 $templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:8:"textarea";s:4:"size";s:2:"13";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";s:4:"span";s:12:",description";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1207297749',);
 
 $templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:8:"textarea";s:4:"size";s:2:"13";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";s:4:"span";s:12:",description";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1229074983',);
@@ -79,8 +62,6 @@ $templ_data[] = array('name' => 'infolog.edit.GroupType','template' => '','lang'
 
 $templ_data[] = array('name' => 'infolog.edit.history','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,250,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"250";i:6;s:4:"auto";}}}','size' => '100%,250,,,,,auto','style' => '','modified' => '1181576846',);
 
-$templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '0.9.15.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"h4";s:3:"164";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1075977056',);
-
 $templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:17:"100%,245,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";}}}','size' => '100%,245,,,,,auto','style' => '','modified' => '1075977056',);
 
 $templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c4";s:2:"th";s:2:"c5";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"link-add";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:17:"100%,245,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";}}}','size' => '100%,245,,,,,auto','style' => '','modified' => '1075977056',);
@@ -89,14 +70,6 @@ $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' =
 
 $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c6";s:7:"row,top";s:2:"h6";s:3:"60%";s:2:"c5";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Projectmanager";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Project";}s:1:"B";a:4:{s:4:"type";s:21:"projectmanager-select";s:4:"name";s:5:"pm_id";s:8:"onchange";s:1:"1";s:4:"size";s:4:"None";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Price";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:207:"this.form[\'exec[info_price]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:10:"info_price";s:4:"span";s:3:"all";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:20:",,,info_planned_time";s:5:"label";s:12:"planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:17:"info_planned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:22:",,,info_replanned_time";s:5:"label";s:15:"Re-planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"info_replanned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,info_used_time";s:5:"label";s:9:"used time";s:4:"help";s:64:"Leave blank to get the used time calculated by timesheet entries";}s:1:"B";a:2:{s:4:"type";s:13:"date-duration";s:4:"name";s:14:"info_used_time";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:8:"100%,245";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"245";}}}','size' => '100%,245','style' => '','modified' => '1223093893',);
 
-$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
-
-$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
-
-$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:244:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
-
-$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:244:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
-
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1223355813',);
 
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1242033158',);
@@ -105,44 +78,17 @@ $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','la
 
 $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"span";s:16:",headertext bold";s:5:"label";s:7:"InfoLog";}}','size' => ',,0,,0,0','style' => '.bold { font-weight: bold; }','modified' => '1056876864',);
 
-$templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=610,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:218:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=550,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=550,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
-
-$templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:218:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
-
 $templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:238:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:240:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:238:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
 
 $templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:239:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=task&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:241:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:239:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
 
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";}i:2;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:11:"Responsible";s:4:"help";s:31:"Select to filter by responsible";}}s:1:"F";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:7:"options";a:1:{i:0;s:1:"3";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1093714137',);
-
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:1:"A";s:2:"2%";s:1:"F";s:34:"8%,@no_info_owner_info_responsible";s:1:"G";s:3:"12%";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"I";s:14:"3%,@no_actions";s:1:"D";s:3:"120";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"G";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1093714137',);
-
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1195812360',);
-
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.4.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1197290396',);
-
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:4;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1197290396',);
-
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1223128790',);
-
-$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1229074929',);
-
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401028',);
 
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:34:"8%,@no_info_owner_info_responsible";s:1:"I";s:3:"12%";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";s:1:"K";s:14:"3%,@no_actions";}i:1;a:11:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"I";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"K";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:11:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:8:",infoDes";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"I";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"J";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"parent";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"K";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:11;}}','size' => '','style' => '','modified' => '1240401028',);
 
-$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
-
-$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:34:"8%,@no_info_onwer_info_responsible";s:1:"F";s:25:"12%,@no_info_datemodified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:37:",@no_info_used_time_info_planned_time";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
-
-$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
-
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"F";s:37:",@no_info_used_time_info_planned_time";s:1:"G";s:34:"8%,@no_info_onwer_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:25:"12%,@no_info_datemodified";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";s:1:"J";s:14:"3%,@no_actions";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401005',);
 
-$templ_data[] = array('name' => 'infolog.Lebert.Baienfurt.Kopf','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:17:"Lebert + Co. GmbH";s:4:"span";s:11:",my_heading";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:23:"International Spedition";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Eisenbahnstrasse 4";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"88255 Baienfurt";}}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:8:"logo.png";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:14:"100%,,,my_form";s:7:"options";a:2:{i:3;s:7:"my_form";i:0;s:4:"100%";}}}','size' => '100%,,,my_form','style' => '.xmy_form td { font-size: 20pt; }
-.my_heading { font-size: 120%; font-weight: bold; }','modified' => '1158752011',);
-
-$templ_data[] = array('name' => 'infolog.test','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:19:"customfields-header";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1197441373',);
+$templ_data[] = array('name' => 'infolog.widget.infolog-value','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:2:"c1";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c2";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@type=button";s:2:"c3";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:6:{s:4:"type";s:14:"infolog-fields";s:4:"name";s:10:"options[0]";s:4:"help";s:21:"Contact field to show";s:4:"span";s:3:"all";s:5:"label";s:5:"Field";s:7:"options";a:0:{}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Compare";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";s:4:"help";s:69:"show a X if content equals this compare value, otherwise show nothing";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"span";s:3:"all";s:5:"label";s:12:"Alternatives";s:4:"name";s:10:"options[2]";s:4:"help";s:77:"colon (:) separated list of field names to use if value is empty or to sum up";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Contactfield";}s:1:"B";a:2:{s:4:"type";s:14:"contact-fields";s:4:"name";s:10:"options[3]";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:19:"Regular expression ";s:4:"name";s:10:"options[4]";s:4:"help";s:31:"first argument for preg_replace";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:11:"Replacement";s:4:"name";s:10:"options[5]";s:4:"help";s:33:"second parameter for preg_replace";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";s:5:"label";s:11:"Span, Class";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1242559977',);
 
diff --git a/infolog/templates/default/widget.infolog-value.xet b/infolog/templates/default/widget.infolog-value.xet
new file mode 100644
index 0000000000..08fa77a660
--- /dev/null
+++ b/infolog/templates/default/widget.infolog-value.xet
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="infolog.widget.infolog-value" template="" lang="" group="0" version="1.7.001">
+		<grid>
+			<columns>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row class="row">
+					<description options=",,,type" value="Type"/>
+					<menulist>
+						<menupopup id="type" onchange="1" statustext="type of the field (select Label if field should be empty)"/>
+					</menulist>
+					<infolog-fields id="options[0]" statustext="Contact field to show" span="all" label="Field"/>
+				</row>
+				<row class="row">
+					<description value="Compare"/>
+					<textbox id="options[1]" statustext="show a X if content equals this compare value, otherwise show nothing"/>
+					<textbox size="40" span="all" label="Alternatives" id="options[2]" statustext="colon (:) separated list of field names to use if value is empty or to sum up"/>
+				</row>
+				<row class="row">
+					<description value="Contactfield"/>
+					<contact-fields id="options[3]"/>
+					<textbox span="2" label="Regular expression " id="options[4]" statustext="first argument for preg_replace"/>
+					<textbox span="2" label="Replacement" id="options[5]" statustext="second parameter for preg_replace"/>
+				</row>
+				<row class="row">
+					<description options=",,,label" value="Label"/>
+					<textbox id="label" statustext="displayed in front of input or input is inserted for a '%s' in the label (label of the Submitbutton or Image-filename)"/>
+					<textbox size="10" id="span" statustext="number of colums the field/cell should span or 'all' for the remaining columns, CSS-class name (for the TD tag)" label="Span, Class" span="2"/>
+					<description value="Align" align="center"/>
+					<menulist>
+						<menupopup id="align" statustext="alignment of label and input-field in table-cell"/>
+					</menulist>
+				</row>
+				<row class="row">
+					<description options=",,,name" value="Name"/>
+					<textbox id="name" statustext="index/name of returned content (name of the Template, Link / Method for Image)"/>
+					<checkbox label="%s disabled" id="disabled" statustext="if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell" span="all"/>
+				</row>
+				<row class="row" disabled="!@type=button">
+					<description options="onclick" value="onClick"/>
+					<hbox options="0,0" span="all">
+						<menulist>
+							<menupopup id="onclick_type" statustext="confirmation necesary or custom java-script"/>
+						</menulist>
+						<textbox size="53" span="all" class="leftPad5 inputFullWidth" id="onclick" statustext="confirmation message or custom javascript (returning true or false)" align="right"/>
+					</hbox>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file

From 8475ae5d96269a0a4152d7dcbf8080787871b7db Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 17 May 2009 11:52:01 +0000
Subject: [PATCH 337/510] Upps: row and column menu got lost ;-)

---
 etemplate/setup/etemplates.inc.php            |  6 ++----
 etemplate/templates/default/editor.widget.xet | 14 ++++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/etemplate/setup/etemplates.inc.php b/etemplate/setup/etemplates.inc.php
index 3f2aa8aefc..0a4ccbfe9d 100644
--- a/etemplate/setup/etemplates.inc.php
+++ b/etemplate/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application etemplate
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-17 13:35
+	* generated by soetemplate::dump4setup() 2009-05-17 13:51
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package etemplate
@@ -147,11 +147,9 @@ $templ_data[] = array('name' => 'etemplate.editor.values','template' => '','lang
 
 $templ_data[] = array('name' => 'etemplate.editor.values','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;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:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Key";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Value";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"$col$row";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:8:"$col$row";}}}s:4:"rows";i:2;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1146315187',);
 
-$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.0.1.005','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:8:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"4,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1109104064',);
-
 $templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.0.1.006','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:1:{s:4:"type";s:5:"label";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1131206619',);
 
-$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:6:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";s:8:"disabled";b:1;}i:4;a:6:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";s:8:"disabled";b:1;}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"3";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:4:{s:4:"type";s:6:"select";s:5:"label";s:4:"Part";s:4:"name";s:14:"grid_row[part]";s:4:"help";s:61:"part of the table (header and footer have to be before body!)";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1235386301',);
+$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:1:{s:4:"type";s:5:"label";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1131206619',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.ajax_select','template' => '','lang' => '','group' => '0','version' => '0.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:12:",@type=label";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"h8";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:5:"label";s:19:"AJAX Select options";s:7:"options";a:1:{i:0;s:1:"1";}s:4:"data";a:4:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"data";a:1:{i:0;a:0:{}}s:5:"label";s:11:"Data Source";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[0]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Title Source";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"ID Field";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[2]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Result row template";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[3]";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Link";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[6]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Icon";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[7]";}}}s:4:"rows";i:3;s:4:"cols";i:4;}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:8;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1176828301',);
 
diff --git a/etemplate/templates/default/editor.widget.xet b/etemplate/templates/default/editor.widget.xet
index de2a02eae1..bf7452d364 100644
--- a/etemplate/templates/default/editor.widget.xet
+++ b/etemplate/templates/default/editor.widget.xet
@@ -93,10 +93,10 @@
 							<menupopup options="Box..." id="box_menu" onchange="1" statustext="all operations save the template!"/>
 						</menulist>
 						<menulist>
-							<menupopup options="Row..." id="row_menu" onchange="1" statustext="all operations save the template!" disabled="true"/>
+							<menupopup options="Row..." id="row_menu" onchange="1" statustext="all operations save the template!"/>
 						</menulist>
 						<menulist>
-							<menupopup options="Column..." id="column_menu" onchange="1" statustext="all operations save the template!" disabled="true"/>
+							<menupopup options="Column..." id="column_menu" onchange="1" statustext="all operations save the template!"/>
 						</menulist>
 					</hbox>
 				</row>
@@ -126,15 +126,13 @@
 				<row disabled="!@grid_row">
 					<groupbox span="all" orient="horizontal">
 						<caption label="Grid row attributes"/>
-						<textbox size="3" label="Height" id="grid_row[height]" statustext="height of row (in % or pixel)"/>
-						<textbox size="8" label="Disabled" id="grid_row[disabled]" statustext="to disable: [! = not]&lt;value&gt;[=&lt;check&gt;] eg: '!@data' disables if content of data is empty"/>
-						<textbox size="8" label="Class" id="grid_row[class]" statustext="CSS-class name for this row, preset: 'th' = header, 'row' = alternating row, 'row_off'+'row_on' rows"/>
+						<textbox size="5" label="Height" id="grid_row[height]" statustext="height of row (in % or pixel)"/>
+						<textbox size="10" label="Disabled" id="grid_row[disabled]" statustext="to disable: [! = not]&lt;value&gt;[=&lt;check&gt;] eg: '!@data' disables if content of data is empty"/>
+						<textbox size="10" label="Class" id="grid_row[class]" statustext="CSS-class name for this row, preset: 'th' = header, 'row' = alternating row, 'row_off'+'row_on' rows"/>
 						<menulist>
 							<menupopup label="Valign" id="grid_row[valign]" statustext="vertical alignment of row"/>
 						</menulist>
-						<menulist>
-							<menupopup label="Part" id="grid_row[part]" statustext="part of the table (header and footer have to be before body!)"/>
-						</menulist>
+						<description/>
 					</groupbox>
 				</row>
 				<row disabled="!@grid_column">

From 654d91cc7c41b0b5f50672280b38de081ab4a8b7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 17 May 2009 13:56:32 +0000
Subject: [PATCH 338/510] "allow extension preProcess method to modify / fix
 $form_name of a widget: - usefull if complete name is determined by eg.
 options - extension has also to fetch the content from
 etemplate::$request->content!"

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

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 84fb3fcd34..418a5b8ca7 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -434,13 +434,13 @@ class boetemplate extends soetemplate
 	 * executes the pre_process-function of the extension $cell[type]
 	 *
 	 * @param string $type type of the extension
-	 * @param string $name form-name of this widget/field (used as a unique index into extension_data)
+	 * @param string &$name form-name of this widget/field (used as a unique index into extension_data)
 	 * @param mixed  &$value value of the extensions content(-array)
 	 * @param array &$cell table-cell on which the extension operates
 	 * @param array &$readonlys value of the extensions readonly-setting(-array)
 	 * @return mixed the return-value of the extensions preprocess function
 	 */
-	protected function extensionPreProcess($type,$name,&$value,&$cell,&$readonlys)
+	protected function extensionPreProcess($type,&$name,&$value,&$cell,&$readonlys)
 	{
 		if (!$this->haveExtension($type))
 		{

From 8e448623709adaa5b2334428b3f63b767301f7c9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 17 May 2009 20:46:12 +0000
Subject: [PATCH 339/510] "Austrian holidays 'til 2019, thanks to
 wolfgang.knabl(at)hhc-partner.com"

---
 calendar/egroupware.org/holidays.AT.csv | 87 ++++++++++++++++---------
 1 file changed, 56 insertions(+), 31 deletions(-)

diff --git a/calendar/egroupware.org/holidays.AT.csv b/calendar/egroupware.org/holidays.AT.csv
index 881e506886..cbf906e572 100644
--- a/calendar/egroupware.org/holidays.AT.csv
+++ b/calendar/egroupware.org/holidays.AT.csv
@@ -23,24 +23,17 @@ AT	Fronleichnam	10	6	2004	0	0
 2005:
 AT	Ostersonntag	27	3	2005	0	0
 AT	Ostermontag	28	3	2005	0	0
+AT	Christi Himmelfahrt	5	5	2005	0	0
 AT	Pfingstsonntag	15	5	2005	0	0
 AT	Pfingstmontag	16	5	2005	0	0
 AT	Fronleichnam	26	5	2005	0	0
 
-2006:
-AT	Ostersonntag	16	4	2006	0	0
-AT	Ostermontag	17	4	2006	0	0
-AT	Christi Himmelfahrt	25	5	2006	0	0
-AT	Pfingstsonntag	4	6	2006	0	0
-AT	Pfingstmontag	5	6	2006	0	0
-AT	Fronleichnam	15	6	2006	0	0
-
 2007:
 AT	Ostersonntag	8	4	2007	0	0
 AT	Ostermontag	9	4	2007	0	0
 AT	Christi Himmelfahrt	17	5	2007	0	0
-AT	Pfingstsonntag	27	5	2007	0	0
-AT	Pfingstmontag	28	5	2007	0	0
+AT	Pfingstsonntag	26	5	2007	0	0
+AT	Pfingstmontag	27	5	2007	0	0
 AT	Fronleichnam	7	6	2007	0	0
 
 2008:
@@ -48,16 +41,16 @@ AT	Ostersonntag	23	3	2008	0	0
 AT	Ostermontag	24	3	2008	0	0
 AT	Christi Himmelfahrt	1	5	2008	0	0
 AT	Pfingstsonntag	11	5	2008	0	0
-AT	Pfingstmontag	12	5	2008	0	0
+AT	Pfingstmontag	12	5	2008	1	0
 AT	Fronleichnam	22	5	2008	0	0
 
 2009:
 AT	Ostersonntag	12	4	2009	0	0
 AT	Ostermontag	13	4	2009	0	0
 AT	Christi Himmelfahrt	21	5	2009	0	0
-AT	Pfingstsontag	31	5	2009	0	0
-AT	Pfingstmontag	1	6	2009	0	0
-AT	Frohnleichnam	11	6	2009	0	0
+AT	Pfingstsonntag	31	5	2009	0	0
+AT	Pfingstmontag	1	6	2009	1	0
+AT	Fronleichnam	11	6	2009	0	0
 
 2010:
 AT	Ostersonntag	4	4	2010	0	0
@@ -65,7 +58,7 @@ AT	Ostermontag	5	4	2010	0	0
 AT	Christi Himmelfahrt	13	5	2010	0	0
 AT	Pfingstsonntag	23	5	2010	0	0
 AT	Pfingstmontag	24	5	2010	0	0
-AT	Frohnleichnam	3	6	2010	0	0
+AT	Fronleichnam	3	6	2010	0	0
 
 2011:
 AT	Ostersonntag	24	4	2011	0	0
@@ -73,23 +66,23 @@ AT	Ostermontag	25	4	2011	0	0
 AT	Christi Himmelfahrt	2	6	2011	0	0
 AT	Pfingstsonntag	12	6	2011	0	0
 AT	Pfingstmontag	13	6	2011	0	0
-AT	Frohnleichnam	23	6	2011	0	0
+AT	Fronleichnam	23	6	2011	0	0
 
 2012:
 AT	Ostersonntag	8	4	2012	0	0
 AT	Ostermontag	9	4	2012	0	0
-AT	Christi Himmelfahrt	16	5	2012	0	0
-AT	Pfingstsonntag	26	5	2012	0	0
-AT	Pfingstmontag	27	5	2012	0	0
-AT	Frohnleichnam	6	6	2012	0	0
+AT	Christi Himmelfahrt	17	5	2012	0	0
+AT	Pfingstsonntag	27	5	2012	0	0
+AT	Pfingstmontag	28	5	2012	0	0
+AT	Fronleichnam	7	6	2012	0	0
 
 2013:
 AT	Ostersonntag	31	3	2013	0	0
 AT	Ostermontag	1	4	2013	0	0
-AT	Christi Himmelfahrt	8	5	2013	0	0
-AT	Pfingstsonntag	18	5	2013	0	0
-AT	Pfingstmontag	19	5	2013	0	0
-AT	Frohnleichnam	29	5	2013	0	0
+AT	Christi Himmelfahrt	9	5	2013	0	0
+AT	Pfingstsonntag	19	5	2013	0	0
+AT	Pfingstmontag	20	5	2013	0	0
+AT	Fronleichnam	30	5	2013	0	0
 
 2014:
 AT	Ostersonntag	20	4	2014	0	0
@@ -97,12 +90,44 @@ AT	Ostermontag	21	4	2014	0	0
 AT	Christi Himmelfahrt	29	5	2014	0	0
 AT	Pfingstsonntag	8	6	2014	0	0
 AT	Pfingstmontag	9	6	2014	0	0
-AT	Frohnleichnam	19	6	2014	0	0
+AT	Fronleichnam	19	6	2014	0	0
 
 2015:
-AT      Ostersonntag    5       4       2015    0       0
-AT      Ostermontag     6       4       2015    0       0
-AT      Christi Himmelfahrt     14      5       2015    0       0
-AT      Pfingstsonntag  24      5       2015    0       0
-AT      Pfingstmontag   25      5       2015    0       0
-AT      Fronleichnam    4       6       2015    0       0
+AT	Ostersonntag	5	4	2015	0	0
+AT	Ostermontag	6	4	2015	0	0
+AT	Christi Himmelfahrt	14	5	2015	0	0
+AT	Pfingstsonntag	24	5	2015	0	0
+AT	Pfingstmontag	25	5	2015	0	0
+AT	Fronleichnam	4	6	2015	0	0
+
+2016:
+AT	Ostersonntag	27	3	2016	0	0
+AT	Ostermontag	28	3	2016	0	0
+AT	Christi Himmelfahrt	5	5	2016	0	0
+AT	Pfingstsonntag	15	5	2016	0	0
+AT	Pfingstmontag	16	5	2016	0	0
+AT	Fronleichnam	26	5	2016	0	0
+
+2017:
+AT	Ostersonntag	16	4	2017	0	0
+AT	Ostermontag	17	4	2017	0	0
+AT	Christi Himmelfahrt	25	5	2017	0	0
+AT	Pfingstsonntag	4	6	2017	0	0
+AT	Pfingstmontag	5	6	2017	0	0
+AT	Fronleichnam	15	6	2017	0	0
+
+2018:
+AT	Ostersonntag	1	4	2018	0	0
+AT	Ostermontag	2	4	2018	0	0
+AT	Christi Himmelfahrt	10	5	2018	0	0
+AT	Pfingstsonntag	20	5	2018	0	0
+AT	Pfingstmontag	21	5	2018	0	0
+AT	Fronleichnam	31	5	2018	0	0
+
+2019:
+AT	Ostersonntag	21	4	2019	0	0
+AT	Ostermontag	22	4	2019	0	0
+AT	Christi Himmelfahrt	30	5	2019	0	0
+AT	Pfingstsonntag	9	6	2019	0	0
+AT	Pfingstmontag	10	6	2019	0	0
+AT	Fronleichnam	20	6	2019	0	0

From d56e962ca3ab2b3d97bdd4a592f780e598faa265 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 17 May 2009 22:03:31 +0000
Subject: [PATCH 340/510] "allow to store custom fields with 1:N relations (eg.
 multi-select-box) as real 1:N relation in the DB (default is the old
 behavior!)"

---
 etemplate/inc/class.so_sql_cf.inc.php | 109 +++++++++++++++++++++-----
 1 file changed, 90 insertions(+), 19 deletions(-)

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index 8062b8093a..21fb16f2e1 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -39,6 +39,9 @@
  */
 class so_sql_cf extends so_sql
 {
+	/**
+	 * Prefix used by the class
+	 */
 	const CF_PREFIX = '#';
 
 	/**
@@ -80,6 +83,13 @@ class so_sql_cf extends so_sql
 	 */
 	var $customfields;
 
+	/**
+	 * Do we allow AND store multiple values for a cf (1:N) relations
+	 *
+	 * @var boolean
+	 */
+	var $allow_multiple_values = false;
+
 	/**
 	 * constructor of the class
 	 *
@@ -94,15 +104,17 @@ class so_sql_cf extends so_sql
 	 * @param string $extra_id='_id' column name for cf id column (will be prefixed with colum prefix, if starting with _)
 	 * @param egw_db $db=null database object, if not the one in $GLOBALS['egw']->db should be used, eg. for an other database
 	 * @param boolean $no_clone=true can we avoid to clone the db-object, default yes (different from so_sql!)
+	 * @param boolean $allow_multiple_values=false should we allow AND store multiple values (1:N relations)
 	 * 	new code using appnames and foreach(select(...,$app) can set it to avoid an extra instance of the db object
 	 */
 	function __construct($app,$table,$extra_table,$column_prefix='',
 		$extra_key='_name',$extra_value='_value',$extra_id='_id',
-		$db=null,$no_clone=true)
+		$db=null,$no_clone=true,$allow_multiple_values=false)
 	{
 		// calling the so_sql constructor
 		parent::__construct($app,$table,$db,$column_prefix,$no_clone);
 
+		$this->allow_multiple_values = $allow_multiple_values;
 		$this->extra_table = $extra_table;
 		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
 
@@ -145,7 +157,7 @@ class so_sql_cf extends so_sql
 	 *
 	 * @param int|array $ids one ore more id's
 	 * @param array $field_names=null custom fields to read, default all
-	 * @return array id => self::CF_PREFIX.name => value
+	 * @return array id => $this->cf_field(name) => value
 	 */
 	function read_customfields($ids,$field_names=null)
 	{
@@ -157,15 +169,25 @@ class so_sql_cf extends so_sql
 		}
 		if (!$ids || !$field_names) return array();	// nothing to do
 
-		$fields = array();
+		$entries = array();
 		foreach($this->db->select($this->extra_table,'*',array(
 			$this->extra_id => $ids,
 			$this->extra_key => $field_names,
 		),__LINE__,__FILE__,false,'',$this->app) as $row)
 		{
-			$fields[$row[$this->extra_id]][self::CF_PREFIX.$row[$this->extra_key]] = $row[$this->extra_value];
+			$entry =& $entries[$row[$this->extra_id]];
+			$field = $this->get_cf_field($row[$this->extra_key]);
+
+			if ($this->allow_multiple_values && $this->is_multiple($row[$this->extra_key]))
+			{
+				$entry[$field][] = $row[$this->extra_value];
+			}
+			else
+			{
+				$entry[$field] = $row[$this->extra_value];
+			}
 		}
-		return $fields;
+		return $entries;
 	}
 
 	/**
@@ -176,23 +198,27 @@ class so_sql_cf extends so_sql
 	*/
 	function save_customfields($data)
 	{
-		foreach ((array)$this->customfields as $field => $options)
+		foreach ((array)$this->customfields as $name => $options)
 		{
-			if (!isset($data[self::CF_PREFIX.$field])) continue;
+			if (!isset($data[$field = $this->get_cf_field($name)])) continue;
 
 			$where = array(
 				$this->extra_id    => $data[$this->autoinc_id],
-				$this->extra_key   => $field,
+				$this->extra_key   => $name,
 			);
+			$is_multiple = $this->is_multiple($name);
 
-			if((string) $data[self::CF_PREFIX.$field] === '')	// dont write empty values
+			if(empty($data[$field]) || $is_multiple)	// dont write empty values
 			{
 				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);	// just delete them, in case they were previously set
-				continue;
+				if (!$is_multiple) continue;
 			}
-			if (!$this->db->insert($this->extra_table,array($this->extra_value => $data[self::CF_PREFIX.$field]),$where,__LINE__,__FILE__,$this->app))
+			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) : $data['field'] as $value)
 			{
-				return $this->db->Errno;
+				if (!$this->db->insert($this->extra_table,array($this->extra_value => $value),$where,__LINE__,__FILE__,$this->app))
+				{
+					return $this->db->Errno;
+				}
 			}
 		}
 		return false;	// no error
@@ -213,9 +239,9 @@ class so_sql_cf extends so_sql
 		{
 			foreach($this->customfields as $name => $data)
 			{
-				if (isset($new[self::CF_PREFIX.$name]))
+				if (isset($new[$field = $this->get_cf_field($name)]))
 				{
-					$this->data[self::CF_PREFIX.$name] = $new[self::CF_PREFIX.$name];
+					$this->data[$field] = $new[$field];
 				}
 			}
 		}
@@ -344,7 +370,7 @@ class so_sql_cf extends so_sql
 			// check if only certain cf's to show
 			foreach($selectcols as $col)
 			{
-				if ($col[0] == self::CF_PREFIX) $fields[] = substr($col,1);
+				if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
 			}
 			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
 			{
@@ -424,22 +450,22 @@ class so_sql_cf extends so_sql
 					}
 					unset($filter[$this->autoinc_id]);
 				}
-				elseif (is_string($name) && $name[0] == self::CF_PREFIX)
+				elseif (is_string($name) && $this->is_cf($name))
 				{
 					if (!empty($val))	// empty -> dont filter
 					{
 						$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
-							' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($name,1)).
+							' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($name)).
 							' AND extra_filter.'.$this->extra_value.'='.$this->db->quote($val));
 						++$extra_filter;
 					}
 					unset($filter[$name]);
 				}
-				elseif(is_int($name) && $val[0] == self::CF_PREFIX)	// lettersearch: #cfname LIKE 's%'
+				elseif(is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
 				{
 					list($cf) = explode(' ',$val);
 					$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
-						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote(substr($cf,1)).
+						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($cf)).
 						' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));
 					++$extra_filter;
 					unset($filter[$name]);
@@ -449,6 +475,51 @@ class so_sql_cf extends so_sql
 		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 	}
 
+	/**
+	 * Function to test if $field is a custom field: check for the prefix
+	 *
+	 * @param string $field
+	 * @return boolean true if $name is a custom field, false otherwise
+	 */
+	function is_cf($field)
+	{
+		return $field[0] == self::CF_PREFIX;
+	}
+
+	/**
+	 * Get name part from a custom field: remove the prefix
+	 *
+	 * @param string $field
+	 * @return string name without prefix
+	 */
+	function get_cf_name($field)
+	{
+		return substr($field,1);
+	}
+
+	/**
+	 * Get the field-name from the name of a custom field: prepend the prefix
+	 *
+	 * @param string $name
+	 * @return string prefix-name
+	 */
+	function get_cf_field($name)
+	{
+		return self::CF_PREFIX.$name;
+	}
+
+	/**
+	 * Check if cf is stored as 1:N relation in DB and array in memory
+	 *
+	 * @param string $name
+	 * @return string
+	 */
+	function is_multiple($name)
+	{
+		return $this->allow_multiple_values && in_array($this->customfields[$name]['type'],array('select','select-account')) &&
+			$this->customfields[$name]['rows'] > 1;
+	}
+
 	/**
 	 * Prevent someone calling the old php4 so_sql constructor
 	 */

From ba88fcbd9a4cb66ecbd1d6efadf1fc61795094b9 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 18 May 2009 12:02:45 +0000
Subject: [PATCH 341/510] fixing caching of images, if image is an array

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

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index caf24d4a6b..702404b442 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -938,7 +938,7 @@ class common
 	{
 		static $cache;	// do some caching in the request
 
-		$image_found =& $cache[$appname.$image.$ext.$use_lang];
+		$image_found =& $cache[$appname.implode('-',(array)$image).$ext.$use_lang];
 
 		if (!isset($image_found))
 		{

From d2230cd0002bb7652ee711f8611048922e48994a Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 18 May 2009 12:55:19 +0000
Subject: [PATCH 342/510] adding .ico as image/x-ico

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

diff --git a/phpgwapi/inc/class.mime_magic.inc.php b/phpgwapi/inc/class.mime_magic.inc.php
index 4dae27f6ae..dce56dfab0 100644
--- a/phpgwapi/inc/class.mime_magic.inc.php
+++ b/phpgwapi/inc/class.mime_magic.inc.php
@@ -276,6 +276,7 @@ class mime_magic
 		'html'	=> 'text/html',
 		'ice'	=> 'x-conference/x-cooltalk',
 		'ics'	=> 'text/calendar',
+		'ico'	=> 'image/x-ico',
 		'ief'	=> 'image/ief',
 		'ifb'	=> 'text/calendar',
 		'iges'	=> 'model/iges',

From 317eda1be15b2dbae218ce92974d8e2cb2d17cb2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 May 2009 06:36:06 +0000
Subject: [PATCH 343/510] "allowing to set home-dir and login-shell, if
 accounts are stored in ldap"

---
 admin/admin-cli.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/admin/admin-cli.php b/admin/admin-cli.php
index 6228846fbb..30043fd185 100755
--- a/admin/admin-cli.php
+++ b/admin/admin-cli.php
@@ -190,8 +190,8 @@ function usage($action=null,$ret=0)
 	$cmd = basename($_SERVER['argv'][0]);
 	echo "Usage: $cmd --command admin-account[@domain],admin-password,options,... [--schedule {YYYY-mm-dd|+1 week|+5 days}] [--requested 'Name <email>'] [--comment 'comment ...'] [--remote {id|name}] [--skip-checks]\n\n";
 
-	echo "--edit-user admin-account[@domain],admin-password,account[=new-account-name],first-name,last-name,password,email,expires{never(default)|YYYY-MM-DD|already},can-change-pw{yes(default)|no},anon-user{yes|no(default)},primary-group{Default(default)|...}[,groups,...]\n";
-	echo "	Edit or add a user to eGroupWare. If you specify groups, they *replace* the exiting memberships!\n";
+	echo "--edit-user admin-account[@domain],admin-password,account[=new-account-name],first-name,last-name,password,email,expires{never(default)|YYYY-MM-DD|already},can-change-pw{yes(default)|no},anon-user{yes|no(default)},primary-group{Default(default)|...}[,groups,...][,homedirectory,loginshell]\n";
+	echo "	Edit or add a user to eGroupWare. If you specify groups, they *replace* the exiting memberships! homedirectory+loginshell are supported only for LDAP and must start with a slash!\n";
 	echo "--change-pw admin-account[@domain],admin-password,account,password\n";
 	echo "  Change/set the password for a given user\n";
 	echo "--delete-user admin-account[@domain],admin-password,account-to-delete[,account-to-move-data]\n";
@@ -279,7 +279,7 @@ function do_change_pw($args)
 /**
  * Edit or add a user to eGroupWare. If you specify groups, they *replace* the exiting memberships!
  *                    1:                     2:             3:                         4:         5:        6:       7:    8:                                         9:                                 10:                            11:                                  12
- * @param array $args admin-account[@domain],admin-password,account[=new-account-name],first-name,last-name,password,email,expires{never(default)|YYYY-MM-DD|already},can-change-pw{true(default)|false},anon-user{true|false(default)},primary-group{Default(default)|...}[,groups,...]
+ * @param array $args admin-account[@domain],admin-password,account[=new-account-name],first-name,last-name,password,email,expires{never(default)|YYYY-MM-DD|already},can-change-pw{true(default)|false},anon-user{true|false(default)},primary-group{Default(default)|...}[,groups,...][,homedirectory,loginshell]
  */
 function do_edit_user($args)
 {
@@ -287,7 +287,17 @@ function do_edit_user($args)
 	array_shift($args);	// admin-pw
 	list($account,$new_account_name) = explode('=',array_shift($args));	// account[=new-account-name]
 
-	$data = array(
+	$data = array();
+	// do we need to support ldap only attributes: homedirectory and loginshell
+	if (($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' ||
+		 empty($GLOBALS['egw_info']['server']['account_repository']) && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap') &&
+		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 &&	// 9 = primary group
+		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')	// last argument start with a slash
+	{
+		$data['loginshell'] = array_pop($args);
+		$data['homedirectory'] = array_pop($args);
+	}
+	$data += array(
 		'account_lid' => $new_account_name,
 		'account_firstname' => array_shift($args),
 		'account_lastname' => array_shift($args),

From a5f7d8d4a31d693035e571d0ad600e7bf2b56001 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 May 2009 07:31:13 +0000
Subject: [PATCH 344/510] "fix for bug #2085 - Rev. 27023 PM does no longer
 save custom fields"

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

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index 21fb16f2e1..79ceda4d12 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -213,7 +213,7 @@ class so_sql_cf extends so_sql
 				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);	// just delete them, in case they were previously set
 				if (!$is_multiple) continue;
 			}
-			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) : $data['field'] as $value)
+			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) : (array)$data[$field] as $value)
 			{
 				if (!$this->db->insert($this->extra_table,array($this->extra_value => $value),$where,__LINE__,__FILE__,$this->app))
 				{

From 66ef863bd59ce314a432531e341e7f4adf751541 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 May 2009 10:23:29 +0000
Subject: [PATCH 345/510] "disabling mime-type and size in link-title of
 attachments, as it clutters the UI and users dont need it most of the time.
 These details can allways be views in filemanager."

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

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index 30ad4a0d4a..fafa46e973 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -561,10 +561,12 @@ class egw_link extends solink
 			{
 				$title = $id;
 			}
+			/* disabling mime-type and size in link-title of attachments, as it clutters the UI
+			   and users dont need it most of the time. These details can allways be views in filemanager.
 			if (is_array($link))
 			{
 				$title .= ': '.$link['type'] . ' '.egw_vfs::hsize($link['size']);
-			}
+			}*/
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (file)</p>\n";
 			return $title;
 		}

From 082f21d3e6e17026eb89613ae448a7db645a6f89 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 May 2009 13:34:27 +0000
Subject: [PATCH 346/510] "fixed search for new phrases, to also work with
 newer method hooks and not only with file-hooks (preferences, admin,
 settings, ...)"

---
 etemplate/inc/class.solangfile.inc.php | 43 ++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.solangfile.inc.php b/etemplate/inc/class.solangfile.inc.php
index d67f59bbdb..a12bd2967c 100644
--- a/etemplate/inc/class.solangfile.inc.php
+++ b/etemplate/inc/class.solangfile.inc.php
@@ -87,6 +87,7 @@ class solangfile
 	function special_file($app,$fname,$langs_in)
 	{
 		//echo "<p>solangfile::special_file(app='$app',fname='$fname',langs_in='$langs_in')</p>\n";
+		$app_in = $app;
 		switch ($langs_in)
 		{
 		 	case 'config':
@@ -104,7 +105,34 @@ class solangfile
 		unset($GLOBALS['acl_manager']);
 
 		ob_start();		// suppress all output
-		include($fname);
+		// call the hooks and not the files direct, as it works for both files and method hooks
+		switch(basename($fname))
+		{
+			case 'hook_settings.inc.php':
+				$settings = $GLOBALS['egw']->hooks->single('settings',$app_in,true);
+				if (!is_array($settings) || !$settings)
+				{
+					$settings =& $GLOBALS['settings'];	// old method of setting GLOBALS[settings], instead returning the settings
+					unset($GLOBALS['settings']);
+				}
+				break;
+
+			case 'hook_admin.inc.php':
+				$GLOBALS['egw']->hooks->single('admin',$app_in,true);
+				break;
+
+			case 'hook_preferences.inc.php':
+				$GLOBALS['egw']->hooks->single('preferences',$app_in,true);
+				break;
+
+			case 'hook_acl_manager.inc.php':
+				$GLOBALS['egw']->hooks->single('acl_manager',$app_in,true);
+				break;
+
+			default:
+				include($fname);
+				break;
+		}
 		ob_end_clean();
 
 		if (isset($GLOBALS['acl_manager']))	// hook_acl_manager
@@ -138,7 +166,7 @@ class solangfile
 				$this->plist[$lang] = $app;
 			}
 		}
-		foreach($GLOBALS['settings'] as $data)
+		foreach((array)$settings as $data)
 		{
 			foreach(array('label','help') as $key)
 			{
@@ -163,6 +191,17 @@ class solangfile
 				{
 					$this->parse_php_app($app,$fd.$fn.SEP);
 				}
+				if ($fn == 'inc')
+				{
+					// make sure all hooks get called, even if they dont exist as hooks
+					foreach($this->files as $f => $type)
+					{
+						if (substr($f,0,5) == 'hook_' && !file_exists($f = $fd.'inc/'.$f))
+						{
+							$this->special_file($app,$f,$this->files[$type]);
+						}
+					}
+				}
 			}
 			elseif (is_readable($fd.$fn))
 			{

From 75850fd66bc4f4173b5dae4a489bb9d88197f0bd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 May 2009 15:24:15 +0000
Subject: [PATCH 347/510] fixed problem pointed out by Necky(T.Okabuchi)
 <neckyegw(at)wanaya.jp>

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index f85b1a2144..81a941f8c5 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1153,8 +1153,10 @@ class etemplate extends boetemplate
 			case 'htmlarea':	// Multiline formatted Text Input, size: {simple|extended|advanced},height,width,toolbar-expanded,upload-path
 				list($mode,$height,$width,$toolbar,$baseref,$convertnl) = explode(',',$cell_options);
 
-				if ($convertnl == 1) $value = nl2br($value);
-
+				if ($convertnl)
+				{
+					$value = nl2br(html::htmlspecialchars($value));
+				}
 				if (!$readonly)
 				{
 					$mode = $mode ? $mode : 'simple';

From 8f797be836ca9fca30beaaa760c837d5d2f33a51 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 May 2009 17:32:06 +0000
Subject: [PATCH 348/510] Added HTMLPurifier (http://htmlpurifier.org/) Version
 3.3.0 - can be used via html class like:

        $clean_html = html::purify($html);

- using it now in eTemplate to remove malicious code from html:
  a) when displaying "formatted text"
  b) when "formatted text" get's input by the user
---
 etemplate/inc/class.etemplate.inc.php         |    4 +-
 phpgwapi/inc/class.html.inc.php               |   30 +
 phpgwapi/inc/htmlpurifier/CREDITS             |    9 +
 phpgwapi/inc/htmlpurifier/INSTALL             |  373 ++
 phpgwapi/inc/htmlpurifier/LICENSE             |  504 +++
 phpgwapi/inc/htmlpurifier/NEWS                |  842 ++++
 .../library/HTMLPurifier.auto.php             |   11 +
 .../library/HTMLPurifier.autoload.php         |   21 +
 .../library/HTMLPurifier.func.php             |   23 +
 .../library/HTMLPurifier.includes.php         |  206 +
 .../library/HTMLPurifier.kses.php             |   30 +
 .../library/HTMLPurifier.path.php             |   11 +
 .../inc/htmlpurifier/library/HTMLPurifier.php |  236 +
 .../library/HTMLPurifier.safe-includes.php    |  200 +
 .../library/HTMLPurifier/AttrCollections.php  |  128 +
 .../library/HTMLPurifier/AttrDef.php          |   87 +
 .../library/HTMLPurifier/AttrDef/CSS.php      |   87 +
 .../HTMLPurifier/AttrDef/CSS/AlphaValue.php   |   21 +
 .../HTMLPurifier/AttrDef/CSS/Background.php   |   87 +
 .../AttrDef/CSS/BackgroundPosition.php        |  126 +
 .../HTMLPurifier/AttrDef/CSS/Border.php       |   43 +
 .../HTMLPurifier/AttrDef/CSS/Color.php        |   78 +
 .../HTMLPurifier/AttrDef/CSS/Composite.php    |   38 +
 .../AttrDef/CSS/DenyElementDecorator.php      |   28 +
 .../HTMLPurifier/AttrDef/CSS/Filter.php       |   54 +
 .../library/HTMLPurifier/AttrDef/CSS/Font.php |  149 +
 .../HTMLPurifier/AttrDef/CSS/FontFamily.php   |   90 +
 .../AttrDef/CSS/ImportantDecorator.php        |   40 +
 .../HTMLPurifier/AttrDef/CSS/Length.php       |   47 +
 .../HTMLPurifier/AttrDef/CSS/ListStyle.php    |   78 +
 .../HTMLPurifier/AttrDef/CSS/Multiple.php     |   58 +
 .../HTMLPurifier/AttrDef/CSS/Number.php       |   69 +
 .../HTMLPurifier/AttrDef/CSS/Percentage.php   |   40 +
 .../AttrDef/CSS/TextDecoration.php            |   38 +
 .../library/HTMLPurifier/AttrDef/CSS/URI.php  |   56 +
 .../library/HTMLPurifier/AttrDef/Enum.php     |   65 +
 .../HTMLPurifier/AttrDef/HTML/Bool.php        |   28 +
 .../HTMLPurifier/AttrDef/HTML/Color.php       |   32 +
 .../HTMLPurifier/AttrDef/HTML/FrameTarget.php |   21 +
 .../library/HTMLPurifier/AttrDef/HTML/ID.php  |   70 +
 .../HTMLPurifier/AttrDef/HTML/Length.php      |   41 +
 .../HTMLPurifier/AttrDef/HTML/LinkTypes.php   |   53 +
 .../HTMLPurifier/AttrDef/HTML/MultiLength.php |   41 +
 .../HTMLPurifier/AttrDef/HTML/Nmtokens.php    |   48 +
 .../HTMLPurifier/AttrDef/HTML/Pixels.php      |   48 +
 .../library/HTMLPurifier/AttrDef/Integer.php  |   73 +
 .../library/HTMLPurifier/AttrDef/Lang.php     |   73 +
 .../library/HTMLPurifier/AttrDef/Switch.php   |   34 +
 .../library/HTMLPurifier/AttrDef/Text.php     |   15 +
 .../library/HTMLPurifier/AttrDef/URI.php      |   77 +
 .../HTMLPurifier/AttrDef/URI/Email.php        |   17 +
 .../AttrDef/URI/Email/SimpleCheck.php         |   21 +
 .../library/HTMLPurifier/AttrDef/URI/Host.php |   62 +
 .../library/HTMLPurifier/AttrDef/URI/IPv4.php |   39 +
 .../library/HTMLPurifier/AttrDef/URI/IPv6.php |   99 +
 .../library/HTMLPurifier/AttrTransform.php    |   56 +
 .../HTMLPurifier/AttrTransform/Background.php |   23 +
 .../HTMLPurifier/AttrTransform/BdoDir.php     |   19 +
 .../HTMLPurifier/AttrTransform/BgColor.php    |   23 +
 .../HTMLPurifier/AttrTransform/BoolToCSS.php  |   36 +
 .../HTMLPurifier/AttrTransform/Border.php     |   18 +
 .../HTMLPurifier/AttrTransform/EnumToCSS.php  |   58 +
 .../AttrTransform/ImgRequired.php             |   42 +
 .../HTMLPurifier/AttrTransform/ImgSpace.php   |   44 +
 .../HTMLPurifier/AttrTransform/Input.php      |   40 +
 .../HTMLPurifier/AttrTransform/Lang.php       |   28 +
 .../HTMLPurifier/AttrTransform/Length.php     |   27 +
 .../HTMLPurifier/AttrTransform/Name.php       |   19 +
 .../HTMLPurifier/AttrTransform/SafeEmbed.php  |   15 +
 .../HTMLPurifier/AttrTransform/SafeObject.php |   16 +
 .../HTMLPurifier/AttrTransform/SafeParam.php  |   50 +
 .../AttrTransform/ScriptRequired.php          |   16 +
 .../HTMLPurifier/AttrTransform/Textarea.php   |   18 +
 .../library/HTMLPurifier/AttrTypes.php        |   74 +
 .../library/HTMLPurifier/AttrValidator.php    |  162 +
 .../library/HTMLPurifier/Bootstrap.php        |   98 +
 .../library/HTMLPurifier/CSSDefinition.php    |  292 ++
 .../library/HTMLPurifier/ChildDef.php         |   48 +
 .../HTMLPurifier/ChildDef/Chameleon.php       |   48 +
 .../library/HTMLPurifier/ChildDef/Custom.php  |   90 +
 .../library/HTMLPurifier/ChildDef/Empty.php   |   20 +
 .../HTMLPurifier/ChildDef/Optional.php        |   26 +
 .../HTMLPurifier/ChildDef/Required.php        |  117 +
 .../ChildDef/StrictBlockquote.php             |   88 +
 .../library/HTMLPurifier/ChildDef/Table.php   |  142 +
 .../library/HTMLPurifier/Config.php           |  497 +++
 .../library/HTMLPurifier/ConfigSchema.php     |  231 +
 .../ConfigSchema/Builder/ConfigSchema.php     |   52 +
 .../HTMLPurifier/ConfigSchema/Builder/Xml.php |  108 +
 .../HTMLPurifier/ConfigSchema/Exception.php   |   11 +
 .../HTMLPurifier/ConfigSchema/Interchange.php |   57 +
 .../ConfigSchema/Interchange/Directive.php    |   77 +
 .../ConfigSchema/Interchange/Id.php           |   31 +
 .../ConfigSchema/Interchange/Namespace.php    |   21 +
 .../ConfigSchema/InterchangeBuilder.php       |  176 +
 .../HTMLPurifier/ConfigSchema/Validator.php   |  225 +
 .../ConfigSchema/ValidatorAtom.php            |   66 +
 .../HTMLPurifier/ConfigSchema/schema.ser      |  Bin 0 -> 11324 bytes
 .../schema/Attr.AllowedFrameTargets.txt       |   12 +
 .../ConfigSchema/schema/Attr.AllowedRel.txt   |    9 +
 .../ConfigSchema/schema/Attr.AllowedRev.txt   |    9 +
 .../schema/Attr.DefaultImageAlt.txt           |   11 +
 .../schema/Attr.DefaultInvalidImage.txt       |    9 +
 .../schema/Attr.DefaultInvalidImageAlt.txt    |    8 +
 .../schema/Attr.DefaultTextDir.txt            |   10 +
 .../ConfigSchema/schema/Attr.EnableID.txt     |   16 +
 .../ConfigSchema/schema/Attr.IDBlacklist.txt  |    5 +
 .../schema/Attr.IDBlacklistRegexp.txt         |    9 +
 .../ConfigSchema/schema/Attr.IDPrefix.txt     |   12 +
 .../schema/Attr.IDPrefixLocal.txt             |   14 +
 .../HTMLPurifier/ConfigSchema/schema/Attr.txt |    3 +
 .../schema/AutoFormat.AutoParagraph.txt       |   31 +
 .../ConfigSchema/schema/AutoFormat.Custom.txt |   12 +
 .../schema/AutoFormat.DisplayLinkURI.txt      |   11 +
 .../schema/AutoFormat.Linkify.txt             |   12 +
 .../schema/AutoFormat.PurifierLinkify.txt     |   12 +
 .../schema/AutoFormat.RemoveEmpty.txt         |   45 +
 .../ConfigSchema/schema/AutoFormat.txt        |    3 +
 .../AutoFormatParam.PurifierLinkifyDocURL.txt |   12 +
 .../ConfigSchema/schema/AutoFormatParam.txt   |    3 +
 .../schema/CSS.AllowImportant.txt             |    8 +
 .../ConfigSchema/schema/CSS.AllowTricky.txt   |   11 +
 .../schema/CSS.AllowedProperties.txt          |   18 +
 .../ConfigSchema/schema/CSS.DefinitionRev.txt |   11 +
 .../ConfigSchema/schema/CSS.MaxImgLength.txt  |   16 +
 .../ConfigSchema/schema/CSS.Proprietary.txt   |   10 +
 .../HTMLPurifier/ConfigSchema/schema/CSS.txt  |    3 +
 .../schema/Cache.DefinitionImpl.txt           |   14 +
 .../schema/Cache.SerializerPath.txt           |   13 +
 .../ConfigSchema/schema/Cache.txt             |    3 +
 .../schema/Core.AggressivelyFixLt.txt         |   18 +
 .../schema/Core.CollectErrors.txt             |   12 +
 .../schema/Core.ColorKeywords.txt             |   28 +
 .../schema/Core.ConvertDocumentToFragment.txt |   14 +
 .../Core.DirectLexLineNumberSyncInterval.txt  |   17 +
 .../ConfigSchema/schema/Core.Encoding.txt     |   15 +
 .../schema/Core.EscapeInvalidChildren.txt     |   10 +
 .../schema/Core.EscapeInvalidTags.txt         |    7 +
 .../schema/Core.EscapeNonASCIICharacters.txt  |   13 +
 .../schema/Core.HiddenElements.txt            |   19 +
 .../ConfigSchema/schema/Core.Language.txt     |   10 +
 .../ConfigSchema/schema/Core.LexerImpl.txt    |   34 +
 .../schema/Core.MaintainLineNumbers.txt       |   16 +
 .../schema/Core.RemoveInvalidImg.txt          |   12 +
 .../schema/Core.RemoveScriptContents.txt      |   12 +
 .../HTMLPurifier/ConfigSchema/schema/Core.txt |    3 +
 .../ConfigSchema/schema/Filter.Custom.txt     |   11 +
 .../schema/Filter.ExtractStyleBlocks.txt      |   74 +
 .../ConfigSchema/schema/Filter.YouTube.txt    |   11 +
 .../ConfigSchema/schema/Filter.txt            |    3 +
 ...FilterParam.ExtractStyleBlocksEscaping.txt |   14 +
 .../FilterParam.ExtractStyleBlocksScope.txt   |   29 +
 ...FilterParam.ExtractStyleBlocksTidyImpl.txt |   15 +
 .../ConfigSchema/schema/FilterParam.txt       |    3 +
 .../ConfigSchema/schema/HTML.Allowed.txt      |   22 +
 .../schema/HTML.AllowedAttributes.txt         |   19 +
 .../schema/HTML.AllowedElements.txt           |   18 +
 .../schema/HTML.AllowedModules.txt            |   20 +
 .../ConfigSchema/schema/HTML.BlockWrapper.txt |   18 +
 .../ConfigSchema/schema/HTML.CoreModules.txt  |   23 +
 .../schema/HTML.CustomDoctype.txt             |    9 +
 .../ConfigSchema/schema/HTML.DefinitionID.txt |   33 +
 .../schema/HTML.DefinitionRev.txt             |   16 +
 .../ConfigSchema/schema/HTML.Doctype.txt      |   11 +
 .../schema/HTML.ForbiddenAttributes.txt       |   21 +
 .../schema/HTML.ForbiddenElements.txt         |   20 +
 .../ConfigSchema/schema/HTML.MaxImgLength.txt |   14 +
 .../ConfigSchema/schema/HTML.Parent.txt       |   12 +
 .../ConfigSchema/schema/HTML.Proprietary.txt  |   12 +
 .../ConfigSchema/schema/HTML.SafeEmbed.txt    |   14 +
 .../ConfigSchema/schema/HTML.SafeObject.txt   |   14 +
 .../ConfigSchema/schema/HTML.Strict.txt       |    9 +
 .../ConfigSchema/schema/HTML.TidyAdd.txt      |    8 +
 .../ConfigSchema/schema/HTML.TidyLevel.txt    |   24 +
 .../ConfigSchema/schema/HTML.TidyRemove.txt   |    8 +
 .../ConfigSchema/schema/HTML.Trusted.txt      |    8 +
 .../ConfigSchema/schema/HTML.XHTML.txt        |   11 +
 .../HTMLPurifier/ConfigSchema/schema/HTML.txt |    3 +
 .../schema/Output.CommentScriptContents.txt   |   10 +
 .../ConfigSchema/schema/Output.Newline.txt    |   13 +
 .../ConfigSchema/schema/Output.SortAttr.txt   |   14 +
 .../ConfigSchema/schema/Output.TidyFormat.txt |   25 +
 .../ConfigSchema/schema/Output.txt            |    3 +
 .../ConfigSchema/schema/Test.ForceNoIconv.txt |    7 +
 .../HTMLPurifier/ConfigSchema/schema/Test.txt |    3 +
 .../schema/URI.AllowedSchemes.txt             |   15 +
 .../ConfigSchema/schema/URI.Base.txt          |   17 +
 .../ConfigSchema/schema/URI.DefaultScheme.txt |   10 +
 .../ConfigSchema/schema/URI.DefinitionID.txt  |   11 +
 .../ConfigSchema/schema/URI.DefinitionRev.txt |   11 +
 .../ConfigSchema/schema/URI.Disable.txt       |   14 +
 .../schema/URI.DisableExternal.txt            |   11 +
 .../schema/URI.DisableExternalResources.txt   |   13 +
 .../schema/URI.DisableResources.txt           |   12 +
 .../ConfigSchema/schema/URI.Host.txt          |   19 +
 .../ConfigSchema/schema/URI.HostBlacklist.txt |    9 +
 .../ConfigSchema/schema/URI.MakeAbsolute.txt  |   13 +
 .../ConfigSchema/schema/URI.Munge.txt         |   83 +
 .../schema/URI.MungeResources.txt             |   17 +
 .../schema/URI.MungeSecretKey.txt             |   30 +
 .../schema/URI.OverrideAllowedSchemes.txt     |    9 +
 .../HTMLPurifier/ConfigSchema/schema/URI.txt  |    3 +
 .../HTMLPurifier/ConfigSchema/schema/info.ini |    3 +
 .../library/HTMLPurifier/ContentSets.php      |  155 +
 .../library/HTMLPurifier/Context.php          |   82 +
 .../library/HTMLPurifier/Definition.php       |   39 +
 .../library/HTMLPurifier/DefinitionCache.php  |  108 +
 .../DefinitionCache/Decorator.php             |   62 +
 .../DefinitionCache/Decorator/Cleanup.php     |   43 +
 .../DefinitionCache/Decorator/Memory.php      |   46 +
 .../DefinitionCache/Decorator/Template.php.in |   47 +
 .../HTMLPurifier/DefinitionCache/Null.php     |   39 +
 .../DefinitionCache/Serializer.php            |  172 +
 .../DefinitionCache/Serializer/README         |    3 +
 .../HTMLPurifier/DefinitionCacheFactory.php   |   91 +
 .../library/HTMLPurifier/Doctype.php          |   60 +
 .../library/HTMLPurifier/DoctypeRegistry.php  |  103 +
 .../library/HTMLPurifier/ElementDef.php       |  175 +
 .../library/HTMLPurifier/Encoder.php          |  426 ++
 .../library/HTMLPurifier/EntityLookup.php     |   44 +
 .../HTMLPurifier/EntityLookup/entities.ser    |    1 +
 .../library/HTMLPurifier/EntityParser.php     |  144 +
 .../library/HTMLPurifier/ErrorCollector.php   |  209 +
 .../library/HTMLPurifier/ErrorStruct.php      |   60 +
 .../library/HTMLPurifier/Exception.php        |   12 +
 .../library/HTMLPurifier/Filter.php           |   46 +
 .../Filter/ExtractStyleBlocks.php             |  135 +
 .../library/HTMLPurifier/Filter/YouTube.php   |   39 +
 .../library/HTMLPurifier/Generator.php        |  183 +
 .../library/HTMLPurifier/HTMLDefinition.php   |  420 ++
 .../library/HTMLPurifier/HTMLModule.php       |  244 +
 .../library/HTMLPurifier/HTMLModule/Bdo.php   |   31 +
 .../HTMLModule/CommonAttributes.php           |   25 +
 .../library/HTMLPurifier/HTMLModule/Edit.php  |   38 +
 .../library/HTMLPurifier/HTMLModule/Forms.php |  118 +
 .../HTMLPurifier/HTMLModule/Hypertext.php     |   31 +
 .../library/HTMLPurifier/HTMLModule/Image.php |   40 +
 .../HTMLPurifier/HTMLModule/Legacy.php        |  143 +
 .../library/HTMLPurifier/HTMLModule/List.php  |   35 +
 .../library/HTMLPurifier/HTMLModule/Name.php  |   18 +
 .../HTMLModule/NonXMLCommonAttributes.php     |   14 +
 .../HTMLPurifier/HTMLModule/Object.php        |   47 +
 .../HTMLPurifier/HTMLModule/Presentation.php  |   36 +
 .../HTMLPurifier/HTMLModule/Proprietary.php   |   33 +
 .../library/HTMLPurifier/HTMLModule/Ruby.php  |   27 +
 .../HTMLPurifier/HTMLModule/SafeEmbed.php     |   33 +
 .../HTMLPurifier/HTMLModule/SafeObject.php    |   50 +
 .../HTMLPurifier/HTMLModule/Scripting.php     |   54 +
 .../HTMLModule/StyleAttribute.php             |   24 +
 .../HTMLPurifier/HTMLModule/Tables.php        |   66 +
 .../HTMLPurifier/HTMLModule/Target.php        |   23 +
 .../library/HTMLPurifier/HTMLModule/Text.php  |   71 +
 .../library/HTMLPurifier/HTMLModule/Tidy.php  |  207 +
 .../HTMLPurifier/HTMLModule/Tidy/Name.php     |   24 +
 .../HTMLModule/Tidy/Proprietary.php           |   23 +
 .../HTMLPurifier/HTMLModule/Tidy/Strict.php   |   21 +
 .../HTMLModule/Tidy/Transitional.php          |    9 +
 .../HTMLPurifier/HTMLModule/Tidy/XHTML.php    |   17 +
 .../HTMLModule/Tidy/XHTMLAndHTML4.php         |  161 +
 .../HTMLModule/XMLCommonAttributes.php        |   14 +
 .../HTMLPurifier/HTMLModuleManager.php        |  403 ++
 .../library/HTMLPurifier/IDAccumulator.php    |   53 +
 .../library/HTMLPurifier/Injector.php         |  233 +
 .../HTMLPurifier/Injector/AutoParagraph.php   |  340 ++
 .../HTMLPurifier/Injector/DisplayLinkURI.php  |   26 +
 .../library/HTMLPurifier/Injector/Linkify.php |   46 +
 .../HTMLPurifier/Injector/PurifierLinkify.php |   45 +
 .../HTMLPurifier/Injector/RemoveEmpty.php     |   42 +
 .../HTMLPurifier/Injector/SafeObject.php      |   87 +
 .../library/HTMLPurifier/Language.php         |  163 +
 .../Language/classes/en-x-test.php            |   12 +
 .../Language/messages/en-x-test.php           |   11 +
 .../Language/messages/en-x-testmini.php       |   12 +
 .../HTMLPurifier/Language/messages/en.php     |   62 +
 .../library/HTMLPurifier/LanguageFactory.php  |  198 +
 .../library/HTMLPurifier/Length.php           |  115 +
 .../library/HTMLPurifier/Lexer.php            |  298 ++
 .../library/HTMLPurifier/Lexer/DOMLex.php     |  213 +
 .../library/HTMLPurifier/Lexer/DirectLex.php  |  490 +++
 .../library/HTMLPurifier/Lexer/PEARSax3.php   |  106 +
 .../library/HTMLPurifier/Lexer/PH5P.php       | 3906 +++++++++++++++++
 .../library/HTMLPurifier/PercentEncoder.php   |   98 +
 .../library/HTMLPurifier/Printer.php          |  176 +
 .../HTMLPurifier/Printer/CSSDefinition.php    |   38 +
 .../HTMLPurifier/Printer/ConfigForm.css       |   10 +
 .../HTMLPurifier/Printer/ConfigForm.js        |    5 +
 .../HTMLPurifier/Printer/ConfigForm.php       |  368 ++
 .../HTMLPurifier/Printer/HTMLDefinition.php   |  272 ++
 .../library/HTMLPurifier/PropertyList.php     |   86 +
 .../HTMLPurifier/PropertyListIterator.php     |   32 +
 .../library/HTMLPurifier/Strategy.php         |   26 +
 .../HTMLPurifier/Strategy/Composite.php       |   25 +
 .../library/HTMLPurifier/Strategy/Core.php    |   18 +
 .../HTMLPurifier/Strategy/FixNesting.php      |  328 ++
 .../HTMLPurifier/Strategy/MakeWellFormed.php  |  455 ++
 .../Strategy/RemoveForeignElements.php        |  171 +
 .../Strategy/ValidateAttributes.php           |   39 +
 .../library/HTMLPurifier/StringHash.php       |   39 +
 .../library/HTMLPurifier/StringHashParser.php |  110 +
 .../library/HTMLPurifier/TagTransform.php     |   36 +
 .../HTMLPurifier/TagTransform/Font.php        |   96 +
 .../HTMLPurifier/TagTransform/Simple.php      |   35 +
 .../library/HTMLPurifier/Token.php            |   57 +
 .../library/HTMLPurifier/Token/Comment.php    |   22 +
 .../library/HTMLPurifier/Token/Empty.php      |   11 +
 .../library/HTMLPurifier/Token/End.php        |   19 +
 .../library/HTMLPurifier/Token/Start.php      |   11 +
 .../library/HTMLPurifier/Token/Tag.php        |   56 +
 .../library/HTMLPurifier/Token/Text.php       |   33 +
 .../library/HTMLPurifier/TokenFactory.php     |   94 +
 .../htmlpurifier/library/HTMLPurifier/URI.php |  173 +
 .../library/HTMLPurifier/URIDefinition.php    |   93 +
 .../library/HTMLPurifier/URIFilter.php        |   45 +
 .../URIFilter/DisableExternal.php             |   23 +
 .../URIFilter/DisableExternalResources.php    |   12 +
 .../HTMLPurifier/URIFilter/HostBlacklist.php  |   21 +
 .../HTMLPurifier/URIFilter/MakeAbsolute.php   |  114 +
 .../library/HTMLPurifier/URIFilter/Munge.php  |   54 +
 .../library/HTMLPurifier/URIParser.php        |   70 +
 .../library/HTMLPurifier/URIScheme.php        |   42 +
 .../library/HTMLPurifier/URIScheme/ftp.php    |   43 +
 .../library/HTMLPurifier/URIScheme/http.php   |   20 +
 .../library/HTMLPurifier/URIScheme/https.php  |   12 +
 .../library/HTMLPurifier/URIScheme/mailto.php |   27 +
 .../library/HTMLPurifier/URIScheme/news.php   |   22 +
 .../library/HTMLPurifier/URIScheme/nntp.php   |   20 +
 .../HTMLPurifier/URISchemeRegistry.php        |   69 +
 .../library/HTMLPurifier/UnitConverter.php    |  254 ++
 .../library/HTMLPurifier/VarParser.php        |  154 +
 .../HTMLPurifier/VarParser/Flexible.php       |   96 +
 .../library/HTMLPurifier/VarParser/Native.php |   26 +
 .../HTMLPurifier/VarParserException.php       |   11 +
 332 files changed, 25369 insertions(+), 1 deletion(-)
 create mode 100755 phpgwapi/inc/htmlpurifier/CREDITS
 create mode 100755 phpgwapi/inc/htmlpurifier/INSTALL
 create mode 100755 phpgwapi/inc/htmlpurifier/LICENSE
 create mode 100755 phpgwapi/inc/htmlpurifier/NEWS
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.auto.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.autoload.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.func.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.includes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.kses.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.path.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier.safe-includes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrCollections.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTypes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrValidator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Bootstrap.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Config.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Namespace.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.PurifierLinkifyDocURL.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksEscaping.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksScope.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksTidyImpl.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.txt
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ContentSets.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Context.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Definition.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Doctype.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ElementDef.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Encoder.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityParser.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Exception.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Generator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Length.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PEARSax3.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyList.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHash.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHashParser.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Comment.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Empty.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/End.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Start.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Tag.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Text.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TokenFactory.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URI.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIDefinition.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIParser.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/UnitConverter.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
 create mode 100755 phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParserException.php

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 81a941f8c5..477ba5109d 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1157,6 +1157,8 @@ class etemplate extends boetemplate
 				{
 					$value = nl2br(html::htmlspecialchars($value));
 				}
+				$value = html::purify($value);
+
 				if (!$readonly)
 				{
 					$mode = $mode ? $mode : 'simple';
@@ -1952,7 +1954,7 @@ class etemplate extends boetemplate
 					}
 					break;
 				case 'htmlarea':
-					self::set_array($content,$form_name,$value);
+					self::set_array($content,$form_name,html::purify($value));
 					break;
 				case 'int':
 				case 'float':
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 48f74926ca..4c319e58fa 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -1244,5 +1244,35 @@ class html
 
 		return $html;
 	}
+
+	/**
+	 * Runs HTMLPurifier over supplied html to remove malicious code
+	 *
+	 * @param string $html
+	 * @param HTMLPurifier_Config $config=null
+	 */
+	static function purify($html,$config=null)
+	{
+		static $purifier;
+
+		if (is_null($purifier) || !is_null($config))
+		{
+			// add htmlpurifiers library to include_path
+			require_once(EGW_API_INC.'/htmlpurifier/library/HTMLPurifier.path.php');
+			// include most of the required files, for best performance with bytecode caches
+			require_once(EGW_API_INC.'/htmlpurifier/library/HTMLPurifier.includes.php');
+			// installs an autoloader for other files
+			require_once(EGW_API_INC.'/htmlpurifier/library/HTMLPurifier.autoload.php');
+
+			if (is_null($config))
+			{
+				$config = HTMLPurifier_Config::createDefault();
+				$config->set('Core', 'Encoding', self::$charset);
+				$config->set('Cache', 'SerializerPath', $GLOBALS['egw_info']['server']['temp_dir']);
+			}
+			$purifier = new HTMLPurifier($config);
+		}
+    	return $purifier->purify( $html );
+	}
 }
 html::_init_static();
diff --git a/phpgwapi/inc/htmlpurifier/CREDITS b/phpgwapi/inc/htmlpurifier/CREDITS
new file mode 100755
index 0000000000..7921b45af7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/CREDITS
@@ -0,0 +1,9 @@
+
+CREDITS
+
+Almost everything written by Edward Z. Yang (Ambush Commander).  Lots of thanks
+to the DevNetwork Community for their help (see docs/ref-devnetwork.html for
+more details), Feyd especially (namely IPv6 and optimization).  Thanks to RSnake
+for letting me package his fantastic XSS cheatsheet for a smoketest.
+
+    vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/INSTALL b/phpgwapi/inc/htmlpurifier/INSTALL
new file mode 100755
index 0000000000..8ee41e86e1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/INSTALL
@@ -0,0 +1,373 @@
+
+Install
+    How to install HTML Purifier
+
+HTML Purifier is designed to run out of the box, so actually using the
+library is extremely easy.  (Although... if you were looking for a
+step-by-step installation GUI, you've downloaded the wrong software!)
+
+While the impatient can get going immediately with some of the sample
+code at the bottom of this library, it's well worth reading this entire
+document--most of the other documentation assumes that you are familiar
+with these contents.
+
+
+---------------------------------------------------------------------------
+1.  Compatibility
+
+HTML Purifier is PHP 5 only, and is actively tested from PHP 5.0.5 and
+up. It has no core dependencies with other libraries. PHP
+4 support was deprecated on December 31, 2007 with HTML Purifier 3.0.0.
+
+These optional extensions can enhance the capabilities of HTML Purifier:
+
+    * iconv  : Converts text to and from non-UTF-8 encodings
+    * bcmath : Used for unit conversion and imagecrash protection
+    * tidy   : Used for pretty-printing HTML
+
+
+---------------------------------------------------------------------------
+2.  Reconnaissance
+
+A big plus of HTML Purifier is its inerrant support of standards, so
+your web-pages should be standards-compliant.  (They should also use
+semantic markup, but that's another issue altogether, one HTML Purifier
+cannot fix without reading your mind.)
+
+HTML Purifier can process these doctypes:
+
+* XHTML 1.0 Transitional (default)
+* XHTML 1.0 Strict
+* HTML 4.01 Transitional
+* HTML 4.01 Strict
+* XHTML 1.1
+
+...and these character encodings:
+
+* UTF-8 (default)
+* Any encoding iconv supports (with crippled internationalization support)
+
+These defaults reflect what my choices would be if I were authoring an
+HTML document, however, what you choose depends on the nature of your
+codebase.  If you don't know what doctype you are using, you can determine
+the doctype from this identifier at the top of your source code:
+
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+...and the character encoding from this code:
+
+    <meta http-equiv="Content-type" content="text/html;charset=ENCODING">
+
+If the character encoding declaration is missing, STOP NOW, and
+read 'docs/enduser-utf8.html' (web accessible at
+http://htmlpurifier.org/docs/enduser-utf8.html).  In fact, even if it is
+present, read this document anyway, as many websites specify their
+document's character encoding incorrectly.
+
+
+---------------------------------------------------------------------------
+3.  Including the library
+
+The procedure is quite simple:
+
+    require_once '/path/to/library/HTMLPurifier.auto.php';
+
+This will setup an autoloader, so the library's files are only included
+when you use them.
+
+Only the contents in the library/ folder are necessary, so you can remove
+everything else when using HTML Purifier in a production environment.
+
+If you installed HTML Purifier via PEAR, all you need to do is:
+
+    require_once 'HTMLPurifier.auto.php';
+
+Please note that the usual PEAR practice of including just the classes you
+want will not work with HTML Purifier's autoloading scheme.
+
+Advanced users, read on; other users can skip to section 4.
+
+Autoload compatibility
+----------------------
+
+    HTML Purifier attempts to be as smart as possible when registering an
+    autoloader, but there are some cases where you will need to change
+    your own code to accomodate HTML Purifier. These are those cases:
+
+    PHP VERSION IS LESS THAN 5.1.2, AND YOU'VE DEFINED __autoload
+        Because spl_autoload_register() doesn't exist in early versions
+        of PHP 5, HTML Purifier has no way of adding itself to the autoload
+        stack. Modify your __autoload function to test
+        HTMLPurifier_Bootstrap::autoload($class)
+
+        For example, suppose your autoload function looks like this:
+
+            function __autoload($class) {
+                require str_replace('_', '/', $class) . '.php';
+                return true;
+            }
+
+        A modified version with HTML Purifier would look like this:
+
+            function __autoload($class) {
+                if (HTMLPurifier_Bootstrap::autoload($class)) return true;
+                require str_replace('_', '/', $class) . '.php';
+                return true;
+            }
+
+        Note that there *is* some custom behavior in our autoloader; the
+        original autoloader in our example would work for 99% of the time,
+        but would fail when including language files.
+
+    AN __autoload FUNCTION IS DECLARED AFTER OUR AUTOLOADER IS REGISTERED
+        spl_autoload_register() has the curious behavior of disabling
+        the existing __autoload() handler. Users need to explicitly
+        spl_autoload_register('__autoload'). Because we use SPL when it
+        is available, __autoload() will ALWAYS be disabled. If __autoload()
+        is declared before HTML Purifier is loaded, this is not a problem:
+        HTML Purifier will register the function for you. But if it is
+        declared afterwards, it will mysteriously not work. This
+        snippet of code (after your autoloader is defined) will fix it:
+
+            spl_autoload_register('__autoload')
+
+    Users should also be on guard if they use a version of PHP previous
+    to 5.1.2 without an autoloader--HTML Purifier will define __autoload()
+    for you, which can collide with an autoloader that was added by *you*
+    later.
+
+
+For better performance
+----------------------
+
+    Opcode caches, which greatly speed up PHP initialization for scripts
+    with large amounts of code (HTML Purifier included), don't like
+    autoloaders. We offer an include file that includes all of HTML Purifier's
+    files in one go in an opcode cache friendly manner:
+
+        // If /path/to/library isn't already in your include path, uncomment
+        // the below line:
+        // require '/path/to/library/HTMLPurifier.path.php';
+
+        require 'HTMLPurifier.includes.php';
+
+    Optional components still need to be included--you'll know if you try to
+    use a feature and you get a class doesn't exists error! The autoloader
+    can be used in conjunction with this approach to catch classes that are
+    missing. Simply add this afterwards:
+
+        require 'HTMLPurifier.autoload.php';
+
+Standalone version
+------------------
+
+    HTML Purifier has a standalone distribution; you can also generate
+    a standalone file from the full version by running the script
+    maintenance/generate-standalone.php . The standalone version has the
+    benefit of having most of its code in one file, so parsing is much
+    faster and the library is easier to manage.
+
+    If HTMLPurifier.standalone.php exists in the library directory, you
+    can use it like this:
+
+        require '/path/to/HTMLPurifier.standalone.php';
+
+    This is equivalent to including HTMLPurifier.includes.php, except that
+    the contents of standalone/ will be added to your path. To override this
+    behavior, specify a new HTMLPURIFIER_PREFIX where standalone files can
+    be found (usually, this will be one directory up, the "true" library
+    directory in full distributions). Don't forget to set your path too!
+
+    The autoloader can be added to the end to ensure the classes are
+    loaded when necessary; otherwise you can manually include them.
+    To use the autoloader, use this:
+
+        require 'HTMLPurifier.autoload.php';
+
+For advanced users
+------------------
+
+    HTMLPurifier.auto.php performs a number of operations that can be done
+    individually. These are:
+
+        HTMLPurifier.path.php
+            Puts /path/to/library in the include path. For high performance,
+            this should be done in php.ini.
+
+        HTMLPurifier.autoload.php
+            Registers our autoload handler HTMLPurifier_Bootstrap::autoload($class).
+
+    You can do these operations by yourself--in fact, you must modify your own
+    autoload handler if you are using a version of PHP earlier than PHP 5.1.2
+    (See "Autoload compatibility" above).
+
+
+---------------------------------------------------------------------------
+4. Configuration
+
+HTML Purifier is designed to run out-of-the-box, but occasionally HTML
+Purifier needs to be told what to do.  If you answer no to any of these
+questions, read on; otherwise, you can skip to the next section (or, if you're
+into configuring things just for the heck of it, skip to 4.3).
+
+* Am I using UTF-8?
+* Am I using XHTML 1.0 Transitional?
+
+If you answered no to any of these questions, instantiate a configuration
+object and read on:
+
+    $config = HTMLPurifier_Config::createDefault();
+
+
+4.1. Setting a different character encoding
+
+You really shouldn't use any other encoding except UTF-8, especially if you
+plan to support multilingual websites (read section three for more details).
+However, switching to UTF-8 is not always immediately feasible, so we can
+adapt.
+
+HTML Purifier uses iconv to support other character encodings, as such,
+any encoding that iconv supports <http://www.gnu.org/software/libiconv/>
+HTML Purifier supports with this code:
+
+    $config->set('Core', 'Encoding', /* put your encoding here */);
+
+An example usage for Latin-1 websites (the most common encoding for English
+websites):
+
+    $config->set('Core', 'Encoding', 'ISO-8859-1');
+
+Note that HTML Purifier's support for non-Unicode encodings is crippled by the
+fact that any character not supported by that encoding will be silently
+dropped, EVEN if it is ampersand escaped.  If you want to work around
+this, you are welcome to read docs/enduser-utf8.html for a fix,
+but please be cognizant of the issues the "solution" creates (for this
+reason, I do not include the solution in this document).
+
+
+4.2. Setting a different doctype
+
+For those of you using HTML 4.01 Transitional, you can disable
+XHTML output like this:
+
+    $config->set('HTML', 'Doctype', 'HTML 4.01 Transitional');
+
+Other supported doctypes include:
+
+    * HTML 4.01 Strict
+    * HTML 4.01 Transitional
+    * XHTML 1.0 Strict
+    * XHTML 1.0 Transitional
+    * XHTML 1.1
+
+
+4.3. Other settings
+
+There are more configuration directives which can be read about
+here: <http://htmlpurifier.org/live/configdoc/plain.html>  They're a bit boring,
+but they can help out for those of you who like to exert maximum control over
+your code.  Some of the more interesting ones are configurable at the
+demo <http://htmlpurifier.org/demo.php> and are well worth looking into
+for your own system.
+
+For example, you can fine tune allowed elements and attributes, convert
+relative URLs to absolute ones, and even autoparagraph input text! These
+are, respectively, %HTML.Allowed, %URI.MakeAbsolute and %URI.Base, and
+%AutoFormat.AutoParagraph. The %Namespace.Directive naming convention
+translates to:
+
+    $config->set('Namespace', 'Directive', $value);
+
+E.g.
+
+    $config->set('HTML', 'Allowed', 'p,b,a[href],i');
+    $config->set('URI', 'Base', 'http://www.example.com');
+    $config->set('URI', 'MakeAbsolute', true);
+    $config->set('AutoFormat', 'AutoParagraph', true);
+
+
+---------------------------------------------------------------------------
+5. Caching
+
+HTML Purifier generates some cache files (generally one or two) to speed up
+its execution. For maximum performance, make sure that
+library/HTMLPurifier/DefinitionCache/Serializer is writeable by the webserver.
+
+If you are in the library/ folder of HTML Purifier, you can set the
+appropriate permissions using:
+
+    chmod -R 0755 HTMLPurifier/DefinitionCache/Serializer
+
+If the above command doesn't work, you may need to assign write permissions
+to all. This may be necessary if your webserver runs as nobody, but is
+not recommended since it means any other user can write files in the
+directory. Use:
+
+    chmod -R 0777 HTMLPurifier/DefinitionCache/Serializer
+
+You can also chmod files via your FTP client; this option
+is usually accessible by right clicking the corresponding directory and
+then selecting "chmod" or "file permissions".
+
+Starting with 2.0.1, HTML Purifier will generate friendly error messages
+that will tell you exactly what you have to chmod the directory to, if in doubt,
+follow its advice.
+
+If you are unable or unwilling to give write permissions to the cache
+directory, you can either disable the cache (and suffer a performance
+hit):
+
+    $config->set('Core', 'DefinitionCache', null);
+
+Or move the cache directory somewhere else (no trailing slash):
+
+    $config->set('Cache', 'SerializerPath', '/home/user/absolute/path');
+
+
+---------------------------------------------------------------------------
+6.   Using the code
+
+The interface is mind-numbingly simple:
+
+    $purifier = new HTMLPurifier();
+    $clean_html = $purifier->purify( $dirty_html );
+
+...or, if you're using the configuration object:
+
+    $purifier = new HTMLPurifier($config);
+    $clean_html = $purifier->purify( $dirty_html );
+
+That's it!  For more examples, check out docs/examples/ (they aren't very
+different though).  Also, docs/enduser-slow.html gives advice on what to
+do if HTML Purifier is slowing down your application.
+
+
+---------------------------------------------------------------------------
+7.   Quick install
+
+First, make sure library/HTMLPurifier/DefinitionCache/Serializer is
+writable by the webserver (see Section 5: Caching above for details).
+If your website is in UTF-8 and XHTML Transitional, use this code:
+
+<?php
+    require_once '/path/to/htmlpurifier/library/HTMLPurifier.auto.php';
+
+    $purifier = new HTMLPurifier();
+    $clean_html = $purifier->purify($dirty_html);
+?>
+
+If your website is in a different encoding or doctype, use this code:
+
+<?php
+    require_once '/path/to/htmlpurifier/library/HTMLPurifier.auto.php';
+
+    $config = HTMLPurifier_Config::createDefault();
+    $config->set('Core', 'Encoding', 'ISO-8859-1'); // replace with your encoding
+    $config->set('HTML', 'Doctype', 'HTML 4.01 Transitional'); // replace with your doctype
+    $purifier = new HTMLPurifier($config);
+
+    $clean_html = $purifier->purify($dirty_html);
+?>
+
+    vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/LICENSE b/phpgwapi/inc/htmlpurifier/LICENSE
new file mode 100755
index 0000000000..8c88a20d45
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+    vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/NEWS b/phpgwapi/inc/htmlpurifier/NEWS
new file mode 100755
index 0000000000..0ebf1a27b8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/NEWS
@@ -0,0 +1,842 @@
+NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
+|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+= KEY ====================
+    # Breaks back-compat
+    ! Feature
+    - Bugfix
+      + Sub-comment
+    . Internal change
+==========================
+
+3.3.0, released 2009-02-16
+! Implement CSS property 'overflow' when %CSS.AllowTricky is true.
+! Implement generic property list classess
+- Fix bug with testEncodingSupportsASCII() algorithm when iconv() implementation
+  does not do the "right thing" with characters not supported in the output
+  set.
+- Spellcheck UTF-8: The Secret To Character Encoding
+- Fix improper removal of the contents of elements with only whitespace. Thanks
+  Eric Wald for reporting.
+- Fix broken test suite in versions of PHP without spl_autoload_register()
+- Fix degenerate case with YouTube filter involving double hyphens.
+  Thanks Pierre Attar for reporting.
+- Fix YouTube rendering problem on certain versions of Firefox.
+- Fix CSSDefinition Printer problems with decorators
+- Add text parameter to unit tests, forces text output
+. Add verbose mode to command line test runner, use (--verbose)
+. Turn on unit tests for UnitConverter
+. Fix missing version number in configuration %Attr.DefaultImageAlt (added 3.2.0)
+. Fix newline errors that caused spurious failures when CRLF HTML Purifier was
+  tested on Linux.
+. Removed trailing whitespace from all text files, see
+  remote-trailing-whitespace.php maintenance script.
+. Convert configuration to use property list backend.
+
+3.2.0, released 2008-10-31
+# Using %Core.CollectErrors forces line number/column tracking on, whereas
+  previously you could theoretically turn it off.
+# HTMLPurifier_Injector->notifyEnd() is formally deprecated. Please
+  use handleEnd() instead.
+! %Output.AttrSort for when you need your attributes in alphabetical order to
+  deal with a bug in FCKEditor. Requested by frank farmer.
+! Enable HTML comments when %HTML.Trusted is on. Requested by Waldo Jaquith.
+! Proper support for name attribute. It is now allowed and equivalent to the id
+  attribute in a and img tags, and is only converted to id when %HTML.TidyLevel
+  is heavy (for all doctypes).
+! %AutoFormat.RemoveEmpty to remove some empty tags from documents. Please don't
+  use on hand-written HTML.
+! Add error-cases for unsupported elements in MakeWellFormed. This enables
+  the strategy to be used, standalone, on untrusted input.
+! %Core.AggressivelyFixLt is on by default. This causes more sensible
+  processing of left angled brackets in smileys and other whatnot.
+! Test scripts now have a 'type' parameter, which lets you say 'htmlpurifier',
+  'phpt', 'vtest', etc. in order to only execute those tests. This supercedes
+  the --only-phpt parameter, although for backwards-compatibility the flag
+  will still work.
+! AutoParagraph auto-formatter will now preserve double-newlines upon output.
+  Users who are not performing inbound filtering, this may seem a little
+  useless, but as a bonus, the test suite and handling of edge cases is also
+  improved.
+! Experimental implementation of forms for %HTML.Trusted
+! Track column numbers when maintain line numbers is on
+! Proprietary 'background' attribute on table-related elements converted into
+  corresponding CSS.  Thanks Fusemail for sponsoring this feature!
+! Add forward(), forwardUntilEndToken(), backward() and current() to Injector
+  supertype.
+! HTMLPurifier_Injector->handleEnd() permits modification to end tokens. The
+  time of operation varies slightly from notifyEnd() as *all* end tokens are
+  processed by the injector before they are subject to the well-formedness rules.
+! %Attr.DefaultImageAlt allows overriding default behavior of setting alt to
+  basename of image when not present.
+! %AutoFormat.DisplayLinkURI neuters <a> tags into plain text URLs.
+- Fix two bugs in %URI.MakeAbsolute; one involving empty paths in base URLs,
+  the other involving an undefined $is_folder error.
+- Throw error when %Core.Encoding is set to a spurious value. Previously,
+  this errored silently and returned false.
+- Redirected stderr to stdout for flush error output.
+- %URI.DisableExternal will now use the host in %URI.Base if %URI.Host is not
+  available.
+- Do not re-munge URL if the output URL has the same host as the input URL.
+  Requested by Chris.
+- Fix error in documentation regarding %Filter.ExtractStyleBlocks
+- Prevent <![CDATA[<body></body>]]> from triggering %Core.ConvertDocumentToFragment
+- Fix bug with inline elements in blockquotes conflicting with strict doctype
+- Detect if HTML support is disabled for DOM by checking for loadHTML() method.
+- Fix bug where dots and double-dots in absolute URLs without hostname were
+  not collapsed by URIFilter_MakeAbsolute.
+- Fix bug with anonymous modules operating on SafeEmbed or SafeObject elements
+  by reordering their addition.
+- Will now throw exception on many error conditions during lexer creation; also
+  throw an exception when MaintainLineNumbers is true, but a non-tracksLineNumbers
+  is being used.
+- Detect if domxml extension is loaded, and use DirectLEx accordingly.
+- Improve handling of big numbers with floating point arithmetic in UnitConverter.
+  Reported by David Morton.
+. Strategy_MakeWellFormed now operates in-place, saving memory and allowing
+  for more interesting filter-backtracking
+. New HTMLPurifier_Injector->rewind() functionality, allows injectors to rewind
+  index to reprocess tokens.
+. StringHashParser now allows for multiline sections with "empty" content;
+  previously the section would remain undefined.
+. Added --quick option to multitest.php, which tests only the most recent
+  release for each series.
+. Added --distro option to multitest.php, which accepts either 'normal' or
+  'standalone'. This supercedes --exclude-normal and --exclude-standalone
+
+3.1.1, released 2008-06-19
+# %URI.Munge now, by default, does not munge resources (for example, <img src="">)
+  In order to enable this again, please set %URI.MungeResources to true.
+! More robust imagecrash protection with height/width CSS with %CSS.MaxImgLength,
+  and height/width HTML with %HTML.MaxImgLength.
+! %URI.MungeSecretKey for secure URI munging. Thanks Chris
+  for sponsoring this feature. Check out the corresponding documentation
+  for details. (Att Nightly testers: The API for this feature changed before
+  the general release. Namely, rename your directives %URI.SecureMungeSecretKey =>
+  %URI.MungeSecretKey and and %URI.SecureMunge => %URI.Munge)
+! Implemented post URI filtering. Set member variable $post to true to set
+  a URIFilter as such.
+! Allow modules to define injectors via $info_injector. Injectors are
+  automatically disabled if injector's needed elements are not found.
+! Support for "safe" objects added, use %HTML.SafeObject and %HTML.SafeEmbed.
+  Thanks Chris for sponsoring. If you've been using ad hoc code from the
+  forums, PLEASE use this instead.
+! Added substitutions for %e, %n, %a and %p in %URI.Munge (in order,
+  embedded, tag name, attribute name, CSS property name). See %URI.Munge
+  for more details. Requested by Jochem Blok.
+- Disable percent height/width attributes for img.
+- AttrValidator operations are now atomic; updates to attributes are not
+  manifest in token until end of operations. This prevents naughty internal
+  code from directly modifying CurrentToken when they're not supposed to.
+  This semantics change was requested by frank farmer.
+- Percent encoding checks enabled for URI query and fragment
+- Fix stray backslashes in font-family; CSS Unicode character escapes are
+  now properly resolved (although *only* in font-family). Thanks Takeshi Terada
+  for reporting.
+- Improve parseCDATA algorithm to take into account newline normalization
+- Account for browser confusion between Yen character and backslash in
+  Shift_JIS encoding. This fix generalizes to any other encoding which is not
+  a strict superset of printable ASCII. Thanks Takeshi Terada for reporting.
+- Fix missing configuration parameter in Generator calls. Thanks vs for the
+  partial patch.
+- Improved adherence to Unicode by checking for non-character codepoints.
+  Thanks Geoffrey Sneddon for reporting. This may result in degraded
+  performance for extremely large inputs.
+- Allow CSS property-value pair ''text-decoration: none''. Thanks Jochem Blok
+  for reporting.
+. Added HTMLPurifier_UnitConverter and HTMLPurifier_Length for convenient
+  handling of CSS-style lengths. HTMLPurifier_AttrDef_CSS_Length now uses
+  this class.
+. API of HTMLPurifier_AttrDef_CSS_Length changed from __construct($disable_negative)
+  to __construct($min, $max). __construct(true) is equivalent to
+  __construct('0').
+. Added HTMLPurifier_AttrDef_Switch class
+. Rename HTMLPurifier_HTMLModule_Tidy->construct() to setup() and bubble method
+  up inheritance hierarchy to HTMLPurifier_HTMLModule. All HTMLModules
+  get this called with the configuration object.  All modules now
+  use this rather than __construct(), although legacy code using constructors
+  will still work--the new format, however, lets modules access the
+  configuration object for HTML namespace dependant tweaks.
+. AttrDef_HTML_Pixels now takes a single construction parameter, pixels.
+. ConfigSchema data-structure heavily optimized; on average it uses a third
+  the memory it did previously. The interface has changed accordingly,
+  consult changes to HTMLPurifier_Config for details.
+. Variable parsing types now are magic integers instead of strings
+. Added benchmark for ConfigSchema
+. HTMLPurifier_Generator requires $config and $context parameters. If you
+  don't know what they should be, use HTMLPurifier_Config::createDefault()
+  and new HTMLPurifier_Context().
+. Printers now properly distinguish between output configuration, and
+  target configuration. This is not applicable to scripts using
+  the Printers for HTML Purifier related tasks.
+. HTML/CSS Printers must be primed with prepareGenerator($gen_config), otherwise
+  fatal errors will ensue.
+. URIFilter->prepare can return false in order to abort loading of the filter
+. Factory for AttrDef_URI implemented, URI#embedded to indicate URI that embeds
+  an external resource.
+. %URI.Munge functionality factored out into a post-filter class.
+. Added CurrentCSSProperty context variable during CSS validation
+
+3.1.0, released 2008-05-18
+# Unnecessary references to objects (vestiges of PHP4) removed from method
+  signatures.  The following methods do not need references when assigning from
+  them and will result in E_STRICT errors if you try:
+    + HTMLPurifier_Config->get*Definition() [* = HTML, CSS]
+    + HTMLPurifier_ConfigSchema::instance()
+    + HTMLPurifier_DefinitionCacheFactory::instance()
+    + HTMLPurifier_DefinitionCacheFactory->create()
+    + HTMLPurifier_DoctypeRegistry->register()
+    + HTMLPurifier_DoctypeRegistry->get()
+    + HTMLPurifier_HTMLModule->addElement()
+    + HTMLPurifier_HTMLModule->addBlankElement()
+    + HTMLPurifier_LanguageFactory::instance()
+# Printer_ConfigForm's get*() functions were static-ified
+# %HTML.ForbiddenAttributes requires attribute declarations to be in the
+  form of tag@attr, NOT tag.attr (which will throw an error and won't do
+  anything). This is for forwards compatibility with XML; you'd do best
+  to migrate an %HTML.AllowedAttributes directives to this syntax too.
+! Allow index to be false for config from form creation
+! Added HTMLPurifier::VERSION constant
+! Commas, not dashes, used for serializer IDs. This change is forwards-compatible
+  and allows for version numbers like "3.1.0-dev".
+! %HTML.Allowed deals gracefully with whitespace anywhere, anytime!
+! HTML Purifier's URI handling is a lot more robust, with much stricter
+  validation checks and better percent encoding handling. Thanks Gareth Heyes
+  for indicating security vulnerabilities from lax percent encoding.
+! Bootstrap autoloader deals more robustly with classes that don't exist,
+  preventing class_exists($class, true) from barfing.
+- InterchangeBuilder now alphabetizes its lists
+- Validation error in configdoc output fixed
+- Iconv and other encoding errors muted even with custom error handlers that
+  do not honor error_reporting
+- Add protection against imagecrash attack with CSS height/width
+- HTMLPurifier::instance() created for consistency, is equivalent to getInstance()
+- Fixed and revamped broken ConfigForm smoketest
+- Bug with bool/null fields in Printer_ConfigForm fixed
+- Bug with global forbidden attributes fixed
+- Improved error messages for allowed and forbidden HTML elements and attributes
+- Missing (or null) in configdoc documentation restored
+- If DOM throws and exception during parsing with PH5P (occurs in newer versions
+  of DOM), HTML Purifier punts to DirectLex
+- Fatal error with unserialization of ScriptRequired
+- Created directories are now chmod'ed properly
+- Fixed bug with fallback languages in LanguageFactory
+- Standalone testing setup properly with autoload
+. Out-of-date documentation revised
+. UTF-8 encoding check optimization as suggested by Diego
+. HTMLPurifier_Error removed in favor of exceptions
+. More copy() function removed; should use clone instead
+. More extensive unit tests for HTMLDefinition
+. assertPurification moved to central harness
+. HTMLPurifier_Generator accepts $config and $context parameters during
+  instantiation, not runtime
+. Double-quotes outside of attribute values are now unescaped
+
+3.1.0rc1, released 2008-04-22
+# Autoload support added. Internal require_once's removed in favor of an
+  explicit require list or autoloading. To use HTML Purifier,
+  you must now either use HTMLPurifier.auto.php
+  or HTMLPurifier.includes.php; setting the include path and including
+  HTMLPurifier.php is insufficient--in such cases include HTMLPurifier.autoload.php
+  as well to register our autoload handler (or modify your autoload function
+  to check HTMLPurifier_Bootstrap::getPath($class)). You can also use
+  HTMLPurifier.safe-includes.php for a less performance friendly but more
+  user-friendly library load.
+# HTMLPurifier_ConfigSchema static functions are officially deprecated. Schema
+  information is stored in the ConfigSchema directory, and the
+  maintenance/generate-schema-cache.php generates the schema.ser file, which
+  is now instantiated. Support for userland schema changes coming soon!
+# HTMLPurifier_Config will now throw E_USER_NOTICE when you use a directive
+  alias; to get rid of these errors just modify your configuration to use
+  the new directive name.
+# HTMLPurifier->addFilter is deprecated; built-in filters can now be
+  enabled using %Filter.$filter_name or by setting your own filters using
+  %Filter.Custom
+# Directive-level safety properties superceded in favor of module-level
+  safety. Internal method HTMLModule->addElement() has changed, although
+  the externally visible HTMLDefinition->addElement has *not* changed.
+! Extra utility classes for testing and non-library operations can
+  be found in extras/. Specifically, these are FSTools and ConfigDoc.
+  You may find a use for these in your own project, but right now they
+  are highly experimental and volatile.
+! Integration with PHPT allows for automated smoketests
+! Limited support for proprietary HTML elements, namely <marquee>, sponsored
+  by Chris. You can enable them with %HTML.Proprietary if your client
+  demands them.
+! Support for !important CSS cascade modifier. By default, this will be stripped
+  from CSS, but you can enable it using %CSS.AllowImportant
+! Support for display and visibility CSS properties added, set %CSS.AllowTricky
+  to true to use them.
+! HTML Purifier now has its own Exception hierarchy under HTMLPurifier_Exception.
+  Developer error (not enduser error) can cause these to be triggered.
+! Experimental kses() wrapper introduced with HTMLPurifier.kses.php
+! Finally %CSS.AllowedProperties for tweaking allowed CSS properties without
+  mucking around with HTMLPurifier_CSSDefinition
+! ConfigDoc output has been enhanced with version and deprecation info.
+! %HTML.ForbiddenAttributes and %HTML.ForbiddenElements implemented.
+- Autoclose now operates iteratively, i.e. <span><span><div> now has
+  both span tags closed.
+- Various HTMLPurifier_Config convenience functions now accept another parameter
+  $schema which defines what HTMLPurifier_ConfigSchema to use besides the
+  global default.
+- Fix bug with trusted script handling in libxml versions later than 2.6.28.
+- Fix bug in ExtractStyleBlocks with comments in style tags
+- Fix bug in comment parsing for DirectLex
+- Flush output now displayed when in command line mode for unit tester
+- Fix bug with rgb(0, 1, 2) color syntax with spaces inside shorthand syntax
+- HTMLPurifier_HTMLDefinition->addAttribute can now be called multiple times
+  on the same element without emitting errors.
+- Fixed fatal error in PH5P lexer with invalid tag names
+. Plugins now get their own changelogs according to project conventions.
+. Convert tokens to use instanceof, reducing memory footprint and
+  improving comparison speed.
+. Dry runs now supported in SimpleTest; testing facilities improved
+. Bootstrap class added for handling autoloading functionality
+. Implemented recursive glob at FSTools->globr
+. ConfigSchema now has instance methods for all corresponding define*
+  static methods.
+. A couple of new historical maintenance scripts were added.
+. HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php split into two files
+. tests/index.php can now be run from any directory.
+. HTMLPurifier_Token subclasses split into seperate files
+. HTMLPURIFIER_PREFIX now is defined in Bootstrap.php, NOT HTMLPurifier.php
+. HTMLPURIFIER_PREFIX can now be defined outside of HTML Purifier
+. New --php=php flag added, allows PHP executable to be specified (command
+  line only!)
+. htmlpurifier_add_test() preferred method to translate test files in to
+  classes, because it handles PHPT files too.
+. Debugger class is deprecated and will be removed soon.
+. Command line argument parsing for testing scripts revamped, now --opt value
+  format is supported.
+. Smoketests now cleanup after magic quotes
+. Generator now can output comments (however, comments are still stripped
+  from HTML Purifier output)
+. HTMLPurifier_ConfigSchema->validate() deprecated in favor of
+  HTMLPurifier_VarParser->parse()
+. Integers auto-cast into float type by VarParser.
+. HTMLPURIFIER_STRICT removed; no validation is performed on runtime, only
+  during cache generation
+. Reordered script calls in maintenance/flush.php
+. Command line scripts now honor exit codes
+. When --flush fails in unit testers, abort tests and print message
+. Improved documentation in docs/dev-flush.html about the maintenance scripts
+. copy() methods removed in favor of clone keyword
+
+3.0.0, released 2008-01-06
+# HTML Purifier is PHP 5 only! The 2.1.x branch will be maintained
+  until PHP 4 is completely deprecated, but no new features will be added
+  to it.
+  + Visibility declarations added
+  + Constructor methods renamed to __construct()
+  + PHP4 reference cruft removed (in progress)
+! CSS properties are now case-insensitive
+! DefinitionCacheFactory now can register new implementations
+! New HTMLPurifier_Filter_ExtractStyleBlocks for extracting <style> from
+  documents and cleaning their contents up. Requires the CSSTidy library
+  <http://csstidy.sourceforge.net/>. You can access the blocks with the
+  'StyleBlocks' Context variable ($purifier->context->get('StyleBlocks')).
+  The output CSS can also be "scoped" for a specific element, use:
+  %Filter.ExtractStyleBlocksScope
+! Experimental support for some proprietary CSS attributes allowed:
+  opacity (and all of the browser-specific equivalents) and scrollbar colors.
+  Enable by setting %CSS.Proprietary to true.
+- Colors missing # but in hex form will be corrected
+- CSS Number algorithm improved
+- Unit testing and multi-testing now on steroids: command lines,
+  XML output, and other goodies now added.
+. Unit tests for Injector improved
+. New classes:
+  + HTMLPurifier_AttrDef_CSS_AlphaValue
+  + HTMLPurifier_AttrDef_CSS_Filter
+. Multitest now has a file docblock
+
+2.1.3, released 2007-11-05
+! tests/multitest.php allows you to test multiple versions by running
+  tests/index.php through multiple interpreters using `phpv` shell
+  script (you must provide this script!)
+- Fixed poor include ordering for Email URI AttrDefs, causes fatal errors
+  on some systems.
+- Injector algorithm further refined: off-by-one error regarding skip
+  counts for dormant injectors fixed
+- Corrective blockquote definition now enabled for HTML 4.01 Strict
+- Fatal error when <img> tag (or any other element with required attributes)
+  has 'id' attribute fixed, thanks NykO18 for reporting
+- Fix warning emitted when a non-supported URI scheme is passed to the
+  MakeAbsolute URIFilter, thanks NykO18 (again)
+- Further refine AutoParagraph injector. Behavior inside of elements
+  allowing paragraph tags clarified: only inline content delimeted by
+  double newlines (not block elements) are paragraphed.
+- Buggy treatment of end tags of elements that have required attributes
+  fixed (does not manifest on default tag-set)
+- Spurious internal content reorganization error suppressed
+- HTMLDefinition->addElement now returns a reference to the created
+  element object, as implied by the documentation
+- Phorum mod's HTML Purifier help message expanded (unreleased elsewhere)
+- Fix a theoretical class of infinite loops from DirectLex reported
+  by Nate Abele
+- Work around unnecessary DOMElement type-cast in PH5P that caused errors
+  in PHP 5.1
+- Work around PHP 4 SimpleTest lack-of-error complaining for one-time-only
+  HTMLDefinition errors, this may indicate problems with error-collecting
+  facilities in PHP 5
+- Make ErrorCollectorEMock work in both PHP 4 and PHP 5
+- Make PH5P work with PHP 5.0 by removing unnecessary array parameter typedef
+. %Core.AcceptFullDocuments renamed to %Core.ConvertDocumentToFragment
+  to better communicate its purpose
+. Error unit tests can now specify the expectation of no errors. Future
+  iterations of the harness will be extremely strict about what errors
+  are allowed
+. Extend Injector hooks to allow for more powerful injector routines
+. HTMLDefinition->addBlankElement created, as according to the HTMLModule
+  method
+. Doxygen configuration file updated, with minor improvements
+. Test runner now checks for similarly named files in conf/ directory too.
+. Minor cosmetic change to flush-definition-cache.php: trailing newline is
+  outputted
+. Maintenance script for generating PH5P patch added, original PH5P source
+  file also added under version control
+. Full unit test runner script title made more descriptive with PHP version
+. Updated INSTALL file to state that 4.3.7 is the earliest version we
+  are actively testing
+
+2.1.2, released 2007-09-03
+! Implemented Object module for trusted users
+! Implemented experimental HTML5 parsing mode using PH5P. To use, add
+  this to your code:
+        require_once 'HTMLPurifier/Lexer/PH5P.php';
+        $config->set('Core', 'LexerImpl', 'PH5P');
+  Note that this Lexer introduces some classes not in the HTMLPurifier
+  namespace.  Also, this is PHP5 only.
+! CSS property border-spacing implemented
+- Fix non-visible parsing error in DirectLex with empty tags that have
+  slashes inside attribute values.
+- Fix typo in CSS definition: border-collapse:seperate; was incorrectly
+  accepted as valid CSS. Usually non-visible, because this styling is the
+  default for tables in most browsers. Thanks Brett Zamir for pointing
+  this out.
+- Fix validation errors in configuration form
+- Hammer out a bunch of edge-case bugs in the standalone distribution
+- Inclusion reflection removed from URISchemeRegistry; you must manually
+  include any new schema files you wish to use
+- Numerous typo fixes in documentation thanks to Brett Zamir
+. Unit test refactoring for one logical test per test function
+. Config and context parameters in ComplexHarness deprecated: instead, edit
+  the $config and $context member variables
+. HTML wrapper in DOMLex now takes DTD identifiers into account; doesn't
+  really make a difference, but is good for completeness sake
+. merge-library.php script refactored for greater code reusability and
+  PHP4 compatibility
+
+2.1.1, released 2007-08-04
+- Fix show-stopper bug in %URI.MakeAbsolute functionality
+- Fix PHP4 syntax error in standalone version
+. Add prefix directory to include path for standalone, this prevents
+  other installations from clobbering the standalone's URI schemes
+. Single test methods can be invoked by prefixing with __only
+
+2.1.0, released 2007-08-02
+# flush-htmldefinition-cache.php superseded in favor of a generic
+  flush-definition-cache.php script, you can clear a specific cache
+  by passing its name as a parameter to the script
+! Phorum mod implemented for HTML Purifier
+! With %Core.AggressivelyFixLt, <3 and similar emoticons no longer
+  trigger HTML removal in PHP5 (DOMLex). This directive is not necessary
+  for PHP4 (DirectLex).
+! Standalone file now available, which greatly reduces the amount of
+  includes (although there are still a few files that reside in the
+  standalone folder)
+! Relative URIs can now be transformed into their absolute equivalents
+  using %URI.Base and %URI.MakeAbsolute
+! Ruby implemented for XHTML 1.1
+! You can now define custom URI filtering behavior, see enduser-uri-filter.html
+  for more details
+! UTF-8 font names now supported in CSS
+- AutoFormatters emit friendly error messages if tags or attributes they
+  need are not allowed
+- ConfigForm's compactification of directive names is now configurable
+- AutoParagraph autoformatter algorithm refined after field-testing
+- XHTML 1.1 now applies XHTML 1.0 Strict cleanup routines, namely
+  blockquote wrapping
+- Contents of <style> tags removed by default when tags are removed
+. HTMLPurifier_Config->getSerial() implemented, this is extremely useful
+  for output cache invalidation
+. ConfigForm printer now can retrieve CSS and JS files as strings, in
+  case HTML Purifier's directory is not publically accessible
+. Introduce new text/itext configuration directive values: these represent
+  longer strings that would be more appropriately edited with a textarea
+. Allow newlines to act as separators for lists, hashes, lookups and
+  %HTML.Allowed
+. ConfigForm generates textareas instead of text inputs for lists, hashes,
+  lookups, text and itext fields
+. Hidden element content removal genericized: %Core.HiddenElements can
+  be used to customize this behavior, by default <script> and <style> are
+  hidden
+. Added HTMLPURIFIER_PREFIX constant, should be used instead of dirname(__FILE__)
+. Custom ChildDef added to default include list
+. URIScheme reflection improved: will not attempt to include file if class
+  already exists. May clobber autoload, so I need to keep an eye on it
+. ConfigSchema heavily optimized, will only collect information and validate
+  definitions when HTMLPURIFIER_SCHEMA_STRICT is true.
+. AttrDef_URI unit tests and implementation refactored
+. benchmarks/ directory now protected from public view with .htaccess file;
+  run the tests via command line
+. URI scheme is munged off if there is no authority and the scheme is the
+  default one
+. All unit tests inherit from HTMLPurifier_Harness, not UnitTestCase
+. Interface for URIScheme changed
+. Generic URI object to hold components of URI added, most systems involved
+  in URI validation have been migrated to use it
+. Custom filtering for URIs factored out to URIDefinition interface for
+  maximum extensibility
+
+2.0.1, released 2007-06-27
+! Tag auto-closing now based on a ChildDef heuristic rather than a
+  manually set auto_close array; some behavior may change
+! Experimental AutoFormat functionality added: auto-paragraph and
+  linkify your HTML input by setting %AutoFormat.AutoParagraph and
+  %AutoFormat.Linkify to true
+! Newlines normalized internally, and then converted back to the
+  value of PHP_EOL. If this is not desired, set your newline format
+  using %Output.Newline.
+! Beta error collection, messages are implemented for the most generic
+  cases involving Lexing or Strategies
+- Clean up special case code for <script> tags
+- Reorder includes for DefinitionCache decorators, fixes a possible
+  missing class error
+- Fixed bug where manually modified definitions were not saved via cache
+  (mostly harmless, except for the fact that it would be a little slower)
+- Configuration objects with different serials do not clobber each
+  others when revision numbers are unequal
+- Improve Serializer DefinitionCache directory permissions checks
+- DefinitionCache no longer throws errors when it encounters old
+  serial files that do not conform to the current style
+- Stray xmlns attributes removed from configuration documentation
+- configForm.php smoketest no longer has XSS vulnerability due to
+  unescaped print_r output
+- Printer adheres to configuration's directives on output format
+- Fix improperly named form field in ConfigForm printer
+. Rewire some test-cases to swallow errors rather than expect them
+. HTMLDefinition printer updated with some of the new attributes
+. DefinitionCache keys reordered to reflect precedence: version number,
+  hash, then revision number
+. %Core.DefinitionCache renamed to %Cache.DefinitionImpl
+. Interlinking in configuration documentation added using
+  Injector_PurifierLinkify
+. Directives now keep track of aliases to themselves
+. Error collector now requires a severity to be passed, use PHP's internal
+  error constants for this
+. HTMLPurifier_Config::getAllowedDirectivesForForm implemented, allows
+  much easier selective embedding of configuration values
+. Doctype objects now accept public and system DTD identifiers
+. %HTML.Doctype is now constrained by specific values, to specify a custom
+  doctype use new %HTML.CustomDoctype
+. ConfigForm truncates long directives to keep the form small, and does
+  not re-output namespaces
+
+2.0.0, released 2007-06-20
+# Completely refactored HTMLModuleManager, decentralizing safety
+  information
+# Transform modules changed to Tidy modules, which offer more flexibility
+  and better modularization
+# Configuration object now finalizes itself when a read operation is
+  performed on it, ensuring that its internal state stays consistent.
+  To revert this behavior, you can set the $autoFinalize member variable
+  off, but it's not recommended.
+# New compact syntax for AttrDef objects that can be used to instantiate
+  new objects via make()
+# Definitions (esp. HTMLDefinition) are now cached for a significant
+  performance boost. You can disable caching by setting %Core.DefinitionCache
+  to null. You CANNOT edit raw definitions without setting the corresponding
+  DefinitionID directive (%HTML.DefinitionID for HTMLDefinition).
+# Contents between <script> tags are now completely removed if <script>
+  is not allowed
+# Prototype-declarations for Lexer removed in favor of configuration
+  determination of Lexer implementations.
+! HTML Purifier now works in PHP 4.3.2.
+! Configuration form-editing API makes tweaking HTMLPurifier_Config a
+  breeze!
+! Configuration directives that accept hashes now allow new string
+  format: key1:value1,key2:value2
+! ConfigDoc now factored into OOP design
+! All deprecated elements now natively supported
+! Implement TinyMCE styled whitelist specification format in
+  %HTML.Allowed
+! Config object gives more friendly error messages when things go wrong
+! Advanced API implemented: easy functions for creating elements (addElement)
+  and attributes (addAttribute) on HTMLDefinition
+! Add native support for required attributes
+- Deprecated and removed EnableRedundantUTF8Cleaning. It didn't even work!
+- DOMLex will not emit errors when a custom error handler that does not
+  honor error_reporting is used
+- StrictBlockquote child definition refrains from wrapping whitespace
+  in tags now.
+- Bug resulting from tag transforms to non-allowed elements fixed
+- ChildDef_Custom's regex generation has been improved, removing several
+  false positives
+. Unit test for ElementDef created, ElementDef behavior modified to
+  be more flexible
+. Added convenience functions for HTMLModule constructors
+. AttrTypes now has accessor functions that should be used instead
+  of directly manipulating info
+. TagTransform_Center deprecated in favor of generic TagTransform_Simple
+. Add extra protection in AttrDef_URI against phantom Schemes
+. Doctype object added to HTMLDefinition which describes certain aspects
+  of the operational document type
+. Lexer is now pre-emptively included, with a conditional include for the
+  PHP5 only version.
+. HTMLDefinition and CSSDefinition have a common parent class: Definition.
+. DirectLex can now track line-numbers
+. Preliminary error collector is in place, although no code actually reports
+  errors yet
+. Factor out most of ValidateAttributes to new AttrValidator class
+
+1.6.1, released 2007-05-05
+! Support for more deprecated attributes via transformations:
+  + hspace and vspace in img
+  + size and noshade in hr
+  + nowrap in td
+  + clear in br
+  + align in caption, table, img and hr
+  + type in ul, ol and li
+! DirectLex now preserves text in which a < bracket is followed by
+  a non-alphanumeric character. This means that certain emoticons
+  are now preserved.
+! %Core.RemoveInvalidImg is now operational, when set to false invalid
+  images will hang around with an empty src
+! target attribute in a tag supported, use %Attr.AllowedFrameTargets
+  to enable
+! CSS property white-space now allows nowrap (supported in all modern
+  browsers) but not others (which have spotty browser implementations)
+! XHTML 1.1 mode now sort-of works without any fatal errors, and
+  lang is now moved over to xml:lang.
+! Attribute transformation smoketest available at smoketests/attrTransform.php
+! Transformation of font's size attribute now handles super-large numbers
+- Possibly fatal bug with __autoload() fixed in module manager
+- Invert HTMLModuleManager->addModule() processing order to check
+  prefixes first and then the literal module
+- Empty strings get converted to empty arrays instead of arrays with
+  an empty string in them.
+- Merging in attribute lists now works.
+. Demo script removed: it has been added to the website's repository
+. Basic.php script modified to work out of the box
+. Refactor AttrTransform classes to reduce duplication
+. AttrTransform_TextAlign axed in favor of a more general
+  AttrTransform_EnumToCSS, refer to HTMLModule/TransformToStrict.php to
+  see how the new equivalent is implemented
+. Unit tests now use exclusively assertIdentical
+
+1.6.0, released 2007-04-01
+! Support for most common deprecated attributes via transformations:
+  + bgcolor in td, th, tr and table
+  + border in img
+  + name in a and img
+  + width in td, th and hr
+  + height in td, th
+! Support for CSS attribute 'height' added
+! Support for rel and rev attributes in a tags added, use %Attr.AllowedRel
+  and %Attr.AllowedRev to activate
+- You can define ID blacklists using regular expressions via
+  %Attr.IDBlacklistRegexp
+- Error messages are emitted when you attempt to "allow" elements or
+  attributes that HTML Purifier does not support
+- Fix segfault in unit test. The problem is not very reproduceable and
+  I don't know what causes it, but a six line patch fixed it.
+
+1.5.0, released 2007-03-23
+! Added a rudimentary I18N and L10N system modeled off MediaWiki. It
+  doesn't actually do anything yet, but keep your eyes peeled.
+! docs/enduser-utf8.html explains how to use UTF-8 and HTML Purifier
+! Newly structured HTMLDefinition modeled off of XHTML 1.1 modules.
+  I am loathe to release beta quality APIs, but this is exactly that;
+  don't use the internal interfaces if you're not willing to do migration
+  later on.
+- Allow 'x' subtag in language codes
+- Fixed buggy chameleon-support for ins and del
+. Added support for IDREF attributes (i.e. for)
+. Renamed HTMLPurifier_AttrDef_Class to HTMLPurifier_AttrDef_Nmtokens
+. Removed context variable ParentType, replaced with IsInline, which
+  is false when you're not inline and an integer of the parent that
+  caused you to become inline when you are (so possibly zero)
+. Removed ElementDef->type in favor of ElementDef->descendants_are_inline
+  and HTMLDefinition->content_sets
+. StrictBlockquote now reports what elements its supposed to allow,
+  rather than what it does allow
+. Removed HTMLDefinition->info_flow_elements in favor of
+  HTMLDefinition->content_sets['Flow']
+. Removed redundant "exclusionary" definitions from DTD roster
+. StrictBlockquote now requires a construction parameter as if it
+  were an Required ChildDef, this is the "real" set of allowed elements
+. AttrDef partitioned into HTML, CSS and URI segments
+. Modify Youtube filter regexp to be multiline
+. Require both PHP5 and DOM extension in order to use DOMLex, fixes
+  some edge cases where a DOMDocument class exists in a PHP4 environment
+  due to DOM XML extension.
+
+1.4.1, released 2007-01-21
+! docs/enduser-youtube.html updated according to new functionality
+- YouTube IDs can have underscores and dashes
+
+1.4.0, released 2007-01-21
+! Implemented list-style-image, URIs now allowed in list-style
+! Implemented background-image, background-repeat, background-attachment
+  and background-position CSS properties. Shorthand property background
+  supports all of these properties.
+! Configuration documentation looks nicer
+! Added %Core.EscapeNonASCIICharacters to workaround loss of Unicode
+  characters while %Core.Encoding is set to a non-UTF-8 encoding.
+! Support for configuration directive aliases added
+! Config object can now be instantiated from ini files
+! YouTube preservation code added to the core, with two lines of code
+  you can add it as a filter to your code. See smoketests/preserveYouTube.php
+  for sample code.
+! Moved SLOW to docs/enduser-slow.html and added code examples
+- Replaced version check with functionality check for DOM (thanks Stephen
+  Khoo)
+. Added smoketest 'all.php', which loads all other smoketests via frames
+. Implemented AttrDef_CSSURI for url(http://google.com) style declarations
+. Added convenient single test selector form on test runner
+
+1.3.2, released 2006-12-25
+! HTMLPurifier object now accepts configuration arrays, no need to manually
+  instantiate a configuration object
+! Context object now accessible to outside
+! Added enduser-youtube.html, explains how to embed YouTube videos. See
+  also corresponding smoketest preserveYouTube.php.
+! Added purifyArray(), which takes a list of HTML and purifies it all
+! Added static member variable $version to HTML Purifier with PHP-compatible
+  version number string.
+- Fixed fatal error thrown by upper-cased language attributes
+- printDefinition.php: added labels, added better clarification
+. HTMLPurifier_Config::create() added, takes mixed variable and converts into
+  a HTMLPurifier_Config object.
+
+1.3.1, released 2006-12-06
+! Added HTMLPurifier.func.php stub for a convenient function to call the library
+- Fixed bug in RemoveInvalidImg code that caused all images to be dropped
+  (thanks to .mario for reporting this)
+. Standardized all attribute handling variables to attr, made it plural
+
+1.3.0, released 2006-11-26
+# Invalid images are now removed, rather than replaced with a dud
+  <img src="" alt="Invalid image" />. Previous behavior can be restored
+  with new directive %Core.RemoveInvalidImg set to false.
+! (X)HTML Strict now supported
+  + Transparently handles inline elements in block context (blockquote)
+! Added GET method to demo for easier validation, added 50kb max input size
+! New directive %HTML.BlockWrapper, for block-ifying inline elements
+! New directive %HTML.Parent, allows you to only allow inline content
+! New directives %HTML.AllowedElements and %HTML.AllowedAttributes to let
+  users narrow the set of allowed tags
+! <li value="4"> and <ul start="2"> now allowed in loose mode
+! New directives %URI.DisableExternalResources and %URI.DisableResources
+! New directive %Attr.DisableURI, which eliminates all hyperlinking
+! New directive %URI.Munge, munges URI so you can use some sort of redirector
+  service to avoid PageRank leaks or warn users that they are exiting your site.
+! Added spiffy new smoketest printDefinition.php, which lets you twiddle with
+  the configuration settings and see how the internal rules are affected.
+! New directive %URI.HostBlacklist for blocking links to bad hosts.
+  xssAttacks.php smoketest updated accordingly.
+- Added missing type to ChildDef_Chameleon
+- Remove Tidy option from demo if there is not Tidy available
+. ChildDef_Required guards against empty tags
+. Lookup table HTMLDefinition->info_flow_elements added
+. Added peace-of-mind variable initialization to Strategy_FixNesting
+. Added HTMLPurifier->info_parent_def, parent child processing made special
+. Added internal documents briefly summarizing future progression of HTML
+. HTMLPurifier_Config->getBatch($namespace) added
+. More lenient casting to bool from string in HTMLPurifier_ConfigSchema
+. Refactored ChildDef classes into their own files
+
+1.2.0, released 2006-11-19
+# ID attributes now disabled by default. New directives:
+  + %HTML.EnableAttrID - restores old behavior by allowing IDs
+  + %Attr.IDPrefix - %Attr.IDBlacklist alternative that munges all user IDs
+    so that they don't collide with your IDs
+  + %Attr.IDPrefixLocal - Same as above, but for when there are multiple
+    instances of user content on the page
+  + Profuse documentation on how to use these available in docs/enduser-id.txt
+! Added MODx plugin <http://modxcms.com/forums/index.php/topic,6604.0.html>
+! Added percent encoding normalization
+! XSS attacks smoketest given facelift
+! Configuration documentation now has table of contents
+! Added %URI.DisableExternal, which prevents links to external websites.  You
+  can also use %URI.Host to permit absolute linking to subdomains
+! Non-accessible resources (ex. mailto) blocked from embedded URIs (img src)
+- Type variable in HTMLDefinition was not being set properly, fixed
+- Documentation updated
+  + TODO added request Phalanger
+  + TODO added request Native compression
+  + TODO added request Remove redundant tags
+  + TODO added possible plaintext formatter for HTML Purifier documentation
+  + Updated ConfigDoc TODO
+  + Improved inline comments in AttrDef/Class.php, AttrDef/CSS.php
+    and AttrDef/Host.php
+  + Revamped documentation into HTML, along with misc updates
+- HTMLPurifier_Context doesn't throw a variable reference error if you attempt
+  to retrieve a non-existent variable
+. Switched to purify()-wide Context object registry
+. Refactored unit tests to minimize duplication
+. XSS attack sheet updated
+. configdoc.xml now has xml:space attached to default value nodes
+. Allow configuration directives to permit null values
+. Cleaned up test-cases to remove unnecessary swallowErrors()
+
+1.1.2, released 2006-09-30
+! Add HTMLPurifier.auto.php stub file that configures include_path
+- Documentation updated
+  + INSTALL document rewritten
+  + TODO added semi-lossy conversion
+  + API Doxygen docs' file exclusions updated
+  + Added notes on HTML versus XML attribute whitespace handling
+  + Noted that HTMLPurifier_ChildDef_Custom isn't being used
+  + Noted that config object's definitions are cached versions
+- Fixed lack of attribute parsing in HTMLPurifier_Lexer_PEARSax3
+- ftp:// URIs now have their typecodes checked
+- Hooked up HTMLPurifier_ChildDef_Custom's unit tests (they weren't being run)
+. Line endings standardized throughout project (svn:eol-style standardized)
+. Refactored parseData() to general Lexer class
+. Tester named "HTML Purifier" not "HTMLPurifier"
+
+1.1.1, released 2006-09-24
+! Configuration option to optionally Tidy up output for indentation to make up
+  for dropped whitespace by DOMLex (pretty-printing for the entire application
+  should be done by a page-wide Tidy)
+- Various documentation updates
+- Fixed parse error in configuration documentation script
+- Fixed fatal error in benchmark scripts, slightly augmented
+- As far as possible, whitespace is preserved in-between table children
+- Sample test-settings.php file included
+
+1.1.0, released 2006-09-16
+! Directive documentation generation using XSLT
+! XHTML can now be turned off, output becomes <br>
+- Made URI validator more forgiving: will ignore leading and trailing
+  quotes, apostrophes and less than or greater than signs.
+- Enforce alphanumeric namespace and directive names for configuration.
+- Table child definition made more flexible, will fix up poorly ordered elements
+. Renamed ConfigDef to ConfigSchema
+
+1.0.1, released 2006-09-04
+- Fixed slight bug in DOMLex attribute parsing
+- Fixed rejection of case-insensitive configuration values when there is a
+  set of allowed values.  This manifested in %Core.Encoding.
+- Fixed rejection of inline style declarations that had lots of extra
+  space in them.  This manifested in TinyMCE.
+
+1.0.0, released 2006-09-01
+! Shorthand CSS properties implemented: font, border, background, list-style
+! Basic color keywords translated into hexadecimal values
+! Table CSS properties implemented
+! Support for charsets other than UTF-8 (defined by iconv)
+! Malformed UTF-8 and non-SGML character detection and cleaning implemented
+- Fixed broken numeric entity conversion
+- API documentation completed
+. (HTML|CSS)Definition de-singleton-ized
+
+1.0.0beta, released 2006-08-16
+! First public release, most functionality implemented. Notable omissions are:
+  + Shorthand CSS properties
+  + Table CSS properties
+  + Deprecated attribute transformations
+
+    vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.auto.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.auto.php
new file mode 100755
index 0000000000..1960c399f8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.auto.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * This is a stub include that automatically configures the include path.
+ */
+
+set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
+require_once 'HTMLPurifier/Bootstrap.php';
+require_once 'HTMLPurifier.autoload.php';
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.autoload.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.autoload.php
new file mode 100755
index 0000000000..8d40176406
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.autoload.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Convenience file that registers autoload handler for HTML Purifier.
+ */
+
+if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
+    // We need unregister for our pre-registering functionality
+    HTMLPurifier_Bootstrap::registerAutoload();
+    if (function_exists('__autoload')) {
+        // Be polite and ensure that userland autoload gets retained
+        spl_autoload_register('__autoload');
+    }
+} elseif (!function_exists('__autoload')) {
+    function __autoload($class) {
+        return HTMLPurifier_Bootstrap::autoload($class);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.func.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.func.php
new file mode 100755
index 0000000000..56a55b2fed
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.func.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Defines a function wrapper for HTML Purifier for quick use.
+ * @note ''HTMLPurifier()'' is NOT the same as ''new HTMLPurifier()''
+ */
+
+/**
+ * Purify HTML.
+ * @param $html String HTML to purify
+ * @param $config Configuration to use, can be any value accepted by
+ *        HTMLPurifier_Config::create()
+ */
+function HTMLPurifier($html, $config = null) {
+    static $purifier = false;
+    if (!$purifier) {
+        $purifier = new HTMLPurifier();
+    }
+    return $purifier->purify($html, $config);
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.includes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.includes.php
new file mode 100755
index 0000000000..944f0893b9
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.includes.php
@@ -0,0 +1,206 @@
+<?php
+
+/**
+ * @file
+ * This file was auto-generated by generate-includes.php and includes all of
+ * the core files required by HTML Purifier. Use this if performance is a
+ * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
+ * FILE, changes will be overwritten the next time the script is run.
+ *
+ * @version 3.3.0
+ *
+ * @warning
+ *      You must *not* include any other HTML Purifier files before this file,
+ *      because 'require' not 'require_once' is used.
+ *
+ * @warning
+ *      This file requires that the include path contains the HTML Purifier
+ *      library directory; this is not auto-set.
+ */
+
+require 'HTMLPurifier.php';
+require 'HTMLPurifier/AttrCollections.php';
+require 'HTMLPurifier/AttrDef.php';
+require 'HTMLPurifier/AttrTransform.php';
+require 'HTMLPurifier/AttrTypes.php';
+require 'HTMLPurifier/AttrValidator.php';
+require 'HTMLPurifier/Bootstrap.php';
+require 'HTMLPurifier/Definition.php';
+require 'HTMLPurifier/CSSDefinition.php';
+require 'HTMLPurifier/ChildDef.php';
+require 'HTMLPurifier/Config.php';
+require 'HTMLPurifier/ConfigSchema.php';
+require 'HTMLPurifier/ContentSets.php';
+require 'HTMLPurifier/Context.php';
+require 'HTMLPurifier/DefinitionCache.php';
+require 'HTMLPurifier/DefinitionCacheFactory.php';
+require 'HTMLPurifier/Doctype.php';
+require 'HTMLPurifier/DoctypeRegistry.php';
+require 'HTMLPurifier/ElementDef.php';
+require 'HTMLPurifier/Encoder.php';
+require 'HTMLPurifier/EntityLookup.php';
+require 'HTMLPurifier/EntityParser.php';
+require 'HTMLPurifier/ErrorCollector.php';
+require 'HTMLPurifier/ErrorStruct.php';
+require 'HTMLPurifier/Exception.php';
+require 'HTMLPurifier/Filter.php';
+require 'HTMLPurifier/Generator.php';
+require 'HTMLPurifier/HTMLDefinition.php';
+require 'HTMLPurifier/HTMLModule.php';
+require 'HTMLPurifier/HTMLModuleManager.php';
+require 'HTMLPurifier/IDAccumulator.php';
+require 'HTMLPurifier/Injector.php';
+require 'HTMLPurifier/Language.php';
+require 'HTMLPurifier/LanguageFactory.php';
+require 'HTMLPurifier/Length.php';
+require 'HTMLPurifier/Lexer.php';
+require 'HTMLPurifier/PercentEncoder.php';
+require 'HTMLPurifier/PropertyList.php';
+require 'HTMLPurifier/PropertyListIterator.php';
+require 'HTMLPurifier/Strategy.php';
+require 'HTMLPurifier/StringHash.php';
+require 'HTMLPurifier/StringHashParser.php';
+require 'HTMLPurifier/TagTransform.php';
+require 'HTMLPurifier/Token.php';
+require 'HTMLPurifier/TokenFactory.php';
+require 'HTMLPurifier/URI.php';
+require 'HTMLPurifier/URIDefinition.php';
+require 'HTMLPurifier/URIFilter.php';
+require 'HTMLPurifier/URIParser.php';
+require 'HTMLPurifier/URIScheme.php';
+require 'HTMLPurifier/URISchemeRegistry.php';
+require 'HTMLPurifier/UnitConverter.php';
+require 'HTMLPurifier/VarParser.php';
+require 'HTMLPurifier/VarParserException.php';
+require 'HTMLPurifier/AttrDef/CSS.php';
+require 'HTMLPurifier/AttrDef/Enum.php';
+require 'HTMLPurifier/AttrDef/Integer.php';
+require 'HTMLPurifier/AttrDef/Lang.php';
+require 'HTMLPurifier/AttrDef/Switch.php';
+require 'HTMLPurifier/AttrDef/Text.php';
+require 'HTMLPurifier/AttrDef/URI.php';
+require 'HTMLPurifier/AttrDef/CSS/Number.php';
+require 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
+require 'HTMLPurifier/AttrDef/CSS/Background.php';
+require 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
+require 'HTMLPurifier/AttrDef/CSS/Border.php';
+require 'HTMLPurifier/AttrDef/CSS/Color.php';
+require 'HTMLPurifier/AttrDef/CSS/Composite.php';
+require 'HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
+require 'HTMLPurifier/AttrDef/CSS/Filter.php';
+require 'HTMLPurifier/AttrDef/CSS/Font.php';
+require 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
+require 'HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
+require 'HTMLPurifier/AttrDef/CSS/Length.php';
+require 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
+require 'HTMLPurifier/AttrDef/CSS/Multiple.php';
+require 'HTMLPurifier/AttrDef/CSS/Percentage.php';
+require 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
+require 'HTMLPurifier/AttrDef/CSS/URI.php';
+require 'HTMLPurifier/AttrDef/HTML/Bool.php';
+require 'HTMLPurifier/AttrDef/HTML/Color.php';
+require 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
+require 'HTMLPurifier/AttrDef/HTML/ID.php';
+require 'HTMLPurifier/AttrDef/HTML/Pixels.php';
+require 'HTMLPurifier/AttrDef/HTML/Length.php';
+require 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
+require 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
+require 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
+require 'HTMLPurifier/AttrDef/URI/Email.php';
+require 'HTMLPurifier/AttrDef/URI/Host.php';
+require 'HTMLPurifier/AttrDef/URI/IPv4.php';
+require 'HTMLPurifier/AttrDef/URI/IPv6.php';
+require 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
+require 'HTMLPurifier/AttrTransform/Background.php';
+require 'HTMLPurifier/AttrTransform/BdoDir.php';
+require 'HTMLPurifier/AttrTransform/BgColor.php';
+require 'HTMLPurifier/AttrTransform/BoolToCSS.php';
+require 'HTMLPurifier/AttrTransform/Border.php';
+require 'HTMLPurifier/AttrTransform/EnumToCSS.php';
+require 'HTMLPurifier/AttrTransform/ImgRequired.php';
+require 'HTMLPurifier/AttrTransform/ImgSpace.php';
+require 'HTMLPurifier/AttrTransform/Input.php';
+require 'HTMLPurifier/AttrTransform/Lang.php';
+require 'HTMLPurifier/AttrTransform/Length.php';
+require 'HTMLPurifier/AttrTransform/Name.php';
+require 'HTMLPurifier/AttrTransform/SafeEmbed.php';
+require 'HTMLPurifier/AttrTransform/SafeObject.php';
+require 'HTMLPurifier/AttrTransform/SafeParam.php';
+require 'HTMLPurifier/AttrTransform/ScriptRequired.php';
+require 'HTMLPurifier/AttrTransform/Textarea.php';
+require 'HTMLPurifier/ChildDef/Chameleon.php';
+require 'HTMLPurifier/ChildDef/Custom.php';
+require 'HTMLPurifier/ChildDef/Empty.php';
+require 'HTMLPurifier/ChildDef/Required.php';
+require 'HTMLPurifier/ChildDef/Optional.php';
+require 'HTMLPurifier/ChildDef/StrictBlockquote.php';
+require 'HTMLPurifier/ChildDef/Table.php';
+require 'HTMLPurifier/DefinitionCache/Decorator.php';
+require 'HTMLPurifier/DefinitionCache/Null.php';
+require 'HTMLPurifier/DefinitionCache/Serializer.php';
+require 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
+require 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
+require 'HTMLPurifier/HTMLModule/Bdo.php';
+require 'HTMLPurifier/HTMLModule/CommonAttributes.php';
+require 'HTMLPurifier/HTMLModule/Edit.php';
+require 'HTMLPurifier/HTMLModule/Forms.php';
+require 'HTMLPurifier/HTMLModule/Hypertext.php';
+require 'HTMLPurifier/HTMLModule/Image.php';
+require 'HTMLPurifier/HTMLModule/Legacy.php';
+require 'HTMLPurifier/HTMLModule/List.php';
+require 'HTMLPurifier/HTMLModule/Name.php';
+require 'HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
+require 'HTMLPurifier/HTMLModule/Object.php';
+require 'HTMLPurifier/HTMLModule/Presentation.php';
+require 'HTMLPurifier/HTMLModule/Proprietary.php';
+require 'HTMLPurifier/HTMLModule/Ruby.php';
+require 'HTMLPurifier/HTMLModule/SafeEmbed.php';
+require 'HTMLPurifier/HTMLModule/SafeObject.php';
+require 'HTMLPurifier/HTMLModule/Scripting.php';
+require 'HTMLPurifier/HTMLModule/StyleAttribute.php';
+require 'HTMLPurifier/HTMLModule/Tables.php';
+require 'HTMLPurifier/HTMLModule/Target.php';
+require 'HTMLPurifier/HTMLModule/Text.php';
+require 'HTMLPurifier/HTMLModule/Tidy.php';
+require 'HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Name.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
+require 'HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Strict.php';
+require 'HTMLPurifier/HTMLModule/Tidy/Transitional.php';
+require 'HTMLPurifier/HTMLModule/Tidy/XHTML.php';
+require 'HTMLPurifier/Injector/AutoParagraph.php';
+require 'HTMLPurifier/Injector/DisplayLinkURI.php';
+require 'HTMLPurifier/Injector/Linkify.php';
+require 'HTMLPurifier/Injector/PurifierLinkify.php';
+require 'HTMLPurifier/Injector/RemoveEmpty.php';
+require 'HTMLPurifier/Injector/SafeObject.php';
+require 'HTMLPurifier/Lexer/DOMLex.php';
+require 'HTMLPurifier/Lexer/DirectLex.php';
+require 'HTMLPurifier/Strategy/Composite.php';
+require 'HTMLPurifier/Strategy/Core.php';
+require 'HTMLPurifier/Strategy/FixNesting.php';
+require 'HTMLPurifier/Strategy/MakeWellFormed.php';
+require 'HTMLPurifier/Strategy/RemoveForeignElements.php';
+require 'HTMLPurifier/Strategy/ValidateAttributes.php';
+require 'HTMLPurifier/TagTransform/Font.php';
+require 'HTMLPurifier/TagTransform/Simple.php';
+require 'HTMLPurifier/Token/Comment.php';
+require 'HTMLPurifier/Token/Tag.php';
+require 'HTMLPurifier/Token/Empty.php';
+require 'HTMLPurifier/Token/End.php';
+require 'HTMLPurifier/Token/Start.php';
+require 'HTMLPurifier/Token/Text.php';
+require 'HTMLPurifier/URIFilter/DisableExternal.php';
+require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
+require 'HTMLPurifier/URIFilter/HostBlacklist.php';
+require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
+require 'HTMLPurifier/URIFilter/Munge.php';
+require 'HTMLPurifier/URIScheme/ftp.php';
+require 'HTMLPurifier/URIScheme/http.php';
+require 'HTMLPurifier/URIScheme/https.php';
+require 'HTMLPurifier/URIScheme/mailto.php';
+require 'HTMLPurifier/URIScheme/news.php';
+require 'HTMLPurifier/URIScheme/nntp.php';
+require 'HTMLPurifier/VarParser/Flexible.php';
+require 'HTMLPurifier/VarParser/Native.php';
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.kses.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.kses.php
new file mode 100755
index 0000000000..24bef74a57
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.kses.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Emulation layer for code that used kses(), substituting in HTML Purifier.
+ */
+
+require_once dirname(__FILE__) . '/HTMLPurifier.auto.php';
+
+function kses($string, $allowed_html, $allowed_protocols = null) {
+    $config = HTMLPurifier_Config::createDefault();
+    $allowed_elements = array();
+    $allowed_attributes = array();
+    foreach ($allowed_html as $element => $attributes) {
+        $allowed_elements[$element] = true;
+        foreach ($attributes as $attribute => $x) {
+            $allowed_attributes["$element.$attribute"] = true;
+        }
+    }
+    $config->set('HTML', 'AllowedElements', $allowed_elements);
+    $config->set('HTML', 'AllowedAttributes', $allowed_attributes);
+    $allowed_schemes = array();
+    if ($allowed_protocols !== null) {
+        $config->set('URI', 'AllowedSchemes', $allowed_protocols);
+    }
+    $purifier = new HTMLPurifier($config);
+    return $purifier->purify($string);
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.path.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.path.php
new file mode 100755
index 0000000000..39b1b65319
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.path.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @file
+ * Convenience stub file that adds HTML Purifier's library file to the path
+ * without any other side-effects.
+ */
+
+set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.php
new file mode 100755
index 0000000000..4b1eddecb5
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.php
@@ -0,0 +1,236 @@
+<?php
+
+/*! @mainpage
+ *
+ * HTML Purifier is an HTML filter that will take an arbitrary snippet of
+ * HTML and rigorously test, validate and filter it into a version that
+ * is safe for output onto webpages. It achieves this by:
+ *
+ *  -# Lexing (parsing into tokens) the document,
+ *  -# Executing various strategies on the tokens:
+ *      -# Removing all elements not in the whitelist,
+ *      -# Making the tokens well-formed,
+ *      -# Fixing the nesting of the nodes, and
+ *      -# Validating attributes of the nodes; and
+ *  -# Generating HTML from the purified tokens.
+ *
+ * However, most users will only need to interface with the HTMLPurifier
+ * and HTMLPurifier_Config.
+ */
+
+/*
+    HTML Purifier 3.3.0 - Standards Compliant HTML Filtering
+    Copyright (C) 2006-2008 Edward Z. Yang
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/**
+ * Facade that coordinates HTML Purifier's subsystems in order to purify HTML.
+ *
+ * @note There are several points in which configuration can be specified
+ *       for HTML Purifier.  The precedence of these (from lowest to
+ *       highest) is as follows:
+ *          -# Instance: new HTMLPurifier($config)
+ *          -# Invocation: purify($html, $config)
+ *       These configurations are entirely independent of each other and
+ *       are *not* merged (this behavior may change in the future).
+ *
+ * @todo We need an easier way to inject strategies using the configuration
+ *       object.
+ */
+class HTMLPurifier
+{
+
+    /** Version of HTML Purifier */
+    public $version = '3.3.0';
+
+    /** Constant with version of HTML Purifier */
+    const VERSION = '3.3.0';
+
+    /** Global configuration object */
+    public $config;
+
+    /** Array of extra HTMLPurifier_Filter objects to run on HTML, for backwards compatibility */
+    private $filters = array();
+
+    /** Single instance of HTML Purifier */
+    private static $instance;
+
+    protected $strategy, $generator;
+
+    /**
+     * Resultant HTMLPurifier_Context of last run purification. Is an array
+     * of contexts if the last called method was purifyArray().
+     */
+    public $context;
+
+    /**
+     * Initializes the purifier.
+     * @param $config Optional HTMLPurifier_Config object for all instances of
+     *                the purifier, if omitted, a default configuration is
+     *                supplied (which can be overridden on a per-use basis).
+     *                The parameter can also be any type that
+     *                HTMLPurifier_Config::create() supports.
+     */
+    public function __construct($config = null) {
+
+        $this->config = HTMLPurifier_Config::create($config);
+
+        $this->strategy     = new HTMLPurifier_Strategy_Core();
+
+    }
+
+    /**
+     * Adds a filter to process the output. First come first serve
+     * @param $filter HTMLPurifier_Filter object
+     */
+    public function addFilter($filter) {
+        trigger_error('HTMLPurifier->addFilter() is deprecated, use configuration directives in the Filter namespace or Filter.Custom', E_USER_WARNING);
+        $this->filters[] = $filter;
+    }
+
+    /**
+     * Filters an HTML snippet/document to be XSS-free and standards-compliant.
+     *
+     * @param $html String of HTML to purify
+     * @param $config HTMLPurifier_Config object for this operation, if omitted,
+     *                defaults to the config object specified during this
+     *                object's construction. The parameter can also be any type
+     *                that HTMLPurifier_Config::create() supports.
+     * @return Purified HTML
+     */
+    public function purify($html, $config = null) {
+
+        // :TODO: make the config merge in, instead of replace
+        $config = $config ? HTMLPurifier_Config::create($config) : $this->config;
+
+        // implementation is partially environment dependant, partially
+        // configuration dependant
+        $lexer = HTMLPurifier_Lexer::create($config);
+
+        $context = new HTMLPurifier_Context();
+
+        // setup HTML generator
+        $this->generator = new HTMLPurifier_Generator($config, $context);
+        $context->register('Generator', $this->generator);
+
+        // set up global context variables
+        if ($config->get('Core', 'CollectErrors')) {
+            // may get moved out if other facilities use it
+            $language_factory = HTMLPurifier_LanguageFactory::instance();
+            $language = $language_factory->create($config, $context);
+            $context->register('Locale', $language);
+
+            $error_collector = new HTMLPurifier_ErrorCollector($context);
+            $context->register('ErrorCollector', $error_collector);
+        }
+
+        // setup id_accumulator context, necessary due to the fact that
+        // AttrValidator can be called from many places
+        $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
+        $context->register('IDAccumulator', $id_accumulator);
+
+        $html = HTMLPurifier_Encoder::convertToUTF8($html, $config, $context);
+
+        // setup filters
+        $filter_flags = $config->getBatch('Filter');
+        $custom_filters = $filter_flags['Custom'];
+        unset($filter_flags['Custom']);
+        $filters = array();
+        foreach ($filter_flags as $filter => $flag) {
+            if (!$flag) continue;
+            $class = "HTMLPurifier_Filter_$filter";
+            $filters[] = new $class;
+        }
+        foreach ($custom_filters as $filter) {
+            // maybe "HTMLPurifier_Filter_$filter", but be consistent with AutoFormat
+            $filters[] = $filter;
+        }
+        $filters = array_merge($filters, $this->filters);
+        // maybe prepare(), but later
+
+        for ($i = 0, $filter_size = count($filters); $i < $filter_size; $i++) {
+            $html = $filters[$i]->preFilter($html, $config, $context);
+        }
+
+        // purified HTML
+        $html =
+            $this->generator->generateFromTokens(
+                // list of tokens
+                $this->strategy->execute(
+                    // list of un-purified tokens
+                    $lexer->tokenizeHTML(
+                        // un-purified HTML
+                        $html, $config, $context
+                    ),
+                    $config, $context
+                )
+            );
+
+        for ($i = $filter_size - 1; $i >= 0; $i--) {
+            $html = $filters[$i]->postFilter($html, $config, $context);
+        }
+
+        $html = HTMLPurifier_Encoder::convertFromUTF8($html, $config, $context);
+        $this->context =& $context;
+        return $html;
+    }
+
+    /**
+     * Filters an array of HTML snippets
+     * @param $config Optional HTMLPurifier_Config object for this operation.
+     *                See HTMLPurifier::purify() for more details.
+     * @return Array of purified HTML
+     */
+    public function purifyArray($array_of_html, $config = null) {
+        $context_array = array();
+        foreach ($array_of_html as $key => $html) {
+            $array_of_html[$key] = $this->purify($html, $config);
+            $context_array[$key] = $this->context;
+        }
+        $this->context = $context_array;
+        return $array_of_html;
+    }
+
+    /**
+     * Singleton for enforcing just one HTML Purifier in your system
+     * @param $prototype Optional prototype HTMLPurifier instance to
+     *                   overload singleton with, or HTMLPurifier_Config
+     *                   instance to configure the generated version with.
+     */
+    public static function instance($prototype = null) {
+        if (!self::$instance || $prototype) {
+            if ($prototype instanceof HTMLPurifier) {
+                self::$instance = $prototype;
+            } elseif ($prototype) {
+                self::$instance = new HTMLPurifier($prototype);
+            } else {
+                self::$instance = new HTMLPurifier();
+            }
+        }
+        return self::$instance;
+    }
+
+    /**
+     * @note Backwards compatibility, see instance()
+     */
+    public static function getInstance($prototype = null) {
+        return HTMLPurifier::instance($prototype);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.safe-includes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.safe-includes.php
new file mode 100755
index 0000000000..7d393036a8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier.safe-includes.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * @file
+ * This file was auto-generated by generate-includes.php and includes all of
+ * the core files required by HTML Purifier. This is a convenience stub that
+ * includes all files using dirname(__FILE__) and require_once. PLEASE DO NOT
+ * EDIT THIS FILE, changes will be overwritten the next time the script is run.
+ *
+ * Changes to include_path are not necessary.
+ */
+
+$__dir = dirname(__FILE__);
+
+require_once $__dir . '/HTMLPurifier.php';
+require_once $__dir . '/HTMLPurifier/AttrCollections.php';
+require_once $__dir . '/HTMLPurifier/AttrDef.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform.php';
+require_once $__dir . '/HTMLPurifier/AttrTypes.php';
+require_once $__dir . '/HTMLPurifier/AttrValidator.php';
+require_once $__dir . '/HTMLPurifier/Bootstrap.php';
+require_once $__dir . '/HTMLPurifier/Definition.php';
+require_once $__dir . '/HTMLPurifier/CSSDefinition.php';
+require_once $__dir . '/HTMLPurifier/ChildDef.php';
+require_once $__dir . '/HTMLPurifier/Config.php';
+require_once $__dir . '/HTMLPurifier/ConfigSchema.php';
+require_once $__dir . '/HTMLPurifier/ContentSets.php';
+require_once $__dir . '/HTMLPurifier/Context.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
+require_once $__dir . '/HTMLPurifier/Doctype.php';
+require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
+require_once $__dir . '/HTMLPurifier/ElementDef.php';
+require_once $__dir . '/HTMLPurifier/Encoder.php';
+require_once $__dir . '/HTMLPurifier/EntityLookup.php';
+require_once $__dir . '/HTMLPurifier/EntityParser.php';
+require_once $__dir . '/HTMLPurifier/ErrorCollector.php';
+require_once $__dir . '/HTMLPurifier/ErrorStruct.php';
+require_once $__dir . '/HTMLPurifier/Exception.php';
+require_once $__dir . '/HTMLPurifier/Filter.php';
+require_once $__dir . '/HTMLPurifier/Generator.php';
+require_once $__dir . '/HTMLPurifier/HTMLDefinition.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule.php';
+require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php';
+require_once $__dir . '/HTMLPurifier/IDAccumulator.php';
+require_once $__dir . '/HTMLPurifier/Injector.php';
+require_once $__dir . '/HTMLPurifier/Language.php';
+require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
+require_once $__dir . '/HTMLPurifier/Length.php';
+require_once $__dir . '/HTMLPurifier/Lexer.php';
+require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
+require_once $__dir . '/HTMLPurifier/PropertyList.php';
+require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
+require_once $__dir . '/HTMLPurifier/Strategy.php';
+require_once $__dir . '/HTMLPurifier/StringHash.php';
+require_once $__dir . '/HTMLPurifier/StringHashParser.php';
+require_once $__dir . '/HTMLPurifier/TagTransform.php';
+require_once $__dir . '/HTMLPurifier/Token.php';
+require_once $__dir . '/HTMLPurifier/TokenFactory.php';
+require_once $__dir . '/HTMLPurifier/URI.php';
+require_once $__dir . '/HTMLPurifier/URIDefinition.php';
+require_once $__dir . '/HTMLPurifier/URIFilter.php';
+require_once $__dir . '/HTMLPurifier/URIParser.php';
+require_once $__dir . '/HTMLPurifier/URIScheme.php';
+require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
+require_once $__dir . '/HTMLPurifier/UnitConverter.php';
+require_once $__dir . '/HTMLPurifier/VarParser.php';
+require_once $__dir . '/HTMLPurifier/VarParserException.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/Text.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php';
+require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Required.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php';
+require_once $__dir . '/HTMLPurifier/ChildDef/Table.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
+require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/List.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
+require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
+require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php';
+require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
+require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
+require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
+require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
+require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
+require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
+require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
+require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
+require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
+require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
+require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php';
+require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php';
+require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php';
+require_once $__dir . '/HTMLPurifier/TagTransform/Font.php';
+require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php';
+require_once $__dir . '/HTMLPurifier/Token/Comment.php';
+require_once $__dir . '/HTMLPurifier/Token/Tag.php';
+require_once $__dir . '/HTMLPurifier/Token/Empty.php';
+require_once $__dir . '/HTMLPurifier/Token/End.php';
+require_once $__dir . '/HTMLPurifier/Token/Start.php';
+require_once $__dir . '/HTMLPurifier/Token/Text.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/news.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php';
+require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php';
+require_once $__dir . '/HTMLPurifier/VarParser/Native.php';
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrCollections.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrCollections.php
new file mode 100755
index 0000000000..555b86d042
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrCollections.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Defines common attribute collections that modules reference
+ */
+
+class HTMLPurifier_AttrCollections
+{
+
+    /**
+     * Associative array of attribute collections, indexed by name
+     */
+    public $info = array();
+
+    /**
+     * Performs all expansions on internal data for use by other inclusions
+     * It also collects all attribute collection extensions from
+     * modules
+     * @param $attr_types HTMLPurifier_AttrTypes instance
+     * @param $modules Hash array of HTMLPurifier_HTMLModule members
+     */
+    public function __construct($attr_types, $modules) {
+        // load extensions from the modules
+        foreach ($modules as $module) {
+            foreach ($module->attr_collections as $coll_i => $coll) {
+                if (!isset($this->info[$coll_i])) {
+                    $this->info[$coll_i] = array();
+                }
+                foreach ($coll as $attr_i => $attr) {
+                    if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
+                        // merge in includes
+                        $this->info[$coll_i][$attr_i] = array_merge(
+                            $this->info[$coll_i][$attr_i], $attr);
+                        continue;
+                    }
+                    $this->info[$coll_i][$attr_i] = $attr;
+                }
+            }
+        }
+        // perform internal expansions and inclusions
+        foreach ($this->info as $name => $attr) {
+            // merge attribute collections that include others
+            $this->performInclusions($this->info[$name]);
+            // replace string identifiers with actual attribute objects
+            $this->expandIdentifiers($this->info[$name], $attr_types);
+        }
+    }
+
+    /**
+     * Takes a reference to an attribute associative array and performs
+     * all inclusions specified by the zero index.
+     * @param &$attr Reference to attribute array
+     */
+    public function performInclusions(&$attr) {
+        if (!isset($attr[0])) return;
+        $merge = $attr[0];
+        $seen  = array(); // recursion guard
+        // loop through all the inclusions
+        for ($i = 0; isset($merge[$i]); $i++) {
+            if (isset($seen[$merge[$i]])) continue;
+            $seen[$merge[$i]] = true;
+            // foreach attribute of the inclusion, copy it over
+            if (!isset($this->info[$merge[$i]])) continue;
+            foreach ($this->info[$merge[$i]] as $key => $value) {
+                if (isset($attr[$key])) continue; // also catches more inclusions
+                $attr[$key] = $value;
+            }
+            if (isset($this->info[$merge[$i]][0])) {
+                // recursion
+                $merge = array_merge($merge, $this->info[$merge[$i]][0]);
+            }
+        }
+        unset($attr[0]);
+    }
+
+    /**
+     * Expands all string identifiers in an attribute array by replacing
+     * them with the appropriate values inside HTMLPurifier_AttrTypes
+     * @param &$attr Reference to attribute array
+     * @param $attr_types HTMLPurifier_AttrTypes instance
+     */
+    public function expandIdentifiers(&$attr, $attr_types) {
+
+        // because foreach will process new elements we add, make sure we
+        // skip duplicates
+        $processed = array();
+
+        foreach ($attr as $def_i => $def) {
+            // skip inclusions
+            if ($def_i === 0) continue;
+
+            if (isset($processed[$def_i])) continue;
+
+            // determine whether or not attribute is required
+            if ($required = (strpos($def_i, '*') !== false)) {
+                // rename the definition
+                unset($attr[$def_i]);
+                $def_i = trim($def_i, '*');
+                $attr[$def_i] = $def;
+            }
+
+            $processed[$def_i] = true;
+
+            // if we've already got a literal object, move on
+            if (is_object($def)) {
+                // preserve previous required
+                $attr[$def_i]->required = ($required || $attr[$def_i]->required);
+                continue;
+            }
+
+            if ($def === false) {
+                unset($attr[$def_i]);
+                continue;
+            }
+
+            if ($t = $attr_types->get($def)) {
+                $attr[$def_i] = $t;
+                $attr[$def_i]->required = $required;
+            } else {
+                unset($attr[$def_i]);
+            }
+        }
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef.php
new file mode 100755
index 0000000000..d32fa62d6a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Base class for all validating attribute definitions.
+ *
+ * This family of classes forms the core for not only HTML attribute validation,
+ * but also any sort of string that needs to be validated or cleaned (which
+ * means CSS properties and composite definitions are defined here too).
+ * Besides defining (through code) what precisely makes the string valid,
+ * subclasses are also responsible for cleaning the code if possible.
+ */
+
+abstract class HTMLPurifier_AttrDef
+{
+
+    /**
+     * Tells us whether or not an HTML attribute is minimized. Has no
+     * meaning in other contexts.
+     */
+    public $minimized = false;
+
+    /**
+     * Tells us whether or not an HTML attribute is required. Has no
+     * meaning in other contexts
+     */
+    public $required = false;
+
+    /**
+     * Validates and cleans passed string according to a definition.
+     *
+     * @param $string String to be validated and cleaned.
+     * @param $config Mandatory HTMLPurifier_Config object.
+     * @param $context Mandatory HTMLPurifier_AttrContext object.
+     */
+    abstract public function validate($string, $config, $context);
+
+    /**
+     * Convenience method that parses a string as if it were CDATA.
+     *
+     * This method process a string in the manner specified at
+     * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
+     * leading and trailing whitespace, ignoring line feeds, and replacing
+     * carriage returns and tabs with spaces.  While most useful for HTML
+     * attributes specified as CDATA, it can also be applied to most CSS
+     * values.
+     *
+     * @note This method is not entirely standards compliant, as trim() removes
+     *       more types of whitespace than specified in the spec. In practice,
+     *       this is rarely a problem, as those extra characters usually have
+     *       already been removed by HTMLPurifier_Encoder.
+     *
+     * @warning This processing is inconsistent with XML's whitespace handling
+     *          as specified by section 3.3.3 and referenced XHTML 1.0 section
+     *          4.7.  However, note that we are NOT necessarily
+     *          parsing XML, thus, this behavior may still be correct. We
+     *          assume that newlines have been normalized.
+     */
+    public function parseCDATA($string) {
+        $string = trim($string);
+        $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
+        return $string;
+    }
+
+    /**
+     * Factory method for creating this class from a string.
+     * @param $string String construction info
+     * @return Created AttrDef object corresponding to $string
+     */
+    public function make($string) {
+        // default implementation, return a flyweight of this object.
+        // If $string has an effect on the returned object (i.e. you
+        // need to overload this method), it is best
+        // to clone or instantiate new copies. (Instantiation is safer.)
+        return $this;
+    }
+
+    /**
+     * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
+     * properly. THIS IS A HACK!
+     */
+    protected function mungeRgb($string) {
+        return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
new file mode 100755
index 0000000000..953e706755
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Validates the HTML attribute style, otherwise known as CSS.
+ * @note We don't implement the whole CSS specification, so it might be
+ *       difficult to reuse this component in the context of validating
+ *       actual stylesheet declarations.
+ * @note If we were really serious about validating the CSS, we would
+ *       tokenize the styles and then parse the tokens. Obviously, we
+ *       are not doing that. Doing that could seriously harm performance,
+ *       but would make these components a lot more viable for a CSS
+ *       filtering solution.
+ */
+class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
+{
+
+    public function validate($css, $config, $context) {
+
+        $css = $this->parseCDATA($css);
+
+        $definition = $config->getCSSDefinition();
+
+        // we're going to break the spec and explode by semicolons.
+        // This is because semicolon rarely appears in escaped form
+        // Doing this is generally flaky but fast
+        // IT MIGHT APPEAR IN URIs, see HTMLPurifier_AttrDef_CSSURI
+        // for details
+
+        $declarations = explode(';', $css);
+        $propvalues = array();
+
+        /**
+         * Name of the current CSS property being validated.
+         */
+        $property = false;
+        $context->register('CurrentCSSProperty', $property);
+
+        foreach ($declarations as $declaration) {
+            if (!$declaration) continue;
+            if (!strpos($declaration, ':')) continue;
+            list($property, $value) = explode(':', $declaration, 2);
+            $property = trim($property);
+            $value    = trim($value);
+            $ok = false;
+            do {
+                if (isset($definition->info[$property])) {
+                    $ok = true;
+                    break;
+                }
+                if (ctype_lower($property)) break;
+                $property = strtolower($property);
+                if (isset($definition->info[$property])) {
+                    $ok = true;
+                    break;
+                }
+            } while(0);
+            if (!$ok) continue;
+            // inefficient call, since the validator will do this again
+            if (strtolower(trim($value)) !== 'inherit') {
+                // inherit works for everything (but only on the base property)
+                $result = $definition->info[$property]->validate(
+                    $value, $config, $context );
+            } else {
+                $result = 'inherit';
+            }
+            if ($result === false) continue;
+            $propvalues[$property] = $result;
+        }
+
+        $context->destroy('CurrentCSSProperty');
+
+        // procedure does not write the new CSS simultaneously, so it's
+        // slightly inefficient, but it's the only way of getting rid of
+        // duplicates. Perhaps config to optimize it, but not now.
+
+        $new_declarations = '';
+        foreach ($propvalues as $prop => $value) {
+            $new_declarations .= "$prop:$value;";
+        }
+
+        return $new_declarations ? $new_declarations : false;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
new file mode 100755
index 0000000000..292c040d4b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
@@ -0,0 +1,21 @@
+<?php
+
+class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
+{
+
+    public function __construct() {
+        parent::__construct(false); // opacity is non-negative, but we will clamp it
+    }
+
+    public function validate($number, $config, $context) {
+        $result = parent::validate($number, $config, $context);
+        if ($result === false) return $result;
+        $float = (float) $result;
+        if ($float < 0.0) $result = '0';
+        if ($float > 1.0) $result = '1';
+        return $result;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
new file mode 100755
index 0000000000..3a3d20cd6a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Validates shorthand CSS property background.
+ * @warning Does not support url tokens that have internal spaces.
+ */
+class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Local copy of component validators.
+     * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
+     */
+    protected $info;
+
+    public function __construct($config) {
+        $def = $config->getCSSDefinition();
+        $this->info['background-color'] = $def->info['background-color'];
+        $this->info['background-image'] = $def->info['background-image'];
+        $this->info['background-repeat'] = $def->info['background-repeat'];
+        $this->info['background-attachment'] = $def->info['background-attachment'];
+        $this->info['background-position'] = $def->info['background-position'];
+    }
+
+    public function validate($string, $config, $context) {
+
+        // regular pre-processing
+        $string = $this->parseCDATA($string);
+        if ($string === '') return false;
+
+        // munge rgb() decl if necessary
+        $string = $this->mungeRgb($string);
+
+        // assumes URI doesn't have spaces in it
+        $bits = explode(' ', strtolower($string)); // bits to process
+
+        $caught = array();
+        $caught['color']    = false;
+        $caught['image']    = false;
+        $caught['repeat']   = false;
+        $caught['attachment'] = false;
+        $caught['position'] = false;
+
+        $i = 0; // number of catches
+        $none = false;
+
+        foreach ($bits as $bit) {
+            if ($bit === '') continue;
+            foreach ($caught as $key => $status) {
+                if ($key != 'position') {
+                    if ($status !== false) continue;
+                    $r = $this->info['background-' . $key]->validate($bit, $config, $context);
+                } else {
+                    $r = $bit;
+                }
+                if ($r === false) continue;
+                if ($key == 'position') {
+                    if ($caught[$key] === false) $caught[$key] = '';
+                    $caught[$key] .= $r . ' ';
+                } else {
+                    $caught[$key] = $r;
+                }
+                $i++;
+                break;
+            }
+        }
+
+        if (!$i) return false;
+        if ($caught['position'] !== false) {
+            $caught['position'] = $this->info['background-position']->
+                validate($caught['position'], $config, $context);
+        }
+
+        $ret = array();
+        foreach ($caught as $value) {
+            if ($value === false) continue;
+            $ret[] = $value;
+        }
+
+        if (empty($ret)) return false;
+        return implode(' ', $ret);
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
new file mode 100755
index 0000000000..35df3985e2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -0,0 +1,126 @@
+<?php
+
+/* W3C says:
+    [ // adjective and number must be in correct order, even if
+      // you could switch them without introducing ambiguity.
+      // some browsers support that syntax
+        [
+            <percentage> | <length> | left | center | right
+        ]
+        [
+            <percentage> | <length> | top | center | bottom
+        ]?
+    ] |
+    [ // this signifies that the vertical and horizontal adjectives
+      // can be arbitrarily ordered, however, there can only be two,
+      // one of each, or none at all
+        [
+            left | center | right
+        ] ||
+        [
+            top | center | bottom
+        ]
+    ]
+    top, left = 0%
+    center, (none) = 50%
+    bottom, right = 100%
+*/
+
+/* QuirksMode says:
+    keyword + length/percentage must be ordered correctly, as per W3C
+
+    Internet Explorer and Opera, however, support arbitrary ordering. We
+    should fix it up.
+
+    Minor issue though, not strictly necessary.
+*/
+
+// control freaks may appreciate the ability to convert these to
+// percentages or something, but it's not necessary
+
+/**
+ * Validates the value of background-position.
+ */
+class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
+{
+
+    protected $length;
+    protected $percentage;
+
+    public function __construct() {
+        $this->length     = new HTMLPurifier_AttrDef_CSS_Length();
+        $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
+    }
+
+    public function validate($string, $config, $context) {
+        $string = $this->parseCDATA($string);
+        $bits = explode(' ', $string);
+
+        $keywords = array();
+        $keywords['h'] = false; // left, right
+        $keywords['v'] = false; // top, bottom
+        $keywords['c'] = false; // center
+        $measures = array();
+
+        $i = 0;
+
+        $lookup = array(
+            'top' => 'v',
+            'bottom' => 'v',
+            'left' => 'h',
+            'right' => 'h',
+            'center' => 'c'
+        );
+
+        foreach ($bits as $bit) {
+            if ($bit === '') continue;
+
+            // test for keyword
+            $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
+            if (isset($lookup[$lbit])) {
+                $status = $lookup[$lbit];
+                $keywords[$status] = $lbit;
+                $i++;
+            }
+
+            // test for length
+            $r = $this->length->validate($bit, $config, $context);
+            if ($r !== false) {
+                $measures[] = $r;
+                $i++;
+            }
+
+            // test for percentage
+            $r = $this->percentage->validate($bit, $config, $context);
+            if ($r !== false) {
+                $measures[] = $r;
+                $i++;
+            }
+
+        }
+
+        if (!$i) return false; // no valid values were caught
+
+
+        $ret = array();
+
+        // first keyword
+        if     ($keywords['h'])     $ret[] = $keywords['h'];
+        elseif (count($measures))   $ret[] = array_shift($measures);
+        elseif ($keywords['c']) {
+            $ret[] = $keywords['c'];
+            $keywords['c'] = false; // prevent re-use: center = center center
+        }
+
+        if     ($keywords['v'])     $ret[] = $keywords['v'];
+        elseif (count($measures))   $ret[] = array_shift($measures);
+        elseif ($keywords['c'])     $ret[] = $keywords['c'];
+
+        if (empty($ret)) return false;
+        return implode(' ', $ret);
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
new file mode 100755
index 0000000000..42a1d1b4ae
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Validates the border property as defined by CSS.
+ */
+class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Local copy of properties this property is shorthand for.
+     */
+    protected $info = array();
+
+    public function __construct($config) {
+        $def = $config->getCSSDefinition();
+        $this->info['border-width'] = $def->info['border-width'];
+        $this->info['border-style'] = $def->info['border-style'];
+        $this->info['border-top-color'] = $def->info['border-top-color'];
+    }
+
+    public function validate($string, $config, $context) {
+        $string = $this->parseCDATA($string);
+        $string = $this->mungeRgb($string);
+        $bits = explode(' ', $string);
+        $done = array(); // segments we've finished
+        $ret = ''; // return value
+        foreach ($bits as $bit) {
+            foreach ($this->info as $propname => $validator) {
+                if (isset($done[$propname])) continue;
+                $r = $validator->validate($bit, $config, $context);
+                if ($r !== false) {
+                    $ret .= $r . ' ';
+                    $done[$propname] = true;
+                    break;
+                }
+            }
+        }
+        return rtrim($ret);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
new file mode 100755
index 0000000000..14c6594b60
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Validates Color as defined by CSS.
+ */
+class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
+{
+
+    public function validate($color, $config, $context) {
+
+        static $colors = null;
+        if ($colors === null) $colors = $config->get('Core', 'ColorKeywords');
+
+        $color = trim($color);
+        if ($color === '') return false;
+
+        $lower = strtolower($color);
+        if (isset($colors[$lower])) return $colors[$lower];
+
+        if (strpos($color, 'rgb(') !== false) {
+            // rgb literal handling
+            $length = strlen($color);
+            if (strpos($color, ')') !== $length - 1) return false;
+            $triad = substr($color, 4, $length - 4 - 1);
+            $parts = explode(',', $triad);
+            if (count($parts) !== 3) return false;
+            $type = false; // to ensure that they're all the same type
+            $new_parts = array();
+            foreach ($parts as $part) {
+                $part = trim($part);
+                if ($part === '') return false;
+                $length = strlen($part);
+                if ($part[$length - 1] === '%') {
+                    // handle percents
+                    if (!$type) {
+                        $type = 'percentage';
+                    } elseif ($type !== 'percentage') {
+                        return false;
+                    }
+                    $num = (float) substr($part, 0, $length - 1);
+                    if ($num < 0) $num = 0;
+                    if ($num > 100) $num = 100;
+                    $new_parts[] = "$num%";
+                } else {
+                    // handle integers
+                    if (!$type) {
+                        $type = 'integer';
+                    } elseif ($type !== 'integer') {
+                        return false;
+                    }
+                    $num = (int) $part;
+                    if ($num < 0) $num = 0;
+                    if ($num > 255) $num = 255;
+                    $new_parts[] = (string) $num;
+                }
+            }
+            $new_triad = implode(',', $new_parts);
+            $color = "rgb($new_triad)";
+        } else {
+            // hexadecimal handling
+            if ($color[0] === '#') {
+                $hex = substr($color, 1);
+            } else {
+                $hex = $color;
+                $color = '#' . $color;
+            }
+            $length = strlen($hex);
+            if ($length !== 3 && $length !== 6) return false;
+            if (!ctype_xdigit($hex)) return false;
+        }
+
+        return $color;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
new file mode 100755
index 0000000000..de1289cba8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Allows multiple validators to attempt to validate attribute.
+ *
+ * Composite is just what it sounds like: a composite of many validators.
+ * This means that multiple HTMLPurifier_AttrDef objects will have a whack
+ * at the string.  If one of them passes, that's what is returned.  This is
+ * especially useful for CSS values, which often are a choice between
+ * an enumerated set of predefined values or a flexible data type.
+ */
+class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * List of HTMLPurifier_AttrDef objects that may process strings
+     * @todo Make protected
+     */
+    public $defs;
+
+    /**
+     * @param $defs List of HTMLPurifier_AttrDef objects
+     */
+    public function __construct($defs) {
+        $this->defs = $defs;
+    }
+
+    public function validate($string, $config, $context) {
+        foreach ($this->defs as $i => $def) {
+            $result = $this->defs[$i]->validate($string, $config, $context);
+            if ($result !== false) return $result;
+        }
+        return false;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
new file mode 100755
index 0000000000..6599c5b2dd
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Decorator which enables CSS properties to be disabled for specific elements.
+ */
+class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
+{
+    public $def, $element;
+
+    /**
+     * @param $def Definition to wrap
+     * @param $element Element to deny
+     */
+    public function __construct($def, $element) {
+        $this->def = $def;
+        $this->element = $element;
+    }
+    /**
+     * Checks if CurrentToken is set and equal to $this->element
+     */
+    public function validate($string, $config, $context) {
+        $token = $context->get('CurrentToken', true);
+        if ($token && $token->name == $this->element) return false;
+        return $this->def->validate($string, $config, $context);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
new file mode 100755
index 0000000000..147894b861
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Microsoft's proprietary filter: CSS property
+ * @note Currently supports the alpha filter. In the future, this will
+ *       probably need an extensible framework
+ */
+class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
+{
+
+    protected $intValidator;
+
+    public function __construct() {
+        $this->intValidator = new HTMLPurifier_AttrDef_Integer();
+    }
+
+    public function validate($value, $config, $context) {
+        $value = $this->parseCDATA($value);
+        if ($value === 'none') return $value;
+        // if we looped this we could support multiple filters
+        $function_length = strcspn($value, '(');
+        $function = trim(substr($value, 0, $function_length));
+        if ($function !== 'alpha' &&
+            $function !== 'Alpha' &&
+            $function !== 'progid:DXImageTransform.Microsoft.Alpha'
+            ) return false;
+        $cursor = $function_length + 1;
+        $parameters_length = strcspn($value, ')', $cursor);
+        $parameters = substr($value, $cursor, $parameters_length);
+        $params = explode(',', $parameters);
+        $ret_params = array();
+        $lookup = array();
+        foreach ($params as $param) {
+            list($key, $value) = explode('=', $param);
+            $key   = trim($key);
+            $value = trim($value);
+            if (isset($lookup[$key])) continue;
+            if ($key !== 'opacity') continue;
+            $value = $this->intValidator->validate($value, $config, $context);
+            if ($value === false) continue;
+            $int = (int) $value;
+            if ($int > 100) $value = '100';
+            if ($int < 0) $value = '0';
+            $ret_params[] = "$key=$value";
+            $lookup[$key] = true;
+        }
+        $ret_parameters = implode(',', $ret_params);
+        $ret_function = "$function($ret_parameters)";
+        return $ret_function;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
new file mode 100755
index 0000000000..699ee0b701
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Validates shorthand CSS property font.
+ */
+class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Local copy of component validators.
+     *
+     * @note If we moved specific CSS property definitions to their own
+     *       classes instead of having them be assembled at run time by
+     *       CSSDefinition, this wouldn't be necessary.  We'd instantiate
+     *       our own copies.
+     */
+    protected $info = array();
+
+    public function __construct($config) {
+        $def = $config->getCSSDefinition();
+        $this->info['font-style']   = $def->info['font-style'];
+        $this->info['font-variant'] = $def->info['font-variant'];
+        $this->info['font-weight']  = $def->info['font-weight'];
+        $this->info['font-size']    = $def->info['font-size'];
+        $this->info['line-height']  = $def->info['line-height'];
+        $this->info['font-family']  = $def->info['font-family'];
+    }
+
+    public function validate($string, $config, $context) {
+
+        static $system_fonts = array(
+            'caption' => true,
+            'icon' => true,
+            'menu' => true,
+            'message-box' => true,
+            'small-caption' => true,
+            'status-bar' => true
+        );
+
+        // regular pre-processing
+        $string = $this->parseCDATA($string);
+        if ($string === '') return false;
+
+        // check if it's one of the keywords
+        $lowercase_string = strtolower($string);
+        if (isset($system_fonts[$lowercase_string])) {
+            return $lowercase_string;
+        }
+
+        $bits = explode(' ', $string); // bits to process
+        $stage = 0; // this indicates what we're looking for
+        $caught = array(); // which stage 0 properties have we caught?
+        $stage_1 = array('font-style', 'font-variant', 'font-weight');
+        $final = ''; // output
+
+        for ($i = 0, $size = count($bits); $i < $size; $i++) {
+            if ($bits[$i] === '') continue;
+            switch ($stage) {
+
+                // attempting to catch font-style, font-variant or font-weight
+                case 0:
+                    foreach ($stage_1 as $validator_name) {
+                        if (isset($caught[$validator_name])) continue;
+                        $r = $this->info[$validator_name]->validate(
+                                                $bits[$i], $config, $context);
+                        if ($r !== false) {
+                            $final .= $r . ' ';
+                            $caught[$validator_name] = true;
+                            break;
+                        }
+                    }
+                    // all three caught, continue on
+                    if (count($caught) >= 3) $stage = 1;
+                    if ($r !== false) break;
+
+                // attempting to catch font-size and perhaps line-height
+                case 1:
+                    $found_slash = false;
+                    if (strpos($bits[$i], '/') !== false) {
+                        list($font_size, $line_height) =
+                                                    explode('/', $bits[$i]);
+                        if ($line_height === '') {
+                            // ooh, there's a space after the slash!
+                            $line_height = false;
+                            $found_slash = true;
+                        }
+                    } else {
+                        $font_size = $bits[$i];
+                        $line_height = false;
+                    }
+                    $r = $this->info['font-size']->validate(
+                                              $font_size, $config, $context);
+                    if ($r !== false) {
+                        $final .= $r;
+                        // attempt to catch line-height
+                        if ($line_height === false) {
+                            // we need to scroll forward
+                            for ($j = $i + 1; $j < $size; $j++) {
+                                if ($bits[$j] === '') continue;
+                                if ($bits[$j] === '/') {
+                                    if ($found_slash) {
+                                        return false;
+                                    } else {
+                                        $found_slash = true;
+                                        continue;
+                                    }
+                                }
+                                $line_height = $bits[$j];
+                                break;
+                            }
+                        } else {
+                            // slash already found
+                            $found_slash = true;
+                            $j = $i;
+                        }
+                        if ($found_slash) {
+                            $i = $j;
+                            $r = $this->info['line-height']->validate(
+                                              $line_height, $config, $context);
+                            if ($r !== false) {
+                                $final .= '/' . $r;
+                            }
+                        }
+                        $final .= ' ';
+                        $stage = 2;
+                        break;
+                    }
+                    return false;
+
+                // attempting to catch font-family
+                case 2:
+                    $font_family =
+                        implode(' ', array_slice($bits, $i, $size - $i));
+                    $r = $this->info['font-family']->validate(
+                                              $font_family, $config, $context);
+                    if ($r !== false) {
+                        $final .= $r . ' ';
+                        // processing completed successfully
+                        return rtrim($final);
+                    }
+                    return false;
+            }
+        }
+        return false;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
new file mode 100755
index 0000000000..705ac893d1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Validates a font family list according to CSS spec
+ * @todo whitelisting allowed fonts would be nice
+ */
+class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
+{
+
+    public function validate($string, $config, $context) {
+        static $generic_names = array(
+            'serif' => true,
+            'sans-serif' => true,
+            'monospace' => true,
+            'fantasy' => true,
+            'cursive' => true
+        );
+
+        // assume that no font names contain commas in them
+        $fonts = explode(',', $string);
+        $final = '';
+        foreach($fonts as $font) {
+            $font = trim($font);
+            if ($font === '') continue;
+            // match a generic name
+            if (isset($generic_names[$font])) {
+                $final .= $font . ', ';
+                continue;
+            }
+            // match a quoted name
+            if ($font[0] === '"' || $font[0] === "'") {
+                $length = strlen($font);
+                if ($length <= 2) continue;
+                $quote = $font[0];
+                if ($font[$length - 1] !== $quote) continue;
+                $font = substr($font, 1, $length - 2);
+
+                $new_font = '';
+                for ($i = 0, $c = strlen($font); $i < $c; $i++) {
+                    if ($font[$i] === '\\') {
+                        $i++;
+                        if ($i >= $c) {
+                            $new_font .= '\\';
+                            break;
+                        }
+                        if (ctype_xdigit($font[$i])) {
+                            $code = $font[$i];
+                            for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
+                                if (!ctype_xdigit($font[$i])) break;
+                                $code .= $font[$i];
+                            }
+                            // We have to be extremely careful when adding
+                            // new characters, to make sure we're not breaking
+                            // the encoding.
+                            $char = HTMLPurifier_Encoder::unichr(hexdec($code));
+                            if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
+                            $new_font .= $char;
+                            if ($i < $c && trim($font[$i]) !== '') $i--;
+                            continue;
+                        }
+                        if ($font[$i] === "\n") continue;
+                    }
+                    $new_font .= $font[$i];
+                }
+
+                $font = $new_font;
+            }
+            // $font is a pure representation of the font name
+
+            if (ctype_alnum($font) && $font !== '') {
+                // very simple font, allow it in unharmed
+                $final .= $font . ', ';
+                continue;
+            }
+
+            // complicated font, requires quoting
+
+            // armor single quotes and new lines
+            $font = str_replace("\\", "\\\\", $font);
+            $font = str_replace("'", "\\'", $font);
+            $final .= "'$font', ";
+        }
+        $final = rtrim($final, ', ');
+        if ($final === '') return false;
+        return $final;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
new file mode 100755
index 0000000000..4e6b35e5a0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Decorator which enables !important to be used in CSS values.
+ */
+class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
+{
+    public $def, $allow;
+
+    /**
+     * @param $def Definition to wrap
+     * @param $allow Whether or not to allow !important
+     */
+    public function __construct($def, $allow = false) {
+        $this->def = $def;
+        $this->allow = $allow;
+    }
+    /**
+     * Intercepts and removes !important if necessary
+     */
+    public function validate($string, $config, $context) {
+        // test for ! and important tokens
+        $string = trim($string);
+        $is_important = false;
+        // :TODO: optimization: test directly for !important and ! important
+        if (strlen($string) >= 9 && substr($string, -9) === 'important') {
+            $temp = rtrim(substr($string, 0, -9));
+            // use a temp, because we might want to restore important
+            if (strlen($temp) >= 1 && substr($temp, -1) === '!') {
+                $string = rtrim(substr($temp, 0, -1));
+                $is_important = true;
+            }
+        }
+        $string = $this->def->validate($string, $config, $context);
+        if ($this->allow && $is_important) $string .= ' !important';
+        return $string;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
new file mode 100755
index 0000000000..a07ec58135
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Represents a Length as defined by CSS.
+ */
+class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
+{
+
+    protected $min, $max;
+
+    /**
+     * @param HTMLPurifier_Length $max Minimum length, or null for no bound. String is also acceptable.
+     * @param HTMLPurifier_Length $max Maximum length, or null for no bound. String is also acceptable.
+     */
+    public function __construct($min = null, $max = null) {
+        $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
+        $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
+    }
+
+    public function validate($string, $config, $context) {
+        $string = $this->parseCDATA($string);
+
+        // Optimizations
+        if ($string === '') return false;
+        if ($string === '0') return '0';
+        if (strlen($string) === 1) return false;
+
+        $length = HTMLPurifier_Length::make($string);
+        if (!$length->isValid()) return false;
+
+        if ($this->min) {
+            $c = $length->compareTo($this->min);
+            if ($c === false) return false;
+            if ($c < 0) return false;
+        }
+        if ($this->max) {
+            $c = $length->compareTo($this->max);
+            if ($c === false) return false;
+            if ($c > 0) return false;
+        }
+
+        return $length->toString();
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
new file mode 100755
index 0000000000..4406868c08
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Validates shorthand CSS property list-style.
+ * @warning Does not support url tokens that have internal spaces.
+ */
+class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Local copy of component validators.
+     * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
+     */
+    protected $info;
+
+    public function __construct($config) {
+        $def = $config->getCSSDefinition();
+        $this->info['list-style-type']     = $def->info['list-style-type'];
+        $this->info['list-style-position'] = $def->info['list-style-position'];
+        $this->info['list-style-image'] = $def->info['list-style-image'];
+    }
+
+    public function validate($string, $config, $context) {
+
+        // regular pre-processing
+        $string = $this->parseCDATA($string);
+        if ($string === '') return false;
+
+        // assumes URI doesn't have spaces in it
+        $bits = explode(' ', strtolower($string)); // bits to process
+
+        $caught = array();
+        $caught['type']     = false;
+        $caught['position'] = false;
+        $caught['image']    = false;
+
+        $i = 0; // number of catches
+        $none = false;
+
+        foreach ($bits as $bit) {
+            if ($i >= 3) return; // optimization bit
+            if ($bit === '') continue;
+            foreach ($caught as $key => $status) {
+                if ($status !== false) continue;
+                $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);
+                if ($r === false) continue;
+                if ($r === 'none') {
+                    if ($none) continue;
+                    else $none = true;
+                    if ($key == 'image') continue;
+                }
+                $caught[$key] = $r;
+                $i++;
+                break;
+            }
+        }
+
+        if (!$i) return false;
+
+        $ret = array();
+
+        // construct type
+        if ($caught['type']) $ret[] = $caught['type'];
+
+        // construct image
+        if ($caught['image']) $ret[] = $caught['image'];
+
+        // construct position
+        if ($caught['position']) $ret[] = $caught['position'];
+
+        if (empty($ret)) return false;
+        return implode(' ', $ret);
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
new file mode 100755
index 0000000000..4d62a40d7f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Framework class for strings that involve multiple values.
+ *
+ * Certain CSS properties such as border-width and margin allow multiple
+ * lengths to be specified.  This class can take a vanilla border-width
+ * definition and multiply it, usually into a max of four.
+ *
+ * @note Even though the CSS specification isn't clear about it, inherit
+ *       can only be used alone: it will never manifest as part of a multi
+ *       shorthand declaration.  Thus, this class does not allow inherit.
+ */
+class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Instance of component definition to defer validation to.
+     * @todo Make protected
+     */
+    public $single;
+
+    /**
+     * Max number of values allowed.
+     * @todo Make protected
+     */
+    public $max;
+
+    /**
+     * @param $single HTMLPurifier_AttrDef to multiply
+     * @param $max Max number of values allowed (usually four)
+     */
+    public function __construct($single, $max = 4) {
+        $this->single = $single;
+        $this->max = $max;
+    }
+
+    public function validate($string, $config, $context) {
+        $string = $this->parseCDATA($string);
+        if ($string === '') return false;
+        $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
+        $length = count($parts);
+        $final = '';
+        for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {
+            if (ctype_space($parts[$i])) continue;
+            $result = $this->single->validate($parts[$i], $config, $context);
+            if ($result !== false) {
+                $final .= $result . ' ';
+                $num++;
+            }
+        }
+        if ($final === '') return false;
+        return rtrim($final);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
new file mode 100755
index 0000000000..3f99e12ec2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Validates a number as defined by the CSS spec.
+ */
+class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Bool indicating whether or not only positive values allowed.
+     */
+    protected $non_negative = false;
+
+    /**
+     * @param $non_negative Bool indicating whether negatives are forbidden
+     */
+    public function __construct($non_negative = false) {
+        $this->non_negative = $non_negative;
+    }
+
+    /**
+     * @warning Some contexts do not pass $config, $context. These
+     *          variables should not be used without checking HTMLPurifier_Length
+     */
+    public function validate($number, $config, $context) {
+
+        $number = $this->parseCDATA($number);
+
+        if ($number === '') return false;
+        if ($number === '0') return '0';
+
+        $sign = '';
+        switch ($number[0]) {
+            case '-':
+                if ($this->non_negative) return false;
+                $sign = '-';
+            case '+':
+                $number = substr($number, 1);
+        }
+
+        if (ctype_digit($number)) {
+            $number = ltrim($number, '0');
+            return $number ? $sign . $number : '0';
+        }
+
+        // Period is the only non-numeric character allowed
+        if (strpos($number, '.') === false) return false;
+
+        list($left, $right) = explode('.', $number, 2);
+
+        if ($left === '' && $right === '') return false;
+        if ($left !== '' && !ctype_digit($left)) return false;
+
+        $left  = ltrim($left,  '0');
+        $right = rtrim($right, '0');
+
+        if ($right === '') {
+            return $left ? $sign . $left : '0';
+        } elseif (!ctype_digit($right)) {
+            return false;
+        }
+
+        return $sign . $left . '.' . $right;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
new file mode 100755
index 0000000000..c34b8fc3c3
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Validates a Percentage as defined by the CSS spec.
+ */
+class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Instance of HTMLPurifier_AttrDef_CSS_Number to defer number validation
+     */
+    protected $number_def;
+
+    /**
+     * @param Bool indicating whether to forbid negative values
+     */
+    public function __construct($non_negative = false) {
+        $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
+    }
+
+    public function validate($string, $config, $context) {
+
+        $string = $this->parseCDATA($string);
+
+        if ($string === '') return false;
+        $length = strlen($string);
+        if ($length === 1) return false;
+        if ($string[$length - 1] !== '%') return false;
+
+        $number = substr($string, 0, $length - 1);
+        $number = $this->number_def->validate($number, $config, $context);
+
+        if ($number === false) return false;
+        return "$number%";
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
new file mode 100755
index 0000000000..772c922d80
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Validates the value for the CSS property text-decoration
+ * @note This class could be generalized into a version that acts sort of
+ *       like Enum except you can compound the allowed values.
+ */
+class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
+{
+
+    public function validate($string, $config, $context) {
+
+        static $allowed_values = array(
+            'line-through' => true,
+            'overline' => true,
+            'underline' => true,
+        );
+
+        $string = strtolower($this->parseCDATA($string));
+
+        if ($string === 'none') return $string;
+
+        $parts = explode(' ', $string);
+        $final = '';
+        foreach ($parts as $part) {
+            if (isset($allowed_values[$part])) {
+                $final .= $part . ' ';
+            }
+        }
+        $final = rtrim($final);
+        if ($final === '') return false;
+        return $final;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
new file mode 100755
index 0000000000..435d7930bb
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Validates a URI in CSS syntax, which uses url('http://example.com')
+ * @note While theoretically speaking a URI in a CSS document could
+ *       be non-embedded, as of CSS2 there is no such usage so we're
+ *       generalizing it. This may need to be changed in the future.
+ * @warning Since HTMLPurifier_AttrDef_CSS blindly uses semicolons as
+ *          the separator, you cannot put a literal semicolon in
+ *          in the URI. Try percent encoding it, in that case.
+ */
+class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
+{
+
+    public function __construct() {
+        parent::__construct(true); // always embedded
+    }
+
+    public function validate($uri_string, $config, $context) {
+        // parse the URI out of the string and then pass it onto
+        // the parent object
+
+        $uri_string = $this->parseCDATA($uri_string);
+        if (strpos($uri_string, 'url(') !== 0) return false;
+        $uri_string = substr($uri_string, 4);
+        $new_length = strlen($uri_string) - 1;
+        if ($uri_string[$new_length] != ')') return false;
+        $uri = trim(substr($uri_string, 0, $new_length));
+
+        if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
+            $quote = $uri[0];
+            $new_length = strlen($uri) - 1;
+            if ($uri[$new_length] !== $quote) return false;
+            $uri = substr($uri, 1, $new_length - 1);
+        }
+
+        $keys   = array(  '(',   ')',   ',',   ' ',   '"',   "'");
+        $values = array('\\(', '\\)', '\\,', '\\ ', '\\"', "\\'");
+        $uri = str_replace($values, $keys, $uri);
+
+        $result = parent::validate($uri, $config, $context);
+
+        if ($result === false) return false;
+
+        // escape necessary characters according to CSS spec
+        // except for the comma, none of these should appear in the
+        // URI at all
+        $result = str_replace($keys, $values, $result);
+
+        return "url($result)";
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
new file mode 100755
index 0000000000..5d603ebcc6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
@@ -0,0 +1,65 @@
+<?php
+
+// Enum = Enumerated
+/**
+ * Validates a keyword against a list of valid values.
+ * @warning The case-insensitive compare of this function uses PHP's
+ *          built-in strtolower and ctype_lower functions, which may
+ *          cause problems with international comparisons
+ */
+class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Lookup table of valid values.
+     * @todo Make protected
+     */
+    public $valid_values   = array();
+
+    /**
+     * Bool indicating whether or not enumeration is case sensitive.
+     * @note In general this is always case insensitive.
+     */
+    protected $case_sensitive = false; // values according to W3C spec
+
+    /**
+     * @param $valid_values List of valid values
+     * @param $case_sensitive Bool indicating whether or not case sensitive
+     */
+    public function __construct(
+        $valid_values = array(), $case_sensitive = false
+    ) {
+        $this->valid_values = array_flip($valid_values);
+        $this->case_sensitive = $case_sensitive;
+    }
+
+    public function validate($string, $config, $context) {
+        $string = trim($string);
+        if (!$this->case_sensitive) {
+            // we may want to do full case-insensitive libraries
+            $string = ctype_lower($string) ? $string : strtolower($string);
+        }
+        $result = isset($this->valid_values[$string]);
+
+        return $result ? $string : false;
+    }
+
+    /**
+     * @param $string In form of comma-delimited list of case-insensitive
+     *      valid values. Example: "foo,bar,baz". Prepend "s:" to make
+     *      case sensitive
+     */
+    public function make($string) {
+        if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
+            $string = substr($string, 2);
+            $sensitive = true;
+        } else {
+            $sensitive = false;
+        }
+        $values = explode(',', $string);
+        return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
new file mode 100755
index 0000000000..e06987eb8d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Validates a boolean attribute
+ */
+class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
+{
+
+    protected $name;
+    public $minimized = true;
+
+    public function __construct($name = false) {$this->name = $name;}
+
+    public function validate($string, $config, $context) {
+        if (empty($string)) return false;
+        return $this->name;
+    }
+
+    /**
+     * @param $string Name of attribute
+     */
+    public function make($string) {
+        return new HTMLPurifier_AttrDef_HTML_Bool($string);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
new file mode 100755
index 0000000000..5311a3c613
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Validates a color according to the HTML spec.
+ */
+class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
+{
+
+    public function validate($string, $config, $context) {
+
+        static $colors = null;
+        if ($colors === null) $colors = $config->get('Core', 'ColorKeywords');
+
+        $string = trim($string);
+
+        if (empty($string)) return false;
+        if (isset($colors[$string])) return $colors[$string];
+        if ($string[0] === '#') $hex = substr($string, 1);
+        else $hex = $string;
+
+        $length = strlen($hex);
+        if ($length !== 3 && $length !== 6) return false;
+        if (!ctype_xdigit($hex)) return false;
+        if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
+
+        return "#$hex";
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
new file mode 100755
index 0000000000..bd281a89fb
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Special-case enum attribute definition that lazy loads allowed frame targets
+ */
+class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
+{
+
+    public $valid_values = false; // uninitialized value
+    protected $case_sensitive = false;
+
+    public function __construct() {}
+
+    public function validate($string, $config, $context) {
+        if ($this->valid_values === false) $this->valid_values = $config->get('Attr', 'AllowedFrameTargets');
+        return parent::validate($string, $config, $context);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
new file mode 100755
index 0000000000..7c5c169c25
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Validates the HTML attribute ID.
+ * @warning Even though this is the id processor, it
+ *          will ignore the directive Attr:IDBlacklist, since it will only
+ *          go according to the ID accumulator. Since the accumulator is
+ *          automatically generated, it will have already absorbed the
+ *          blacklist. If you're hacking around, make sure you use load()!
+ */
+
+class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
+{
+
+    // ref functionality disabled, since we also have to verify
+    // whether or not the ID it refers to exists
+
+    public function validate($id, $config, $context) {
+
+        if (!$config->get('Attr', 'EnableID')) return false;
+
+        $id = trim($id); // trim it first
+
+        if ($id === '') return false;
+
+        $prefix = $config->get('Attr', 'IDPrefix');
+        if ($prefix !== '') {
+            $prefix .= $config->get('Attr', 'IDPrefixLocal');
+            // prevent re-appending the prefix
+            if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
+        } elseif ($config->get('Attr', 'IDPrefixLocal') !== '') {
+            trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
+                '%Attr.IDPrefix is set', E_USER_WARNING);
+        }
+
+        //if (!$this->ref) {
+            $id_accumulator =& $context->get('IDAccumulator');
+            if (isset($id_accumulator->ids[$id])) return false;
+        //}
+
+        // we purposely avoid using regex, hopefully this is faster
+
+        if (ctype_alpha($id)) {
+            $result = true;
+        } else {
+            if (!ctype_alpha(@$id[0])) return false;
+            $trim = trim( // primitive style of regexps, I suppose
+                $id,
+                'A..Za..z0..9:-._'
+              );
+            $result = ($trim === '');
+        }
+
+        $regexp = $config->get('Attr', 'IDBlacklistRegexp');
+        if ($regexp && preg_match($regexp, $id)) {
+            return false;
+        }
+
+        if (/*!$this->ref && */$result) $id_accumulator->add($id);
+
+        // if no change was made to the ID, return the result
+        // else, return the new id if stripping whitespace made it
+        //     valid, or return false.
+        return $result ? $id : false;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
new file mode 100755
index 0000000000..a242f9c238
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Validates the HTML type length (not to be confused with CSS's length).
+ *
+ * This accepts integer pixels or percentages as lengths for certain
+ * HTML attributes.
+ */
+
+class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
+{
+
+    public function validate($string, $config, $context) {
+
+        $string = trim($string);
+        if ($string === '') return false;
+
+        $parent_result = parent::validate($string, $config, $context);
+        if ($parent_result !== false) return $parent_result;
+
+        $length = strlen($string);
+        $last_char = $string[$length - 1];
+
+        if ($last_char !== '%') return false;
+
+        $points = substr($string, 0, $length - 1);
+
+        if (!is_numeric($points)) return false;
+
+        $points = (int) $points;
+
+        if ($points < 0) return '0%';
+        if ($points > 100) return '100%';
+
+        return ((string) $points) . '%';
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
new file mode 100755
index 0000000000..8a0da0c89e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Validates a rel/rev link attribute against a directive of allowed values
+ * @note We cannot use Enum because link types allow multiple
+ *       values.
+ * @note Assumes link types are ASCII text
+ */
+class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
+{
+
+    /** Name config attribute to pull. */
+    protected $name;
+
+    public function __construct($name) {
+        $configLookup = array(
+            'rel' => 'AllowedRel',
+            'rev' => 'AllowedRev'
+        );
+        if (!isset($configLookup[$name])) {
+            trigger_error('Unrecognized attribute name for link '.
+                'relationship.', E_USER_ERROR);
+            return;
+        }
+        $this->name = $configLookup[$name];
+    }
+
+    public function validate($string, $config, $context) {
+
+        $allowed = $config->get('Attr', $this->name);
+        if (empty($allowed)) return false;
+
+        $string = $this->parseCDATA($string);
+        $parts = explode(' ', $string);
+
+        // lookup to prevent duplicates
+        $ret_lookup = array();
+        foreach ($parts as $part) {
+            $part = strtolower(trim($part));
+            if (!isset($allowed[$part])) continue;
+            $ret_lookup[$part] = true;
+        }
+
+        if (empty($ret_lookup)) return false;
+        $string = implode(' ', array_keys($ret_lookup));
+
+        return $string;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
new file mode 100755
index 0000000000..c72fc76e4d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Validates a MultiLength as defined by the HTML spec.
+ *
+ * A multilength is either a integer (pixel count), a percentage, or
+ * a relative number.
+ */
+class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
+{
+
+    public function validate($string, $config, $context) {
+
+        $string = trim($string);
+        if ($string === '') return false;
+
+        $parent_result = parent::validate($string, $config, $context);
+        if ($parent_result !== false) return $parent_result;
+
+        $length = strlen($string);
+        $last_char = $string[$length - 1];
+
+        if ($last_char !== '*') return false;
+
+        $int = substr($string, 0, $length - 1);
+
+        if ($int == '') return '*';
+        if (!is_numeric($int)) return false;
+
+        $int = (int) $int;
+
+        if ($int < 0) return false;
+        if ($int == 0) return '0';
+        if ($int == 1) return '*';
+        return ((string) $int) . '*';
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
new file mode 100755
index 0000000000..55035c4d04
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Validates contents based on NMTOKENS attribute type.
+ * @note The only current use for this is the class attribute in HTML
+ * @note Could have some functionality factored out into Nmtoken class
+ * @warning We cannot assume this class will be used only for 'class'
+ *          attributes. Not sure how to hook in magic behavior, then.
+ */
+class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
+{
+
+    public function validate($string, $config, $context) {
+
+        $string = trim($string);
+
+        // early abort: '' and '0' (strings that convert to false) are invalid
+        if (!$string) return false;
+
+        // OPTIMIZABLE!
+        // do the preg_match, capture all subpatterns for reformulation
+
+        // we don't support U+00A1 and up codepoints or
+        // escaping because I don't know how to do that with regexps
+        // and plus it would complicate optimization efforts (you never
+        // see that anyway).
+        $matches = array();
+        $pattern = '/(?:(?<=\s)|\A)'. // look behind for space or string start
+                   '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
+                   '(?:(?=\s)|\z)/'; // look ahead for space or string end
+        preg_match_all($pattern, $string, $matches);
+
+        if (empty($matches[1])) return false;
+
+        // reconstruct string
+        $new_string = '';
+        foreach ($matches[1] as $token) {
+            $new_string .= $token . ' ';
+        }
+        $new_string = rtrim($new_string);
+
+        return $new_string;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
new file mode 100755
index 0000000000..4cb2c1b857
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Validates an integer representation of pixels according to the HTML spec.
+ */
+class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
+{
+
+    protected $max;
+
+    public function __construct($max = null) {
+        $this->max = $max;
+    }
+
+    public function validate($string, $config, $context) {
+
+        $string = trim($string);
+        if ($string === '0') return $string;
+        if ($string === '')  return false;
+        $length = strlen($string);
+        if (substr($string, $length - 2) == 'px') {
+            $string = substr($string, 0, $length - 2);
+        }
+        if (!is_numeric($string)) return false;
+        $int = (int) $string;
+
+        if ($int < 0) return '0';
+
+        // upper-bound value, extremely high values can
+        // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
+        // WARNING, above link WILL crash you if you're using Windows
+
+        if ($this->max !== null && $int > $this->max) return (string) $this->max;
+
+        return (string) $int;
+
+    }
+
+    public function make($string) {
+        if ($string === '') $max = null;
+        else $max = (int) $string;
+        $class = get_class($this);
+        return new $class($max);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
new file mode 100755
index 0000000000..d59738d2a2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Validates an integer.
+ * @note While this class was modeled off the CSS definition, no currently
+ *       allowed CSS uses this type.  The properties that do are: widows,
+ *       orphans, z-index, counter-increment, counter-reset.  Some of the
+ *       HTML attributes, however, find use for a non-negative version of this.
+ */
+class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Bool indicating whether or not negative values are allowed
+     */
+    protected $negative = true;
+
+    /**
+     * Bool indicating whether or not zero is allowed
+     */
+    protected $zero = true;
+
+    /**
+     * Bool indicating whether or not positive values are allowed
+     */
+    protected $positive = true;
+
+    /**
+     * @param $negative Bool indicating whether or not negative values are allowed
+     * @param $zero Bool indicating whether or not zero is allowed
+     * @param $positive Bool indicating whether or not positive values are allowed
+     */
+    public function __construct(
+        $negative = true, $zero = true, $positive = true
+    ) {
+        $this->negative = $negative;
+        $this->zero     = $zero;
+        $this->positive = $positive;
+    }
+
+    public function validate($integer, $config, $context) {
+
+        $integer = $this->parseCDATA($integer);
+        if ($integer === '') return false;
+
+        // we could possibly simply typecast it to integer, but there are
+        // certain fringe cases that must not return an integer.
+
+        // clip leading sign
+        if ( $this->negative && $integer[0] === '-' ) {
+            $digits = substr($integer, 1);
+            if ($digits === '0') $integer = '0'; // rm minus sign for zero
+        } elseif( $this->positive && $integer[0] === '+' ) {
+            $digits = $integer = substr($integer, 1); // rm unnecessary plus
+        } else {
+            $digits = $integer;
+        }
+
+        // test if it's numeric
+        if (!ctype_digit($digits)) return false;
+
+        // perform scope tests
+        if (!$this->zero     && $integer == 0) return false;
+        if (!$this->positive && $integer > 0) return false;
+        if (!$this->negative && $integer < 0) return false;
+
+        return $integer;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
new file mode 100755
index 0000000000..10e6da56db
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Validates the HTML attribute lang, effectively a language code.
+ * @note Built according to RFC 3066, which obsoleted RFC 1766
+ */
+class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
+{
+
+    public function validate($string, $config, $context) {
+
+        $string = trim($string);
+        if (!$string) return false;
+
+        $subtags = explode('-', $string);
+        $num_subtags = count($subtags);
+
+        if ($num_subtags == 0) return false; // sanity check
+
+        // process primary subtag : $subtags[0]
+        $length = strlen($subtags[0]);
+        switch ($length) {
+            case 0:
+                return false;
+            case 1:
+                if (! ($subtags[0] == 'x' || $subtags[0] == 'i') ) {
+                    return false;
+                }
+                break;
+            case 2:
+            case 3:
+                if (! ctype_alpha($subtags[0]) ) {
+                    return false;
+                } elseif (! ctype_lower($subtags[0]) ) {
+                    $subtags[0] = strtolower($subtags[0]);
+                }
+                break;
+            default:
+                return false;
+        }
+
+        $new_string = $subtags[0];
+        if ($num_subtags == 1) return $new_string;
+
+        // process second subtag : $subtags[1]
+        $length = strlen($subtags[1]);
+        if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
+            return $new_string;
+        }
+        if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);
+
+        $new_string .= '-' . $subtags[1];
+        if ($num_subtags == 2) return $new_string;
+
+        // process all other subtags, index 2 and up
+        for ($i = 2; $i < $num_subtags; $i++) {
+            $length = strlen($subtags[$i]);
+            if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
+                return $new_string;
+            }
+            if (!ctype_lower($subtags[$i])) {
+                $subtags[$i] = strtolower($subtags[$i]);
+            }
+            $new_string .= '-' . $subtags[$i];
+        }
+
+        return $new_string;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
new file mode 100755
index 0000000000..c9e3ed193e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Decorator that, depending on a token, switches between two definitions.
+ */
+class HTMLPurifier_AttrDef_Switch
+{
+
+    protected $tag;
+    protected $withTag, $withoutTag;
+
+    /**
+     * @param string $tag Tag name to switch upon
+     * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
+     * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
+     */
+    public function __construct($tag, $with_tag, $without_tag) {
+        $this->tag = $tag;
+        $this->withTag = $with_tag;
+        $this->withoutTag = $without_tag;
+    }
+
+    public function validate($string, $config, $context) {
+        $token = $context->get('CurrentToken', true);
+        if (!$token || $token->name !== $this->tag) {
+            return $this->withoutTag->validate($string, $config, $context);
+        } else {
+            return $this->withTag->validate($string, $config, $context);
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
new file mode 100755
index 0000000000..c6216cc531
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Validates arbitrary text according to the HTML spec.
+ */
+class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
+{
+
+    public function validate($string, $config, $context) {
+        return $this->parseCDATA($string);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
new file mode 100755
index 0000000000..93d2f0bbf4
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Validates a URI as defined by RFC 3986.
+ * @note Scheme-specific mechanics deferred to HTMLPurifier_URIScheme
+ */
+class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
+{
+
+    protected $parser;
+    protected $embedsResource;
+
+    /**
+     * @param $embeds_resource_resource Does the URI here result in an extra HTTP request?
+     */
+    public function __construct($embeds_resource = false) {
+        $this->parser = new HTMLPurifier_URIParser();
+        $this->embedsResource = (bool) $embeds_resource;
+    }
+
+    public function make($string) {
+        $embeds = (bool) $string;
+        return new HTMLPurifier_AttrDef_URI($embeds);
+    }
+
+    public function validate($uri, $config, $context) {
+
+        if ($config->get('URI', 'Disable')) return false;
+
+        $uri = $this->parseCDATA($uri);
+
+        // parse the URI
+        $uri = $this->parser->parse($uri);
+        if ($uri === false) return false;
+
+        // add embedded flag to context for validators
+        $context->register('EmbeddedURI', $this->embedsResource);
+
+        $ok = false;
+        do {
+
+            // generic validation
+            $result = $uri->validate($config, $context);
+            if (!$result) break;
+
+            // chained filtering
+            $uri_def = $config->getDefinition('URI');
+            $result = $uri_def->filter($uri, $config, $context);
+            if (!$result) break;
+
+            // scheme-specific validation
+            $scheme_obj = $uri->getSchemeObj($config, $context);
+            if (!$scheme_obj) break;
+            if ($this->embedsResource && !$scheme_obj->browsable) break;
+            $result = $scheme_obj->validate($uri, $config, $context);
+            if (!$result) break;
+
+            // Post chained filtering
+            $result = $uri_def->postFilter($uri, $config, $context);
+            if (!$result) break;
+
+            // survived gauntlet
+            $ok = true;
+
+        } while (false);
+
+        $context->destroy('EmbeddedURI');
+        if (!$ok) return false;
+
+        // back to string
+        return $uri->toString();
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
new file mode 100755
index 0000000000..bfee9d166c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
@@ -0,0 +1,17 @@
+<?php
+
+abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Unpacks a mailbox into its display-name and address
+     */
+    function unpack($string) {
+        // needs to be implemented
+    }
+
+}
+
+// sub-implementations
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
new file mode 100755
index 0000000000..94c715ab43
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Primitive email validation class based on the regexp found at
+ * http://www.regular-expressions.info/email.html
+ */
+class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
+{
+
+    public function validate($string, $config, $context) {
+        // no support for named mailboxes i.e. "Bob <bob@example.com>"
+        // that needs more percent encoding to be done
+        if ($string == '') return false;
+        $string = trim($string);
+        $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
+        return $result ? $string : false;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
new file mode 100755
index 0000000000..2156c10c66
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Validates a host according to the IPv4, IPv6 and DNS (future) specifications.
+ */
+class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * Instance of HTMLPurifier_AttrDef_URI_IPv4 sub-validator
+     */
+    protected $ipv4;
+
+    /**
+     * Instance of HTMLPurifier_AttrDef_URI_IPv6 sub-validator
+     */
+    protected $ipv6;
+
+    public function __construct() {
+        $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
+        $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
+    }
+
+    public function validate($string, $config, $context) {
+        $length = strlen($string);
+        if ($string === '') return '';
+        if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
+            //IPv6
+            $ip = substr($string, 1, $length - 2);
+            $valid = $this->ipv6->validate($ip, $config, $context);
+            if ($valid === false) return false;
+            return '['. $valid . ']';
+        }
+
+        // need to do checks on unusual encodings too
+        $ipv4 = $this->ipv4->validate($string, $config, $context);
+        if ($ipv4 !== false) return $ipv4;
+
+        // A regular domain name.
+
+        // This breaks I18N domain names, but we don't have proper IRI support,
+        // so force users to insert Punycode. If there's complaining we'll
+        // try to fix things into an international friendly form.
+
+        // The productions describing this are:
+        $a   = '[a-z]';     // alpha
+        $an  = '[a-z0-9]';  // alphanum
+        $and = '[a-z0-9-]'; // alphanum | "-"
+        // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
+        $domainlabel   = "$an($and*$an)?";
+        // toplabel    = alpha | alpha *( alphanum | "-" ) alphanum
+        $toplabel      = "$a($and*$an)?";
+        // hostname    = *( domainlabel "." ) toplabel [ "." ]
+        $match = preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string);
+        if (!$match) return false;
+
+        return $string;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
new file mode 100755
index 0000000000..ec4cf591b8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Validates an IPv4 address
+ * @author Feyd @ forums.devnetwork.net (public domain)
+ */
+class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
+{
+
+    /**
+     * IPv4 regex, protected so that IPv6 can reuse it
+     */
+    protected $ip4;
+
+    public function validate($aIP, $config, $context) {
+
+        if (!$this->ip4) $this->_loadRegex();
+
+        if (preg_match('#^' . $this->ip4 . '$#s', $aIP))
+        {
+                return $aIP;
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Lazy load function to prevent regex from being stuffed in
+     * cache.
+     */
+    protected function _loadRegex() {
+        $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
+        $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
new file mode 100755
index 0000000000..9454e9be50
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Validates an IPv6 address.
+ * @author Feyd @ forums.devnetwork.net (public domain)
+ * @note This function requires brackets to have been removed from address
+ *       in URI.
+ */
+class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
+{
+
+    public function validate($aIP, $config, $context) {
+
+        if (!$this->ip4) $this->_loadRegex();
+
+        $original = $aIP;
+
+        $hex = '[0-9a-fA-F]';
+        $blk = '(?:' . $hex . '{1,4})';
+        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))';   // /0 - /128
+
+        //      prefix check
+        if (strpos($aIP, '/') !== false)
+        {
+                if (preg_match('#' . $pre . '$#s', $aIP, $find))
+                {
+                        $aIP = substr($aIP, 0, 0-strlen($find[0]));
+                        unset($find);
+                }
+                else
+                {
+                        return false;
+                }
+        }
+
+        //      IPv4-compatiblity check
+        if (preg_match('#(?<=:'.')' . $this->ip4 . '$#s', $aIP, $find))
+        {
+                $aIP = substr($aIP, 0, 0-strlen($find[0]));
+                $ip = explode('.', $find[0]);
+                $ip = array_map('dechex', $ip);
+                $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
+                unset($find, $ip);
+        }
+
+        //      compression check
+        $aIP = explode('::', $aIP);
+        $c = count($aIP);
+        if ($c > 2)
+        {
+                return false;
+        }
+        elseif ($c == 2)
+        {
+                list($first, $second) = $aIP;
+                $first = explode(':', $first);
+                $second = explode(':', $second);
+
+                if (count($first) + count($second) > 8)
+                {
+                        return false;
+                }
+
+                while(count($first) < 8)
+                {
+                        array_push($first, '0');
+                }
+
+                array_splice($first, 8 - count($second), 8, $second);
+                $aIP = $first;
+                unset($first,$second);
+        }
+        else
+        {
+                $aIP = explode(':', $aIP[0]);
+        }
+        $c = count($aIP);
+
+        if ($c != 8)
+        {
+                return false;
+        }
+
+        //      All the pieces should be 16-bit hex strings. Are they?
+        foreach ($aIP as $piece)
+        {
+                if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece)))
+                {
+                        return false;
+                }
+        }
+
+        return $original;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform.php
new file mode 100755
index 0000000000..e61d3e01b6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Processes an entire attribute array for corrections needing multiple values.
+ *
+ * Occasionally, a certain attribute will need to be removed and popped onto
+ * another value.  Instead of creating a complex return syntax for
+ * HTMLPurifier_AttrDef, we just pass the whole attribute array to a
+ * specialized object and have that do the special work.  That is the
+ * family of HTMLPurifier_AttrTransform.
+ *
+ * An attribute transformation can be assigned to run before or after
+ * HTMLPurifier_AttrDef validation.  See HTMLPurifier_HTMLDefinition for
+ * more details.
+ */
+
+abstract class HTMLPurifier_AttrTransform
+{
+
+    /**
+     * Abstract: makes changes to the attributes dependent on multiple values.
+     *
+     * @param $attr Assoc array of attributes, usually from
+     *              HTMLPurifier_Token_Tag::$attr
+     * @param $config Mandatory HTMLPurifier_Config object.
+     * @param $context Mandatory HTMLPurifier_Context object
+     * @returns Processed attribute array.
+     */
+    abstract public function transform($attr, $config, $context);
+
+    /**
+     * Prepends CSS properties to the style attribute, creating the
+     * attribute if it doesn't exist.
+     * @param $attr Attribute array to process (passed by reference)
+     * @param $css CSS to prepend
+     */
+    public function prependCSS(&$attr, $css) {
+        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
+        $attr['style'] = $css . $attr['style'];
+    }
+
+    /**
+     * Retrieves and removes an attribute
+     * @param $attr Attribute array to process (passed by reference)
+     * @param $key Key of attribute to confiscate
+     */
+    public function confiscateAttr(&$attr, $key) {
+        if (!isset($attr[$key])) return null;
+        $value = $attr[$key];
+        unset($attr[$key]);
+        return $value;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
new file mode 100755
index 0000000000..0e1ff24a3e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Pre-transform that changes proprietary background attribute to CSS.
+ */
+class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform {
+
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr['background'])) return $attr;
+
+        $background = $this->confiscateAttr($attr, 'background');
+        // some validation should happen here
+
+        $this->prependCSS($attr, "background-image:url($background);");
+
+        return $attr;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
new file mode 100755
index 0000000000..40310b9144
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
@@ -0,0 +1,19 @@
+<?php
+
+// this MUST be placed in post, as it assumes that any value in dir is valid
+
+/**
+ * Post-trasnform that ensures that bdo tags have the dir attribute set.
+ */
+class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
+{
+
+    public function transform($attr, $config, $context) {
+        if (isset($attr['dir'])) return $attr;
+        $attr['dir'] = $config->get('Attr', 'DefaultTextDir');
+        return $attr;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
new file mode 100755
index 0000000000..ad3916bb96
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Pre-transform that changes deprecated bgcolor attribute to CSS.
+ */
+class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform {
+
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr['bgcolor'])) return $attr;
+
+        $bgcolor = $this->confiscateAttr($attr, 'bgcolor');
+        // some validation should happen here
+
+        $this->prependCSS($attr, "background-color:$bgcolor;");
+
+        return $attr;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
new file mode 100755
index 0000000000..51159b6715
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Pre-transform that changes converts a boolean attribute to fixed CSS
+ */
+class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform {
+
+    /**
+     * Name of boolean attribute that is trigger
+     */
+    protected $attr;
+
+    /**
+     * CSS declarations to add to style, needs trailing semicolon
+     */
+    protected $css;
+
+    /**
+     * @param $attr string attribute name to convert from
+     * @param $css string CSS declarations to add to style (needs semicolon)
+     */
+    public function __construct($attr, $css) {
+        $this->attr = $attr;
+        $this->css  = $css;
+    }
+
+    public function transform($attr, $config, $context) {
+        if (!isset($attr[$this->attr])) return $attr;
+        unset($attr[$this->attr]);
+        $this->prependCSS($attr, $this->css);
+        return $attr;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
new file mode 100755
index 0000000000..476b0b079b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Pre-transform that changes deprecated border attribute to CSS.
+ */
+class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform {
+
+    public function transform($attr, $config, $context) {
+        if (!isset($attr['border'])) return $attr;
+        $border_width = $this->confiscateAttr($attr, 'border');
+        // some validation should happen here
+        $this->prependCSS($attr, "border:{$border_width}px solid;");
+        return $attr;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
new file mode 100755
index 0000000000..2a5b4514ab
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Generic pre-transform that converts an attribute with a fixed number of
+ * values (enumerated) to CSS.
+ */
+class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform {
+
+    /**
+     * Name of attribute to transform from
+     */
+    protected $attr;
+
+    /**
+     * Lookup array of attribute values to CSS
+     */
+    protected $enumToCSS = array();
+
+    /**
+     * Case sensitivity of the matching
+     * @warning Currently can only be guaranteed to work with ASCII
+     *          values.
+     */
+    protected $caseSensitive = false;
+
+    /**
+     * @param $attr String attribute name to transform from
+     * @param $enumToCSS Lookup array of attribute values to CSS
+     * @param $case_sensitive Boolean case sensitivity indicator, default false
+     */
+    public function __construct($attr, $enum_to_css, $case_sensitive = false) {
+        $this->attr = $attr;
+        $this->enumToCSS = $enum_to_css;
+        $this->caseSensitive = (bool) $case_sensitive;
+    }
+
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr[$this->attr])) return $attr;
+
+        $value = trim($attr[$this->attr]);
+        unset($attr[$this->attr]);
+
+        if (!$this->caseSensitive) $value = strtolower($value);
+
+        if (!isset($this->enumToCSS[$value])) {
+            return $attr;
+        }
+
+        $this->prependCSS($attr, $this->enumToCSS[$value]);
+
+        return $attr;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
new file mode 100755
index 0000000000..25c9403c20
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
@@ -0,0 +1,42 @@
+<?php
+
+// must be called POST validation
+
+/**
+ * Transform that supplies default values for the src and alt attributes
+ * in img tags, as well as prevents the img tag from being removed
+ * because of a missing alt tag. This needs to be registered as both
+ * a pre and post attribute transform.
+ */
+class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
+{
+
+    public function transform($attr, $config, $context) {
+
+        $src = true;
+        if (!isset($attr['src'])) {
+            if ($config->get('Core', 'RemoveInvalidImg')) return $attr;
+            $attr['src'] = $config->get('Attr', 'DefaultInvalidImage');
+            $src = false;
+        }
+
+        if (!isset($attr['alt'])) {
+            if ($src) {
+                $alt = $config->get('Attr', 'DefaultImageAlt');
+                if ($alt === null) {
+                    $attr['alt'] = basename($attr['src']);
+                } else {
+                    $attr['alt'] = $alt;
+                }
+            } else {
+                $attr['alt'] = $config->get('Attr', 'DefaultInvalidImageAlt');
+            }
+        }
+
+        return $attr;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
new file mode 100755
index 0000000000..fd84c10c36
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Pre-transform that changes deprecated hspace and vspace attributes to CSS
+ */
+class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform {
+
+    protected $attr;
+    protected $css = array(
+        'hspace' => array('left', 'right'),
+        'vspace' => array('top', 'bottom')
+    );
+
+    public function __construct($attr) {
+        $this->attr = $attr;
+        if (!isset($this->css[$attr])) {
+            trigger_error(htmlspecialchars($attr) . ' is not valid space attribute');
+        }
+    }
+
+    public function transform($attr, $config, $context) {
+
+        if (!isset($attr[$this->attr])) return $attr;
+
+        $width = $this->confiscateAttr($attr, $this->attr);
+        // some validation could happen here
+
+        if (!isset($this->css[$this->attr])) return $attr;
+
+        $style = '';
+        foreach ($this->css[$this->attr] as $suffix) {
+            $property = "margin-$suffix";
+            $style .= "$property:{$width}px;";
+        }
+
+        $this->prependCSS($attr, $style);
+
+        return $attr;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
new file mode 100755
index 0000000000..16829552d1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Performs miscellaneous cross attribute validation and filtering for
+ * input elements. This is meant to be a post-transform.
+ */
+class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform {
+
+    protected $pixels;
+
+    public function __construct() {
+        $this->pixels = new HTMLPurifier_AttrDef_HTML_Pixels();
+    }
+
+    public function transform($attr, $config, $context) {
+        if (!isset($attr['type'])) $t = 'text';
+        else $t = strtolower($attr['type']);
+        if (isset($attr['checked']) && $t !== 'radio' && $t !== 'checkbox') {
+            unset($attr['checked']);
+        }
+        if (isset($attr['maxlength']) && $t !== 'text' && $t !== 'password') {
+            unset($attr['maxlength']);
+        }
+        if (isset($attr['size']) && $t !== 'text' && $t !== 'password') {
+            $result = $this->pixels->validate($attr['size'], $config, $context);
+            if ($result === false) unset($attr['size']);
+            else $attr['size'] = $result;
+        }
+        if (isset($attr['src']) && $t !== 'image') {
+            unset($attr['src']);
+        }
+        if (!isset($attr['value']) && ($t === 'radio' || $t === 'checkbox')) {
+            $attr['value'] = '';
+        }
+        return $attr;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
new file mode 100755
index 0000000000..5869e7f820
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Post-transform that copies lang's value to xml:lang (and vice-versa)
+ * @note Theoretically speaking, this could be a pre-transform, but putting
+ *       post is more efficient.
+ */
+class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
+{
+
+    public function transform($attr, $config, $context) {
+
+        $lang     = isset($attr['lang']) ? $attr['lang'] : false;
+        $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;
+
+        if ($lang !== false && $xml_lang === false) {
+            $attr['xml:lang'] = $lang;
+        } elseif ($xml_lang !== false) {
+            $attr['lang'] = $xml_lang;
+        }
+
+        return $attr;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
new file mode 100755
index 0000000000..ea2f30473d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Class for handling width/height length attribute transformations to CSS
+ */
+class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
+{
+
+    protected $name;
+    protected $cssName;
+
+    public function __construct($name, $css_name = null) {
+        $this->name = $name;
+        $this->cssName = $css_name ? $css_name : $name;
+    }
+
+    public function transform($attr, $config, $context) {
+        if (!isset($attr[$this->name])) return $attr;
+        $length = $this->confiscateAttr($attr, $this->name);
+        if(ctype_digit($length)) $length .= 'px';
+        $this->prependCSS($attr, $this->cssName . ":$length;");
+        return $attr;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
new file mode 100755
index 0000000000..e6f93aee3b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Pre-transform that changes deprecated name attribute to ID if necessary
+ */
+class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
+{
+
+    public function transform($attr, $config, $context) {
+        if (!isset($attr['name'])) return $attr;
+        $id = $this->confiscateAttr($attr, 'name');
+        if ( isset($attr['id']))   return $attr;
+        $attr['id'] = $id;
+        return $attr;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
new file mode 100755
index 0000000000..4da449981f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
@@ -0,0 +1,15 @@
+<?php
+
+class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
+{
+    public $name = "SafeEmbed";
+
+    public function transform($attr, $config, $context) {
+        $attr['allowscriptaccess'] = 'never';
+        $attr['allownetworking'] = 'internal';
+        $attr['type'] = 'application/x-shockwave-flash';
+        return $attr;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
new file mode 100755
index 0000000000..1ed74898ba
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Writes default type for all objects. Currently only supports flash.
+ */
+class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
+{
+    public $name = "SafeObject";
+
+    function transform($attr, $config, $context) {
+        if (!isset($attr['type'])) $attr['type'] = 'application/x-shockwave-flash';
+        return $attr;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
new file mode 100755
index 0000000000..94e8052a9d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Validates name/value pairs in param tags to be used in safe objects. This
+ * will only allow name values it recognizes, and pre-fill certain attributes
+ * with required values.
+ *
+ * @note
+ *      This class only supports Flash. In the future, Quicktime support
+ *      may be added.
+ *
+ * @warning
+ *      This class expects an injector to add the necessary parameters tags.
+ */
+class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
+{
+    public $name = "SafeParam";
+    private $uri;
+
+    public function __construct() {
+        $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
+    }
+
+    public function transform($attr, $config, $context) {
+        // If we add support for other objects, we'll need to alter the
+        // transforms.
+        switch ($attr['name']) {
+            // application/x-shockwave-flash
+            // Keep this synchronized with Injector/SafeObject.php
+            case 'allowScriptAccess':
+                $attr['value'] = 'never';
+                break;
+            case 'allowNetworking':
+                $attr['value'] = 'internal';
+                break;
+            case 'wmode':
+                $attr['value'] = 'window';
+                break;
+            case 'movie':
+                $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
+                break;
+            // add other cases to support other param name/value pairs
+            default:
+                $attr['name'] = $attr['value'] = null;
+        }
+        return $attr;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
new file mode 100755
index 0000000000..4499050a22
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Implements required attribute stipulation for <script>
+ */
+class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
+{
+    public function transform($attr, $config, $context) {
+        if (!isset($attr['type'])) {
+            $attr['type'] = 'text/javascript';
+        }
+        return $attr;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
new file mode 100755
index 0000000000..81ac3488ba
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Sets height/width defaults for <textarea>
+ */
+class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
+{
+
+    public function transform($attr, $config, $context) {
+        // Calculated from Firefox
+        if (!isset($attr['cols'])) $attr['cols'] = '22';
+        if (!isset($attr['rows'])) $attr['rows'] = '3';
+        return $attr;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTypes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTypes.php
new file mode 100755
index 0000000000..6c624bb0ba
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrTypes.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Provides lookup array of attribute types to HTMLPurifier_AttrDef objects
+ */
+class HTMLPurifier_AttrTypes
+{
+    /**
+     * Lookup array of attribute string identifiers to concrete implementations
+     */
+    protected $info = array();
+
+    /**
+     * Constructs the info array, supplying default implementations for attribute
+     * types.
+     */
+    public function __construct() {
+        // pseudo-types, must be instantiated via shorthand
+        $this->info['Enum']    = new HTMLPurifier_AttrDef_Enum();
+        $this->info['Bool']    = new HTMLPurifier_AttrDef_HTML_Bool();
+
+        $this->info['CDATA']    = new HTMLPurifier_AttrDef_Text();
+        $this->info['ID']       = new HTMLPurifier_AttrDef_HTML_ID();
+        $this->info['Length']   = new HTMLPurifier_AttrDef_HTML_Length();
+        $this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
+        $this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
+        $this->info['Pixels']   = new HTMLPurifier_AttrDef_HTML_Pixels();
+        $this->info['Text']     = new HTMLPurifier_AttrDef_Text();
+        $this->info['URI']      = new HTMLPurifier_AttrDef_URI();
+        $this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
+        $this->info['Color']    = new HTMLPurifier_AttrDef_HTML_Color();
+
+        // unimplemented aliases
+        $this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
+        $this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
+        $this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
+        $this->info['Character'] = new HTMLPurifier_AttrDef_Text();
+
+        // number is really a positive integer (one or more digits)
+        // FIXME: ^^ not always, see start and value of list items
+        $this->info['Number']   = new HTMLPurifier_AttrDef_Integer(false, false, true);
+    }
+
+    /**
+     * Retrieves a type
+     * @param $type String type name
+     * @return Object AttrDef for type
+     */
+    public function get($type) {
+
+        // determine if there is any extra info tacked on
+        if (strpos($type, '#') !== false) list($type, $string) = explode('#', $type, 2);
+        else $string = '';
+
+        if (!isset($this->info[$type])) {
+            trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
+            return;
+        }
+
+        return $this->info[$type]->make($string);
+
+    }
+
+    /**
+     * Sets a new implementation for a type
+     * @param $type String type name
+     * @param $impl Object AttrDef for type
+     */
+    public function set($type, $impl) {
+        $this->info[$type] = $impl;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrValidator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrValidator.php
new file mode 100755
index 0000000000..829a0f8f22
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/AttrValidator.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * Validates the attributes of a token. Doesn't manage required attributes
+ * very well. The only reason we factored this out was because RemoveForeignElements
+ * also needed it besides ValidateAttributes.
+ */
+class HTMLPurifier_AttrValidator
+{
+
+    /**
+     * Validates the attributes of a token, returning a modified token
+     * that has valid tokens
+     * @param $token Reference to token to validate. We require a reference
+     *     because the operation this class performs on the token are
+     *     not atomic, so the context CurrentToken to be updated
+     *     throughout
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     */
+    public function validateToken(&$token, &$config, $context) {
+
+        $definition = $config->getHTMLDefinition();
+        $e =& $context->get('ErrorCollector', true);
+
+        // initialize IDAccumulator if necessary
+        $ok =& $context->get('IDAccumulator', true);
+        if (!$ok) {
+            $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
+            $context->register('IDAccumulator', $id_accumulator);
+        }
+
+        // initialize CurrentToken if necessary
+        $current_token =& $context->get('CurrentToken', true);
+        if (!$current_token) $context->register('CurrentToken', $token);
+
+        if (
+            !$token instanceof HTMLPurifier_Token_Start &&
+            !$token instanceof HTMLPurifier_Token_Empty
+        ) return $token;
+
+        // create alias to global definition array, see also $defs
+        // DEFINITION CALL
+        $d_defs = $definition->info_global_attr;
+
+        // don't update token until the very end, to ensure an atomic update
+        $attr = $token->attr;
+
+        // do global transformations (pre)
+        // nothing currently utilizes this
+        foreach ($definition->info_attr_transform_pre as $transform) {
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e) {
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+            }
+        }
+
+        // do local transformations only applicable to this element (pre)
+        // ex. <p align="right"> to <p style="text-align:right;">
+        foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e) {
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+            }
+        }
+
+        // create alias to this element's attribute definition array, see
+        // also $d_defs (global attribute definition array)
+        // DEFINITION CALL
+        $defs = $definition->info[$token->name]->attr;
+
+        $attr_key = false;
+        $context->register('CurrentAttr', $attr_key);
+
+        // iterate through all the attribute keypairs
+        // Watch out for name collisions: $key has previously been used
+        foreach ($attr as $attr_key => $value) {
+
+            // call the definition
+            if ( isset($defs[$attr_key]) ) {
+                // there is a local definition defined
+                if ($defs[$attr_key] === false) {
+                    // We've explicitly been told not to allow this element.
+                    // This is usually when there's a global definition
+                    // that must be overridden.
+                    // Theoretically speaking, we could have a
+                    // AttrDef_DenyAll, but this is faster!
+                    $result = false;
+                } else {
+                    // validate according to the element's definition
+                    $result = $defs[$attr_key]->validate(
+                                    $value, $config, $context
+                               );
+                }
+            } elseif ( isset($d_defs[$attr_key]) ) {
+                // there is a global definition defined, validate according
+                // to the global definition
+                $result = $d_defs[$attr_key]->validate(
+                                $value, $config, $context
+                           );
+            } else {
+                // system never heard of the attribute? DELETE!
+                $result = false;
+            }
+
+            // put the results into effect
+            if ($result === false || $result === null) {
+                // this is a generic error message that should replaced
+                // with more specific ones when possible
+                if ($e) $e->send(E_ERROR, 'AttrValidator: Attribute removed');
+
+                // remove the attribute
+                unset($attr[$attr_key]);
+            } elseif (is_string($result)) {
+                // generally, if a substitution is happening, there
+                // was some sort of implicit correction going on. We'll
+                // delegate it to the attribute classes to say exactly what.
+
+                // simple substitution
+                $attr[$attr_key] = $result;
+            } else {
+                // nothing happens
+            }
+
+            // we'd also want slightly more complicated substitution
+            // involving an array as the return value,
+            // although we're not sure how colliding attributes would
+            // resolve (certain ones would be completely overriden,
+            // others would prepend themselves).
+        }
+
+        $context->destroy('CurrentAttr');
+
+        // post transforms
+
+        // global (error reporting untested)
+        foreach ($definition->info_attr_transform_post as $transform) {
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e) {
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+            }
+        }
+
+        // local (error reporting untested)
+        foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
+            $attr = $transform->transform($o = $attr, $config, $context);
+            if ($e) {
+                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
+            }
+        }
+
+        $token->attr = $attr;
+
+        // destroy CurrentToken if we made it ourselves
+        if (!$current_token) $context->destroy('CurrentToken');
+
+    }
+
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Bootstrap.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Bootstrap.php
new file mode 100755
index 0000000000..559f61a232
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Bootstrap.php
@@ -0,0 +1,98 @@
+<?php
+
+// constants are slow, so we use as few as possible
+if (!defined('HTMLPURIFIER_PREFIX')) {
+    define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
+}
+
+// accomodations for versions earlier than 5.0.2
+// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister <aidan@php.net>
+if (!defined('PHP_EOL')) {
+    switch (strtoupper(substr(PHP_OS, 0, 3))) {
+        case 'WIN':
+            define('PHP_EOL', "\r\n");
+            break;
+        case 'DAR':
+            define('PHP_EOL', "\r");
+            break;
+        default:
+            define('PHP_EOL', "\n");
+    }
+}
+
+/**
+ * Bootstrap class that contains meta-functionality for HTML Purifier such as
+ * the autoload function.
+ *
+ * @note
+ *      This class may be used without any other files from HTML Purifier.
+ */
+class HTMLPurifier_Bootstrap
+{
+
+    /**
+     * Autoload function for HTML Purifier
+     * @param $class Class to load
+     */
+    public static function autoload($class) {
+        $file = HTMLPurifier_Bootstrap::getPath($class);
+        if (!$file) return false;
+        require HTMLPURIFIER_PREFIX . '/' . $file;
+        return true;
+    }
+
+    /**
+     * Returns the path for a specific class.
+     */
+    public static function getPath($class) {
+        if (strncmp('HTMLPurifier', $class, 12) !== 0) return false;
+        // Custom implementations
+        if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
+            $code = str_replace('_', '-', substr($class, 22));
+            $file = 'HTMLPurifier/Language/classes/' . $code . '.php';
+        } else {
+            $file = str_replace('_', '/', $class) . '.php';
+        }
+        if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) return false;
+        return $file;
+    }
+
+    /**
+     * "Pre-registers" our autoloader on the SPL stack.
+     */
+    public static function registerAutoload() {
+        $autoload = array('HTMLPurifier_Bootstrap', 'autoload');
+        if ( ($funcs = spl_autoload_functions()) === false ) {
+            spl_autoload_register($autoload);
+        } elseif (function_exists('spl_autoload_unregister')) {
+            $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&
+                      version_compare(PHP_VERSION, '5.1.0', '>=');
+            foreach ($funcs as $func) {
+                if (is_array($func)) {
+                    // :TRICKY: There are some compatibility issues and some
+                    // places where we need to error out
+                    $reflector = new ReflectionMethod($func[0], $func[1]);
+                    if (!$reflector->isStatic()) {
+                        throw new Exception('
+                            HTML Purifier autoloader registrar is not compatible
+                            with non-static object methods due to PHP Bug #44144;
+                            Please do not use HTMLPurifier.autoload.php (or any
+                            file that includes this file); instead, place the code:
+                            spl_autoload_register(array(\'HTMLPurifier_Bootstrap\', \'autoload\'))
+                            after your own autoloaders.
+                        ');
+                    }
+                    // Suprisingly, spl_autoload_register supports the
+                    // Class::staticMethod callback format, although call_user_func doesn't
+                    if ($compat) $func = implode('::', $func);
+                }
+                spl_autoload_unregister($func);
+            }
+            spl_autoload_register($autoload);
+            foreach ($funcs as $func) spl_autoload_register($func);
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/CSSDefinition.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
new file mode 100755
index 0000000000..1a18057338
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
@@ -0,0 +1,292 @@
+<?php
+
+/**
+ * Defines allowed CSS attributes and what their values are.
+ * @see HTMLPurifier_HTMLDefinition
+ */
+class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
+{
+
+    public $type = 'CSS';
+
+    /**
+     * Assoc array of attribute name to definition object.
+     */
+    public $info = array();
+
+    /**
+     * Constructs the info array.  The meat of this class.
+     */
+    protected function doSetup($config) {
+
+        $this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
+            array('left', 'right', 'center', 'justify'), false);
+
+        $border_style =
+        $this->info['border-bottom-style'] =
+        $this->info['border-right-style'] =
+        $this->info['border-left-style'] =
+        $this->info['border-top-style'] =  new HTMLPurifier_AttrDef_Enum(
+            array('none', 'hidden', 'dotted', 'dashed', 'solid', 'double',
+            'groove', 'ridge', 'inset', 'outset'), false);
+
+        $this->info['border-style'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_style);
+
+        $this->info['clear'] = new HTMLPurifier_AttrDef_Enum(
+            array('none', 'left', 'right', 'both'), false);
+        $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
+            array('none', 'left', 'right'), false);
+        $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
+            array('normal', 'italic', 'oblique'), false);
+        $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
+            array('normal', 'small-caps'), false);
+
+        $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_Enum(array('none')),
+                new HTMLPurifier_AttrDef_CSS_URI()
+            )
+        );
+
+        $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
+            array('inside', 'outside'), false);
+        $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
+            array('disc', 'circle', 'square', 'decimal', 'lower-roman',
+            'upper-roman', 'lower-alpha', 'upper-alpha', 'none'), false);
+        $this->info['list-style-image'] = $uri_or_none;
+
+        $this->info['list-style'] = new HTMLPurifier_AttrDef_CSS_ListStyle($config);
+
+        $this->info['text-transform'] = new HTMLPurifier_AttrDef_Enum(
+            array('capitalize', 'uppercase', 'lowercase', 'none'), false);
+        $this->info['color'] = new HTMLPurifier_AttrDef_CSS_Color();
+
+        $this->info['background-image'] = $uri_or_none;
+        $this->info['background-repeat'] = new HTMLPurifier_AttrDef_Enum(
+            array('repeat', 'repeat-x', 'repeat-y', 'no-repeat')
+        );
+        $this->info['background-attachment'] = new HTMLPurifier_AttrDef_Enum(
+            array('scroll', 'fixed')
+        );
+        $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
+
+        $border_color =
+        $this->info['border-top-color'] =
+        $this->info['border-bottom-color'] =
+        $this->info['border-left-color'] =
+        $this->info['border-right-color'] =
+        $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('transparent')),
+            new HTMLPurifier_AttrDef_CSS_Color()
+        ));
+
+        $this->info['background'] = new HTMLPurifier_AttrDef_CSS_Background($config);
+
+        $this->info['border-color'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_color);
+
+        $border_width =
+        $this->info['border-top-width'] =
+        $this->info['border-bottom-width'] =
+        $this->info['border-left-width'] =
+        $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
+            new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
+        ));
+
+        $this->info['border-width'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_width);
+
+        $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('normal')),
+            new HTMLPurifier_AttrDef_CSS_Length()
+        ));
+
+        $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('normal')),
+            new HTMLPurifier_AttrDef_CSS_Length()
+        ));
+
+        $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('xx-small', 'x-small',
+                'small', 'medium', 'large', 'x-large', 'xx-large',
+                'larger', 'smaller')),
+            new HTMLPurifier_AttrDef_CSS_Percentage(),
+            new HTMLPurifier_AttrDef_CSS_Length()
+        ));
+
+        $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('normal')),
+            new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
+            new HTMLPurifier_AttrDef_CSS_Length('0'),
+            new HTMLPurifier_AttrDef_CSS_Percentage(true)
+        ));
+
+        $margin =
+        $this->info['margin-top'] =
+        $this->info['margin-bottom'] =
+        $this->info['margin-left'] =
+        $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage(),
+            new HTMLPurifier_AttrDef_Enum(array('auto'))
+        ));
+
+        $this->info['margin'] = new HTMLPurifier_AttrDef_CSS_Multiple($margin);
+
+        // non-negative
+        $padding =
+        $this->info['padding-top'] =
+        $this->info['padding-bottom'] =
+        $this->info['padding-left'] =
+        $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length('0'),
+            new HTMLPurifier_AttrDef_CSS_Percentage(true)
+        ));
+
+        $this->info['padding'] = new HTMLPurifier_AttrDef_CSS_Multiple($padding);
+
+        $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage()
+        ));
+
+        $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_CSS_Length('0'),
+            new HTMLPurifier_AttrDef_CSS_Percentage(true),
+            new HTMLPurifier_AttrDef_Enum(array('auto'))
+        ));
+        $max = $config->get('CSS', 'MaxImgLength');
+
+        $this->info['width'] =
+        $this->info['height'] =
+            $max === null ?
+            $trusted_wh :
+            new HTMLPurifier_AttrDef_Switch('img',
+                // For img tags:
+                new HTMLPurifier_AttrDef_CSS_Composite(array(
+                    new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                    new HTMLPurifier_AttrDef_Enum(array('auto'))
+                )),
+                // For everyone else:
+                $trusted_wh
+            );
+
+        $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
+
+        $this->info['font-family'] = new HTMLPurifier_AttrDef_CSS_FontFamily();
+
+        // this could use specialized code
+        $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
+            array('normal', 'bold', 'bolder', 'lighter', '100', '200', '300',
+            '400', '500', '600', '700', '800', '900'), false);
+
+        // MUST be called after other font properties, as it references
+        // a CSSDefinition object
+        $this->info['font'] = new HTMLPurifier_AttrDef_CSS_Font($config);
+
+        // same here
+        $this->info['border'] =
+        $this->info['border-bottom'] =
+        $this->info['border-top'] =
+        $this->info['border-left'] =
+        $this->info['border-right'] = new HTMLPurifier_AttrDef_CSS_Border($config);
+
+        $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(array(
+            'collapse', 'separate'));
+
+        $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(array(
+            'top', 'bottom'));
+
+        $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(array(
+            'auto', 'fixed'));
+
+        $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
+            new HTMLPurifier_AttrDef_Enum(array('baseline', 'sub', 'super',
+                'top', 'text-top', 'middle', 'bottom', 'text-bottom')),
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage()
+        ));
+
+        $this->info['border-spacing'] = new HTMLPurifier_AttrDef_CSS_Multiple(new HTMLPurifier_AttrDef_CSS_Length(), 2);
+
+        // partial support
+        $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(array('nowrap'));
+
+        if ($config->get('CSS', 'Proprietary')) {
+            $this->doSetupProprietary($config);
+        }
+
+        if ($config->get('CSS', 'AllowTricky')) {
+            $this->doSetupTricky($config);
+        }
+
+        $allow_important = $config->get('CSS', 'AllowImportant');
+        // wrap all attr-defs with decorator that handles !important
+        foreach ($this->info as $k => $v) {
+            $this->info[$k] = new HTMLPurifier_AttrDef_CSS_ImportantDecorator($v, $allow_important);
+        }
+
+        $this->setupConfigStuff($config);
+    }
+
+    protected function doSetupProprietary($config) {
+        // Internet Explorer only scrollbar colors
+        $this->info['scrollbar-arrow-color']        = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-base-color']         = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-darkshadow-color']   = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-face-color']         = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-highlight-color']    = new HTMLPurifier_AttrDef_CSS_Color();
+        $this->info['scrollbar-shadow-color']       = new HTMLPurifier_AttrDef_CSS_Color();
+
+        // technically not proprietary, but CSS3, and no one supports it
+        $this->info['opacity']          = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+        $this->info['-moz-opacity']     = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+        $this->info['-khtml-opacity']   = new HTMLPurifier_AttrDef_CSS_AlphaValue();
+
+        // only opacity, for now
+        $this->info['filter'] = new HTMLPurifier_AttrDef_CSS_Filter();
+
+    }
+
+    protected function doSetupTricky($config) {
+        $this->info['display'] = new HTMLPurifier_AttrDef_Enum(array(
+            'inline', 'block', 'list-item', 'run-in', 'compact',
+            'marker', 'table', 'inline-table', 'table-row-group',
+            'table-header-group', 'table-footer-group', 'table-row',
+            'table-column-group', 'table-column', 'table-cell', 'table-caption', 'none'
+        ));
+        $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(array(
+            'visible', 'hidden', 'collapse'
+        ));
+        $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
+    }
+
+
+    /**
+     * Performs extra config-based processing. Based off of
+     * HTMLPurifier_HTMLDefinition.
+     * @todo Refactor duplicate elements into common class (probably using
+     *       composition, not inheritance).
+     */
+    protected function setupConfigStuff($config) {
+
+        // setup allowed elements
+        $support = "(for information on implementing this, see the ".
+                   "support forums) ";
+        $allowed_attributes = $config->get('CSS', 'AllowedProperties');
+        if ($allowed_attributes !== null) {
+            foreach ($this->info as $name => $d) {
+                if(!isset($allowed_attributes[$name])) unset($this->info[$name]);
+                unset($allowed_attributes[$name]);
+            }
+            // emit errors
+            foreach ($allowed_attributes as $name => $d) {
+                // :TODO: Is this htmlspecialchars() call really necessary?
+                $name = htmlspecialchars($name);
+                trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
+            }
+        }
+
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef.php
new file mode 100755
index 0000000000..c5d5216dab
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Defines allowed child nodes and validates tokens against it.
+ */
+abstract class HTMLPurifier_ChildDef
+{
+    /**
+     * Type of child definition, usually right-most part of class name lowercase.
+     * Used occasionally in terms of context.
+     */
+    public $type;
+
+    /**
+     * Bool that indicates whether or not an empty array of children is okay
+     *
+     * This is necessary for redundant checking when changes affecting
+     * a child node may cause a parent node to now be disallowed.
+     */
+    public $allow_empty;
+
+    /**
+     * Lookup array of all elements that this definition could possibly allow
+     */
+    public $elements = array();
+
+    /**
+     * Get lookup of tag names that should not close this element automatically.
+     * All other elements will do so.
+     */
+    public function getAllowedElements($config) {
+        return $this->elements;
+    }
+
+    /**
+     * Validates nodes according to definition and returns modification.
+     *
+     * @param $tokens_of_children Array of HTMLPurifier_Token
+     * @param $config HTMLPurifier_Config object
+     * @param $context HTMLPurifier_Context object
+     * @return bool true to leave nodes as is
+     * @return bool false to remove parent node
+     * @return array of replacement child tokens
+     */
+    abstract public function validateChildren($tokens_of_children, $config, $context);
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
new file mode 100755
index 0000000000..15c364ee33
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Definition that uses different definitions depending on context.
+ *
+ * The del and ins tags are notable because they allow different types of
+ * elements depending on whether or not they're in a block or inline context.
+ * Chameleon allows this behavior to happen by using two different
+ * definitions depending on context.  While this somewhat generalized,
+ * it is specifically intended for those two tags.
+ */
+class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
+{
+
+    /**
+     * Instance of the definition object to use when inline. Usually stricter.
+     */
+    public $inline;
+
+    /**
+     * Instance of the definition object to use when block.
+     */
+    public $block;
+
+    public $type = 'chameleon';
+
+    /**
+     * @param $inline List of elements to allow when inline.
+     * @param $block List of elements to allow when block.
+     */
+    public function __construct($inline, $block) {
+        $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
+        $this->block  = new HTMLPurifier_ChildDef_Optional($block);
+        $this->elements = $this->block->elements;
+    }
+
+    public function validateChildren($tokens_of_children, $config, $context) {
+        if ($context->get('IsInline') === false) {
+            return $this->block->validateChildren(
+                $tokens_of_children, $config, $context);
+        } else {
+            return $this->inline->validateChildren(
+                $tokens_of_children, $config, $context);
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
new file mode 100755
index 0000000000..b68047b4b5
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Custom validation class, accepts DTD child definitions
+ *
+ * @warning Currently this class is an all or nothing proposition, that is,
+ *          it will only give a bool return value.
+ */
+class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
+{
+    public $type = 'custom';
+    public $allow_empty = false;
+    /**
+     * Allowed child pattern as defined by the DTD
+     */
+    public $dtd_regex;
+    /**
+     * PCRE regex derived from $dtd_regex
+     * @private
+     */
+    private $_pcre_regex;
+    /**
+     * @param $dtd_regex Allowed child pattern from the DTD
+     */
+    public function __construct($dtd_regex) {
+        $this->dtd_regex = $dtd_regex;
+        $this->_compileRegex();
+    }
+    /**
+     * Compiles the PCRE regex from a DTD regex ($dtd_regex to $_pcre_regex)
+     */
+    protected function _compileRegex() {
+        $raw = str_replace(' ', '', $this->dtd_regex);
+        if ($raw{0} != '(') {
+            $raw = "($raw)";
+        }
+        $el = '[#a-zA-Z0-9_.-]+';
+        $reg = $raw;
+
+        // COMPLICATED! AND MIGHT BE BUGGY! I HAVE NO CLUE WHAT I'M
+        // DOING! Seriously: if there's problems, please report them.
+
+        // collect all elements into the $elements array
+        preg_match_all("/$el/", $reg, $matches);
+        foreach ($matches[0] as $match) {
+            $this->elements[$match] = true;
+        }
+
+        // setup all elements as parentheticals with leading commas
+        $reg = preg_replace("/$el/", '(,\\0)', $reg);
+
+        // remove commas when they were not solicited
+        $reg = preg_replace("/([^,(|]\(+),/", '\\1', $reg);
+
+        // remove all non-paranthetical commas: they are handled by first regex
+        $reg = preg_replace("/,\(/", '(', $reg);
+
+        $this->_pcre_regex = $reg;
+    }
+    public function validateChildren($tokens_of_children, $config, $context) {
+        $list_of_children = '';
+        $nesting = 0; // depth into the nest
+        foreach ($tokens_of_children as $token) {
+            if (!empty($token->is_whitespace)) continue;
+
+            $is_child = ($nesting == 0); // direct
+
+            if ($token instanceof HTMLPurifier_Token_Start) {
+                $nesting++;
+            } elseif ($token instanceof HTMLPurifier_Token_End) {
+                $nesting--;
+            }
+
+            if ($is_child) {
+                $list_of_children .= $token->name . ',';
+            }
+        }
+        // add leading comma to deal with stray comma declarations
+        $list_of_children = ',' . rtrim($list_of_children, ',');
+        $okay =
+            preg_match(
+                '/^,?'.$this->_pcre_regex.'$/',
+                $list_of_children
+            );
+
+        return (bool) $okay;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
new file mode 100755
index 0000000000..13171f6651
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Definition that disallows all elements.
+ * @warning validateChildren() in this class is actually never called, because
+ *          empty elements are corrected in HTMLPurifier_Strategy_MakeWellFormed
+ *          before child definitions are parsed in earnest by
+ *          HTMLPurifier_Strategy_FixNesting.
+ */
+class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
+{
+    public $allow_empty = true;
+    public $type = 'empty';
+    public function __construct() {}
+    public function validateChildren($tokens_of_children, $config, $context) {
+        return array();
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
new file mode 100755
index 0000000000..32bcb9898e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Definition that allows a set of elements, and allows no children.
+ * @note This is a hack to reuse code from HTMLPurifier_ChildDef_Required,
+ *       really, one shouldn't inherit from the other.  Only altered behavior
+ *       is to overload a returned false with an array.  Thus, it will never
+ *       return false.
+ */
+class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
+{
+    public $allow_empty = true;
+    public $type = 'optional';
+    public function validateChildren($tokens_of_children, $config, $context) {
+        $result = parent::validateChildren($tokens_of_children, $config, $context);
+        // we assume that $tokens_of_children is not modified
+        if ($result === false) {
+            if (empty($tokens_of_children)) return true;
+            elseif ($this->whitespace) return $tokens_of_children;
+            else return array();
+        }
+        return $result;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
new file mode 100755
index 0000000000..c3e748b260
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * Definition that allows a set of elements, but disallows empty children.
+ */
+class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
+{
+    /**
+     * Lookup table of allowed elements.
+     * @public
+     */
+    public $elements = array();
+    /**
+     * Whether or not the last passed node was all whitespace.
+     */
+    protected $whitespace = false;
+    /**
+     * @param $elements List of allowed element names (lowercase).
+     */
+    public function __construct($elements) {
+        if (is_string($elements)) {
+            $elements = str_replace(' ', '', $elements);
+            $elements = explode('|', $elements);
+        }
+        $keys = array_keys($elements);
+        if ($keys == array_keys($keys)) {
+            $elements = array_flip($elements);
+            foreach ($elements as $i => $x) {
+                $elements[$i] = true;
+                if (empty($i)) unset($elements[$i]); // remove blank
+            }
+        }
+        $this->elements = $elements;
+    }
+    public $allow_empty = false;
+    public $type = 'required';
+    public function validateChildren($tokens_of_children, $config, $context) {
+        // Flag for subclasses
+        $this->whitespace = false;
+
+        // if there are no tokens, delete parent node
+        if (empty($tokens_of_children)) return false;
+
+        // the new set of children
+        $result = array();
+
+        // current depth into the nest
+        $nesting = 0;
+
+        // whether or not we're deleting a node
+        $is_deleting = false;
+
+        // whether or not parsed character data is allowed
+        // this controls whether or not we silently drop a tag
+        // or generate escaped HTML from it
+        $pcdata_allowed = isset($this->elements['#PCDATA']);
+
+        // a little sanity check to make sure it's not ALL whitespace
+        $all_whitespace = true;
+
+        // some configuration
+        $escape_invalid_children = $config->get('Core', 'EscapeInvalidChildren');
+
+        // generator
+        $gen = new HTMLPurifier_Generator($config, $context);
+
+        foreach ($tokens_of_children as $token) {
+            if (!empty($token->is_whitespace)) {
+                $result[] = $token;
+                continue;
+            }
+            $all_whitespace = false; // phew, we're not talking about whitespace
+
+            $is_child = ($nesting == 0);
+
+            if ($token instanceof HTMLPurifier_Token_Start) {
+                $nesting++;
+            } elseif ($token instanceof HTMLPurifier_Token_End) {
+                $nesting--;
+            }
+
+            if ($is_child) {
+                $is_deleting = false;
+                if (!isset($this->elements[$token->name])) {
+                    $is_deleting = true;
+                    if ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text) {
+                        $result[] = $token;
+                    } elseif ($pcdata_allowed && $escape_invalid_children) {
+                        $result[] = new HTMLPurifier_Token_Text(
+                            $gen->generateFromToken($token)
+                        );
+                    }
+                    continue;
+                }
+            }
+            if (!$is_deleting || ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text)) {
+                $result[] = $token;
+            } elseif ($pcdata_allowed && $escape_invalid_children) {
+                $result[] =
+                    new HTMLPurifier_Token_Text(
+                        $gen->generateFromToken($token)
+                    );
+            } else {
+                // drop silently
+            }
+        }
+        if (empty($result)) return false;
+        if ($all_whitespace) {
+            $this->whitespace = true;
+            return false;
+        }
+        if ($tokens_of_children == $result) return true;
+        return $result;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
new file mode 100755
index 0000000000..dfae8a6e5e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Takes the contents of blockquote when in strict and reformats for validation.
+ */
+class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required
+{
+    protected $real_elements;
+    protected $fake_elements;
+    public $allow_empty = true;
+    public $type = 'strictblockquote';
+    protected $init = false;
+
+    /**
+     * @note We don't want MakeWellFormed to auto-close inline elements since
+     *       they might be allowed.
+     */
+    public function getAllowedElements($config) {
+        $this->init($config);
+        return $this->fake_elements;
+    }
+
+    public function validateChildren($tokens_of_children, $config, $context) {
+
+        $this->init($config);
+
+        // trick the parent class into thinking it allows more
+        $this->elements = $this->fake_elements;
+        $result = parent::validateChildren($tokens_of_children, $config, $context);
+        $this->elements = $this->real_elements;
+
+        if ($result === false) return array();
+        if ($result === true) $result = $tokens_of_children;
+
+        $def = $config->getHTMLDefinition();
+        $block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);
+        $block_wrap_end   = new HTMLPurifier_Token_End(  $def->info_block_wrapper);
+        $is_inline = false;
+        $depth = 0;
+        $ret = array();
+
+        // assuming that there are no comment tokens
+        foreach ($result as $i => $token) {
+            $token = $result[$i];
+            // ifs are nested for readability
+            if (!$is_inline) {
+                if (!$depth) {
+                     if (
+                        ($token instanceof HTMLPurifier_Token_Text && !$token->is_whitespace) ||
+                        (!$token instanceof HTMLPurifier_Token_Text && !isset($this->elements[$token->name]))
+                     ) {
+                        $is_inline = true;
+                        $ret[] = $block_wrap_start;
+                     }
+                }
+            } else {
+                if (!$depth) {
+                    // starting tokens have been inline text / empty
+                    if ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) {
+                        if (isset($this->elements[$token->name])) {
+                            // ended
+                            $ret[] = $block_wrap_end;
+                            $is_inline = false;
+                        }
+                    }
+                }
+            }
+            $ret[] = $token;
+            if ($token instanceof HTMLPurifier_Token_Start) $depth++;
+            if ($token instanceof HTMLPurifier_Token_End)   $depth--;
+        }
+        if ($is_inline) $ret[] = $block_wrap_end;
+        return $ret;
+    }
+
+    private function init($config) {
+        if (!$this->init) {
+            $def = $config->getHTMLDefinition();
+            // allow all inline elements
+            $this->real_elements = $this->elements;
+            $this->fake_elements = $def->info_content_sets['Flow'];
+            $this->fake_elements['#PCDATA'] = true;
+            $this->init = true;
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
new file mode 100755
index 0000000000..34f0227dd2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * Definition for tables
+ */
+class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
+{
+    public $allow_empty = false;
+    public $type = 'table';
+    public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
+        'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
+    public function __construct() {}
+    public function validateChildren($tokens_of_children, $config, $context) {
+        if (empty($tokens_of_children)) return false;
+
+        // this ensures that the loop gets run one last time before closing
+        // up. It's a little bit of a hack, but it works! Just make sure you
+        // get rid of the token later.
+        $tokens_of_children[] = false;
+
+        // only one of these elements is allowed in a table
+        $caption = false;
+        $thead   = false;
+        $tfoot   = false;
+
+        // as many of these as you want
+        $cols    = array();
+        $content = array();
+
+        $nesting = 0; // current depth so we can determine nodes
+        $is_collecting = false; // are we globbing together tokens to package
+                                // into one of the collectors?
+        $collection = array(); // collected nodes
+        $tag_index = 0; // the first node might be whitespace,
+                            // so this tells us where the start tag is
+
+        foreach ($tokens_of_children as $token) {
+            $is_child = ($nesting == 0);
+
+            if ($token === false) {
+                // terminating sequence started
+            } elseif ($token instanceof HTMLPurifier_Token_Start) {
+                $nesting++;
+            } elseif ($token instanceof HTMLPurifier_Token_End) {
+                $nesting--;
+            }
+
+            // handle node collection
+            if ($is_collecting) {
+                if ($is_child) {
+                    // okay, let's stash the tokens away
+                    // first token tells us the type of the collection
+                    switch ($collection[$tag_index]->name) {
+                        case 'tr':
+                        case 'tbody':
+                            $content[] = $collection;
+                            break;
+                        case 'caption':
+                            if ($caption !== false) break;
+                            $caption = $collection;
+                            break;
+                        case 'thead':
+                        case 'tfoot':
+                            // access the appropriate variable, $thead or $tfoot
+                            $var = $collection[$tag_index]->name;
+                            if ($$var === false) {
+                                $$var = $collection;
+                            } else {
+                                // transmutate the first and less entries into
+                                // tbody tags, and then put into content
+                                $collection[$tag_index]->name = 'tbody';
+                                $collection[count($collection)-1]->name = 'tbody';
+                                $content[] = $collection;
+                            }
+                            break;
+                         case 'colgroup':
+                            $cols[] = $collection;
+                            break;
+                    }
+                    $collection = array();
+                    $is_collecting = false;
+                    $tag_index = 0;
+                } else {
+                    // add the node to the collection
+                    $collection[] = $token;
+                }
+            }
+
+            // terminate
+            if ($token === false) break;
+
+            if ($is_child) {
+                // determine what we're dealing with
+                if ($token->name == 'col') {
+                    // the only empty tag in the possie, we can handle it
+                    // immediately
+                    $cols[] = array_merge($collection, array($token));
+                    $collection = array();
+                    $tag_index = 0;
+                    continue;
+                }
+                switch($token->name) {
+                    case 'caption':
+                    case 'colgroup':
+                    case 'thead':
+                    case 'tfoot':
+                    case 'tbody':
+                    case 'tr':
+                        $is_collecting = true;
+                        $collection[] = $token;
+                        continue;
+                    default:
+                        if (!empty($token->is_whitespace)) {
+                            $collection[] = $token;
+                            $tag_index++;
+                        }
+                        continue;
+                }
+            }
+        }
+
+        if (empty($content)) return false;
+
+        $ret = array();
+        if ($caption !== false) $ret = array_merge($ret, $caption);
+        if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
+        if ($thead !== false)   $ret = array_merge($ret, $thead);
+        if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
+        foreach ($content as $token_array) $ret = array_merge($ret, $token_array);
+        if (!empty($collection) && $is_collecting == false){
+            // grab the trailing space
+            $ret = array_merge($ret, $collection);
+        }
+
+        array_pop($tokens_of_children); // remove phantom token
+
+        return ($ret === $tokens_of_children) ? true : $ret;
+
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Config.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Config.php
new file mode 100755
index 0000000000..f8e1f7804e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Config.php
@@ -0,0 +1,497 @@
+<?php
+
+/**
+ * Configuration object that triggers customizable behavior.
+ *
+ * @warning This class is strongly defined: that means that the class
+ *          will fail if an undefined directive is retrieved or set.
+ *
+ * @note Many classes that could (although many times don't) use the
+ *       configuration object make it a mandatory parameter.  This is
+ *       because a configuration object should always be forwarded,
+ *       otherwise, you run the risk of missing a parameter and then
+ *       being stumped when a configuration directive doesn't work.
+ *
+ * @todo Reconsider some of the public member variables
+ */
+class HTMLPurifier_Config
+{
+
+    /**
+     * HTML Purifier's version
+     */
+    public $version = '3.3.0';
+
+    /**
+     * Bool indicator whether or not to automatically finalize
+     * the object if a read operation is done
+     */
+    public $autoFinalize = true;
+
+    // protected member variables
+
+    /**
+     * Namespace indexed array of serials for specific namespaces (see
+     * getSerial() for more info).
+     */
+    protected $serials = array();
+
+    /**
+     * Serial for entire configuration object
+     */
+    protected $serial;
+
+    /**
+     * Parser for variables
+     */
+    protected $parser;
+
+    /**
+     * Reference HTMLPurifier_ConfigSchema for value checking
+     * @note This is public for introspective purposes. Please don't
+     *       abuse!
+     */
+    public $def;
+
+    /**
+     * Indexed array of definitions
+     */
+    protected $definitions;
+
+    /**
+     * Bool indicator whether or not config is finalized
+     */
+    protected $finalized = false;
+
+    /**
+     * Property list containing configuration directives.
+     */
+    protected $plist;
+
+    /**
+     * @param $definition HTMLPurifier_ConfigSchema that defines what directives
+     *                    are allowed.
+     */
+    public function __construct($definition) {
+        $this->plist = new HTMLPurifier_PropertyList($definition->defaultPlist);
+        $this->def = $definition; // keep a copy around for checking
+        $this->parser = new HTMLPurifier_VarParser_Flexible();
+    }
+
+    /**
+     * Convenience constructor that creates a config object based on a mixed var
+     * @param mixed $config Variable that defines the state of the config
+     *                      object. Can be: a HTMLPurifier_Config() object,
+     *                      an array of directives based on loadArray(),
+     *                      or a string filename of an ini file.
+     * @param HTMLPurifier_ConfigSchema Schema object
+     * @return Configured HTMLPurifier_Config object
+     */
+    public static function create($config, $schema = null) {
+        if ($config instanceof HTMLPurifier_Config) {
+            // pass-through
+            return $config;
+        }
+        if (!$schema) {
+            $ret = HTMLPurifier_Config::createDefault();
+        } else {
+            $ret = new HTMLPurifier_Config($schema);
+        }
+        if (is_string($config)) $ret->loadIni($config);
+        elseif (is_array($config)) $ret->loadArray($config);
+        return $ret;
+    }
+
+    /**
+     * Convenience constructor that creates a default configuration object.
+     * @return Default HTMLPurifier_Config object.
+     */
+    public static function createDefault() {
+        $definition = HTMLPurifier_ConfigSchema::instance();
+        $config = new HTMLPurifier_Config($definition);
+        return $config;
+    }
+
+    /**
+     * Retreives a value from the configuration.
+     * @param $namespace String namespace
+     * @param $key String key
+     */
+    public function get($namespace, $key) {
+        if (!$this->finalized) $this->autoFinalize ? $this->finalize() : $this->plist->squash(true);
+        if (!isset($this->def->info[$namespace][$key])) {
+            // can't add % due to SimpleTest bug
+            trigger_error('Cannot retrieve value of undefined directive ' . htmlspecialchars("$namespace.$key"),
+                E_USER_WARNING);
+            return;
+        }
+        if (isset($this->def->info[$namespace][$key]->isAlias)) {
+            $d = $this->def->info[$namespace][$key];
+            trigger_error('Cannot get value from aliased directive, use real name ' . $d->namespace . '.' . $d->name,
+                E_USER_ERROR);
+            return;
+        }
+        return $this->plist->get("$namespace.$key");
+    }
+
+    /**
+     * Retreives an array of directives to values from a given namespace
+     * @param $namespace String namespace
+     */
+    public function getBatch($namespace) {
+        if (!$this->finalized) $this->autoFinalize ? $this->finalize() : $this->plist->squash(true);
+        if (!isset($this->def->info[$namespace])) {
+            trigger_error('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace),
+                E_USER_WARNING);
+            return;
+        }
+        $full = $this->getAll();
+        return $full[$namespace];
+    }
+
+    /**
+     * Returns a md5 signature of a segment of the configuration object
+     * that uniquely identifies that particular configuration
+     * @note Revision is handled specially and is removed from the batch
+     *       before processing!
+     * @param $namespace Namespace to get serial for
+     */
+    public function getBatchSerial($namespace) {
+        if (empty($this->serials[$namespace])) {
+            $batch = $this->getBatch($namespace);
+            unset($batch['DefinitionRev']);
+            $this->serials[$namespace] = md5(serialize($batch));
+        }
+        return $this->serials[$namespace];
+    }
+
+    /**
+     * Returns a md5 signature for the entire configuration object
+     * that uniquely identifies that particular configuration
+     */
+    public function getSerial() {
+        if (empty($this->serial)) {
+            $this->serial = md5(serialize($this->getAll()));
+        }
+        return $this->serial;
+    }
+
+    /**
+     * Retrieves all directives, organized by namespace
+     */
+    public function getAll() {
+        if (!$this->finalized) $this->autoFinalize ? $this->finalize() : $this->plist->squash(true);
+        $ret = array();
+        foreach ($this->plist->squash() as $name => $value) {
+            list($ns, $key) = explode('.', $name, 2);
+            $ret[$ns][$key] = $value;
+        }
+        return $ret;
+    }
+
+    /**
+     * Sets a value to configuration.
+     * @param $namespace String namespace
+     * @param $key String key
+     * @param $value Mixed value
+     */
+    public function set($namespace, $key, $value, $from_alias = false) {
+        if ($this->isFinalized('Cannot set directive after finalization')) return;
+        if (!isset($this->def->info[$namespace][$key])) {
+            trigger_error('Cannot set undefined directive ' . htmlspecialchars("$namespace.$key") . ' to value',
+                E_USER_WARNING);
+            return;
+        }
+        $def = $this->def->info[$namespace][$key];
+
+        if (isset($def->isAlias)) {
+            if ($from_alias) {
+                trigger_error('Double-aliases not allowed, please fix '.
+                    'ConfigSchema bug with' . "$namespace.$key", E_USER_ERROR);
+                return;
+            }
+            $this->set($new_ns  = $def->namespace,
+                       $new_dir = $def->name,
+                       $value, true);
+            trigger_error("$namespace.$key is an alias, preferred directive name is $new_ns.$new_dir", E_USER_NOTICE);
+            return;
+        }
+
+        // Raw type might be negative when using the fully optimized form
+        // of stdclass, which indicates allow_null == true
+        $rtype = is_int($def) ? $def : $def->type;
+        if ($rtype < 0) {
+            $type = -$rtype;
+            $allow_null = true;
+        } else {
+            $type = $rtype;
+            $allow_null = isset($def->allow_null);
+        }
+
+        try {
+            $value = $this->parser->parse($value, $type, $allow_null);
+        } catch (HTMLPurifier_VarParserException $e) {
+            trigger_error('Value for ' . "$namespace.$key" . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
+            return;
+        }
+        if (is_string($value) && is_object($def)) {
+            // resolve value alias if defined
+            if (isset($def->aliases[$value])) {
+                $value = $def->aliases[$value];
+            }
+            // check to see if the value is allowed
+            if (isset($def->allowed) && !isset($def->allowed[$value])) {
+                trigger_error('Value not supported, valid values are: ' .
+                    $this->_listify($def->allowed), E_USER_WARNING);
+                return;
+            }
+        }
+        $this->plist->set("$namespace.$key", $value);
+
+        // reset definitions if the directives they depend on changed
+        // this is a very costly process, so it's discouraged
+        // with finalization
+        if ($namespace == 'HTML' || $namespace == 'CSS') {
+            $this->definitions[$namespace] = null;
+        }
+
+        $this->serials[$namespace] = false;
+    }
+
+    /**
+     * Convenience function for error reporting
+     */
+    private function _listify($lookup) {
+        $list = array();
+        foreach ($lookup as $name => $b) $list[] = $name;
+        return implode(', ', $list);
+    }
+
+    /**
+     * Retrieves object reference to the HTML definition.
+     * @param $raw Return a copy that has not been setup yet. Must be
+     *             called before it's been setup, otherwise won't work.
+     */
+    public function getHTMLDefinition($raw = false) {
+        return $this->getDefinition('HTML', $raw);
+    }
+
+    /**
+     * Retrieves object reference to the CSS definition
+     * @param $raw Return a copy that has not been setup yet. Must be
+     *             called before it's been setup, otherwise won't work.
+     */
+    public function getCSSDefinition($raw = false) {
+        return $this->getDefinition('CSS', $raw);
+    }
+
+    /**
+     * Retrieves a definition
+     * @param $type Type of definition: HTML, CSS, etc
+     * @param $raw  Whether or not definition should be returned raw
+     */
+    public function getDefinition($type, $raw = false) {
+        if (!$this->finalized) $this->autoFinalize ? $this->finalize() : $this->plist->squash(true);
+        $factory = HTMLPurifier_DefinitionCacheFactory::instance();
+        $cache = $factory->create($type, $this);
+        if (!$raw) {
+            // see if we can quickly supply a definition
+            if (!empty($this->definitions[$type])) {
+                if (!$this->definitions[$type]->setup) {
+                    $this->definitions[$type]->setup($this);
+                    $cache->set($this->definitions[$type], $this);
+                }
+                return $this->definitions[$type];
+            }
+            // memory check missed, try cache
+            $this->definitions[$type] = $cache->get($this);
+            if ($this->definitions[$type]) {
+                // definition in cache, return it
+                return $this->definitions[$type];
+            }
+        } elseif (
+            !empty($this->definitions[$type]) &&
+            !$this->definitions[$type]->setup
+        ) {
+            // raw requested, raw in memory, quick return
+            return $this->definitions[$type];
+        }
+        // quick checks failed, let's create the object
+        if ($type == 'HTML') {
+            $this->definitions[$type] = new HTMLPurifier_HTMLDefinition();
+        } elseif ($type == 'CSS') {
+            $this->definitions[$type] = new HTMLPurifier_CSSDefinition();
+        } elseif ($type == 'URI') {
+            $this->definitions[$type] = new HTMLPurifier_URIDefinition();
+        } else {
+            throw new HTMLPurifier_Exception("Definition of $type type not supported");
+        }
+        // quick abort if raw
+        if ($raw) {
+            if (is_null($this->get($type, 'DefinitionID'))) {
+                // fatally error out if definition ID not set
+                throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
+            }
+            return $this->definitions[$type];
+        }
+        // set it up
+        $this->definitions[$type]->setup($this);
+        // save in cache
+        $cache->set($this->definitions[$type], $this);
+        return $this->definitions[$type];
+    }
+
+    /**
+     * Loads configuration values from an array with the following structure:
+     * Namespace.Directive => Value
+     * @param $config_array Configuration associative array
+     */
+    public function loadArray($config_array) {
+        if ($this->isFinalized('Cannot load directives after finalization')) return;
+        foreach ($config_array as $key => $value) {
+            $key = str_replace('_', '.', $key);
+            if (strpos($key, '.') !== false) {
+                // condensed form
+                list($namespace, $directive) = explode('.', $key);
+                $this->set($namespace, $directive, $value);
+            } else {
+                $namespace = $key;
+                $namespace_values = $value;
+                foreach ($namespace_values as $directive => $value) {
+                    $this->set($namespace, $directive, $value);
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a list of array(namespace, directive) for all directives
+     * that are allowed in a web-form context as per an allowed
+     * namespaces/directives list.
+     * @param $allowed List of allowed namespaces/directives
+     */
+    public static function getAllowedDirectivesForForm($allowed, $schema = null) {
+        if (!$schema) {
+            $schema = HTMLPurifier_ConfigSchema::instance();
+        }
+        if ($allowed !== true) {
+             if (is_string($allowed)) $allowed = array($allowed);
+             $allowed_ns = array();
+             $allowed_directives = array();
+             $blacklisted_directives = array();
+             foreach ($allowed as $ns_or_directive) {
+                 if (strpos($ns_or_directive, '.') !== false) {
+                     // directive
+                     if ($ns_or_directive[0] == '-') {
+                         $blacklisted_directives[substr($ns_or_directive, 1)] = true;
+                     } else {
+                         $allowed_directives[$ns_or_directive] = true;
+                     }
+                 } else {
+                     // namespace
+                     $allowed_ns[$ns_or_directive] = true;
+                 }
+             }
+        }
+        $ret = array();
+        foreach ($schema->info as $ns => $keypairs) {
+            foreach ($keypairs as $directive => $def) {
+                if ($allowed !== true) {
+                    if (isset($blacklisted_directives["$ns.$directive"])) continue;
+                    if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
+                }
+                if (isset($def->isAlias)) continue;
+                if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
+                $ret[] = array($ns, $directive);
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Loads configuration values from $_GET/$_POST that were posted
+     * via ConfigForm
+     * @param $array $_GET or $_POST array to import
+     * @param $index Index/name that the config variables are in
+     * @param $allowed List of allowed namespaces/directives
+     * @param $mq_fix Boolean whether or not to enable magic quotes fix
+     * @param $schema Instance of HTMLPurifier_ConfigSchema to use, if not global copy
+     */
+    public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
+        $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
+        $config = HTMLPurifier_Config::create($ret, $schema);
+        return $config;
+    }
+
+    /**
+     * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
+     * @note Same parameters as loadArrayFromForm
+     */
+    public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {
+         $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
+         $this->loadArray($ret);
+    }
+
+    /**
+     * Prepares an array from a form into something usable for the more
+     * strict parts of HTMLPurifier_Config
+     */
+    public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
+        if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+        $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
+
+        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
+        $ret = array();
+        foreach ($allowed as $key) {
+            list($ns, $directive) = $key;
+            $skey = "$ns.$directive";
+            if (!empty($array["Null_$skey"])) {
+                $ret[$ns][$directive] = null;
+                continue;
+            }
+            if (!isset($array[$skey])) continue;
+            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
+            $ret[$ns][$directive] = $value;
+        }
+        return $ret;
+    }
+
+    /**
+     * Loads configuration values from an ini file
+     * @param $filename Name of ini file
+     */
+    public function loadIni($filename) {
+        if ($this->isFinalized('Cannot load directives after finalization')) return;
+        $array = parse_ini_file($filename, true);
+        $this->loadArray($array);
+    }
+
+    /**
+     * Checks whether or not the configuration object is finalized.
+     * @param $error String error message, or false for no error
+     */
+    public function isFinalized($error = false) {
+        if ($this->finalized && $error) {
+            trigger_error($error, E_USER_ERROR);
+        }
+        return $this->finalized;
+    }
+
+    /**
+     * Finalizes configuration only if auto finalize is on and not
+     * already finalized
+     */
+    public function autoFinalize() {
+        if (!$this->finalized && $this->autoFinalize) $this->finalize();
+    }
+
+    /**
+     * Finalizes a configuration object, prohibiting further change
+     */
+    public function finalize() {
+        $this->finalized = true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
new file mode 100755
index 0000000000..340ed7dbc6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
@@ -0,0 +1,231 @@
+<?php
+
+/**
+ * Configuration definition, defines directives and their defaults.
+ */
+class HTMLPurifier_ConfigSchema {
+
+    /**
+     * Defaults of the directives and namespaces.
+     * @note This shares the exact same structure as HTMLPurifier_Config::$conf
+     */
+    public $defaults = array();
+
+    /**
+     * The default property list. Do not edit this property list.
+     */
+    public $defaultPlist;
+
+    /**
+     * Definition of the directives. The structure of this is:
+     *
+     *  array(
+     *      'Namespace' => array(
+     *          'Directive' => new stdclass(),
+     *      )
+     *  )
+     *
+     * The stdclass may have the following properties:
+     *
+     *  - If isAlias isn't set:
+     *      - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
+     *      - allow_null: If set, this directive allows null values
+     *      - aliases: If set, an associative array of value aliases to real values
+     *      - allowed: If set, a lookup array of allowed (string) values
+     *  - If isAlias is set:
+     *      - namespace: Namespace this directive aliases to
+     *      - name: Directive name this directive aliases to
+     *
+     * In certain degenerate cases, stdclass will actually be an integer. In
+     * that case, the value is equivalent to an stdclass with the type
+     * property set to the integer. If the integer is negative, type is
+     * equal to the absolute value of integer, and allow_null is true.
+     *
+     * This class is friendly with HTMLPurifier_Config. If you need introspection
+     * about the schema, you're better of using the ConfigSchema_Interchange,
+     * which uses more memory but has much richer information.
+     */
+    public $info = array();
+
+    /**
+     * Application-wide singleton
+     */
+    static protected $singleton;
+
+    public function __construct() {
+        $this->defaultPlist = new HTMLPurifier_PropertyList();
+    }
+
+    /**
+     * Unserializes the default ConfigSchema.
+     */
+    public static function makeFromSerial() {
+        return unserialize(file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser'));
+    }
+
+    /**
+     * Retrieves an instance of the application-wide configuration definition.
+     */
+    public static function instance($prototype = null) {
+        if ($prototype !== null) {
+            HTMLPurifier_ConfigSchema::$singleton = $prototype;
+        } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
+            HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
+        }
+        return HTMLPurifier_ConfigSchema::$singleton;
+    }
+
+    /**
+     * Defines a directive for configuration
+     * @warning Will fail of directive's namespace is defined.
+     * @warning This method's signature is slightly different from the legacy
+     *          define() static method! Beware!
+     * @param $namespace Namespace the directive is in
+     * @param $name Key of directive
+     * @param $default Default value of directive
+     * @param $type Allowed type of the directive. See
+     *      HTMLPurifier_DirectiveDef::$type for allowed values
+     * @param $allow_null Whether or not to allow null values
+     */
+    public function add($namespace, $name, $default, $type, $allow_null) {
+        $obj = new stdclass();
+        $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
+        if ($allow_null) $obj->allow_null = true;
+        $this->info[$namespace][$name] = $obj;
+        $this->defaults[$namespace][$name] = $default;
+        $this->defaultPlist->set("$namespace.$name", $default);
+    }
+
+    /**
+     * Defines a namespace for directives to be put into.
+     * @warning This is slightly different from the corresponding static
+     *          method.
+     * @param $namespace Namespace's name
+     */
+    public function addNamespace($namespace) {
+        $this->info[$namespace] = array();
+        $this->defaults[$namespace] = array();
+    }
+
+    /**
+     * Defines a directive value alias.
+     *
+     * Directive value aliases are convenient for developers because it lets
+     * them set a directive to several values and get the same result.
+     * @param $namespace Directive's namespace
+     * @param $name Name of Directive
+     * @param $aliases Hash of aliased values to the real alias
+     */
+    public function addValueAliases($namespace, $name, $aliases) {
+        if (!isset($this->info[$namespace][$name]->aliases)) {
+            $this->info[$namespace][$name]->aliases = array();
+        }
+        foreach ($aliases as $alias => $real) {
+            $this->info[$namespace][$name]->aliases[$alias] = $real;
+        }
+    }
+
+    /**
+     * Defines a set of allowed values for a directive.
+     * @warning This is slightly different from the corresponding static
+     *          method definition.
+     * @param $namespace Namespace of directive
+     * @param $name Name of directive
+     * @param $allowed Lookup array of allowed values
+     */
+    public function addAllowedValues($namespace, $name, $allowed) {
+        $this->info[$namespace][$name]->allowed = $allowed;
+    }
+
+    /**
+     * Defines a directive alias for backwards compatibility
+     * @param $namespace
+     * @param $name Directive that will be aliased
+     * @param $new_namespace
+     * @param $new_name Directive that the alias will be to
+     */
+    public function addAlias($namespace, $name, $new_namespace, $new_name) {
+        $obj = new stdclass;
+        $obj->namespace = $new_namespace;
+        $obj->name = $new_name;
+        $obj->isAlias = true;
+        $this->info[$namespace][$name] = $obj;
+    }
+
+    /**
+     * Replaces any stdclass that only has the type property with type integer.
+     */
+    public function postProcess() {
+        foreach ($this->info as $namespace => $info) {
+            foreach ($info as $directive => $v) {
+                if (count((array) $v) == 1) {
+                    $this->info[$namespace][$directive] = $v->type;
+                } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
+                    $this->info[$namespace][$directive] = -$v->type;
+                }
+            }
+        }
+    }
+
+    // DEPRECATED METHODS
+
+    /** @see HTMLPurifier_ConfigSchema->set() */
+    public static function define($namespace, $name, $default, $type, $description) {
+        HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
+        $type_values = explode('/', $type, 2);
+        $type = $type_values[0];
+        $modifier = isset($type_values[1]) ? $type_values[1] : false;
+        $allow_null = ($modifier === 'null');
+        $def = HTMLPurifier_ConfigSchema::instance();
+        $def->add($namespace, $name, $default, $type, $allow_null);
+    }
+
+    /** @see HTMLPurifier_ConfigSchema->addNamespace() */
+    public static function defineNamespace($namespace, $description) {
+        HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
+        $def = HTMLPurifier_ConfigSchema::instance();
+        $def->addNamespace($namespace);
+    }
+
+    /** @see HTMLPurifier_ConfigSchema->addValueAliases() */
+    public static function defineValueAliases($namespace, $name, $aliases) {
+        HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
+        $def = HTMLPurifier_ConfigSchema::instance();
+        $def->addValueAliases($namespace, $name, $aliases);
+    }
+
+    /** @see HTMLPurifier_ConfigSchema->addAllowedValues() */
+    public static function defineAllowedValues($namespace, $name, $allowed_values) {
+        HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
+        $allowed = array();
+        foreach ($allowed_values as $value) {
+            $allowed[$value] = true;
+        }
+        $def = HTMLPurifier_ConfigSchema::instance();
+        $def->addAllowedValues($namespace, $name, $allowed);
+    }
+
+    /** @see HTMLPurifier_ConfigSchema->addAlias() */
+    public static function defineAlias($namespace, $name, $new_namespace, $new_name) {
+        HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
+        $def = HTMLPurifier_ConfigSchema::instance();
+        $def->addAlias($namespace, $name, $new_namespace, $new_name);
+    }
+
+    /** @deprecated, use HTMLPurifier_VarParser->parse() */
+    public function validate($a, $b, $c = false) {
+        trigger_error("HTMLPurifier_ConfigSchema->validate deprecated, use HTMLPurifier_VarParser->parse instead", E_USER_NOTICE);
+        $parser = new HTMLPurifier_VarParser();
+        return $parser->parse($a, $b, $c);
+    }
+
+    /**
+     * Throws an E_USER_NOTICE stating that a method is deprecated.
+     */
+    private static function deprecated($method) {
+        trigger_error("Static HTMLPurifier_ConfigSchema::$method deprecated, use add*() method instead", E_USER_NOTICE);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
new file mode 100755
index 0000000000..987f547bca
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
+ * representation used to perform checks on user configuration.
+ */
+class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
+{
+
+    public function build($interchange) {
+        $schema = new HTMLPurifier_ConfigSchema();
+        foreach ($interchange->namespaces as $n) {
+            $schema->addNamespace($n->namespace);
+        }
+        foreach ($interchange->directives as $d) {
+            $schema->add(
+                $d->id->namespace,
+                $d->id->directive,
+                $d->default,
+                $d->type,
+                $d->typeAllowsNull
+            );
+            if ($d->allowed !== null) {
+                $schema->addAllowedValues(
+                    $d->id->namespace,
+                    $d->id->directive,
+                    $d->allowed
+                );
+            }
+            foreach ($d->aliases as $alias) {
+                $schema->addAlias(
+                    $alias->namespace,
+                    $alias->directive,
+                    $d->id->namespace,
+                    $d->id->directive
+                );
+            }
+            if ($d->valueAliases !== null) {
+                $schema->addValueAliases(
+                    $d->id->namespace,
+                    $d->id->directive,
+                    $d->valueAliases
+                );
+            }
+        }
+        $schema->postProcess();
+        return $schema;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
new file mode 100755
index 0000000000..51bcab78cc
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
+ * which can be further processed to generate documentation.
+ */
+class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
+{
+
+    protected $interchange;
+
+    protected function writeHTMLDiv($html) {
+        $this->startElement('div');
+
+        $purifier = HTMLPurifier::getInstance();
+        $html = $purifier->purify($html);
+        $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
+        $this->writeRaw($html);
+
+        $this->endElement(); // div
+    }
+
+    protected function export($var) {
+        if ($var === array()) return 'array()';
+        return var_export($var, true);
+    }
+
+    public function build($interchange) {
+        // global access, only use as last resort
+        $this->interchange = $interchange;
+
+        $this->setIndent(true);
+        $this->startDocument('1.0', 'UTF-8');
+        $this->startElement('configdoc');
+        $this->writeElement('title', $interchange->name);
+
+        foreach ($interchange->namespaces as $namespace) {
+            $this->buildNamespace($namespace);
+        }
+
+        $this->endElement(); // configdoc
+        $this->flush();
+    }
+
+    public function buildNamespace($namespace) {
+        $this->startElement('namespace');
+        $this->writeAttribute('id', $namespace->namespace);
+
+        $this->writeElement('name', $namespace->namespace);
+        $this->startElement('description');
+            $this->writeHTMLDiv($namespace->description);
+        $this->endElement(); // description
+
+        foreach ($this->interchange->directives as $directive) {
+            if ($directive->id->namespace !== $namespace->namespace) continue;
+            $this->buildDirective($directive);
+        }
+
+        $this->endElement(); // namespace
+    }
+
+    public function buildDirective($directive) {
+        $this->startElement('directive');
+        $this->writeAttribute('id', $directive->id->toString());
+
+        $this->writeElement('name', $directive->id->directive);
+
+        $this->startElement('aliases');
+            foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
+        $this->endElement(); // aliases
+
+        $this->startElement('constraints');
+            if ($directive->version) $this->writeElement('version', $directive->version);
+            $this->startElement('type');
+                if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
+                $this->text($directive->type);
+            $this->endElement(); // type
+            if ($directive->allowed) {
+                $this->startElement('allowed');
+                    foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
+                $this->endElement(); // allowed
+            }
+            $this->writeElement('default', $this->export($directive->default));
+            $this->writeAttribute('xml:space', 'preserve');
+            if ($directive->external) {
+                $this->startElement('external');
+                    foreach ($directive->external as $project) $this->writeElement('project', $project);
+                $this->endElement();
+            }
+        $this->endElement(); // constraints
+
+        if ($directive->deprecatedVersion) {
+            $this->startElement('deprecated');
+                $this->writeElement('version', $directive->deprecatedVersion);
+                $this->writeElement('use', $directive->deprecatedUse->toString());
+            $this->endElement(); // deprecated
+        }
+
+        $this->startElement('description');
+            $this->writeHTMLDiv($directive->description);
+        $this->endElement(); // description
+
+        $this->endElement(); // directive
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
new file mode 100755
index 0000000000..2671516c58
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Exceptions related to configuration schema
+ */
+class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
new file mode 100755
index 0000000000..365c66357f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Generic schema interchange format that can be converted to a runtime
+ * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
+ * are completely validated.
+ */
+class HTMLPurifier_ConfigSchema_Interchange
+{
+
+    /**
+     * Name of the application this schema is describing.
+     */
+    public $name;
+
+    /**
+     * Array of Namespace ID => array(namespace info)
+     */
+    public $namespaces = array();
+
+    /**
+     * Array of Directive ID => array(directive info)
+     */
+    public $directives = array();
+
+    /**
+     * Adds a namespace array to $namespaces
+     */
+    public function addNamespace($namespace) {
+        if (isset($this->namespaces[$i = $namespace->namespace])) {
+            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine namespace '$i'");
+        }
+        $this->namespaces[$i] = $namespace;
+    }
+
+    /**
+     * Adds a directive array to $directives
+     */
+    public function addDirective($directive) {
+        if (isset($this->directives[$i = $directive->id->toString()])) {
+            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
+        }
+        $this->directives[$i] = $directive;
+    }
+
+    /**
+     * Convenience function to perform standard validation. Throws exception
+     * on failed validation.
+     */
+    public function validate() {
+        $validator = new HTMLPurifier_ConfigSchema_Validator();
+        return $validator->validate($this);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
new file mode 100755
index 0000000000..ac8be0d970
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Interchange component class describing configuration directives.
+ */
+class HTMLPurifier_ConfigSchema_Interchange_Directive
+{
+
+    /**
+     * ID of directive, instance of HTMLPurifier_ConfigSchema_Interchange_Id.
+     */
+    public $id;
+
+    /**
+     * String type, e.g. 'integer' or 'istring'.
+     */
+    public $type;
+
+    /**
+     * Default value, e.g. 3 or 'DefaultVal'.
+     */
+    public $default;
+
+    /**
+     * HTML description.
+     */
+    public $description;
+
+    /**
+     * Boolean whether or not null is allowed as a value.
+     */
+    public $typeAllowsNull = false;
+
+    /**
+     * Lookup table of allowed scalar values, e.g. array('allowed' => true).
+     * Null if all values are allowed.
+     */
+    public $allowed;
+
+    /**
+     * List of aliases for the directive,
+     * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
+     */
+    public $aliases = array();
+
+    /**
+     * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
+     * aliasing is disabled (necessary for non-scalar types).
+     */
+    public $valueAliases;
+
+    /**
+     * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
+     * Null if the directive has always existed.
+     */
+    public $version;
+
+    /**
+     * ID of directive that supercedes this old directive, is an instance
+     * of HTMLPurifier_ConfigSchema_Interchange_Id. Null if not deprecated.
+     */
+    public $deprecatedUse;
+
+    /**
+     * Version of HTML Purifier this directive was deprecated. Null if not
+     * deprecated.
+     */
+    public $deprecatedVersion;
+
+    /**
+     * List of external projects this directive depends on, e.g. array('CSSTidy').
+     */
+    public $external = array();
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
new file mode 100755
index 0000000000..ec01589b62
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Represents a directive ID in the interchange format.
+ */
+class HTMLPurifier_ConfigSchema_Interchange_Id
+{
+
+    public $namespace, $directive;
+
+    public function __construct($namespace, $directive) {
+        $this->namespace = $namespace;
+        $this->directive = $directive;
+    }
+
+    /**
+     * @warning This is NOT magic, to ensure that people don't abuse SPL and
+     *          cause problems for PHP 5.0 support.
+     */
+    public function toString() {
+        return $this->namespace . '.' . $this->directive;
+    }
+
+    public static function make($id) {
+        list($namespace, $directive) = explode('.', $id);
+        return new HTMLPurifier_ConfigSchema_Interchange_Id($namespace, $directive);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Namespace.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Namespace.php
new file mode 100755
index 0000000000..3ffac0a0f4
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Namespace.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Interchange component class describing namespaces.
+ */
+class HTMLPurifier_ConfigSchema_Interchange_Namespace
+{
+
+    /**
+     * Name of namespace defined.
+     */
+    public $namespace;
+
+    /**
+     * HTML description.
+     */
+    public $description;
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
new file mode 100755
index 0000000000..a1a24eacba
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
@@ -0,0 +1,176 @@
+<?php
+
+class HTMLPurifier_ConfigSchema_InterchangeBuilder
+{
+
+    /**
+     * Used for processing DEFAULT, nothing else.
+     */
+    protected $varParser;
+
+    public function __construct($varParser = null) {
+        $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
+    }
+
+    public static function buildFromDirectory($dir = null) {
+        $parser      = new HTMLPurifier_StringHashParser();
+        $builder     = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
+        $interchange = new HTMLPurifier_ConfigSchema_Interchange();
+
+        if (!$dir) $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema/';
+        $info = parse_ini_file($dir . 'info.ini');
+        $interchange->name = $info['name'];
+
+        $files = array();
+        $dh = opendir($dir);
+        while (false !== ($file = readdir($dh))) {
+            if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
+                continue;
+            }
+            $files[] = $file;
+        }
+        closedir($dh);
+
+        sort($files);
+        foreach ($files as $file) {
+            $builder->build(
+                $interchange,
+                new HTMLPurifier_StringHash( $parser->parseFile($dir . $file) )
+            );
+        }
+
+        return $interchange;
+    }
+
+    /**
+     * Builds an interchange object based on a hash.
+     * @param $interchange HTMLPurifier_ConfigSchema_Interchange object to build
+     * @param $hash HTMLPurifier_ConfigSchema_StringHash source data
+     */
+    public function build($interchange, $hash) {
+        if (!$hash instanceof HTMLPurifier_StringHash) {
+            $hash = new HTMLPurifier_StringHash($hash);
+        }
+        if (!isset($hash['ID'])) {
+            throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
+        }
+        if (strpos($hash['ID'], '.') === false) {
+            $this->buildNamespace($interchange, $hash);
+        } else {
+            $this->buildDirective($interchange, $hash);
+        }
+        $this->_findUnused($hash);
+    }
+
+    public function buildNamespace($interchange, $hash) {
+        $namespace = new HTMLPurifier_ConfigSchema_Interchange_Namespace();
+        $namespace->namespace   = $hash->offsetGet('ID');
+        if (isset($hash['DESCRIPTION'])) {
+            $namespace->description = $hash->offsetGet('DESCRIPTION');
+        }
+        $interchange->addNamespace($namespace);
+    }
+
+    public function buildDirective($interchange, $hash) {
+        $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
+
+        // These are required elements:
+        $directive->id = $this->id($hash->offsetGet('ID'));
+        $id = $directive->id->toString(); // convenience
+
+        if (isset($hash['TYPE'])) {
+            $type = explode('/', $hash->offsetGet('TYPE'));
+            if (isset($type[1])) $directive->typeAllowsNull = true;
+            $directive->type = $type[0];
+        } else {
+            throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
+        }
+
+        if (isset($hash['DEFAULT'])) {
+            try {
+                $directive->default = $this->varParser->parse($hash->offsetGet('DEFAULT'), $directive->type, $directive->typeAllowsNull);
+            } catch (HTMLPurifier_VarParserException $e) {
+                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
+            }
+        }
+
+        if (isset($hash['DESCRIPTION'])) {
+            $directive->description = $hash->offsetGet('DESCRIPTION');
+        }
+
+        if (isset($hash['ALLOWED'])) {
+            $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
+        }
+
+        if (isset($hash['VALUE-ALIASES'])) {
+            $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
+        }
+
+        if (isset($hash['ALIASES'])) {
+            $raw_aliases = trim($hash->offsetGet('ALIASES'));
+            $aliases = preg_split('/\s*,\s*/', $raw_aliases);
+            foreach ($aliases as $alias) {
+                $directive->aliases[] = $this->id($alias);
+            }
+        }
+
+        if (isset($hash['VERSION'])) {
+            $directive->version = $hash->offsetGet('VERSION');
+        }
+
+        if (isset($hash['DEPRECATED-USE'])) {
+            $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
+        }
+
+        if (isset($hash['DEPRECATED-VERSION'])) {
+            $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
+        }
+
+        if (isset($hash['EXTERNAL'])) {
+            $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
+        }
+
+        $interchange->addDirective($directive);
+    }
+
+    /**
+     * Evaluates an array PHP code string without array() wrapper
+     */
+    protected function evalArray($contents) {
+        return eval('return array('. $contents .');');
+    }
+
+    /**
+     * Converts an array list into a lookup array.
+     */
+    protected function lookup($array) {
+        $ret = array();
+        foreach ($array as $val) $ret[$val] = true;
+        return $ret;
+    }
+
+    /**
+     * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
+     * object based on a string Id.
+     */
+    protected function id($id) {
+        return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
+    }
+
+    /**
+     * Triggers errors for any unused keys passed in the hash; such keys
+     * may indicate typos, missing values, etc.
+     * @param $hash Instance of ConfigSchema_StringHash to check.
+     */
+    protected function _findUnused($hash) {
+        $accessed = $hash->getAccessed();
+        foreach ($hash as $k => $v) {
+            if (!isset($accessed[$k])) {
+                trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
+            }
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
new file mode 100755
index 0000000000..2dfd37baed
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * Performs validations on HTMLPurifier_ConfigSchema_Interchange
+ *
+ * @note If you see '// handled by InterchangeBuilder', that means a
+ *       design decision in that class would prevent this validation from
+ *       ever being necessary. We have them anyway, however, for
+ *       redundancy.
+ */
+class HTMLPurifier_ConfigSchema_Validator
+{
+
+    /**
+     * Easy to access global objects.
+     */
+    protected $interchange, $aliases;
+
+    /**
+     * Context-stack to provide easy to read error messages.
+     */
+    protected $context = array();
+
+    /**
+     * HTMLPurifier_VarParser to test default's type.
+     */
+    protected $parser;
+
+    public function __construct() {
+        $this->parser = new HTMLPurifier_VarParser();
+    }
+
+    /**
+     * Validates a fully-formed interchange object. Throws an
+     * HTMLPurifier_ConfigSchema_Exception if there's a problem.
+     */
+    public function validate($interchange) {
+        $this->interchange = $interchange;
+        $this->aliases = array();
+        // PHP is a bit lax with integer <=> string conversions in
+        // arrays, so we don't use the identical !== comparison
+        foreach ($interchange->namespaces as $i => $namespace) {
+            if ($i != $namespace->namespace) $this->error(false, "Integrity violation: key '$i' does not match internal id '{$namespace->namespace}'");
+            $this->validateNamespace($namespace);
+        }
+        foreach ($interchange->directives as $i => $directive) {
+            $id = $directive->id->toString();
+            if ($i != $id) $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
+            $this->validateDirective($directive);
+        }
+        return true;
+    }
+
+    /**
+     * Validates a HTMLPurifier_ConfigSchema_Interchange_Namespace object.
+     */
+    public function validateNamespace($n) {
+        $this->context[] = "namespace '{$n->namespace}'";
+        $this->with($n, 'namespace')
+            ->assertNotEmpty()
+            ->assertAlnum(); // implicit assertIsString handled by InterchangeBuilder
+        $this->with($n, 'description')
+            ->assertNotEmpty()
+            ->assertIsString(); // handled by InterchangeBuilder
+        array_pop($this->context);
+    }
+
+    /**
+     * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
+     */
+    public function validateId($id) {
+        $id_string = $id->toString();
+        $this->context[] = "id '$id_string'";
+        if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
+            // handled by InterchangeBuilder
+            $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
+        }
+        if (!isset($this->interchange->namespaces[$id->namespace])) {
+            $this->error('namespace', 'does not exist'); // assumes that the namespace was validated already
+        }
+        $this->with($id, 'directive')
+            ->assertNotEmpty()
+            ->assertAlnum(); // implicit assertIsString handled by InterchangeBuilder
+        array_pop($this->context);
+    }
+
+    /**
+     * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
+     */
+    public function validateDirective($d) {
+        $id = $d->id->toString();
+        $this->context[] = "directive '$id'";
+        $this->validateId($d->id);
+
+        $this->with($d, 'description')
+            ->assertNotEmpty();
+
+        // BEGIN - handled by InterchangeBuilder
+        $this->with($d, 'type')
+            ->assertNotEmpty();
+        $this->with($d, 'typeAllowsNull')
+            ->assertIsBool();
+        try {
+            // This also tests validity of $d->type
+            $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
+        } catch (HTMLPurifier_VarParserException $e) {
+            $this->error('default', 'had error: ' . $e->getMessage());
+        }
+        // END - handled by InterchangeBuilder
+
+        if (!is_null($d->allowed) || !empty($d->valueAliases)) {
+            // allowed and valueAliases require that we be dealing with
+            // strings, so check for that early.
+            $d_int = HTMLPurifier_VarParser::$types[$d->type];
+            if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
+                $this->error('type', 'must be a string type when used with allowed or value aliases');
+            }
+        }
+
+        $this->validateDirectiveAllowed($d);
+        $this->validateDirectiveValueAliases($d);
+        $this->validateDirectiveAliases($d);
+
+        array_pop($this->context);
+    }
+
+    /**
+     * Extra validation if $allowed member variable of
+     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+     */
+    public function validateDirectiveAllowed($d) {
+        if (is_null($d->allowed)) return;
+        $this->with($d, 'allowed')
+            ->assertNotEmpty()
+            ->assertIsLookup(); // handled by InterchangeBuilder
+        if (is_string($d->default) && !isset($d->allowed[$d->default])) {
+            $this->error('default', 'must be an allowed value');
+        }
+        $this->context[] = 'allowed';
+        foreach ($d->allowed as $val => $x) {
+            if (!is_string($val)) $this->error("value $val", 'must be a string');
+        }
+        array_pop($this->context);
+    }
+
+    /**
+     * Extra validation if $valueAliases member variable of
+     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+     */
+    public function validateDirectiveValueAliases($d) {
+        if (is_null($d->valueAliases)) return;
+        $this->with($d, 'valueAliases')
+            ->assertIsArray(); // handled by InterchangeBuilder
+        $this->context[] = 'valueAliases';
+        foreach ($d->valueAliases as $alias => $real) {
+            if (!is_string($alias)) $this->error("alias $alias", 'must be a string');
+            if (!is_string($real))  $this->error("alias target $real from alias '$alias'",  'must be a string');
+            if ($alias === $real) {
+                $this->error("alias '$alias'", "must not be an alias to itself");
+            }
+        }
+        if (!is_null($d->allowed)) {
+            foreach ($d->valueAliases as $alias => $real) {
+                if (isset($d->allowed[$alias])) {
+                    $this->error("alias '$alias'", 'must not be an allowed value');
+                } elseif (!isset($d->allowed[$real])) {
+                    $this->error("alias '$alias'", 'must be an alias to an allowed value');
+                }
+            }
+        }
+        array_pop($this->context);
+    }
+
+    /**
+     * Extra validation if $aliases member variable of
+     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+     */
+    public function validateDirectiveAliases($d) {
+        $this->with($d, 'aliases')
+            ->assertIsArray(); // handled by InterchangeBuilder
+        $this->context[] = 'aliases';
+        foreach ($d->aliases as $alias) {
+            $this->validateId($alias);
+            $s = $alias->toString();
+            if (isset($this->interchange->directives[$s])) {
+                $this->error("alias '$s'", 'collides with another directive');
+            }
+            if (isset($this->aliases[$s])) {
+                $other_directive = $this->aliases[$s];
+                $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
+            }
+            $this->aliases[$s] = $d->id->toString();
+        }
+        array_pop($this->context);
+    }
+
+    // protected helper functions
+
+    /**
+     * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
+     * for validating simple member variables of objects.
+     */
+    protected function with($obj, $member) {
+        return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
+    }
+
+    /**
+     * Emits an error, providing helpful context.
+     */
+    protected function error($target, $msg) {
+        if ($target !== false) $prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();
+        else $prefix = ucfirst($this->getFormattedContext());
+        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
+    }
+
+    /**
+     * Returns a formatted context string.
+     */
+    protected function getFormattedContext() {
+        return implode(' in ', array_reverse($this->context));
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
new file mode 100755
index 0000000000..b95aea18cc
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Fluent interface for validating the contents of member variables.
+ * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
+ * use-cases. We name this an 'atom' because it's ONLY for validations that
+ * are independent and usually scalar.
+ */
+class HTMLPurifier_ConfigSchema_ValidatorAtom
+{
+
+    protected $context, $obj, $member, $contents;
+
+    public function __construct($context, $obj, $member) {
+        $this->context     = $context;
+        $this->obj         = $obj;
+        $this->member      = $member;
+        $this->contents    =& $obj->$member;
+    }
+
+    public function assertIsString() {
+        if (!is_string($this->contents)) $this->error('must be a string');
+        return $this;
+    }
+
+    public function assertIsBool() {
+        if (!is_bool($this->contents)) $this->error('must be a boolean');
+        return $this;
+    }
+
+    public function assertIsArray() {
+        if (!is_array($this->contents)) $this->error('must be an array');
+        return $this;
+    }
+
+    public function assertNotNull() {
+        if ($this->contents === null) $this->error('must not be null');
+        return $this;
+    }
+
+    public function assertAlnum() {
+        $this->assertIsString();
+        if (!ctype_alnum($this->contents)) $this->error('must be alphanumeric');
+        return $this;
+    }
+
+    public function assertNotEmpty() {
+        if (empty($this->contents)) $this->error('must not be empty');
+        return $this;
+    }
+
+    public function assertIsLookup() {
+        $this->assertIsArray();
+        foreach ($this->contents as $v) {
+            if ($v !== true) $this->error('must be a lookup array');
+        }
+        return $this;
+    }
+
+    protected function error($msg) {
+        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
new file mode 100755
index 0000000000000000000000000000000000000000..1eaecd11f856504cde09c1b302c7c1cfd65ec00b
GIT binary patch
literal 11324
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
A=l}o!

literal 0
HcmV?d00001

diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
new file mode 100755
index 0000000000..249edd647b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
@@ -0,0 +1,12 @@
+Attr.AllowedFrameTargets
+TYPE: lookup
+DEFAULT: array()
+--DESCRIPTION--
+Lookup table of all allowed link frame targets.  Some commonly used link
+targets include _blank, _self, _parent and _top. Values should be
+lowercase, as validation will be done in a case-sensitive manner despite
+W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
+so this directive will have no effect in that doctype. XHTML 1.1 does not
+enable the Target module by default, you will have to manually enable it
+(see the module documentation for more details.)
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
new file mode 100755
index 0000000000..9a8fa6a2e2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
@@ -0,0 +1,9 @@
+Attr.AllowedRel
+TYPE: lookup
+VERSION: 1.6.0
+DEFAULT: array()
+--DESCRIPTION--
+List of allowed forward document relationships in the rel attribute. Common
+values may be nofollow or print. By default, this is empty, meaning that no
+document relationships are allowed.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
new file mode 100755
index 0000000000..b017883485
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
@@ -0,0 +1,9 @@
+Attr.AllowedRev
+TYPE: lookup
+VERSION: 1.6.0
+DEFAULT: array()
+--DESCRIPTION--
+List of allowed reverse document relationships in the rev attribute. This
+attribute is a bit of an edge-case; if you don't know what it is for, stay
+away.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
new file mode 100755
index 0000000000..533165e175
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
@@ -0,0 +1,11 @@
+Attr.DefaultImageAlt
+TYPE: string/null
+DEFAULT: null
+VERSION: 3.2.0
+--DESCRIPTION--
+This is the content of the alt tag of an image if the user had not
+previously specified an alt attribute.  This applies to all images without
+a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
+only applies to invalid images, and overrides in the case of an invalid image.
+Default behavior with null is to use the basename of the src tag for the alt.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
new file mode 100755
index 0000000000..9eb7e38469
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
@@ -0,0 +1,9 @@
+Attr.DefaultInvalidImage
+TYPE: string
+DEFAULT: ''
+--DESCRIPTION--
+This is the default image an img tag will be pointed to if it does not have
+a valid src attribute.  In future versions, we may allow the image tag to
+be removed completely, but due to design issues, this is not possible right
+now.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
new file mode 100755
index 0000000000..2f17bf477a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
@@ -0,0 +1,8 @@
+Attr.DefaultInvalidImageAlt
+TYPE: string
+DEFAULT: 'Invalid image'
+--DESCRIPTION--
+This is the content of the alt tag of an invalid image if the user had not
+previously specified an alt attribute.  It has no effect when the image is
+valid but there was no alt attribute present.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
new file mode 100755
index 0000000000..52654b53ae
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
@@ -0,0 +1,10 @@
+Attr.DefaultTextDir
+TYPE: string
+DEFAULT: 'ltr'
+--DESCRIPTION--
+Defines the default text direction (ltr or rtl) of the document being
+parsed.  This generally is the same as the value of the dir attribute in
+HTML, or ltr if that is not specified.
+--ALLOWED--
+'ltr', 'rtl'
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
new file mode 100755
index 0000000000..6440d21032
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
@@ -0,0 +1,16 @@
+Attr.EnableID
+TYPE: bool
+DEFAULT: false
+VERSION: 1.2.0
+--DESCRIPTION--
+Allows the ID attribute in HTML.  This is disabled by default due to the
+fact that without proper configuration user input can easily break the
+validation of a webpage by specifying an ID that is already on the
+surrounding HTML.  If you don't mind throwing caution to the wind, enable
+this directive, but I strongly recommend you also consider blacklisting IDs
+you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
+(%Attr.IDPrefix).  When set to true HTML Purifier reverts to the behavior of
+pre-1.2.0 versions.
+--ALIASES--
+HTML.EnableAttrID
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
new file mode 100755
index 0000000000..5f2b5e3d2c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
@@ -0,0 +1,5 @@
+Attr.IDBlacklist
+TYPE: list
+DEFAULT: array()
+DESCRIPTION: Array of IDs not allowed in the document.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
new file mode 100755
index 0000000000..6f5824586e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
@@ -0,0 +1,9 @@
+Attr.IDBlacklistRegexp
+TYPE: string/null
+VERSION: 1.6.0
+DEFAULT: NULL
+--DESCRIPTION--
+PCRE regular expression to be matched against all IDs. If the expression is
+matches, the ID is rejected. Use this with care: may cause significant
+degradation. ID matching is done after all other validation.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
new file mode 100755
index 0000000000..cc49d43fd0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
@@ -0,0 +1,12 @@
+Attr.IDPrefix
+TYPE: string
+VERSION: 1.2.0
+DEFAULT: ''
+--DESCRIPTION--
+String to prefix to IDs.  If you have no idea what IDs your pages may use,
+you may opt to simply add a prefix to all user-submitted ID attributes so
+that they are still usable, but will not conflict with core page IDs.
+Example: setting the directive to 'user_' will result in a user submitted
+'foo' to become 'user_foo'  Be sure to set %HTML.EnableAttrID to true
+before using this.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
new file mode 100755
index 0000000000..2c5924a7ad
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
@@ -0,0 +1,14 @@
+Attr.IDPrefixLocal
+TYPE: string
+VERSION: 1.2.0
+DEFAULT: ''
+--DESCRIPTION--
+Temporary prefix for IDs used in conjunction with %Attr.IDPrefix.  If you
+need to allow multiple sets of user content on web page, you may need to
+have a seperate prefix that changes with each iteration.  This way,
+seperately submitted user content displayed on the same page doesn't
+clobber each other. Ideal values are unique identifiers for the content it
+represents (i.e. the id of the row in the database). Be sure to add a
+seperator (like an underscore) at the end.  Warning: this directive will
+not work unless %Attr.IDPrefix is set to a non-empty value!
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.txt
new file mode 100755
index 0000000000..2d72049d64
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.txt
@@ -0,0 +1,3 @@
+Attr
+DESCRIPTION: Features regarding attribute validation.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
new file mode 100755
index 0000000000..d5caa1bb97
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
@@ -0,0 +1,31 @@
+AutoFormat.AutoParagraph
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+  This directive turns on auto-paragraphing, where double newlines are
+  converted in to paragraphs whenever possible. Auto-paragraphing:
+</p>
+<ul>
+  <li>Always applies to inline elements or text in the root node,</li>
+  <li>Applies to inline elements or text with double newlines in nodes
+      that allow paragraph tags,</li>
+  <li>Applies to double newlines in paragraph tags</li>
+</ul>
+<p>
+  <code>p</code> tags must be allowed for this directive to take effect.
+  We do not use <code>br</code> tags for paragraphing, as that is
+  semantically incorrect.
+</p>
+<p>
+  To prevent auto-paragraphing as a content-producer, refrain from using
+  double-newlines except to specify a new paragraph or in contexts where
+  it has special meaning (whitespace usually has no meaning except in
+  tags like <code>pre</code>, so this should not be difficult.) To prevent
+  the paragraphing of inline text adjacent to block elements, wrap them
+  in <code>div</code> tags (the behavior is slightly different outside of
+  the root node.)
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
new file mode 100755
index 0000000000..2a476481af
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
@@ -0,0 +1,12 @@
+AutoFormat.Custom
+TYPE: list
+VERSION: 2.0.1
+DEFAULT: array()
+--DESCRIPTION--
+
+<p>
+  This directive can be used to add custom auto-format injectors.
+  Specify an array of injector names (class name minus the prefix)
+  or concrete implementations. Injector class must exist.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
new file mode 100755
index 0000000000..663064a344
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
@@ -0,0 +1,11 @@
+AutoFormat.DisplayLinkURI
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  This directive turns on the in-text display of URIs in &lt;a&gt; tags, and disables
+  those links. For example, <a href="http://example.com">example</a> becomes
+  example (<a>http://example.com</a>).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
new file mode 100755
index 0000000000..3a48ba960e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
@@ -0,0 +1,12 @@
+AutoFormat.Linkify
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+  This directive turns on linkification, auto-linking http, ftp and
+  https URLs. <code>a</code> tags with the <code>href</code> attribute
+  must be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
new file mode 100755
index 0000000000..7996488be0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
@@ -0,0 +1,12 @@
+AutoFormat.PurifierLinkify
+TYPE: bool
+VERSION: 2.0.1
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+  Internal auto-formatter that converts configuration directives in
+  syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
+  with the <code>href</code> attribute must be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
new file mode 100755
index 0000000000..aaede47d62
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
@@ -0,0 +1,45 @@
+AutoFormat.RemoveEmpty
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  When enabled, HTML Purifier will attempt to remove empty elements that
+  contribute no semantic information to the document. The following types
+  of nodes will be removed:
+</p>
+<ul><li>
+    Tags with no attributes and no content, and that are not empty
+    elements (remove <code>&lt;a&gt;&lt;/a&gt;</code> but not
+    <code>&lt;br /&gt;</code>), and
+  </li>
+  <li>
+    Tags with no content, except for:<ul>
+      <li>The <code>colgroup</code> element, or</li>
+      <li>
+        Elements with the <code>id</code> or <code>name</code> attribute,
+        when those attributes are permitted on those elements.
+      </li>
+    </ul></li>
+</ul>
+<p>
+  Please be very careful when using this functionality; while it may not
+  seem that empty elements contain useful information, they can alter the
+  layout of a document given appropriate styling. This directive is most
+  useful when you are processing machine-generated HTML, please avoid using
+  it on regular user HTML.
+</p>
+<p>
+  Elements that contain only whitespace will be treated as empty. Non-breaking
+  spaces, however, do not count as whitespace.
+</p>
+<p>
+  This algorithm is not perfect; you may still notice some empty tags,
+  particularly if a node had elements, but those elements were later removed
+  because they were not permitted in that context, or tags that, after
+  being auto-closed by another tag, where empty. This is for safety reasons
+  to prevent clever code from breaking validation. The general rule of thumb:
+  if a tag looked empty on the way end, it will get removed; if HTML Purifier
+  made it empty, it will stay.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.txt
new file mode 100755
index 0000000000..161a52ef48
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.txt
@@ -0,0 +1,3 @@
+AutoFormat
+DESCRIPTION: Configuration for activating auto-formatting functionality (also known as <code>Injector</code>s)
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.PurifierLinkifyDocURL.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.PurifierLinkifyDocURL.txt
new file mode 100755
index 0000000000..3e8309e39e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.PurifierLinkifyDocURL.txt
@@ -0,0 +1,12 @@
+AutoFormatParam.PurifierLinkifyDocURL
+TYPE: string
+VERSION: 2.0.1
+DEFAULT: '#%s'
+--DESCRIPTION--
+
+<p>
+  Location of configuration documentation to link to, let %s substitute
+  into the configuration's namespace and directive names sans the percent
+  sign.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.txt
new file mode 100755
index 0000000000..6097a557e7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.txt
@@ -0,0 +1,3 @@
+AutoFormatParam
+DESCRIPTION: Configuration for customizing auto-formatting functionality
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
new file mode 100755
index 0000000000..b324608f76
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
@@ -0,0 +1,8 @@
+CSS.AllowImportant
+TYPE: bool
+DEFAULT: false
+VERSION: 3.1.0
+--DESCRIPTION--
+This parameter determines whether or not !important cascade modifiers should
+be allowed in user CSS. If false, !important will stripped.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
new file mode 100755
index 0000000000..748be0eec8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
@@ -0,0 +1,11 @@
+CSS.AllowTricky
+TYPE: bool
+DEFAULT: false
+VERSION: 3.1.0
+--DESCRIPTION--
+This parameter determines whether or not to allow "tricky" CSS properties and
+values. Tricky CSS properties/values can drastically modify page layout or
+be used for deceptive practices but do not directly constitute a security risk.
+For example, <code>display:none;</code> is considered a tricky property that
+will only be allowed if this directive is set to true.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
new file mode 100755
index 0000000000..460112ebe0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
@@ -0,0 +1,18 @@
+CSS.AllowedProperties
+TYPE: lookup/null
+VERSION: 3.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    If HTML Purifier's style attributes set is unsatisfactory for your needs,
+    you can overload it with your own list of tags to allow.  Note that this
+    method is subtractive: it does its job by taking away from HTML Purifier
+    usual feature set, so you cannot add an attribute that HTML Purifier never
+    supported in the first place.
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the
+    elements here, <em>that</em> directive will win and override.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
new file mode 100755
index 0000000000..5cb7dda3ba
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
@@ -0,0 +1,11 @@
+CSS.DefinitionRev
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+    Revision identifier for your custom definition. See
+    %HTML.DefinitionRev for details.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
new file mode 100755
index 0000000000..7a3291470c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
@@ -0,0 +1,16 @@
+CSS.MaxImgLength
+TYPE: string/null
+DEFAULT: '1200px'
+VERSION: 3.1.1
+--DESCRIPTION--
+<p>
+ This parameter sets the maximum allowed length on <code>img</code> tags,
+ effectively the <code>width</code> and <code>height</code> properties.
+ Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
+ in place to prevent imagecrash attacks, disable with null at your own risk.
+ This directive is similar to %HTML.MaxImgLength, and both should be
+ concurrently edited, although there are
+ subtle differences in the input format (the CSS max is a number with
+ a unit).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
new file mode 100755
index 0000000000..148eedb8be
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
@@ -0,0 +1,10 @@
+CSS.Proprietary
+TYPE: bool
+VERSION: 3.0.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+    Whether or not to allow safe, proprietary CSS values.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.txt
new file mode 100755
index 0000000000..d14b490933
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.txt
@@ -0,0 +1,3 @@
+CSS
+DESCRIPTION: Configuration regarding allowed CSS.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
new file mode 100755
index 0000000000..c486724c88
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
@@ -0,0 +1,14 @@
+Cache.DefinitionImpl
+TYPE: string/null
+VERSION: 2.0.0
+DEFAULT: 'Serializer'
+--DESCRIPTION--
+
+This directive defines which method to use when caching definitions,
+the complex data-type that makes HTML Purifier tick. Set to null
+to disable caching (not recommended, as you will see a definite
+performance degradation).
+
+--ALIASES--
+Core.DefinitionCache
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
new file mode 100755
index 0000000000..54036507d6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
@@ -0,0 +1,13 @@
+Cache.SerializerPath
+TYPE: string/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Absolute path with no trailing slash to store serialized definitions in.
+    Default is within the
+    HTML Purifier library inside DefinitionCache/Serializer. This
+    path must be writable by the webserver.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.txt
new file mode 100755
index 0000000000..57f30239a0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.txt
@@ -0,0 +1,3 @@
+Cache
+DESCRIPTION: Configuration for DefinitionCache and related subclasses.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
new file mode 100755
index 0000000000..568cbf3b32
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
@@ -0,0 +1,18 @@
+Core.AggressivelyFixLt
+TYPE: bool
+VERSION: 2.1.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+    This directive enables aggressive pre-filter fixes HTML Purifier can
+    perform in order to ensure that open angled-brackets do not get killed
+    during parsing stage. Enabling this will result in two preg_replace_callback
+    calls and at least two preg_replace calls for every HTML document parsed;
+    if your users make very well-formed HTML, you can set this directive false.
+    This has no effect when DirectLex is used.
+</p>
+<p>
+    <strong>Notice:</strong> This directive's default turned from false to true
+    in HTML Purifier 3.2.0.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
new file mode 100755
index 0000000000..d7317911fa
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
@@ -0,0 +1,12 @@
+Core.CollectErrors
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: false
+--DESCRIPTION--
+
+Whether or not to collect errors found while filtering the document. This
+is a useful way to give feedback to your users. <strong>Warning:</strong>
+Currently this feature is very patchy and experimental, with lots of
+possible error messages not yet implemented. It will not cause any
+problems, but it may not help your users either.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
new file mode 100755
index 0000000000..08b381d34c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
@@ -0,0 +1,28 @@
+Core.ColorKeywords
+TYPE: hash
+VERSION: 2.0.0
+--DEFAULT--
+array (
+  'maroon' => '#800000',
+  'red' => '#FF0000',
+  'orange' => '#FFA500',
+  'yellow' => '#FFFF00',
+  'olive' => '#808000',
+  'purple' => '#800080',
+  'fuchsia' => '#FF00FF',
+  'white' => '#FFFFFF',
+  'lime' => '#00FF00',
+  'green' => '#008000',
+  'navy' => '#000080',
+  'blue' => '#0000FF',
+  'aqua' => '#00FFFF',
+  'teal' => '#008080',
+  'black' => '#000000',
+  'silver' => '#C0C0C0',
+  'gray' => '#808080',
+)
+--DESCRIPTION--
+
+Lookup array of color names to six digit hexadecimal number corresponding
+to color, with preceding hash mark. Used when parsing colors.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
new file mode 100755
index 0000000000..64b114fce2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
@@ -0,0 +1,14 @@
+Core.ConvertDocumentToFragment
+TYPE: bool
+DEFAULT: true
+--DESCRIPTION--
+
+This parameter determines whether or not the filter should convert
+input that is a full document with html and body tags to a fragment
+of just the contents of a body tag. This parameter is simply something
+HTML Purifier can do during an edge-case: for most inputs, this
+processing is not necessary.
+
+--ALIASES--
+Core.AcceptFullDocuments
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
new file mode 100755
index 0000000000..36f16e07ea
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
@@ -0,0 +1,17 @@
+Core.DirectLexLineNumberSyncInterval
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 0
+--DESCRIPTION--
+
+<p>
+  Specifies the number of tokens the DirectLex line number tracking
+  implementations should process before attempting to resyncronize the
+  current line count by manually counting all previous new-lines. When
+  at 0, this functionality is disabled. Lower values will decrease
+  performance, and this is only strictly necessary if the counting
+  algorithm is buggy (in which case you should report it as a bug).
+  This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
+  not being used.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
new file mode 100755
index 0000000000..8bfb47c3ac
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
@@ -0,0 +1,15 @@
+Core.Encoding
+TYPE: istring
+DEFAULT: 'utf-8'
+--DESCRIPTION--
+If for some reason you are unable to convert all webpages to UTF-8, you can
+use this directive as a stop-gap compatibility change to let HTML Purifier
+deal with non UTF-8 input.  This technique has notable deficiencies:
+absolutely no characters outside of the selected character encoding will be
+preserved, not even the ones that have been ampersand escaped (this is due
+to a UTF-8 specific <em>feature</em> that automatically resolves all
+entities), making it pretty useless for anything except the most I18N-blind
+applications, although %Core.EscapeNonASCIICharacters offers fixes this
+trouble with another tradeoff. This directive only accepts ISO-8859-1 if
+iconv is not enabled.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
new file mode 100755
index 0000000000..4d5b5055cd
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
@@ -0,0 +1,10 @@
+Core.EscapeInvalidChildren
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+When true, a child is found that is not allowed in the context of the
+parent element will be transformed into text as if it were ASCII. When
+false, that element and all internal tags will be dropped, though text will
+be preserved.  There is no option for dropping the element but preserving
+child nodes.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
new file mode 100755
index 0000000000..a7a5b249bb
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
@@ -0,0 +1,7 @@
+Core.EscapeInvalidTags
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+When true, invalid tags will be written back to the document as plain text.
+Otherwise, they are silently dropped.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
new file mode 100755
index 0000000000..abb499948a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
@@ -0,0 +1,13 @@
+Core.EscapeNonASCIICharacters
+TYPE: bool
+VERSION: 1.4.0
+DEFAULT: false
+--DESCRIPTION--
+This directive overcomes a deficiency in %Core.Encoding by blindly
+converting all non-ASCII characters into decimal numeric entities before
+converting it to its native encoding. This means that even characters that
+can be expressed in the non-UTF-8 encoding will be entity-ized, which can
+be a real downer for encodings like Big5. It also assumes that the ASCII
+repetoire is available, although this is the case for almost all encodings.
+Anyway, use UTF-8!
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
new file mode 100755
index 0000000000..915391edb7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
@@ -0,0 +1,19 @@
+Core.HiddenElements
+TYPE: lookup
+--DEFAULT--
+array (
+  'script' => true,
+  'style' => true,
+)
+--DESCRIPTION--
+
+<p>
+  This directive is a lookup array of elements which should have their
+  contents removed when they are not allowed by the HTML definition.
+  For example, the contents of a <code>script</code> tag are not
+  normally shown in a document, so if script tags are to be removed,
+  their contents should be removed to. This is opposed to a <code>b</code>
+  tag, which defines some presentational changes but does not hide its
+  contents.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
new file mode 100755
index 0000000000..233fca14f8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
@@ -0,0 +1,10 @@
+Core.Language
+TYPE: string
+VERSION: 2.0.0
+DEFAULT: 'en'
+--DESCRIPTION--
+
+ISO 639 language code for localizable things in HTML Purifier to use,
+which is mainly error reporting. There is currently only an English (en)
+translation, so this directive is currently useless.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
new file mode 100755
index 0000000000..8983e2cca9
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
@@ -0,0 +1,34 @@
+Core.LexerImpl
+TYPE: mixed/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+  This parameter determines what lexer implementation can be used. The
+  valid values are:
+</p>
+<dl>
+  <dt><em>null</em></dt>
+  <dd>
+    Recommended, the lexer implementation will be auto-detected based on
+    your PHP-version and configuration.
+  </dd>
+  <dt><em>string</em> lexer identifier</dt>
+  <dd>
+    This is a slim way of manually overridding the implementation.
+    Currently recognized values are: DOMLex (the default PHP5
+implementation)
+    and DirectLex (the default PHP4 implementation). Only use this if
+    you know what you are doing: usually, the auto-detection will
+    manage things for cases you aren't even aware of.
+  </dd>
+  <dt><em>object</em> lexer instance</dt>
+  <dd>
+    Super-advanced: you can specify your own, custom, implementation that
+    implements the interface defined by <code>HTMLPurifier_Lexer</code>.
+    I may remove this option simply because I don't expect anyone
+    to use it.
+  </dd>
+</dl>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
new file mode 100755
index 0000000000..eb841a7597
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
@@ -0,0 +1,16 @@
+Core.MaintainLineNumbers
+TYPE: bool/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+  If true, HTML Purifier will add line number information to all tokens.
+  This is useful when error reporting is turned on, but can result in
+  significant performance degradation and should not be used when
+  unnecessary. This directive must be used with the DirectLex lexer,
+  as the DOMLex lexer does not (yet) support this functionality.
+  If the value is null, an appropriate value will be selected based
+  on other configuration.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
new file mode 100755
index 0000000000..4070c2a0de
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
@@ -0,0 +1,12 @@
+Core.RemoveInvalidImg
+TYPE: bool
+DEFAULT: true
+VERSION: 1.3.0
+--DESCRIPTION--
+
+<p>
+  This directive enables pre-emptive URI checking in <code>img</code>
+  tags, as the attribute validation strategy is not authorized to
+  remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
new file mode 100755
index 0000000000..a4cd966df8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
@@ -0,0 +1,12 @@
+Core.RemoveScriptContents
+TYPE: bool/null
+DEFAULT: NULL
+VERSION: 2.0.0
+DEPRECATED-VERSION: 2.1.0
+DEPRECATED-USE: Core.HiddenElements
+--DESCRIPTION--
+<p>
+  This directive enables HTML Purifier to remove not only script tags
+  but all of their contents.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.txt
new file mode 100755
index 0000000000..5edfe07863
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.txt
@@ -0,0 +1,3 @@
+Core
+DESCRIPTION: Core features that are always available.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
new file mode 100755
index 0000000000..3db50ef204
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
@@ -0,0 +1,11 @@
+Filter.Custom
+TYPE: list
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+  This directive can be used to add custom filters; it is nearly the
+  equivalent of the now deprecated <code>HTMLPurifier-&gt;addFilter()</code>
+  method. Specify an array of concrete implementations.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
new file mode 100755
index 0000000000..078d087417
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
@@ -0,0 +1,74 @@
+Filter.ExtractStyleBlocks
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+EXTERNAL: CSSTidy
+--DESCRIPTION--
+<p>
+  This directive turns on the style block extraction filter, which removes
+  <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
+  and places them in the <code>StyleBlocks</code> context variable, for further
+  use by you, usually to be placed in an external stylesheet, or a
+  <code>style</code> block in the <code>head</code> of your document.
+</p>
+<p>
+  Sample usage:
+</p>
+<pre><![CDATA[
+<?php
+    header('Content-type: text/html; charset=utf-8');
+    echo '<?xml version="1.0" encoding="UTF-8"?>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+  <title>Filter.ExtractStyleBlocks</title>
+<?php
+    require_once '/path/to/library/HTMLPurifier.auto.php';
+    require_once '/path/to/csstidy.class.php';
+
+    $dirty = '<style>body {color:#F00;}</style> Some text';
+
+    $config = HTMLPurifier_Config::createDefault();
+    $config->set('Filter', 'ExtractStyleBlocks', true);
+    $purifier = new HTMLPurifier($config);
+
+    $html = $purifier->purify($dirty);
+
+    // This implementation writes the stylesheets to the styles/ directory.
+    // You can also echo the styles inside the document, but it's a bit
+    // more difficult to make sure they get interpreted properly by
+    // browsers; try the usual CSS armoring techniques.
+    $styles = $purifier->context->get('StyleBlocks');
+    $dir = 'styles/';
+    if (!is_dir($dir)) mkdir($dir);
+    $hash = sha1($_GET['html']);
+    foreach ($styles as $i => $style) {
+        file_put_contents($name = $dir . $hash . "_$i");
+        echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
+    }
+?>
+</head>
+<body>
+  <div>
+    <?php echo $html; ?>
+  </div>
+</b]]><![CDATA[ody>
+</html>
+]]></pre>
+<p>
+  <strong>Warning:</strong> It is possible for a user to mount an
+  imagecrash attack using this CSS. Counter-measures are difficult;
+  it is not simply enough to limit the range of CSS lengths (using
+  relative lengths with many nesting levels allows for large values
+  to be attained without actually specifying them in the stylesheet),
+  and the flexible nature of selectors makes it difficult to selectively
+  disable lengths on image tags (HTML Purifier, however, does disable
+  CSS width and height in inline styling). There are probably two effective
+  counter measures: an explicit width and height set to auto in all
+  images in your document (unlikely) or the disabling of width and
+  height (somewhat reasonable). Whether or not these measures should be
+  used is left to the reader.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
new file mode 100755
index 0000000000..7fa6536b2c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
@@ -0,0 +1,11 @@
+Filter.YouTube
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  This directive enables YouTube video embedding in HTML Purifier. Check
+  <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
+  on embedding videos</a> for more information on what this filter does.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.txt
new file mode 100755
index 0000000000..f2d25a1b26
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.txt
@@ -0,0 +1,3 @@
+Filter
+DESCRIPTION: Directives for turning filters on and off, or specifying custom filters.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksEscaping.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksEscaping.txt
new file mode 100755
index 0000000000..d436ed0158
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksEscaping.txt
@@ -0,0 +1,14 @@
+FilterParam.ExtractStyleBlocksEscaping
+TYPE: bool
+VERSION: 3.0.0
+DEFAULT: true
+ALIASES: Filter.ExtractStyleBlocksEscaping
+--DESCRIPTION--
+
+<p>
+  Whether or not to escape the dangerous characters &lt;, &gt; and &amp;
+  as \3C, \3E and \26, respectively. This is can be safely set to false
+  if the contents of StyleBlocks will be placed in an external stylesheet,
+  where there is no risk of it being interpreted as HTML.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksScope.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksScope.txt
new file mode 100755
index 0000000000..3943529c7b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksScope.txt
@@ -0,0 +1,29 @@
+FilterParam.ExtractStyleBlocksScope
+TYPE: string/null
+VERSION: 3.0.0
+DEFAULT: NULL
+ALIASES: Filter.ExtractStyleBlocksScope
+--DESCRIPTION--
+
+<p>
+  If you would like users to be able to define external stylesheets, but
+  only allow them to specify CSS declarations for a specific node and
+  prevent them from fiddling with other elements, use this directive.
+  It accepts any valid CSS selector, and will prepend this to any
+  CSS declaration extracted from the document. For example, if this
+  directive is set to <code>#user-content</code> and a user uses the
+  selector <code>a:hover</code>, the final selector will be
+  <code>#user-content a:hover</code>.
+</p>
+<p>
+  The comma shorthand may be used; consider the above example, with
+  <code>#user-content, #user-content2</code>, the final selector will
+  be <code>#user-content a:hover, #user-content2 a:hover</code>.
+</p>
+<p>
+  <strong>Warning:</strong> It is possible for users to bypass this measure
+  using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
+  Purifier, and I am working to get it fixed. Until then, HTML Purifier
+  performs a basic check to prevent this.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksTidyImpl.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksTidyImpl.txt
new file mode 100755
index 0000000000..cafccf8b53
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.ExtractStyleBlocksTidyImpl.txt
@@ -0,0 +1,15 @@
+FilterParam.ExtractStyleBlocksTidyImpl
+TYPE: mixed/null
+VERSION: 3.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+  If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
+  class to use for internal cleaning. This will usually be good enough.
+</p>
+<p>
+  However, for trusted user input, you can set this to <code>false</code> to
+  disable cleaning. In addition, you can supply your own concrete implementation
+  of Tidy's interface to use, although I don't know why you'd want to do that.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.txt
new file mode 100755
index 0000000000..dff9784b12
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/FilterParam.txt
@@ -0,0 +1,3 @@
+FilterParam
+DESCRIPTION: Configuration for filters.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
new file mode 100755
index 0000000000..3e231d2d16
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
@@ -0,0 +1,22 @@
+HTML.Allowed
+TYPE: itext/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    This is a convenience directive that rolls the functionality of
+    %HTML.AllowedElements and %HTML.AllowedAttributes into one directive.
+    Specify elements and attributes that are allowed using:
+    <code>element1[attr1|attr2],element2...</code>. You can also use
+    newlines instead of commas to separate elements.
+</p>
+<p>
+    <strong>Warning</strong>:
+    All of the constraints on the component directives are still enforced.
+    The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
+    whitelist: directly copy-pasting it here will probably result in
+    broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
+    are set, this directive has no effect.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
new file mode 100755
index 0000000000..fcf093f17d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
@@ -0,0 +1,19 @@
+HTML.AllowedAttributes
+TYPE: lookup/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    If HTML Purifier's attribute set is unsatisfactory, overload it!
+    The syntax is "tag.attr" or "*.attr" for the global attributes
+    (style, id, class, dir, lang, xml:lang).
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the
+    elements here, <em>that</em> directive will win and override. For
+    example, %HTML.EnableAttrID will take precedence over *.id in this
+    directive.  You must set that directive to true before you can use
+    IDs at all.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
new file mode 100755
index 0000000000..888d558196
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
@@ -0,0 +1,18 @@
+HTML.AllowedElements
+TYPE: lookup/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+    If HTML Purifier's tag set is unsatisfactory for your needs, you
+    can overload it with your own list of tags to allow.  Note that this
+    method is subtractive: it does its job by taking away from HTML Purifier
+    usual feature set, so you cannot add a tag that HTML Purifier never
+    supported in the first place (like embed, form or head).  If you
+    change this, you probably also want to change %HTML.AllowedAttributes.
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the
+    elements here, <em>that</em> directive will win and override.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
new file mode 100755
index 0000000000..5a59a55c08
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
@@ -0,0 +1,20 @@
+HTML.AllowedModules
+TYPE: lookup/null
+VERSION: 2.0.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    A doctype comes with a set of usual modules to use. Without having
+    to mucking about with the doctypes, you can quickly activate or
+    disable these modules by specifying which modules you wish to allow
+    with this directive. This is most useful for unit testing specific
+    modules, although end users may find it useful for their own ends.
+</p>
+<p>
+    If you specify a module that does not exist, the manager will silently
+    fail to use it, so be careful! User-defined modules are not affected
+    by this directive. Modules defined in %HTML.CoreModules are not
+    affected by this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
new file mode 100755
index 0000000000..45ae469ec9
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
@@ -0,0 +1,18 @@
+HTML.BlockWrapper
+TYPE: string
+VERSION: 1.3.0
+DEFAULT: 'p'
+--DESCRIPTION--
+
+<p>
+    String name of element to wrap inline elements that are inside a block
+    context.  This only occurs in the children of blockquote in strict mode.
+</p>
+<p>
+    Example: by default value,
+    <code>&lt;blockquote&gt;Foo&lt;/blockquote&gt;</code> would become
+    <code>&lt;blockquote&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/blockquote&gt;</code>.
+    The <code>&lt;p&gt;</code> tags can be replaced with whatever you desire,
+    as long as it is a block level element.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
new file mode 100755
index 0000000000..5246188795
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
@@ -0,0 +1,23 @@
+HTML.CoreModules
+TYPE: lookup
+VERSION: 2.0.0
+--DEFAULT--
+array (
+  'Structure' => true,
+  'Text' => true,
+  'Hypertext' => true,
+  'List' => true,
+  'NonXMLCommonAttributes' => true,
+  'XMLCommonAttributes' => true,
+  'CommonAttributes' => true,
+)
+--DESCRIPTION--
+
+<p>
+    Certain modularized doctypes (XHTML, namely), have certain modules
+    that must be included for the doctype to be an conforming document
+    type: put those modules here. By default, XHTML's core modules
+    are used. You can set this to a blank array to disable core module
+    protection, but this is not recommended.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
new file mode 100755
index 0000000000..a64e3d7c36
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
@@ -0,0 +1,9 @@
+HTML.CustomDoctype
+TYPE: string/null
+VERSION: 2.0.1
+DEFAULT: NULL
+--DESCRIPTION--
+
+A custom doctype for power-users who defined there own document
+type. This directive only applies when %HTML.Doctype is blank.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
new file mode 100755
index 0000000000..103db754a2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
@@ -0,0 +1,33 @@
+HTML.DefinitionID
+TYPE: string/null
+DEFAULT: NULL
+VERSION: 2.0.0
+--DESCRIPTION--
+
+<p>
+    Unique identifier for a custom-built HTML definition. If you edit
+    the raw version of the HTMLDefinition, introducing changes that the
+    configuration object does not reflect, you must specify this variable.
+    If you change your custom edits, you should change this directive, or
+    clear your cache. Example:
+</p>
+<pre>
+$config = HTMLPurifier_Config::createDefault();
+$config->set('HTML', 'DefinitionID', '1');
+$def = $config->getHTMLDefinition();
+$def->addAttribute('a', 'tabindex', 'Number');
+</pre>
+<p>
+    In the above example, the configuration is still at the defaults, but
+    using the advanced API, an extra attribute has been added. The
+    configuration object normally has no way of knowing that this change
+    has taken place, so it needs an extra directive: %HTML.DefinitionID.
+    If someone else attempts to use the default configuration, these two
+    pieces of code will not clobber each other in the cache, since one has
+    an extra directive attached to it.
+</p>
+<p>
+    You <em>must</em> specify a value to this directive to use the
+    advanced API features.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
new file mode 100755
index 0000000000..229ae0267a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
@@ -0,0 +1,16 @@
+HTML.DefinitionRev
+TYPE: int
+VERSION: 2.0.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+    Revision identifier for your custom definition specified in
+    %HTML.DefinitionID.  This serves the same purpose: uniquely identifying
+    your custom definition, but this one does so in a chronological
+    context: revision 3 is more up-to-date then revision 2.  Thus, when
+    this gets incremented, the cache handling is smart enough to clean
+    up any older revisions of your definition as well as flush the
+    cache.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
new file mode 100755
index 0000000000..9dab497f2f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
@@ -0,0 +1,11 @@
+HTML.Doctype
+TYPE: string/null
+DEFAULT: NULL
+--DESCRIPTION--
+Doctype to use during filtering. Technically speaking this is not actually
+a doctype (as it does not identify a corresponding DTD), but we are using
+this name for sake of simplicity. When non-blank, this will override any
+older directives like %HTML.XHTML or %HTML.Strict.
+--ALLOWED--
+'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
new file mode 100755
index 0000000000..57358f9bad
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
@@ -0,0 +1,21 @@
+HTML.ForbiddenAttributes
+TYPE: lookup
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    While this directive is similar to %HTML.AllowedAttributes, for
+    forwards-compatibility with XML, this attribute has a different syntax. Instead of
+    <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
+    attributes in <code>a</code> tags, set this directive to
+    <code>a@href</code>. You can also disallow an attribute globally with
+    <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
+    is provided for consistency with %HTML.AllowedAttributes).
+</p>
+<p>
+    <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
+    accordingly, check
+    out that directive for a discussion of why you
+    should think twice before using this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
new file mode 100755
index 0000000000..93a53e14fb
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
@@ -0,0 +1,20 @@
+HTML.ForbiddenElements
+TYPE: lookup
+VERSION: 3.1.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    This was, perhaps, the most requested feature ever in HTML
+    Purifier. Please don't abuse it! This is the logical inverse of
+    %HTML.AllowedElements, and it will override that directive, or any
+    other directive.
+</p>
+<p>
+    If possible, %HTML.Allowed is recommended over this directive, because it
+    can sometimes be difficult to tell whether or not you've forbidden all of
+    the behavior you would like to disallow. If you forbid <code>img</code>
+    with the expectation of preventing images on your site, you'll be in for
+    a nasty surprise when people start using the <code>background-image</code>
+    CSS property.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
new file mode 100755
index 0000000000..e424c386ec
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
@@ -0,0 +1,14 @@
+HTML.MaxImgLength
+TYPE: int/null
+DEFAULT: 1200
+VERSION: 3.1.1
+--DESCRIPTION--
+<p>
+ This directive controls the maximum number of pixels in the width and
+ height attributes in <code>img</code> tags. This is
+ in place to prevent imagecrash attacks, disable with null at your own risk.
+ This directive is similar to %CSS.MaxImgLength, and both should be
+ concurrently edited, although there are
+ subtle differences in the input format (the HTML max is an integer).
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
new file mode 100755
index 0000000000..62e8e160c7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
@@ -0,0 +1,12 @@
+HTML.Parent
+TYPE: string
+VERSION: 1.3.0
+DEFAULT: 'div'
+--DESCRIPTION--
+
+<p>
+    String name of element that HTML fragment passed to library will be
+    inserted in.  An interesting variation would be using span as the
+    parent element, meaning that only inline tags would be allowed.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
new file mode 100755
index 0000000000..dfb720496d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
@@ -0,0 +1,12 @@
+HTML.Proprietary
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to allow proprietary elements and attributes in your
+    documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
+    <strong>Warning:</strong> This can cause your documents to stop
+    validating!
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
new file mode 100755
index 0000000000..f635a68548
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
@@ -0,0 +1,14 @@
+HTML.SafeEmbed
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit embed tags in documents, with a number of extra
+    security features added to prevent script execution. This is similar to
+    what websites like MySpace do to embed tags. Embed is a proprietary
+    element and will cause your website to stop validating. You probably want
+    to enable this with %HTML.SafeObject.
+    <strong>Highly experimental.</strong>
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
new file mode 100755
index 0000000000..32967b88fb
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
@@ -0,0 +1,14 @@
+HTML.SafeObject
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit object tags in documents, with a number of extra
+    security features added to prevent script execution. This is similar to
+    what websites like MySpace do to object tags. You may also want to
+    enable %HTML.SafeEmbed for maximum interoperability with Internet Explorer,
+    although embed tags will cause your website to stop validating.
+    <strong>Highly experimental.</strong>
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
new file mode 100755
index 0000000000..a8b1de56be
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
@@ -0,0 +1,9 @@
+HTML.Strict
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
+--DESCRIPTION--
+Determines whether or not to use Transitional (loose) or Strict rulesets.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
new file mode 100755
index 0000000000..b4c271b7fa
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
@@ -0,0 +1,8 @@
+HTML.TidyAdd
+TYPE: lookup
+VERSION: 2.0.0
+DEFAULT: array()
+--DESCRIPTION--
+
+Fixes to add to the default set of Tidy fixes as per your level.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
new file mode 100755
index 0000000000..4186ccd0d1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
@@ -0,0 +1,24 @@
+HTML.TidyLevel
+TYPE: string
+VERSION: 2.0.0
+DEFAULT: 'medium'
+--DESCRIPTION--
+
+<p>General level of cleanliness the Tidy module should enforce.
+There are four allowed values:</p>
+<dl>
+    <dt>none</dt>
+    <dd>No extra tidying should be done</dd>
+    <dt>light</dt>
+    <dd>Only fix elements that would be discarded otherwise due to
+    lack of support in doctype</dd>
+    <dt>medium</dt>
+    <dd>Enforce best practices</dd>
+    <dt>heavy</dt>
+    <dd>Transform all deprecated elements and attributes to standards
+    compliant equivalents</dd>
+</dl>
+
+--ALLOWED--
+'none', 'light', 'medium', 'heavy'
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
new file mode 100755
index 0000000000..996762bd1d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
@@ -0,0 +1,8 @@
+HTML.TidyRemove
+TYPE: lookup
+VERSION: 2.0.0
+DEFAULT: array()
+--DESCRIPTION--
+
+Fixes to remove from the default set of Tidy fixes as per your level.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
new file mode 100755
index 0000000000..89133b1a38
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
@@ -0,0 +1,8 @@
+HTML.Trusted
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: false
+--DESCRIPTION--
+Indicates whether or not the user input is trusted or not. If the input is
+trusted, a more expansive set of allowed tags and attributes will be used.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
new file mode 100755
index 0000000000..2a47e384f4
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
@@ -0,0 +1,11 @@
+HTML.XHTML
+TYPE: bool
+DEFAULT: true
+VERSION: 1.1.0
+DEPRECATED-VERSION: 1.7.0
+DEPRECATED-USE: HTML.Doctype
+--DESCRIPTION--
+Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
+--ALIASES--
+Core.XHTML
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.txt
new file mode 100755
index 0000000000..f32ceb5b6e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.txt
@@ -0,0 +1,3 @@
+HTML
+DESCRIPTION: Configuration regarding allowed HTML.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
new file mode 100755
index 0000000000..08921fde70
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
@@ -0,0 +1,10 @@
+Output.CommentScriptContents
+TYPE: bool
+VERSION: 2.0.0
+DEFAULT: true
+--DESCRIPTION--
+Determines whether or not HTML Purifier should attempt to fix up the
+contents of script tags for legacy browsers with comments.
+--ALIASES--
+Core.CommentScriptContents
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
new file mode 100755
index 0000000000..79f8ad82cf
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
@@ -0,0 +1,13 @@
+Output.Newline
+TYPE: string/null
+VERSION: 2.0.1
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Newline string to format final output with. If left null, HTML Purifier
+    will auto-detect the default newline type of the system and use that;
+    you can manually override it here. Remember, \r\n is Windows, \r
+    is Mac, and \n is Unix.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
new file mode 100755
index 0000000000..232b02362a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
@@ -0,0 +1,14 @@
+Output.SortAttr
+TYPE: bool
+VERSION: 3.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  If true, HTML Purifier will sort attributes by name before writing them back
+  to the document, converting a tag like: <code>&lt;el b="" a="" c="" /&gt;</code>
+  to <code>&lt;el a="" b="" c="" /&gt;</code>. This is a workaround for
+  a bug in FCKeditor which causes it to swap attributes order, adding noise
+  to text diffs. If you're not seeing this bug, chances are, you don't need
+  this directive.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
new file mode 100755
index 0000000000..06bab00a0a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
@@ -0,0 +1,25 @@
+Output.TidyFormat
+TYPE: bool
+VERSION: 1.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Determines whether or not to run Tidy on the final output for pretty
+    formatting reasons, such as indentation and wrap.
+</p>
+<p>
+    This can greatly improve readability for editors who are hand-editing
+    the HTML, but is by no means necessary as HTML Purifier has already
+    fixed all major errors the HTML may have had. Tidy is a non-default
+    extension, and this directive will silently fail if Tidy is not
+    available.
+</p>
+<p>
+    If you are looking to make the overall look of your page's source
+    better, I recommend running Tidy on the entire page rather than just
+    user-content (after all, the indentation relative to the containing
+    blocks will be incorrect).
+</p>
+--ALIASES--
+Core.TidyFormat
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.txt
new file mode 100755
index 0000000000..7849d60d26
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.txt
@@ -0,0 +1,3 @@
+Output
+DESCRIPTION: Configuration relating to the generation of (X)HTML.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
new file mode 100755
index 0000000000..071bc0295d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
@@ -0,0 +1,7 @@
+Test.ForceNoIconv
+TYPE: bool
+DEFAULT: false
+--DESCRIPTION--
+When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
+and use only pure PHP implementations.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.txt
new file mode 100755
index 0000000000..5025f9d14f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.txt
@@ -0,0 +1,3 @@
+Test
+DESCRIPTION: Developer testing configuration for our unit tests.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
new file mode 100755
index 0000000000..98fdfe9222
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
@@ -0,0 +1,15 @@
+URI.AllowedSchemes
+TYPE: lookup
+--DEFAULT--
+array (
+  'http' => true,
+  'https' => true,
+  'mailto' => true,
+  'ftp' => true,
+  'nntp' => true,
+  'news' => true,
+)
+--DESCRIPTION--
+Whitelist that defines the schemes that a URI is allowed to have.  This
+prevents XSS attacks from using pseudo-schemes like javascript or mocha.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
new file mode 100755
index 0000000000..876f0680cf
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
@@ -0,0 +1,17 @@
+URI.Base
+TYPE: string/null
+VERSION: 2.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    The base URI is the URI of the document this purified HTML will be
+    inserted into.  This information is important if HTML Purifier needs
+    to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
+    is on.  You may use a non-absolute URI for this value, but behavior
+    may vary (%URI.MakeAbsolute deals nicely with both absolute and
+    relative paths, but forwards-compatibility is not guaranteed).
+    <strong>Warning:</strong> If set, the scheme on this URI
+    overrides the one specified by %URI.DefaultScheme.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
new file mode 100755
index 0000000000..728e378cbe
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
@@ -0,0 +1,10 @@
+URI.DefaultScheme
+TYPE: string
+DEFAULT: 'http'
+--DESCRIPTION--
+
+<p>
+    Defines through what scheme the output will be served, in order to
+    select the proper object validator when no scheme information is present.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
new file mode 100755
index 0000000000..f05312ba86
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
@@ -0,0 +1,11 @@
+URI.DefinitionID
+TYPE: string/null
+VERSION: 2.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Unique identifier for a custom-built URI definition. If you  want
+    to add custom URIFilters, you must specify this value.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
new file mode 100755
index 0000000000..80cfea93f7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
@@ -0,0 +1,11 @@
+URI.DefinitionRev
+TYPE: int
+VERSION: 2.1.0
+DEFAULT: 1
+--DESCRIPTION--
+
+<p>
+    Revision identifier for your custom definition. See
+    %HTML.DefinitionRev for details.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
new file mode 100755
index 0000000000..71ce025a2d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
@@ -0,0 +1,14 @@
+URI.Disable
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+    Disables all URIs in all forms. Not sure why you'd want to do that
+    (after all, the Internet's founded on the notion of a hyperlink).
+</p>
+
+--ALIASES--
+Attr.DisableURI
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
new file mode 100755
index 0000000000..13c122c8ce
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
@@ -0,0 +1,11 @@
+URI.DisableExternal
+TYPE: bool
+VERSION: 1.2.0
+DEFAULT: false
+--DESCRIPTION--
+Disables links to external websites.  This is a highly effective anti-spam
+and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
+images outside of your domain will be allowed.  Non-linkified URIs will
+still be preserved.  If you want to be able to link to subdomains or use
+absolute URIs, specify %URI.Host for your website.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
new file mode 100755
index 0000000000..abcc1efd61
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
@@ -0,0 +1,13 @@
+URI.DisableExternalResources
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+--DESCRIPTION--
+Disables the embedding of external resources, preventing users from
+embedding things like images from other hosts. This prevents access
+tracking (good for email viewers), bandwidth leeching, cross-site request
+forging, goatse.cx posting, and other nasties, but also results in a loss
+of end-user functionality (they can't directly post a pic they posted from
+Flickr anymore). Use it if you don't have a robust user-content moderation
+team.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
new file mode 100755
index 0000000000..51e6ea91f7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
@@ -0,0 +1,12 @@
+URI.DisableResources
+TYPE: bool
+VERSION: 1.3.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+    Disables embedding resources, essentially meaning no pictures. You can
+    still link to them though. See %URI.DisableExternalResources for why
+    this might be a good idea.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
new file mode 100755
index 0000000000..ee83b121de
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
@@ -0,0 +1,19 @@
+URI.Host
+TYPE: string/null
+VERSION: 1.2.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Defines the domain name of the server, so we can determine whether or
+    an absolute URI is from your website or not.  Not strictly necessary,
+    as users should be using relative URIs to reference resources on your
+    website.  It will, however, let you use absolute URIs to link to
+    subdomains of the domain you post here: i.e. example.com will allow
+    sub.example.com.  However, higher up domains will still be excluded:
+    if you set %URI.Host to sub.example.com, example.com will be blocked.
+    <strong>Note:</strong> This directive overrides %URI.Base because
+    a given page may be on a sub-domain, but you wish HTML Purifier to be
+    more relaxed and allow some of the parent domains too.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
new file mode 100755
index 0000000000..0b6df7625d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
@@ -0,0 +1,9 @@
+URI.HostBlacklist
+TYPE: list
+VERSION: 1.3.0
+DEFAULT: array()
+--DESCRIPTION--
+List of strings that are forbidden in the host of any URI. Use it to kill
+domain names of spam, etc. Note that it will catch anything in the domain,
+so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
new file mode 100755
index 0000000000..4214900a59
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
@@ -0,0 +1,13 @@
+URI.MakeAbsolute
+TYPE: bool
+VERSION: 2.1.0
+DEFAULT: false
+--DESCRIPTION--
+
+<p>
+    Converts all URIs into absolute forms. This is useful when the HTML
+    being filtered assumes a specific base path, but will actually be
+    viewed in a different context (and setting an alternate base URI is
+    not possible). %URI.Base must be set for this directive to work.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
new file mode 100755
index 0000000000..58c81dcc44
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
@@ -0,0 +1,83 @@
+URI.Munge
+TYPE: string/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    Munges all browsable (usually http, https and ftp)
+    absolute URIs into another URI, usually a URI redirection service.
+    This directive accepts a URI, formatted with a <code>%s</code> where
+    the url-encoded original URI should be inserted (sample:
+    <code>http://www.google.com/url?q=%s</code>).
+</p>
+<p>
+    Uses for this directive:
+</p>
+<ul>
+    <li>
+        Prevent PageRank leaks, while being fairly transparent
+        to users (you may also want to add some client side JavaScript to
+        override the text in the statusbar). <strong>Notice</strong>:
+        Many security experts believe that this form of protection does not deter spam-bots.
+    </li>
+    <li>
+        Redirect users to a splash page telling them they are leaving your
+        website. While this is poor usability practice, it is often mandated
+        in corporate environments.
+    </li>
+</ul>
+<p>
+    Prior to HTML Purifier 3.1.1, this directive also enabled the munging
+    of browsable external resources, which could break things if your redirection
+    script was a splash page or used <code>meta</code> tags. To revert to
+    previous behavior, please use %URI.MungeResources.
+</p>
+<p>
+    You may want to also use %URI.MungeSecretKey along with this directive
+    in order to enforce what URIs your redirector script allows. Open
+    redirector scripts can be a security risk and negatively affect the
+    reputation of your domain name.
+</p>
+<p>
+    Starting with HTML Purifier 3.1.1, there is also these substitutions:
+</p>
+<table>
+    <thead>
+        <tr>
+            <th>Key</th>
+            <th>Description</th>
+            <th>Example <code>&lt;a href=""&gt;</code></th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>%r</td>
+            <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td>%n</td>
+            <td>The name of the tag this URI came from</td>
+            <td>a</td>
+        </tr>
+        <tr>
+            <td>%m</td>
+            <td>The name of the attribute this URI came from</td>
+            <td>href</td>
+        </tr>
+        <tr>
+            <td>%p</td>
+            <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
+            <td></td>
+        </tr>
+    </tbody>
+</table>
+<p>
+    Admittedly, these letters are somewhat arbitrary; the only stipulation
+    was that they couldn't be a through f. r is for resource (I would have preferred
+    e, but you take what you can get), n is for name, m
+    was picked because it came after n (and I couldn't use a), p is for
+    property.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
new file mode 100755
index 0000000000..6fce0fdc37
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
@@ -0,0 +1,17 @@
+URI.MungeResources
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    If true, any URI munging directives like %URI.Munge
+    will also apply to embedded resources, such as <code>&lt;img src=""&gt;</code>.
+    Be careful enabling this directive if you have a redirector script
+    that does not use the <code>Location</code> HTTP header; all of your images
+    and other embedded resources will break.
+</p>
+<p>
+    <strong>Warning:</strong> It is strongly advised you use this in conjunction
+    %URI.MungeSecretKey to mitigate the security risk of an open redirector.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
new file mode 100755
index 0000000000..0d00f62ea8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
@@ -0,0 +1,30 @@
+URI.MungeSecretKey
+TYPE: string/null
+VERSION: 3.1.1
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+    This directive enables secure checksum generation along with %URI.Munge.
+    It should be set to a secure key that is not shared with anyone else.
+    The checksum can be placed in the URI using %t. Use of this checksum
+    affords an additional level of protection by allowing a redirector
+    to check if a URI has passed through HTML Purifier with this line:
+</p>
+
+<pre>$checksum === sha1($secret_key . ':' . $url)</pre>
+
+<p>
+    If the output is TRUE, the redirector script should accept the URI.
+</p>
+
+<p>
+    Please note that it would still be possible for an attacker to procure
+    secure hashes en-mass by abusing your website's Preview feature or the
+    like, but this service affords an additional level of protection
+    that should be combined with website blacklisting.
+</p>
+
+<p>
+    Remember this has no effect if %URI.Munge is not on.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
new file mode 100755
index 0000000000..23331a4e79
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
@@ -0,0 +1,9 @@
+URI.OverrideAllowedSchemes
+TYPE: bool
+DEFAULT: true
+--DESCRIPTION--
+If this is set to true (which it is by default), you can override
+%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
+registry.  If false, you will also have to update that directive in order
+to add more schemes.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.txt b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.txt
new file mode 100755
index 0000000000..a13060f365
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.txt
@@ -0,0 +1,3 @@
+URI
+DESCRIPTION: Features regarding Uniform Resource Identifiers.
+--# vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
new file mode 100755
index 0000000000..5de4505e1b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
@@ -0,0 +1,3 @@
+name = "HTML Purifier"
+
+; vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ContentSets.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ContentSets.php
new file mode 100755
index 0000000000..3b6e96f5f5
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ContentSets.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * @todo Unit test
+ */
+class HTMLPurifier_ContentSets
+{
+
+    /**
+     * List of content set strings (pipe seperators) indexed by name.
+     */
+    public $info = array();
+
+    /**
+     * List of content set lookups (element => true) indexed by name.
+     * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
+     */
+    public $lookup = array();
+
+    /**
+     * Synchronized list of defined content sets (keys of info)
+     */
+    protected $keys = array();
+    /**
+     * Synchronized list of defined content values (values of info)
+     */
+    protected $values = array();
+
+    /**
+     * Merges in module's content sets, expands identifiers in the content
+     * sets and populates the keys, values and lookup member variables.
+     * @param $modules List of HTMLPurifier_HTMLModule
+     */
+    public function __construct($modules) {
+        if (!is_array($modules)) $modules = array($modules);
+        // populate content_sets based on module hints
+        // sorry, no way of overloading
+        foreach ($modules as $module_i => $module) {
+            foreach ($module->content_sets as $key => $value) {
+                $temp = $this->convertToLookup($value);
+                if (isset($this->lookup[$key])) {
+                    // add it into the existing content set
+                    $this->lookup[$key] = array_merge($this->lookup[$key], $temp);
+                } else {
+                    $this->lookup[$key] = $temp;
+                }
+            }
+        }
+        $old_lookup = false;
+        while ($old_lookup !== $this->lookup) {
+            $old_lookup = $this->lookup;
+            foreach ($this->lookup as $i => $set) {
+                $add = array();
+                foreach ($set as $element => $x) {
+                    if (isset($this->lookup[$element])) {
+                        $add += $this->lookup[$element];
+                        unset($this->lookup[$i][$element]);
+                    }
+                }
+                $this->lookup[$i] += $add;
+            }
+        }
+
+        foreach ($this->lookup as $key => $lookup) {
+            $this->info[$key] = implode(' | ', array_keys($lookup));
+        }
+        $this->keys   = array_keys($this->info);
+        $this->values = array_values($this->info);
+    }
+
+    /**
+     * Accepts a definition; generates and assigns a ChildDef for it
+     * @param $def HTMLPurifier_ElementDef reference
+     * @param $module Module that defined the ElementDef
+     */
+    public function generateChildDef(&$def, $module) {
+        if (!empty($def->child)) return; // already done!
+        $content_model = $def->content_model;
+        if (is_string($content_model)) {
+            // Assume that $this->keys is alphanumeric
+            $def->content_model = preg_replace_callback(
+                '/\b(' . implode('|', $this->keys) . ')\b/',
+                array($this, 'generateChildDefCallback'),
+                $content_model
+            );
+            //$def->content_model = str_replace(
+            //    $this->keys, $this->values, $content_model);
+        }
+        $def->child = $this->getChildDef($def, $module);
+    }
+
+    public function generateChildDefCallback($matches) {
+        return $this->info[$matches[0]];
+    }
+
+    /**
+     * Instantiates a ChildDef based on content_model and content_model_type
+     * member variables in HTMLPurifier_ElementDef
+     * @note This will also defer to modules for custom HTMLPurifier_ChildDef
+     *       subclasses that need content set expansion
+     * @param $def HTMLPurifier_ElementDef to have ChildDef extracted
+     * @return HTMLPurifier_ChildDef corresponding to ElementDef
+     */
+    public function getChildDef($def, $module) {
+        $value = $def->content_model;
+        if (is_object($value)) {
+            trigger_error(
+                'Literal object child definitions should be stored in '.
+                'ElementDef->child not ElementDef->content_model',
+                E_USER_NOTICE
+            );
+            return $value;
+        }
+        switch ($def->content_model_type) {
+            case 'required':
+                return new HTMLPurifier_ChildDef_Required($value);
+            case 'optional':
+                return new HTMLPurifier_ChildDef_Optional($value);
+            case 'empty':
+                return new HTMLPurifier_ChildDef_Empty();
+            case 'custom':
+                return new HTMLPurifier_ChildDef_Custom($value);
+        }
+        // defer to its module
+        $return = false;
+        if ($module->defines_child_def) { // save a func call
+            $return = $module->getChildDef($def);
+        }
+        if ($return !== false) return $return;
+        // error-out
+        trigger_error(
+            'Could not determine which ChildDef class to instantiate',
+            E_USER_ERROR
+        );
+        return false;
+    }
+
+    /**
+     * Converts a string list of elements separated by pipes into
+     * a lookup array.
+     * @param $string List of elements
+     * @return Lookup array of elements
+     */
+    protected function convertToLookup($string) {
+        $array = explode('|', str_replace(' ', '', $string));
+        $ret = array();
+        foreach ($array as $i => $k) {
+            $ret[$k] = true;
+        }
+        return $ret;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Context.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Context.php
new file mode 100755
index 0000000000..9ddf0c5476
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Context.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Registry object that contains information about the current context.
+ * @warning Is a bit buggy when variables are set to null: it thinks
+ *          they don't exist! So use false instead, please.
+ * @note Since the variables Context deals with may not be objects,
+ *       references are very important here! Do not remove!
+ */
+class HTMLPurifier_Context
+{
+
+    /**
+     * Private array that stores the references.
+     */
+    private $_storage = array();
+
+    /**
+     * Registers a variable into the context.
+     * @param $name String name
+     * @param $ref Reference to variable to be registered
+     */
+    public function register($name, &$ref) {
+        if (isset($this->_storage[$name])) {
+            trigger_error("Name $name produces collision, cannot re-register",
+                          E_USER_ERROR);
+            return;
+        }
+        $this->_storage[$name] =& $ref;
+    }
+
+    /**
+     * Retrieves a variable reference from the context.
+     * @param $name String name
+     * @param $ignore_error Boolean whether or not to ignore error
+     */
+    public function &get($name, $ignore_error = false) {
+        if (!isset($this->_storage[$name])) {
+            if (!$ignore_error) {
+                trigger_error("Attempted to retrieve non-existent variable $name",
+                              E_USER_ERROR);
+            }
+            $var = null; // so we can return by reference
+            return $var;
+        }
+        return $this->_storage[$name];
+    }
+
+    /**
+     * Destorys a variable in the context.
+     * @param $name String name
+     */
+    public function destroy($name) {
+        if (!isset($this->_storage[$name])) {
+            trigger_error("Attempted to destroy non-existent variable $name",
+                          E_USER_ERROR);
+            return;
+        }
+        unset($this->_storage[$name]);
+    }
+
+    /**
+     * Checks whether or not the variable exists.
+     * @param $name String name
+     */
+    public function exists($name) {
+        return isset($this->_storage[$name]);
+    }
+
+    /**
+     * Loads a series of variables from an associative array
+     * @param $context_array Assoc array of variables to load
+     */
+    public function loadArray($context_array) {
+        foreach ($context_array as $key => $discard) {
+            $this->register($key, $context_array[$key]);
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Definition.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Definition.php
new file mode 100755
index 0000000000..a7408c9749
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Definition.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Super-class for definition datatype objects, implements serialization
+ * functions for the class.
+ */
+abstract class HTMLPurifier_Definition
+{
+
+    /**
+     * Has setup() been called yet?
+     */
+    public $setup = false;
+
+    /**
+     * What type of definition is it?
+     */
+    public $type;
+
+    /**
+     * Sets up the definition object into the final form, something
+     * not done by the constructor
+     * @param $config HTMLPurifier_Config instance
+     */
+    abstract protected function doSetup($config);
+
+    /**
+     * Setup function that aborts if already setup
+     * @param $config HTMLPurifier_Config instance
+     */
+    public function setup($config) {
+        if ($this->setup) return;
+        $this->setup = true;
+        $this->doSetup($config);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
new file mode 100755
index 0000000000..fa5a087bb7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * Abstract class representing Definition cache managers that implements
+ * useful common methods and is a factory.
+ * @todo Create a separate maintenance file advanced users can use to
+ *       cache their custom HTMLDefinition, which can be loaded
+ *       via a configuration directive
+ * @todo Implement memcached
+ */
+abstract class HTMLPurifier_DefinitionCache
+{
+
+    public $type;
+
+    /**
+     * @param $name Type of definition objects this instance of the
+     *      cache will handle.
+     */
+    public function __construct($type) {
+        $this->type = $type;
+    }
+
+    /**
+     * Generates a unique identifier for a particular configuration
+     * @param Instance of HTMLPurifier_Config
+     */
+    public function generateKey($config) {
+        return $config->version . ',' . // possibly replace with function calls
+               $config->getBatchSerial($this->type) . ',' .
+               $config->get($this->type, 'DefinitionRev');
+    }
+
+    /**
+     * Tests whether or not a key is old with respect to the configuration's
+     * version and revision number.
+     * @param $key Key to test
+     * @param $config Instance of HTMLPurifier_Config to test against
+     */
+    public function isOld($key, $config) {
+        if (substr_count($key, ',') < 2) return true;
+        list($version, $hash, $revision) = explode(',', $key, 3);
+        $compare = version_compare($version, $config->version);
+        // version mismatch, is always old
+        if ($compare != 0) return true;
+        // versions match, ids match, check revision number
+        if (
+            $hash == $config->getBatchSerial($this->type) &&
+            $revision < $config->get($this->type, 'DefinitionRev')
+        ) return true;
+        return false;
+    }
+
+    /**
+     * Checks if a definition's type jives with the cache's type
+     * @note Throws an error on failure
+     * @param $def Definition object to check
+     * @return Boolean true if good, false if not
+     */
+    public function checkDefType($def) {
+        if ($def->type !== $this->type) {
+            trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Adds a definition object to the cache
+     */
+    abstract public function add($def, $config);
+
+    /**
+     * Unconditionally saves a definition object to the cache
+     */
+    abstract public function set($def, $config);
+
+    /**
+     * Replace an object in the cache
+     */
+    abstract public function replace($def, $config);
+
+    /**
+     * Retrieves a definition object from the cache
+     */
+    abstract public function get($config);
+
+    /**
+     * Removes a definition object to the cache
+     */
+    abstract public function remove($config);
+
+    /**
+     * Clears all objects from cache
+     */
+    abstract public function flush($config);
+
+    /**
+     * Clears all expired (older version or revision) objects from cache
+     * @note Be carefuly implementing this method as flush. Flush must
+     *       not interfere with other Definition types, and cleanup()
+     *       should not be repeatedly called by userland code.
+     */
+    abstract public function cleanup($config);
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
new file mode 100755
index 0000000000..b0fb6d0cd6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
@@ -0,0 +1,62 @@
+<?php
+
+class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
+{
+
+    /**
+     * Cache object we are decorating
+     */
+    public $cache;
+
+    public function __construct() {}
+
+    /**
+     * Lazy decorator function
+     * @param $cache Reference to cache object to decorate
+     */
+    public function decorate(&$cache) {
+        $decorator = $this->copy();
+        // reference is necessary for mocks in PHP 4
+        $decorator->cache =& $cache;
+        $decorator->type  = $cache->type;
+        return $decorator;
+    }
+
+    /**
+     * Cross-compatible clone substitute
+     */
+    public function copy() {
+        return new HTMLPurifier_DefinitionCache_Decorator();
+    }
+
+    public function add($def, $config) {
+        return $this->cache->add($def, $config);
+    }
+
+    public function set($def, $config) {
+        return $this->cache->set($def, $config);
+    }
+
+    public function replace($def, $config) {
+        return $this->cache->replace($def, $config);
+    }
+
+    public function get($config) {
+        return $this->cache->get($config);
+    }
+
+    public function remove($config) {
+        return $this->cache->remove($config);
+    }
+
+    public function flush($config) {
+        return $this->cache->flush($config);
+    }
+
+    public function cleanup($config) {
+        return $this->cache->cleanup($config);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
new file mode 100755
index 0000000000..d4cc35c4bc
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Definition cache decorator class that cleans up the cache
+ * whenever there is a cache miss.
+ */
+class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends
+      HTMLPurifier_DefinitionCache_Decorator
+{
+
+    public $name = 'Cleanup';
+
+    public function copy() {
+        return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
+    }
+
+    public function add($def, $config) {
+        $status = parent::add($def, $config);
+        if (!$status) parent::cleanup($config);
+        return $status;
+    }
+
+    public function set($def, $config) {
+        $status = parent::set($def, $config);
+        if (!$status) parent::cleanup($config);
+        return $status;
+    }
+
+    public function replace($def, $config) {
+        $status = parent::replace($def, $config);
+        if (!$status) parent::cleanup($config);
+        return $status;
+    }
+
+    public function get($config) {
+        $ret = parent::get($config);
+        if (!$ret) parent::cleanup($config);
+        return $ret;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
new file mode 100755
index 0000000000..18f16d32b6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Definition cache decorator class that saves all cache retrievals
+ * to PHP's memory; good for unit tests or circumstances where
+ * there are lots of configuration objects floating around.
+ */
+class HTMLPurifier_DefinitionCache_Decorator_Memory extends
+      HTMLPurifier_DefinitionCache_Decorator
+{
+
+    protected $definitions;
+    public $name = 'Memory';
+
+    public function copy() {
+        return new HTMLPurifier_DefinitionCache_Decorator_Memory();
+    }
+
+    public function add($def, $config) {
+        $status = parent::add($def, $config);
+        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        return $status;
+    }
+
+    public function set($def, $config) {
+        $status = parent::set($def, $config);
+        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        return $status;
+    }
+
+    public function replace($def, $config) {
+        $status = parent::replace($def, $config);
+        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        return $status;
+    }
+
+    public function get($config) {
+        $key = $this->generateKey($config);
+        if (isset($this->definitions[$key])) return $this->definitions[$key];
+        $this->definitions[$key] = parent::get($config);
+        return $this->definitions[$key];
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
new file mode 100755
index 0000000000..21a8fcfda2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
@@ -0,0 +1,47 @@
+<?php
+
+require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
+
+/**
+ * Definition cache decorator template.
+ */
+class HTMLPurifier_DefinitionCache_Decorator_Template extends
+      HTMLPurifier_DefinitionCache_Decorator
+{
+
+    var $name = 'Template'; // replace this
+
+    function copy() {
+        // replace class name with yours
+        return new HTMLPurifier_DefinitionCache_Decorator_Template();
+    }
+
+    // remove methods you don't need
+
+    function add($def, $config) {
+        return parent::add($def, $config);
+    }
+
+    function set($def, $config) {
+        return parent::set($def, $config);
+    }
+
+    function replace($def, $config) {
+        return parent::replace($def, $config);
+    }
+
+    function get($config) {
+        return parent::get($config);
+    }
+
+    function flush() {
+        return parent::flush();
+    }
+
+    function cleanup($config) {
+        return parent::cleanup($config);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
new file mode 100755
index 0000000000..41d97e734f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Null cache object to use when no caching is on.
+ */
+class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
+{
+
+    public function add($def, $config) {
+        return false;
+    }
+
+    public function set($def, $config) {
+        return false;
+    }
+
+    public function replace($def, $config) {
+        return false;
+    }
+
+    public function remove($config) {
+        return false;
+    }
+
+    public function get($config) {
+        return false;
+    }
+
+    public function flush($config) {
+        return false;
+    }
+
+    public function cleanup($config) {
+        return false;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
new file mode 100755
index 0000000000..acbbe2c3b3
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
@@ -0,0 +1,172 @@
+<?php
+
+class HTMLPurifier_DefinitionCache_Serializer extends
+      HTMLPurifier_DefinitionCache
+{
+
+    public function add($def, $config) {
+        if (!$this->checkDefType($def)) return;
+        $file = $this->generateFilePath($config);
+        if (file_exists($file)) return false;
+        if (!$this->_prepareDir($config)) return false;
+        return $this->_write($file, serialize($def));
+    }
+
+    public function set($def, $config) {
+        if (!$this->checkDefType($def)) return;
+        $file = $this->generateFilePath($config);
+        if (!$this->_prepareDir($config)) return false;
+        return $this->_write($file, serialize($def));
+    }
+
+    public function replace($def, $config) {
+        if (!$this->checkDefType($def)) return;
+        $file = $this->generateFilePath($config);
+        if (!file_exists($file)) return false;
+        if (!$this->_prepareDir($config)) return false;
+        return $this->_write($file, serialize($def));
+    }
+
+    public function get($config) {
+        $file = $this->generateFilePath($config);
+        if (!file_exists($file)) return false;
+        return unserialize(file_get_contents($file));
+    }
+
+    public function remove($config) {
+        $file = $this->generateFilePath($config);
+        if (!file_exists($file)) return false;
+        return unlink($file);
+    }
+
+    public function flush($config) {
+        if (!$this->_prepareDir($config)) return false;
+        $dir = $this->generateDirectoryPath($config);
+        $dh  = opendir($dir);
+        while (false !== ($filename = readdir($dh))) {
+            if (empty($filename)) continue;
+            if ($filename[0] === '.') continue;
+            unlink($dir . '/' . $filename);
+        }
+    }
+
+    public function cleanup($config) {
+        if (!$this->_prepareDir($config)) return false;
+        $dir = $this->generateDirectoryPath($config);
+        $dh  = opendir($dir);
+        while (false !== ($filename = readdir($dh))) {
+            if (empty($filename)) continue;
+            if ($filename[0] === '.') continue;
+            $key = substr($filename, 0, strlen($filename) - 4);
+            if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
+        }
+    }
+
+    /**
+     * Generates the file path to the serial file corresponding to
+     * the configuration and definition name
+     * @todo Make protected
+     */
+    public function generateFilePath($config) {
+        $key = $this->generateKey($config);
+        return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
+    }
+
+    /**
+     * Generates the path to the directory contain this cache's serial files
+     * @note No trailing slash
+     * @todo Make protected
+     */
+    public function generateDirectoryPath($config) {
+        $base = $this->generateBaseDirectoryPath($config);
+        return $base . '/' . $this->type;
+    }
+
+    /**
+     * Generates path to base directory that contains all definition type
+     * serials
+     * @todo Make protected
+     */
+    public function generateBaseDirectoryPath($config) {
+        $base = $config->get('Cache', 'SerializerPath');
+        $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
+        return $base;
+    }
+
+    /**
+     * Convenience wrapper function for file_put_contents
+     * @param $file File name to write to
+     * @param $data Data to write into file
+     * @return Number of bytes written if success, or false if failure.
+     */
+    private function _write($file, $data) {
+        return file_put_contents($file, $data);
+    }
+
+    /**
+     * Prepares the directory that this type stores the serials in
+     * @return True if successful
+     */
+    private function _prepareDir($config) {
+        $directory = $this->generateDirectoryPath($config);
+        if (!is_dir($directory)) {
+            $base = $this->generateBaseDirectoryPath($config);
+            if (!is_dir($base)) {
+                trigger_error('Base directory '.$base.' does not exist,
+                    please create or change using %Cache.SerializerPath',
+                    E_USER_WARNING);
+                return false;
+            } elseif (!$this->_testPermissions($base)) {
+                return false;
+            }
+            $old = umask(0022); // disable group and world writes
+            mkdir($directory);
+            umask($old);
+        } elseif (!$this->_testPermissions($directory)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Tests permissions on a directory and throws out friendly
+     * error messages and attempts to chmod it itself if possible
+     */
+    private function _testPermissions($dir) {
+        // early abort, if it is writable, everything is hunky-dory
+        if (is_writable($dir)) return true;
+        if (!is_dir($dir)) {
+            // generally, you'll want to handle this beforehand
+            // so a more specific error message can be given
+            trigger_error('Directory '.$dir.' does not exist',
+                E_USER_WARNING);
+            return false;
+        }
+        if (function_exists('posix_getuid')) {
+            // POSIX system, we can give more specific advice
+            if (fileowner($dir) === posix_getuid()) {
+                // we can chmod it ourselves
+                chmod($dir, 0755);
+                return true;
+            } elseif (filegroup($dir) === posix_getgid()) {
+                $chmod = '775';
+            } else {
+                // PHP's probably running as nobody, so we'll
+                // need to give global permissions
+                $chmod = '777';
+            }
+            trigger_error('Directory '.$dir.' not writable, '.
+                'please chmod to ' . $chmod,
+                E_USER_WARNING);
+        } else {
+            // generic error message
+            trigger_error('Directory '.$dir.' not writable, '.
+                'please alter file permissions',
+                E_USER_WARNING);
+        }
+        return false;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
new file mode 100755
index 0000000000..2e35c1c3d0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
@@ -0,0 +1,3 @@
+This is a dummy file to prevent Git from ignoring this empty directory.
+
+    vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
new file mode 100755
index 0000000000..3adefbb661
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Responsible for creating definition caches.
+ */
+class HTMLPurifier_DefinitionCacheFactory
+{
+
+    protected $caches = array('Serializer' => array());
+    protected $implementations = array();
+    protected $decorators = array();
+
+    /**
+     * Initialize default decorators
+     */
+    public function setup() {
+        $this->addDecorator('Cleanup');
+    }
+
+    /**
+     * Retrieves an instance of global definition cache factory.
+     */
+    public static function instance($prototype = null) {
+        static $instance;
+        if ($prototype !== null) {
+            $instance = $prototype;
+        } elseif ($instance === null || $prototype === true) {
+            $instance = new HTMLPurifier_DefinitionCacheFactory();
+            $instance->setup();
+        }
+        return $instance;
+    }
+
+    /**
+     * Registers a new definition cache object
+     * @param $short Short name of cache object, for reference
+     * @param $long Full class name of cache object, for construction
+     */
+    public function register($short, $long) {
+        $this->implementations[$short] = $long;
+    }
+
+    /**
+     * Factory method that creates a cache object based on configuration
+     * @param $name Name of definitions handled by cache
+     * @param $config Instance of HTMLPurifier_Config
+     */
+    public function create($type, $config) {
+        $method = $config->get('Cache', 'DefinitionImpl');
+        if ($method === null) {
+            return new HTMLPurifier_DefinitionCache_Null($type);
+        }
+        if (!empty($this->caches[$method][$type])) {
+            return $this->caches[$method][$type];
+        }
+        if (
+          isset($this->implementations[$method]) &&
+          class_exists($class = $this->implementations[$method], false)
+        ) {
+            $cache = new $class($type);
+        } else {
+            if ($method != 'Serializer') {
+                trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
+            }
+            $cache = new HTMLPurifier_DefinitionCache_Serializer($type);
+        }
+        foreach ($this->decorators as $decorator) {
+            $new_cache = $decorator->decorate($cache);
+            // prevent infinite recursion in PHP 4
+            unset($cache);
+            $cache = $new_cache;
+        }
+        $this->caches[$method][$type] = $cache;
+        return $this->caches[$method][$type];
+    }
+
+    /**
+     * Registers a decorator to add to all new cache objects
+     * @param
+     */
+    public function addDecorator($decorator) {
+        if (is_string($decorator)) {
+            $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
+            $decorator = new $class;
+        }
+        $this->decorators[$decorator->name] = $decorator;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Doctype.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Doctype.php
new file mode 100755
index 0000000000..1e3c574c06
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Doctype.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Represents a document type, contains information on which modules
+ * need to be loaded.
+ * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.
+ *       If structure changes, please update that function.
+ */
+class HTMLPurifier_Doctype
+{
+    /**
+     * Full name of doctype
+     */
+    public $name;
+
+    /**
+     * List of standard modules (string identifiers or literal objects)
+     * that this doctype uses
+     */
+    public $modules = array();
+
+    /**
+     * List of modules to use for tidying up code
+     */
+    public $tidyModules = array();
+
+    /**
+     * Is the language derived from XML (i.e. XHTML)?
+     */
+    public $xml = true;
+
+    /**
+     * List of aliases for this doctype
+     */
+    public $aliases = array();
+
+    /**
+     * Public DTD identifier
+     */
+    public $dtdPublic;
+
+    /**
+     * System DTD identifier
+     */
+    public $dtdSystem;
+
+    public function __construct($name = null, $xml = true, $modules = array(),
+        $tidyModules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
+    ) {
+        $this->name         = $name;
+        $this->xml          = $xml;
+        $this->modules      = $modules;
+        $this->tidyModules  = $tidyModules;
+        $this->aliases      = $aliases;
+        $this->dtdPublic    = $dtd_public;
+        $this->dtdSystem    = $dtd_system;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
new file mode 100755
index 0000000000..d6552aa550
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
@@ -0,0 +1,103 @@
+<?php
+
+class HTMLPurifier_DoctypeRegistry
+{
+
+    /**
+     * Hash of doctype names to doctype objects
+     */
+    protected $doctypes;
+
+    /**
+     * Lookup table of aliases to real doctype names
+     */
+    protected $aliases;
+
+    /**
+     * Registers a doctype to the registry
+     * @note Accepts a fully-formed doctype object, or the
+     *       parameters for constructing a doctype object
+     * @param $doctype Name of doctype or literal doctype object
+     * @param $modules Modules doctype will load
+     * @param $modules_for_modes Modules doctype will load for certain modes
+     * @param $aliases Alias names for doctype
+     * @return Editable registered doctype
+     */
+    public function register($doctype, $xml = true, $modules = array(),
+        $tidy_modules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
+    ) {
+        if (!is_array($modules)) $modules = array($modules);
+        if (!is_array($tidy_modules)) $tidy_modules = array($tidy_modules);
+        if (!is_array($aliases)) $aliases = array($aliases);
+        if (!is_object($doctype)) {
+            $doctype = new HTMLPurifier_Doctype(
+                $doctype, $xml, $modules, $tidy_modules, $aliases, $dtd_public, $dtd_system
+            );
+        }
+        $this->doctypes[$doctype->name] = $doctype;
+        $name = $doctype->name;
+        // hookup aliases
+        foreach ($doctype->aliases as $alias) {
+            if (isset($this->doctypes[$alias])) continue;
+            $this->aliases[$alias] = $name;
+        }
+        // remove old aliases
+        if (isset($this->aliases[$name])) unset($this->aliases[$name]);
+        return $doctype;
+    }
+
+    /**
+     * Retrieves reference to a doctype of a certain name
+     * @note This function resolves aliases
+     * @note When possible, use the more fully-featured make()
+     * @param $doctype Name of doctype
+     * @return Editable doctype object
+     */
+    public function get($doctype) {
+        if (isset($this->aliases[$doctype])) $doctype = $this->aliases[$doctype];
+        if (!isset($this->doctypes[$doctype])) {
+            trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
+            $anon = new HTMLPurifier_Doctype($doctype);
+            return $anon;
+        }
+        return $this->doctypes[$doctype];
+    }
+
+    /**
+     * Creates a doctype based on a configuration object,
+     * will perform initialization on the doctype
+     * @note Use this function to get a copy of doctype that config
+     *       can hold on to (this is necessary in order to tell
+     *       Generator whether or not the current document is XML
+     *       based or not).
+     */
+    public function make($config) {
+        return clone $this->get($this->getDoctypeFromConfig($config));
+    }
+
+    /**
+     * Retrieves the doctype from the configuration object
+     */
+    public function getDoctypeFromConfig($config) {
+        // recommended test
+        $doctype = $config->get('HTML', 'Doctype');
+        if (!empty($doctype)) return $doctype;
+        $doctype = $config->get('HTML', 'CustomDoctype');
+        if (!empty($doctype)) return $doctype;
+        // backwards-compatibility
+        if ($config->get('HTML', 'XHTML')) {
+            $doctype = 'XHTML 1.0';
+        } else {
+            $doctype = 'HTML 4.01';
+        }
+        if ($config->get('HTML', 'Strict')) {
+            $doctype .= ' Strict';
+        } else {
+            $doctype .= ' Transitional';
+        }
+        return $doctype;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ElementDef.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ElementDef.php
new file mode 100755
index 0000000000..b55c7bd793
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ElementDef.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * Structure that stores an HTML element definition. Used by
+ * HTMLPurifier_HTMLDefinition and HTMLPurifier_HTMLModule.
+ * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.
+ *       Please update that class too.
+ * @warning If you add new properties to this class, you MUST update
+ *          the mergeIn() method.
+ */
+class HTMLPurifier_ElementDef
+{
+
+    /**
+     * Does the definition work by itself, or is it created solely
+     * for the purpose of merging into another definition?
+     */
+    public $standalone = true;
+
+    /**
+     * Associative array of attribute name to HTMLPurifier_AttrDef
+     * @note Before being processed by HTMLPurifier_AttrCollections
+     *       when modules are finalized during
+     *       HTMLPurifier_HTMLDefinition->setup(), this array may also
+     *       contain an array at index 0 that indicates which attribute
+     *       collections to load into the full array. It may also
+     *       contain string indentifiers in lieu of HTMLPurifier_AttrDef,
+     *       see HTMLPurifier_AttrTypes on how they are expanded during
+     *       HTMLPurifier_HTMLDefinition->setup() processing.
+     */
+    public $attr = array();
+
+    /**
+     * Indexed list of tag's HTMLPurifier_AttrTransform to be done before validation
+     */
+    public $attr_transform_pre = array();
+
+    /**
+     * Indexed list of tag's HTMLPurifier_AttrTransform to be done after validation
+     */
+    public $attr_transform_post = array();
+
+    /**
+     * HTMLPurifier_ChildDef of this tag.
+     */
+    public $child;
+
+    /**
+     * Abstract string representation of internal ChildDef rules. See
+     * HTMLPurifier_ContentSets for how this is parsed and then transformed
+     * into an HTMLPurifier_ChildDef.
+     * @warning This is a temporary variable that is not available after
+     *      being processed by HTMLDefinition
+     */
+    public $content_model;
+
+    /**
+     * Value of $child->type, used to determine which ChildDef to use,
+     * used in combination with $content_model.
+     * @warning This must be lowercase
+     * @warning This is a temporary variable that is not available after
+     *      being processed by HTMLDefinition
+     */
+    public $content_model_type;
+
+
+
+    /**
+     * Does the element have a content model (#PCDATA | Inline)*? This
+     * is important for chameleon ins and del processing in
+     * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
+     * have to worry about this one.
+     */
+    public $descendants_are_inline = false;
+
+    /**
+     * List of the names of required attributes this element has. Dynamically
+     * populated by HTMLPurifier_HTMLDefinition::getElement
+     */
+    public $required_attr = array();
+
+    /**
+     * Lookup table of tags excluded from all descendants of this tag.
+     * @note SGML permits exclusions for all descendants, but this is
+     *       not possible with DTDs or XML Schemas. W3C has elected to
+     *       use complicated compositions of content_models to simulate
+     *       exclusion for children, but we go the simpler, SGML-style
+     *       route of flat-out exclusions, which correctly apply to
+     *       all descendants and not just children. Note that the XHTML
+     *       Modularization Abstract Modules are blithely unaware of such
+     *       distinctions.
+     */
+    public $excludes = array();
+
+    /**
+     * This tag is explicitly auto-closed by the following tags.
+     */
+    public $autoclose = array();
+
+    /**
+     * Whether or not this is a formatting element affected by the
+     * "Active Formatting Elements" algorithm.
+     */
+    public $formatting;
+
+    /**
+     * Low-level factory constructor for creating new standalone element defs
+     */
+    public static function create($content_model, $content_model_type, $attr) {
+        $def = new HTMLPurifier_ElementDef();
+        $def->content_model = $content_model;
+        $def->content_model_type = $content_model_type;
+        $def->attr = $attr;
+        return $def;
+    }
+
+    /**
+     * Merges the values of another element definition into this one.
+     * Values from the new element def take precedence if a value is
+     * not mergeable.
+     */
+    public function mergeIn($def) {
+
+        // later keys takes precedence
+        foreach($def->attr as $k => $v) {
+            if ($k === 0) {
+                // merge in the includes
+                // sorry, no way to override an include
+                foreach ($v as $v2) {
+                    $this->attr[0][] = $v2;
+                }
+                continue;
+            }
+            if ($v === false) {
+                if (isset($this->attr[$k])) unset($this->attr[$k]);
+                continue;
+            }
+            $this->attr[$k] = $v;
+        }
+        $this->_mergeAssocArray($this->attr_transform_pre, $def->attr_transform_pre);
+        $this->_mergeAssocArray($this->attr_transform_post, $def->attr_transform_post);
+        $this->_mergeAssocArray($this->excludes, $def->excludes);
+
+        if(!empty($def->content_model)) {
+            $this->content_model .= ' | ' . $def->content_model;
+            $this->child = false;
+        }
+        if(!empty($def->content_model_type)) {
+            $this->content_model_type = $def->content_model_type;
+            $this->child = false;
+        }
+        if(!is_null($def->child)) $this->child = $def->child;
+        if(!is_null($def->formatting)) $this->formatting = $def->formatting;
+        if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
+
+    }
+
+    /**
+     * Merges one array into another, removes values which equal false
+     * @param $a1 Array by reference that is merged into
+     * @param $a2 Array that merges into $a1
+     */
+    private function _mergeAssocArray(&$a1, $a2) {
+        foreach ($a2 as $k => $v) {
+            if ($v === false) {
+                if (isset($a1[$k])) unset($a1[$k]);
+                continue;
+            }
+            $a1[$k] = $v;
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Encoder.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Encoder.php
new file mode 100755
index 0000000000..79a42d26ec
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Encoder.php
@@ -0,0 +1,426 @@
+<?php
+
+/**
+ * A UTF-8 specific character encoder that handles cleaning and transforming.
+ * @note All functions in this class should be static.
+ */
+class HTMLPurifier_Encoder
+{
+
+    /**
+     * Constructor throws fatal error if you attempt to instantiate class
+     */
+    private function __construct() {
+        trigger_error('Cannot instantiate encoder, call methods statically', E_USER_ERROR);
+    }
+
+    /**
+     * Error-handler that mutes errors, alternative to shut-up operator.
+     */
+    private static function muteErrorHandler() {}
+
+    /**
+     * Cleans a UTF-8 string for well-formedness and SGML validity
+     *
+     * It will parse according to UTF-8 and return a valid UTF8 string, with
+     * non-SGML codepoints excluded.
+     *
+     * @note Just for reference, the non-SGML code points are 0 to 31 and
+     *       127 to 159, inclusive.  However, we allow code points 9, 10
+     *       and 13, which are the tab, line feed and carriage return
+     *       respectively. 128 and above the code points map to multibyte
+     *       UTF-8 representations.
+     *
+     * @note Fallback code adapted from utf8ToUnicode by Henri Sivonen and
+     *       hsivonen@iki.fi at <http://iki.fi/hsivonen/php-utf8/> under the
+     *       LGPL license.  Notes on what changed are inside, but in general,
+     *       the original code transformed UTF-8 text into an array of integer
+     *       Unicode codepoints. Understandably, transforming that back to
+     *       a string would be somewhat expensive, so the function was modded to
+     *       directly operate on the string.  However, this discourages code
+     *       reuse, and the logic enumerated here would be useful for any
+     *       function that needs to be able to understand UTF-8 characters.
+     *       As of right now, only smart lossless character encoding converters
+     *       would need that, and I'm probably not going to implement them.
+     *       Once again, PHP 6 should solve all our problems.
+     */
+    public static function cleanUTF8($str, $force_php = false) {
+
+        // UTF-8 validity is checked since PHP 4.3.5
+        // This is an optimization: if the string is already valid UTF-8, no
+        // need to do PHP stuff. 99% of the time, this will be the case.
+        // The regexp matches the XML char production, as well as well as excluding
+        // non-SGML codepoints U+007F to U+009F
+        if (preg_match('/^[\x{9}\x{A}\x{D}\x{20}-\x{7E}\x{A0}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]*$/Du', $str)) {
+            return $str;
+        }
+
+        $mState = 0; // cached expected number of octets after the current octet
+                     // until the beginning of the next UTF8 character sequence
+        $mUcs4  = 0; // cached Unicode character
+        $mBytes = 1; // cached expected number of octets in the current sequence
+
+        // original code involved an $out that was an array of Unicode
+        // codepoints.  Instead of having to convert back into UTF-8, we've
+        // decided to directly append valid UTF-8 characters onto a string
+        // $out once they're done.  $char accumulates raw bytes, while $mUcs4
+        // turns into the Unicode code point, so there's some redundancy.
+
+        $out = '';
+        $char = '';
+
+        $len = strlen($str);
+        for($i = 0; $i < $len; $i++) {
+            $in = ord($str{$i});
+            $char .= $str[$i]; // append byte to char
+            if (0 == $mState) {
+                // When mState is zero we expect either a US-ASCII character
+                // or a multi-octet sequence.
+                if (0 == (0x80 & ($in))) {
+                    // US-ASCII, pass straight through.
+                    if (($in <= 31 || $in == 127) &&
+                        !($in == 9 || $in == 13 || $in == 10) // save \r\t\n
+                    ) {
+                        // control characters, remove
+                    } else {
+                        $out .= $char;
+                    }
+                    // reset
+                    $char = '';
+                    $mBytes = 1;
+                } elseif (0xC0 == (0xE0 & ($in))) {
+                    // First octet of 2 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x1F) << 6;
+                    $mState = 1;
+                    $mBytes = 2;
+                } elseif (0xE0 == (0xF0 & ($in))) {
+                    // First octet of 3 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x0F) << 12;
+                    $mState = 2;
+                    $mBytes = 3;
+                } elseif (0xF0 == (0xF8 & ($in))) {
+                    // First octet of 4 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x07) << 18;
+                    $mState = 3;
+                    $mBytes = 4;
+                } elseif (0xF8 == (0xFC & ($in))) {
+                    // First octet of 5 octet sequence.
+                    //
+                    // This is illegal because the encoded codepoint must be
+                    // either:
+                    // (a) not the shortest form or
+                    // (b) outside the Unicode range of 0-0x10FFFF.
+                    // Rather than trying to resynchronize, we will carry on
+                    // until the end of the sequence and let the later error
+                    // handling code catch it.
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x03) << 24;
+                    $mState = 4;
+                    $mBytes = 5;
+                } elseif (0xFC == (0xFE & ($in))) {
+                    // First octet of 6 octet sequence, see comments for 5
+                    // octet sequence.
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 1) << 30;
+                    $mState = 5;
+                    $mBytes = 6;
+                } else {
+                    // Current octet is neither in the US-ASCII range nor a
+                    // legal first octet of a multi-octet sequence.
+                    $mState = 0;
+                    $mUcs4  = 0;
+                    $mBytes = 1;
+                    $char = '';
+                }
+            } else {
+                // When mState is non-zero, we expect a continuation of the
+                // multi-octet sequence
+                if (0x80 == (0xC0 & ($in))) {
+                    // Legal continuation.
+                    $shift = ($mState - 1) * 6;
+                    $tmp = $in;
+                    $tmp = ($tmp & 0x0000003F) << $shift;
+                    $mUcs4 |= $tmp;
+
+                    if (0 == --$mState) {
+                        // End of the multi-octet sequence. mUcs4 now contains
+                        // the final Unicode codepoint to be output
+
+                        // Check for illegal sequences and codepoints.
+
+                        // From Unicode 3.1, non-shortest form is illegal
+                        if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
+                            ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
+                            ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
+                            (4 < $mBytes) ||
+                            // From Unicode 3.2, surrogate characters = illegal
+                            (($mUcs4 & 0xFFFFF800) == 0xD800) ||
+                            // Codepoints outside the Unicode range are illegal
+                            ($mUcs4 > 0x10FFFF)
+                        ) {
+
+                        } elseif (0xFEFF != $mUcs4 && // omit BOM
+                            // check for valid Char unicode codepoints
+                            (
+                                0x9 == $mUcs4 ||
+                                0xA == $mUcs4 ||
+                                0xD == $mUcs4 ||
+                                (0x20 <= $mUcs4 && 0x7E >= $mUcs4) ||
+                                // 7F-9F is not strictly prohibited by XML,
+                                // but it is non-SGML, and thus we don't allow it
+                                (0xA0 <= $mUcs4 && 0xD7FF >= $mUcs4) ||
+                                (0x10000 <= $mUcs4 && 0x10FFFF >= $mUcs4)
+                            )
+                        ) {
+                            $out .= $char;
+                        }
+                        // initialize UTF8 cache (reset)
+                        $mState = 0;
+                        $mUcs4  = 0;
+                        $mBytes = 1;
+                        $char = '';
+                    }
+                } else {
+                    // ((0xC0 & (*in) != 0x80) && (mState != 0))
+                    // Incomplete multi-octet sequence.
+                    // used to result in complete fail, but we'll reset
+                    $mState = 0;
+                    $mUcs4  = 0;
+                    $mBytes = 1;
+                    $char ='';
+                }
+            }
+        }
+        return $out;
+    }
+
+    /**
+     * Translates a Unicode codepoint into its corresponding UTF-8 character.
+     * @note Based on Feyd's function at
+     *       <http://forums.devnetwork.net/viewtopic.php?p=191404#191404>,
+     *       which is in public domain.
+     * @note While we're going to do code point parsing anyway, a good
+     *       optimization would be to refuse to translate code points that
+     *       are non-SGML characters.  However, this could lead to duplication.
+     * @note This is very similar to the unichr function in
+     *       maintenance/generate-entity-file.php (although this is superior,
+     *       due to its sanity checks).
+     */
+
+    // +----------+----------+----------+----------+
+    // | 33222222 | 22221111 | 111111   |          |
+    // | 10987654 | 32109876 | 54321098 | 76543210 | bit
+    // +----------+----------+----------+----------+
+    // |          |          |          | 0xxxxxxx | 1 byte 0x00000000..0x0000007F
+    // |          |          | 110yyyyy | 10xxxxxx | 2 byte 0x00000080..0x000007FF
+    // |          | 1110zzzz | 10yyyyyy | 10xxxxxx | 3 byte 0x00000800..0x0000FFFF
+    // | 11110www | 10wwzzzz | 10yyyyyy | 10xxxxxx | 4 byte 0x00010000..0x0010FFFF
+    // +----------+----------+----------+----------+
+    // | 00000000 | 00011111 | 11111111 | 11111111 | Theoretical upper limit of legal scalars: 2097151 (0x001FFFFF)
+    // | 00000000 | 00010000 | 11111111 | 11111111 | Defined upper limit of legal scalar codes
+    // +----------+----------+----------+----------+
+
+    public static function unichr($code) {
+        if($code > 1114111 or $code < 0 or
+          ($code >= 55296 and $code <= 57343) ) {
+            // bits are set outside the "valid" range as defined
+            // by UNICODE 4.1.0
+            return '';
+        }
+
+        $x = $y = $z = $w = 0;
+        if ($code < 128) {
+            // regular ASCII character
+            $x = $code;
+        } else {
+            // set up bits for UTF-8
+            $x = ($code & 63) | 128;
+            if ($code < 2048) {
+                $y = (($code & 2047) >> 6) | 192;
+            } else {
+                $y = (($code & 4032) >> 6) | 128;
+                if($code < 65536) {
+                    $z = (($code >> 12) & 15) | 224;
+                } else {
+                    $z = (($code >> 12) & 63) | 128;
+                    $w = (($code >> 18) & 7)  | 240;
+                }
+            }
+        }
+        // set up the actual character
+        $ret = '';
+        if($w) $ret .= chr($w);
+        if($z) $ret .= chr($z);
+        if($y) $ret .= chr($y);
+        $ret .= chr($x);
+
+        return $ret;
+    }
+
+    /**
+     * Converts a string to UTF-8 based on configuration.
+     */
+    public static function convertToUTF8($str, $config, $context) {
+        $encoding = $config->get('Core', 'Encoding');
+        if ($encoding === 'utf-8') return $str;
+        static $iconv = null;
+        if ($iconv === null) $iconv = function_exists('iconv');
+        set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
+        if ($iconv && !$config->get('Test', 'ForceNoIconv')) {
+            $str = iconv($encoding, 'utf-8//IGNORE', $str);
+            if ($str === false) {
+                // $encoding is not a valid encoding
+                restore_error_handler();
+                trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
+                return '';
+            }
+            // If the string is bjorked by Shift_JIS or a similar encoding
+            // that doesn't support all of ASCII, convert the naughty
+            // characters to their true byte-wise ASCII/UTF-8 equivalents.
+            $str = strtr($str, HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding));
+            restore_error_handler();
+            return $str;
+        } elseif ($encoding === 'iso-8859-1') {
+            $str = utf8_encode($str);
+            restore_error_handler();
+            return $str;
+        }
+        trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
+    }
+
+    /**
+     * Converts a string from UTF-8 based on configuration.
+     * @note Currently, this is a lossy conversion, with unexpressable
+     *       characters being omitted.
+     */
+    public static function convertFromUTF8($str, $config, $context) {
+        $encoding = $config->get('Core', 'Encoding');
+        if ($encoding === 'utf-8') return $str;
+        static $iconv = null;
+        if ($iconv === null) $iconv = function_exists('iconv');
+        if ($escape = $config->get('Core', 'EscapeNonASCIICharacters')) {
+            $str = HTMLPurifier_Encoder::convertToASCIIDumbLossless($str);
+        }
+        set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
+        if ($iconv && !$config->get('Test', 'ForceNoIconv')) {
+            // Undo our previous fix in convertToUTF8, otherwise iconv will barf
+            $ascii_fix = HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding);
+            if (!$escape && !empty($ascii_fix)) {
+                $clear_fix = array();
+                foreach ($ascii_fix as $utf8 => $native) $clear_fix[$utf8] = '';
+                $str = strtr($str, $clear_fix);
+            }
+            $str = strtr($str, array_flip($ascii_fix));
+            // Normal stuff
+            $str = iconv('utf-8', $encoding . '//IGNORE', $str);
+            restore_error_handler();
+            return $str;
+        } elseif ($encoding === 'iso-8859-1') {
+            $str = utf8_decode($str);
+            restore_error_handler();
+            return $str;
+        }
+        trigger_error('Encoding not supported', E_USER_ERROR);
+    }
+
+    /**
+     * Lossless (character-wise) conversion of HTML to ASCII
+     * @param $str UTF-8 string to be converted to ASCII
+     * @returns ASCII encoded string with non-ASCII character entity-ized
+     * @warning Adapted from MediaWiki, claiming fair use: this is a common
+     *       algorithm. If you disagree with this license fudgery,
+     *       implement it yourself.
+     * @note Uses decimal numeric entities since they are best supported.
+     * @note This is a DUMB function: it has no concept of keeping
+     *       character entities that the projected character encoding
+     *       can allow. We could possibly implement a smart version
+     *       but that would require it to also know which Unicode
+     *       codepoints the charset supported (not an easy task).
+     * @note Sort of with cleanUTF8() but it assumes that $str is
+     *       well-formed UTF-8
+     */
+    public static function convertToASCIIDumbLossless($str) {
+        $bytesleft = 0;
+        $result = '';
+        $working = 0;
+        $len = strlen($str);
+        for( $i = 0; $i < $len; $i++ ) {
+            $bytevalue = ord( $str[$i] );
+            if( $bytevalue <= 0x7F ) { //0xxx xxxx
+                $result .= chr( $bytevalue );
+                $bytesleft = 0;
+            } elseif( $bytevalue <= 0xBF ) { //10xx xxxx
+                $working = $working << 6;
+                $working += ($bytevalue & 0x3F);
+                $bytesleft--;
+                if( $bytesleft <= 0 ) {
+                    $result .= "&#" . $working . ";";
+                }
+            } elseif( $bytevalue <= 0xDF ) { //110x xxxx
+                $working = $bytevalue & 0x1F;
+                $bytesleft = 1;
+            } elseif( $bytevalue <= 0xEF ) { //1110 xxxx
+                $working = $bytevalue & 0x0F;
+                $bytesleft = 2;
+            } else { //1111 0xxx
+                $working = $bytevalue & 0x07;
+                $bytesleft = 3;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * This expensive function tests whether or not a given character
+     * encoding supports ASCII. 7/8-bit encodings like Shift_JIS will
+     * fail this test, and require special processing. Variable width
+     * encodings shouldn't ever fail.
+     *
+     * @param string $encoding Encoding name to test, as per iconv format
+     * @param bool $bypass Whether or not to bypass the precompiled arrays.
+     * @return Array of UTF-8 characters to their corresponding ASCII,
+     *      which can be used to "undo" any overzealous iconv action.
+     */
+    public static function testEncodingSupportsASCII($encoding, $bypass = false) {
+        static $encodings = array();
+        if (!$bypass) {
+            if (isset($encodings[$encoding])) return $encodings[$encoding];
+            $lenc = strtolower($encoding);
+            switch ($lenc) {
+                case 'shift_jis':
+                    return array("\xC2\xA5" => '\\', "\xE2\x80\xBE" => '~');
+                case 'johab':
+                    return array("\xE2\x82\xA9" => '\\');
+            }
+            if (strpos($lenc, 'iso-8859-') === 0) return array();
+        }
+        $ret = array();
+        set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
+        if (iconv('UTF-8', $encoding, 'a') === false) return false;
+        for ($i = 0x20; $i <= 0x7E; $i++) { // all printable ASCII chars
+            $c = chr($i); // UTF-8 char
+            $r = iconv('UTF-8', "$encoding//IGNORE", $c); // initial conversion
+            if (
+                $r === '' ||
+                // This line is needed for iconv implementations that do not
+                // omit characters that do not exist in the target character set
+                ($r === $c && iconv($encoding, 'UTF-8//IGNORE', $r) !== $c)
+            ) {
+                // Reverse engineer: what's the UTF-8 equiv of this byte
+                // sequence? This assumes that there's no variable width
+                // encoding that doesn't support ASCII.
+                $ret[iconv($encoding, 'UTF-8//IGNORE', $c)] = $c;
+            }
+        }
+        restore_error_handler();
+        $encodings[$encoding] = $ret;
+        return $ret;
+    }
+
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup.php
new file mode 100755
index 0000000000..b4dfce94c3
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Object that provides entity lookup table from entity name to character
+ */
+class HTMLPurifier_EntityLookup {
+
+    /**
+     * Assoc array of entity name to character represented.
+     */
+    public $table;
+
+    /**
+     * Sets up the entity lookup table from the serialized file contents.
+     * @note The serialized contents are versioned, but were generated
+     *       using the maintenance script generate_entity_file.php
+     * @warning This is not in constructor to help enforce the Singleton
+     */
+    public function setup($file = false) {
+        if (!$file) {
+            $file = HTMLPURIFIER_PREFIX . '/HTMLPurifier/EntityLookup/entities.ser';
+        }
+        $this->table = unserialize(file_get_contents($file));
+    }
+
+    /**
+     * Retrieves sole instance of the object.
+     * @param Optional prototype of custom lookup table to overload with.
+     */
+    public static function instance($prototype = false) {
+        // no references, since PHP doesn't copy unless modified
+        static $instance = null;
+        if ($prototype) {
+            $instance = $prototype;
+        } elseif (!$instance) {
+            $instance = new HTMLPurifier_EntityLookup();
+            $instance->setup();
+        }
+        return $instance;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
new file mode 100755
index 0000000000..f2b8b8f2db
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
@@ -0,0 +1 @@
+a:246:{s:4:"nbsp";s:2:" ";s:5:"iexcl";s:2:"¡";s:4:"cent";s:2:"¢";s:5:"pound";s:2:"£";s:6:"curren";s:2:"¤";s:3:"yen";s:2:"¥";s:6:"brvbar";s:2:"¦";s:4:"sect";s:2:"§";s:3:"uml";s:2:"¨";s:4:"copy";s:2:"©";s:4:"ordf";s:2:"ª";s:5:"laquo";s:2:"«";s:3:"not";s:2:"¬";s:3:"shy";s:2:"­";s:3:"reg";s:2:"®";s:4:"macr";s:2:"¯";s:3:"deg";s:2:"°";s:6:"plusmn";s:2:"±";s:5:"acute";s:2:"´";s:5:"micro";s:2:"µ";s:4:"para";s:2:"¶";s:6:"middot";s:2:"·";s:5:"cedil";s:2:"¸";s:4:"ordm";s:2:"º";s:5:"raquo";s:2:"»";s:6:"iquest";s:2:"¿";s:6:"Agrave";s:2:"À";s:6:"Aacute";s:2:"�";s:5:"Acirc";s:2:"Â";s:6:"Atilde";s:2:"Ã";s:4:"Auml";s:2:"Ä";s:5:"Aring";s:2:"Å";s:5:"AElig";s:2:"Æ";s:6:"Ccedil";s:2:"Ç";s:6:"Egrave";s:2:"È";s:6:"Eacute";s:2:"É";s:5:"Ecirc";s:2:"Ê";s:4:"Euml";s:2:"Ë";s:6:"Igrave";s:2:"Ì";s:6:"Iacute";s:2:"�";s:5:"Icirc";s:2:"Î";s:4:"Iuml";s:2:"�";s:3:"ETH";s:2:"�";s:6:"Ntilde";s:2:"Ñ";s:6:"Ograve";s:2:"Ò";s:6:"Oacute";s:2:"Ó";s:5:"Ocirc";s:2:"Ô";s:6:"Otilde";s:2:"Õ";s:4:"Ouml";s:2:"Ö";s:5:"times";s:2:"×";s:6:"Oslash";s:2:"Ø";s:6:"Ugrave";s:2:"Ù";s:6:"Uacute";s:2:"Ú";s:5:"Ucirc";s:2:"Û";s:4:"Uuml";s:2:"Ü";s:6:"Yacute";s:2:"�";s:5:"THORN";s:2:"Þ";s:5:"szlig";s:2:"ß";s:6:"agrave";s:2:"à";s:6:"aacute";s:2:"á";s:5:"acirc";s:2:"â";s:6:"atilde";s:2:"ã";s:4:"auml";s:2:"ä";s:5:"aring";s:2:"å";s:5:"aelig";s:2:"æ";s:6:"ccedil";s:2:"ç";s:6:"egrave";s:2:"è";s:6:"eacute";s:2:"é";s:5:"ecirc";s:2:"ê";s:4:"euml";s:2:"ë";s:6:"igrave";s:2:"ì";s:6:"iacute";s:2:"í";s:5:"icirc";s:2:"î";s:4:"iuml";s:2:"ï";s:3:"eth";s:2:"ð";s:6:"ntilde";s:2:"ñ";s:6:"ograve";s:2:"ò";s:6:"oacute";s:2:"ó";s:5:"ocirc";s:2:"ô";s:6:"otilde";s:2:"õ";s:4:"ouml";s:2:"ö";s:6:"divide";s:2:"÷";s:6:"oslash";s:2:"ø";s:6:"ugrave";s:2:"ù";s:6:"uacute";s:2:"ú";s:5:"ucirc";s:2:"û";s:4:"uuml";s:2:"ü";s:6:"yacute";s:2:"ý";s:5:"thorn";s:2:"þ";s:4:"yuml";s:2:"ÿ";s:4:"quot";s:1:""";s:3:"amp";s:1:"&";s:2:"lt";s:1:"<";s:2:"gt";s:1:">";s:4:"apos";s:1:"'";s:5:"OElig";s:2:"Œ";s:5:"oelig";s:2:"œ";s:6:"Scaron";s:2:"Š";s:6:"scaron";s:2:"š";s:4:"Yuml";s:2:"Ÿ";s:4:"circ";s:2:"ˆ";s:5:"tilde";s:2:"˜";s:4:"ensp";s:3:" ";s:4:"emsp";s:3:" ";s:6:"thinsp";s:3:" ";s:4:"zwnj";s:3:"‌";s:3:"zwj";s:3:"�";s:3:"lrm";s:3:"‎";s:3:"rlm";s:3:"�";s:5:"ndash";s:3:"–";s:5:"mdash";s:3:"—";s:5:"lsquo";s:3:"‘";s:5:"rsquo";s:3:"’";s:5:"sbquo";s:3:"‚";s:5:"ldquo";s:3:"“";s:5:"rdquo";s:3:"�";s:5:"bdquo";s:3:"„";s:6:"dagger";s:3:"†";s:6:"Dagger";s:3:"‡";s:6:"permil";s:3:"‰";s:6:"lsaquo";s:3:"‹";s:6:"rsaquo";s:3:"›";s:4:"euro";s:3:"€";s:4:"fnof";s:2:"ƒ";s:5:"Alpha";s:2:"Α";s:4:"Beta";s:2:"Β";s:5:"Gamma";s:2:"Γ";s:5:"Delta";s:2:"Δ";s:7:"Epsilon";s:2:"Ε";s:4:"Zeta";s:2:"Ζ";s:3:"Eta";s:2:"Η";s:5:"Theta";s:2:"Θ";s:4:"Iota";s:2:"Ι";s:5:"Kappa";s:2:"Κ";s:6:"Lambda";s:2:"Λ";s:2:"Mu";s:2:"Μ";s:2:"Nu";s:2:"�";s:2:"Xi";s:2:"Ξ";s:7:"Omicron";s:2:"Ο";s:2:"Pi";s:2:"Π";s:3:"Rho";s:2:"Ρ";s:5:"Sigma";s:2:"Σ";s:3:"Tau";s:2:"Τ";s:7:"Upsilon";s:2:"Υ";s:3:"Phi";s:2:"Φ";s:3:"Chi";s:2:"Χ";s:3:"Psi";s:2:"Ψ";s:5:"Omega";s:2:"Ω";s:5:"alpha";s:2:"α";s:4:"beta";s:2:"β";s:5:"gamma";s:2:"γ";s:5:"delta";s:2:"δ";s:7:"epsilon";s:2:"ε";s:4:"zeta";s:2:"ζ";s:3:"eta";s:2:"η";s:5:"theta";s:2:"θ";s:4:"iota";s:2:"ι";s:5:"kappa";s:2:"κ";s:6:"lambda";s:2:"λ";s:2:"mu";s:2:"μ";s:2:"nu";s:2:"ν";s:2:"xi";s:2:"ξ";s:7:"omicron";s:2:"ο";s:2:"pi";s:2:"π";s:3:"rho";s:2:"�";s:6:"sigmaf";s:2:"ς";s:5:"sigma";s:2:"σ";s:3:"tau";s:2:"τ";s:7:"upsilon";s:2:"υ";s:3:"phi";s:2:"φ";s:3:"chi";s:2:"χ";s:3:"psi";s:2:"ψ";s:5:"omega";s:2:"ω";s:8:"thetasym";s:2:"ϑ";s:5:"upsih";s:2:"ϒ";s:3:"piv";s:2:"ϖ";s:4:"bull";s:3:"•";s:6:"hellip";s:3:"…";s:5:"prime";s:3:"′";s:5:"Prime";s:3:"″";s:5:"oline";s:3:"‾";s:5:"frasl";s:3:"�";s:6:"weierp";s:3:"℘";s:5:"image";s:3:"ℑ";s:4:"real";s:3:"ℜ";s:5:"trade";s:3:"™";s:7:"alefsym";s:3:"ℵ";s:4:"larr";s:3:"�";s:4:"uarr";s:3:"↑";s:4:"rarr";s:3:"→";s:4:"darr";s:3:"↓";s:4:"harr";s:3:"↔";s:5:"crarr";s:3:"↵";s:4:"lArr";s:3:"�";s:4:"uArr";s:3:"⇑";s:4:"rArr";s:3:"⇒";s:4:"dArr";s:3:"⇓";s:4:"hArr";s:3:"⇔";s:6:"forall";s:3:"∀";s:4:"part";s:3:"∂";s:5:"exist";s:3:"∃";s:5:"empty";s:3:"∅";s:5:"nabla";s:3:"∇";s:4:"isin";s:3:"∈";s:5:"notin";s:3:"∉";s:2:"ni";s:3:"∋";s:4:"prod";s:3:"�";s:3:"sum";s:3:"∑";s:5:"minus";s:3:"−";s:6:"lowast";s:3:"∗";s:5:"radic";s:3:"√";s:4:"prop";s:3:"�";s:5:"infin";s:3:"∞";s:3:"ang";s:3:"∠";s:3:"and";s:3:"∧";s:2:"or";s:3:"∨";s:3:"cap";s:3:"∩";s:3:"cup";s:3:"∪";s:3:"int";s:3:"∫";s:3:"sim";s:3:"∼";s:4:"cong";s:3:"≅";s:5:"asymp";s:3:"≈";s:2:"ne";s:3:"≠";s:5:"equiv";s:3:"≡";s:2:"le";s:3:"≤";s:2:"ge";s:3:"≥";s:3:"sub";s:3:"⊂";s:3:"sup";s:3:"⊃";s:4:"nsub";s:3:"⊄";s:4:"sube";s:3:"⊆";s:4:"supe";s:3:"⊇";s:5:"oplus";s:3:"⊕";s:6:"otimes";s:3:"⊗";s:4:"perp";s:3:"⊥";s:4:"sdot";s:3:"⋅";s:5:"lceil";s:3:"⌈";s:5:"rceil";s:3:"⌉";s:6:"lfloor";s:3:"⌊";s:6:"rfloor";s:3:"⌋";s:4:"lang";s:3:"〈";s:4:"rang";s:3:"〉";s:3:"loz";s:3:"◊";s:6:"spades";s:3:"♠";s:5:"clubs";s:3:"♣";s:6:"hearts";s:3:"♥";s:5:"diams";s:3:"♦";}
\ No newline at end of file
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityParser.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityParser.php
new file mode 100755
index 0000000000..8c384472dc
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/EntityParser.php
@@ -0,0 +1,144 @@
+<?php
+
+// if want to implement error collecting here, we'll need to use some sort
+// of global data (probably trigger_error) because it's impossible to pass
+// $config or $context to the callback functions.
+
+/**
+ * Handles referencing and derefencing character entities
+ */
+class HTMLPurifier_EntityParser
+{
+
+    /**
+     * Reference to entity lookup table.
+     */
+    protected $_entity_lookup;
+
+    /**
+     * Callback regex string for parsing entities.
+     */
+    protected $_substituteEntitiesRegex =
+'/&(?:[#]x([a-fA-F0-9]+)|[#]0*(\d+)|([A-Za-z_:][A-Za-z0-9.\-_:]*));?/';
+//     1. hex             2. dec      3. string (XML style)
+
+
+    /**
+     * Decimal to parsed string conversion table for special entities.
+     */
+    protected $_special_dec2str =
+            array(
+                    34 => '"',
+                    38 => '&',
+                    39 => "'",
+                    60 => '<',
+                    62 => '>'
+            );
+
+    /**
+     * Stripped entity names to decimal conversion table for special entities.
+     */
+    protected $_special_ent2dec =
+            array(
+                    'quot' => 34,
+                    'amp'  => 38,
+                    'lt'   => 60,
+                    'gt'   => 62
+            );
+
+    /**
+     * Substitutes non-special entities with their parsed equivalents. Since
+     * running this whenever you have parsed character is t3h 5uck, we run
+     * it before everything else.
+     *
+     * @param $string String to have non-special entities parsed.
+     * @returns Parsed string.
+     */
+    public function substituteNonSpecialEntities($string) {
+        // it will try to detect missing semicolons, but don't rely on it
+        return preg_replace_callback(
+            $this->_substituteEntitiesRegex,
+            array($this, 'nonSpecialEntityCallback'),
+            $string
+            );
+    }
+
+    /**
+     * Callback function for substituteNonSpecialEntities() that does the work.
+     *
+     * @param $matches  PCRE matches array, with 0 the entire match, and
+     *                  either index 1, 2 or 3 set with a hex value, dec value,
+     *                  or string (respectively).
+     * @returns Replacement string.
+     */
+
+    protected function nonSpecialEntityCallback($matches) {
+        // replaces all but big five
+        $entity = $matches[0];
+        $is_num = (@$matches[0][1] === '#');
+        if ($is_num) {
+            $is_hex = (@$entity[2] === 'x');
+            $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
+
+            // abort for special characters
+            if (isset($this->_special_dec2str[$code]))  return $entity;
+
+            return HTMLPurifier_Encoder::unichr($code);
+        } else {
+            if (isset($this->_special_ent2dec[$matches[3]])) return $entity;
+            if (!$this->_entity_lookup) {
+                $this->_entity_lookup = HTMLPurifier_EntityLookup::instance();
+            }
+            if (isset($this->_entity_lookup->table[$matches[3]])) {
+                return $this->_entity_lookup->table[$matches[3]];
+            } else {
+                return $entity;
+            }
+        }
+    }
+
+    /**
+     * Substitutes only special entities with their parsed equivalents.
+     *
+     * @notice We try to avoid calling this function because otherwise, it
+     * would have to be called a lot (for every parsed section).
+     *
+     * @param $string String to have non-special entities parsed.
+     * @returns Parsed string.
+     */
+    public function substituteSpecialEntities($string) {
+        return preg_replace_callback(
+            $this->_substituteEntitiesRegex,
+            array($this, 'specialEntityCallback'),
+            $string);
+    }
+
+    /**
+     * Callback function for substituteSpecialEntities() that does the work.
+     *
+     * This callback has same syntax as nonSpecialEntityCallback().
+     *
+     * @param $matches  PCRE-style matches array, with 0 the entire match, and
+     *                  either index 1, 2 or 3 set with a hex value, dec value,
+     *                  or string (respectively).
+     * @returns Replacement string.
+     */
+    protected function specialEntityCallback($matches) {
+        $entity = $matches[0];
+        $is_num = (@$matches[0][1] === '#');
+        if ($is_num) {
+            $is_hex = (@$entity[2] === 'x');
+            $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
+            return isset($this->_special_dec2str[$int]) ?
+                $this->_special_dec2str[$int] :
+                $entity;
+        } else {
+            return isset($this->_special_ent2dec[$matches[3]]) ?
+                $this->_special_ent2dec[$matches[3]] :
+                $entity;
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorCollector.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
new file mode 100755
index 0000000000..6713eaf773
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * Error collection class that enables HTML Purifier to report HTML
+ * problems back to the user
+ */
+class HTMLPurifier_ErrorCollector
+{
+
+    /**
+     * Identifiers for the returned error array. These are purposely numeric
+     * so list() can be used.
+     */
+    const LINENO   = 0;
+    const SEVERITY = 1;
+    const MESSAGE  = 2;
+    const CHILDREN = 3;
+
+    protected $errors;
+    protected $_current;
+    protected $_stacks = array(array());
+    protected $locale;
+    protected $generator;
+    protected $context;
+
+    protected $lines = array();
+
+    public function __construct($context) {
+        $this->locale    =& $context->get('Locale');
+        $this->context   = $context;
+        $this->_current  =& $this->_stacks[0];
+        $this->errors    =& $this->_stacks[0];
+    }
+
+    /**
+     * Sends an error message to the collector for later use
+     * @param $severity int Error severity, PHP error style (don't use E_USER_)
+     * @param $msg string Error message text
+     * @param $subst1 string First substitution for $msg
+     * @param $subst2 string ...
+     */
+    public function send($severity, $msg) {
+
+        $args = array();
+        if (func_num_args() > 2) {
+            $args = func_get_args();
+            array_shift($args);
+            unset($args[0]);
+        }
+
+        $token = $this->context->get('CurrentToken', true);
+        $line  = $token ? $token->line : $this->context->get('CurrentLine', true);
+        $col   = $token ? $token->col  : $this->context->get('CurrentCol',  true);
+        $attr  = $this->context->get('CurrentAttr', true);
+
+        // perform special substitutions, also add custom parameters
+        $subst = array();
+        if (!is_null($token)) {
+            $args['CurrentToken'] = $token;
+        }
+        if (!is_null($attr)) {
+            $subst['$CurrentAttr.Name'] = $attr;
+            if (isset($token->attr[$attr])) $subst['$CurrentAttr.Value'] = $token->attr[$attr];
+        }
+
+        if (empty($args)) {
+            $msg = $this->locale->getMessage($msg);
+        } else {
+            $msg = $this->locale->formatMessage($msg, $args);
+        }
+
+        if (!empty($subst)) $msg = strtr($msg, $subst);
+
+        // (numerically indexed)
+        $error = array(
+            self::LINENO   => $line,
+            self::SEVERITY => $severity,
+            self::MESSAGE  => $msg,
+            self::CHILDREN => array()
+        );
+        $this->_current[] = $error;
+
+
+        // NEW CODE BELOW ...
+
+        $struct = null;
+        // Top-level errors are either:
+        //  TOKEN type, if $value is set appropriately, or
+        //  "syntax" type, if $value is null
+        $new_struct = new HTMLPurifier_ErrorStruct();
+        $new_struct->type = HTMLPurifier_ErrorStruct::TOKEN;
+        if ($token) $new_struct->value = clone $token;
+        if (is_int($line) && is_int($col)) {
+            if (isset($this->lines[$line][$col])) {
+                $struct = $this->lines[$line][$col];
+            } else {
+                $struct = $this->lines[$line][$col] = $new_struct;
+            }
+            // These ksorts may present a performance problem
+            ksort($this->lines[$line], SORT_NUMERIC);
+        } else {
+            if (isset($this->lines[-1])) {
+                $struct = $this->lines[-1];
+            } else {
+                $struct = $this->lines[-1] = $new_struct;
+            }
+        }
+        ksort($this->lines, SORT_NUMERIC);
+
+        // Now, check if we need to operate on a lower structure
+        if (!empty($attr)) {
+            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::ATTR, $attr);
+            if (!$struct->value) {
+                $struct->value = array($attr, 'PUT VALUE HERE');
+            }
+        }
+        if (!empty($cssprop)) {
+            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::CSSPROP, $cssprop);
+            if (!$struct->value) {
+                // if we tokenize CSS this might be a little more difficult to do
+                $struct->value = array($cssprop, 'PUT VALUE HERE');
+            }
+        }
+
+        // Ok, structs are all setup, now time to register the error
+        $struct->addError($severity, $msg);
+    }
+
+    /**
+     * Retrieves raw error data for custom formatter to use
+     * @param List of arrays in format of array(line of error,
+     *        error severity, error message,
+     *        recursive sub-errors array)
+     */
+    public function getRaw() {
+        return $this->errors;
+    }
+
+    /**
+     * Default HTML formatting implementation for error messages
+     * @param $config Configuration array, vital for HTML output nature
+     * @param $errors Errors array to display; used for recursion.
+     */
+    public function getHTMLFormatted($config, $errors = null) {
+        $ret = array();
+
+        $this->generator = new HTMLPurifier_Generator($config, $this->context);
+        if ($errors === null) $errors = $this->errors;
+
+        // 'At line' message needs to be removed
+
+        // generation code for new structure goes here. It needs to be recursive.
+        foreach ($this->lines as $line => $col_array) {
+            if ($line == -1) continue;
+            foreach ($col_array as $col => $struct) {
+                $this->_renderStruct($ret, $struct, $line, $col);
+            }
+        }
+        if (isset($this->lines[-1])) {
+            $this->_renderStruct($ret, $this->lines[-1]);
+        }
+
+        if (empty($errors)) {
+            return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>';
+        } else {
+            return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>';
+        }
+
+    }
+
+    private function _renderStruct(&$ret, $struct, $line = null, $col = null) {
+        $stack = array($struct);
+        $context_stack = array(array());
+        while ($current = array_pop($stack)) {
+            $context = array_pop($context_stack);
+            foreach ($current->errors as $error) {
+                list($severity, $msg) = $error;
+                $string = '';
+                $string .= '<div>';
+                // W3C uses an icon to indicate the severity of the error.
+                $error = $this->locale->getErrorName($severity);
+                $string .= "<span class=\"error e$severity\"><strong>$error</strong></span> ";
+                if (!is_null($line) && !is_null($col)) {
+                    $string .= "<em class=\"location\">Line $line, Column $col: </em> ";
+                } else {
+                    $string .= '<em class="location">End of Document: </em> ';
+                }
+                $string .= '<strong class="description">' . $this->generator->escape($msg) . '</strong> ';
+                $string .= '</div>';
+                // Here, have a marker for the character on the column appropriate.
+                // Be sure to clip extremely long lines.
+                //$string .= '<pre>';
+                //$string .= '';
+                //$string .= '</pre>';
+                $ret[] = $string;
+            }
+            foreach ($current->children as $type => $array) {
+                $context[] = $current;
+                $stack = array_merge($stack, array_reverse($array, true));
+                for ($i = count($array); $i > 0; $i--) {
+                    $context_stack[] = $context;
+                }
+            }
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorStruct.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
new file mode 100755
index 0000000000..9bc8996ec1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Records errors for particular segments of an HTML document such as tokens,
+ * attributes or CSS properties. They can contain error structs (which apply
+ * to components of what they represent), but their main purpose is to hold
+ * errors applying to whatever struct is being used.
+ */
+class HTMLPurifier_ErrorStruct
+{
+
+    /**
+     * Possible values for $children first-key. Note that top-level structures
+     * are automatically token-level.
+     */
+    const TOKEN     = 0;
+    const ATTR      = 1;
+    const CSSPROP   = 2;
+
+    /**
+     * Type of this struct.
+     */
+    public $type;
+
+    /**
+     * Value of the struct we are recording errors for. There are various
+     * values for this:
+     *  - TOKEN: Instance of HTMLPurifier_Token
+     *  - ATTR: array('attr-name', 'value')
+     *  - CSSPROP: array('prop-name', 'value')
+     */
+    public $value;
+
+    /**
+     * Errors registered for this structure.
+     */
+    public $errors = array();
+
+    /**
+     * Child ErrorStructs that are from this structure. For example, a TOKEN
+     * ErrorStruct would contain ATTR ErrorStructs. This is a multi-dimensional
+     * array in structure: [TYPE]['identifier']
+     */
+    public $children = array();
+
+    public function getChild($type, $id) {
+        if (!isset($this->children[$type][$id])) {
+            $this->children[$type][$id] = new HTMLPurifier_ErrorStruct();
+            $this->children[$type][$id]->type = $type;
+        }
+        return $this->children[$type][$id];
+    }
+
+    public function addError($severity, $message) {
+        $this->errors[] = array($severity, $message);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Exception.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Exception.php
new file mode 100755
index 0000000000..be85b4c560
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Exception.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Global exception class for HTML Purifier; any exceptions we throw
+ * are from here.
+ */
+class HTMLPurifier_Exception extends Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter.php
new file mode 100755
index 0000000000..9a0e7b09f3
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Represents a pre or post processing filter on HTML Purifier's output
+ *
+ * Sometimes, a little ad-hoc fixing of HTML has to be done before
+ * it gets sent through HTML Purifier: you can use filters to acheive
+ * this effect. For instance, YouTube videos can be preserved using
+ * this manner. You could have used a decorator for this task, but
+ * PHP's support for them is not terribly robust, so we're going
+ * to just loop through the filters.
+ *
+ * Filters should be exited first in, last out. If there are three filters,
+ * named 1, 2 and 3, the order of execution should go 1->preFilter,
+ * 2->preFilter, 3->preFilter, purify, 3->postFilter, 2->postFilter,
+ * 1->postFilter.
+ *
+ * @note Methods are not declared abstract as it is perfectly legitimate
+ *       for an implementation not to want anything to happen on a step
+ */
+
+class HTMLPurifier_Filter
+{
+
+    /**
+     * Name of the filter for identification purposes
+     */
+    public $name;
+
+    /**
+     * Pre-processor function, handles HTML before HTML Purifier
+     */
+    public function preFilter($html, $config, $context) {
+        return $html;
+    }
+
+    /**
+     * Post-processor function, handles HTML after HTML Purifier
+     */
+    public function postFilter($html, $config, $context) {
+        return $html;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
new file mode 100755
index 0000000000..970f9e0c9d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * This filter extracts <style> blocks from input HTML, cleans them up
+ * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
+ * so they can be used elsewhere in the document.
+ *
+ * @note
+ *      See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
+ *      sample usage.
+ *
+ * @note
+ *      This filter can also be used on stylesheets not included in the
+ *      document--something purists would probably prefer. Just directly
+ *      call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
+ */
+class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
+{
+
+    public $name = 'ExtractStyleBlocks';
+    private $_styleMatches = array();
+    private $_tidy;
+
+    public function __construct() {
+        $this->_tidy = new csstidy();
+    }
+
+    /**
+     * Save the contents of CSS blocks to style matches
+     * @param $matches preg_replace style $matches array
+     */
+    protected function styleCallback($matches) {
+        $this->_styleMatches[] = $matches[1];
+    }
+
+    /**
+     * Removes inline <style> tags from HTML, saves them for later use
+     * @todo Extend to indicate non-text/css style blocks
+     */
+    public function preFilter($html, $config, $context) {
+        $tidy = $config->get('FilterParam', 'ExtractStyleBlocksTidyImpl');
+        if ($tidy !== null) $this->_tidy = $tidy;
+        $html = preg_replace_callback('#<style(?:\s.*)?>(.+)</style>#isU', array($this, 'styleCallback'), $html);
+        $style_blocks = $this->_styleMatches;
+        $this->_styleMatches = array(); // reset
+        $context->register('StyleBlocks', $style_blocks); // $context must not be reused
+        if ($this->_tidy) {
+            foreach ($style_blocks as &$style) {
+                $style = $this->cleanCSS($style, $config, $context);
+            }
+        }
+        return $html;
+    }
+
+    /**
+     * Takes CSS (the stuff found in <style>) and cleans it.
+     * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
+     * @param $css     CSS styling to clean
+     * @param $config  Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @return Cleaned CSS
+     */
+    public function cleanCSS($css, $config, $context) {
+        // prepare scope
+        $scope = $config->get('FilterParam', 'ExtractStyleBlocksScope');
+        if ($scope !== null) {
+            $scopes = array_map('trim', explode(',', $scope));
+        } else {
+            $scopes = array();
+        }
+        // remove comments from CSS
+        $css = trim($css);
+        if (strncmp('<!--', $css, 4) === 0) {
+            $css = substr($css, 4);
+        }
+        if (strlen($css) > 3 && substr($css, -3) == '-->') {
+            $css = substr($css, 0, -3);
+        }
+        $css = trim($css);
+        $this->_tidy->parse($css);
+        $css_definition = $config->getDefinition('CSS');
+        foreach ($this->_tidy->css as $k => $decls) {
+            // $decls are all CSS declarations inside an @ selector
+            $new_decls = array();
+            foreach ($decls as $selector => $style) {
+                $selector = trim($selector);
+                if ($selector === '') continue; // should not happen
+                if ($selector[0] === '+') {
+                    if ($selector !== '' && $selector[0] === '+') continue;
+                }
+                if (!empty($scopes)) {
+                    $new_selector = array(); // because multiple ones are possible
+                    $selectors = array_map('trim', explode(',', $selector));
+                    foreach ($scopes as $s1) {
+                        foreach ($selectors as $s2) {
+                            $new_selector[] = "$s1 $s2";
+                        }
+                    }
+                    $selector = implode(', ', $new_selector); // now it's a string
+                }
+                foreach ($style as $name => $value) {
+                    if (!isset($css_definition->info[$name])) {
+                        unset($style[$name]);
+                        continue;
+                    }
+                    $def = $css_definition->info[$name];
+                    $ret = $def->validate($value, $config, $context);
+                    if ($ret === false) unset($style[$name]);
+                    else $style[$name] = $ret;
+                }
+                $new_decls[$selector] = $style;
+            }
+            $this->_tidy->css[$k] = $new_decls;
+        }
+        // remove stuff that shouldn't be used, could be reenabled
+        // after security risks are analyzed
+        $this->_tidy->import = array();
+        $this->_tidy->charset = null;
+        $this->_tidy->namespace = null;
+        $css = $this->_tidy->print->plain();
+        // we are going to escape any special characters <>& to ensure
+        // that no funny business occurs (i.e. </style> in a font-family prop).
+        if ($config->get('FilterParam', 'ExtractStyleBlocksEscaping')) {
+            $css = str_replace(
+                array('<',    '>',    '&'),
+                array('\3C ', '\3E ', '\26 '),
+                $css
+            );
+        }
+        return $css;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
new file mode 100755
index 0000000000..aca972f6c5
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
@@ -0,0 +1,39 @@
+<?php
+
+class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
+{
+
+    public $name = 'YouTube';
+
+    public function preFilter($html, $config, $context) {
+        $pre_regex = '#<object[^>]+>.+?'.
+            'http://www.youtube.com/v/([A-Za-z0-9\-_]+).+?</object>#s';
+        $pre_replace = '<span class="youtube-embed">\1</span>';
+        return preg_replace($pre_regex, $pre_replace, $html);
+    }
+
+    public function postFilter($html, $config, $context) {
+        $post_regex = '#<span class="youtube-embed">([A-Za-z0-9\-_]+)</span>#';
+        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
+    }
+
+    protected function armorUrl($url) {
+        return str_replace('--', '-&#45;', $url);
+    }
+
+    protected function postFilterCallback($matches) {
+        $url = $this->armorUrl($matches[1]);
+        return '<object width="425" height="350" type="application/x-shockwave-flash" '.
+            'data="http://www.youtube.com/v/'.$url.'">'.
+            '<param name="movie" value="http://www.youtube.com/v/'.$url.'"></param>'.
+            '<!--[if IE]>'.
+            '<embed src="http://www.youtube.com/v/'.$url.'"'.
+            'type="application/x-shockwave-flash"'.
+            'wmode="transparent" width="425" height="350" />'.
+            '<![endif]-->'.
+            '</object>';
+
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Generator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Generator.php
new file mode 100755
index 0000000000..a1b96b9e49
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Generator.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * Generates HTML from tokens.
+ * @todo Refactor interface so that configuration/context is determined
+ *       upon instantiation, no need for messy generateFromTokens() calls
+ * @todo Make some of the more internal functions protected, and have
+ *       unit tests work around that
+ */
+class HTMLPurifier_Generator
+{
+
+    /**
+     * Whether or not generator should produce XML output
+     */
+    private $_xhtml = true;
+
+    /**
+     * :HACK: Whether or not generator should comment the insides of <script> tags
+     */
+    private $_scriptFix = false;
+
+    /**
+     * Cache of HTMLDefinition during HTML output to determine whether or
+     * not attributes should be minimized.
+     */
+    private $_def;
+
+    /**
+     * Cache of %Output.SortAttr
+     */
+    private $_sortAttr;
+
+    /**
+     * Configuration for the generator
+     */
+    protected $config;
+
+    /**
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     */
+    public function __construct($config, $context) {
+        $this->config = $config;
+        $this->_scriptFix = $config->get('Output', 'CommentScriptContents');
+        $this->_sortAttr = $config->get('Output', 'SortAttr');
+        $this->_def = $config->getHTMLDefinition();
+        $this->_xhtml = $this->_def->doctype->xml;
+    }
+
+    /**
+     * Generates HTML from an array of tokens.
+     * @param $tokens Array of HTMLPurifier_Token
+     * @param $config HTMLPurifier_Config object
+     * @return Generated HTML
+     */
+    public function generateFromTokens($tokens) {
+        if (!$tokens) return '';
+
+        // Basic algorithm
+        $html = '';
+        for ($i = 0, $size = count($tokens); $i < $size; $i++) {
+            if ($this->_scriptFix && $tokens[$i]->name === 'script'
+                && $i + 2 < $size && $tokens[$i+2] instanceof HTMLPurifier_Token_End) {
+                // script special case
+                // the contents of the script block must be ONE token
+                // for this to work.
+                $html .= $this->generateFromToken($tokens[$i++]);
+                $html .= $this->generateScriptFromToken($tokens[$i++]);
+            }
+            $html .= $this->generateFromToken($tokens[$i]);
+        }
+
+        // Tidy cleanup
+        if (extension_loaded('tidy') && $this->config->get('Output', 'TidyFormat')) {
+            $tidy = new Tidy;
+            $tidy->parseString($html, array(
+               'indent'=> true,
+               'output-xhtml' => $this->_xhtml,
+               'show-body-only' => true,
+               'indent-spaces' => 2,
+               'wrap' => 68,
+            ), 'utf8');
+            $tidy->cleanRepair();
+            $html = (string) $tidy; // explicit cast necessary
+        }
+
+        // Normalize newlines to system defined value
+        $nl = $this->config->get('Output', 'Newline');
+        if ($nl === null) $nl = PHP_EOL;
+        if ($nl !== "\n") $html = str_replace("\n", $nl, $html);
+        return $html;
+    }
+
+    /**
+     * Generates HTML from a single token.
+     * @param $token HTMLPurifier_Token object.
+     * @return Generated HTML
+     */
+    public function generateFromToken($token) {
+        if (!$token instanceof HTMLPurifier_Token) {
+            trigger_error('Cannot generate HTML from non-HTMLPurifier_Token object', E_USER_WARNING);
+            return '';
+
+        } elseif ($token instanceof HTMLPurifier_Token_Start) {
+            $attr = $this->generateAttributes($token->attr, $token->name);
+            return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
+
+        } elseif ($token instanceof HTMLPurifier_Token_End) {
+            return '</' . $token->name . '>';
+
+        } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+            $attr = $this->generateAttributes($token->attr, $token->name);
+             return '<' . $token->name . ($attr ? ' ' : '') . $attr .
+                ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
+                . '>';
+
+        } elseif ($token instanceof HTMLPurifier_Token_Text) {
+            return $this->escape($token->data, ENT_NOQUOTES);
+
+        } elseif ($token instanceof HTMLPurifier_Token_Comment) {
+            return '<!--' . $token->data . '-->';
+        } else {
+            return '';
+
+        }
+    }
+
+    /**
+     * Special case processor for the contents of script tags
+     * @warning This runs into problems if there's already a literal
+     *          --> somewhere inside the script contents.
+     */
+    public function generateScriptFromToken($token) {
+        if (!$token instanceof HTMLPurifier_Token_Text) return $this->generateFromToken($token);
+        // Thanks <http://lachy.id.au/log/2005/05/script-comments>
+        $data = preg_replace('#//\s*$#', '', $token->data);
+        return '<!--//--><![CDATA[//><!--' . "\n" . trim($data) . "\n" . '//--><!]]>';
+    }
+
+    /**
+     * Generates attribute declarations from attribute array.
+     * @note This does not include the leading or trailing space.
+     * @param $assoc_array_of_attributes Attribute array
+     * @param $element Name of element attributes are for, used to check
+     *        attribute minimization.
+     * @return Generate HTML fragment for insertion.
+     */
+    public function generateAttributes($assoc_array_of_attributes, $element = false) {
+        $html = '';
+        if ($this->_sortAttr) ksort($assoc_array_of_attributes);
+        foreach ($assoc_array_of_attributes as $key => $value) {
+            if (!$this->_xhtml) {
+                // Remove namespaced attributes
+                if (strpos($key, ':') !== false) continue;
+                // Check if we should minimize the attribute: val="val" -> val
+                if ($element && !empty($this->_def->info[$element]->attr[$key]->minimized)) {
+                    $html .= $key . ' ';
+                    continue;
+                }
+            }
+            $html .= $key.'="'.$this->escape($value).'" ';
+        }
+        return rtrim($html);
+    }
+
+    /**
+     * Escapes raw text data.
+     * @todo This really ought to be protected, but until we have a facility
+     *       for properly generating HTML here w/o using tokens, it stays
+     *       public.
+     * @param $string String data to escape for HTML.
+     * @param $quote Quoting style, like htmlspecialchars. ENT_NOQUOTES is
+     *               permissible for non-attribute output.
+     * @return String escaped data.
+     */
+    public function escape($string, $quote = ENT_COMPAT) {
+        return htmlspecialchars($string, $quote, 'UTF-8');
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
new file mode 100755
index 0000000000..3368821c74
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
@@ -0,0 +1,420 @@
+<?php
+
+/**
+ * Definition of the purified HTML that describes allowed children,
+ * attributes, and many other things.
+ *
+ * Conventions:
+ *
+ * All member variables that are prefixed with info
+ * (including the main $info array) are used by HTML Purifier internals
+ * and should not be directly edited when customizing the HTMLDefinition.
+ * They can usually be set via configuration directives or custom
+ * modules.
+ *
+ * On the other hand, member variables without the info prefix are used
+ * internally by the HTMLDefinition and MUST NOT be used by other HTML
+ * Purifier internals. Many of them, however, are public, and may be
+ * edited by userspace code to tweak the behavior of HTMLDefinition.
+ *
+ * @note This class is inspected by Printer_HTMLDefinition; please
+ *       update that class if things here change.
+ *
+ * @warning Directives that change this object's structure must be in
+ *          the HTML or Attr namespace!
+ */
+class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
+{
+
+    // FULLY-PUBLIC VARIABLES ---------------------------------------------
+
+    /**
+     * Associative array of element names to HTMLPurifier_ElementDef
+     */
+    public $info = array();
+
+    /**
+     * Associative array of global attribute name to attribute definition.
+     */
+    public $info_global_attr = array();
+
+    /**
+     * String name of parent element HTML will be going into.
+     */
+    public $info_parent = 'div';
+
+    /**
+     * Definition for parent element, allows parent element to be a
+     * tag that's not allowed inside the HTML fragment.
+     */
+    public $info_parent_def;
+
+    /**
+     * String name of element used to wrap inline elements in block context
+     * @note This is rarely used except for BLOCKQUOTEs in strict mode
+     */
+    public $info_block_wrapper = 'p';
+
+    /**
+     * Associative array of deprecated tag name to HTMLPurifier_TagTransform
+     */
+    public $info_tag_transform = array();
+
+    /**
+     * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
+     */
+    public $info_attr_transform_pre = array();
+
+    /**
+     * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
+     */
+    public $info_attr_transform_post = array();
+
+    /**
+     * Nested lookup array of content set name (Block, Inline) to
+     * element name to whether or not it belongs in that content set.
+     */
+    public $info_content_sets = array();
+
+    /**
+     * Indexed list of HTMLPurifier_Injector to be used.
+     */
+    public $info_injector = array();
+
+    /**
+     * Doctype object
+     */
+    public $doctype;
+
+
+
+    // RAW CUSTOMIZATION STUFF --------------------------------------------
+
+    /**
+     * Adds a custom attribute to a pre-existing element
+     * @note This is strictly convenience, and does not have a corresponding
+     *       method in HTMLPurifier_HTMLModule
+     * @param $element_name String element name to add attribute to
+     * @param $attr_name String name of attribute
+     * @param $def Attribute definition, can be string or object, see
+     *             HTMLPurifier_AttrTypes for details
+     */
+    public function addAttribute($element_name, $attr_name, $def) {
+        $module = $this->getAnonymousModule();
+        if (!isset($module->info[$element_name])) {
+            $element = $module->addBlankElement($element_name);
+        } else {
+            $element = $module->info[$element_name];
+        }
+        $element->attr[$attr_name] = $def;
+    }
+
+    /**
+     * Adds a custom element to your HTML definition
+     * @note See HTMLPurifier_HTMLModule::addElement for detailed
+     *       parameter and return value descriptions.
+     */
+    public function addElement($element_name, $type, $contents, $attr_collections, $attributes) {
+        $module = $this->getAnonymousModule();
+        // assume that if the user is calling this, the element
+        // is safe. This may not be a good idea
+        $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
+        return $element;
+    }
+
+    /**
+     * Adds a blank element to your HTML definition, for overriding
+     * existing behavior
+     * @note See HTMLPurifier_HTMLModule::addBlankElement for detailed
+     *       parameter and return value descriptions.
+     */
+    public function addBlankElement($element_name) {
+        $module  = $this->getAnonymousModule();
+        $element = $module->addBlankElement($element_name);
+        return $element;
+    }
+
+    /**
+     * Retrieves a reference to the anonymous module, so you can
+     * bust out advanced features without having to make your own
+     * module.
+     */
+    public function getAnonymousModule() {
+        if (!$this->_anonModule) {
+            $this->_anonModule = new HTMLPurifier_HTMLModule();
+            $this->_anonModule->name = 'Anonymous';
+        }
+        return $this->_anonModule;
+    }
+
+    private $_anonModule;
+
+
+    // PUBLIC BUT INTERNAL VARIABLES --------------------------------------
+
+    public $type = 'HTML';
+    public $manager; /**< Instance of HTMLPurifier_HTMLModuleManager */
+
+    /**
+     * Performs low-cost, preliminary initialization.
+     */
+    public function __construct() {
+        $this->manager = new HTMLPurifier_HTMLModuleManager();
+    }
+
+    protected function doSetup($config) {
+        $this->processModules($config);
+        $this->setupConfigStuff($config);
+        unset($this->manager);
+
+        // cleanup some of the element definitions
+        foreach ($this->info as $k => $v) {
+            unset($this->info[$k]->content_model);
+            unset($this->info[$k]->content_model_type);
+        }
+    }
+
+    /**
+     * Extract out the information from the manager
+     */
+    protected function processModules($config) {
+
+        if ($this->_anonModule) {
+            // for user specific changes
+            // this is late-loaded so we don't have to deal with PHP4
+            // reference wonky-ness
+            $this->manager->addModule($this->_anonModule);
+            unset($this->_anonModule);
+        }
+
+        $this->manager->setup($config);
+        $this->doctype = $this->manager->doctype;
+
+        foreach ($this->manager->modules as $module) {
+            foreach($module->info_tag_transform as $k => $v) {
+                if ($v === false) unset($this->info_tag_transform[$k]);
+                else $this->info_tag_transform[$k] = $v;
+            }
+            foreach($module->info_attr_transform_pre as $k => $v) {
+                if ($v === false) unset($this->info_attr_transform_pre[$k]);
+                else $this->info_attr_transform_pre[$k] = $v;
+            }
+            foreach($module->info_attr_transform_post as $k => $v) {
+                if ($v === false) unset($this->info_attr_transform_post[$k]);
+                else $this->info_attr_transform_post[$k] = $v;
+            }
+            foreach ($module->info_injector as $k => $v) {
+                if ($v === false) unset($this->info_injector[$k]);
+                else $this->info_injector[$k] = $v;
+            }
+        }
+
+        $this->info = $this->manager->getElements();
+        $this->info_content_sets = $this->manager->contentSets->lookup;
+
+    }
+
+    /**
+     * Sets up stuff based on config. We need a better way of doing this.
+     */
+    protected function setupConfigStuff($config) {
+
+        $block_wrapper = $config->get('HTML', 'BlockWrapper');
+        if (isset($this->info_content_sets['Block'][$block_wrapper])) {
+            $this->info_block_wrapper = $block_wrapper;
+        } else {
+            trigger_error('Cannot use non-block element as block wrapper',
+                E_USER_ERROR);
+        }
+
+        $parent = $config->get('HTML', 'Parent');
+        $def = $this->manager->getElement($parent, true);
+        if ($def) {
+            $this->info_parent = $parent;
+            $this->info_parent_def = $def;
+        } else {
+            trigger_error('Cannot use unrecognized element as parent',
+                E_USER_ERROR);
+            $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
+        }
+
+        // support template text
+        $support = "(for information on implementing this, see the ".
+                   "support forums) ";
+
+        // setup allowed elements -----------------------------------------
+
+        $allowed_elements = $config->get('HTML', 'AllowedElements');
+        $allowed_attributes = $config->get('HTML', 'AllowedAttributes'); // retrieve early
+
+        if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
+            $allowed = $config->get('HTML', 'Allowed');
+            if (is_string($allowed)) {
+                list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
+            }
+        }
+
+        if (is_array($allowed_elements)) {
+            foreach ($this->info as $name => $d) {
+                if(!isset($allowed_elements[$name])) unset($this->info[$name]);
+                unset($allowed_elements[$name]);
+            }
+            // emit errors
+            foreach ($allowed_elements as $element => $d) {
+                $element = htmlspecialchars($element); // PHP doesn't escape errors, be careful!
+                trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
+            }
+        }
+
+        // setup allowed attributes ---------------------------------------
+
+        $allowed_attributes_mutable = $allowed_attributes; // by copy!
+        if (is_array($allowed_attributes)) {
+
+            // This actually doesn't do anything, since we went away from
+            // global attributes. It's possible that userland code uses
+            // it, but HTMLModuleManager doesn't!
+            foreach ($this->info_global_attr as $attr => $x) {
+                $keys = array($attr, "*@$attr", "*.$attr");
+                $delete = true;
+                foreach ($keys as $key) {
+                    if ($delete && isset($allowed_attributes[$key])) {
+                        $delete = false;
+                    }
+                    if (isset($allowed_attributes_mutable[$key])) {
+                        unset($allowed_attributes_mutable[$key]);
+                    }
+                }
+                if ($delete) unset($this->info_global_attr[$attr]);
+            }
+
+            foreach ($this->info as $tag => $info) {
+                foreach ($info->attr as $attr => $x) {
+                    $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
+                    $delete = true;
+                    foreach ($keys as $key) {
+                        if ($delete && isset($allowed_attributes[$key])) {
+                            $delete = false;
+                        }
+                        if (isset($allowed_attributes_mutable[$key])) {
+                            unset($allowed_attributes_mutable[$key]);
+                        }
+                    }
+                    if ($delete) unset($this->info[$tag]->attr[$attr]);
+                }
+            }
+            // emit errors
+            foreach ($allowed_attributes_mutable as $elattr => $d) {
+                $bits = preg_split('/[.@]/', $elattr, 2);
+                $c = count($bits);
+                switch ($c) {
+                    case 2:
+                        if ($bits[0] !== '*') {
+                            $element = htmlspecialchars($bits[0]);
+                            $attribute = htmlspecialchars($bits[1]);
+                            if (!isset($this->info[$element])) {
+                                trigger_error("Cannot allow attribute '$attribute' if element '$element' is not allowed/supported $support");
+                            } else {
+                                trigger_error("Attribute '$attribute' in element '$element' not supported $support",
+                                    E_USER_WARNING);
+                            }
+                            break;
+                        }
+                        // otherwise fall through
+                    case 1:
+                        $attribute = htmlspecialchars($bits[0]);
+                        trigger_error("Global attribute '$attribute' is not ".
+                            "supported in any elements $support",
+                            E_USER_WARNING);
+                        break;
+                }
+            }
+
+        }
+
+        // setup forbidden elements ---------------------------------------
+
+        $forbidden_elements   = $config->get('HTML', 'ForbiddenElements');
+        $forbidden_attributes = $config->get('HTML', 'ForbiddenAttributes');
+
+        foreach ($this->info as $tag => $info) {
+            if (isset($forbidden_elements[$tag])) {
+                unset($this->info[$tag]);
+                continue;
+            }
+            foreach ($info->attr as $attr => $x) {
+                if (
+                    isset($forbidden_attributes["$tag@$attr"]) ||
+                    isset($forbidden_attributes["*@$attr"]) ||
+                    isset($forbidden_attributes[$attr])
+                ) {
+                    unset($this->info[$tag]->attr[$attr]);
+                    continue;
+                } // this segment might get removed eventually
+                elseif (isset($forbidden_attributes["$tag.$attr"])) {
+                    // $tag.$attr are not user supplied, so no worries!
+                    trigger_error("Error with $tag.$attr: tag.attr syntax not supported for HTML.ForbiddenAttributes; use tag@attr instead", E_USER_WARNING);
+                }
+            }
+        }
+        foreach ($forbidden_attributes as $key => $v) {
+            if (strlen($key) < 2) continue;
+            if ($key[0] != '*') continue;
+            if ($key[1] == '.') {
+                trigger_error("Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead", E_USER_WARNING);
+            }
+        }
+
+        // setup injectors -----------------------------------------------------
+        foreach ($this->info_injector as $i => $injector) {
+            if ($injector->checkNeeded($config) !== false) {
+                // remove injector that does not have it's required
+                // elements/attributes present, and is thus not needed.
+                unset($this->info_injector[$i]);
+            }
+        }
+    }
+
+    /**
+     * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
+     * separate lists for processing. Format is element[attr1|attr2],element2...
+     * @warning Although it's largely drawn from TinyMCE's implementation,
+     *      it is different, and you'll probably have to modify your lists
+     * @param $list String list to parse
+     * @param array($allowed_elements, $allowed_attributes)
+     * @todo Give this its own class, probably static interface
+     */
+    public function parseTinyMCEAllowedList($list) {
+
+        $list = str_replace(array(' ', "\t"), '', $list);
+
+        $elements = array();
+        $attributes = array();
+
+        $chunks = preg_split('/(,|[\n\r]+)/', $list);
+        foreach ($chunks as $chunk) {
+            if (empty($chunk)) continue;
+            // remove TinyMCE element control characters
+            if (!strpos($chunk, '[')) {
+                $element = $chunk;
+                $attr = false;
+            } else {
+                list($element, $attr) = explode('[', $chunk);
+            }
+            if ($element !== '*') $elements[$element] = true;
+            if (!$attr) continue;
+            $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
+            $attr = explode('|', $attr);
+            foreach ($attr as $key) {
+                $attributes["$element.$key"] = true;
+            }
+        }
+
+        return array($elements, $attributes);
+
+    }
+
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule.php
new file mode 100755
index 0000000000..072cf68084
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule.php
@@ -0,0 +1,244 @@
+<?php
+
+/**
+ * Represents an XHTML 1.1 module, with information on elements, tags
+ * and attributes.
+ * @note Even though this is technically XHTML 1.1, it is also used for
+ *       regular HTML parsing. We are using modulization as a convenient
+ *       way to represent the internals of HTMLDefinition, and our
+ *       implementation is by no means conforming and does not directly
+ *       use the normative DTDs or XML schemas.
+ * @note The public variables in a module should almost directly
+ *       correspond to the variables in HTMLPurifier_HTMLDefinition.
+ *       However, the prefix info carries no special meaning in these
+ *       objects (include it anyway if that's the correspondence though).
+ * @todo Consider making some member functions protected
+ */
+
+class HTMLPurifier_HTMLModule
+{
+
+    // -- Overloadable ----------------------------------------------------
+
+    /**
+     * Short unique string identifier of the module
+     */
+    public $name;
+
+    /**
+     * Informally, a list of elements this module changes. Not used in
+     * any significant way.
+     */
+    public $elements = array();
+
+    /**
+     * Associative array of element names to element definitions.
+     * Some definitions may be incomplete, to be merged in later
+     * with the full definition.
+     */
+    public $info = array();
+
+    /**
+     * Associative array of content set names to content set additions.
+     * This is commonly used to, say, add an A element to the Inline
+     * content set. This corresponds to an internal variable $content_sets
+     * and NOT info_content_sets member variable of HTMLDefinition.
+     */
+    public $content_sets = array();
+
+    /**
+     * Associative array of attribute collection names to attribute
+     * collection additions. More rarely used for adding attributes to
+     * the global collections. Example is the StyleAttribute module adding
+     * the style attribute to the Core. Corresponds to HTMLDefinition's
+     * attr_collections->info, since the object's data is only info,
+     * with extra behavior associated with it.
+     */
+    public $attr_collections = array();
+
+    /**
+     * Associative array of deprecated tag name to HTMLPurifier_TagTransform
+     */
+    public $info_tag_transform = array();
+
+    /**
+     * List of HTMLPurifier_AttrTransform to be performed before validation.
+     */
+    public $info_attr_transform_pre = array();
+
+    /**
+     * List of HTMLPurifier_AttrTransform to be performed after validation.
+     */
+    public $info_attr_transform_post = array();
+
+    /**
+     * List of HTMLPurifier_Injector to be performed during well-formedness fixing.
+     * An injector will only be invoked if all of it's pre-requisites are met;
+     * if an injector fails setup, there will be no error; it will simply be
+     * silently disabled.
+     */
+    public $info_injector = array();
+
+    /**
+     * Boolean flag that indicates whether or not getChildDef is implemented.
+     * For optimization reasons: may save a call to a function. Be sure
+     * to set it if you do implement getChildDef(), otherwise it will have
+     * no effect!
+     */
+    public $defines_child_def = false;
+
+    /**
+     * Boolean flag whether or not this module is safe. If it is not safe, all
+     * of its members are unsafe. Modules are safe by default (this might be
+     * slightly dangerous, but it doesn't make much sense to force HTML Purifier,
+     * which is based off of safe HTML, to explicitly say, "This is safe," even
+     * though there are modules which are "unsafe")
+     *
+     * @note Previously, safety could be applied at an element level granularity.
+     *       We've removed this ability, so in order to add "unsafe" elements
+     *       or attributes, a dedicated module with this property set to false
+     *       must be used.
+     */
+    public $safe = true;
+
+    /**
+     * Retrieves a proper HTMLPurifier_ChildDef subclass based on
+     * content_model and content_model_type member variables of
+     * the HTMLPurifier_ElementDef class. There is a similar function
+     * in HTMLPurifier_HTMLDefinition.
+     * @param $def HTMLPurifier_ElementDef instance
+     * @return HTMLPurifier_ChildDef subclass
+     */
+    public function getChildDef($def) {return false;}
+
+    // -- Convenience -----------------------------------------------------
+
+    /**
+     * Convenience function that sets up a new element
+     * @param $element Name of element to add
+     * @param $type What content set should element be registered to?
+     *              Set as false to skip this step.
+     * @param $contents Allowed children in form of:
+     *              "$content_model_type: $content_model"
+     * @param $attr_includes What attribute collections to register to
+     *              element?
+     * @param $attr What unique attributes does the element define?
+     * @note See ElementDef for in-depth descriptions of these parameters.
+     * @return Created element definition object, so you
+     *         can set advanced parameters
+     */
+    public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array()) {
+        $this->elements[] = $element;
+        // parse content_model
+        list($content_model_type, $content_model) = $this->parseContents($contents);
+        // merge in attribute inclusions
+        $this->mergeInAttrIncludes($attr, $attr_includes);
+        // add element to content sets
+        if ($type) $this->addElementToContentSet($element, $type);
+        // create element
+        $this->info[$element] = HTMLPurifier_ElementDef::create(
+            $content_model, $content_model_type, $attr
+        );
+        // literal object $contents means direct child manipulation
+        if (!is_string($contents)) $this->info[$element]->child = $contents;
+        return $this->info[$element];
+    }
+
+    /**
+     * Convenience function that creates a totally blank, non-standalone
+     * element.
+     * @param $element Name of element to create
+     * @return Created element
+     */
+    public function addBlankElement($element) {
+        if (!isset($this->info[$element])) {
+            $this->elements[] = $element;
+            $this->info[$element] = new HTMLPurifier_ElementDef();
+            $this->info[$element]->standalone = false;
+        } else {
+            trigger_error("Definition for $element already exists in module, cannot redefine");
+        }
+        return $this->info[$element];
+    }
+
+    /**
+     * Convenience function that registers an element to a content set
+     * @param Element to register
+     * @param Name content set (warning: case sensitive, usually upper-case
+     *        first letter)
+     */
+    public function addElementToContentSet($element, $type) {
+        if (!isset($this->content_sets[$type])) $this->content_sets[$type] = '';
+        else $this->content_sets[$type] .= ' | ';
+        $this->content_sets[$type] .= $element;
+    }
+
+    /**
+     * Convenience function that transforms single-string contents
+     * into separate content model and content model type
+     * @param $contents Allowed children in form of:
+     *                  "$content_model_type: $content_model"
+     * @note If contents is an object, an array of two nulls will be
+     *       returned, and the callee needs to take the original $contents
+     *       and use it directly.
+     */
+    public function parseContents($contents) {
+        if (!is_string($contents)) return array(null, null); // defer
+        switch ($contents) {
+            // check for shorthand content model forms
+            case 'Empty':
+                return array('empty', '');
+            case 'Inline':
+                return array('optional', 'Inline | #PCDATA');
+            case 'Flow':
+                return array('optional', 'Flow | #PCDATA');
+        }
+        list($content_model_type, $content_model) = explode(':', $contents);
+        $content_model_type = strtolower(trim($content_model_type));
+        $content_model = trim($content_model);
+        return array($content_model_type, $content_model);
+    }
+
+    /**
+     * Convenience function that merges a list of attribute includes into
+     * an attribute array.
+     * @param $attr Reference to attr array to modify
+     * @param $attr_includes Array of includes / string include to merge in
+     */
+    public function mergeInAttrIncludes(&$attr, $attr_includes) {
+        if (!is_array($attr_includes)) {
+            if (empty($attr_includes)) $attr_includes = array();
+            else $attr_includes = array($attr_includes);
+        }
+        $attr[0] = $attr_includes;
+    }
+
+    /**
+     * Convenience function that generates a lookup table with boolean
+     * true as value.
+     * @param $list List of values to turn into a lookup
+     * @note You can also pass an arbitrary number of arguments in
+     *       place of the regular argument
+     * @return Lookup array equivalent of list
+     */
+    public function makeLookup($list) {
+        if (is_string($list)) $list = func_get_args();
+        $ret = array();
+        foreach ($list as $value) {
+            if (is_null($value)) continue;
+            $ret[$value] = true;
+        }
+        return $ret;
+    }
+
+    /**
+     * Lazy load construction of the module after determining whether
+     * or not it's needed, and also when a finalized configuration object
+     * is available.
+     * @param $config Instance of HTMLPurifier_Config
+     */
+    public function setup($config) {}
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
new file mode 100755
index 0000000000..3d66f1b4e1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * XHTML 1.1 Bi-directional Text Module, defines elements that
+ * declare directionality of content. Text Extension Module.
+ */
+class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Bdo';
+    public $attr_collections = array(
+        'I18N' => array('dir' => false)
+    );
+
+    public function setup($config) {
+        $bdo = $this->addElement(
+            'bdo', 'Inline', 'Inline', array('Core', 'Lang'),
+            array(
+                'dir' => 'Enum#ltr,rtl', // required
+                // The Abstract Module specification has the attribute
+                // inclusions wrong for bdo: bdo allows Lang
+            )
+        );
+        $bdo->attr_transform_post['required-dir'] = new HTMLPurifier_AttrTransform_BdoDir();
+
+        $this->attr_collections['I18N']['dir'] = 'Enum#ltr,rtl';
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
new file mode 100755
index 0000000000..fdf7b32399
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
@@ -0,0 +1,25 @@
+<?php
+
+class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
+{
+    public $name = 'CommonAttributes';
+
+    public $attr_collections = array(
+        'Core' => array(
+            0 => array('Style'),
+            // 'xml:space' => false,
+            'class' => 'NMTOKENS',
+            'id' => 'ID',
+            'title' => 'CDATA',
+        ),
+        'Lang' => array(),
+        'I18N' => array(
+            0 => array('Lang'), // proprietary, for xml:lang/lang
+        ),
+        'Common' => array(
+            0 => array('Core', 'I18N')
+        )
+    );
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
new file mode 100755
index 0000000000..ff93690555
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
+ * Module.
+ */
+class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Edit';
+
+    public function setup($config) {
+        $contents = 'Chameleon: #PCDATA | Inline ! #PCDATA | Flow';
+        $attr = array(
+            'cite' => 'URI',
+            // 'datetime' => 'Datetime', // not implemented
+        );
+        $this->addElement('del', 'Inline', $contents, 'Common', $attr);
+        $this->addElement('ins', 'Inline', $contents, 'Common', $attr);
+    }
+
+    // HTML 4.01 specifies that ins/del must not contain block
+    // elements when used in an inline context, chameleon is
+    // a complicated workaround to acheive this effect
+
+    // Inline context ! Block context (exclamation mark is
+    // separator, see getChildDef for parsing)
+
+    public $defines_child_def = true;
+    public function getChildDef($def) {
+        if ($def->content_model_type != 'chameleon') return false;
+        $value = explode('!', $def->content_model);
+        return new HTMLPurifier_ChildDef_Chameleon($value[0], $value[1]);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
new file mode 100755
index 0000000000..44c22f6f8b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * XHTML 1.1 Forms module, defines all form-related elements found in HTML 4.
+ */
+class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
+{
+    public $name = 'Forms';
+    public $safe = false;
+
+    public $content_sets = array(
+        'Block' => 'Form',
+        'Inline' => 'Formctrl',
+    );
+
+    public function setup($config) {
+        $form = $this->addElement('form', 'Form',
+          'Required: Heading | List | Block | fieldset', 'Common', array(
+            'accept' => 'ContentTypes',
+            'accept-charset' => 'Charsets',
+            'action*' => 'URI',
+            'method' => 'Enum#get,post',
+            // really ContentType, but these two are the only ones used today
+            'enctype' => 'Enum#application/x-www-form-urlencoded,multipart/form-data',
+        ));
+        $form->excludes = array('form' => true);
+
+        $input = $this->addElement('input', 'Formctrl', 'Empty', 'Common', array(
+            'accept' => 'ContentTypes',
+            'accesskey' => 'Character',
+            'alt' => 'Text',
+            'checked' => 'Bool#checked',
+            'disabled' => 'Bool#disabled',
+            'maxlength' => 'Number',
+            'name' => 'CDATA',
+            'readonly' => 'Bool#readonly',
+            'size' => 'Number',
+            'src' => 'URI#embeds',
+            'tabindex' => 'Number',
+            'type' => 'Enum#text,password,checkbox,button,radio,submit,reset,file,hidden,image',
+            'value' => 'CDATA',
+        ));
+        $input->attr_transform_post[] = new HTMLPurifier_AttrTransform_Input();
+
+        $this->addElement('select', 'Formctrl', 'Required: optgroup | option', 'Common', array(
+            'disabled' => 'Bool#disabled',
+            'multiple' => 'Bool#multiple',
+            'name' => 'CDATA',
+            'size' => 'Number',
+            'tabindex' => 'Number',
+        ));
+
+        $this->addElement('option', false, 'Optional: #PCDATA', 'Common', array(
+            'disabled' => 'Bool#disabled',
+            'label' => 'Text',
+            'selected' => 'Bool#selected',
+            'value' => 'CDATA',
+        ));
+        // It's illegal for there to be more than one selected, but not
+        // be multiple. Also, no selected means undefined behavior. This might
+        // be difficult to implement; perhaps an injector, or a context variable.
+
+        $textarea = $this->addElement('textarea', 'Formctrl', 'Optional: #PCDATA', 'Common', array(
+            'accesskey' => 'Character',
+            'cols*' => 'Number',
+            'disabled' => 'Bool#disabled',
+            'name' => 'CDATA',
+            'readonly' => 'Bool#readonly',
+            'rows*' => 'Number',
+            'tabindex' => 'Number',
+        ));
+        $textarea->attr_transform_pre[] = new HTMLPurifier_AttrTransform_Textarea();
+
+        $button = $this->addElement('button', 'Formctrl', 'Optional: #PCDATA | Heading | List | Block | Inline', 'Common', array(
+            'accesskey' => 'Character',
+            'disabled' => 'Bool#disabled',
+            'name' => 'CDATA',
+            'tabindex' => 'Number',
+            'type' => 'Enum#button,submit,reset',
+            'value' => 'CDATA',
+        ));
+
+        // For exclusions, ideally we'd specify content sets, not literal elements
+        $button->excludes = $this->makeLookup(
+            'form', 'fieldset', // Form
+            'input', 'select', 'textarea', 'label', 'button', // Formctrl
+            'a' // as per HTML 4.01 spec, this is omitted by modularization
+        );
+
+        // Extra exclusion: img usemap="" is not permitted within this element.
+        // We'll omit this for now, since we don't have any good way of
+        // indicating it yet.
+
+        // This is HIGHLY user-unfriendly; we need a custom child-def for this
+        $this->addElement('fieldset', 'Form', 'Custom: (#WS?,legend,(Flow|#PCDATA)*)', 'Common');
+
+        $label = $this->addElement('label', 'Formctrl', 'Optional: #PCDATA | Inline', 'Common', array(
+            'accesskey' => 'Character',
+            // 'for' => 'IDREF', // IDREF not implemented, cannot allow
+        ));
+        $label->excludes = array('label' => true);
+
+        $this->addElement('legend', false, 'Optional: #PCDATA | Inline', 'Common', array(
+            'accesskey' => 'Character',
+        ));
+
+        $this->addElement('optgroup', false, 'Required: option', 'Common', array(
+            'disabled' => 'Bool#disabled',
+            'label*' => 'Text',
+        ));
+
+        // Don't forget an injector for <isindex>. This one's a little complex
+        // because it maps to multiple elements.
+
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
new file mode 100755
index 0000000000..d7e9bdd27e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * XHTML 1.1 Hypertext Module, defines hypertext links. Core Module.
+ */
+class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Hypertext';
+
+    public function setup($config) {
+        $a = $this->addElement(
+            'a', 'Inline', 'Inline', 'Common',
+            array(
+                // 'accesskey' => 'Character',
+                // 'charset' => 'Charset',
+                'href' => 'URI',
+                // 'hreflang' => 'LanguageCode',
+                'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
+                'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
+                // 'tabindex' => 'Number',
+                // 'type' => 'ContentType',
+            )
+        );
+        $a->formatting = true;
+        $a->excludes = array('a' => true);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
new file mode 100755
index 0000000000..e6ed53aea2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * XHTML 1.1 Image Module provides basic image embedding.
+ * @note There is specialized code for removing empty images in
+ *       HTMLPurifier_Strategy_RemoveForeignElements
+ */
+class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Image';
+
+    public function setup($config) {
+        $max = $config->get('HTML', 'MaxImgLength');
+        $img = $this->addElement(
+            'img', 'Inline', 'Empty', 'Common',
+            array(
+                'alt*' => 'Text',
+                // According to the spec, it's Length, but percents can
+                // be abused, so we allow only Pixels.
+                'height' => 'Pixels#' . $max,
+                'width'  => 'Pixels#' . $max,
+                'longdesc' => 'URI',
+                'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
+            )
+        );
+        if ($max === null || $config->get('HTML', 'Trusted')) {
+            $img->attr['height'] =
+            $img->attr['width'] = 'Length';
+        }
+
+        // kind of strange, but splitting things up would be inefficient
+        $img->attr_transform_pre[] =
+        $img->attr_transform_post[] =
+            new HTMLPurifier_AttrTransform_ImgRequired();
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
new file mode 100755
index 0000000000..df33927ba6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * XHTML 1.1 Legacy module defines elements that were previously
+ * deprecated.
+ *
+ * @note Not all legacy elements have been implemented yet, which
+ *       is a bit of a reverse problem as compared to browsers! In
+ *       addition, this legacy module may implement a bit more than
+ *       mandated by XHTML 1.1.
+ *
+ * This module can be used in combination with TransformToStrict in order
+ * to transform as many deprecated elements as possible, but retain
+ * questionably deprecated elements that do not have good alternatives
+ * as well as transform elements that don't have an implementation.
+ * See docs/ref-strictness.txt for more details.
+ */
+
+class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Legacy';
+
+    public function setup($config) {
+
+        $this->addElement('basefont', 'Inline', 'Empty', false, array(
+            'color' => 'Color',
+            'face' => 'Text', // extremely broad, we should
+            'size' => 'Text', // tighten it
+            'id' => 'ID'
+        ));
+        $this->addElement('center', 'Block', 'Flow', 'Common');
+        $this->addElement('dir', 'Block', 'Required: li', 'Common', array(
+            'compact' => 'Bool#compact'
+        ));
+        $this->addElement('font', 'Inline', 'Inline', array('Core', 'I18N'), array(
+            'color' => 'Color',
+            'face' => 'Text', // extremely broad, we should
+            'size' => 'Text', // tighten it
+        ));
+        $this->addElement('menu', 'Block', 'Required: li', 'Common', array(
+            'compact' => 'Bool#compact'
+        ));
+
+        $s = $this->addElement('s', 'Inline', 'Inline', 'Common');
+        $s->formatting = true;
+
+        $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
+        $strike->formatting = true;
+
+        $u = $this->addElement('u', 'Inline', 'Inline', 'Common');
+        $u->formatting = true;
+
+        // setup modifications to old elements
+
+        $align = 'Enum#left,right,center,justify';
+
+        $address = $this->addBlankElement('address');
+        $address->content_model = 'Inline | #PCDATA | p';
+        $address->content_model_type = 'optional';
+        $address->child = false;
+
+        $blockquote = $this->addBlankElement('blockquote');
+        $blockquote->content_model = 'Flow | #PCDATA';
+        $blockquote->content_model_type = 'optional';
+        $blockquote->child = false;
+
+        $br = $this->addBlankElement('br');
+        $br->attr['clear'] = 'Enum#left,all,right,none';
+
+        $caption = $this->addBlankElement('caption');
+        $caption->attr['align'] = 'Enum#top,bottom,left,right';
+
+        $div = $this->addBlankElement('div');
+        $div->attr['align'] = $align;
+
+        $dl = $this->addBlankElement('dl');
+        $dl->attr['compact'] = 'Bool#compact';
+
+        for ($i = 1; $i <= 6; $i++) {
+            $h = $this->addBlankElement("h$i");
+            $h->attr['align'] = $align;
+        }
+
+        $hr = $this->addBlankElement('hr');
+        $hr->attr['align'] = $align;
+        $hr->attr['noshade'] = 'Bool#noshade';
+        $hr->attr['size'] = 'Pixels';
+        $hr->attr['width'] = 'Length';
+
+        $img = $this->addBlankElement('img');
+        $img->attr['align'] = 'Enum#top,middle,bottom,left,right';
+        $img->attr['border'] = 'Pixels';
+        $img->attr['hspace'] = 'Pixels';
+        $img->attr['vspace'] = 'Pixels';
+
+        // figure out this integer business
+
+        $li = $this->addBlankElement('li');
+        $li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
+        $li->attr['type']  = 'Enum#s:1,i,I,a,A,disc,square,circle';
+
+        $ol = $this->addBlankElement('ol');
+        $ol->attr['compact'] = 'Bool#compact';
+        $ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
+        $ol->attr['type'] = 'Enum#s:1,i,I,a,A';
+
+        $p = $this->addBlankElement('p');
+        $p->attr['align'] = $align;
+
+        $pre = $this->addBlankElement('pre');
+        $pre->attr['width'] = 'Number';
+
+        // script omitted
+
+        $table = $this->addBlankElement('table');
+        $table->attr['align'] = 'Enum#left,center,right';
+        $table->attr['bgcolor'] = 'Color';
+
+        $tr = $this->addBlankElement('tr');
+        $tr->attr['bgcolor'] = 'Color';
+
+        $th = $this->addBlankElement('th');
+        $th->attr['bgcolor'] = 'Color';
+        $th->attr['height'] = 'Length';
+        $th->attr['nowrap'] = 'Bool#nowrap';
+        $th->attr['width'] = 'Length';
+
+        $td = $this->addBlankElement('td');
+        $td->attr['bgcolor'] = 'Color';
+        $td->attr['height'] = 'Length';
+        $td->attr['nowrap'] = 'Bool#nowrap';
+        $td->attr['width'] = 'Length';
+
+        $ul = $this->addBlankElement('ul');
+        $ul->attr['compact'] = 'Bool#compact';
+        $ul->attr['type'] = 'Enum#square,disc,circle';
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
new file mode 100755
index 0000000000..1d15f27293
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * XHTML 1.1 List Module, defines list-oriented elements. Core Module.
+ */
+class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'List';
+
+    // According to the abstract schema, the List content set is a fully formed
+    // one or more expr, but it invariably occurs in an optional declaration
+    // so we're not going to do that subtlety. It might cause trouble
+    // if a user defines "List" and expects that multiple lists are
+    // allowed to be specified, but then again, that's not very intuitive.
+    // Furthermore, the actual XML Schema may disagree. Regardless,
+    // we don't have support for such nested expressions without using
+    // the incredibly inefficient and draconic Custom ChildDef.
+
+    public $content_sets = array('Flow' => 'List');
+
+    public function setup($config) {
+        $this->addElement('ol', 'List', 'Required: li', 'Common');
+        $this->addElement('ul', 'List', 'Required: li', 'Common');
+        $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
+
+        $this->addElement('li', false, 'Flow', 'Common');
+
+        $this->addElement('dd', false, 'Flow', 'Common');
+        $this->addElement('dt', false, 'Inline', 'Common');
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
new file mode 100755
index 0000000000..d908a0ada6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
@@ -0,0 +1,18 @@
+<?php
+
+class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Name';
+
+    public function setup($config) {
+        $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
+        foreach ($elements as $name) {
+            $element = $this->addBlankElement($name);
+            $element->attr['name'] = 'ID';
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
new file mode 100755
index 0000000000..5f1b14abb8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
@@ -0,0 +1,14 @@
+<?php
+
+class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule
+{
+    public $name = 'NonXMLCommonAttributes';
+
+    public $attr_collections = array(
+        'Lang' => array(
+            'lang' => 'LanguageCode',
+        )
+    );
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
new file mode 100755
index 0000000000..193c1011f8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * XHTML 1.1 Object Module, defines elements for generic object inclusion
+ * @warning Users will commonly use <embed> to cater to legacy browsers: this
+ *      module does not allow this sort of behavior
+ */
+class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Object';
+    public $safe = false;
+
+    public function setup($config) {
+
+        $this->addElement('object', 'Inline', 'Optional: #PCDATA | Flow | param', 'Common',
+            array(
+                'archive' => 'URI',
+                'classid' => 'URI',
+                'codebase' => 'URI',
+                'codetype' => 'Text',
+                'data' => 'URI',
+                'declare' => 'Bool#declare',
+                'height' => 'Length',
+                'name' => 'CDATA',
+                'standby' => 'Text',
+                'tabindex' => 'Number',
+                'type' => 'ContentType',
+                'width' => 'Length'
+            )
+        );
+
+        $this->addElement('param', false, 'Empty', false,
+            array(
+                'id' => 'ID',
+                'name*' => 'Text',
+                'type' => 'Text',
+                'value' => 'Text',
+                'valuetype' => 'Enum#data,ref,object'
+           )
+        );
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
new file mode 100755
index 0000000000..8ff0b5ed78
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * XHTML 1.1 Presentation Module, defines simple presentation-related
+ * markup. Text Extension Module.
+ * @note The official XML Schema and DTD specs further divide this into
+ *       two modules:
+ *          - Block Presentation (hr)
+ *          - Inline Presentation (b, big, i, small, sub, sup, tt)
+ *       We have chosen not to heed this distinction, as content_sets
+ *       provides satisfactory disambiguation.
+ */
+class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Presentation';
+
+    public function setup($config) {
+        $this->addElement('hr',     'Block',  'Empty',  'Common');
+        $this->addElement('sub',    'Inline', 'Inline', 'Common');
+        $this->addElement('sup',    'Inline', 'Inline', 'Common');
+        $b = $this->addElement('b',      'Inline', 'Inline', 'Common');
+        $b->formatting = true;
+        $big = $this->addElement('big',    'Inline', 'Inline', 'Common');
+        $big->formatting = true;
+        $i = $this->addElement('i',      'Inline', 'Inline', 'Common');
+        $i->formatting = true;
+        $small = $this->addElement('small',  'Inline', 'Inline', 'Common');
+        $small->formatting = true;
+        $tt = $this->addElement('tt',     'Inline', 'Inline', 'Common');
+        $tt->formatting = true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
new file mode 100755
index 0000000000..dd36a3de0e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Module defines proprietary tags and attributes in HTML.
+ * @warning If this module is enabled, standards-compliance is off!
+ */
+class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Proprietary';
+
+    public function setup($config) {
+
+        $this->addElement('marquee', 'Inline', 'Flow', 'Common',
+            array(
+                'direction' => 'Enum#left,right,up,down',
+                'behavior' => 'Enum#alternate',
+                'width' => 'Length',
+                'height' => 'Length',
+                'scrolldelay' => 'Number',
+                'scrollamount' => 'Number',
+                'loop' => 'Number',
+                'bgcolor' => 'Color',
+                'hspace' => 'Pixels',
+                'vspace' => 'Pixels',
+            )
+        );
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
new file mode 100755
index 0000000000..b26a0a30a0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * XHTML 1.1 Ruby Annotation Module, defines elements that indicate
+ * short runs of text alongside base text for annotation or pronounciation.
+ */
+class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Ruby';
+
+    public function setup($config) {
+        $this->addElement('ruby', 'Inline',
+            'Custom: ((rb, (rt | (rp, rt, rp))) | (rbc, rtc, rtc?))',
+            'Common');
+        $this->addElement('rbc', false, 'Required: rb', 'Common');
+        $this->addElement('rtc', false, 'Required: rt', 'Common');
+        $rb = $this->addElement('rb', false, 'Inline', 'Common');
+        $rb->excludes = array('ruby' => true);
+        $rt = $this->addElement('rt', false, 'Inline', 'Common', array('rbspan' => 'Number'));
+        $rt->excludes = array('ruby' => true);
+        $this->addElement('rp', false, 'Optional: #PCDATA', 'Common');
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
new file mode 100755
index 0000000000..635e8f2d2b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * A "safe" embed module. See SafeObject. This is a proprietary element.
+ */
+class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'SafeEmbed';
+
+    public function setup($config) {
+
+        $max = $config->get('HTML', 'MaxImgLength');
+        $embed = $this->addElement(
+            'embed', 'Inline', 'Empty', 'Common',
+            array(
+                'src*' => 'URI#embedded',
+                'type' => 'Enum#application/x-shockwave-flash',
+                'width' => 'Pixels#' . $max,
+                'height' => 'Pixels#' . $max,
+                'allowscriptaccess' => 'Enum#never',
+                'allownetworking' => 'Enum#internal',
+                'wmode' => 'Enum#window',
+                'name' => 'ID',
+            )
+        );
+        $embed->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeEmbed();
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
new file mode 100755
index 0000000000..bbda7a2147
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * A "safe" object module. In theory, objects permitted by this module will
+ * be safe, and untrusted users can be allowed to embed arbitrary flash objects
+ * (maybe other types too, but only Flash is supported as of right now).
+ * Highly experimental.
+ */
+class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'SafeObject';
+
+    public function setup($config) {
+
+        // These definitions are not intrinsically safe: the attribute transforms
+        // are a vital part of ensuring safety.
+
+        $max = $config->get('HTML', 'MaxImgLength');
+        $object = $this->addElement(
+            'object',
+            'Inline',
+            'Optional: param | Flow | #PCDATA',
+            'Common',
+            array(
+                // While technically not required by the spec, we're forcing
+                // it to this value.
+                'type'   => 'Enum#application/x-shockwave-flash',
+                'width'  => 'Pixels#' . $max,
+                'height' => 'Pixels#' . $max,
+                'data'   => 'URI#embedded'
+            )
+        );
+        $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
+
+        $param = $this->addElement('param', false, 'Empty', false,
+            array(
+                'id' => 'ID',
+                'name*' => 'Text',
+                'value' => 'Text'
+            )
+        );
+        $param->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeParam();
+        $this->info_injector[] = 'SafeObject';
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
new file mode 100755
index 0000000000..cecdea6c30
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+
+WARNING: THIS MODULE IS EXTREMELY DANGEROUS AS IT ENABLES INLINE SCRIPTING
+INSIDE HTML PURIFIER DOCUMENTS. USE ONLY WITH TRUSTED USER INPUT!!!
+
+*/
+
+/**
+ * XHTML 1.1 Scripting module, defines elements that are used to contain
+ * information pertaining to executable scripts or the lack of support
+ * for executable scripts.
+ * @note This module does not contain inline scripting elements
+ */
+class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
+{
+    public $name = 'Scripting';
+    public $elements = array('script', 'noscript');
+    public $content_sets = array('Block' => 'script | noscript', 'Inline' => 'script | noscript');
+    public $safe = false;
+
+    public function setup($config) {
+        // TODO: create custom child-definition for noscript that
+        // auto-wraps stray #PCDATA in a similar manner to
+        // blockquote's custom definition (we would use it but
+        // blockquote's contents are optional while noscript's contents
+        // are required)
+
+        // TODO: convert this to new syntax, main problem is getting
+        // both content sets working
+
+        // In theory, this could be safe, but I don't see any reason to
+        // allow it.
+        $this->info['noscript'] = new HTMLPurifier_ElementDef();
+        $this->info['noscript']->attr = array( 0 => array('Common') );
+        $this->info['noscript']->content_model = 'Heading | List | Block';
+        $this->info['noscript']->content_model_type = 'required';
+
+        $this->info['script'] = new HTMLPurifier_ElementDef();
+        $this->info['script']->attr = array(
+            'defer' => new HTMLPurifier_AttrDef_Enum(array('defer')),
+            'src'   => new HTMLPurifier_AttrDef_URI(true),
+            'type'  => new HTMLPurifier_AttrDef_Enum(array('text/javascript'))
+        );
+        $this->info['script']->content_model = '#PCDATA';
+        $this->info['script']->content_model_type = 'optional';
+        $this->info['script']->attr_transform_pre['type'] =
+        $this->info['script']->attr_transform_post['type'] =
+            new HTMLPurifier_AttrTransform_ScriptRequired();
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
new file mode 100755
index 0000000000..eb78464cc0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
+ * Module.
+ */
+class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'StyleAttribute';
+    public $attr_collections = array(
+        // The inclusion routine differs from the Abstract Modules but
+        // is in line with the DTD and XML Schemas.
+        'Style' => array('style' => false), // see constructor
+        'Core' => array(0 => array('Style'))
+    );
+
+    public function setup($config) {
+        $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
new file mode 100755
index 0000000000..f314ced3f8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * XHTML 1.1 Tables Module, fully defines accessible table elements.
+ */
+class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Tables';
+
+    public function setup($config) {
+
+        $this->addElement('caption', false, 'Inline', 'Common');
+
+        $this->addElement('table', 'Block',
+            new HTMLPurifier_ChildDef_Table(),  'Common',
+            array(
+                'border' => 'Pixels',
+                'cellpadding' => 'Length',
+                'cellspacing' => 'Length',
+                'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
+                'rules' => 'Enum#none,groups,rows,cols,all',
+                'summary' => 'Text',
+                'width' => 'Length'
+            )
+        );
+
+        // common attributes
+        $cell_align = array(
+            'align' => 'Enum#left,center,right,justify,char',
+            'charoff' => 'Length',
+            'valign' => 'Enum#top,middle,bottom,baseline',
+        );
+
+        $cell_t = array_merge(
+            array(
+                'abbr'    => 'Text',
+                'colspan' => 'Number',
+                'rowspan' => 'Number',
+            ),
+            $cell_align
+        );
+        $this->addElement('td', false, 'Flow', 'Common', $cell_t);
+        $this->addElement('th', false, 'Flow', 'Common', $cell_t);
+
+        $this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
+
+        $cell_col = array_merge(
+            array(
+                'span'  => 'Number',
+                'width' => 'MultiLength',
+            ),
+            $cell_align
+        );
+        $this->addElement('col',      false, 'Empty',         'Common', $cell_col);
+        $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
+
+        $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
+        $this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
+        $this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
new file mode 100755
index 0000000000..2b844ecc45
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * XHTML 1.1 Target Module, defines target attribute in link elements.
+ */
+class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Target';
+
+    public function setup($config) {
+        $elements = array('a');
+        foreach ($elements as $name) {
+            $e = $this->addBlankElement($name);
+            $e->attr = array(
+                'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
+            );
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
new file mode 100755
index 0000000000..ae77c71886
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * XHTML 1.1 Text Module, defines basic text containers. Core Module.
+ * @note In the normative XML Schema specification, this module
+ *       is further abstracted into the following modules:
+ *          - Block Phrasal (address, blockquote, pre, h1, h2, h3, h4, h5, h6)
+ *          - Block Structural (div, p)
+ *          - Inline Phrasal (abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var)
+ *          - Inline Structural (br, span)
+ *       This module, functionally, does not distinguish between these
+ *       sub-modules, but the code is internally structured to reflect
+ *       these distinctions.
+ */
+class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Text';
+    public $content_sets = array(
+        'Flow' => 'Heading | Block | Inline'
+    );
+
+    public function setup($config) {
+
+        // Inline Phrasal -------------------------------------------------
+        $this->addElement('abbr',    'Inline', 'Inline', 'Common');
+        $this->addElement('acronym', 'Inline', 'Inline', 'Common');
+        $this->addElement('cite',    'Inline', 'Inline', 'Common');
+        $this->addElement('dfn',     'Inline', 'Inline', 'Common');
+        $this->addElement('kbd',     'Inline', 'Inline', 'Common');
+        $this->addElement('q',       'Inline', 'Inline', 'Common', array('cite' => 'URI'));
+        $this->addElement('samp',    'Inline', 'Inline', 'Common');
+        $this->addElement('var',     'Inline', 'Inline', 'Common');
+
+        $em = $this->addElement('em',      'Inline', 'Inline', 'Common');
+        $em->formatting = true;
+
+        $strong = $this->addElement('strong',  'Inline', 'Inline', 'Common');
+        $strong->formatting = true;
+
+        $code = $this->addElement('code',    'Inline', 'Inline', 'Common');
+        $code->formatting = true;
+
+        // Inline Structural ----------------------------------------------
+        $this->addElement('span', 'Inline', 'Inline', 'Common');
+        $this->addElement('br',   'Inline', 'Empty',  'Core');
+
+        // Block Phrasal --------------------------------------------------
+        $this->addElement('address',     'Block', 'Inline', 'Common');
+        $this->addElement('blockquote',  'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI') );
+        $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
+        $pre->excludes = $this->makeLookup(
+            'img', 'big', 'small', 'object', 'applet', 'font', 'basefont' );
+        $this->addElement('h1', 'Heading', 'Inline', 'Common');
+        $this->addElement('h2', 'Heading', 'Inline', 'Common');
+        $this->addElement('h3', 'Heading', 'Inline', 'Common');
+        $this->addElement('h4', 'Heading', 'Inline', 'Common');
+        $this->addElement('h5', 'Heading', 'Inline', 'Common');
+        $this->addElement('h6', 'Heading', 'Inline', 'Common');
+
+        // Block Structural -----------------------------------------------
+        $p = $this->addElement('p', 'Block', 'Inline', 'Common');
+        $p->autoclose = array_flip(array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul"));
+
+        $this->addElement('div', 'Block', 'Flow', 'Common');
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
new file mode 100755
index 0000000000..c9d4706485
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
@@ -0,0 +1,207 @@
+<?php
+
+/**
+ * Abstract class for a set of proprietary modules that clean up (tidy)
+ * poorly written HTML.
+ * @todo Figure out how to protect some of these methods/properties
+ */
+class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
+{
+
+    /**
+     * List of supported levels. Index zero is a special case "no fixes"
+     * level.
+     */
+    public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
+
+    /**
+     * Default level to place all fixes in. Disabled by default
+     */
+    public $defaultLevel = null;
+
+    /**
+     * Lists of fixes used by getFixesForLevel(). Format is:
+     *      HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
+     */
+    public $fixesForLevel = array(
+        'light'  => array(),
+        'medium' => array(),
+        'heavy'  => array()
+    );
+
+    /**
+     * Lazy load constructs the module by determining the necessary
+     * fixes to create and then delegating to the populate() function.
+     * @todo Wildcard matching and error reporting when an added or
+     *       subtracted fix has no effect.
+     */
+    public function setup($config) {
+
+        // create fixes, initialize fixesForLevel
+        $fixes = $this->makeFixes();
+        $this->makeFixesForLevel($fixes);
+
+        // figure out which fixes to use
+        $level = $config->get('HTML', 'TidyLevel');
+        $fixes_lookup = $this->getFixesForLevel($level);
+
+        // get custom fix declarations: these need namespace processing
+        $add_fixes    = $config->get('HTML', 'TidyAdd');
+        $remove_fixes = $config->get('HTML', 'TidyRemove');
+
+        foreach ($fixes as $name => $fix) {
+            // needs to be refactored a little to implement globbing
+            if (
+                isset($remove_fixes[$name]) ||
+                (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))
+            ) {
+                unset($fixes[$name]);
+            }
+        }
+
+        // populate this module with necessary fixes
+        $this->populate($fixes);
+
+    }
+
+    /**
+     * Retrieves all fixes per a level, returning fixes for that specific
+     * level as well as all levels below it.
+     * @param $level String level identifier, see $levels for valid values
+     * @return Lookup up table of fixes
+     */
+    public function getFixesForLevel($level) {
+        if ($level == $this->levels[0]) {
+            return array();
+        }
+        $activated_levels = array();
+        for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
+            $activated_levels[] = $this->levels[$i];
+            if ($this->levels[$i] == $level) break;
+        }
+        if ($i == $c) {
+            trigger_error(
+                'Tidy level ' . htmlspecialchars($level) . ' not recognized',
+                E_USER_WARNING
+            );
+            return array();
+        }
+        $ret = array();
+        foreach ($activated_levels as $level) {
+            foreach ($this->fixesForLevel[$level] as $fix) {
+                $ret[$fix] = true;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Dynamically populates the $fixesForLevel member variable using
+     * the fixes array. It may be custom overloaded, used in conjunction
+     * with $defaultLevel, or not used at all.
+     */
+    public function makeFixesForLevel($fixes) {
+        if (!isset($this->defaultLevel)) return;
+        if (!isset($this->fixesForLevel[$this->defaultLevel])) {
+            trigger_error(
+                'Default level ' . $this->defaultLevel . ' does not exist',
+                E_USER_ERROR
+            );
+            return;
+        }
+        $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
+    }
+
+    /**
+     * Populates the module with transforms and other special-case code
+     * based on a list of fixes passed to it
+     * @param $lookup Lookup table of fixes to activate
+     */
+    public function populate($fixes) {
+        foreach ($fixes as $name => $fix) {
+            // determine what the fix is for
+            list($type, $params) = $this->getFixType($name);
+            switch ($type) {
+                case 'attr_transform_pre':
+                case 'attr_transform_post':
+                    $attr = $params['attr'];
+                    if (isset($params['element'])) {
+                        $element = $params['element'];
+                        if (empty($this->info[$element])) {
+                            $e = $this->addBlankElement($element);
+                        } else {
+                            $e = $this->info[$element];
+                        }
+                    } else {
+                        $type = "info_$type";
+                        $e = $this;
+                    }
+                    // PHP does some weird parsing when I do
+                    // $e->$type[$attr], so I have to assign a ref.
+                    $f =& $e->$type;
+                    $f[$attr] = $fix;
+                    break;
+                case 'tag_transform':
+                    $this->info_tag_transform[$params['element']] = $fix;
+                    break;
+                case 'child':
+                case 'content_model_type':
+                    $element = $params['element'];
+                    if (empty($this->info[$element])) {
+                        $e = $this->addBlankElement($element);
+                    } else {
+                        $e = $this->info[$element];
+                    }
+                    $e->$type = $fix;
+                    break;
+                default:
+                    trigger_error("Fix type $type not supported", E_USER_ERROR);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Parses a fix name and determines what kind of fix it is, as well
+     * as other information defined by the fix
+     * @param $name String name of fix
+     * @return array(string $fix_type, array $fix_parameters)
+     * @note $fix_parameters is type dependant, see populate() for usage
+     *       of these parameters
+     */
+    public function getFixType($name) {
+        // parse it
+        $property = $attr = null;
+        if (strpos($name, '#') !== false) list($name, $property) = explode('#', $name);
+        if (strpos($name, '@') !== false) list($name, $attr)     = explode('@', $name);
+
+        // figure out the parameters
+        $params = array();
+        if ($name !== '')    $params['element'] = $name;
+        if (!is_null($attr)) $params['attr'] = $attr;
+
+        // special case: attribute transform
+        if (!is_null($attr)) {
+            if (is_null($property)) $property = 'pre';
+            $type = 'attr_transform_' . $property;
+            return array($type, $params);
+        }
+
+        // special case: tag transform
+        if (is_null($property)) {
+            return array('tag_transform', $params);
+        }
+
+        return array($property, $params);
+
+    }
+
+    /**
+     * Defines all fixes the module will perform in a compact
+     * associative array of fix name to fix implementation.
+     */
+    public function makeFixes() {}
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
new file mode 100755
index 0000000000..61ff85ce2f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Name is deprecated, but allowed in strict doctypes, so onl
+ */
+class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
+{
+    public $name = 'Tidy_Name';
+    public $defaultLevel = 'heavy';
+    public function makeFixes() {
+
+        $r = array();
+
+        // @name for img, a -----------------------------------------------
+        // Technically, it's allowed even on strict, so we allow authors to use
+        // it. However, it's deprecated in future versions of XHTML.
+        $r['img@name'] =
+        $r['a@name'] = new HTMLPurifier_AttrTransform_Name();
+
+        return $r;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
new file mode 100755
index 0000000000..85fa90a942
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
@@ -0,0 +1,23 @@
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
+{
+
+    public $name = 'Tidy_Proprietary';
+    public $defaultLevel = 'light';
+
+    public function makeFixes() {
+        $r = array();
+        $r['table@background'] = new HTMLPurifier_AttrTransform_Background();
+        $r['td@background']    = new HTMLPurifier_AttrTransform_Background();
+        $r['th@background']    = new HTMLPurifier_AttrTransform_Background();
+        $r['tr@background']    = new HTMLPurifier_AttrTransform_Background();
+        $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
+        $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
+        $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
+        return $r;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
new file mode 100755
index 0000000000..c73dc3c4d1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
@@ -0,0 +1,21 @@
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
+{
+    public $name = 'Tidy_Strict';
+    public $defaultLevel = 'light';
+
+    public function makeFixes() {
+        $r = parent::makeFixes();
+        $r['blockquote#content_model_type'] = 'strictblockquote';
+        return $r;
+    }
+
+    public $defines_child_def = true;
+    public function getChildDef($def) {
+        if ($def->content_model_type != 'strictblockquote') return parent::getChildDef($def);
+        return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
new file mode 100755
index 0000000000..9960b1dd10
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
@@ -0,0 +1,9 @@
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
+{
+    public $name = 'Tidy_Transitional';
+    public $defaultLevel = 'heavy';
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
new file mode 100755
index 0000000000..db5a378e53
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
@@ -0,0 +1,17 @@
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
+{
+
+    public $name = 'Tidy_XHTML';
+    public $defaultLevel = 'medium';
+
+    public function makeFixes() {
+        $r = array();
+        $r['@lang'] = new HTMLPurifier_AttrTransform_Lang();
+        return $r;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
new file mode 100755
index 0000000000..02e9438139
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
@@ -0,0 +1,161 @@
+<?php
+
+class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
+{
+
+    public function makeFixes() {
+
+        $r = array();
+
+        // == deprecated tag transforms ===================================
+
+        $r['font']   = new HTMLPurifier_TagTransform_Font();
+        $r['menu']   = new HTMLPurifier_TagTransform_Simple('ul');
+        $r['dir']    = new HTMLPurifier_TagTransform_Simple('ul');
+        $r['center'] = new HTMLPurifier_TagTransform_Simple('div',  'text-align:center;');
+        $r['u']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
+        $r['s']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
+        $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
+
+        // == deprecated attribute transforms =============================
+
+        $r['caption@align'] =
+            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+                // we're following IE's behavior, not Firefox's, due
+                // to the fact that no one supports caption-side:right,
+                // W3C included (with CSS 2.1). This is a slightly
+                // unreasonable attribute!
+                'left'   => 'text-align:left;',
+                'right'  => 'text-align:right;',
+                'top'    => 'caption-side:top;',
+                'bottom' => 'caption-side:bottom;' // not supported by IE
+            ));
+
+        // @align for img -------------------------------------------------
+        $r['img@align'] =
+            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+                'left'   => 'float:left;',
+                'right'  => 'float:right;',
+                'top'    => 'vertical-align:top;',
+                'middle' => 'vertical-align:middle;',
+                'bottom' => 'vertical-align:baseline;',
+            ));
+
+        // @align for table -----------------------------------------------
+        $r['table@align'] =
+            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+                'left'   => 'float:left;',
+                'center' => 'margin-left:auto;margin-right:auto;',
+                'right'  => 'float:right;'
+            ));
+
+        // @align for hr -----------------------------------------------
+        $r['hr@align'] =
+            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+                // we use both text-align and margin because these work
+                // for different browsers (IE and Firefox, respectively)
+                // and the melange makes for a pretty cross-compatible
+                // solution
+                'left'   => 'margin-left:0;margin-right:auto;text-align:left;',
+                'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
+                'right'  => 'margin-left:auto;margin-right:0;text-align:right;'
+            ));
+
+        // @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
+        // {{{
+            $align_lookup = array();
+            $align_values = array('left', 'right', 'center', 'justify');
+            foreach ($align_values as $v) $align_lookup[$v] = "text-align:$v;";
+        // }}}
+        $r['h1@align'] =
+        $r['h2@align'] =
+        $r['h3@align'] =
+        $r['h4@align'] =
+        $r['h5@align'] =
+        $r['h6@align'] =
+        $r['p@align']  =
+        $r['div@align'] =
+            new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
+
+        // @bgcolor for table, tr, td, th ---------------------------------
+        $r['table@bgcolor'] =
+        $r['td@bgcolor'] =
+        $r['th@bgcolor'] =
+            new HTMLPurifier_AttrTransform_BgColor();
+
+        // @border for img ------------------------------------------------
+        $r['img@border'] = new HTMLPurifier_AttrTransform_Border();
+
+        // @clear for br --------------------------------------------------
+        $r['br@clear'] =
+            new HTMLPurifier_AttrTransform_EnumToCSS('clear', array(
+                'left'  => 'clear:left;',
+                'right' => 'clear:right;',
+                'all'   => 'clear:both;',
+                'none'  => 'clear:none;',
+            ));
+
+        // @height for td, th ---------------------------------------------
+        $r['td@height'] =
+        $r['th@height'] =
+            new HTMLPurifier_AttrTransform_Length('height');
+
+        // @hspace for img ------------------------------------------------
+        $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
+
+        // @noshade for hr ------------------------------------------------
+        // this transformation is not precise but often good enough.
+        // different browsers use different styles to designate noshade
+        $r['hr@noshade'] =
+            new HTMLPurifier_AttrTransform_BoolToCSS(
+                'noshade',
+                'color:#808080;background-color:#808080;border:0;'
+            );
+
+        // @nowrap for td, th ---------------------------------------------
+        $r['td@nowrap'] =
+        $r['th@nowrap'] =
+            new HTMLPurifier_AttrTransform_BoolToCSS(
+                'nowrap',
+                'white-space:nowrap;'
+            );
+
+        // @size for hr  --------------------------------------------------
+        $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
+
+        // @type for li, ol, ul -------------------------------------------
+        // {{{
+            $ul_types = array(
+                'disc'   => 'list-style-type:disc;',
+                'square' => 'list-style-type:square;',
+                'circle' => 'list-style-type:circle;'
+            );
+            $ol_types = array(
+                '1'   => 'list-style-type:decimal;',
+                'i'   => 'list-style-type:lower-roman;',
+                'I'   => 'list-style-type:upper-roman;',
+                'a'   => 'list-style-type:lower-alpha;',
+                'A'   => 'list-style-type:upper-alpha;'
+            );
+            $li_types = $ul_types + $ol_types;
+        // }}}
+
+        $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
+        $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
+        $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
+
+        // @vspace for img ------------------------------------------------
+        $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
+
+        // @width for hr, td, th ------------------------------------------
+        $r['td@width'] =
+        $r['th@width'] =
+        $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
+
+        return $r;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
new file mode 100755
index 0000000000..9c0e031984
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
@@ -0,0 +1,14 @@
+<?php
+
+class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
+{
+    public $name = 'XMLCommonAttributes';
+
+    public $attr_collections = array(
+        'Lang' => array(
+            'xml:lang' => 'LanguageCode',
+        )
+    );
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
new file mode 100755
index 0000000000..78f38781d8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
@@ -0,0 +1,403 @@
+<?php
+
+class HTMLPurifier_HTMLModuleManager
+{
+
+    /**
+     * Instance of HTMLPurifier_DoctypeRegistry
+     */
+    public $doctypes;
+
+    /**
+     * Instance of current doctype
+     */
+    public $doctype;
+
+    /**
+     * Instance of HTMLPurifier_AttrTypes
+     */
+    public $attrTypes;
+
+    /**
+     * Active instances of modules for the specified doctype are
+     * indexed, by name, in this array.
+     */
+    public $modules = array();
+
+    /**
+     * Array of recognized HTMLPurifier_Module instances, indexed by
+     * module's class name. This array is usually lazy loaded, but a
+     * user can overload a module by pre-emptively registering it.
+     */
+    public $registeredModules = array();
+
+    /**
+     * List of extra modules that were added by the user using addModule().
+     * These get unconditionally merged into the current doctype, whatever
+     * it may be.
+     */
+    public $userModules = array();
+
+    /**
+     * Associative array of element name to list of modules that have
+     * definitions for the element; this array is dynamically filled.
+     */
+    public $elementLookup = array();
+
+    /** List of prefixes we should use for registering small names */
+    public $prefixes = array('HTMLPurifier_HTMLModule_');
+
+    public $contentSets;     /**< Instance of HTMLPurifier_ContentSets */
+    public $attrCollections; /**< Instance of HTMLPurifier_AttrCollections */
+
+    /** If set to true, unsafe elements and attributes will be allowed */
+    public $trusted = false;
+
+    public function __construct() {
+
+        // editable internal objects
+        $this->attrTypes = new HTMLPurifier_AttrTypes();
+        $this->doctypes  = new HTMLPurifier_DoctypeRegistry();
+
+        // setup basic modules
+        $common = array(
+            'CommonAttributes', 'Text', 'Hypertext', 'List',
+            'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
+            'StyleAttribute',
+            // Unsafe:
+            'Scripting', 'Object',  'Forms',
+            // Sorta legacy, but present in strict:
+            'Name',
+        );
+        $transitional = array('Legacy', 'Target');
+        $xml = array('XMLCommonAttributes');
+        $non_xml = array('NonXMLCommonAttributes');
+
+        // setup basic doctypes
+        $this->doctypes->register(
+            'HTML 4.01 Transitional', false,
+            array_merge($common, $transitional, $non_xml),
+            array('Tidy_Transitional', 'Tidy_Proprietary'),
+            array(),
+            '-//W3C//DTD HTML 4.01 Transitional//EN',
+            'http://www.w3.org/TR/html4/loose.dtd'
+        );
+
+        $this->doctypes->register(
+            'HTML 4.01 Strict', false,
+            array_merge($common, $non_xml),
+            array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
+            array(),
+            '-//W3C//DTD HTML 4.01//EN',
+            'http://www.w3.org/TR/html4/strict.dtd'
+        );
+
+        $this->doctypes->register(
+            'XHTML 1.0 Transitional', true,
+            array_merge($common, $transitional, $xml, $non_xml),
+            array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
+            array(),
+            '-//W3C//DTD XHTML 1.0 Transitional//EN',
+            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
+        );
+
+        $this->doctypes->register(
+            'XHTML 1.0 Strict', true,
+            array_merge($common, $xml, $non_xml),
+            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
+            array(),
+            '-//W3C//DTD XHTML 1.0 Strict//EN',
+            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
+        );
+
+        $this->doctypes->register(
+            'XHTML 1.1', true,
+            array_merge($common, $xml, array('Ruby')),
+            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
+            array(),
+            '-//W3C//DTD XHTML 1.1//EN',
+            'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
+        );
+
+    }
+
+    /**
+     * Registers a module to the recognized module list, useful for
+     * overloading pre-existing modules.
+     * @param $module Mixed: string module name, with or without
+     *                HTMLPurifier_HTMLModule prefix, or instance of
+     *                subclass of HTMLPurifier_HTMLModule.
+     * @param $overload Boolean whether or not to overload previous modules.
+     *                  If this is not set, and you do overload a module,
+     *                  HTML Purifier will complain with a warning.
+     * @note This function will not call autoload, you must instantiate
+     *       (and thus invoke) autoload outside the method.
+     * @note If a string is passed as a module name, different variants
+     *       will be tested in this order:
+     *          - Check for HTMLPurifier_HTMLModule_$name
+     *          - Check all prefixes with $name in order they were added
+     *          - Check for literal object name
+     *          - Throw fatal error
+     *       If your object name collides with an internal class, specify
+     *       your module manually. All modules must have been included
+     *       externally: registerModule will not perform inclusions for you!
+     */
+    public function registerModule($module, $overload = false) {
+        if (is_string($module)) {
+            // attempt to load the module
+            $original_module = $module;
+            $ok = false;
+            foreach ($this->prefixes as $prefix) {
+                $module = $prefix . $original_module;
+                if (class_exists($module)) {
+                    $ok = true;
+                    break;
+                }
+            }
+            if (!$ok) {
+                $module = $original_module;
+                if (!class_exists($module)) {
+                    trigger_error($original_module . ' module does not exist',
+                        E_USER_ERROR);
+                    return;
+                }
+            }
+            $module = new $module();
+        }
+        if (empty($module->name)) {
+            trigger_error('Module instance of ' . get_class($module) . ' must have name');
+            return;
+        }
+        if (!$overload && isset($this->registeredModules[$module->name])) {
+            trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING);
+        }
+        $this->registeredModules[$module->name] = $module;
+    }
+
+    /**
+     * Adds a module to the current doctype by first registering it,
+     * and then tacking it on to the active doctype
+     */
+    public function addModule($module) {
+        $this->registerModule($module);
+        if (is_object($module)) $module = $module->name;
+        $this->userModules[] = $module;
+    }
+
+    /**
+     * Adds a class prefix that registerModule() will use to resolve a
+     * string name to a concrete class
+     */
+    public function addPrefix($prefix) {
+        $this->prefixes[] = $prefix;
+    }
+
+    /**
+     * Performs processing on modules, after being called you may
+     * use getElement() and getElements()
+     * @param $config Instance of HTMLPurifier_Config
+     */
+    public function setup($config) {
+
+        $this->trusted = $config->get('HTML', 'Trusted');
+
+        // generate
+        $this->doctype = $this->doctypes->make($config);
+        $modules = $this->doctype->modules;
+
+        // take out the default modules that aren't allowed
+        $lookup = $config->get('HTML', 'AllowedModules');
+        $special_cases = $config->get('HTML', 'CoreModules');
+
+        if (is_array($lookup)) {
+            foreach ($modules as $k => $m) {
+                if (isset($special_cases[$m])) continue;
+                if (!isset($lookup[$m])) unset($modules[$k]);
+            }
+        }
+
+        // add proprietary module (this gets special treatment because
+        // it is completely removed from doctypes, etc.)
+        if ($config->get('HTML', 'Proprietary')) {
+            $modules[] = 'Proprietary';
+        }
+
+        // add SafeObject/Safeembed modules
+        if ($config->get('HTML', 'SafeObject')) {
+            $modules[] = 'SafeObject';
+        }
+        if ($config->get('HTML', 'SafeEmbed')) {
+            $modules[] = 'SafeEmbed';
+        }
+
+        // merge in custom modules
+        $modules = array_merge($modules, $this->userModules);
+
+        foreach ($modules as $module) {
+            $this->processModule($module);
+            $this->modules[$module]->setup($config);
+        }
+
+        foreach ($this->doctype->tidyModules as $module) {
+            $this->processModule($module);
+            $this->modules[$module]->setup($config);
+        }
+
+        // prepare any injectors
+        foreach ($this->modules as $module) {
+            $n = array();
+            foreach ($module->info_injector as $i => $injector) {
+                if (!is_object($injector)) {
+                    $class = "HTMLPurifier_Injector_$injector";
+                    $injector = new $class;
+                }
+                $n[$injector->name] = $injector;
+            }
+            $module->info_injector = $n;
+        }
+
+        // setup lookup table based on all valid modules
+        foreach ($this->modules as $module) {
+            foreach ($module->info as $name => $def) {
+                if (!isset($this->elementLookup[$name])) {
+                    $this->elementLookup[$name] = array();
+                }
+                $this->elementLookup[$name][] = $module->name;
+            }
+        }
+
+        // note the different choice
+        $this->contentSets = new HTMLPurifier_ContentSets(
+            // content set assembly deals with all possible modules,
+            // not just ones deemed to be "safe"
+            $this->modules
+        );
+        $this->attrCollections = new HTMLPurifier_AttrCollections(
+            $this->attrTypes,
+            // there is no way to directly disable a global attribute,
+            // but using AllowedAttributes or simply not including
+            // the module in your custom doctype should be sufficient
+            $this->modules
+        );
+    }
+
+    /**
+     * Takes a module and adds it to the active module collection,
+     * registering it if necessary.
+     */
+    public function processModule($module) {
+        if (!isset($this->registeredModules[$module]) || is_object($module)) {
+            $this->registerModule($module);
+        }
+        $this->modules[$module] = $this->registeredModules[$module];
+    }
+
+    /**
+     * Retrieves merged element definitions.
+     * @return Array of HTMLPurifier_ElementDef
+     */
+    public function getElements() {
+
+        $elements = array();
+        foreach ($this->modules as $module) {
+            if (!$this->trusted && !$module->safe) continue;
+            foreach ($module->info as $name => $v) {
+                if (isset($elements[$name])) continue;
+                $elements[$name] = $this->getElement($name);
+            }
+        }
+
+        // remove dud elements, this happens when an element that
+        // appeared to be safe actually wasn't
+        foreach ($elements as $n => $v) {
+            if ($v === false) unset($elements[$n]);
+        }
+
+        return $elements;
+
+    }
+
+    /**
+     * Retrieves a single merged element definition
+     * @param $name Name of element
+     * @param $trusted Boolean trusted overriding parameter: set to true
+     *                 if you want the full version of an element
+     * @return Merged HTMLPurifier_ElementDef
+     * @note You may notice that modules are getting iterated over twice (once
+     *       in getElements() and once here). This
+     *       is because
+     */
+    public function getElement($name, $trusted = null) {
+
+        if (!isset($this->elementLookup[$name])) {
+            return false;
+        }
+
+        // setup global state variables
+        $def = false;
+        if ($trusted === null) $trusted = $this->trusted;
+
+        // iterate through each module that has registered itself to this
+        // element
+        foreach($this->elementLookup[$name] as $module_name) {
+
+            $module = $this->modules[$module_name];
+
+            // refuse to create/merge from a module that is deemed unsafe--
+            // pretend the module doesn't exist--when trusted mode is not on.
+            if (!$trusted && !$module->safe) {
+                continue;
+            }
+
+            // clone is used because, ideally speaking, the original
+            // definition should not be modified. Usually, this will
+            // make no difference, but for consistency's sake
+            $new_def = clone $module->info[$name];
+
+            if (!$def && $new_def->standalone) {
+                $def = $new_def;
+            } elseif ($def) {
+                // This will occur even if $new_def is standalone. In practice,
+                // this will usually result in a full replacement.
+                $def->mergeIn($new_def);
+            } else {
+                // :TODO:
+                // non-standalone definitions that don't have a standalone
+                // to merge into could be deferred to the end
+                continue;
+            }
+
+            // attribute value expansions
+            $this->attrCollections->performInclusions($def->attr);
+            $this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
+
+            // descendants_are_inline, for ChildDef_Chameleon
+            if (is_string($def->content_model) &&
+                strpos($def->content_model, 'Inline') !== false) {
+                if ($name != 'del' && $name != 'ins') {
+                    // this is for you, ins/del
+                    $def->descendants_are_inline = true;
+                }
+            }
+
+            $this->contentSets->generateChildDef($def, $module);
+        }
+
+        // This can occur if there is a blank definition, but no base to
+        // mix it in with
+        if (!$def) return false;
+
+        // add information on required attributes
+        foreach ($def->attr as $attr_name => $attr_def) {
+            if ($attr_def->required) {
+                $def->required_attr[] = $attr_name;
+            }
+        }
+
+        return $def;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/IDAccumulator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
new file mode 100755
index 0000000000..d546cd751c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Component of HTMLPurifier_AttrContext that accumulates IDs to prevent dupes
+ * @note In Slashdot-speak, dupe means duplicate.
+ * @note The default constructor does not accept $config or $context objects:
+ *       use must use the static build() factory method to perform initialization.
+ */
+class HTMLPurifier_IDAccumulator
+{
+
+    /**
+     * Lookup table of IDs we've accumulated.
+     * @public
+     */
+    public $ids = array();
+
+    /**
+     * Builds an IDAccumulator, also initializing the default blacklist
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @return Fully initialized HTMLPurifier_IDAccumulator
+     */
+    public static function build($config, $context) {
+        $id_accumulator = new HTMLPurifier_IDAccumulator();
+        $id_accumulator->load($config->get('Attr', 'IDBlacklist'));
+        return $id_accumulator;
+    }
+
+    /**
+     * Add an ID to the lookup table.
+     * @param $id ID to be added.
+     * @return Bool status, true if success, false if there's a dupe
+     */
+    public function add($id) {
+        if (isset($this->ids[$id])) return false;
+        return $this->ids[$id] = true;
+    }
+
+    /**
+     * Load a list of IDs into the lookup table
+     * @param $array_of_ids Array of IDs to load
+     * @note This function doesn't care about duplicates
+     */
+    public function load($array_of_ids) {
+        foreach ($array_of_ids as $id) {
+            $this->ids[$id] = true;
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector.php
new file mode 100755
index 0000000000..bc093b805c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector.php
@@ -0,0 +1,233 @@
+<?php
+
+/**
+ * Injects tokens into the document while parsing for well-formedness.
+ * This enables "formatter-like" functionality such as auto-paragraphing,
+ * smiley-ification and linkification to take place.
+ *
+ * A note on how handlers create changes; this is done by assigning a new
+ * value to the $token reference. These values can take a variety of forms and
+ * are best described HTMLPurifier_Strategy_MakeWellFormed->processToken()
+ * documentation.
+ *
+ * @todo Allow injectors to request a re-run on their output. This
+ *       would help if an operation is recursive.
+ */
+abstract class HTMLPurifier_Injector
+{
+
+    /**
+     * Advisory name of injector, this is for friendly error messages
+     */
+    public $name;
+
+    /**
+     * Instance of HTMLPurifier_HTMLDefinition
+     */
+    protected $htmlDefinition;
+
+    /**
+     * Reference to CurrentNesting variable in Context. This is an array
+     * list of tokens that we are currently "inside"
+     */
+    protected $currentNesting;
+
+    /**
+     * Reference to InputTokens variable in Context. This is an array
+     * list of the input tokens that are being processed.
+     */
+    protected $inputTokens;
+
+    /**
+     * Reference to InputIndex variable in Context. This is an integer
+     * array index for $this->inputTokens that indicates what token
+     * is currently being processed.
+     */
+    protected $inputIndex;
+
+    /**
+     * Array of elements and attributes this injector creates and therefore
+     * need to be allowed by the definition. Takes form of
+     * array('element' => array('attr', 'attr2'), 'element2')
+     */
+    public $needed = array();
+
+    /**
+     * Index of inputTokens to rewind to.
+     */
+    protected $rewind = false;
+
+    /**
+     * Rewind to a spot to re-perform processing. This is useful if you
+     * deleted a node, and now need to see if this change affected any
+     * earlier nodes. Rewinding does not affect other injectors, and can
+     * result in infinite loops if not used carefully.
+     * @warning HTML Purifier will prevent you from fast-forwarding with this
+     *          function.
+     */
+    public function rewind($index) {
+        $this->rewind = $index;
+    }
+
+    /**
+     * Retrieves rewind, and then unsets it.
+     */
+    public function getRewind() {
+        $r = $this->rewind;
+        $this->rewind = false;
+        return $r;
+    }
+
+    /**
+     * Prepares the injector by giving it the config and context objects:
+     * this allows references to important variables to be made within
+     * the injector. This function also checks if the HTML environment
+     * will work with the Injector (see checkNeeded()).
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @return Boolean false if success, string of missing needed element/attribute if failure
+     */
+    public function prepare($config, $context) {
+        $this->htmlDefinition = $config->getHTMLDefinition();
+        // Even though this might fail, some unit tests ignore this and
+        // still test checkNeeded, so be careful. Maybe get rid of that
+        // dependency.
+        $result = $this->checkNeeded($config);
+        if ($result !== false) return $result;
+        $this->currentNesting =& $context->get('CurrentNesting');
+        $this->inputTokens    =& $context->get('InputTokens');
+        $this->inputIndex     =& $context->get('InputIndex');
+        return false;
+    }
+
+    /**
+     * This function checks if the HTML environment
+     * will work with the Injector: if p tags are not allowed, the
+     * Auto-Paragraphing injector should not be enabled.
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @return Boolean false if success, string of missing needed element/attribute if failure
+     */
+    public function checkNeeded($config) {
+        $def = $config->getHTMLDefinition();
+        foreach ($this->needed as $element => $attributes) {
+            if (is_int($element)) $element = $attributes;
+            if (!isset($def->info[$element])) return $element;
+            if (!is_array($attributes)) continue;
+            foreach ($attributes as $name) {
+                if (!isset($def->info[$element]->attr[$name])) return "$element.$name";
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Tests if the context node allows a certain element
+     * @param $name Name of element to test for
+     * @return True if element is allowed, false if it is not
+     */
+    public function allowsElement($name) {
+        if (!empty($this->currentNesting)) {
+            $parent_token = array_pop($this->currentNesting);
+            $this->currentNesting[] = $parent_token;
+            $parent = $this->htmlDefinition->info[$parent_token->name];
+        } else {
+            $parent = $this->htmlDefinition->info_parent_def;
+        }
+        if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Iterator function, which starts with the next token and continues until
+     * you reach the end of the input tokens.
+     * @warning Please prevent previous references from interfering with this
+     *          functions by setting $i = null beforehand!
+     * @param &$i Current integer index variable for inputTokens
+     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
+     */
+    protected function forward(&$i, &$current) {
+        if ($i === null) $i = $this->inputIndex + 1;
+        else $i++;
+        if (!isset($this->inputTokens[$i])) return false;
+        $current = $this->inputTokens[$i];
+        return true;
+    }
+
+    /**
+     * Similar to _forward, but accepts a third parameter $nesting (which
+     * should be initialized at 0) and stops when we hit the end tag
+     * for the node $this->inputIndex starts in.
+     */
+    protected function forwardUntilEndToken(&$i, &$current, &$nesting) {
+        $result = $this->forward($i, $current);
+        if (!$result) return false;
+        if ($nesting === null) $nesting = 0;
+        if     ($current instanceof HTMLPurifier_Token_Start) $nesting++;
+        elseif ($current instanceof HTMLPurifier_Token_End) {
+            if ($nesting <= 0) return false;
+            $nesting--;
+        }
+        return true;
+    }
+
+    /**
+     * Iterator function, starts with the previous token and continues until
+     * you reach the beginning of input tokens.
+     * @warning Please prevent previous references from interfering with this
+     *          functions by setting $i = null beforehand!
+     * @param &$i Current integer index variable for inputTokens
+     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
+     */
+    protected function backward(&$i, &$current) {
+        if ($i === null) $i = $this->inputIndex - 1;
+        else $i--;
+        if ($i < 0) return false;
+        $current = $this->inputTokens[$i];
+        return true;
+    }
+
+    /**
+     * Initializes the iterator at the current position. Use in a do {} while;
+     * loop to force the _forward and _backward functions to start at the
+     * current location.
+     * @warning Please prevent previous references from interfering with this
+     *          functions by setting $i = null beforehand!
+     * @param &$i Current integer index variable for inputTokens
+     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
+     */
+    protected function current(&$i, &$current) {
+        if ($i === null) $i = $this->inputIndex;
+        $current = $this->inputTokens[$i];
+    }
+
+    /**
+     * Handler that is called when a text token is processed
+     */
+    public function handleText(&$token) {}
+
+    /**
+     * Handler that is called when a start or empty token is processed
+     */
+    public function handleElement(&$token) {}
+
+    /**
+     * Handler that is called when an end token is processed
+     */
+    public function handleEnd(&$token) {
+        $this->notifyEnd($token);
+    }
+
+    /**
+     * Notifier that is called when an end token is processed
+     * @note This differs from handlers in that the token is read-only
+     * @deprecated
+     */
+    public function notifyEnd($token) {}
+
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
new file mode 100755
index 0000000000..8cc952549c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
@@ -0,0 +1,340 @@
+<?php
+
+/**
+ * Injector that auto paragraphs text in the root node based on
+ * double-spacing.
+ * @todo Ensure all states are unit tested, including variations as well.
+ * @todo Make a graph of the flow control for this Injector.
+ */
+class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
+{
+
+    public $name = 'AutoParagraph';
+    public $needed = array('p');
+
+    private function _pStart() {
+        $par = new HTMLPurifier_Token_Start('p');
+        $par->armor['MakeWellFormed_TagClosedError'] = true;
+        return $par;
+    }
+
+    public function handleText(&$token) {
+        $text = $token->data;
+        // Does the current parent allow <p> tags?
+        if ($this->allowsElement('p')) {
+            if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
+                // Note that we have differing behavior when dealing with text
+                // in the anonymous root node, or a node inside the document.
+                // If the text as a double-newline, the treatment is the same;
+                // if it doesn't, see the next if-block if you're in the document.
+
+                $i = $nesting = null;
+                if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
+                    // State 1.1: ...    ^ (whitespace, then document end)
+                    //               ----
+                    // This is a degenerate case
+                } else {
+                    // State 1.2: PAR1
+                    //            ----
+
+                    // State 1.3: PAR1\n\nPAR2
+                    //            ------------
+
+                    // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
+                    //                 ------------
+                    $token = array($this->_pStart());
+                    $this->_splitText($text, $token);
+                }
+            } else {
+                // State 2:   <div>PAR1... (similar to 1.4)
+                //                 ----
+
+                // We're in an element that allows paragraph tags, but we're not
+                // sure if we're going to need them.
+                if ($this->_pLookAhead()) {
+                    // State 2.1: <div>PAR1<b>PAR1\n\nPAR2
+                    //                 ----
+                    // Note: This will always be the first child, since any
+                    // previous inline element would have triggered this very
+                    // same routine, and found the double newline. One possible
+                    // exception would be a comment.
+                    $token = array($this->_pStart(), $token);
+                } else {
+                    // State 2.2.1: <div>PAR1<div>
+                    //                   ----
+
+                    // State 2.2.2: <div>PAR1<b>PAR1</b></div>
+                    //                   ----
+                }
+            }
+        // Is the current parent a <p> tag?
+        } elseif (
+            !empty($this->currentNesting) &&
+            $this->currentNesting[count($this->currentNesting)-1]->name == 'p'
+        ) {
+            // State 3.1: ...<p>PAR1
+            //                  ----
+
+            // State 3.2: ...<p>PAR1\n\nPAR2
+            //                  ------------
+            $token = array();
+            $this->_splitText($text, $token);
+        // Abort!
+        } else {
+            // State 4.1: ...<b>PAR1
+            //                  ----
+
+            // State 4.2: ...<b>PAR1\n\nPAR2
+            //                  ------------
+        }
+    }
+
+    public function handleElement(&$token) {
+        // We don't have to check if we're already in a <p> tag for block
+        // tokens, because the tag would have been autoclosed by MakeWellFormed.
+        if ($this->allowsElement('p')) {
+            if (!empty($this->currentNesting)) {
+                if ($this->_isInline($token)) {
+                    // State 1: <div>...<b>
+                    //                  ---
+
+                    // Check if this token is adjacent to the parent token
+                    // (seek backwards until token isn't whitespace)
+                    $i = null;
+                    $this->backward($i, $prev);
+
+                    if (!$prev instanceof HTMLPurifier_Token_Start) {
+                        // Token wasn't adjacent
+
+                        if (
+                            $prev instanceof HTMLPurifier_Token_Text &&
+                            substr($prev->data, -2) === "\n\n"
+                        ) {
+                            // State 1.1.4: <div><p>PAR1</p>\n\n<b>
+                            //                                  ---
+
+                            // Quite frankly, this should be handled by splitText
+                            $token = array($this->_pStart(), $token);
+                        } else {
+                            // State 1.1.1: <div><p>PAR1</p><b>
+                            //                              ---
+
+                            // State 1.1.2: <div><br /><b>
+                            //                         ---
+
+                            // State 1.1.3: <div>PAR<b>
+                            //                      ---
+                        }
+
+                    } else {
+                        // State 1.2.1: <div><b>
+                        //                   ---
+
+                        // Lookahead to see if <p> is needed.
+                        if ($this->_pLookAhead()) {
+                            // State 1.3.1: <div><b>PAR1\n\nPAR2
+                            //                   ---
+                            $token = array($this->_pStart(), $token);
+                        } else {
+                            // State 1.3.2: <div><b>PAR1</b></div>
+                            //                   ---
+
+                            // State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
+                            //                   ---
+                        }
+                    }
+                } else {
+                    // State 2.3: ...<div>
+                    //               -----
+                }
+            } else {
+                if ($this->_isInline($token)) {
+                    // State 3.1: <b>
+                    //            ---
+                    // This is where the {p} tag is inserted, not reflected in
+                    // inputTokens yet, however.
+                    $token = array($this->_pStart(), $token);
+                } else {
+                    // State 3.2: <div>
+                    //            -----
+                }
+
+                $i = null;
+                if ($this->backward($i, $prev)) {
+                    if (
+                        !$prev instanceof HTMLPurifier_Token_Text
+                    ) {
+                        // State 3.1.1: ...</p>{p}<b>
+                        //                        ---
+
+                        // State 3.2.1: ...</p><div>
+                        //                     -----
+
+                        if (!is_array($token)) $token = array($token);
+                        array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
+                    } else {
+                        // State 3.1.2: ...</p>\n\n{p}<b>
+                        //                            ---
+
+                        // State 3.2.2: ...</p>\n\n<div>
+                        //                         -----
+
+                        // Note: PAR<ELEM> cannot occur because PAR would have been
+                        // wrapped in <p> tags.
+                    }
+                }
+            }
+        } else {
+            // State 2.2: <ul><li>
+            //                ----
+
+            // State 2.4: <p><b>
+            //               ---
+        }
+    }
+
+    /**
+     * Splits up a text in paragraph tokens and appends them
+     * to the result stream that will replace the original
+     * @param $data String text data that will be processed
+     *    into paragraphs
+     * @param $result Reference to array of tokens that the
+     *    tags will be appended onto
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     */
+    private function _splitText($data, &$result) {
+        $raw_paragraphs = explode("\n\n", $data);
+        $paragraphs  = array(); // without empty paragraphs
+        $needs_start = false;
+        $needs_end   = false;
+
+        $c = count($raw_paragraphs);
+        if ($c == 1) {
+            // There were no double-newlines, abort quickly. In theory this
+            // should never happen.
+            $result[] = new HTMLPurifier_Token_Text($data);
+            return;
+        }
+        for ($i = 0; $i < $c; $i++) {
+            $par = $raw_paragraphs[$i];
+            if (trim($par) !== '') {
+                $paragraphs[] = $par;
+            } else {
+                if ($i == 0) {
+                    // Double newline at the front
+                    if (empty($result)) {
+                        // The empty result indicates that the AutoParagraph
+                        // injector did not add any start paragraph tokens.
+                        // This means that we have been in a paragraph for
+                        // a while, and the newline means we should start a new one.
+                        $result[] = new HTMLPurifier_Token_End('p');
+                        $result[] = new HTMLPurifier_Token_Text("\n\n");
+                        // However, the start token should only be added if
+                        // there is more processing to be done (i.e. there are
+                        // real paragraphs in here). If there are none, the
+                        // next start paragraph tag will be handled by the
+                        // next call to the injector
+                        $needs_start = true;
+                    } else {
+                        // We just started a new paragraph!
+                        // Reinstate a double-newline for presentation's sake, since
+                        // it was in the source code.
+                        array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
+                    }
+                } elseif ($i + 1 == $c) {
+                    // Double newline at the end
+                    // There should be a trailing </p> when we're finally done.
+                    $needs_end = true;
+                }
+            }
+        }
+
+        // Check if this was just a giant blob of whitespace. Move this earlier,
+        // perhaps?
+        if (empty($paragraphs)) {
+            return;
+        }
+
+        // Add the start tag indicated by \n\n at the beginning of $data
+        if ($needs_start) {
+            $result[] = $this->_pStart();
+        }
+
+        // Append the paragraphs onto the result
+        foreach ($paragraphs as $par) {
+            $result[] = new HTMLPurifier_Token_Text($par);
+            $result[] = new HTMLPurifier_Token_End('p');
+            $result[] = new HTMLPurifier_Token_Text("\n\n");
+            $result[] = $this->_pStart();
+        }
+
+        // Remove trailing start token; Injector will handle this later if
+        // it was indeed needed. This prevents from needing to do a lookahead,
+        // at the cost of a lookbehind later.
+        array_pop($result);
+
+        // If there is no need for an end tag, remove all of it and let
+        // MakeWellFormed close it later.
+        if (!$needs_end) {
+            array_pop($result); // removes \n\n
+            array_pop($result); // removes </p>
+        }
+
+    }
+
+    /**
+     * Returns true if passed token is inline (and, ergo, allowed in
+     * paragraph tags)
+     */
+    private function _isInline($token) {
+        return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
+    }
+
+    /**
+     * Looks ahead in the token list and determines whether or not we need
+     * to insert a <p> tag.
+     */
+    private function _pLookAhead() {
+        $this->current($i, $current);
+        if ($current instanceof HTMLPurifier_Token_Start) $nesting = 1;
+        else $nesting = 0;
+        $ok = false;
+        while ($this->forwardUntilEndToken($i, $current, $nesting)) {
+            $result = $this->_checkNeedsP($current);
+            if ($result !== null) {
+                $ok = $result;
+                break;
+            }
+        }
+        return $ok;
+    }
+
+    /**
+     * Determines if a particular token requires an earlier inline token
+     * to get a paragraph. This should be used with _forwardUntilEndToken
+     */
+    private function _checkNeedsP($current) {
+        if ($current instanceof HTMLPurifier_Token_Start){
+            if (!$this->_isInline($current)) {
+                // <div>PAR1<div>
+                //      ----
+                // Terminate early, since we hit a block element
+                return false;
+            }
+        } elseif ($current instanceof HTMLPurifier_Token_Text) {
+            if (strpos($current->data, "\n\n") !== false) {
+                // <div>PAR1<b>PAR1\n\nPAR2
+                //      ----
+                return true;
+            } else {
+                // <div>PAR1<b>PAR1...
+                //      ----
+            }
+        }
+        return null;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
new file mode 100755
index 0000000000..9dce9bd085
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Injector that displays the URL of an anchor instead of linking to it, in addition to showing the text of the link.
+ */
+class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
+{
+
+    public $name = 'DisplayLinkURI';
+    public $needed = array('a');
+
+    public function handleElement(&$token) {
+    }
+
+    public function handleEnd(&$token) {
+        if (isset($token->start->attr['href'])){
+            $url = $token->start->attr['href'];
+            unset($token->start->attr['href']);
+            $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
+        } else {
+            // nothing to display
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
new file mode 100755
index 0000000000..296dac2829
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Injector that converts http, https and ftp text URLs to actual links.
+ */
+class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
+{
+
+    public $name = 'Linkify';
+    public $needed = array('a' => array('href'));
+
+    public function handleText(&$token) {
+        if (!$this->allowsElement('a')) return;
+
+        if (strpos($token->data, '://') === false) {
+            // our really quick heuristic failed, abort
+            // this may not work so well if we want to match things like
+            // "google.com", but then again, most people don't
+            return;
+        }
+
+        // there is/are URL(s). Let's split the string:
+        // Note: this regex is extremely permissive
+        $bits = preg_split('#((?:https?|ftp)://[^\s\'"<>()]+)#S', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $token = array();
+
+        // $i = index
+        // $c = count
+        // $l = is link
+        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+            if (!$l) {
+                if ($bits[$i] === '') continue;
+                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+            } else {
+                $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
+                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+                $token[] = new HTMLPurifier_Token_End('a');
+            }
+        }
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
new file mode 100755
index 0000000000..3c706a33af
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Injector that converts configuration directive syntax %Namespace.Directive
+ * to links
+ */
+class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
+{
+
+    public $name = 'PurifierLinkify';
+    public $docURL;
+    public $needed = array('a' => array('href'));
+
+    public function prepare($config, $context) {
+        $this->docURL = $config->get('AutoFormatParam', 'PurifierLinkifyDocURL');
+        return parent::prepare($config, $context);
+    }
+
+    public function handleText(&$token) {
+        if (!$this->allowsElement('a')) return;
+        if (strpos($token->data, '%') === false) return;
+
+        $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $token = array();
+
+        // $i = index
+        // $c = count
+        // $l = is link
+        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+            if (!$l) {
+                if ($bits[$i] === '') continue;
+                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
+            } else {
+                $token[] = new HTMLPurifier_Token_Start('a',
+                    array('href' => str_replace('%s', $bits[$i], $this->docURL)));
+                $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
+                $token[] = new HTMLPurifier_Token_End('a');
+            }
+        }
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
new file mode 100755
index 0000000000..d85ca97d92
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
@@ -0,0 +1,42 @@
+<?php
+
+class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
+{
+
+    private $context, $config;
+
+    public function prepare($config, $context) {
+        parent::prepare($config, $context);
+        $this->config = $config;
+        $this->context = $context;
+        $this->attrValidator = new HTMLPurifier_AttrValidator();
+    }
+
+    public function handleElement(&$token) {
+        if (!$token instanceof HTMLPurifier_Token_Start) return;
+        $next = false;
+        for ($i = $this->inputIndex + 1, $c = count($this->inputTokens); $i < $c; $i++) {
+            $next = $this->inputTokens[$i];
+            if ($next instanceof HTMLPurifier_Token_Text && $next->is_whitespace) continue;
+            break;
+        }
+        if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
+            if ($token->name == 'colgroup') return;
+            $this->attrValidator->validateToken($token, $this->config, $this->context);
+            $token->armor['ValidateAttributes'] = true;
+            if (isset($token->attr['id']) || isset($token->attr['name'])) return;
+            $token = $i - $this->inputIndex + 1;
+            for ($b = $this->inputIndex - 1; $b > 0; $b--) {
+                $prev = $this->inputTokens[$b];
+                if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) continue;
+                break;
+            }
+            // This is safe because we removed the token that triggered this.
+            $this->rewind($b - 1);
+            return;
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
new file mode 100755
index 0000000000..3415828685
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Adds important param elements to inside of object in order to make
+ * things safe.
+ */
+class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
+{
+    public $name = 'SafeObject';
+    public $needed = array('object', 'param');
+
+    protected $objectStack = array();
+    protected $paramStack  = array();
+
+    // Keep this synchronized with AttrTransform/SafeParam.php
+    protected $addParam = array(
+        'allowScriptAccess' => 'never',
+        'allowNetworking' => 'internal',
+    );
+    protected $allowedParam = array(
+        'wmode' => true,
+        'movie' => true,
+    );
+
+    public function prepare($config, $context) {
+        parent::prepare($config, $context);
+    }
+
+    public function handleElement(&$token) {
+        if ($token->name == 'object') {
+            $this->objectStack[] = $token;
+            $this->paramStack[] = array();
+            $new = array($token);
+            foreach ($this->addParam as $name => $value) {
+                $new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
+            }
+            $token = $new;
+        } elseif ($token->name == 'param') {
+            $nest = count($this->currentNesting) - 1;
+            if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
+                $i = count($this->objectStack) - 1;
+                if (!isset($token->attr['name'])) {
+                    $token = false;
+                    return;
+                }
+                $n = $token->attr['name'];
+                // We need this fix because YouTube doesn't supply a data
+                // attribute, which we need if a type is specified. This is
+                // *very* Flash specific.
+                if (!isset($this->objectStack[$i]->attr['data']) && $token->attr['name'] == 'movie') {
+                    $this->objectStack[$i]->attr['data'] = $token->attr['value'];
+                }
+                // Check if the parameter is the correct value but has not
+                // already been added
+                if (
+                    !isset($this->paramStack[$i][$n]) &&
+                    isset($this->addParam[$n]) &&
+                    $token->attr['name'] === $this->addParam[$n]
+                ) {
+                    // keep token, and add to param stack
+                    $this->paramStack[$i][$n] = true;
+                } elseif (isset($this->allowedParam[$n])) {
+                    // keep token, don't do anything to it
+                    // (could possibly check for duplicates here)
+                } else {
+                    $token = false;
+                }
+            } else {
+                // not directly inside an object, DENY!
+                $token = false;
+            }
+        }
+    }
+
+    public function handleEnd(&$token) {
+        // This is the WRONG way of handling the object and param stacks;
+        // we should be inserting them directly on the relevant object tokens
+        // so that the global stack handling handles it.
+        if ($token->name == 'object') {
+            array_pop($this->objectStack);
+            array_pop($this->paramStack);
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language.php
new file mode 100755
index 0000000000..3e2be03b58
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language.php
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * Represents a language and defines localizable string formatting and
+ * other functions, as well as the localized messages for HTML Purifier.
+ */
+class HTMLPurifier_Language
+{
+
+    /**
+     * ISO 639 language code of language. Prefers shortest possible version
+     */
+    public $code = 'en';
+
+    /**
+     * Fallback language code
+     */
+    public $fallback = false;
+
+    /**
+     * Array of localizable messages
+     */
+    public $messages = array();
+
+    /**
+     * Array of localizable error codes
+     */
+    public $errorNames = array();
+
+    /**
+     * True if no message file was found for this language, so English
+     * is being used instead. Check this if you'd like to notify the
+     * user that they've used a non-supported language.
+     */
+    public $error = false;
+
+    /**
+     * Has the language object been loaded yet?
+     * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
+     */
+    public $_loaded = false;
+
+    /**
+     * Instances of HTMLPurifier_Config and HTMLPurifier_Context
+     */
+    protected $config, $context;
+
+    public function __construct($config, $context) {
+        $this->config  = $config;
+        $this->context = $context;
+    }
+
+    /**
+     * Loads language object with necessary info from factory cache
+     * @note This is a lazy loader
+     */
+    public function load() {
+        if ($this->_loaded) return;
+        $factory = HTMLPurifier_LanguageFactory::instance();
+        $factory->loadLanguage($this->code);
+        foreach ($factory->keys as $key) {
+            $this->$key = $factory->cache[$this->code][$key];
+        }
+        $this->_loaded = true;
+    }
+
+    /**
+     * Retrieves a localised message.
+     * @param $key string identifier of message
+     * @return string localised message
+     */
+    public function getMessage($key) {
+        if (!$this->_loaded) $this->load();
+        if (!isset($this->messages[$key])) return "[$key]";
+        return $this->messages[$key];
+    }
+
+    /**
+     * Retrieves a localised error name.
+     * @param $int integer error number, corresponding to PHP's error
+     *             reporting
+     * @return string localised message
+     */
+    public function getErrorName($int) {
+        if (!$this->_loaded) $this->load();
+        if (!isset($this->errorNames[$int])) return "[Error: $int]";
+        return $this->errorNames[$int];
+    }
+
+    /**
+     * Converts an array list into a string readable representation
+     */
+    public function listify($array) {
+        $sep      = $this->getMessage('Item separator');
+        $sep_last = $this->getMessage('Item separator last');
+        $ret = '';
+        for ($i = 0, $c = count($array); $i < $c; $i++) {
+            if ($i == 0) {
+            } elseif ($i + 1 < $c) {
+                $ret .= $sep;
+            } else {
+                $ret .= $sep_last;
+            }
+            $ret .= $array[$i];
+        }
+        return $ret;
+    }
+
+    /**
+     * Formats a localised message with passed parameters
+     * @param $key string identifier of message
+     * @param $args Parameters to substitute in
+     * @return string localised message
+     * @todo Implement conditionals? Right now, some messages make
+     *     reference to line numbers, but those aren't always available
+     */
+    public function formatMessage($key, $args = array()) {
+        if (!$this->_loaded) $this->load();
+        if (!isset($this->messages[$key])) return "[$key]";
+        $raw = $this->messages[$key];
+        $subst = array();
+        $generator = false;
+        foreach ($args as $i => $value) {
+            if (is_object($value)) {
+                if ($value instanceof HTMLPurifier_Token) {
+                    // factor this out some time
+                    if (!$generator) $generator = $this->context->get('Generator');
+                    if (isset($value->name)) $subst['$'.$i.'.Name'] = $value->name;
+                    if (isset($value->data)) $subst['$'.$i.'.Data'] = $value->data;
+                    $subst['$'.$i.'.Compact'] =
+                    $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
+                    // a more complex algorithm for compact representation
+                    // could be introduced for all types of tokens. This
+                    // may need to be factored out into a dedicated class
+                    if (!empty($value->attr)) {
+                        $stripped_token = clone $value;
+                        $stripped_token->attr = array();
+                        $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
+                    }
+                    $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
+                }
+                continue;
+            } elseif (is_array($value)) {
+                $keys = array_keys($value);
+                if (array_keys($keys) === $keys) {
+                    // list
+                    $subst['$'.$i] = $this->listify($value);
+                } else {
+                    // associative array
+                    // no $i implementation yet, sorry
+                    $subst['$'.$i.'.Keys'] = $this->listify($keys);
+                    $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
+                }
+                continue;
+            }
+            $subst['$' . $i] = $value;
+        }
+        return strtr($raw, $subst);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php
new file mode 100755
index 0000000000..d52fcb7ac1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php
@@ -0,0 +1,12 @@
+<?php
+
+// private class for unit testing
+
+class HTMLPurifier_Language_en_x_test extends HTMLPurifier_Language
+{
+
+
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php
new file mode 100755
index 0000000000..1c046f379e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php
@@ -0,0 +1,11 @@
+<?php
+
+// private language message file for unit testing purposes
+
+$fallback = 'en';
+
+$messages = array(
+    'HTMLPurifier' => 'HTML Purifier X'
+);
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php
new file mode 100755
index 0000000000..806c83fbf7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php
@@ -0,0 +1,12 @@
+<?php
+
+// private language message file for unit testing purposes
+// this language file has no class associated with it
+
+$fallback = 'en';
+
+$messages = array(
+    'HTMLPurifier' => 'HTML Purifier XNone'
+);
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
new file mode 100755
index 0000000000..aab2e52ebc
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
@@ -0,0 +1,62 @@
+<?php
+
+$fallback = false;
+
+$messages = array(
+
+'HTMLPurifier' => 'HTML Purifier',
+
+// for unit testing purposes
+'LanguageFactoryTest: Pizza' => 'Pizza',
+'LanguageTest: List' => '$1',
+'LanguageTest: Hash' => '$1.Keys; $1.Values',
+
+'Item separator' => ', ',
+'Item separator last' => ' and ', // non-Harvard style
+
+'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
+'ErrorCollector: At line'   => ' at line $line',
+'ErrorCollector: Incidental errors'  => 'Incidental errors',
+
+'Lexer: Unclosed comment'      => 'Unclosed comment',
+'Lexer: Unescaped lt'          => 'Unescaped less-than sign (<) should be &lt;',
+'Lexer: Missing gt'            => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
+'Lexer: Missing attribute key' => 'Attribute declaration has no key',
+'Lexer: Missing end quote'     => 'Attribute declaration has no end quote',
+
+'Strategy_RemoveForeignElements: Tag transform'              => '<$1> element transformed into $CurrentToken.Serialized',
+'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
+'Strategy_RemoveForeignElements: Foreign element to text'    => 'Unrecognized $CurrentToken.Serialized tag converted to text',
+'Strategy_RemoveForeignElements: Foreign element removed'    => 'Unrecognized $CurrentToken.Serialized tag removed',
+'Strategy_RemoveForeignElements: Comment removed'            => 'Comment containing "$CurrentToken.Data" removed',
+'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
+'Strategy_RemoveForeignElements: Token removed to end'       => 'Tags and text starting from $1 element where removed to end',
+'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
+'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
+
+'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
+'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
+'Strategy_MakeWellFormed: Tag auto closed'             => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
+'Strategy_MakeWellFormed: Tag carryover'               => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
+'Strategy_MakeWellFormed: Stray end tag removed'       => 'Stray $CurrentToken.Serialized tag removed',
+'Strategy_MakeWellFormed: Stray end tag to text'       => 'Stray $CurrentToken.Serialized tag converted to text',
+'Strategy_MakeWellFormed: Tag closed by element end'   => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
+'Strategy_MakeWellFormed: Tag closed by document end'  => '$1.Compact tag started on line $1.Line closed by end of document',
+
+'Strategy_FixNesting: Node removed'          => '$CurrentToken.Compact node removed',
+'Strategy_FixNesting: Node excluded'         => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
+'Strategy_FixNesting: Node reorganized'      => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
+'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
+
+'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
+'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
+
+);
+
+$errorNames = array(
+    E_ERROR   => 'Error',
+    E_WARNING => 'Warning',
+    E_NOTICE  => 'Notice'
+);
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/LanguageFactory.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
new file mode 100755
index 0000000000..baa4422ebf
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
@@ -0,0 +1,198 @@
+<?php
+
+/**
+ * Class responsible for generating HTMLPurifier_Language objects, managing
+ * caching and fallbacks.
+ * @note Thanks to MediaWiki for the general logic, although this version
+ *       has been entirely rewritten
+ * @todo Serialized cache for languages
+ */
+class HTMLPurifier_LanguageFactory
+{
+
+    /**
+     * Cache of language code information used to load HTMLPurifier_Language objects
+     * Structure is: $factory->cache[$language_code][$key] = $value
+     * @value array map
+     */
+    public $cache;
+
+    /**
+     * Valid keys in the HTMLPurifier_Language object. Designates which
+     * variables to slurp out of a message file.
+     * @value array list
+     */
+    public $keys = array('fallback', 'messages', 'errorNames');
+
+    /**
+     * Instance of HTMLPurifier_AttrDef_Lang to validate language codes
+     * @value object HTMLPurifier_AttrDef_Lang
+     */
+    protected $validator;
+
+    /**
+     * Cached copy of dirname(__FILE__), directory of current file without
+     * trailing slash
+     * @value string filename
+     */
+    protected $dir;
+
+    /**
+     * Keys whose contents are a hash map and can be merged
+     * @value array lookup
+     */
+    protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
+
+    /**
+     * Keys whose contents are a list and can be merged
+     * @value array lookup
+     */
+    protected $mergeable_keys_list = array();
+
+    /**
+     * Retrieve sole instance of the factory.
+     * @param $prototype Optional prototype to overload sole instance with,
+     *                   or bool true to reset to default factory.
+     */
+    public static function instance($prototype = null) {
+        static $instance = null;
+        if ($prototype !== null) {
+            $instance = $prototype;
+        } elseif ($instance === null || $prototype == true) {
+            $instance = new HTMLPurifier_LanguageFactory();
+            $instance->setup();
+        }
+        return $instance;
+    }
+
+    /**
+     * Sets up the singleton, much like a constructor
+     * @note Prevents people from getting this outside of the singleton
+     */
+    public function setup() {
+        $this->validator = new HTMLPurifier_AttrDef_Lang();
+        $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
+    }
+
+    /**
+     * Creates a language object, handles class fallbacks
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @param $code Code to override configuration with. Private parameter.
+     */
+    public function create($config, $context, $code = false) {
+
+        // validate language code
+        if ($code === false) {
+            $code = $this->validator->validate(
+              $config->get('Core', 'Language'), $config, $context
+            );
+        } else {
+            $code = $this->validator->validate($code, $config, $context);
+        }
+        if ($code === false) $code = 'en'; // malformed code becomes English
+
+        $pcode = str_replace('-', '_', $code); // make valid PHP classname
+        static $depth = 0; // recursion protection
+
+        if ($code == 'en') {
+            $lang = new HTMLPurifier_Language($config, $context);
+        } else {
+            $class = 'HTMLPurifier_Language_' . $pcode;
+            $file  = $this->dir . '/Language/classes/' . $code . '.php';
+            if (file_exists($file) || class_exists($class, false)) {
+                $lang = new $class($config, $context);
+            } else {
+                // Go fallback
+                $raw_fallback = $this->getFallbackFor($code);
+                $fallback = $raw_fallback ? $raw_fallback : 'en';
+                $depth++;
+                $lang = $this->create($config, $context, $fallback);
+                if (!$raw_fallback) {
+                    $lang->error = true;
+                }
+                $depth--;
+            }
+        }
+
+        $lang->code = $code;
+
+        return $lang;
+
+    }
+
+    /**
+     * Returns the fallback language for language
+     * @note Loads the original language into cache
+     * @param $code string language code
+     */
+    public function getFallbackFor($code) {
+        $this->loadLanguage($code);
+        return $this->cache[$code]['fallback'];
+    }
+
+    /**
+     * Loads language into the cache, handles message file and fallbacks
+     * @param $code string language code
+     */
+    public function loadLanguage($code) {
+        static $languages_seen = array(); // recursion guard
+
+        // abort if we've already loaded it
+        if (isset($this->cache[$code])) return;
+
+        // generate filename
+        $filename = $this->dir . '/Language/messages/' . $code . '.php';
+
+        // default fallback : may be overwritten by the ensuing include
+        $fallback = ($code != 'en') ? 'en' : false;
+
+        // load primary localisation
+        if (!file_exists($filename)) {
+            // skip the include: will rely solely on fallback
+            $filename = $this->dir . '/Language/messages/en.php';
+            $cache = array();
+        } else {
+            include $filename;
+            $cache = compact($this->keys);
+        }
+
+        // load fallback localisation
+        if (!empty($fallback)) {
+
+            // infinite recursion guard
+            if (isset($languages_seen[$code])) {
+                trigger_error('Circular fallback reference in language ' .
+                    $code, E_USER_ERROR);
+                $fallback = 'en';
+            }
+            $language_seen[$code] = true;
+
+            // load the fallback recursively
+            $this->loadLanguage($fallback);
+            $fallback_cache = $this->cache[$fallback];
+
+            // merge fallback with current language
+            foreach ( $this->keys as $key ) {
+                if (isset($cache[$key]) && isset($fallback_cache[$key])) {
+                    if (isset($this->mergeable_keys_map[$key])) {
+                        $cache[$key] = $cache[$key] + $fallback_cache[$key];
+                    } elseif (isset($this->mergeable_keys_list[$key])) {
+                        $cache[$key] = array_merge( $fallback_cache[$key], $cache[$key] );
+                    }
+                } else {
+                    $cache[$key] = $fallback_cache[$key];
+                }
+            }
+
+        }
+
+        // save to cache for later retrieval
+        $this->cache[$code] = $cache;
+
+        return;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Length.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Length.php
new file mode 100755
index 0000000000..8d2a46b7da
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Length.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * Represents a measurable length, with a string numeric magnitude
+ * and a unit. This object is immutable.
+ */
+class HTMLPurifier_Length
+{
+
+    /**
+     * String numeric magnitude.
+     */
+    protected $n;
+
+    /**
+     * String unit. False is permitted if $n = 0.
+     */
+    protected $unit;
+
+    /**
+     * Whether or not this length is valid. Null if not calculated yet.
+     */
+    protected $isValid;
+
+    /**
+     * Lookup array of units recognized by CSS 2.1
+     */
+    protected static $allowedUnits = array(
+        'em' => true, 'ex' => true, 'px' => true, 'in' => true,
+        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
+    );
+
+    /**
+     * @param number $n Magnitude
+     * @param string $u Unit
+     */
+    public function __construct($n = '0', $u = false) {
+        $this->n = (string) $n;
+        $this->unit = $u !== false ? (string) $u : false;
+    }
+
+    /**
+     * @param string $s Unit string, like '2em' or '3.4in'
+     * @warning Does not perform validation.
+     */
+    static public function make($s) {
+        if ($s instanceof HTMLPurifier_Length) return $s;
+        $n_length = strspn($s, '1234567890.+-');
+        $n = substr($s, 0, $n_length);
+        $unit = substr($s, $n_length);
+        if ($unit === '') $unit = false;
+        return new HTMLPurifier_Length($n, $unit);
+    }
+
+    /**
+     * Validates the number and unit.
+     */
+    protected function validate() {
+        // Special case:
+        if ($this->n === '+0' || $this->n === '-0') $this->n = '0';
+        if ($this->n === '0' && $this->unit === false) return true;
+        if (!ctype_lower($this->unit)) $this->unit = strtolower($this->unit);
+        if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) return false;
+        // Hack:
+        $def = new HTMLPurifier_AttrDef_CSS_Number();
+        $result = $def->validate($this->n, false, false);
+        if ($result === false) return false;
+        $this->n = $result;
+        return true;
+    }
+
+    /**
+     * Returns string representation of number.
+     */
+    public function toString() {
+        if (!$this->isValid()) return false;
+        return $this->n . $this->unit;
+    }
+
+    /**
+     * Retrieves string numeric magnitude.
+     */
+    public function getN() {return $this->n;}
+
+    /**
+     * Retrieves string unit.
+     */
+    public function getUnit() {return $this->unit;}
+
+    /**
+     * Returns true if this length unit is valid.
+     */
+    public function isValid() {
+        if ($this->isValid === null) $this->isValid = $this->validate();
+        return $this->isValid;
+    }
+
+    /**
+     * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
+     * @warning If both values are too large or small, this calculation will
+     *          not work properly
+     */
+    public function compareTo($l) {
+        if ($l === false) return false;
+        if ($l->unit !== $this->unit) {
+            $converter = new HTMLPurifier_UnitConverter();
+            $l = $converter->convert($l, $this->unit);
+            if ($l === false) return false;
+        }
+        return $this->n - $l->n;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer.php
new file mode 100755
index 0000000000..9458869983
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer.php
@@ -0,0 +1,298 @@
+<?php
+
+/**
+ * Forgivingly lexes HTML (SGML-style) markup into tokens.
+ *
+ * A lexer parses a string of SGML-style markup and converts them into
+ * corresponding tokens.  It doesn't check for well-formedness, although its
+ * internal mechanism may make this automatic (such as the case of
+ * HTMLPurifier_Lexer_DOMLex).  There are several implementations to choose
+ * from.
+ *
+ * A lexer is HTML-oriented: it might work with XML, but it's not
+ * recommended, as we adhere to a subset of the specification for optimization
+ * reasons. This might change in the future. Also, most tokenizers are not
+ * expected to handle DTDs or PIs.
+ *
+ * This class should not be directly instantiated, but you may use create() to
+ * retrieve a default copy of the lexer.  Being a supertype, this class
+ * does not actually define any implementation, but offers commonly used
+ * convenience functions for subclasses.
+ *
+ * @note The unit tests will instantiate this class for testing purposes, as
+ *       many of the utility functions require a class to be instantiated.
+ *       This means that, even though this class is not runnable, it will
+ *       not be declared abstract.
+ *
+ * @par
+ *
+ * @note
+ * We use tokens rather than create a DOM representation because DOM would:
+ *
+ * @par
+ *  -# Require more processing and memory to create,
+ *  -# Is not streamable, and
+ *  -# Has the entire document structure (html and body not needed).
+ *
+ * @par
+ * However, DOM is helpful in that it makes it easy to move around nodes
+ * without a lot of lookaheads to see when a tag is closed. This is a
+ * limitation of the token system and some workarounds would be nice.
+ */
+class HTMLPurifier_Lexer
+{
+
+    /**
+     * Whether or not this lexer implements line-number/column-number tracking.
+     * If it does, set to true.
+     */
+    public $tracksLineNumbers = false;
+
+    // -- STATIC ----------------------------------------------------------
+
+    /**
+     * Retrieves or sets the default Lexer as a Prototype Factory.
+     *
+     * By default HTMLPurifier_Lexer_DOMLex will be returned. There are
+     * a few exceptions involving special features that only DirectLex
+     * implements.
+     *
+     * @note The behavior of this class has changed, rather than accepting
+     *       a prototype object, it now accepts a configuration object.
+     *       To specify your own prototype, set %Core.LexerImpl to it.
+     *       This change in behavior de-singletonizes the lexer object.
+     *
+     * @param $config Instance of HTMLPurifier_Config
+     * @return Concrete lexer.
+     */
+    public static function create($config) {
+
+        if (!($config instanceof HTMLPurifier_Config)) {
+            $lexer = $config;
+            trigger_error("Passing a prototype to
+              HTMLPurifier_Lexer::create() is deprecated, please instead
+              use %Core.LexerImpl", E_USER_WARNING);
+        } else {
+            $lexer = $config->get('Core', 'LexerImpl');
+        }
+
+        $needs_tracking =
+            $config->get('Core', 'MaintainLineNumbers') ||
+            $config->get('Core', 'CollectErrors');
+
+        $inst = null;
+        if (is_object($lexer)) {
+            $inst = $lexer;
+        } else {
+
+            if (is_null($lexer)) { do {
+                // auto-detection algorithm
+
+                if ($needs_tracking) {
+                    $lexer = 'DirectLex';
+                    break;
+                }
+
+                if (
+                    class_exists('DOMDocument') &&
+                    method_exists('DOMDocument', 'loadHTML') &&
+                    !extension_loaded('domxml')
+                ) {
+                    // check for DOM support, because while it's part of the
+                    // core, it can be disabled compile time. Also, the PECL
+                    // domxml extension overrides the default DOM, and is evil
+                    // and nasty and we shan't bother to support it
+                    $lexer = 'DOMLex';
+                } else {
+                    $lexer = 'DirectLex';
+                }
+
+            } while(0); } // do..while so we can break
+
+            // instantiate recognized string names
+            switch ($lexer) {
+                case 'DOMLex':
+                    $inst = new HTMLPurifier_Lexer_DOMLex();
+                    break;
+                case 'DirectLex':
+                    $inst = new HTMLPurifier_Lexer_DirectLex();
+                    break;
+                case 'PH5P':
+                    $inst = new HTMLPurifier_Lexer_PH5P();
+                    break;
+                default:
+                    throw new HTMLPurifier_Exception("Cannot instantiate unrecognized Lexer type " . htmlspecialchars($lexer));
+            }
+        }
+
+        if (!$inst) throw new HTMLPurifier_Exception('No lexer was instantiated');
+
+        // once PHP DOM implements native line numbers, or we
+        // hack out something using XSLT, remove this stipulation
+        if ($needs_tracking && !$inst->tracksLineNumbers) {
+            throw new HTMLPurifier_Exception('Cannot use lexer that does not support line numbers with Core.MaintainLineNumbers or Core.CollectErrors (use DirectLex instead)');
+        }
+
+        return $inst;
+
+    }
+
+    // -- CONVENIENCE MEMBERS ---------------------------------------------
+
+    public function __construct() {
+        $this->_entity_parser = new HTMLPurifier_EntityParser();
+    }
+
+    /**
+     * Most common entity to raw value conversion table for special entities.
+     */
+    protected $_special_entity2str =
+            array(
+                    '&quot;' => '"',
+                    '&amp;'  => '&',
+                    '&lt;'   => '<',
+                    '&gt;'   => '>',
+                    '&#39;'  => "'",
+                    '&#039;' => "'",
+                    '&#x27;' => "'"
+            );
+
+    /**
+     * Parses special entities into the proper characters.
+     *
+     * This string will translate escaped versions of the special characters
+     * into the correct ones.
+     *
+     * @warning
+     * You should be able to treat the output of this function as
+     * completely parsed, but that's only because all other entities should
+     * have been handled previously in substituteNonSpecialEntities()
+     *
+     * @param $string String character data to be parsed.
+     * @returns Parsed character data.
+     */
+    public function parseData($string) {
+
+        // following functions require at least one character
+        if ($string === '') return '';
+
+        // subtracts amps that cannot possibly be escaped
+        $num_amp = substr_count($string, '&') - substr_count($string, '& ') -
+            ($string[strlen($string)-1] === '&' ? 1 : 0);
+
+        if (!$num_amp) return $string; // abort if no entities
+        $num_esc_amp = substr_count($string, '&amp;');
+        $string = strtr($string, $this->_special_entity2str);
+
+        // code duplication for sake of optimization, see above
+        $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -
+            ($string[strlen($string)-1] === '&' ? 1 : 0);
+
+        if ($num_amp_2 <= $num_esc_amp) return $string;
+
+        // hmm... now we have some uncommon entities. Use the callback.
+        $string = $this->_entity_parser->substituteSpecialEntities($string);
+        return $string;
+    }
+
+    /**
+     * Lexes an HTML string into tokens.
+     *
+     * @param $string String HTML.
+     * @return HTMLPurifier_Token array representation of HTML.
+     */
+    public function tokenizeHTML($string, $config, $context) {
+        trigger_error('Call to abstract class', E_USER_ERROR);
+    }
+
+    /**
+     * Translates CDATA sections into regular sections (through escaping).
+     *
+     * @param $string HTML string to process.
+     * @returns HTML with CDATA sections escaped.
+     */
+    protected static function escapeCDATA($string) {
+        return preg_replace_callback(
+            '/<!\[CDATA\[(.+?)\]\]>/s',
+            array('HTMLPurifier_Lexer', 'CDATACallback'),
+            $string
+        );
+    }
+
+    /**
+     * Special CDATA case that is especially convoluted for <script>
+     */
+    protected static function escapeCommentedCDATA($string) {
+        return preg_replace_callback(
+            '#<!--//--><!\[CDATA\[//><!--(.+?)//--><!\]\]>#s',
+            array('HTMLPurifier_Lexer', 'CDATACallback'),
+            $string
+        );
+    }
+
+    /**
+     * Callback function for escapeCDATA() that does the work.
+     *
+     * @warning Though this is public in order to let the callback happen,
+     *          calling it directly is not recommended.
+     * @params $matches PCRE matches array, with index 0 the entire match
+     *                  and 1 the inside of the CDATA section.
+     * @returns Escaped internals of the CDATA section.
+     */
+    protected static function CDATACallback($matches) {
+        // not exactly sure why the character set is needed, but whatever
+        return htmlspecialchars($matches[1], ENT_COMPAT, 'UTF-8');
+    }
+
+    /**
+     * Takes a piece of HTML and normalizes it by converting entities, fixing
+     * encoding, extracting bits, and other good stuff.
+     * @todo Consider making protected
+     */
+    public function normalize($html, $config, $context) {
+
+        // normalize newlines to \n
+        $html = str_replace("\r\n", "\n", $html);
+        $html = str_replace("\r", "\n", $html);
+
+        if ($config->get('HTML', 'Trusted')) {
+            // escape convoluted CDATA
+            $html = $this->escapeCommentedCDATA($html);
+        }
+
+        // escape CDATA
+        $html = $this->escapeCDATA($html);
+
+        // extract body from document if applicable
+        if ($config->get('Core', 'ConvertDocumentToFragment')) {
+            $html = $this->extractBody($html);
+        }
+
+        // expand entities that aren't the big five
+        $html = $this->_entity_parser->substituteNonSpecialEntities($html);
+
+        // clean into wellformed UTF-8 string for an SGML context: this has
+        // to be done after entity expansion because the entities sometimes
+        // represent non-SGML characters (horror, horror!)
+        $html = HTMLPurifier_Encoder::cleanUTF8($html);
+
+        return $html;
+    }
+
+    /**
+     * Takes a string of HTML (fragment or document) and returns the content
+     * @todo Consider making protected
+     */
+    public function extractBody($html) {
+        $matches = array();
+        $result = preg_match('!<body[^>]*>(.+?)</body>!is', $html, $matches);
+        if ($result) {
+            return $matches[1];
+        } else {
+            return $html;
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
new file mode 100755
index 0000000000..0db3974bfa
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Parser that uses PHP 5's DOM extension (part of the core).
+ *
+ * In PHP 5, the DOM XML extension was revamped into DOM and added to the core.
+ * It gives us a forgiving HTML parser, which we use to transform the HTML
+ * into a DOM, and then into the tokens.  It is blazingly fast (for large
+ * documents, it performs twenty times faster than
+ * HTMLPurifier_Lexer_DirectLex,and is the default choice for PHP 5.
+ *
+ * @note Any empty elements will have empty tokens associated with them, even if
+ * this is prohibited by the spec. This is cannot be fixed until the spec
+ * comes into play.
+ *
+ * @note PHP's DOM extension does not actually parse any entities, we use
+ *       our own function to do that.
+ *
+ * @warning DOM tends to drop whitespace, which may wreak havoc on indenting.
+ *          If this is a huge problem, due to the fact that HTML is hand
+ *          edited and you are unable to get a parser cache that caches the
+ *          the output of HTML Purifier while keeping the original HTML lying
+ *          around, you may want to run Tidy on the resulting output or use
+ *          HTMLPurifier_DirectLex
+ */
+
+class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
+{
+
+    private $factory;
+
+    public function __construct() {
+        // setup the factory
+        parent::__construct();
+        $this->factory = new HTMLPurifier_TokenFactory();
+    }
+
+    public function tokenizeHTML($html, $config, $context) {
+
+        $html = $this->normalize($html, $config, $context);
+
+        // attempt to armor stray angled brackets that cannot possibly
+        // form tags and thus are probably being used as emoticons
+        if ($config->get('Core', 'AggressivelyFixLt')) {
+            $char = '[^a-z!\/]';
+            $comment = "/<!--(.*?)(-->|\z)/is";
+            $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
+            do {
+                $old = $html;
+                $html = preg_replace("/<($char)/i", '&lt;\\1', $html);
+            } while ($html !== $old);
+            $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
+        }
+
+        // preprocess html, essential for UTF-8
+        $html = $this->wrapHTML($html, $config, $context);
+
+        $doc = new DOMDocument();
+        $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
+
+        set_error_handler(array($this, 'muteErrorHandler'));
+        $doc->loadHTML($html);
+        restore_error_handler();
+
+        $tokens = array();
+        $this->tokenizeDOM(
+            $doc->getElementsByTagName('html')->item(0)-> // <html>
+                  getElementsByTagName('body')->item(0)-> //   <body>
+                  getElementsByTagName('div')->item(0)    //     <div>
+            , $tokens);
+        return $tokens;
+    }
+
+    /**
+     * Recursive function that tokenizes a node, putting it into an accumulator.
+     *
+     * @param $node     DOMNode to be tokenized.
+     * @param $tokens   Array-list of already tokenized tokens.
+     * @param $collect  Says whether or start and close are collected, set to
+     *                  false at first recursion because it's the implicit DIV
+     *                  tag you're dealing with.
+     * @returns Tokens of node appended to previously passed tokens.
+     */
+    protected function tokenizeDOM($node, &$tokens, $collect = false) {
+
+        // intercept non element nodes. WE MUST catch all of them,
+        // but we're not getting the character reference nodes because
+        // those should have been preprocessed
+        if ($node->nodeType === XML_TEXT_NODE) {
+            $tokens[] = $this->factory->createText($node->data);
+            return;
+        } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
+            // undo libxml's special treatment of <script> and <style> tags
+            $last = end($tokens);
+            $data = $node->data;
+            // (note $node->tagname is already normalized)
+            if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
+                $new_data = trim($data);
+                if (substr($new_data, 0, 4) === '<!--') {
+                    $data = substr($new_data, 4);
+                    if (substr($data, -3) === '-->') {
+                        $data = substr($data, 0, -3);
+                    } else {
+                        // Highly suspicious! Not sure what to do...
+                    }
+                }
+            }
+            $tokens[] = $this->factory->createText($this->parseData($data));
+            return;
+        } elseif ($node->nodeType === XML_COMMENT_NODE) {
+            // this is code is only invoked for comments in script/style in versions
+            // of libxml pre-2.6.28 (regular comments, of course, are still
+            // handled regularly)
+            $tokens[] = $this->factory->createComment($node->data);
+            return;
+        } elseif (
+            // not-well tested: there may be other nodes we have to grab
+            $node->nodeType !== XML_ELEMENT_NODE
+        ) {
+            return;
+        }
+
+        $attr = $node->hasAttributes() ?
+            $this->transformAttrToAssoc($node->attributes) :
+            array();
+
+        // We still have to make sure that the element actually IS empty
+        if (!$node->childNodes->length) {
+            if ($collect) {
+                $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
+            }
+        } else {
+            if ($collect) { // don't wrap on first iteration
+                $tokens[] = $this->factory->createStart(
+                    $tag_name = $node->tagName, // somehow, it get's dropped
+                    $attr
+                );
+            }
+            foreach ($node->childNodes as $node) {
+                // remember, it's an accumulator. Otherwise, we'd have
+                // to use array_merge
+                $this->tokenizeDOM($node, $tokens, true);
+            }
+            if ($collect) {
+                $tokens[] = $this->factory->createEnd($tag_name);
+            }
+        }
+
+    }
+
+    /**
+     * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
+     *
+     * @param $attribute_list DOMNamedNodeMap of DOMAttr objects.
+     * @returns Associative array of attributes.
+     */
+    protected function transformAttrToAssoc($node_map) {
+        // NamedNodeMap is documented very well, so we're using undocumented
+        // features, namely, the fact that it implements Iterator and
+        // has a ->length attribute
+        if ($node_map->length === 0) return array();
+        $array = array();
+        foreach ($node_map as $attr) {
+            $array[$attr->name] = $attr->value;
+        }
+        return $array;
+    }
+
+    /**
+     * An error handler that mutes all errors
+     */
+    public function muteErrorHandler($errno, $errstr) {}
+
+    /**
+     * Callback function for undoing escaping of stray angled brackets
+     * in comments
+     */
+    public function callbackUndoCommentSubst($matches) {
+        return '<!--' . strtr($matches[1], array('&amp;'=>'&','&lt;'=>'<')) . $matches[2];
+    }
+
+    /**
+     * Callback function that entity-izes ampersands in comments so that
+     * callbackUndoCommentSubst doesn't clobber them
+     */
+    public function callbackArmorCommentEntities($matches) {
+        return '<!--' . str_replace('&', '&amp;', $matches[1]) . $matches[2];
+    }
+
+    /**
+     * Wraps an HTML fragment in the necessary HTML
+     */
+    protected function wrapHTML($html, $config, $context) {
+        $def = $config->getDefinition('HTML');
+        $ret = '';
+
+        if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
+            $ret .= '<!DOCTYPE html ';
+            if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
+            if (!empty($def->doctype->dtdSystem)) $ret .= '"' . $def->doctype->dtdSystem . '" ';
+            $ret .= '>';
+        }
+
+        $ret .= '<html><head>';
+        $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
+        // No protection if $html contains a stray </div>!
+        $ret .= '</head><body><div>'.$html.'</div></body></html>';
+        return $ret;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
new file mode 100755
index 0000000000..bfca4533d8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
@@ -0,0 +1,490 @@
+<?php
+
+/**
+ * Our in-house implementation of a parser.
+ *
+ * A pure PHP parser, DirectLex has absolutely no dependencies, making
+ * it a reasonably good default for PHP4.  Written with efficiency in mind,
+ * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
+ * pales in comparison to HTMLPurifier_Lexer_DOMLex.
+ *
+ * @todo Reread XML spec and document differences.
+ */
+class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
+{
+
+    public $tracksLineNumbers = true;
+
+    /**
+     * Whitespace characters for str(c)spn.
+     */
+    protected $_whitespace = "\x20\x09\x0D\x0A";
+
+    /**
+     * Callback function for script CDATA fudge
+     * @param $matches, in form of array(opening tag, contents, closing tag)
+     */
+    protected function scriptCallback($matches) {
+        return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3];
+    }
+
+    public function tokenizeHTML($html, $config, $context) {
+
+        // special normalization for script tags without any armor
+        // our "armor" heurstic is a < sign any number of whitespaces after
+        // the first script tag
+        if ($config->get('HTML', 'Trusted')) {
+            $html = preg_replace_callback('#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
+                array($this, 'scriptCallback'), $html);
+        }
+
+        $html = $this->normalize($html, $config, $context);
+
+        $cursor = 0; // our location in the text
+        $inside_tag = false; // whether or not we're parsing the inside of a tag
+        $array = array(); // result array
+
+        // This is also treated to mean maintain *column* numbers too
+        $maintain_line_numbers = $config->get('Core', 'MaintainLineNumbers');
+
+        if ($maintain_line_numbers === null) {
+            // automatically determine line numbering by checking
+            // if error collection is on
+            $maintain_line_numbers = $config->get('Core', 'CollectErrors');
+        }
+
+        if ($maintain_line_numbers) {
+            $current_line = 1;
+            $current_col  = 0;
+            $length = strlen($html);
+        } else {
+            $current_line = false;
+            $current_col  = false;
+            $length = false;
+        }
+        $context->register('CurrentLine', $current_line);
+        $context->register('CurrentCol',  $current_col);
+        $nl = "\n";
+        // how often to manually recalculate. This will ALWAYS be right,
+        // but it's pretty wasteful. Set to 0 to turn off
+        $synchronize_interval = $config->get('Core', 'DirectLexLineNumberSyncInterval');
+
+        $e = false;
+        if ($config->get('Core', 'CollectErrors')) {
+            $e =& $context->get('ErrorCollector');
+        }
+
+        // for testing synchronization
+        $loops = 0;
+
+        while(++$loops) {
+
+            // $cursor is either at the start of a token, or inside of
+            // a tag (i.e. there was a < immediately before it), as indicated
+            // by $inside_tag
+
+            if ($maintain_line_numbers) {
+
+                // $rcursor, however, is always at the start of a token.
+                $rcursor = $cursor - (int) $inside_tag;
+
+                // Column number is cheap, so we calculate it every round.
+                // We're interested at the *end* of the newline string, so
+                // we need to add strlen($nl) == 1 to $nl_pos before subtracting it
+                // from our "rcursor" position.
+                $nl_pos = strrpos($html, $nl, $rcursor - $length);
+                $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
+
+                // recalculate lines
+                if (
+                    $synchronize_interval &&  // synchronization is on
+                    $cursor > 0 &&            // cursor is further than zero
+                    $loops % $synchronize_interval === 0 // time to synchronize!
+                ) {
+                    $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
+                }
+
+            }
+
+            $position_next_lt = strpos($html, '<', $cursor);
+            $position_next_gt = strpos($html, '>', $cursor);
+
+            // triggers on "<b>asdf</b>" but not "asdf <b></b>"
+            // special case to set up context
+            if ($position_next_lt === $cursor) {
+                $inside_tag = true;
+                $cursor++;
+            }
+
+            if (!$inside_tag && $position_next_lt !== false) {
+                // We are not inside tag and there still is another tag to parse
+                $token = new
+                    HTMLPurifier_Token_Text(
+                        $this->parseData(
+                            substr(
+                                $html, $cursor, $position_next_lt - $cursor
+                            )
+                        )
+                    );
+                if ($maintain_line_numbers) {
+                    $token->rawPosition($current_line, $current_col);
+                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
+                }
+                $array[] = $token;
+                $cursor  = $position_next_lt + 1;
+                $inside_tag = true;
+                continue;
+            } elseif (!$inside_tag) {
+                // We are not inside tag but there are no more tags
+                // If we're already at the end, break
+                if ($cursor === strlen($html)) break;
+                // Create Text of rest of string
+                $token = new
+                    HTMLPurifier_Token_Text(
+                        $this->parseData(
+                            substr(
+                                $html, $cursor
+                            )
+                        )
+                    );
+                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
+                $array[] = $token;
+                break;
+            } elseif ($inside_tag && $position_next_gt !== false) {
+                // We are in tag and it is well formed
+                // Grab the internals of the tag
+                $strlen_segment = $position_next_gt - $cursor;
+
+                if ($strlen_segment < 1) {
+                    // there's nothing to process!
+                    $token = new HTMLPurifier_Token_Text('<');
+                    $cursor++;
+                    continue;
+                }
+
+                $segment = substr($html, $cursor, $strlen_segment);
+
+                if ($segment === false) {
+                    // somehow, we attempted to access beyond the end of
+                    // the string, defense-in-depth, reported by Nate Abele
+                    break;
+                }
+
+                // Check if it's a comment
+                if (
+                    substr($segment, 0, 3) === '!--'
+                ) {
+                    // re-determine segment length, looking for -->
+                    $position_comment_end = strpos($html, '-->', $cursor);
+                    if ($position_comment_end === false) {
+                        // uh oh, we have a comment that extends to
+                        // infinity. Can't be helped: set comment
+                        // end position to end of string
+                        if ($e) $e->send(E_WARNING, 'Lexer: Unclosed comment');
+                        $position_comment_end = strlen($html);
+                        $end = true;
+                    } else {
+                        $end = false;
+                    }
+                    $strlen_segment = $position_comment_end - $cursor;
+                    $segment = substr($html, $cursor, $strlen_segment);
+                    $token = new
+                        HTMLPurifier_Token_Comment(
+                            substr(
+                                $segment, 3, $strlen_segment - 3
+                            )
+                        );
+                    if ($maintain_line_numbers) {
+                        $token->rawPosition($current_line, $current_col);
+                        $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
+                    }
+                    $array[] = $token;
+                    $cursor = $end ? $position_comment_end : $position_comment_end + 3;
+                    $inside_tag = false;
+                    continue;
+                }
+
+                // Check if it's an end tag
+                $is_end_tag = (strpos($segment,'/') === 0);
+                if ($is_end_tag) {
+                    $type = substr($segment, 1);
+                    $token = new HTMLPurifier_Token_End($type);
+                    if ($maintain_line_numbers) {
+                        $token->rawPosition($current_line, $current_col);
+                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+                    }
+                    $array[] = $token;
+                    $inside_tag = false;
+                    $cursor = $position_next_gt + 1;
+                    continue;
+                }
+
+                // Check leading character is alnum, if not, we may
+                // have accidently grabbed an emoticon. Translate into
+                // text and go our merry way
+                if (!ctype_alpha($segment[0])) {
+                    // XML:  $segment[0] !== '_' && $segment[0] !== ':'
+                    if ($e) $e->send(E_NOTICE, 'Lexer: Unescaped lt');
+                    $token = new HTMLPurifier_Token_Text('<');
+                    if ($maintain_line_numbers) {
+                        $token->rawPosition($current_line, $current_col);
+                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+                    }
+                    $array[] = $token;
+                    $inside_tag = false;
+                    continue;
+                }
+
+                // Check if it is explicitly self closing, if so, remove
+                // trailing slash. Remember, we could have a tag like <br>, so
+                // any later token processing scripts must convert improperly
+                // classified EmptyTags from StartTags.
+                $is_self_closing = (strrpos($segment,'/') === $strlen_segment-1);
+                if ($is_self_closing) {
+                    $strlen_segment--;
+                    $segment = substr($segment, 0, $strlen_segment);
+                }
+
+                // Check if there are any attributes
+                $position_first_space = strcspn($segment, $this->_whitespace);
+
+                if ($position_first_space >= $strlen_segment) {
+                    if ($is_self_closing) {
+                        $token = new HTMLPurifier_Token_Empty($segment);
+                    } else {
+                        $token = new HTMLPurifier_Token_Start($segment);
+                    }
+                    if ($maintain_line_numbers) {
+                        $token->rawPosition($current_line, $current_col);
+                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+                    }
+                    $array[] = $token;
+                    $inside_tag = false;
+                    $cursor = $position_next_gt + 1;
+                    continue;
+                }
+
+                // Grab out all the data
+                $type = substr($segment, 0, $position_first_space);
+                $attribute_string =
+                    trim(
+                        substr(
+                            $segment, $position_first_space
+                        )
+                    );
+                if ($attribute_string) {
+                    $attr = $this->parseAttributeString(
+                                    $attribute_string
+                                  , $config, $context
+                              );
+                } else {
+                    $attr = array();
+                }
+
+                if ($is_self_closing) {
+                    $token = new HTMLPurifier_Token_Empty($type, $attr);
+                } else {
+                    $token = new HTMLPurifier_Token_Start($type, $attr);
+                }
+                if ($maintain_line_numbers) {
+                    $token->rawPosition($current_line, $current_col);
+                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+                }
+                $array[] = $token;
+                $cursor = $position_next_gt + 1;
+                $inside_tag = false;
+                continue;
+            } else {
+                // inside tag, but there's no ending > sign
+                if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
+                $token = new
+                    HTMLPurifier_Token_Text(
+                        '<' .
+                        $this->parseData(
+                            substr($html, $cursor)
+                        )
+                    );
+                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
+                // no cursor scroll? Hmm...
+                $array[] = $token;
+                break;
+            }
+            break;
+        }
+
+        $context->destroy('CurrentLine');
+        $context->destroy('CurrentCol');
+        return $array;
+    }
+
+    /**
+     * PHP 5.0.x compatible substr_count that implements offset and length
+     */
+    protected function substrCount($haystack, $needle, $offset, $length) {
+        static $oldVersion;
+        if ($oldVersion === null) {
+            $oldVersion = version_compare(PHP_VERSION, '5.1', '<');
+        }
+        if ($oldVersion) {
+            $haystack = substr($haystack, $offset, $length);
+            return substr_count($haystack, $needle);
+        } else {
+            return substr_count($haystack, $needle, $offset, $length);
+        }
+    }
+
+    /**
+     * Takes the inside of an HTML tag and makes an assoc array of attributes.
+     *
+     * @param $string Inside of tag excluding name.
+     * @returns Assoc array of attributes.
+     */
+    public function parseAttributeString($string, $config, $context) {
+        $string = (string) $string; // quick typecast
+
+        if ($string == '') return array(); // no attributes
+
+        $e = false;
+        if ($config->get('Core', 'CollectErrors')) {
+            $e =& $context->get('ErrorCollector');
+        }
+
+        // let's see if we can abort as quickly as possible
+        // one equal sign, no spaces => one attribute
+        $num_equal = substr_count($string, '=');
+        $has_space = strpos($string, ' ');
+        if ($num_equal === 0 && !$has_space) {
+            // bool attribute
+            return array($string => $string);
+        } elseif ($num_equal === 1 && !$has_space) {
+            // only one attribute
+            list($key, $quoted_value) = explode('=', $string);
+            $quoted_value = trim($quoted_value);
+            if (!$key) {
+                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                return array();
+            }
+            if (!$quoted_value) return array($key => '');
+            $first_char = @$quoted_value[0];
+            $last_char  = @$quoted_value[strlen($quoted_value)-1];
+
+            $same_quote = ($first_char == $last_char);
+            $open_quote = ($first_char == '"' || $first_char == "'");
+
+            if ( $same_quote && $open_quote) {
+                // well behaved
+                $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
+            } else {
+                // not well behaved
+                if ($open_quote) {
+                    if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote');
+                    $value = substr($quoted_value, 1);
+                } else {
+                    $value = $quoted_value;
+                }
+            }
+            if ($value === false) $value = '';
+            return array($key => $value);
+        }
+
+        // setup loop environment
+        $array  = array(); // return assoc array of attributes
+        $cursor = 0; // current position in string (moves forward)
+        $size   = strlen($string); // size of the string (stays the same)
+
+        // if we have unquoted attributes, the parser expects a terminating
+        // space, so let's guarantee that there's always a terminating space.
+        $string .= ' ';
+
+        while(true) {
+
+            if ($cursor >= $size) {
+                break;
+            }
+
+            $cursor += ($value = strspn($string, $this->_whitespace, $cursor));
+            // grab the key
+
+            $key_begin = $cursor; //we're currently at the start of the key
+
+            // scroll past all characters that are the key (not whitespace or =)
+            $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
+
+            $key_end = $cursor; // now at the end of the key
+
+            $key = substr($string, $key_begin, $key_end - $key_begin);
+
+            if (!$key) {
+                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                $cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
+                continue; // empty key
+            }
+
+            // scroll past all whitespace
+            $cursor += strspn($string, $this->_whitespace, $cursor);
+
+            if ($cursor >= $size) {
+                $array[$key] = $key;
+                break;
+            }
+
+            // if the next character is an equal sign, we've got a regular
+            // pair, otherwise, it's a bool attribute
+            $first_char = @$string[$cursor];
+
+            if ($first_char == '=') {
+                // key="value"
+
+                $cursor++;
+                $cursor += strspn($string, $this->_whitespace, $cursor);
+
+                if ($cursor === false) {
+                    $array[$key] = '';
+                    break;
+                }
+
+                // we might be in front of a quote right now
+
+                $char = @$string[$cursor];
+
+                if ($char == '"' || $char == "'") {
+                    // it's quoted, end bound is $char
+                    $cursor++;
+                    $value_begin = $cursor;
+                    $cursor = strpos($string, $char, $cursor);
+                    $value_end = $cursor;
+                } else {
+                    // it's not quoted, end bound is whitespace
+                    $value_begin = $cursor;
+                    $cursor += strcspn($string, $this->_whitespace, $cursor);
+                    $value_end = $cursor;
+                }
+
+                // we reached a premature end
+                if ($cursor === false) {
+                    $cursor = $size;
+                    $value_end = $cursor;
+                }
+
+                $value = substr($string, $value_begin, $value_end - $value_begin);
+                if ($value === false) $value = '';
+                $array[$key] = $this->parseData($value);
+                $cursor++;
+
+            } else {
+                // boolattr
+                if ($key !== '') {
+                    $array[$key] = $key;
+                } else {
+                    // purely theoretical
+                    if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                }
+
+            }
+        }
+        return $array;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PEARSax3.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PEARSax3.php
new file mode 100755
index 0000000000..57cffa82ab
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PEARSax3.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Proof-of-concept lexer that uses the PEAR package XML_HTMLSax3 to parse HTML.
+ *
+ * PEAR, not suprisingly, also has a SAX parser for HTML.  I don't know
+ * very much about implementation, but it's fairly well written.  However, that
+ * abstraction comes at a price: performance. You need to have it installed,
+ * and if the API changes, it might break our adapter. Not sure whether or not
+ * it's UTF-8 aware, but it has some entity parsing trouble (in all areas,
+ * text and attributes).
+ *
+ * Quite personally, I don't recommend using the PEAR class, and the defaults
+ * don't use it. The unit tests do perform the tests on the SAX parser too, but
+ * whatever it does for poorly formed HTML is up to it.
+ *
+ * @todo Generalize so that XML_HTMLSax is also supported.
+ *
+ * @warning Entity-resolution inside attributes is broken.
+ */
+
+class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
+{
+
+    /**
+     * Internal accumulator array for SAX parsers.
+     */
+    protected $tokens = array();
+
+    public function tokenizeHTML($string, $config, $context) {
+
+        $this->tokens = array();
+
+        $string = $this->normalize($string, $config, $context);
+
+        $parser = new XML_HTMLSax3();
+        $parser->set_object($this);
+        $parser->set_element_handler('openHandler','closeHandler');
+        $parser->set_data_handler('dataHandler');
+        $parser->set_escape_handler('escapeHandler');
+
+        // doesn't seem to work correctly for attributes
+        $parser->set_option('XML_OPTION_ENTITIES_PARSED', 1);
+
+        $parser->parse($string);
+
+        return $this->tokens;
+
+    }
+
+    /**
+     * Open tag event handler, interface is defined by PEAR package.
+     */
+    public function openHandler(&$parser, $name, $attrs, $closed) {
+        // entities are not resolved in attrs
+        foreach ($attrs as $key => $attr) {
+            $attrs[$key] = $this->parseData($attr);
+        }
+        if ($closed) {
+            $this->tokens[] = new HTMLPurifier_Token_Empty($name, $attrs);
+        } else {
+            $this->tokens[] = new HTMLPurifier_Token_Start($name, $attrs);
+        }
+        return true;
+    }
+
+    /**
+     * Close tag event handler, interface is defined by PEAR package.
+     */
+    public function closeHandler(&$parser, $name) {
+        // HTMLSax3 seems to always send empty tags an extra close tag
+        // check and ignore if you see it:
+        // [TESTME] to make sure it doesn't overreach
+        if ($this->tokens[count($this->tokens)-1] instanceof HTMLPurifier_Token_Empty) {
+            return true;
+        }
+        $this->tokens[] = new HTMLPurifier_Token_End($name);
+        return true;
+    }
+
+    /**
+     * Data event handler, interface is defined by PEAR package.
+     */
+    public function dataHandler(&$parser, $data) {
+        $this->tokens[] = new HTMLPurifier_Token_Text($data);
+        return true;
+    }
+
+    /**
+     * Escaped text handler, interface is defined by PEAR package.
+     */
+    public function escapeHandler(&$parser, $data) {
+        if (strpos($data, '--') === 0) {
+            $this->tokens[] = new HTMLPurifier_Token_Comment($data);
+        }
+        // CDATA is handled elsewhere, but if it was handled here:
+        //if (strpos($data, '[CDATA[') === 0) {
+        //    $this->tokens[] = new HTMLPurifier_Token_Text(
+        //        substr($data, 7, strlen($data) - 9) );
+        //}
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
new file mode 100755
index 0000000000..fa1bf973e0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
@@ -0,0 +1,3906 @@
+<?php
+
+/**
+ * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library.
+ * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts.
+ * 
+ * @note
+ *    Recent changes to PHP's DOM extension have resulted in some fatal
+ *    error conditions with the original version of PH5P. Pending changes,
+ *    this lexer will punt to DirectLex if DOM throughs an exception.
+ */
+
+class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex {
+    
+    public function tokenizeHTML($html, $config, $context) {
+        $new_html = $this->normalize($html, $config, $context);
+        $new_html = $this->wrapHTML($new_html, $config, $context);
+        try {
+            $parser = new HTML5($new_html);
+            $doc = $parser->save();
+        } catch (DOMException $e) {
+            // Uh oh, it failed. Punt to DirectLex.
+            $lexer = new HTMLPurifier_Lexer_DirectLex();
+            $context->register('PH5PError', $e); // save the error, so we can detect it
+            return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
+        }
+        $tokens = array();
+        $this->tokenizeDOM(
+            $doc->getElementsByTagName('html')->item(0)-> // <html>
+                  getElementsByTagName('body')->item(0)-> //   <body>
+                  getElementsByTagName('div')->item(0)    //     <div>
+            , $tokens);
+        return $tokens;
+    }
+    
+}
+
+/*
+
+Copyright 2007 Jeroen van der Meer <http://jero.net/> 
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, 
+distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject to 
+the following conditions: 
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+*/
+
+class HTML5 {
+    private $data;
+    private $char;
+    private $EOF;
+    private $state;
+    private $tree;
+    private $token;
+    private $content_model;
+    private $escape = false;
+    private $entities = array('AElig;','AElig','AMP;','AMP','Aacute;','Aacute',
+    'Acirc;','Acirc','Agrave;','Agrave','Alpha;','Aring;','Aring','Atilde;',
+    'Atilde','Auml;','Auml','Beta;','COPY;','COPY','Ccedil;','Ccedil','Chi;',
+    'Dagger;','Delta;','ETH;','ETH','Eacute;','Eacute','Ecirc;','Ecirc','Egrave;',
+    'Egrave','Epsilon;','Eta;','Euml;','Euml','GT;','GT','Gamma;','Iacute;',
+    'Iacute','Icirc;','Icirc','Igrave;','Igrave','Iota;','Iuml;','Iuml','Kappa;',
+    'LT;','LT','Lambda;','Mu;','Ntilde;','Ntilde','Nu;','OElig;','Oacute;',
+    'Oacute','Ocirc;','Ocirc','Ograve;','Ograve','Omega;','Omicron;','Oslash;',
+    'Oslash','Otilde;','Otilde','Ouml;','Ouml','Phi;','Pi;','Prime;','Psi;',
+    'QUOT;','QUOT','REG;','REG','Rho;','Scaron;','Sigma;','THORN;','THORN',
+    'TRADE;','Tau;','Theta;','Uacute;','Uacute','Ucirc;','Ucirc','Ugrave;',
+    'Ugrave','Upsilon;','Uuml;','Uuml','Xi;','Yacute;','Yacute','Yuml;','Zeta;',
+    'aacute;','aacute','acirc;','acirc','acute;','acute','aelig;','aelig',
+    'agrave;','agrave','alefsym;','alpha;','amp;','amp','and;','ang;','apos;',
+    'aring;','aring','asymp;','atilde;','atilde','auml;','auml','bdquo;','beta;',
+    'brvbar;','brvbar','bull;','cap;','ccedil;','ccedil','cedil;','cedil',
+    'cent;','cent','chi;','circ;','clubs;','cong;','copy;','copy','crarr;',
+    'cup;','curren;','curren','dArr;','dagger;','darr;','deg;','deg','delta;',
+    'diams;','divide;','divide','eacute;','eacute','ecirc;','ecirc','egrave;',
+    'egrave','empty;','emsp;','ensp;','epsilon;','equiv;','eta;','eth;','eth',
+    'euml;','euml','euro;','exist;','fnof;','forall;','frac12;','frac12',
+    'frac14;','frac14','frac34;','frac34','frasl;','gamma;','ge;','gt;','gt',
+    'hArr;','harr;','hearts;','hellip;','iacute;','iacute','icirc;','icirc',
+    'iexcl;','iexcl','igrave;','igrave','image;','infin;','int;','iota;',
+    'iquest;','iquest','isin;','iuml;','iuml','kappa;','lArr;','lambda;','lang;',
+    'laquo;','laquo','larr;','lceil;','ldquo;','le;','lfloor;','lowast;','loz;',
+    'lrm;','lsaquo;','lsquo;','lt;','lt','macr;','macr','mdash;','micro;','micro',
+    'middot;','middot','minus;','mu;','nabla;','nbsp;','nbsp','ndash;','ne;',
+    'ni;','not;','not','notin;','nsub;','ntilde;','ntilde','nu;','oacute;',
+    'oacute','ocirc;','ocirc','oelig;','ograve;','ograve','oline;','omega;',
+    'omicron;','oplus;','or;','ordf;','ordf','ordm;','ordm','oslash;','oslash',
+    'otilde;','otilde','otimes;','ouml;','ouml','para;','para','part;','permil;',
+    'perp;','phi;','pi;','piv;','plusmn;','plusmn','pound;','pound','prime;',
+    'prod;','prop;','psi;','quot;','quot','rArr;','radic;','rang;','raquo;',
+    'raquo','rarr;','rceil;','rdquo;','real;','reg;','reg','rfloor;','rho;',
+    'rlm;','rsaquo;','rsquo;','sbquo;','scaron;','sdot;','sect;','sect','shy;',
+    'shy','sigma;','sigmaf;','sim;','spades;','sub;','sube;','sum;','sup1;',
+    'sup1','sup2;','sup2','sup3;','sup3','sup;','supe;','szlig;','szlig','tau;',
+    'there4;','theta;','thetasym;','thinsp;','thorn;','thorn','tilde;','times;',
+    'times','trade;','uArr;','uacute;','uacute','uarr;','ucirc;','ucirc',
+    'ugrave;','ugrave','uml;','uml','upsih;','upsilon;','uuml;','uuml','weierp;',
+    'xi;','yacute;','yacute','yen;','yen','yuml;','yuml','zeta;','zwj;','zwnj;');
+
+    const PCDATA    = 0;
+    const RCDATA    = 1;
+    const CDATA     = 2;
+    const PLAINTEXT = 3;
+
+    const DOCTYPE  = 0;
+    const STARTTAG = 1;
+    const ENDTAG   = 2;
+    const COMMENT  = 3;
+    const CHARACTR = 4;
+    const EOF      = 5;
+
+    public function __construct($data) {
+        $data = str_replace("\r\n", "\n", $data);
+        $data = str_replace("\r", null, $data);
+
+        $this->data = $data;
+        $this->char = -1;
+        $this->EOF  = strlen($data);
+        $this->tree = new HTML5TreeConstructer;
+        $this->content_model = self::PCDATA;
+
+        $this->state = 'data';
+
+        while($this->state !== null) {
+            $this->{$this->state.'State'}();
+        }
+    }
+
+    public function save() {
+        return $this->tree->save();
+    }
+
+    private function char() {
+        return ($this->char < $this->EOF)
+            ? $this->data[$this->char]
+            : false;
+    }
+
+    private function character($s, $l = 0) {
+        if($s + $l < $this->EOF) {
+            if($l === 0) {
+                return $this->data[$s];
+            } else {
+                return substr($this->data, $s, $l);
+            }
+        }
+    }
+
+    private function characters($char_class, $start) {
+        return preg_replace('#^(['.$char_class.']+).*#s', '\\1', substr($this->data, $start));
+    }
+
+    private function dataState() {
+        // Consume the next input character
+        $this->char++;
+        $char = $this->char();
+
+        if($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
+            /* U+0026 AMPERSAND (&)
+            When the content model flag is set to one of the PCDATA or RCDATA
+            states: switch to the entity data state. Otherwise: treat it as per
+            the "anything else"    entry below. */
+            $this->state = 'entityData';
+
+        } elseif($char === '-') {
+            /* If the content model flag is set to either the RCDATA state or
+            the CDATA state, and the escape flag is false, and there are at
+            least three characters before this one in the input stream, and the
+            last four characters in the input stream, including this one, are
+            U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
+            and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
+            if(($this->content_model === self::RCDATA || $this->content_model ===
+            self::CDATA) && $this->escape === false &&
+            $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--') {
+                $this->escape = true;
+            }
+
+            /* In any case, emit the input character as a character token. Stay
+            in the data state. */
+            $this->emitToken(array(
+                'type' => self::CHARACTR,
+                'data' => $char
+            ));
+
+        /* U+003C LESS-THAN SIGN (<) */
+        } elseif($char === '<' && ($this->content_model === self::PCDATA ||
+        (($this->content_model === self::RCDATA ||
+        $this->content_model === self::CDATA) && $this->escape === false))) {
+            /* When the content model flag is set to the PCDATA state: switch
+            to the tag open state.
+
+            When the content model flag is set to either the RCDATA state or
+            the CDATA state and the escape flag is false: switch to the tag
+            open state.
+
+            Otherwise: treat it as per the "anything else" entry below. */
+            $this->state = 'tagOpen';
+
+        /* U+003E GREATER-THAN SIGN (>) */
+        } elseif($char === '>') {
+            /* If the content model flag is set to either the RCDATA state or
+            the CDATA state, and the escape flag is true, and the last three
+            characters in the input stream including this one are U+002D
+            HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
+            set the escape flag to false. */
+            if(($this->content_model === self::RCDATA ||
+            $this->content_model === self::CDATA) && $this->escape === true &&
+            $this->character($this->char, 3) === '-->') {
+                $this->escape = false;
+            }
+
+            /* In any case, emit the input character as a character token.
+            Stay in the data state. */
+            $this->emitToken(array(
+                'type' => self::CHARACTR,
+                'data' => $char
+            ));
+
+        } elseif($this->char === $this->EOF) {
+            /* EOF
+            Emit an end-of-file token. */
+            $this->EOF();
+
+        } elseif($this->content_model === self::PLAINTEXT) {
+            /* When the content model flag is set to the PLAINTEXT state
+            THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
+            the text and emit it as a character token. */
+            $this->emitToken(array(
+                'type' => self::CHARACTR,
+                'data' => substr($this->data, $this->char)
+            ));
+
+            $this->EOF();
+
+        } else {
+            /* Anything else
+            THIS DIFFERS GREATLY FROM THE SPEC: Get as many character that
+            otherwise would also be treated as a character token and emit it
+            as a single character token. Stay in the data state. */
+            $len  = strcspn($this->data, '<&', $this->char);
+            $char = substr($this->data, $this->char, $len);
+            $this->char += $len - 1;
+
+            $this->emitToken(array(
+                'type' => self::CHARACTR,
+                'data' => $char
+            ));
+
+            $this->state = 'data';
+        }
+    }
+
+    private function entityDataState() {
+        // Attempt to consume an entity.
+        $entity = $this->entity();
+
+        // If nothing is returned, emit a U+0026 AMPERSAND character token.
+        // Otherwise, emit the character token that was returned.
+        $char = (!$entity) ? '&' : $entity;
+        $this->emitToken(array(
+            'type' => self::CHARACTR,
+            'data' => $char
+        ));
+
+        // Finally, switch to the data state.
+        $this->state = 'data';
+    }
+
+    private function tagOpenState() {
+        switch($this->content_model) {
+            case self::RCDATA:
+            case self::CDATA:
+                /* If the next input character is a U+002F SOLIDUS (/) character,
+                consume it and switch to the close tag open state. If the next
+                input character is not a U+002F SOLIDUS (/) character, emit a
+                U+003C LESS-THAN SIGN character token and switch to the data
+                state to process the next input character. */
+                if($this->character($this->char + 1) === '/') {
+                    $this->char++;
+                    $this->state = 'closeTagOpen';
+
+                } else {
+                    $this->emitToken(array(
+                        'type' => self::CHARACTR,
+                        'data' => '<'
+                    ));
+
+                    $this->state = 'data';
+                }
+            break;
+
+            case self::PCDATA:
+                // If the content model flag is set to the PCDATA state
+                // Consume the next input character:
+                $this->char++;
+                $char = $this->char();
+
+                if($char === '!') {
+                    /* U+0021 EXCLAMATION MARK (!)
+                    Switch to the markup declaration open state. */
+                    $this->state = 'markupDeclarationOpen';
+
+                } elseif($char === '/') {
+                    /* U+002F SOLIDUS (/)
+                    Switch to the close tag open state. */
+                    $this->state = 'closeTagOpen';
+
+                } elseif(preg_match('/^[A-Za-z]$/', $char)) {
+                    /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
+                    Create a new start tag token, set its tag name to the lowercase
+                    version of the input character (add 0x0020 to the character's code
+                    point), then switch to the tag name state. (Don't emit the token
+                    yet; further details will be filled in before it is emitted.) */
+                    $this->token = array(
+                        'name'  => strtolower($char),
+                        'type'  => self::STARTTAG,
+                        'attr'  => array()
+                    );
+
+                    $this->state = 'tagName';
+
+                } elseif($char === '>') {
+                    /* U+003E GREATER-THAN SIGN (>)
+                    Parse error. Emit a U+003C LESS-THAN SIGN character token and a
+                    U+003E GREATER-THAN SIGN character token. Switch to the data state. */
+                    $this->emitToken(array(
+                        'type' => self::CHARACTR,
+                        'data' => '<>'
+                    ));
+
+                    $this->state = 'data';
+
+                } elseif($char === '?') {
+                    /* U+003F QUESTION MARK (?)
+                    Parse error. Switch to the bogus comment state. */
+                    $this->state = 'bogusComment';
+
+                } else {
+                    /* Anything else
+                    Parse error. Emit a U+003C LESS-THAN SIGN character token and
+                    reconsume the current input character in the data state. */
+                    $this->emitToken(array(
+                        'type' => self::CHARACTR,
+                        'data' => '<'
+                    ));
+
+                    $this->char--;
+                    $this->state = 'data';
+                }
+            break;
+        }
+    }
+
+    private function closeTagOpenState() {
+        $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
+        $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
+
+        if(($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
+        (!$the_same || ($the_same && (!preg_match('/[\t\n\x0b\x0c >\/]/',
+        $this->character($this->char + 1 + strlen($next_node))) || $this->EOF === $this->char)))) {
+            /* If the content model flag is set to the RCDATA or CDATA states then
+            examine the next few characters. If they do not match the tag name of
+            the last start tag token emitted (case insensitively), or if they do but
+            they are not immediately followed by one of the following characters:
+                * U+0009 CHARACTER TABULATION
+                * U+000A LINE FEED (LF)
+                * U+000B LINE TABULATION
+                * U+000C FORM FEED (FF)
+                * U+0020 SPACE
+                * U+003E GREATER-THAN SIGN (>)
+                * U+002F SOLIDUS (/)
+                * EOF
+            ...then there is a parse error. Emit a U+003C LESS-THAN SIGN character
+            token, a U+002F SOLIDUS character token, and switch to the data state
+            to process the next input character. */
+            $this->emitToken(array(
+                'type' => self::CHARACTR,
+                'data' => '</'
+            ));
+
+            $this->state = 'data';
+
+        } else {
+            /* Otherwise, if the content model flag is set to the PCDATA state,
+            or if the next few characters do match that tag name, consume the
+            next input character: */
+            $this->char++;
+            $char = $this->char();
+
+            if(preg_match('/^[A-Za-z]$/', $char)) {
+                /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
+                Create a new end tag token, set its tag name to the lowercase version
+                of the input character (add 0x0020 to the character's code point), then
+                switch to the tag name state. (Don't emit the token yet; further details
+                will be filled in before it is emitted.) */
+                $this->token = array(
+                    'name'  => strtolower($char),
+                    'type'  => self::ENDTAG
+                );
+
+                $this->state = 'tagName';
+
+            } elseif($char === '>') {
+                /* U+003E GREATER-THAN SIGN (>)
+                Parse error. Switch to the data state. */
+                $this->state = 'data';
+
+            } elseif($this->char === $this->EOF) {
+                /* EOF
+                Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
+                SOLIDUS character token. Reconsume the EOF character in the data state. */
+                $this->emitToken(array(
+                    'type' => self::CHARACTR,
+                    'data' => '</'
+                ));
+
+                $this->char--;
+                $this->state = 'data';
+
+            } else {
+                /* Parse error. Switch to the bogus comment state. */
+                $this->state = 'bogusComment';
+            }
+        }
+    }
+
+    private function tagNameState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            /* U+0009 CHARACTER TABULATION
+            U+000A LINE FEED (LF)
+            U+000B LINE TABULATION
+            U+000C FORM FEED (FF)
+            U+0020 SPACE
+            Switch to the before attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($char === '>') {
+            /* U+003E GREATER-THAN SIGN (>)
+            Emit the current tag token. Switch to the data state. */
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif($this->char === $this->EOF) {
+            /* EOF
+            Parse error. Emit the current tag token. Reconsume the EOF
+            character in the data state. */
+            $this->emitToken($this->token);
+
+            $this->char--;
+            $this->state = 'data';
+
+        } elseif($char === '/') {
+            /* U+002F SOLIDUS (/)
+            Parse error unless this is a permitted slash. Switch to the before
+            attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } else {
+            /* Anything else
+            Append the current input character to the current tag token's tag name.
+            Stay in the tag name state. */
+            $this->token['name'] .= strtolower($char);
+            $this->state = 'tagName';
+        }
+    }
+
+    private function beforeAttributeNameState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            /* U+0009 CHARACTER TABULATION
+            U+000A LINE FEED (LF)
+            U+000B LINE TABULATION
+            U+000C FORM FEED (FF)
+            U+0020 SPACE
+            Stay in the before attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($char === '>') {
+            /* U+003E GREATER-THAN SIGN (>)
+            Emit the current tag token. Switch to the data state. */
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif($char === '/') {
+            /* U+002F SOLIDUS (/)
+            Parse error unless this is a permitted slash. Stay in the before
+            attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($this->char === $this->EOF) {
+            /* EOF
+            Parse error. Emit the current tag token. Reconsume the EOF
+            character in the data state. */
+            $this->emitToken($this->token);
+
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            /* Anything else
+            Start a new attribute in the current tag token. Set that attribute's
+            name to the current input character, and its value to the empty string.
+            Switch to the attribute name state. */
+            $this->token['attr'][] = array(
+                'name'  => strtolower($char),
+                'value' => null
+            );
+
+            $this->state = 'attributeName';
+        }
+    }
+
+    private function attributeNameState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            /* U+0009 CHARACTER TABULATION
+            U+000A LINE FEED (LF)
+            U+000B LINE TABULATION
+            U+000C FORM FEED (FF)
+            U+0020 SPACE
+            Stay in the before attribute name state. */
+            $this->state = 'afterAttributeName';
+
+        } elseif($char === '=') {
+            /* U+003D EQUALS SIGN (=)
+            Switch to the before attribute value state. */
+            $this->state = 'beforeAttributeValue';
+
+        } elseif($char === '>') {
+            /* U+003E GREATER-THAN SIGN (>)
+            Emit the current tag token. Switch to the data state. */
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
+            /* U+002F SOLIDUS (/)
+            Parse error unless this is a permitted slash. Switch to the before
+            attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($this->char === $this->EOF) {
+            /* EOF
+            Parse error. Emit the current tag token. Reconsume the EOF
+            character in the data state. */
+            $this->emitToken($this->token);
+
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            /* Anything else
+            Append the current input character to the current attribute's name.
+            Stay in the attribute name state. */
+            $last = count($this->token['attr']) - 1;
+            $this->token['attr'][$last]['name'] .= strtolower($char);
+
+            $this->state = 'attributeName';
+        }
+    }
+
+    private function afterAttributeNameState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            /* U+0009 CHARACTER TABULATION
+            U+000A LINE FEED (LF)
+            U+000B LINE TABULATION
+            U+000C FORM FEED (FF)
+            U+0020 SPACE
+            Stay in the after attribute name state. */
+            $this->state = 'afterAttributeName';
+
+        } elseif($char === '=') {
+            /* U+003D EQUALS SIGN (=)
+            Switch to the before attribute value state. */
+            $this->state = 'beforeAttributeValue';
+
+        } elseif($char === '>') {
+            /* U+003E GREATER-THAN SIGN (>)
+            Emit the current tag token. Switch to the data state. */
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
+            /* U+002F SOLIDUS (/)
+            Parse error unless this is a permitted slash. Switch to the
+            before attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($this->char === $this->EOF) {
+            /* EOF
+            Parse error. Emit the current tag token. Reconsume the EOF
+            character in the data state. */
+            $this->emitToken($this->token);
+
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            /* Anything else
+            Start a new attribute in the current tag token. Set that attribute's
+            name to the current input character, and its value to the empty string.
+            Switch to the attribute name state. */
+            $this->token['attr'][] = array(
+                'name'  => strtolower($char),
+                'value' => null
+            );
+
+            $this->state = 'attributeName';
+        }
+    }
+
+    private function beforeAttributeValueState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            /* U+0009 CHARACTER TABULATION
+            U+000A LINE FEED (LF)
+            U+000B LINE TABULATION
+            U+000C FORM FEED (FF)
+            U+0020 SPACE
+            Stay in the before attribute value state. */
+            $this->state = 'beforeAttributeValue';
+
+        } elseif($char === '"') {
+            /* U+0022 QUOTATION MARK (")
+            Switch to the attribute value (double-quoted) state. */
+            $this->state = 'attributeValueDoubleQuoted';
+
+        } elseif($char === '&') {
+            /* U+0026 AMPERSAND (&)
+            Switch to the attribute value (unquoted) state and reconsume
+            this input character. */
+            $this->char--;
+            $this->state = 'attributeValueUnquoted';
+
+        } elseif($char === '\'') {
+            /* U+0027 APOSTROPHE (')
+            Switch to the attribute value (single-quoted) state. */
+            $this->state = 'attributeValueSingleQuoted';
+
+        } elseif($char === '>') {
+            /* U+003E GREATER-THAN SIGN (>)
+            Emit the current tag token. Switch to the data state. */
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } else {
+            /* Anything else
+            Append the current input character to the current attribute's value.
+            Switch to the attribute value (unquoted) state. */
+            $last = count($this->token['attr']) - 1;
+            $this->token['attr'][$last]['value'] .= $char;
+
+            $this->state = 'attributeValueUnquoted';
+        }
+    }
+
+    private function attributeValueDoubleQuotedState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if($char === '"') {
+            /* U+0022 QUOTATION MARK (")
+            Switch to the before attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($char === '&') {
+            /* U+0026 AMPERSAND (&)
+            Switch to the entity in attribute value state. */
+            $this->entityInAttributeValueState('double');
+
+        } elseif($this->char === $this->EOF) {
+            /* EOF
+            Parse error. Emit the current tag token. Reconsume the character
+            in the data state. */
+            $this->emitToken($this->token);
+
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            /* Anything else
+            Append the current input character to the current attribute's value.
+            Stay in the attribute value (double-quoted) state. */
+            $last = count($this->token['attr']) - 1;
+            $this->token['attr'][$last]['value'] .= $char;
+
+            $this->state = 'attributeValueDoubleQuoted';
+        }
+    }
+
+    private function attributeValueSingleQuotedState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if($char === '\'') {
+            /* U+0022 QUOTATION MARK (')
+            Switch to the before attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($char === '&') {
+            /* U+0026 AMPERSAND (&)
+            Switch to the entity in attribute value state. */
+            $this->entityInAttributeValueState('single');
+
+        } elseif($this->char === $this->EOF) {
+            /* EOF
+            Parse error. Emit the current tag token. Reconsume the character
+            in the data state. */
+            $this->emitToken($this->token);
+
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            /* Anything else
+            Append the current input character to the current attribute's value.
+            Stay in the attribute value (single-quoted) state. */
+            $last = count($this->token['attr']) - 1;
+            $this->token['attr'][$last]['value'] .= $char;
+
+            $this->state = 'attributeValueSingleQuoted';
+        }
+    }
+
+    private function attributeValueUnquotedState() {
+        // Consume the next input character:
+        $this->char++;
+        $char = $this->character($this->char);
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            /* U+0009 CHARACTER TABULATION
+            U+000A LINE FEED (LF)
+            U+000B LINE TABULATION
+            U+000C FORM FEED (FF)
+            U+0020 SPACE
+            Switch to the before attribute name state. */
+            $this->state = 'beforeAttributeName';
+
+        } elseif($char === '&') {
+            /* U+0026 AMPERSAND (&)
+            Switch to the entity in attribute value state. */
+            $this->entityInAttributeValueState();
+
+        } elseif($char === '>') {
+            /* U+003E GREATER-THAN SIGN (>)
+            Emit the current tag token. Switch to the data state. */
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } else {
+            /* Anything else
+            Append the current input character to the current attribute's value.
+            Stay in the attribute value (unquoted) state. */
+            $last = count($this->token['attr']) - 1;
+            $this->token['attr'][$last]['value'] .= $char;
+
+            $this->state = 'attributeValueUnquoted';
+        }
+    }
+
+    private function entityInAttributeValueState() {
+        // Attempt to consume an entity.
+        $entity = $this->entity();
+
+        // If nothing is returned, append a U+0026 AMPERSAND character to the
+        // current attribute's value. Otherwise, emit the character token that
+        // was returned.
+        $char = (!$entity)
+            ? '&'
+            : $entity;
+
+        $last = count($this->token['attr']) - 1;
+        $this->token['attr'][$last]['value'] .= $char;
+    }
+
+    private function bogusCommentState() {
+        /* Consume every character up to the first U+003E GREATER-THAN SIGN
+        character (>) or the end of the file (EOF), whichever comes first. Emit
+        a comment token whose data is the concatenation of all the characters
+        starting from and including the character that caused the state machine
+        to switch into the bogus comment state, up to and including the last
+        consumed character before the U+003E character, if any, or up to the
+        end of the file otherwise. (If the comment was started by the end of
+        the file (EOF), the token is empty.) */
+        $data = $this->characters('^>', $this->char);
+        $this->emitToken(array(
+            'data' => $data,
+            'type' => self::COMMENT
+        ));
+
+        $this->char += strlen($data);
+
+        /* Switch to the data state. */
+        $this->state = 'data';
+
+        /* If the end of the file was reached, reconsume the EOF character. */
+        if($this->char === $this->EOF) {
+            $this->char = $this->EOF - 1;
+        }
+    }
+
+    private function markupDeclarationOpenState() {
+        /* If the next two characters are both U+002D HYPHEN-MINUS (-)
+        characters, consume those two characters, create a comment token whose
+        data is the empty string, and switch to the comment state. */
+        if($this->character($this->char + 1, 2) === '--') {
+            $this->char += 2;
+            $this->state = 'comment';
+            $this->token = array(
+                'data' => null,
+                'type' => self::COMMENT
+            );
+
+        /* Otherwise if the next seven chacacters are a case-insensitive match
+        for the word "DOCTYPE", then consume those characters and switch to the
+        DOCTYPE state. */
+        } elseif(strtolower($this->character($this->char + 1, 7)) === 'doctype') {
+            $this->char += 7;
+            $this->state = 'doctype';
+
+        /* Otherwise, is is a parse error. Switch to the bogus comment state.
+        The next character that is consumed, if any, is the first character
+        that will be in the comment. */
+        } else {
+            $this->char++;
+            $this->state = 'bogusComment';
+        }
+    }
+
+    private function commentState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        /* U+002D HYPHEN-MINUS (-) */
+        if($char === '-') {
+            /* Switch to the comment dash state  */
+            $this->state = 'commentDash';
+
+        /* EOF */
+        } elseif($this->char === $this->EOF) {
+            /* Parse error. Emit the comment token. Reconsume the EOF character
+            in the data state. */
+            $this->emitToken($this->token);
+            $this->char--;
+            $this->state = 'data';
+
+        /* Anything else */
+        } else {
+            /* Append the input character to the comment token's data. Stay in
+            the comment state. */
+            $this->token['data'] .= $char;
+        }
+    }
+
+    private function commentDashState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        /* U+002D HYPHEN-MINUS (-) */
+        if($char === '-') {
+            /* Switch to the comment end state  */
+            $this->state = 'commentEnd';
+
+        /* EOF */
+        } elseif($this->char === $this->EOF) {
+            /* Parse error. Emit the comment token. Reconsume the EOF character
+            in the data state. */
+            $this->emitToken($this->token);
+            $this->char--;
+            $this->state = 'data';
+
+        /* Anything else */
+        } else {
+            /* Append a U+002D HYPHEN-MINUS (-) character and the input
+            character to the comment token's data. Switch to the comment state. */
+            $this->token['data'] .= '-'.$char;
+            $this->state = 'comment';
+        }
+    }
+
+    private function commentEndState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        if($char === '>') {
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif($char === '-') {
+            $this->token['data'] .= '-';
+
+        } elseif($this->char === $this->EOF) {
+            $this->emitToken($this->token);
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            $this->token['data'] .= '--'.$char;
+            $this->state = 'comment';
+        }
+    }
+
+    private function doctypeState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            $this->state = 'beforeDoctypeName';
+
+        } else {
+            $this->char--;
+            $this->state = 'beforeDoctypeName';
+        }
+    }
+
+    private function beforeDoctypeNameState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            // Stay in the before DOCTYPE name state.
+
+        } elseif(preg_match('/^[a-z]$/', $char)) {
+            $this->token = array(
+                'name' => strtoupper($char),
+                'type' => self::DOCTYPE,
+                'error' => true
+            );
+
+            $this->state = 'doctypeName';
+
+        } elseif($char === '>') {
+            $this->emitToken(array(
+                'name' => null,
+                'type' => self::DOCTYPE,
+                'error' => true
+            ));
+
+            $this->state = 'data';
+
+        } elseif($this->char === $this->EOF) {
+            $this->emitToken(array(
+                'name' => null,
+                'type' => self::DOCTYPE,
+                'error' => true
+            ));
+
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            $this->token = array(
+                'name' => $char,
+                'type' => self::DOCTYPE,
+                'error' => true
+            );
+
+            $this->state = 'doctypeName';
+        }
+    }
+
+    private function doctypeNameState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            $this->state = 'AfterDoctypeName';
+
+        } elseif($char === '>') {
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif(preg_match('/^[a-z]$/', $char)) {
+            $this->token['name'] .= strtoupper($char);
+
+        } elseif($this->char === $this->EOF) {
+            $this->emitToken($this->token);
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            $this->token['name'] .= $char;
+        }
+
+        $this->token['error'] = ($this->token['name'] === 'HTML')
+            ? false
+            : true;
+    }
+
+    private function afterDoctypeNameState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+            // Stay in the DOCTYPE name state.
+
+        } elseif($char === '>') {
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif($this->char === $this->EOF) {
+            $this->emitToken($this->token);
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            $this->token['error'] = true;
+            $this->state = 'bogusDoctype';
+        }
+    }
+
+    private function bogusDoctypeState() {
+        /* Consume the next input character: */
+        $this->char++;
+        $char = $this->char();
+
+        if($char === '>') {
+            $this->emitToken($this->token);
+            $this->state = 'data';
+
+        } elseif($this->char === $this->EOF) {
+            $this->emitToken($this->token);
+            $this->char--;
+            $this->state = 'data';
+
+        } else {
+            // Stay in the bogus DOCTYPE state.
+        }
+    }
+
+    private function entity() {
+        $start = $this->char;
+
+        // This section defines how to consume an entity. This definition is
+        // used when parsing entities in text and in attributes.
+
+        // The behaviour depends on the identity of the next character (the
+        // one immediately after the U+0026 AMPERSAND character): 
+
+        switch($this->character($this->char + 1)) {
+            // U+0023 NUMBER SIGN (#)
+            case '#':
+
+                // The behaviour further depends on the character after the
+                // U+0023 NUMBER SIGN:
+                switch($this->character($this->char + 1)) {
+                    // U+0078 LATIN SMALL LETTER X
+                    // U+0058 LATIN CAPITAL LETTER X
+                    case 'x':
+                    case 'X':
+                        // Follow the steps below, but using the range of
+                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
+                        // NINE, U+0061 LATIN SMALL LETTER A through to U+0066
+                        // LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
+                        // A, through to U+0046 LATIN CAPITAL LETTER F (in other
+                        // words, 0-9, A-F, a-f).
+                        $char = 1;
+                        $char_class = '0-9A-Fa-f';
+                    break;
+
+                    // Anything else
+                    default:
+                        // Follow the steps below, but using the range of
+                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
+                        // NINE (i.e. just 0-9).
+                        $char = 0;
+                        $char_class = '0-9';
+                    break;
+                }
+
+                // Consume as many characters as match the range of characters
+                // given above.
+                $this->char++;
+                $e_name = $this->characters($char_class, $this->char + $char + 1);
+                $entity = $this->character($start, $this->char);
+                $cond = strlen($e_name) > 0;
+
+                // The rest of the parsing happens bellow.
+            break;
+
+            // Anything else
+            default:
+                // Consume the maximum number of characters possible, with the
+                // consumed characters case-sensitively matching one of the
+                // identifiers in the first column of the entities table.
+                $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
+                $len = strlen($e_name);
+
+                for($c = 1; $c <= $len; $c++) {
+                    $id = substr($e_name, 0, $c);
+                    $this->char++;
+
+                    if(in_array($id, $this->entities)) {
+                        if ($e_name[$c-1] !== ';') {
+                            if ($c < $len && $e_name[$c] == ';') {
+                                $this->char++; // consume extra semicolon
+                            }
+                        }
+                        $entity = $id;
+                        break;
+                    }
+                }
+
+                $cond = isset($entity);
+                // The rest of the parsing happens bellow.
+            break;
+        }
+
+        if(!$cond) {
+            // If no match can be made, then this is a parse error. No
+            // characters are consumed, and nothing is returned.
+            $this->char = $start;
+            return false;
+        }
+
+        // Return a character token for the character corresponding to the
+        // entity name (as given by the second column of the entities table).
+        return html_entity_decode('&'.$entity.';', ENT_QUOTES, 'UTF-8');
+    }
+
+    private function emitToken($token) {
+        $emit = $this->tree->emitToken($token);
+
+        if(is_int($emit)) {
+            $this->content_model = $emit;
+
+        } elseif($token['type'] === self::ENDTAG) {
+            $this->content_model = self::PCDATA;
+        }
+    }
+
+    private function EOF() {
+        $this->state = null;
+        $this->tree->emitToken(array(
+            'type' => self::EOF
+        ));
+    }
+}
+
+class HTML5TreeConstructer {
+    public $stack = array();
+
+    private $phase;
+    private $mode;
+    private $dom;
+    private $foster_parent = null;
+    private $a_formatting  = array();
+
+    private $head_pointer = null;
+    private $form_pointer = null;
+
+    private $scoping = array('button','caption','html','marquee','object','table','td','th');
+    private $formatting = array('a','b','big','em','font','i','nobr','s','small','strike','strong','tt','u');
+    private $special = array('address','area','base','basefont','bgsound',
+    'blockquote','body','br','center','col','colgroup','dd','dir','div','dl',
+    'dt','embed','fieldset','form','frame','frameset','h1','h2','h3','h4','h5',
+    'h6','head','hr','iframe','image','img','input','isindex','li','link',
+    'listing','menu','meta','noembed','noframes','noscript','ol','optgroup',
+    'option','p','param','plaintext','pre','script','select','spacer','style',
+    'tbody','textarea','tfoot','thead','title','tr','ul','wbr');
+
+    // The different phases.
+    const INIT_PHASE = 0;
+    const ROOT_PHASE = 1;
+    const MAIN_PHASE = 2;
+    const END_PHASE  = 3;
+
+    // The different insertion modes for the main phase.
+    const BEFOR_HEAD = 0;
+    const IN_HEAD    = 1;
+    const AFTER_HEAD = 2;
+    const IN_BODY    = 3;
+    const IN_TABLE   = 4;
+    const IN_CAPTION = 5;
+    const IN_CGROUP  = 6;
+    const IN_TBODY   = 7;
+    const IN_ROW     = 8;
+    const IN_CELL    = 9;
+    const IN_SELECT  = 10;
+    const AFTER_BODY = 11;
+    const IN_FRAME   = 12;
+    const AFTR_FRAME = 13;
+
+    // The different types of elements.
+    const SPECIAL    = 0;
+    const SCOPING    = 1;
+    const FORMATTING = 2;
+    const PHRASING   = 3;
+
+    const MARKER     = 0;
+
+    public function __construct() {
+        $this->phase = self::INIT_PHASE;
+        $this->mode = self::BEFOR_HEAD;
+        $this->dom = new DOMDocument;
+
+        $this->dom->encoding = 'UTF-8';
+        $this->dom->preserveWhiteSpace = true;
+        $this->dom->substituteEntities = true;
+        $this->dom->strictErrorChecking = false;
+    }
+
+    // Process tag tokens
+    public function emitToken($token) {
+        switch($this->phase) {
+            case self::INIT_PHASE: return $this->initPhase($token); break;
+            case self::ROOT_PHASE: return $this->rootElementPhase($token); break;
+            case self::MAIN_PHASE: return $this->mainPhase($token); break;
+            case self::END_PHASE : return $this->trailingEndPhase($token); break;
+        }
+    }
+
+    private function initPhase($token) {
+        /* Initially, the tree construction stage must handle each token
+        emitted from the tokenisation stage as follows: */
+
+        /* A DOCTYPE token that is marked as being in error
+        A comment token
+        A start tag token
+        An end tag token
+        A character token that is not one of one of U+0009 CHARACTER TABULATION,
+            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+            or U+0020 SPACE
+        An end-of-file token */
+        if((isset($token['error']) && $token['error']) ||
+        $token['type'] === HTML5::COMMENT ||
+        $token['type'] === HTML5::STARTTAG ||
+        $token['type'] === HTML5::ENDTAG ||
+        $token['type'] === HTML5::EOF ||
+        ($token['type'] === HTML5::CHARACTR && isset($token['data']) &&
+        !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data']))) {
+            /* This specification does not define how to handle this case. In
+            particular, user agents may ignore the entirety of this specification
+            altogether for such documents, and instead invoke special parse modes
+            with a greater emphasis on backwards compatibility. */
+
+            $this->phase = self::ROOT_PHASE;
+            return $this->rootElementPhase($token);
+
+        /* A DOCTYPE token marked as being correct */
+        } elseif(isset($token['error']) && !$token['error']) {
+            /* Append a DocumentType node to the Document  node, with the name
+            attribute set to the name given in the DOCTYPE token (which will be
+            "HTML"), and the other attributes specific to DocumentType objects
+            set to null, empty lists, or the empty string as appropriate. */
+            $doctype = new DOMDocumentType(null, null, 'HTML');
+
+            /* Then, switch to the root element phase of the tree construction
+            stage. */
+            $this->phase = self::ROOT_PHASE;
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        } elseif(isset($token['data']) && preg_match('/^[\t\n\x0b\x0c ]+$/',
+        $token['data'])) {
+            /* Append that character  to the Document node. */
+            $text = $this->dom->createTextNode($token['data']);
+            $this->dom->appendChild($text);
+        }
+    }
+
+    private function rootElementPhase($token) {
+        /* After the initial phase, as each token is emitted from the tokenisation
+        stage, it must be processed as described in this section. */
+
+        /* A DOCTYPE token */
+        if($token['type'] === HTML5::DOCTYPE) {
+            // Parse error. Ignore the token.
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the Document object with the data
+            attribute set to the data given in the comment token. */
+            $comment = $this->dom->createComment($token['data']);
+            $this->dom->appendChild($comment);
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        } elseif($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Append that character  to the Document node. */
+            $text = $this->dom->createTextNode($token['data']);
+            $this->dom->appendChild($text);
+
+        /* A character token that is not one of U+0009 CHARACTER TABULATION,
+            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED
+            (FF), or U+0020 SPACE
+        A start tag token
+        An end tag token
+        An end-of-file token */
+        } elseif(($token['type'] === HTML5::CHARACTR &&
+        !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
+        $token['type'] === HTML5::STARTTAG ||
+        $token['type'] === HTML5::ENDTAG ||
+        $token['type'] === HTML5::EOF) {
+            /* Create an HTMLElement node with the tag name html, in the HTML
+            namespace. Append it to the Document object. Switch to the main
+            phase and reprocess the current token. */
+            $html = $this->dom->createElement('html');
+            $this->dom->appendChild($html);
+            $this->stack[] = $html;
+
+            $this->phase = self::MAIN_PHASE;
+            return $this->mainPhase($token);
+        }
+    }
+
+    private function mainPhase($token) {
+        /* Tokens in the main phase must be handled as follows: */
+
+        /* A DOCTYPE token */
+        if($token['type'] === HTML5::DOCTYPE) {
+            // Parse error. Ignore the token.
+
+        /* A start tag token with the tag name "html" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'html') {
+            /* If this start tag token was not the first start tag token, then
+            it is a parse error. */
+
+            /* For each attribute on the token, check to see if the attribute
+            is already present on the top element of the stack of open elements.
+            If it is not, add the attribute and its corresponding value to that
+            element. */
+            foreach($token['attr'] as $attr) {
+                if(!$this->stack[0]->hasAttribute($attr['name'])) {
+                    $this->stack[0]->setAttribute($attr['name'], $attr['value']);
+                }
+            }
+
+        /* An end-of-file token */
+        } elseif($token['type'] === HTML5::EOF) {
+            /* Generate implied end tags. */
+            $this->generateImpliedEndTags();
+
+        /* Anything else. */
+        } else {
+            /* Depends on the insertion mode: */
+            switch($this->mode) {
+                case self::BEFOR_HEAD: return $this->beforeHead($token); break;
+                case self::IN_HEAD:    return $this->inHead($token); break;
+                case self::AFTER_HEAD: return $this->afterHead($token); break;
+                case self::IN_BODY:    return $this->inBody($token); break;
+                case self::IN_TABLE:   return $this->inTable($token); break;
+                case self::IN_CAPTION: return $this->inCaption($token); break;
+                case self::IN_CGROUP:  return $this->inColumnGroup($token); break;
+                case self::IN_TBODY:   return $this->inTableBody($token); break;
+                case self::IN_ROW:     return $this->inRow($token); break;
+                case self::IN_CELL:    return $this->inCell($token); break;
+                case self::IN_SELECT:  return $this->inSelect($token); break;
+                case self::AFTER_BODY: return $this->afterBody($token); break;
+                case self::IN_FRAME:   return $this->inFrameset($token); break;
+                case self::AFTR_FRAME: return $this->afterFrameset($token); break;
+                case self::END_PHASE:  return $this->trailingEndPhase($token); break;
+            }
+        }
+    }
+
+    private function beforeHead($token) {
+        /* Handle the token as follows: */
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        if($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Append the character to the current node. */
+            $this->insertText($token['data']);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data attribute
+            set to the data given in the comment token. */
+            $this->insertComment($token['data']);
+
+        /* A start tag token with the tag name "head" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') {
+            /* Create an element for the token, append the new element to the
+            current node and push it onto the stack of open elements. */
+            $element = $this->insertElement($token);
+
+            /* Set the head element pointer to this new element node. */
+            $this->head_pointer = $element;
+
+            /* Change the insertion mode to "in head". */
+            $this->mode = self::IN_HEAD;
+
+        /* A start tag token whose tag name is one of: "base", "link", "meta",
+        "script", "style", "title". Or an end tag with the tag name "html".
+        Or a character token that is not one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE. Or any other start tag token */
+        } elseif($token['type'] === HTML5::STARTTAG ||
+        ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
+        ($token['type'] === HTML5::CHARACTR && !preg_match('/^[\t\n\x0b\x0c ]$/',
+        $token['data']))) {
+            /* Act as if a start tag token with the tag name "head" and no
+            attributes had been seen, then reprocess the current token. */
+            $this->beforeHead(array(
+                'name' => 'head',
+                'type' => HTML5::STARTTAG,
+                'attr' => array()
+            ));
+
+            return $this->inHead($token);
+
+        /* Any other end tag */
+        } elseif($token['type'] === HTML5::ENDTAG) {
+            /* Parse error. Ignore the token. */
+        }
+    }
+
+    private function inHead($token) {
+        /* Handle the token as follows: */
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE.
+
+        THIS DIFFERS FROM THE SPEC: If the current node is either a title, style
+        or script element, append the character to the current node regardless
+        of its content. */
+        if(($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) || (
+        $token['type'] === HTML5::CHARACTR && in_array(end($this->stack)->nodeName,
+        array('title', 'style', 'script')))) {
+            /* Append the character to the current node. */
+            $this->insertText($token['data']);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data attribute
+            set to the data given in the comment token. */
+            $this->insertComment($token['data']);
+
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        in_array($token['name'], array('title', 'style', 'script'))) {
+            array_pop($this->stack);
+            return HTML5::PCDATA;
+
+        /* A start tag with the tag name "title" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'title') {
+            /* Create an element for the token and append the new element to the
+            node pointed to by the head element pointer, or, if that is null
+            (innerHTML case), to the current node. */
+            if($this->head_pointer !== null) {
+                $element = $this->insertElement($token, false);
+                $this->head_pointer->appendChild($element);
+
+            } else {
+                $element = $this->insertElement($token);
+            }
+
+            /* Switch the tokeniser's content model flag  to the RCDATA state. */
+            return HTML5::RCDATA;
+
+        /* A start tag with the tag name "style" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
+            /* Create an element for the token and append the new element to the
+            node pointed to by the head element pointer, or, if that is null
+            (innerHTML case), to the current node. */
+            if($this->head_pointer !== null) {
+                $element = $this->insertElement($token, false);
+                $this->head_pointer->appendChild($element);
+
+            } else {
+                $this->insertElement($token);
+            }
+
+            /* Switch the tokeniser's content model flag  to the CDATA state. */
+            return HTML5::CDATA;
+
+        /* A start tag with the tag name "script" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'script') {
+            /* Create an element for the token. */
+            $element = $this->insertElement($token, false);
+            $this->head_pointer->appendChild($element);
+
+            /* Switch the tokeniser's content model flag  to the CDATA state. */
+            return HTML5::CDATA;
+
+        /* A start tag with the tag name "base", "link", or "meta" */
+        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('base', 'link', 'meta'))) {
+            /* Create an element for the token and append the new element to the
+            node pointed to by the head element pointer, or, if that is null
+            (innerHTML case), to the current node. */
+            if($this->head_pointer !== null) {
+                $element = $this->insertElement($token, false);
+                $this->head_pointer->appendChild($element);
+                array_pop($this->stack);
+
+            } else {
+                $this->insertElement($token);
+            }
+
+        /* An end tag with the tag name "head" */
+        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
+            /* If the current node is a head element, pop the current node off
+            the stack of open elements. */
+            if($this->head_pointer->isSameNode(end($this->stack))) {
+                array_pop($this->stack);
+
+            /* Otherwise, this is a parse error. */
+            } else {
+                // k
+            }
+
+            /* Change the insertion mode to "after head". */
+            $this->mode = self::AFTER_HEAD;
+
+        /* A start tag with the tag name "head" or an end tag except "html". */
+        } elseif(($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
+        ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')) {
+            // Parse error. Ignore the token.
+
+        /* Anything else */
+        } else {
+            /* If the current node is a head element, act as if an end tag
+            token with the tag name "head" had been seen. */
+            if($this->head_pointer->isSameNode(end($this->stack))) {
+                $this->inHead(array(
+                    'name' => 'head',
+                    'type' => HTML5::ENDTAG
+                ));
+
+            /* Otherwise, change the insertion mode to "after head". */
+            } else {
+                $this->mode = self::AFTER_HEAD;
+            }
+
+            /* Then, reprocess the current token. */
+            return $this->afterHead($token);
+        }
+    }
+
+    private function afterHead($token) {
+        /* Handle the token as follows: */
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        if($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Append the character to the current node. */
+            $this->insertText($token['data']);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data attribute
+            set to the data given in the comment token. */
+            $this->insertComment($token['data']);
+
+        /* A start tag token with the tag name "body" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
+            /* Insert a body element for the token. */
+            $this->insertElement($token);
+
+            /* Change the insertion mode to "in body". */
+            $this->mode = self::IN_BODY;
+
+        /* A start tag token with the tag name "frameset" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
+            /* Insert a frameset element for the token. */
+            $this->insertElement($token);
+
+            /* Change the insertion mode to "in frameset". */
+            $this->mode = self::IN_FRAME;
+
+        /* A start tag token whose tag name is one of: "base", "link", "meta",
+        "script", "style", "title" */
+        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('base', 'link', 'meta', 'script', 'style', 'title'))) {
+            /* Parse error. Switch the insertion mode back to "in head" and
+            reprocess the token. */
+            $this->mode = self::IN_HEAD;
+            return $this->inHead($token);
+
+        /* Anything else */
+        } else {
+            /* Act as if a start tag token with the tag name "body" and no
+            attributes had been seen, and then reprocess the current token. */
+            $this->afterHead(array(
+                'name' => 'body',
+                'type' => HTML5::STARTTAG,
+                'attr' => array()
+            ));
+
+            return $this->inBody($token);
+        }
+    }
+
+    private function inBody($token) {
+        /* Handle the token as follows: */
+
+        switch($token['type']) {
+            /* A character token */
+            case HTML5::CHARACTR:
+                /* Reconstruct the active formatting elements, if any. */
+                $this->reconstructActiveFormattingElements();
+
+                /* Append the token's character to the current node. */
+                $this->insertText($token['data']);
+            break;
+
+            /* A comment token */
+            case HTML5::COMMENT:
+                /* Append a Comment node to the current node with the data
+                attribute set to the data given in the comment token. */
+                $this->insertComment($token['data']);
+            break;
+
+            case HTML5::STARTTAG:
+            switch($token['name']) {
+                /* A start tag token whose tag name is one of: "script",
+                "style" */
+                case 'script': case 'style':
+                    /* Process the token as if the insertion mode had been "in
+                    head". */
+                    return $this->inHead($token);
+                break;
+
+                /* A start tag token whose tag name is one of: "base", "link",
+                "meta", "title" */
+                case 'base': case 'link': case 'meta': case 'title':
+                    /* Parse error. Process the token as if the insertion mode
+                    had    been "in head". */
+                    return $this->inHead($token);
+                break;
+
+                /* A start tag token with the tag name "body" */
+                case 'body':
+                    /* Parse error. If the second element on the stack of open
+                    elements is not a body element, or, if the stack of open
+                    elements has only one node on it, then ignore the token.
+                    (innerHTML case) */
+                    if(count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
+                        // Ignore
+
+                    /* Otherwise, for each attribute on the token, check to see
+                    if the attribute is already present on the body element (the
+                    second element)    on the stack of open elements. If it is not,
+                    add the attribute and its corresponding value to that
+                    element. */
+                    } else {
+                        foreach($token['attr'] as $attr) {
+                            if(!$this->stack[1]->hasAttribute($attr['name'])) {
+                                $this->stack[1]->setAttribute($attr['name'], $attr['value']);
+                            }
+                        }
+                    }
+                break;
+
+                /* A start tag whose tag name is one of: "address",
+                "blockquote", "center", "dir", "div", "dl", "fieldset",
+                "listing", "menu", "ol", "p", "ul" */
+                case 'address': case 'blockquote': case 'center': case 'dir':
+                case 'div': case 'dl': case 'fieldset': case 'listing':
+                case 'menu': case 'ol': case 'p': case 'ul':
+                    /* If the stack of open elements has a p element in scope,
+                    then act as if an end tag with the tag name p had been
+                    seen. */
+                    if($this->elementInScope('p')) {
+                        $this->emitToken(array(
+                            'name' => 'p',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+                break;
+
+                /* A start tag whose tag name is "form" */
+                case 'form':
+                    /* If the form element pointer is not null, ignore the
+                    token with a parse error. */
+                    if($this->form_pointer !== null) {
+                        // Ignore.
+
+                    /* Otherwise: */
+                    } else {
+                        /* If the stack of open elements has a p element in
+                        scope, then act as if an end tag with the tag name p
+                        had been seen. */
+                        if($this->elementInScope('p')) {
+                            $this->emitToken(array(
+                                'name' => 'p',
+                                'type' => HTML5::ENDTAG
+                            ));
+                        }
+
+                        /* Insert an HTML element for the token, and set the
+                        form element pointer to point to the element created. */
+                        $element = $this->insertElement($token);
+                        $this->form_pointer = $element;
+                    }
+                break;
+
+                /* A start tag whose tag name is "li", "dd" or "dt" */
+                case 'li': case 'dd': case 'dt':
+                    /* If the stack of open elements has a p  element in scope,
+                    then act as if an end tag with the tag name p had been
+                    seen. */
+                    if($this->elementInScope('p')) {
+                        $this->emitToken(array(
+                            'name' => 'p',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+
+                    $stack_length = count($this->stack) - 1;
+
+                    for($n = $stack_length; 0 <= $n; $n--) {
+                        /* 1. Initialise node to be the current node (the
+                        bottommost node of the stack). */
+                        $stop = false;
+                        $node = $this->stack[$n];
+                        $cat  = $this->getElementCategory($node->tagName);
+
+                        /* 2. If node is an li, dd or dt element, then pop all
+                        the    nodes from the current node up to node, including
+                        node, then stop this algorithm. */
+                        if($token['name'] === $node->tagName ||    ($token['name'] !== 'li'
+                        && ($node->tagName === 'dd' || $node->tagName === 'dt'))) {
+                            for($x = $stack_length; $x >= $n ; $x--) {
+                                array_pop($this->stack);
+                            }
+
+                            break;
+                        }
+
+                        /* 3. If node is not in the formatting category, and is
+                        not    in the phrasing category, and is not an address or
+                        div element, then stop this algorithm. */
+                        if($cat !== self::FORMATTING && $cat !== self::PHRASING &&
+                        $node->tagName !== 'address' && $node->tagName !== 'div') {
+                            break;
+                        }
+                    }
+
+                    /* Finally, insert an HTML element with the same tag
+                    name as the    token's. */
+                    $this->insertElement($token);
+                break;
+
+                /* A start tag token whose tag name is "plaintext" */
+                case 'plaintext':
+                    /* If the stack of open elements has a p  element in scope,
+                    then act as if an end tag with the tag name p had been
+                    seen. */
+                    if($this->elementInScope('p')) {
+                        $this->emitToken(array(
+                            'name' => 'p',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    return HTML5::PLAINTEXT;
+                break;
+
+                /* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
+                "h5", "h6" */
+                case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
+                    /* If the stack of open elements has a p  element in scope,
+                    then act as if an end tag with the tag name p had been seen. */
+                    if($this->elementInScope('p')) {
+                        $this->emitToken(array(
+                            'name' => 'p',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+
+                    /* If the stack of open elements has in scope an element whose
+                    tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
+                    this is a parse error; pop elements from the stack until an
+                    element with one of those tag names has been popped from the
+                    stack. */
+                    while($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
+                        array_pop($this->stack);
+                    }
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+                break;
+
+                /* A start tag whose tag name is "a" */
+                case 'a':
+                    /* If the list of active formatting elements contains
+                    an element whose tag name is "a" between the end of the
+                    list and the last marker on the list (or the start of
+                    the list if there is no marker on the list), then this
+                    is a parse error; act as if an end tag with the tag name
+                    "a" had been seen, then remove that element from the list
+                    of active formatting elements and the stack of open
+                    elements if the end tag didn't already remove it (it
+                    might not have if the element is not in table scope). */
+                    $leng = count($this->a_formatting);
+
+                    for($n = $leng - 1; $n >= 0; $n--) {
+                        if($this->a_formatting[$n] === self::MARKER) {
+                            break;
+
+                        } elseif($this->a_formatting[$n]->nodeName === 'a') {
+                            $this->emitToken(array(
+                                'name' => 'a',
+                                'type' => HTML5::ENDTAG
+                            ));
+                            break;
+                        }
+                    }
+
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an HTML element for the token. */
+                    $el = $this->insertElement($token);
+
+                    /* Add that element to the list of active formatting
+                    elements. */
+                    $this->a_formatting[] = $el;
+                break;
+
+                /* A start tag whose tag name is one of: "b", "big", "em", "font",
+                "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
+                case 'b': case 'big': case 'em': case 'font': case 'i':
+                case 'nobr': case 's': case 'small': case 'strike':
+                case 'strong': case 'tt': case 'u':
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an HTML element for the token. */
+                    $el = $this->insertElement($token);
+
+                    /* Add that element to the list of active formatting
+                    elements. */
+                    $this->a_formatting[] = $el;
+                break;
+
+                /* A start tag token whose tag name is "button" */
+                case 'button':
+                    /* If the stack of open elements has a button element in scope,
+                    then this is a parse error; act as if an end tag with the tag
+                    name "button" had been seen, then reprocess the token. (We don't
+                    do that. Unnecessary.) */
+                    if($this->elementInScope('button')) {
+                        $this->inBody(array(
+                            'name' => 'button',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    /* Insert a marker at the end of the list of active
+                    formatting elements. */
+                    $this->a_formatting[] = self::MARKER;
+                break;
+
+                /* A start tag token whose tag name is one of: "marquee", "object" */
+                case 'marquee': case 'object':
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    /* Insert a marker at the end of the list of active
+                    formatting elements. */
+                    $this->a_formatting[] = self::MARKER;
+                break;
+
+                /* A start tag token whose tag name is "xmp" */
+                case 'xmp':
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    /* Switch the content model flag to the CDATA state. */
+                    return HTML5::CDATA;
+                break;
+
+                /* A start tag whose tag name is "table" */
+                case 'table':
+                    /* If the stack of open elements has a p element in scope,
+                    then act as if an end tag with the tag name p had been seen. */
+                    if($this->elementInScope('p')) {
+                        $this->emitToken(array(
+                            'name' => 'p',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    /* Change the insertion mode to "in table". */
+                    $this->mode = self::IN_TABLE;
+                break;
+
+                /* A start tag whose tag name is one of: "area", "basefont",
+                "bgsound", "br", "embed", "img", "param", "spacer", "wbr" */
+                case 'area': case 'basefont': case 'bgsound': case 'br':
+                case 'embed': case 'img': case 'param': case 'spacer':
+                case 'wbr':
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    /* Immediately pop the current node off the stack of open elements. */
+                    array_pop($this->stack);
+                break;
+
+                /* A start tag whose tag name is "hr" */
+                case 'hr':
+                    /* If the stack of open elements has a p element in scope,
+                    then act as if an end tag with the tag name p had been seen. */
+                    if($this->elementInScope('p')) {
+                        $this->emitToken(array(
+                            'name' => 'p',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    /* Immediately pop the current node off the stack of open elements. */
+                    array_pop($this->stack);
+                break;
+
+                /* A start tag whose tag name is "image" */
+                case 'image':
+                    /* Parse error. Change the token's tag name to "img" and
+                    reprocess it. (Don't ask.) */
+                    $token['name'] = 'img';
+                    return $this->inBody($token);
+                break;
+
+                /* A start tag whose tag name is "input" */
+                case 'input':
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an input element for the token. */
+                    $element = $this->insertElement($token, false);
+
+                    /* If the form element pointer is not null, then associate the
+                    input element with the form element pointed to by the form
+                    element pointer. */
+                    $this->form_pointer !== null
+                        ? $this->form_pointer->appendChild($element)
+                        : end($this->stack)->appendChild($element);
+
+                    /* Pop that input element off the stack of open elements. */
+                    array_pop($this->stack);
+                break;
+
+                /* A start tag whose tag name is "isindex" */
+                case 'isindex':
+                    /* Parse error. */
+                    // w/e
+
+                    /* If the form element pointer is not null,
+                    then ignore the token. */
+                    if($this->form_pointer === null) {
+                        /* Act as if a start tag token with the tag name "form" had
+                        been seen. */
+                        $this->inBody(array(
+                            'name' => 'body',
+                            'type' => HTML5::STARTTAG,
+                            'attr' => array()
+                        ));
+
+                        /* Act as if a start tag token with the tag name "hr" had
+                        been seen. */
+                        $this->inBody(array(
+                            'name' => 'hr',
+                            'type' => HTML5::STARTTAG,
+                            'attr' => array()
+                        ));
+
+                        /* Act as if a start tag token with the tag name "p" had
+                        been seen. */
+                        $this->inBody(array(
+                            'name' => 'p',
+                            'type' => HTML5::STARTTAG,
+                            'attr' => array()
+                        ));
+
+                        /* Act as if a start tag token with the tag name "label"
+                        had been seen. */
+                        $this->inBody(array(
+                            'name' => 'label',
+                            'type' => HTML5::STARTTAG,
+                            'attr' => array()
+                        ));
+
+                        /* Act as if a stream of character tokens had been seen. */
+                        $this->insertText('This is a searchable index. '.
+                        'Insert your search keywords here: ');
+
+                        /* Act as if a start tag token with the tag name "input"
+                        had been seen, with all the attributes from the "isindex"
+                        token, except with the "name" attribute set to the value
+                        "isindex" (ignoring any explicit "name" attribute). */
+                        $attr = $token['attr'];
+                        $attr[] = array('name' => 'name', 'value' => 'isindex');
+
+                        $this->inBody(array(
+                            'name' => 'input',
+                            'type' => HTML5::STARTTAG,
+                            'attr' => $attr
+                        ));
+
+                        /* Act as if a stream of character tokens had been seen
+                        (see below for what they should say). */
+                        $this->insertText('This is a searchable index. '.
+                        'Insert your search keywords here: ');
+
+                        /* Act as if an end tag token with the tag name "label"
+                        had been seen. */
+                        $this->inBody(array(
+                            'name' => 'label',
+                            'type' => HTML5::ENDTAG
+                        ));
+
+                        /* Act as if an end tag token with the tag name "p" had
+                        been seen. */
+                        $this->inBody(array(
+                            'name' => 'p',
+                            'type' => HTML5::ENDTAG
+                        ));
+
+                        /* Act as if a start tag token with the tag name "hr" had
+                        been seen. */
+                        $this->inBody(array(
+                            'name' => 'hr',
+                            'type' => HTML5::ENDTAG
+                        ));
+
+                        /* Act as if an end tag token with the tag name "form" had
+                        been seen. */
+                        $this->inBody(array(
+                            'name' => 'form',
+                            'type' => HTML5::ENDTAG
+                        ));
+                    }
+                break;
+
+                /* A start tag whose tag name is "textarea" */
+                case 'textarea':
+                    $this->insertElement($token);
+
+                    /* Switch the tokeniser's content model flag to the
+                    RCDATA state. */
+                    return HTML5::RCDATA;
+                break;
+
+                /* A start tag whose tag name is one of: "iframe", "noembed",
+                "noframes" */
+                case 'iframe': case 'noembed': case 'noframes':
+                    $this->insertElement($token);
+
+                    /* Switch the tokeniser's content model flag to the CDATA state. */
+                    return HTML5::CDATA;
+                break;
+
+                /* A start tag whose tag name is "select" */
+                case 'select':
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    /* Insert an HTML element for the token. */
+                    $this->insertElement($token);
+
+                    /* Change the insertion mode to "in select". */
+                    $this->mode = self::IN_SELECT;
+                break;
+
+                /* A start or end tag whose tag name is one of: "caption", "col",
+                "colgroup", "frame", "frameset", "head", "option", "optgroup",
+                "tbody", "td", "tfoot", "th", "thead", "tr". */
+                case 'caption': case 'col': case 'colgroup': case 'frame':
+                case 'frameset': case 'head': case 'option': case 'optgroup':
+                case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead':
+                case 'tr':
+                    // Parse error. Ignore the token.
+                break;
+
+                /* A start or end tag whose tag name is one of: "event-source",
+                "section", "nav", "article", "aside", "header", "footer",
+                "datagrid", "command" */
+                case 'event-source': case 'section': case 'nav': case 'article':
+                case 'aside': case 'header': case 'footer': case 'datagrid':
+                case 'command':
+                    // Work in progress!
+                break;
+
+                /* A start tag token not covered by the previous entries */
+                default:
+                    /* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    $this->insertElement($token, true, true);
+                break;
+            }
+            break;
+
+            case HTML5::ENDTAG:
+            switch($token['name']) {
+                /* An end tag with the tag name "body" */
+                case 'body':
+                    /* If the second element in the stack of open elements is
+                    not a body element, this is a parse error. Ignore the token.
+                    (innerHTML case) */
+                    if(count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
+                        // Ignore.
+
+                    /* If the current node is not the body element, then this
+                    is a parse error. */
+                    } elseif(end($this->stack)->nodeName !== 'body') {
+                        // Parse error.
+                    }
+
+                    /* Change the insertion mode to "after body". */
+                    $this->mode = self::AFTER_BODY;
+                break;
+
+                /* An end tag with the tag name "html" */
+                case 'html':
+                    /* Act as if an end tag with tag name "body" had been seen,
+                    then, if that token wasn't ignored, reprocess the current
+                    token. */
+                    $this->inBody(array(
+                        'name' => 'body',
+                        'type' => HTML5::ENDTAG
+                    ));
+
+                    return $this->afterBody($token);
+                break;
+
+                /* An end tag whose tag name is one of: "address", "blockquote",
+                "center", "dir", "div", "dl", "fieldset", "listing", "menu",
+                "ol", "pre", "ul" */
+                case 'address': case 'blockquote': case 'center': case 'dir':
+                case 'div': case 'dl': case 'fieldset': case 'listing':
+                case 'menu': case 'ol': case 'pre': case 'ul':
+                    /* If the stack of open elements has an element in scope
+                    with the same tag name as that of the token, then generate
+                    implied end tags. */
+                    if($this->elementInScope($token['name'])) {
+                        $this->generateImpliedEndTags();
+
+                        /* Now, if the current node is not an element with
+                        the same tag name as that of the token, then this
+                        is a parse error. */
+                        // w/e
+
+                        /* If the stack of open elements has an element in
+                        scope with the same tag name as that of the token,
+                        then pop elements from this stack until an element
+                        with that tag name has been popped from the stack. */
+                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if($this->stack[$n]->nodeName === $token['name']) {
+                                $n = -1;
+                            }
+
+                            array_pop($this->stack);
+                        }
+                    }
+                break;
+
+                /* An end tag whose tag name is "form" */
+                case 'form':
+                    /* If the stack of open elements has an element in scope
+                    with the same tag name as that of the token, then generate
+                    implied    end tags. */
+                    if($this->elementInScope($token['name'])) {
+                        $this->generateImpliedEndTags();
+
+                    } 
+
+                    if(end($this->stack)->nodeName !== $token['name']) {
+                        /* Now, if the current node is not an element with the
+                        same tag name as that of the token, then this is a parse
+                        error. */
+                        // w/e
+
+                    } else {
+                        /* Otherwise, if the current node is an element with
+                        the same tag name as that of the token pop that element
+                        from the stack. */
+                        array_pop($this->stack);
+                    }
+
+                    /* In any case, set the form element pointer to null. */
+                    $this->form_pointer = null;
+                break;
+
+                /* An end tag whose tag name is "p" */
+                case 'p':
+                    /* If the stack of open elements has a p element in scope,
+                    then generate implied end tags, except for p elements. */
+                    if($this->elementInScope('p')) {
+                        $this->generateImpliedEndTags(array('p'));
+
+                        /* If the current node is not a p element, then this is
+                        a parse error. */
+                        // k
+
+                        /* If the stack of open elements has a p element in
+                        scope, then pop elements from this stack until the stack
+                        no longer has a p element in scope. */
+                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if($this->elementInScope('p')) {
+                                array_pop($this->stack);
+
+                            } else {
+                                break;
+                            }
+                        }
+                    }
+                break;
+
+                /* An end tag whose tag name is "dd", "dt", or "li" */
+                case 'dd': case 'dt': case 'li':
+                    /* If the stack of open elements has an element in scope
+                    whose tag name matches the tag name of the token, then
+                    generate implied end tags, except for elements with the
+                    same tag name as the token. */
+                    if($this->elementInScope($token['name'])) {
+                        $this->generateImpliedEndTags(array($token['name']));
+
+                        /* If the current node is not an element with the same
+                        tag name as the token, then this is a parse error. */
+                        // w/e
+
+                        /* If the stack of open elements has an element in scope
+                        whose tag name matches the tag name of the token, then
+                        pop elements from this stack until an element with that
+                        tag name has been popped from the stack. */
+                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if($this->stack[$n]->nodeName === $token['name']) {
+                                $n = -1;
+                            }
+
+                            array_pop($this->stack);
+                        }
+                    }
+                break;
+
+                /* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
+                "h5", "h6" */
+                case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
+                    $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
+
+                    /* If the stack of open elements has in scope an element whose
+                    tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
+                    generate implied end tags. */
+                    if($this->elementInScope($elements)) {
+                        $this->generateImpliedEndTags();
+
+                        /* Now, if the current node is not an element with the same
+                        tag name as that of the token, then this is a parse error. */
+                        // w/e
+
+                        /* If the stack of open elements has in scope an element
+                        whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
+                        "h6", then pop elements from the stack until an element
+                        with one of those tag names has been popped from the stack. */
+                        while($this->elementInScope($elements)) {
+                            array_pop($this->stack);
+                        }
+                    }
+                break;
+
+                /* An end tag whose tag name is one of: "a", "b", "big", "em",
+                "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
+                case 'a': case 'b': case 'big': case 'em': case 'font':
+                case 'i': case 'nobr': case 's': case 'small': case 'strike':
+                case 'strong': case 'tt': case 'u':
+                    /* 1. Let the formatting element be the last element in
+                    the list of active formatting elements that:
+                        * is between the end of the list and the last scope
+                        marker in the list, if any, or the start of the list
+                        otherwise, and
+                        * has the same tag name as the token.
+                    */
+                    while(true) {
+                        for($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
+                            if($this->a_formatting[$a] === self::MARKER) {
+                                break;
+
+                            } elseif($this->a_formatting[$a]->tagName === $token['name']) {
+                                $formatting_element = $this->a_formatting[$a];
+                                $in_stack = in_array($formatting_element, $this->stack, true);
+                                $fe_af_pos = $a;
+                                break;
+                            }
+                        }
+
+                        /* If there is no such node, or, if that node is
+                        also in the stack of open elements but the element
+                        is not in scope, then this is a parse error. Abort
+                        these steps. The token is ignored. */
+                        if(!isset($formatting_element) || ($in_stack &&
+                        !$this->elementInScope($token['name']))) {
+                            break;
+
+                        /* Otherwise, if there is such a node, but that node
+                        is not in the stack of open elements, then this is a
+                        parse error; remove the element from the list, and
+                        abort these steps. */
+                        } elseif(isset($formatting_element) && !$in_stack) {
+                            unset($this->a_formatting[$fe_af_pos]);
+                            $this->a_formatting = array_merge($this->a_formatting);
+                            break;
+                        }
+
+                        /* 2. Let the furthest block be the topmost node in the
+                        stack of open elements that is lower in the stack
+                        than the formatting element, and is not an element in
+                        the phrasing or formatting categories. There might
+                        not be one. */
+                        $fe_s_pos = array_search($formatting_element, $this->stack, true);
+                        $length = count($this->stack);
+
+                        for($s = $fe_s_pos + 1; $s < $length; $s++) {
+                            $category = $this->getElementCategory($this->stack[$s]->nodeName);
+
+                            if($category !== self::PHRASING && $category !== self::FORMATTING) {
+                                $furthest_block = $this->stack[$s];
+                            }
+                        }
+
+                        /* 3. If there is no furthest block, then the UA must
+                        skip the subsequent steps and instead just pop all
+                        the nodes from the bottom of the stack of open
+                        elements, from the current node up to the formatting
+                        element, and remove the formatting element from the
+                        list of active formatting elements. */
+                        if(!isset($furthest_block)) {
+                            for($n = $length - 1; $n >= $fe_s_pos; $n--) {
+                                array_pop($this->stack);
+                            }
+
+                            unset($this->a_formatting[$fe_af_pos]);
+                            $this->a_formatting = array_merge($this->a_formatting);
+                            break;
+                        }
+
+                        /* 4. Let the common ancestor be the element
+                        immediately above the formatting element in the stack
+                        of open elements. */
+                        $common_ancestor = $this->stack[$fe_s_pos - 1];
+
+                        /* 5. If the furthest block has a parent node, then
+                        remove the furthest block from its parent node. */
+                        if($furthest_block->parentNode !== null) {
+                            $furthest_block->parentNode->removeChild($furthest_block);
+                        }
+
+                        /* 6. Let a bookmark note the position of the
+                        formatting element in the list of active formatting
+                        elements relative to the elements on either side
+                        of it in the list. */
+                        $bookmark = $fe_af_pos;
+
+                        /* 7. Let node and last node  be the furthest block.
+                        Follow these steps: */
+                        $node = $furthest_block;
+                        $last_node = $furthest_block;
+
+                        while(true) {
+                            for($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
+                                /* 7.1 Let node be the element immediately
+                                prior to node in the stack of open elements. */
+                                $node = $this->stack[$n];
+
+                                /* 7.2 If node is not in the list of active
+                                formatting elements, then remove node from
+                                the stack of open elements and then go back
+                                to step 1. */
+                                if(!in_array($node, $this->a_formatting, true)) {
+                                    unset($this->stack[$n]);
+                                    $this->stack = array_merge($this->stack);
+
+                                } else {
+                                    break;
+                                }
+                            }
+
+                            /* 7.3 Otherwise, if node is the formatting
+                            element, then go to the next step in the overall
+                            algorithm. */
+                            if($node === $formatting_element) {
+                                break;
+
+                            /* 7.4 Otherwise, if last node is the furthest
+                            block, then move the aforementioned bookmark to
+                            be immediately after the node in the list of
+                            active formatting elements. */
+                            } elseif($last_node === $furthest_block) {
+                                $bookmark = array_search($node, $this->a_formatting, true) + 1;
+                            }
+
+                            /* 7.5 If node has any children, perform a
+                            shallow clone of node, replace the entry for
+                            node in the list of active formatting elements
+                            with an entry for the clone, replace the entry
+                            for node in the stack of open elements with an
+                            entry for the clone, and let node be the clone. */
+                            if($node->hasChildNodes()) {
+                                $clone = $node->cloneNode();
+                                $s_pos = array_search($node, $this->stack, true);
+                                $a_pos = array_search($node, $this->a_formatting, true);
+
+                                $this->stack[$s_pos] = $clone;
+                                $this->a_formatting[$a_pos] = $clone;
+                                $node = $clone;
+                            }
+
+                            /* 7.6 Insert last node into node, first removing
+                            it from its previous parent node if any. */
+                            if($last_node->parentNode !== null) {
+                                $last_node->parentNode->removeChild($last_node);
+                            }
+
+                            $node->appendChild($last_node);
+
+                            /* 7.7 Let last node be node. */
+                            $last_node = $node;
+                        }
+
+                        /* 8. Insert whatever last node ended up being in
+                        the previous step into the common ancestor node,
+                        first removing it from its previous parent node if
+                        any. */
+                        if($last_node->parentNode !== null) {
+                            $last_node->parentNode->removeChild($last_node);
+                        }
+
+                        $common_ancestor->appendChild($last_node);
+
+                        /* 9. Perform a shallow clone of the formatting
+                        element. */
+                        $clone = $formatting_element->cloneNode();
+
+                        /* 10. Take all of the child nodes of the furthest
+                        block and append them to the clone created in the
+                        last step. */
+                        while($furthest_block->hasChildNodes()) {
+                            $child = $furthest_block->firstChild;
+                            $furthest_block->removeChild($child);
+                            $clone->appendChild($child);
+                        }
+
+                        /* 11. Append that clone to the furthest block. */
+                        $furthest_block->appendChild($clone);
+
+                        /* 12. Remove the formatting element from the list
+                        of active formatting elements, and insert the clone
+                        into the list of active formatting elements at the
+                        position of the aforementioned bookmark. */
+                        $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
+                        unset($this->a_formatting[$fe_af_pos]);
+                        $this->a_formatting = array_merge($this->a_formatting);
+
+                        $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
+                        $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
+                        $this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
+
+                        /* 13. Remove the formatting element from the stack
+                        of open elements, and insert the clone into the stack
+                        of open elements immediately after (i.e. in a more
+                        deeply nested position than) the position of the
+                        furthest block in that stack. */
+                        $fe_s_pos = array_search($formatting_element, $this->stack, true);
+                        $fb_s_pos = array_search($furthest_block, $this->stack, true);
+                        unset($this->stack[$fe_s_pos]);
+
+                        $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
+                        $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
+                        $this->stack = array_merge($s_part1, array($clone), $s_part2);
+
+                        /* 14. Jump back to step 1 in this series of steps. */
+                        unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
+                    }
+                break;
+
+                /* An end tag token whose tag name is one of: "button",
+                "marquee", "object" */
+                case 'button': case 'marquee': case 'object':
+                    /* If the stack of open elements has an element in scope whose
+                    tag name matches the tag name of the token, then generate implied
+                    tags. */
+                    if($this->elementInScope($token['name'])) {
+                        $this->generateImpliedEndTags();
+
+                        /* Now, if the current node is not an element with the same
+                        tag name as the token, then this is a parse error. */
+                        // k
+
+                        /* Now, if the stack of open elements has an element in scope
+                        whose tag name matches the tag name of the token, then pop
+                        elements from the stack until that element has been popped from
+                        the stack, and clear the list of active formatting elements up
+                        to the last marker. */
+                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if($this->stack[$n]->nodeName === $token['name']) {
+                                $n = -1;
+                            }
+
+                            array_pop($this->stack);
+                        }
+
+                        $marker = end(array_keys($this->a_formatting, self::MARKER, true));
+
+                        for($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
+                            array_pop($this->a_formatting);
+                        }
+                    }
+                break;
+
+                /* Or an end tag whose tag name is one of: "area", "basefont",
+                "bgsound", "br", "embed", "hr", "iframe", "image", "img",
+                "input", "isindex", "noembed", "noframes", "param", "select",
+                "spacer", "table", "textarea", "wbr" */
+                case 'area': case 'basefont': case 'bgsound': case 'br':
+                case 'embed': case 'hr': case 'iframe': case 'image':
+                case 'img': case 'input': case 'isindex': case 'noembed':
+                case 'noframes': case 'param': case 'select': case 'spacer':
+                case 'table': case 'textarea': case 'wbr':
+                    // Parse error. Ignore the token.
+                break;
+
+                /* An end tag token not covered by the previous entries */
+                default:
+                    for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                        /* Initialise node to be the current node (the bottommost
+                        node of the stack). */
+                        $node = end($this->stack);
+
+                        /* If node has the same tag name as the end tag token,
+                        then: */
+                        if($token['name'] === $node->nodeName) {
+                            /* Generate implied end tags. */
+                            $this->generateImpliedEndTags();
+
+                            /* If the tag name of the end tag token does not
+                            match the tag name of the current node, this is a
+                            parse error. */
+                            // k
+
+                            /* Pop all the nodes from the current node up to
+                            node, including node, then stop this algorithm. */
+                            for($x = count($this->stack) - $n; $x >= $n; $x--) {
+                                array_pop($this->stack);
+                            }
+                                    
+                        } else {
+                            $category = $this->getElementCategory($node);
+
+                            if($category !== self::SPECIAL && $category !== self::SCOPING) {
+                                /* Otherwise, if node is in neither the formatting
+                                category nor the phrasing category, then this is a
+                                parse error. Stop this algorithm. The end tag token
+                                is ignored. */
+                                return false;
+                            }
+                        }
+                    }
+                break;
+            }
+            break;
+        }
+    }
+
+    private function inTable($token) {
+        $clear = array('html', 'table');
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        if($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Append the character to the current node. */
+            $text = $this->dom->createTextNode($token['data']);
+            end($this->stack)->appendChild($text);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data
+            attribute set to the data given in the comment token. */
+            $comment = $this->dom->createComment($token['data']);
+            end($this->stack)->appendChild($comment);
+
+        /* A start tag whose tag name is "caption" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        $token['name'] === 'caption') {
+            /* Clear the stack back to a table context. */
+            $this->clearStackToTableContext($clear);
+
+            /* Insert a marker at the end of the list of active
+            formatting elements. */
+            $this->a_formatting[] = self::MARKER;
+
+            /* Insert an HTML element for the token, then switch the
+            insertion mode to "in caption". */
+            $this->insertElement($token);
+            $this->mode = self::IN_CAPTION;
+
+        /* A start tag whose tag name is "colgroup" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        $token['name'] === 'colgroup') {
+            /* Clear the stack back to a table context. */
+            $this->clearStackToTableContext($clear);
+
+            /* Insert an HTML element for the token, then switch the
+            insertion mode to "in column group". */
+            $this->insertElement($token);
+            $this->mode = self::IN_CGROUP;
+
+        /* A start tag whose tag name is "col" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        $token['name'] === 'col') {
+            $this->inTable(array(
+                'name' => 'colgroup',
+                'type' => HTML5::STARTTAG,
+                'attr' => array()
+            ));
+
+            $this->inColumnGroup($token);
+
+        /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
+        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('tbody', 'tfoot', 'thead'))) {
+            /* Clear the stack back to a table context. */
+            $this->clearStackToTableContext($clear);
+
+            /* Insert an HTML element for the token, then switch the insertion
+            mode to "in table body". */
+            $this->insertElement($token);
+            $this->mode = self::IN_TBODY;
+
+        /* A start tag whose tag name is one of: "td", "th", "tr" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        in_array($token['name'], array('td', 'th', 'tr'))) {
+            /* Act as if a start tag token with the tag name "tbody" had been
+            seen, then reprocess the current token. */
+            $this->inTable(array(
+                'name' => 'tbody',
+                'type' => HTML5::STARTTAG,
+                'attr' => array()
+            ));
+
+            return $this->inTableBody($token);
+
+        /* A start tag whose tag name is "table" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        $token['name'] === 'table') {
+            /* Parse error. Act as if an end tag token with the tag name "table"
+            had been seen, then, if that token wasn't ignored, reprocess the
+            current token. */
+            $this->inTable(array(
+                'name' => 'table',
+                'type' => HTML5::ENDTAG
+            ));
+
+            return $this->mainPhase($token);
+
+        /* An end tag whose tag name is "table" */
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        $token['name'] === 'table') {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as the token, this is a parse error.
+            Ignore the token. (innerHTML case) */
+            if(!$this->elementInScope($token['name'], true)) {
+                return false;
+
+            /* Otherwise: */
+            } else {
+                /* Generate implied end tags. */
+                $this->generateImpliedEndTags();
+
+                /* Now, if the current node is not a table element, then this
+                is a parse error. */
+                // w/e
+
+                /* Pop elements from this stack until a table element has been
+                popped from the stack. */
+                while(true) {
+                    $current = end($this->stack)->nodeName;
+                    array_pop($this->stack);
+
+                    if($current === 'table') {
+                        break;
+                    }
+                }
+
+                /* Reset the insertion mode appropriately. */
+                $this->resetInsertionMode();
+            }
+
+        /* An end tag whose tag name is one of: "body", "caption", "col",
+        "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
+        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+        array('body', 'caption', 'col', 'colgroup', 'html', 'tbody', 'td',
+        'tfoot', 'th', 'thead', 'tr'))) {
+            // Parse error. Ignore the token.
+
+        /* Anything else */
+        } else {
+            /* Parse error. Process the token as if the insertion mode was "in
+            body", with the following exception: */
+
+            /* If the current node is a table, tbody, tfoot, thead, or tr
+            element, then, whenever a node would be inserted into the current
+            node, it must instead be inserted into the foster parent element. */
+            if(in_array(end($this->stack)->nodeName,
+            array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
+                /* The foster parent element is the parent element of the last
+                table element in the stack of open elements, if there is a
+                table element and it has such a parent element. If there is no
+                table element in the stack of open elements (innerHTML case),
+                then the foster parent element is the first element in the
+                stack of open elements (the html  element). Otherwise, if there
+                is a table element in the stack of open elements, but the last
+                table element in the stack of open elements has no parent, or
+                its parent node is not an element, then the foster parent
+                element is the element before the last table element in the
+                stack of open elements. */
+                for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                    if($this->stack[$n]->nodeName === 'table') {
+                        $table = $this->stack[$n];
+                        break;
+                    }
+                }
+
+                if(isset($table) && $table->parentNode !== null) {
+                    $this->foster_parent = $table->parentNode;
+
+                } elseif(!isset($table)) {
+                    $this->foster_parent = $this->stack[0];
+
+                } elseif(isset($table) && ($table->parentNode === null ||
+                $table->parentNode->nodeType !== XML_ELEMENT_NODE)) {
+                    $this->foster_parent = $this->stack[$n - 1];
+                }
+            }
+
+            $this->inBody($token);
+        }
+    }
+
+    private function inCaption($token) {
+        /* An end tag whose tag name is "caption" */
+        if($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as the token, this is a parse error.
+            Ignore the token. (innerHTML case) */
+            if(!$this->elementInScope($token['name'], true)) {
+                // Ignore
+
+            /* Otherwise: */
+            } else {
+                /* Generate implied end tags. */
+                $this->generateImpliedEndTags();
+
+                /* Now, if the current node is not a caption element, then this
+                is a parse error. */
+                // w/e
+
+                /* Pop elements from this stack until a caption element has
+                been popped from the stack. */
+                while(true) {
+                    $node = end($this->stack)->nodeName;
+                    array_pop($this->stack);
+
+                    if($node === 'caption') {
+                        break;
+                    }
+                }
+
+                /* Clear the list of active formatting elements up to the last
+                marker. */
+                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
+
+                /* Switch the insertion mode to "in table". */
+                $this->mode = self::IN_TABLE;
+            }
+
+        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+        "tbody", "td", "tfoot", "th", "thead", "tr", or an end tag whose tag
+        name is "table" */
+        } elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+        'thead', 'tr'))) || ($token['type'] === HTML5::ENDTAG &&
+        $token['name'] === 'table')) {
+            /* Parse error. Act as if an end tag with the tag name "caption"
+            had been seen, then, if that token wasn't ignored, reprocess the
+            current token. */
+            $this->inCaption(array(
+                'name' => 'caption',
+                'type' => HTML5::ENDTAG
+            ));
+
+            return $this->inTable($token);
+
+        /* An end tag whose tag name is one of: "body", "col", "colgroup",
+        "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
+        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+        array('body', 'col', 'colgroup', 'html', 'tbody', 'tfoot', 'th',
+        'thead', 'tr'))) {
+            // Parse error. Ignore the token.
+
+        /* Anything else */
+        } else {
+            /* Process the token as if the insertion mode was "in body". */
+            $this->inBody($token);
+        }
+    }
+
+    private function inColumnGroup($token) {
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        if($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Append the character to the current node. */
+            $text = $this->dom->createTextNode($token['data']);
+            end($this->stack)->appendChild($text);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data
+            attribute set to the data given in the comment token. */
+            $comment = $this->dom->createComment($token['data']);
+            end($this->stack)->appendChild($comment);
+
+        /* A start tag whose tag name is "col" */
+        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'col') {
+            /* Insert a col element for the token. Immediately pop the current
+            node off the stack of open elements. */
+            $this->insertElement($token);
+            array_pop($this->stack);
+
+        /* An end tag whose tag name is "colgroup" */
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        $token['name'] === 'colgroup') {
+            /* If the current node is the root html element, then this is a
+            parse error, ignore the token. (innerHTML case) */
+            if(end($this->stack)->nodeName === 'html') {
+                // Ignore
+
+            /* Otherwise, pop the current node (which will be a colgroup
+            element) from the stack of open elements. Switch the insertion
+            mode to "in table". */
+            } else {
+                array_pop($this->stack);
+                $this->mode = self::IN_TABLE;
+            }
+
+        /* An end tag whose tag name is "col" */
+        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
+            /* Parse error. Ignore the token. */
+
+        /* Anything else */
+        } else {
+            /* Act as if an end tag with the tag name "colgroup" had been seen,
+            and then, if that token wasn't ignored, reprocess the current token. */
+            $this->inColumnGroup(array(
+                'name' => 'colgroup',
+                'type' => HTML5::ENDTAG
+            ));
+
+            return $this->inTable($token);
+        }
+    }
+
+    private function inTableBody($token) {
+        $clear = array('tbody', 'tfoot', 'thead', 'html');
+
+        /* A start tag whose tag name is "tr" */
+        if($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
+            /* Clear the stack back to a table body context. */
+            $this->clearStackToTableContext($clear);
+
+            /* Insert a tr element for the token, then switch the insertion
+            mode to "in row". */
+            $this->insertElement($token);
+            $this->mode = self::IN_ROW;
+
+        /* A start tag whose tag name is one of: "th", "td" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        ($token['name'] === 'th' ||    $token['name'] === 'td')) {
+            /* Parse error. Act as if a start tag with the tag name "tr" had
+            been seen, then reprocess the current token. */
+            $this->inTableBody(array(
+                'name' => 'tr',
+                'type' => HTML5::STARTTAG,
+                'attr' => array()
+            ));
+
+            return $this->inRow($token);
+
+        /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        in_array($token['name'], array('tbody', 'tfoot', 'thead'))) {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as the token, this is a parse error.
+            Ignore the token. */
+            if(!$this->elementInScope($token['name'], true)) {
+                // Ignore
+
+            /* Otherwise: */
+            } else {
+                /* Clear the stack back to a table body context. */
+                $this->clearStackToTableContext($clear);
+
+                /* Pop the current node from the stack of open elements. Switch
+                the insertion mode to "in table". */
+                array_pop($this->stack);
+                $this->mode = self::IN_TABLE;
+            }
+
+        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+        "tbody", "tfoot", "thead", or an end tag whose tag name is "table" */
+        } elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead'))) ||
+        ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')) {
+            /* If the stack of open elements does not have a tbody, thead, or
+            tfoot element in table scope, this is a parse error. Ignore the
+            token. (innerHTML case) */
+            if(!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
+                // Ignore.
+
+            /* Otherwise: */
+            } else {
+                /* Clear the stack back to a table body context. */
+                $this->clearStackToTableContext($clear);
+
+                /* Act as if an end tag with the same tag name as the current
+                node ("tbody", "tfoot", or "thead") had been seen, then
+                reprocess the current token. */
+                $this->inTableBody(array(
+                    'name' => end($this->stack)->nodeName,
+                    'type' => HTML5::ENDTAG
+                ));
+
+                return $this->mainPhase($token);
+            }
+
+        /* An end tag whose tag name is one of: "body", "caption", "col",
+        "colgroup", "html", "td", "th", "tr" */
+        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+        array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
+            /* Parse error. Ignore the token. */
+
+        /* Anything else */
+        } else {
+            /* Process the token as if the insertion mode was "in table". */
+            $this->inTable($token);
+        }
+    }
+
+    private function inRow($token) {
+        $clear = array('tr', 'html');
+
+        /* A start tag whose tag name is one of: "th", "td" */
+        if($token['type'] === HTML5::STARTTAG &&
+        ($token['name'] === 'th' || $token['name'] === 'td')) {
+            /* Clear the stack back to a table row context. */
+            $this->clearStackToTableContext($clear);
+
+            /* Insert an HTML element for the token, then switch the insertion
+            mode to "in cell". */
+            $this->insertElement($token);
+            $this->mode = self::IN_CELL;
+
+            /* Insert a marker at the end of the list of active formatting
+            elements. */
+            $this->a_formatting[] = self::MARKER;
+
+        /* An end tag whose tag name is "tr" */
+        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'tr') {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as the token, this is a parse error.
+            Ignore the token. (innerHTML case) */
+            if(!$this->elementInScope($token['name'], true)) {
+                // Ignore.
+
+            /* Otherwise: */
+            } else {
+                /* Clear the stack back to a table row context. */
+                $this->clearStackToTableContext($clear);
+
+                /* Pop the current node (which will be a tr element) from the
+                stack of open elements. Switch the insertion mode to "in table
+                body". */
+                array_pop($this->stack);
+                $this->mode = self::IN_TBODY;
+            }
+
+        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+        "tbody", "tfoot", "thead", "tr" or an end tag whose tag name is "table" */
+        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr'))) {
+            /* Act as if an end tag with the tag name "tr" had been seen, then,
+            if that token wasn't ignored, reprocess the current token. */
+            $this->inRow(array(
+                'name' => 'tr',
+                'type' => HTML5::ENDTAG
+            ));
+
+            return $this->inCell($token);
+
+        /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        in_array($token['name'], array('tbody', 'tfoot', 'thead'))) {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as the token, this is a parse error.
+            Ignore the token. */
+            if(!$this->elementInScope($token['name'], true)) {
+                // Ignore.
+
+            /* Otherwise: */
+            } else {
+                /* Otherwise, act as if an end tag with the tag name "tr" had
+                been seen, then reprocess the current token. */
+                $this->inRow(array(
+                    'name' => 'tr',
+                    'type' => HTML5::ENDTAG
+                ));
+
+                return $this->inCell($token);
+            }
+
+        /* An end tag whose tag name is one of: "body", "caption", "col",
+        "colgroup", "html", "td", "th" */
+        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+        array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
+            /* Parse error. Ignore the token. */
+
+        /* Anything else */
+        } else {
+            /* Process the token as if the insertion mode was "in table". */
+            $this->inTable($token);
+        }
+    }
+
+    private function inCell($token) {
+        /* An end tag whose tag name is one of: "td", "th" */
+        if($token['type'] === HTML5::ENDTAG &&
+        ($token['name'] === 'td' || $token['name'] === 'th')) {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as that of the token, then this is a
+            parse error and the token must be ignored. */
+            if(!$this->elementInScope($token['name'], true)) {
+                // Ignore.
+
+            /* Otherwise: */
+            } else {
+                /* Generate implied end tags, except for elements with the same
+                tag name as the token. */
+                $this->generateImpliedEndTags(array($token['name']));
+
+                /* Now, if the current node is not an element with the same tag
+                name as the token, then this is a parse error. */
+                // k
+
+                /* Pop elements from this stack until an element with the same
+                tag name as the token has been popped from the stack. */
+                while(true) {
+                    $node = end($this->stack)->nodeName;
+                    array_pop($this->stack);
+
+                    if($node === $token['name']) {
+                        break;
+                    }
+                }
+
+                /* Clear the list of active formatting elements up to the last
+                marker. */
+                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
+
+                /* Switch the insertion mode to "in row". (The current node
+                will be a tr element at this point.) */
+                $this->mode = self::IN_ROW;
+            }
+
+        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+        "tbody", "td", "tfoot", "th", "thead", "tr" */
+        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+        'thead', 'tr'))) {
+            /* If the stack of open elements does not have a td or th element
+            in table scope, then this is a parse error; ignore the token.
+            (innerHTML case) */
+            if(!$this->elementInScope(array('td', 'th'), true)) {
+                // Ignore.
+
+            /* Otherwise, close the cell (see below) and reprocess the current
+            token. */
+            } else {
+                $this->closeCell();
+                return $this->inRow($token);
+            }
+
+        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+        "tbody", "td", "tfoot", "th", "thead", "tr" */
+        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+        'thead', 'tr'))) {
+            /* If the stack of open elements does not have a td or th element
+            in table scope, then this is a parse error; ignore the token.
+            (innerHTML case) */
+            if(!$this->elementInScope(array('td', 'th'), true)) {
+                // Ignore.
+
+            /* Otherwise, close the cell (see below) and reprocess the current
+            token. */
+            } else {
+                $this->closeCell();
+                return $this->inRow($token);
+            }
+
+        /* An end tag whose tag name is one of: "body", "caption", "col",
+        "colgroup", "html" */
+        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+        array('body', 'caption', 'col', 'colgroup', 'html'))) {
+            /* Parse error. Ignore the token. */
+
+        /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
+        "thead", "tr" */
+        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+        array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as that of the token (which can only
+            happen for "tbody", "tfoot" and "thead", or, in the innerHTML case),
+            then this is a parse error and the token must be ignored. */
+            if(!$this->elementInScope($token['name'], true)) {
+                // Ignore.
+
+            /* Otherwise, close the cell (see below) and reprocess the current
+            token. */
+            } else {
+                $this->closeCell();
+                return $this->inRow($token);
+            }
+
+        /* Anything else */
+        } else {
+            /* Process the token as if the insertion mode was "in body". */
+            $this->inBody($token);
+        }
+    }
+
+    private function inSelect($token) {
+        /* Handle the token as follows: */
+
+        /* A character token */
+        if($token['type'] === HTML5::CHARACTR) {
+            /* Append the token's character to the current node. */
+            $this->insertText($token['data']);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data
+            attribute set to the data given in the comment token. */
+            $this->insertComment($token['data']);
+
+        /* A start tag token whose tag name is "option" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        $token['name'] === 'option') {
+            /* If the current node is an option element, act as if an end tag
+            with the tag name "option" had been seen. */
+            if(end($this->stack)->nodeName === 'option') {
+                $this->inSelect(array(
+                    'name' => 'option',
+                    'type' => HTML5::ENDTAG
+                ));
+            }
+
+            /* Insert an HTML element for the token. */
+            $this->insertElement($token);
+
+        /* A start tag token whose tag name is "optgroup" */
+        } elseif($token['type'] === HTML5::STARTTAG &&
+        $token['name'] === 'optgroup') {
+            /* If the current node is an option element, act as if an end tag
+            with the tag name "option" had been seen. */
+            if(end($this->stack)->nodeName === 'option') {
+                $this->inSelect(array(
+                    'name' => 'option',
+                    'type' => HTML5::ENDTAG
+                ));
+            }
+
+            /* If the current node is an optgroup element, act as if an end tag
+            with the tag name "optgroup" had been seen. */
+            if(end($this->stack)->nodeName === 'optgroup') {
+                $this->inSelect(array(
+                    'name' => 'optgroup',
+                    'type' => HTML5::ENDTAG
+                ));
+            }
+
+            /* Insert an HTML element for the token. */
+            $this->insertElement($token);
+
+        /* An end tag token whose tag name is "optgroup" */
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        $token['name'] === 'optgroup') {
+            /* First, if the current node is an option element, and the node
+            immediately before it in the stack of open elements is an optgroup
+            element, then act as if an end tag with the tag name "option" had
+            been seen. */
+            $elements_in_stack = count($this->stack);
+
+            if($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
+            $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup') {
+                $this->inSelect(array(
+                    'name' => 'option',
+                    'type' => HTML5::ENDTAG
+                ));
+            }
+
+            /* If the current node is an optgroup element, then pop that node
+            from the stack of open elements. Otherwise, this is a parse error,
+            ignore the token. */
+            if($this->stack[$elements_in_stack - 1] === 'optgroup') {
+                array_pop($this->stack);
+            }
+
+        /* An end tag token whose tag name is "option" */
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        $token['name'] === 'option') {
+            /* If the current node is an option element, then pop that node
+            from the stack of open elements. Otherwise, this is a parse error,
+            ignore the token. */
+            if(end($this->stack)->nodeName === 'option') {
+                array_pop($this->stack);
+            }
+
+        /* An end tag whose tag name is "select" */
+        } elseif($token['type'] === HTML5::ENDTAG &&
+        $token['name'] === 'select') {
+            /* If the stack of open elements does not have an element in table
+            scope with the same tag name as the token, this is a parse error.
+            Ignore the token. (innerHTML case) */
+            if(!$this->elementInScope($token['name'], true)) {
+                // w/e
+
+            /* Otherwise: */
+            } else {
+                /* Pop elements from the stack of open elements until a select
+                element has been popped from the stack. */
+                while(true) {
+                    $current = end($this->stack)->nodeName;
+                    array_pop($this->stack);
+
+                    if($current === 'select') {
+                        break;
+                    }
+                }
+
+                /* Reset the insertion mode appropriately. */
+                $this->resetInsertionMode();
+            }
+
+        /* A start tag whose tag name is "select" */
+        } elseif($token['name'] === 'select' &&
+        $token['type'] === HTML5::STARTTAG) {
+            /* Parse error. Act as if the token had been an end tag with the
+            tag name "select" instead. */
+            $this->inSelect(array(
+                'name' => 'select',
+                'type' => HTML5::ENDTAG
+            ));
+
+        /* An end tag whose tag name is one of: "caption", "table", "tbody",
+        "tfoot", "thead", "tr", "td", "th" */
+        } elseif(in_array($token['name'], array('caption', 'table', 'tbody',
+        'tfoot', 'thead', 'tr', 'td', 'th')) && $token['type'] === HTML5::ENDTAG) {
+            /* Parse error. */
+            // w/e
+
+            /* If the stack of open elements has an element in table scope with
+            the same tag name as that of the token, then act as if an end tag
+            with the tag name "select" had been seen, and reprocess the token.
+            Otherwise, ignore the token. */
+            if($this->elementInScope($token['name'], true)) {
+                $this->inSelect(array(
+                    'name' => 'select',
+                    'type' => HTML5::ENDTAG
+                ));
+
+                $this->mainPhase($token);
+            }
+
+        /* Anything else */
+        } else {
+            /* Parse error. Ignore the token. */
+        }
+    }
+
+    private function afterBody($token) {
+        /* Handle the token as follows: */
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        if($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Process the token as it would be processed if the insertion mode
+            was "in body". */
+            $this->inBody($token);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the first element in the stack of open
+            elements (the html element), with the data attribute set to the
+            data given in the comment token. */
+            $comment = $this->dom->createComment($token['data']);
+            $this->stack[0]->appendChild($comment);
+
+        /* An end tag with the tag name "html" */
+        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') {
+            /* If the parser was originally created in order to handle the
+            setting of an element's innerHTML attribute, this is a parse error;
+            ignore the token. (The element will be an html element in this
+            case.) (innerHTML case) */
+
+            /* Otherwise, switch to the trailing end phase. */
+            $this->phase = self::END_PHASE;
+
+        /* Anything else */
+        } else {
+            /* Parse error. Set the insertion mode to "in body" and reprocess
+            the token. */
+            $this->mode = self::IN_BODY;
+            return $this->inBody($token);
+        }
+    }
+
+    private function inFrameset($token) {
+        /* Handle the token as follows: */
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
+        if($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Append the character to the current node. */
+            $this->insertText($token['data']);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data
+            attribute set to the data given in the comment token. */
+            $this->insertComment($token['data']);
+
+        /* A start tag with the tag name "frameset" */
+        } elseif($token['name'] === 'frameset' &&
+        $token['type'] === HTML5::STARTTAG) {
+            $this->insertElement($token);
+
+        /* An end tag with the tag name "frameset" */
+        } elseif($token['name'] === 'frameset' &&
+        $token['type'] === HTML5::ENDTAG) {
+            /* If the current node is the root html element, then this is a
+            parse error; ignore the token. (innerHTML case) */
+            if(end($this->stack)->nodeName === 'html') {
+                // Ignore
+
+            } else {
+                /* Otherwise, pop the current node from the stack of open
+                elements. */
+                array_pop($this->stack);
+
+                /* If the parser was not originally created in order to handle
+                the setting of an element's innerHTML attribute (innerHTML case),
+                and the current node is no longer a frameset element, then change
+                the insertion mode to "after frameset". */
+                $this->mode = self::AFTR_FRAME;
+            }
+
+        /* A start tag with the tag name "frame" */
+        } elseif($token['name'] === 'frame' &&
+        $token['type'] === HTML5::STARTTAG) {
+            /* Insert an HTML element for the token. */
+            $this->insertElement($token);
+
+            /* Immediately pop the current node off the stack of open elements. */
+            array_pop($this->stack);
+
+        /* A start tag with the tag name "noframes" */
+        } elseif($token['name'] === 'noframes' &&
+        $token['type'] === HTML5::STARTTAG) {
+            /* Process the token as if the insertion mode had been "in body". */
+            $this->inBody($token);
+
+        /* Anything else */
+        } else {
+            /* Parse error. Ignore the token. */
+        }
+    }
+
+    private function afterFrameset($token) {
+        /* Handle the token as follows: */
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
+        if($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Append the character to the current node. */
+            $this->insertText($token['data']);
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the current node with the data
+            attribute set to the data given in the comment token. */
+            $this->insertComment($token['data']);
+
+        /* An end tag with the tag name "html" */
+        } elseif($token['name'] === 'html' &&
+        $token['type'] === HTML5::ENDTAG) {
+            /* Switch to the trailing end phase. */
+            $this->phase = self::END_PHASE;
+
+        /* A start tag with the tag name "noframes" */
+        } elseif($token['name'] === 'noframes' &&
+        $token['type'] === HTML5::STARTTAG) {
+            /* Process the token as if the insertion mode had been "in body". */
+            $this->inBody($token);
+
+        /* Anything else */
+        } else {
+            /* Parse error. Ignore the token. */
+        }
+    }
+
+    private function trailingEndPhase($token) {
+        /* After the main phase, as each token is emitted from the tokenisation
+        stage, it must be processed as described in this section. */
+
+        /* A DOCTYPE token */
+        if($token['type'] === HTML5::DOCTYPE) {
+            // Parse error. Ignore the token.
+
+        /* A comment token */
+        } elseif($token['type'] === HTML5::COMMENT) {
+            /* Append a Comment node to the Document object with the data
+            attribute set to the data given in the comment token. */
+            $comment = $this->dom->createComment($token['data']);
+            $this->dom->appendChild($comment);
+
+        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE */
+        } elseif($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+            /* Process the token as it would be processed in the main phase. */
+            $this->mainPhase($token);
+
+        /* A character token that is not one of U+0009 CHARACTER TABULATION,
+        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
+        or U+0020 SPACE. Or a start tag token. Or an end tag token. */
+        } elseif(($token['type'] === HTML5::CHARACTR &&
+        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
+        $token['type'] === HTML5::STARTTAG || $token['type'] === HTML5::ENDTAG) {
+            /* Parse error. Switch back to the main phase and reprocess the
+            token. */
+            $this->phase = self::MAIN_PHASE;
+            return $this->mainPhase($token);
+
+        /* An end-of-file token */
+        } elseif($token['type'] === HTML5::EOF) {
+            /* OMG DONE!! */
+        }
+    }
+
+    private function insertElement($token, $append = true, $check = false) {
+        // Proprietary workaround for libxml2's limitations with tag names
+        if ($check) {
+            // Slightly modified HTML5 tag-name modification,
+            // removing anything that's not an ASCII letter, digit, or hyphen
+            $token['name'] = preg_replace('/[^a-z0-9-]/i', '', $token['name']);
+            // Remove leading hyphens and numbers
+            $token['name'] = ltrim($token['name'], '-0..9');
+            // In theory, this should ever be needed, but just in case
+            if ($token['name'] === '') $token['name'] = 'span'; // arbitrary generic choice
+        }
+        
+        $el = $this->dom->createElement($token['name']);
+
+        foreach($token['attr'] as $attr) {
+            if(!$el->hasAttribute($attr['name'])) {
+                $el->setAttribute($attr['name'], $attr['value']);
+            }
+        }
+
+        $this->appendToRealParent($el);
+        $this->stack[] = $el;
+
+        return $el;
+    }
+
+    private function insertText($data) {
+        $text = $this->dom->createTextNode($data);
+        $this->appendToRealParent($text);
+    }
+
+    private function insertComment($data) {
+        $comment = $this->dom->createComment($data);
+        $this->appendToRealParent($comment);
+    }
+
+    private function appendToRealParent($node) {
+        if($this->foster_parent === null) {
+            end($this->stack)->appendChild($node);
+
+        } elseif($this->foster_parent !== null) {
+            /* If the foster parent element is the parent element of the
+            last table element in the stack of open elements, then the new
+            node must be inserted immediately before the last table element
+            in the stack of open elements in the foster parent element;
+            otherwise, the new node must be appended to the foster parent
+            element. */
+            for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                if($this->stack[$n]->nodeName === 'table' &&
+                $this->stack[$n]->parentNode !== null) {
+                    $table = $this->stack[$n];
+                    break;
+                }
+            }
+
+            if(isset($table) && $this->foster_parent->isSameNode($table->parentNode))
+                $this->foster_parent->insertBefore($node, $table);
+            else
+                $this->foster_parent->appendChild($node);
+
+            $this->foster_parent = null;
+        }
+    }
+
+    private function elementInScope($el, $table = false) {
+        if(is_array($el)) {
+            foreach($el as $element) {
+                if($this->elementInScope($element, $table)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        $leng = count($this->stack);
+
+        for($n = 0; $n < $leng; $n++) {
+            /* 1. Initialise node to be the current node (the bottommost node of
+            the stack). */
+            $node = $this->stack[$leng - 1 - $n];
+
+            if($node->tagName === $el) {
+                /* 2. If node is the target node, terminate in a match state. */
+                return true;
+
+            } elseif($node->tagName === 'table') {
+                /* 3. Otherwise, if node is a table element, terminate in a failure
+                state. */
+                return false;
+
+            } elseif($table === true && in_array($node->tagName, array('caption', 'td',
+            'th', 'button', 'marquee', 'object'))) {
+                /* 4. Otherwise, if the algorithm is the "has an element in scope"
+                variant (rather than the "has an element in table scope" variant),
+                and node is one of the following, terminate in a failure state. */
+                return false;
+
+            } elseif($node === $node->ownerDocument->documentElement) {
+                /* 5. Otherwise, if node is an html element (root element), terminate
+                in a failure state. (This can only happen if the node is the topmost
+                node of the    stack of open elements, and prevents the next step from
+                being invoked if there are no more elements in the stack.) */
+                return false;
+            }
+
+            /* Otherwise, set node to the previous entry in the stack of open
+            elements and return to step 2. (This will never fail, since the loop
+            will always terminate in the previous step if the top of the stack
+            is reached.) */
+        }
+    }
+
+    private function reconstructActiveFormattingElements() {
+        /* 1. If there are no entries in the list of active formatting elements,
+        then there is nothing to reconstruct; stop this algorithm. */
+        $formatting_elements = count($this->a_formatting);
+
+        if($formatting_elements === 0) {
+            return false;
+        }
+
+        /* 3. Let entry be the last (most recently added) element in the list
+        of active formatting elements. */
+        $entry = end($this->a_formatting);
+
+        /* 2. If the last (most recently added) entry in the list of active
+        formatting elements is a marker, or if it is an element that is in the
+        stack of open elements, then there is nothing to reconstruct; stop this
+        algorithm. */
+        if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+            return false;
+        }
+
+        for($a = $formatting_elements - 1; $a >= 0; true) {
+            /* 4. If there are no entries before entry in the list of active
+            formatting elements, then jump to step 8. */
+            if($a === 0) {
+                $step_seven = false;
+                break;
+            }
+
+            /* 5. Let entry be the entry one earlier than entry in the list of
+            active formatting elements. */
+            $a--;
+            $entry = $this->a_formatting[$a];
+
+            /* 6. If entry is neither a marker nor an element that is also in
+            thetack of open elements, go to step 4. */
+            if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+                break;
+            }
+        }
+
+        while(true) {
+            /* 7. Let entry be the element one later than entry in the list of
+            active formatting elements. */
+            if(isset($step_seven) && $step_seven === true) {
+                $a++;
+                $entry = $this->a_formatting[$a];
+            }
+
+            /* 8. Perform a shallow clone of the element entry to obtain clone. */
+            $clone = $entry->cloneNode();
+
+            /* 9. Append clone to the current node and push it onto the stack
+            of open elements  so that it is the new current node. */
+            end($this->stack)->appendChild($clone);
+            $this->stack[] = $clone;
+
+            /* 10. Replace the entry for entry in the list with an entry for
+            clone. */
+            $this->a_formatting[$a] = $clone;
+
+            /* 11. If the entry for clone in the list of active formatting
+            elements is not the last entry in the list, return to step 7. */
+            if(end($this->a_formatting) !== $clone) {
+                $step_seven = true;
+            } else {
+                break;
+            }
+        }
+    }
+
+    private function clearTheActiveFormattingElementsUpToTheLastMarker() {
+        /* When the steps below require the UA to clear the list of active
+        formatting elements up to the last marker, the UA must perform the
+        following steps: */
+
+        while(true) {
+            /* 1. Let entry be the last (most recently added) entry in the list
+            of active formatting elements. */
+            $entry = end($this->a_formatting);
+
+            /* 2. Remove entry from the list of active formatting elements. */
+            array_pop($this->a_formatting);
+
+            /* 3. If entry was a marker, then stop the algorithm at this point.
+            The list has been cleared up to the last marker. */
+            if($entry === self::MARKER) {
+                break;
+            }
+        }
+    }
+
+    private function generateImpliedEndTags($exclude = array()) {
+        /* When the steps below require the UA to generate implied end tags,
+        then, if the current node is a dd element, a dt element, an li element,
+        a p element, a td element, a th  element, or a tr element, the UA must
+        act as if an end tag with the respective tag name had been seen and
+        then generate implied end tags again. */
+        $node = end($this->stack);
+        $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
+
+        while(in_array(end($this->stack)->nodeName, $elements)) {
+            array_pop($this->stack);
+        }
+    }
+
+    private function getElementCategory($node) {
+        $name = $node->tagName;
+        if(in_array($name, $this->special))
+            return self::SPECIAL;
+
+        elseif(in_array($name, $this->scoping))
+            return self::SCOPING;
+
+        elseif(in_array($name, $this->formatting))
+            return self::FORMATTING;
+
+        else
+            return self::PHRASING;
+    }
+
+    private function clearStackToTableContext($elements) {
+        /* When the steps above require the UA to clear the stack back to a
+        table context, it means that the UA must, while the current node is not
+        a table element or an html element, pop elements from the stack of open
+        elements. If this causes any elements to be popped from the stack, then
+        this is a parse error. */
+        while(true) {
+            $node = end($this->stack)->nodeName;
+
+            if(in_array($node, $elements)) {
+                break;
+            } else {
+                array_pop($this->stack);
+            }
+        }
+    }
+
+    private function resetInsertionMode() {
+        /* 1. Let last be false. */
+        $last = false;
+        $leng = count($this->stack);
+
+        for($n = $leng - 1; $n >= 0; $n--) {
+            /* 2. Let node be the last node in the stack of open elements. */
+            $node = $this->stack[$n];
+
+            /* 3. If node is the first node in the stack of open elements, then
+            set last to true. If the element whose innerHTML  attribute is being
+            set is neither a td  element nor a th element, then set node to the
+            element whose innerHTML  attribute is being set. (innerHTML  case) */
+            if($this->stack[0]->isSameNode($node)) {
+                $last = true;
+            }
+
+            /* 4. If node is a select element, then switch the insertion mode to
+            "in select" and abort these steps. (innerHTML case) */
+            if($node->nodeName === 'select') {
+                $this->mode = self::IN_SELECT;
+                break;
+
+            /* 5. If node is a td or th element, then switch the insertion mode
+            to "in cell" and abort these steps. */
+            } elseif($node->nodeName === 'td' || $node->nodeName === 'th') {
+                $this->mode = self::IN_CELL;
+                break;
+
+            /* 6. If node is a tr element, then switch the insertion mode to
+            "in    row" and abort these steps. */
+            } elseif($node->nodeName === 'tr') {
+                $this->mode = self::IN_ROW;
+                break;
+
+            /* 7. If node is a tbody, thead, or tfoot element, then switch the
+            insertion mode to "in table body" and abort these steps. */
+            } elseif(in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
+                $this->mode = self::IN_TBODY;
+                break;
+
+            /* 8. If node is a caption element, then switch the insertion mode
+            to "in caption" and abort these steps. */
+            } elseif($node->nodeName === 'caption') {
+                $this->mode = self::IN_CAPTION;
+                break;
+
+            /* 9. If node is a colgroup element, then switch the insertion mode
+            to "in column group" and abort these steps. (innerHTML case) */
+            } elseif($node->nodeName === 'colgroup') {
+                $this->mode = self::IN_CGROUP;
+                break;
+
+            /* 10. If node is a table element, then switch the insertion mode
+            to "in table" and abort these steps. */
+            } elseif($node->nodeName === 'table') {
+                $this->mode = self::IN_TABLE;
+                break;
+
+            /* 11. If node is a head element, then switch the insertion mode
+            to "in body" ("in body"! not "in head"!) and abort these steps.
+            (innerHTML case) */
+            } elseif($node->nodeName === 'head') {
+                $this->mode = self::IN_BODY;
+                break;
+
+            /* 12. If node is a body element, then switch the insertion mode to
+            "in body" and abort these steps. */
+            } elseif($node->nodeName === 'body') {
+                $this->mode = self::IN_BODY;
+                break;
+
+            /* 13. If node is a frameset element, then switch the insertion
+            mode to "in frameset" and abort these steps. (innerHTML case) */
+            } elseif($node->nodeName === 'frameset') {
+                $this->mode = self::IN_FRAME;
+                break;
+
+            /* 14. If node is an html element, then: if the head element
+            pointer is null, switch the insertion mode to "before head",
+            otherwise, switch the insertion mode to "after head". In either
+            case, abort these steps. (innerHTML case) */
+            } elseif($node->nodeName === 'html') {
+                $this->mode = ($this->head_pointer === null)
+                    ? self::BEFOR_HEAD
+                    : self::AFTER_HEAD;
+
+                break;
+
+            /* 15. If last is true, then set the insertion mode to "in body"
+            and    abort these steps. (innerHTML case) */
+            } elseif($last) {
+                $this->mode = self::IN_BODY;
+                break;
+            }
+        }
+    }
+
+    private function closeCell() {
+        /* If the stack of open elements has a td or th element in table scope,
+        then act as if an end tag token with that tag name had been seen. */
+        foreach(array('td', 'th') as $cell) {
+            if($this->elementInScope($cell, true)) {
+                $this->inCell(array(
+                    'name' => $cell,
+                    'type' => HTML5::ENDTAG
+                ));
+
+                break;
+            }
+        }
+    }
+
+    public function save() {
+        return $this->dom;
+    }
+}
+?>
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PercentEncoder.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
new file mode 100755
index 0000000000..a43c44f4c5
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * Class that handles operations involving percent-encoding in URIs.
+ *
+ * @warning
+ *      Be careful when reusing instances of PercentEncoder. The object
+ *      you use for normalize() SHOULD NOT be used for encode(), or
+ *      vice-versa.
+ */
+class HTMLPurifier_PercentEncoder
+{
+
+    /**
+     * Reserved characters to preserve when using encode().
+     */
+    protected $preserve = array();
+
+    /**
+     * String of characters that should be preserved while using encode().
+     */
+    public function __construct($preserve = false) {
+        // unreserved letters, ought to const-ify
+        for ($i = 48; $i <= 57;  $i++) $this->preserve[$i] = true; // digits
+        for ($i = 65; $i <= 90;  $i++) $this->preserve[$i] = true; // upper-case
+        for ($i = 97; $i <= 122; $i++) $this->preserve[$i] = true; // lower-case
+        $this->preserve[45] = true; // Dash         -
+        $this->preserve[46] = true; // Period       .
+        $this->preserve[95] = true; // Underscore   _
+        $this->preserve[126]= true; // Tilde        ~
+
+        // extra letters not to escape
+        if ($preserve !== false) {
+            for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {
+                $this->preserve[ord($preserve[$i])] = true;
+            }
+        }
+    }
+
+    /**
+     * Our replacement for urlencode, it encodes all non-reserved characters,
+     * as well as any extra characters that were instructed to be preserved.
+     * @note
+     *      Assumes that the string has already been normalized, making any
+     *      and all percent escape sequences valid. Percents will not be
+     *      re-escaped, regardless of their status in $preserve
+     * @param $string String to be encoded
+     * @return Encoded string.
+     */
+    public function encode($string) {
+        $ret = '';
+        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
+            if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])]) ) {
+                $ret .= '%' . sprintf('%02X', $int);
+            } else {
+                $ret .= $string[$i];
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Fix up percent-encoding by decoding unreserved characters and normalizing.
+     * @warning This function is affected by $preserve, even though the
+     *          usual desired behavior is for this not to preserve those
+     *          characters. Be careful when reusing instances of PercentEncoder!
+     * @param $string String to normalize
+     */
+    public function normalize($string) {
+        if ($string == '') return '';
+        $parts = explode('%', $string);
+        $ret = array_shift($parts);
+        foreach ($parts as $part) {
+            $length = strlen($part);
+            if ($length < 2) {
+                $ret .= '%25' . $part;
+                continue;
+            }
+            $encoding = substr($part, 0, 2);
+            $text     = substr($part, 2);
+            if (!ctype_xdigit($encoding)) {
+                $ret .= '%25' . $part;
+                continue;
+            }
+            $int = hexdec($encoding);
+            if (isset($this->preserve[$int])) {
+                $ret .= chr($int) . $text;
+                continue;
+            }
+            $encoding = strtoupper($encoding);
+            $ret .= '%' . $encoding . $text;
+        }
+        return $ret;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer.php
new file mode 100755
index 0000000000..e7eb82e83e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer.php
@@ -0,0 +1,176 @@
+<?php
+
+// OUT OF DATE, NEEDS UPDATING!
+// USE XMLWRITER!
+
+class HTMLPurifier_Printer
+{
+
+    /**
+     * Instance of HTMLPurifier_Generator for HTML generation convenience funcs
+     */
+    protected $generator;
+
+    /**
+     * Instance of HTMLPurifier_Config, for easy access
+     */
+    protected $config;
+
+    /**
+     * Initialize $generator.
+     */
+    public function __construct() {
+    }
+
+    /**
+     * Give generator necessary configuration if possible
+     */
+    public function prepareGenerator($config) {
+        $all = $config->getAll();
+        $context = new HTMLPurifier_Context();
+        $this->generator = new HTMLPurifier_Generator($config, $context);
+    }
+
+    /**
+     * Main function that renders object or aspect of that object
+     * @note Parameters vary depending on printer
+     */
+    // function render() {}
+
+    /**
+     * Returns a start tag
+     * @param $tag Tag name
+     * @param $attr Attribute array
+     */
+    protected function start($tag, $attr = array()) {
+        return $this->generator->generateFromToken(
+                    new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
+               );
+    }
+
+    /**
+     * Returns an end teg
+     * @param $tag Tag name
+     */
+    protected function end($tag) {
+        return $this->generator->generateFromToken(
+                    new HTMLPurifier_Token_End($tag)
+               );
+    }
+
+    /**
+     * Prints a complete element with content inside
+     * @param $tag Tag name
+     * @param $contents Element contents
+     * @param $attr Tag attributes
+     * @param $escape Bool whether or not to escape contents
+     */
+    protected function element($tag, $contents, $attr = array(), $escape = true) {
+        return $this->start($tag, $attr) .
+               ($escape ? $this->escape($contents) : $contents) .
+               $this->end($tag);
+    }
+
+    protected function elementEmpty($tag, $attr = array()) {
+        return $this->generator->generateFromToken(
+            new HTMLPurifier_Token_Empty($tag, $attr)
+        );
+    }
+
+    protected function text($text) {
+        return $this->generator->generateFromToken(
+            new HTMLPurifier_Token_Text($text)
+        );
+    }
+
+    /**
+     * Prints a simple key/value row in a table.
+     * @param $name Key
+     * @param $value Value
+     */
+    protected function row($name, $value) {
+        if (is_bool($value)) $value = $value ? 'On' : 'Off';
+        return
+            $this->start('tr') . "\n" .
+                $this->element('th', $name) . "\n" .
+                $this->element('td', $value) . "\n" .
+            $this->end('tr')
+        ;
+    }
+
+    /**
+     * Escapes a string for HTML output.
+     * @param $string String to escape
+     */
+    protected function escape($string) {
+        $string = HTMLPurifier_Encoder::cleanUTF8($string);
+        $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
+        return $string;
+    }
+
+    /**
+     * Takes a list of strings and turns them into a single list
+     * @param $array List of strings
+     * @param $polite Bool whether or not to add an end before the last
+     */
+    protected function listify($array, $polite = false) {
+        if (empty($array)) return 'None';
+        $ret = '';
+        $i = count($array);
+        foreach ($array as $value) {
+            $i--;
+            $ret .= $value;
+            if ($i > 0 && !($polite && $i == 1)) $ret .= ', ';
+            if ($polite && $i == 1) $ret .= 'and ';
+        }
+        return $ret;
+    }
+
+    /**
+     * Retrieves the class of an object without prefixes, as well as metadata
+     * @param $obj Object to determine class of
+     * @param $prefix Further prefix to remove
+     */
+    protected function getClass($obj, $sec_prefix = '') {
+        static $five = null;
+        if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');
+        $prefix = 'HTMLPurifier_' . $sec_prefix;
+        if (!$five) $prefix = strtolower($prefix);
+        $class = str_replace($prefix, '', get_class($obj));
+        $lclass = strtolower($class);
+        $class .= '(';
+        switch ($lclass) {
+            case 'enum':
+                $values = array();
+                foreach ($obj->valid_values as $value => $bool) {
+                    $values[] = $value;
+                }
+                $class .= implode(', ', $values);
+                break;
+            case 'css_composite':
+                $values = array();
+                foreach ($obj->defs as $def) {
+                    $values[] = $this->getClass($def, $sec_prefix);
+                }
+                $class .= implode(', ', $values);
+                break;
+            case 'css_multiple':
+                $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
+                $class .= $obj->max;
+                break;
+            case 'css_denyelementdecorator':
+                $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
+                $class .= $obj->element;
+                break;
+            case 'css_importantdecorator':
+                $class .= $this->getClass($obj->def, $sec_prefix);
+                if ($obj->allow) $class .= ', !important';
+                break;
+        }
+        $class .= ')';
+        return $class;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
new file mode 100755
index 0000000000..81f9865901
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
@@ -0,0 +1,38 @@
+<?php
+
+class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
+{
+
+    protected $def;
+
+    public function render($config) {
+        $this->def = $config->getCSSDefinition();
+        $ret = '';
+
+        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+        $ret .= $this->start('table');
+
+        $ret .= $this->element('caption', 'Properties ($info)');
+
+        $ret .= $this->start('thead');
+        $ret .= $this->start('tr');
+        $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
+        $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
+        $ret .= $this->end('tr');
+        $ret .= $this->end('thead');
+
+        ksort($this->def->info);
+        foreach ($this->def->info as $property => $obj) {
+            $name = $this->getClass($obj, 'AttrDef_');
+            $ret .= $this->row($property, $name);
+        }
+
+        $ret .= $this->end('table');
+        $ret .= $this->end('div');
+
+        return $ret;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
new file mode 100755
index 0000000000..3ff1a88aa4
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
@@ -0,0 +1,10 @@
+
+.hp-config {}
+
+.hp-config tbody th {text-align:right; padding-right:0.5em;}
+.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
+.hp-config .namespace th {text-align:center;}
+.hp-config .verbose {display:none;}
+.hp-config .controls {text-align:center;}
+
+/* vim: et sw=4 sts=4 */
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
new file mode 100755
index 0000000000..cba00c9b80
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
@@ -0,0 +1,5 @@
+function toggleWriteability(id_of_patient, checked) {
+    document.getElementById(id_of_patient).disabled = checked;
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
new file mode 100755
index 0000000000..744dec6597
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
@@ -0,0 +1,368 @@
+<?php
+
+/**
+ * @todo Rewrite to use Interchange objects
+ */
+class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
+{
+
+    /**
+     * Printers for specific fields
+     */
+    protected $fields = array();
+
+    /**
+     * Documentation URL, can have fragment tagged on end
+     */
+    protected $docURL;
+
+    /**
+     * Name of form element to stuff config in
+     */
+    protected $name;
+
+    /**
+     * Whether or not to compress directive names, clipping them off
+     * after a certain amount of letters. False to disable or integer letters
+     * before clipping.
+     */
+    protected $compress = false;
+
+    /**
+     * @param $name Form element name for directives to be stuffed into
+     * @param $doc_url String documentation URL, will have fragment tagged on
+     * @param $compress Integer max length before compressing a directive name, set to false to turn off
+     */
+    public function __construct(
+        $name, $doc_url = null, $compress = false
+    ) {
+        parent::__construct();
+        $this->docURL = $doc_url;
+        $this->name   = $name;
+        $this->compress = $compress;
+        // initialize sub-printers
+        $this->fields[0]    = new HTMLPurifier_Printer_ConfigForm_default();
+        $this->fields[HTMLPurifier_VarParser::BOOL]       = new HTMLPurifier_Printer_ConfigForm_bool();
+    }
+
+    /**
+     * Sets default column and row size for textareas in sub-printers
+     * @param $cols Integer columns of textarea, null to use default
+     * @param $rows Integer rows of textarea, null to use default
+     */
+    public function setTextareaDimensions($cols = null, $rows = null) {
+        if ($cols) $this->fields['default']->cols = $cols;
+        if ($rows) $this->fields['default']->rows = $rows;
+    }
+
+    /**
+     * Retrieves styling, in case it is not accessible by webserver
+     */
+    public static function getCSS() {
+        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
+    }
+
+    /**
+     * Retrieves JavaScript, in case it is not accessible by webserver
+     */
+    public static function getJavaScript() {
+        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
+    }
+
+    /**
+     * Returns HTML output for a configuration form
+     * @param $config Configuration object of current form state, or an array
+     *        where [0] has an HTML namespace and [1] is being rendered.
+     * @param $allowed Optional namespace(s) and directives to restrict form to.
+     */
+    public function render($config, $allowed = true, $render_controls = true) {
+        if (is_array($config) && isset($config[0])) {
+            $gen_config = $config[0];
+            $config = $config[1];
+        } else {
+            $gen_config = $config;
+        }
+
+        $this->config = $config;
+        $this->genConfig = $gen_config;
+        $this->prepareGenerator($gen_config);
+
+        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
+        $all = array();
+        foreach ($allowed as $key) {
+            list($ns, $directive) = $key;
+            $all[$ns][$directive] = $config->get($ns, $directive);
+        }
+
+        $ret = '';
+        $ret .= $this->start('table', array('class' => 'hp-config'));
+        $ret .= $this->start('thead');
+        $ret .= $this->start('tr');
+            $ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
+            $ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
+        $ret .= $this->end('tr');
+        $ret .= $this->end('thead');
+        foreach ($all as $ns => $directives) {
+            $ret .= $this->renderNamespace($ns, $directives);
+        }
+        if ($render_controls) {
+             $ret .= $this->start('tbody');
+             $ret .= $this->start('tr');
+                 $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
+                     $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
+                     $ret .= '[<a href="?">Reset</a>]';
+                 $ret .= $this->end('td');
+             $ret .= $this->end('tr');
+             $ret .= $this->end('tbody');
+        }
+        $ret .= $this->end('table');
+        return $ret;
+    }
+
+    /**
+     * Renders a single namespace
+     * @param $ns String namespace name
+     * @param $directive Associative array of directives to values
+     */
+    protected function renderNamespace($ns, $directives) {
+        $ret = '';
+        $ret .= $this->start('tbody', array('class' => 'namespace'));
+        $ret .= $this->start('tr');
+            $ret .= $this->element('th', $ns, array('colspan' => 2));
+        $ret .= $this->end('tr');
+        $ret .= $this->end('tbody');
+        $ret .= $this->start('tbody');
+        foreach ($directives as $directive => $value) {
+            $ret .= $this->start('tr');
+            $ret .= $this->start('th');
+            if ($this->docURL) {
+                $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
+                $ret .= $this->start('a', array('href' => $url));
+            }
+                $attr = array('for' => "{$this->name}:$ns.$directive");
+
+                // crop directive name if it's too long
+                if (!$this->compress || (strlen($directive) < $this->compress)) {
+                    $directive_disp = $directive;
+                } else {
+                    $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
+                    $attr['title'] = $directive;
+                }
+
+                $ret .= $this->element(
+                    'label',
+                    $directive_disp,
+                    // component printers must create an element with this id
+                    $attr
+                );
+            if ($this->docURL) $ret .= $this->end('a');
+            $ret .= $this->end('th');
+
+            $ret .= $this->start('td');
+                $def = $this->config->def->info[$ns][$directive];
+                if (is_int($def)) {
+                    $allow_null = $def < 0;
+                    $type = abs($def);
+                } else {
+                    $type = $def->type;
+                    $allow_null = isset($def->allow_null);
+                }
+                if (!isset($this->fields[$type])) $type = 0; // default
+                $type_obj = $this->fields[$type];
+                if ($allow_null) {
+                    $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
+                }
+                $ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
+            $ret .= $this->end('td');
+            $ret .= $this->end('tr');
+        }
+        $ret .= $this->end('tbody');
+        return $ret;
+    }
+
+}
+
+/**
+ * Printer decorator for directives that accept null
+ */
+class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer {
+    /**
+     * Printer being decorated
+     */
+    protected $obj;
+    /**
+     * @param $obj Printer to decorate
+     */
+    public function __construct($obj) {
+        parent::__construct();
+        $this->obj = $obj;
+    }
+    public function render($ns, $directive, $value, $name, $config) {
+        if (is_array($config) && isset($config[0])) {
+            $gen_config = $config[0];
+            $config = $config[1];
+        } else {
+            $gen_config = $config;
+        }
+        $this->prepareGenerator($gen_config);
+
+        $ret = '';
+        $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
+        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+        $ret .= $this->text(' Null/Disabled');
+        $ret .= $this->end('label');
+        $attr = array(
+            'type' => 'checkbox',
+            'value' => '1',
+            'class' => 'null-toggle',
+            'name' => "$name"."[Null_$ns.$directive]",
+            'id' => "$name:Null_$ns.$directive",
+            'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
+        );
+        if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
+            // modify inline javascript slightly
+            $attr['onclick'] = "toggleWriteability('$name:Yes_$ns.$directive',checked);toggleWriteability('$name:No_$ns.$directive',checked)";
+        }
+        if ($value === null) $attr['checked'] = 'checked';
+        $ret .= $this->elementEmpty('input', $attr);
+        $ret .= $this->text(' or ');
+        $ret .= $this->elementEmpty('br');
+        $ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
+        return $ret;
+    }
+}
+
+/**
+ * Swiss-army knife configuration form field printer
+ */
+class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
+    public $cols = 18;
+    public $rows = 5;
+    public function render($ns, $directive, $value, $name, $config) {
+        if (is_array($config) && isset($config[0])) {
+            $gen_config = $config[0];
+            $config = $config[1];
+        } else {
+            $gen_config = $config;
+        }
+        $this->prepareGenerator($gen_config);
+        // this should probably be split up a little
+        $ret = '';
+        $def = $config->def->info[$ns][$directive];
+        if (is_int($def)) {
+            $type = abs($def);
+        } else {
+            $type = $def->type;
+        }
+        if (is_array($value)) {
+            switch ($type) {
+                case HTMLPurifier_VarParser::LOOKUP:
+                    $array = $value;
+                    $value = array();
+                    foreach ($array as $val => $b) {
+                        $value[] = $val;
+                    }
+                case HTMLPurifier_VarParser::ALIST:
+                    $value = implode(PHP_EOL, $value);
+                    break;
+                case HTMLPurifier_VarParser::HASH:
+                    $nvalue = '';
+                    foreach ($value as $i => $v) {
+                        $nvalue .= "$i:$v" . PHP_EOL;
+                    }
+                    $value = $nvalue;
+                    break;
+                default:
+                    $value = '';
+            }
+        }
+        if ($type === HTMLPurifier_VarParser::MIXED) {
+            return 'Not supported';
+            $value = serialize($value);
+        }
+        $attr = array(
+            'name' => "$name"."[$ns.$directive]",
+            'id' => "$name:$ns.$directive"
+        );
+        if ($value === null) $attr['disabled'] = 'disabled';
+        if (isset($def->allowed)) {
+            $ret .= $this->start('select', $attr);
+            foreach ($def->allowed as $val => $b) {
+                $attr = array();
+                if ($value == $val) $attr['selected'] = 'selected';
+                $ret .= $this->element('option', $val, $attr);
+            }
+            $ret .= $this->end('select');
+        } elseif (
+            $type === HTMLPurifier_VarParser::TEXT ||
+            $type === HTMLPurifier_VarParser::ITEXT ||
+            $type === HTMLPurifier_VarParser::ALIST ||
+            $type === HTMLPurifier_VarParser::HASH ||
+            $type === HTMLPurifier_VarParser::LOOKUP
+        ) {
+            $attr['cols'] = $this->cols;
+            $attr['rows'] = $this->rows;
+            $ret .= $this->start('textarea', $attr);
+            $ret .= $this->text($value);
+            $ret .= $this->end('textarea');
+        } else {
+            $attr['value'] = $value;
+            $attr['type'] = 'text';
+            $ret .= $this->elementEmpty('input', $attr);
+        }
+        return $ret;
+    }
+}
+
+/**
+ * Bool form field printer
+ */
+class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {
+    public function render($ns, $directive, $value, $name, $config) {
+        if (is_array($config) && isset($config[0])) {
+            $gen_config = $config[0];
+            $config = $config[1];
+        } else {
+            $gen_config = $config;
+        }
+        $this->prepareGenerator($gen_config);
+        $ret = '';
+        $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
+
+        $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
+        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+        $ret .= $this->text(' Yes');
+        $ret .= $this->end('label');
+
+        $attr = array(
+            'type' => 'radio',
+            'name' => "$name"."[$ns.$directive]",
+            'id' => "$name:Yes_$ns.$directive",
+            'value' => '1'
+        );
+        if ($value === true) $attr['checked'] = 'checked';
+        if ($value === null) $attr['disabled'] = 'disabled';
+        $ret .= $this->elementEmpty('input', $attr);
+
+        $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
+        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+        $ret .= $this->text(' No');
+        $ret .= $this->end('label');
+
+        $attr = array(
+            'type' => 'radio',
+            'name' => "$name"."[$ns.$directive]",
+            'id' => "$name:No_$ns.$directive",
+            'value' => '0'
+        );
+        if ($value === false) $attr['checked'] = 'checked';
+        if ($value === null) $attr['disabled'] = 'disabled';
+        $ret .= $this->elementEmpty('input', $attr);
+
+        $ret .= $this->end('div');
+
+        return $ret;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
new file mode 100755
index 0000000000..8a8f126b81
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
@@ -0,0 +1,272 @@
+<?php
+
+class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
+{
+
+    /**
+     * Instance of HTMLPurifier_HTMLDefinition, for easy access
+     */
+    protected $def;
+
+    public function render($config) {
+        $ret = '';
+        $this->config =& $config;
+
+        $this->def = $config->getHTMLDefinition();
+
+        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+
+        $ret .= $this->renderDoctype();
+        $ret .= $this->renderEnvironment();
+        $ret .= $this->renderContentSets();
+        $ret .= $this->renderInfo();
+
+        $ret .= $this->end('div');
+
+        return $ret;
+    }
+
+    /**
+     * Renders the Doctype table
+     */
+    protected function renderDoctype() {
+        $doctype = $this->def->doctype;
+        $ret = '';
+        $ret .= $this->start('table');
+        $ret .= $this->element('caption', 'Doctype');
+        $ret .= $this->row('Name', $doctype->name);
+        $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
+        $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
+        $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
+        $ret .= $this->end('table');
+        return $ret;
+    }
+
+
+    /**
+     * Renders environment table, which is miscellaneous info
+     */
+    protected function renderEnvironment() {
+        $def = $this->def;
+
+        $ret = '';
+
+        $ret .= $this->start('table');
+        $ret .= $this->element('caption', 'Environment');
+
+        $ret .= $this->row('Parent of fragment', $def->info_parent);
+        $ret .= $this->renderChildren($def->info_parent_def->child);
+        $ret .= $this->row('Block wrap name', $def->info_block_wrapper);
+
+        $ret .= $this->start('tr');
+            $ret .= $this->element('th', 'Global attributes');
+            $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr),0,0);
+        $ret .= $this->end('tr');
+
+        $ret .= $this->start('tr');
+            $ret .= $this->element('th', 'Tag transforms');
+            $list = array();
+            foreach ($def->info_tag_transform as $old => $new) {
+                $new = $this->getClass($new, 'TagTransform_');
+                $list[] = "<$old> with $new";
+            }
+            $ret .= $this->element('td', $this->listify($list));
+        $ret .= $this->end('tr');
+
+        $ret .= $this->start('tr');
+            $ret .= $this->element('th', 'Pre-AttrTransform');
+            $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
+        $ret .= $this->end('tr');
+
+        $ret .= $this->start('tr');
+            $ret .= $this->element('th', 'Post-AttrTransform');
+            $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
+        $ret .= $this->end('tr');
+
+        $ret .= $this->end('table');
+        return $ret;
+    }
+
+    /**
+     * Renders the Content Sets table
+     */
+    protected function renderContentSets() {
+        $ret = '';
+        $ret .= $this->start('table');
+        $ret .= $this->element('caption', 'Content Sets');
+        foreach ($this->def->info_content_sets as $name => $lookup) {
+            $ret .= $this->heavyHeader($name);
+            $ret .= $this->start('tr');
+            $ret .= $this->element('td', $this->listifyTagLookup($lookup));
+            $ret .= $this->end('tr');
+        }
+        $ret .= $this->end('table');
+        return $ret;
+    }
+
+    /**
+     * Renders the Elements ($info) table
+     */
+    protected function renderInfo() {
+        $ret = '';
+        $ret .= $this->start('table');
+        $ret .= $this->element('caption', 'Elements ($info)');
+        ksort($this->def->info);
+        $ret .= $this->heavyHeader('Allowed tags', 2);
+        $ret .= $this->start('tr');
+        $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
+        $ret .= $this->end('tr');
+        foreach ($this->def->info as $name => $def) {
+            $ret .= $this->start('tr');
+                $ret .= $this->element('th', "<$name>", array('class'=>'heavy', 'colspan' => 2));
+            $ret .= $this->end('tr');
+            $ret .= $this->start('tr');
+                $ret .= $this->element('th', 'Inline content');
+                $ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
+            $ret .= $this->end('tr');
+            if (!empty($def->excludes)) {
+                $ret .= $this->start('tr');
+                    $ret .= $this->element('th', 'Excludes');
+                    $ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
+                $ret .= $this->end('tr');
+            }
+            if (!empty($def->attr_transform_pre)) {
+                $ret .= $this->start('tr');
+                    $ret .= $this->element('th', 'Pre-AttrTransform');
+                    $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
+                $ret .= $this->end('tr');
+            }
+            if (!empty($def->attr_transform_post)) {
+                $ret .= $this->start('tr');
+                    $ret .= $this->element('th', 'Post-AttrTransform');
+                    $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
+                $ret .= $this->end('tr');
+            }
+            if (!empty($def->auto_close)) {
+                $ret .= $this->start('tr');
+                    $ret .= $this->element('th', 'Auto closed by');
+                    $ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
+                $ret .= $this->end('tr');
+            }
+            $ret .= $this->start('tr');
+                $ret .= $this->element('th', 'Allowed attributes');
+                $ret .= $this->element('td',$this->listifyAttr($def->attr), array(), 0);
+            $ret .= $this->end('tr');
+
+            if (!empty($def->required_attr)) {
+                $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
+            }
+
+            $ret .= $this->renderChildren($def->child);
+        }
+        $ret .= $this->end('table');
+        return $ret;
+    }
+
+    /**
+     * Renders a row describing the allowed children of an element
+     * @param $def HTMLPurifier_ChildDef of pertinent element
+     */
+    protected function renderChildren($def) {
+        $context = new HTMLPurifier_Context();
+        $ret = '';
+        $ret .= $this->start('tr');
+            $elements = array();
+            $attr = array();
+            if (isset($def->elements)) {
+                if ($def->type == 'strictblockquote') {
+                    $def->validateChildren(array(), $this->config, $context);
+                }
+                $elements = $def->elements;
+            }
+            if ($def->type == 'chameleon') {
+                $attr['rowspan'] = 2;
+            } elseif ($def->type == 'empty') {
+                $elements = array();
+            } elseif ($def->type == 'table') {
+                $elements = array_flip(array('col', 'caption', 'colgroup', 'thead',
+                    'tfoot', 'tbody', 'tr'));
+            }
+            $ret .= $this->element('th', 'Allowed children', $attr);
+
+            if ($def->type == 'chameleon') {
+
+                $ret .= $this->element('td',
+                    '<em>Block</em>: ' .
+                    $this->escape($this->listifyTagLookup($def->block->elements)),0,0);
+                $ret .= $this->end('tr');
+                $ret .= $this->start('tr');
+                $ret .= $this->element('td',
+                    '<em>Inline</em>: ' .
+                    $this->escape($this->listifyTagLookup($def->inline->elements)),0,0);
+
+            } elseif ($def->type == 'custom') {
+
+                $ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: ' .
+                    $def->dtd_regex);
+
+            } else {
+                $ret .= $this->element('td',
+                    '<em>'.ucfirst($def->type).'</em>: ' .
+                    $this->escape($this->listifyTagLookup($elements)),0,0);
+            }
+        $ret .= $this->end('tr');
+        return $ret;
+    }
+
+    /**
+     * Listifies a tag lookup table.
+     * @param $array Tag lookup array in form of array('tagname' => true)
+     */
+    protected function listifyTagLookup($array) {
+        ksort($array);
+        $list = array();
+        foreach ($array as $name => $discard) {
+            if ($name !== '#PCDATA' && !isset($this->def->info[$name])) continue;
+            $list[] = $name;
+        }
+        return $this->listify($list);
+    }
+
+    /**
+     * Listifies a list of objects by retrieving class names and internal state
+     * @param $array List of objects
+     * @todo Also add information about internal state
+     */
+    protected function listifyObjectList($array) {
+        ksort($array);
+        $list = array();
+        foreach ($array as $discard => $obj) {
+            $list[] = $this->getClass($obj, 'AttrTransform_');
+        }
+        return $this->listify($list);
+    }
+
+    /**
+     * Listifies a hash of attributes to AttrDef classes
+     * @param $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
+     */
+    protected function listifyAttr($array) {
+        ksort($array);
+        $list = array();
+        foreach ($array as $name => $obj) {
+            if ($obj === false) continue;
+            $list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
+        }
+        return $this->listify($list);
+    }
+
+    /**
+     * Creates a heavy header row
+     */
+    protected function heavyHeader($text, $num = 1) {
+        $ret = '';
+        $ret .= $this->start('tr');
+        $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
+        $ret .= $this->end('tr');
+        return $ret;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyList.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyList.php
new file mode 100755
index 0000000000..2b99fb7bc3
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyList.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Generic property list implementation
+ */
+class HTMLPurifier_PropertyList
+{
+    /**
+     * Internal data-structure for properties
+     */
+    protected $data = array();
+
+    /**
+     * Parent plist
+     */
+    protected $parent;
+
+    protected $cache;
+
+    public function __construct($parent = null) {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Recursively retrieves the value for a key
+     */
+    public function get($name) {
+        if ($this->has($name)) return $this->data[$name];
+        // possible performance bottleneck, convert to iterative if necessary
+        if ($this->parent) return $this->parent->get($name);
+        throw new HTMLPurifier_Exception("Key '$name' not found");
+    }
+
+    /**
+     * Sets the value of a key, for this plist
+     */
+    public function set($name, $value) {
+        $this->data[$name] = $value;
+    }
+
+    /**
+     * Returns true if a given key exists
+     */
+    public function has($name) {
+        return array_key_exists($name, $this->data);
+    }
+
+    /**
+     * Resets a value to the value of it's parent, usually the default. If
+     * no value is specified, the entire plist is reset.
+     */
+    public function reset($name = null) {
+        if ($name == null) $this->data = array();
+        else unset($this->data[$name]);
+    }
+
+    /**
+     * Squashes this property list and all of its property lists into a single
+     * array, and returns the array. This value is cached by default.
+     * @param $force If true, ignores the cache and regenerates the array.
+     */
+    public function squash($force = false) {
+        if ($this->cache !== null && !$force) return $this->cache;
+        if ($this->parent) {
+            return $this->cache = array_merge($this->parent->squash($force), $this->data);
+        } else {
+            return $this->cache = $this->data;
+        }
+    }
+
+    /**
+     * Returns the parent plist.
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+
+    /**
+     * Sets the parent plist.
+     */
+    public function setParent($plist) {
+        $this->parent = $plist;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
new file mode 100755
index 0000000000..8f250443e4
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Property list iterator. Do not instantiate this class directly.
+ */
+class HTMLPurifier_PropertyListIterator extends FilterIterator
+{
+
+    protected $l;
+    protected $filter;
+
+    /**
+     * @param $data Array of data to iterate over
+     * @param $filter Optional prefix to only allow values of
+     */
+    public function __construct(Iterator $iterator, $filter = null) {
+        parent::__construct($iterator);
+        $this->l = strlen($filter);
+        $this->filter = $filter;
+    }
+
+    public function accept() {
+        $key = $this->getInnerIterator()->key();
+        if( strncmp($key, $this->filter, $this->l) !== 0 ) {
+            return false;
+        }
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy.php
new file mode 100755
index 0000000000..2462865210
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Supertype for classes that define a strategy for modifying/purifying tokens.
+ *
+ * While HTMLPurifier's core purpose is fixing HTML into something proper,
+ * strategies provide plug points for extra configuration or even extra
+ * features, such as custom tags, custom parsing of text, etc.
+ */
+
+
+abstract class HTMLPurifier_Strategy
+{
+
+    /**
+     * Executes the strategy on the tokens.
+     *
+     * @param $tokens Array of HTMLPurifier_Token objects to be operated on.
+     * @param $config Configuration options
+     * @returns Processed array of token objects.
+     */
+    abstract public function execute($tokens, $config, $context);
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
new file mode 100755
index 0000000000..816490b799
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Composite strategy that runs multiple strategies on tokens.
+ */
+abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
+{
+
+    /**
+     * List of strategies to run tokens through.
+     */
+    protected $strategies = array();
+
+    abstract public function __construct();
+
+    public function execute($tokens, $config, $context) {
+        foreach ($this->strategies as $strategy) {
+            $tokens = $strategy->execute($tokens, $config, $context);
+        }
+        return $tokens;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Core.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
new file mode 100755
index 0000000000..d90e158606
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Core strategy composed of the big four strategies.
+ */
+class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
+{
+
+    public function __construct() {
+        $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
+        $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
+        $this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
+        $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
new file mode 100755
index 0000000000..f81802391b
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
@@ -0,0 +1,328 @@
+<?php
+
+/**
+ * Takes a well formed list of tokens and fixes their nesting.
+ *
+ * HTML elements dictate which elements are allowed to be their children,
+ * for example, you can't have a p tag in a span tag.  Other elements have
+ * much more rigorous definitions: tables, for instance, require a specific
+ * order for their elements.  There are also constraints not expressible by
+ * document type definitions, such as the chameleon nature of ins/del
+ * tags and global child exclusions.
+ *
+ * The first major objective of this strategy is to iterate through all the
+ * nodes (not tokens) of the list of tokens and determine whether or not
+ * their children conform to the element's definition.  If they do not, the
+ * child definition may optionally supply an amended list of elements that
+ * is valid or require that the entire node be deleted (and the previous
+ * node rescanned).
+ *
+ * The second objective is to ensure that explicitly excluded elements of
+ * an element do not appear in its children.  Code that accomplishes this
+ * task is pervasive through the strategy, though the two are distinct tasks
+ * and could, theoretically, be seperated (although it's not recommended).
+ *
+ * @note Whether or not unrecognized children are silently dropped or
+ *       translated into text depends on the child definitions.
+ *
+ * @todo Enable nodes to be bubbled out of the structure.
+ */
+
+class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
+{
+
+    public function execute($tokens, $config, $context) {
+        //####################################################################//
+        // Pre-processing
+
+        // get a copy of the HTML definition
+        $definition = $config->getHTMLDefinition();
+
+        // insert implicit "parent" node, will be removed at end.
+        // DEFINITION CALL
+        $parent_name = $definition->info_parent;
+        array_unshift($tokens, new HTMLPurifier_Token_Start($parent_name));
+        $tokens[] = new HTMLPurifier_Token_End($parent_name);
+
+        // setup the context variable 'IsInline', for chameleon processing
+        // is 'false' when we are not inline, 'true' when it must always
+        // be inline, and an integer when it is inline for a certain
+        // branch of the document tree
+        $is_inline = $definition->info_parent_def->descendants_are_inline;
+        $context->register('IsInline', $is_inline);
+
+        // setup error collector
+        $e =& $context->get('ErrorCollector', true);
+
+        //####################################################################//
+        // Loop initialization
+
+        // stack that contains the indexes of all parents,
+        // $stack[count($stack)-1] being the current parent
+        $stack = array();
+
+        // stack that contains all elements that are excluded
+        // it is organized by parent elements, similar to $stack,
+        // but it is only populated when an element with exclusions is
+        // processed, i.e. there won't be empty exclusions.
+        $exclude_stack = array();
+
+        // variable that contains the start token while we are processing
+        // nodes. This enables error reporting to do its job
+        $start_token = false;
+        $context->register('CurrentToken', $start_token);
+
+        //####################################################################//
+        // Loop
+
+        // iterate through all start nodes. Determining the start node
+        // is complicated so it has been omitted from the loop construct
+        for ($i = 0, $size = count($tokens) ; $i < $size; ) {
+
+            //################################################################//
+            // Gather information on children
+
+            // child token accumulator
+            $child_tokens = array();
+
+            // scroll to the end of this node, report number, and collect
+            // all children
+            for ($j = $i, $depth = 0; ; $j++) {
+                if ($tokens[$j] instanceof HTMLPurifier_Token_Start) {
+                    $depth++;
+                    // skip token assignment on first iteration, this is the
+                    // token we currently are on
+                    if ($depth == 1) continue;
+                } elseif ($tokens[$j] instanceof HTMLPurifier_Token_End) {
+                    $depth--;
+                    // skip token assignment on last iteration, this is the
+                    // end token of the token we're currently on
+                    if ($depth == 0) break;
+                }
+                $child_tokens[] = $tokens[$j];
+            }
+
+            // $i is index of start token
+            // $j is index of end token
+
+            $start_token = $tokens[$i]; // to make token available via CurrentToken
+
+            //################################################################//
+            // Gather information on parent
+
+            // calculate parent information
+            if ($count = count($stack)) {
+                $parent_index = $stack[$count-1];
+                $parent_name  = $tokens[$parent_index]->name;
+                if ($parent_index == 0) {
+                    $parent_def   = $definition->info_parent_def;
+                } else {
+                    $parent_def   = $definition->info[$parent_name];
+                }
+            } else {
+                // processing as if the parent were the "root" node
+                // unknown info, it won't be used anyway, in the future,
+                // we may want to enforce one element only (this is
+                // necessary for HTML Purifier to clean entire documents
+                $parent_index = $parent_name = $parent_def = null;
+            }
+
+            // calculate context
+            if ($is_inline === false) {
+                // check if conditions make it inline
+                if (!empty($parent_def) && $parent_def->descendants_are_inline) {
+                    $is_inline = $count - 1;
+                }
+            } else {
+                // check if we're out of inline
+                if ($count === $is_inline) {
+                    $is_inline = false;
+                }
+            }
+
+            //################################################################//
+            // Determine whether element is explicitly excluded SGML-style
+
+            // determine whether or not element is excluded by checking all
+            // parent exclusions. The array should not be very large, two
+            // elements at most.
+            $excluded = false;
+            if (!empty($exclude_stack)) {
+                foreach ($exclude_stack as $lookup) {
+                    if (isset($lookup[$tokens[$i]->name])) {
+                        $excluded = true;
+                        // no need to continue processing
+                        break;
+                    }
+                }
+            }
+
+            //################################################################//
+            // Perform child validation
+
+            if ($excluded) {
+                // there is an exclusion, remove the entire node
+                $result = false;
+                $excludes = array(); // not used, but good to initialize anyway
+            } else {
+                // DEFINITION CALL
+                if ($i === 0) {
+                    // special processing for the first node
+                    $def = $definition->info_parent_def;
+                } else {
+                    $def = $definition->info[$tokens[$i]->name];
+
+                }
+
+                if (!empty($def->child)) {
+                    // have DTD child def validate children
+                    $result = $def->child->validateChildren(
+                        $child_tokens, $config, $context);
+                } else {
+                    // weird, no child definition, get rid of everything
+                    $result = false;
+                }
+
+                // determine whether or not this element has any exclusions
+                $excludes = $def->excludes;
+            }
+
+            // $result is now a bool or array
+
+            //################################################################//
+            // Process result by interpreting $result
+
+            if ($result === true || $child_tokens === $result) {
+                // leave the node as is
+
+                // register start token as a parental node start
+                $stack[] = $i;
+
+                // register exclusions if there are any
+                if (!empty($excludes)) $exclude_stack[] = $excludes;
+
+                // move cursor to next possible start node
+                $i++;
+
+            } elseif($result === false) {
+                // remove entire node
+
+                if ($e) {
+                    if ($excluded) {
+                        $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
+                    } else {
+                        $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
+                    }
+                }
+
+                // calculate length of inner tokens and current tokens
+                $length = $j - $i + 1;
+
+                // perform removal
+                array_splice($tokens, $i, $length);
+
+                // update size
+                $size -= $length;
+
+                // there is no start token to register,
+                // current node is now the next possible start node
+                // unless it turns out that we need to do a double-check
+
+                // this is a rought heuristic that covers 100% of HTML's
+                // cases and 99% of all other cases. A child definition
+                // that would be tricked by this would be something like:
+                // ( | a b c) where it's all or nothing. Fortunately,
+                // our current implementation claims that that case would
+                // not allow empty, even if it did
+                if (!$parent_def->child->allow_empty) {
+                    // we need to do a double-check
+                    $i = $parent_index;
+                    array_pop($stack);
+                }
+
+                // PROJECTED OPTIMIZATION: Process all children elements before
+                // reprocessing parent node.
+
+            } else {
+                // replace node with $result
+
+                // calculate length of inner tokens
+                $length = $j - $i - 1;
+
+                if ($e) {
+                    if (empty($result) && $length) {
+                        $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
+                    } else {
+                        $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
+                    }
+                }
+
+                // perform replacement
+                array_splice($tokens, $i + 1, $length, $result);
+
+                // update size
+                $size -= $length;
+                $size += count($result);
+
+                // register start token as a parental node start
+                $stack[] = $i;
+
+                // register exclusions if there are any
+                if (!empty($excludes)) $exclude_stack[] = $excludes;
+
+                // move cursor to next possible start node
+                $i++;
+
+            }
+
+            //################################################################//
+            // Scroll to next start node
+
+            // We assume, at this point, that $i is the index of the token
+            // that is the first possible new start point for a node.
+
+            // Test if the token indeed is a start tag, if not, move forward
+            // and test again.
+            $size = count($tokens);
+            while ($i < $size and !$tokens[$i] instanceof HTMLPurifier_Token_Start) {
+                if ($tokens[$i] instanceof HTMLPurifier_Token_End) {
+                    // pop a token index off the stack if we ended a node
+                    array_pop($stack);
+                    // pop an exclusion lookup off exclusion stack if
+                    // we ended node and that node had exclusions
+                    if ($i == 0 || $i == $size - 1) {
+                        // use specialized var if it's the super-parent
+                        $s_excludes = $definition->info_parent_def->excludes;
+                    } else {
+                        $s_excludes = $definition->info[$tokens[$i]->name]->excludes;
+                    }
+                    if ($s_excludes) {
+                        array_pop($exclude_stack);
+                    }
+                }
+                $i++;
+            }
+
+        }
+
+        //####################################################################//
+        // Post-processing
+
+        // remove implicit parent tokens at the beginning and end
+        array_shift($tokens);
+        array_pop($tokens);
+
+        // remove context variables
+        $context->destroy('IsInline');
+        $context->destroy('CurrentToken');
+
+        //####################################################################//
+        // Return
+
+        return $tokens;
+
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
new file mode 100755
index 0000000000..0ec811f8ae
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
@@ -0,0 +1,455 @@
+<?php
+
+/**
+ * Takes tokens makes them well-formed (balance end tags, etc.)
+ */
+class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
+{
+
+    /**
+     * Array stream of tokens being processed.
+     */
+    protected $tokens;
+
+    /**
+     * Current index in $tokens.
+     */
+    protected $t;
+
+    /**
+     * Current nesting of elements.
+     */
+    protected $stack;
+
+    /**
+     * Injectors active in this stream processing.
+     */
+    protected $injectors;
+
+    /**
+     * Current instance of HTMLPurifier_Config.
+     */
+    protected $config;
+
+    /**
+     * Current instance of HTMLPurifier_Context.
+     */
+    protected $context;
+
+    public function execute($tokens, $config, $context) {
+
+        $definition = $config->getHTMLDefinition();
+
+        // local variables
+        $generator = new HTMLPurifier_Generator($config, $context);
+        $escape_invalid_tags = $config->get('Core', 'EscapeInvalidTags');
+        $e = $context->get('ErrorCollector', true);
+        $t = false; // token index
+        $i = false; // injector index
+        $token      = false; // the current token
+        $reprocess  = false; // whether or not to reprocess the same token
+        $stack = array();
+
+        // member variables
+        $this->stack   =& $stack;
+        $this->t       =& $t;
+        $this->tokens  =& $tokens;
+        $this->config  = $config;
+        $this->context = $context;
+
+        // context variables
+        $context->register('CurrentNesting', $stack);
+        $context->register('InputIndex',     $t);
+        $context->register('InputTokens',    $tokens);
+        $context->register('CurrentToken',   $token);
+
+        // -- begin INJECTOR --
+
+        $this->injectors = array();
+
+        $injectors = $config->getBatch('AutoFormat');
+        $def_injectors = $definition->info_injector;
+        $custom_injectors = $injectors['Custom'];
+        unset($injectors['Custom']); // special case
+        foreach ($injectors as $injector => $b) {
+            $injector = "HTMLPurifier_Injector_$injector";
+            if (!$b) continue;
+            $this->injectors[] = new $injector;
+        }
+        foreach ($def_injectors as $injector) {
+            // assumed to be objects
+            $this->injectors[] = $injector;
+        }
+        foreach ($custom_injectors as $injector) {
+            if (is_string($injector)) {
+                $injector = "HTMLPurifier_Injector_$injector";
+                $injector = new $injector;
+            }
+            $this->injectors[] = $injector;
+        }
+
+        // give the injectors references to the definition and context
+        // variables for performance reasons
+        foreach ($this->injectors as $ix => $injector) {
+            $error = $injector->prepare($config, $context);
+            if (!$error) continue;
+            array_splice($this->injectors, $ix, 1); // rm the injector
+            trigger_error("Cannot enable {$injector->name} injector because $error is not allowed", E_USER_WARNING);
+        }
+
+        // -- end INJECTOR --
+
+        // a note on punting:
+        //      In order to reduce code duplication, whenever some code needs
+        //      to make HTML changes in order to make things "correct", the
+        //      new HTML gets sent through the purifier, regardless of its
+        //      status. This means that if we add a start token, because it
+        //      was totally necessary, we don't have to update nesting; we just
+        //      punt ($reprocess = true; continue;) and it does that for us.
+
+        // isset is in loop because $tokens size changes during loop exec
+        for (
+            $t = 0;
+            $t == 0 || isset($tokens[$t - 1]);
+            // only increment if we don't need to reprocess
+            $reprocess ? $reprocess = false : $t++
+        ) {
+
+            // check for a rewind
+            if (is_int($i) && $i >= 0) {
+                // possibility: disable rewinding if the current token has a
+                // rewind set on it already. This would offer protection from
+                // infinite loop, but might hinder some advanced rewinding.
+                $rewind_to = $this->injectors[$i]->getRewind();
+                if (is_int($rewind_to) && $rewind_to < $t) {
+                    if ($rewind_to < 0) $rewind_to = 0;
+                    while ($t > $rewind_to) {
+                        $t--;
+                        $prev = $tokens[$t];
+                        // indicate that other injectors should not process this token,
+                        // but we need to reprocess it
+                        unset($prev->skip[$i]);
+                        $prev->rewind = $i;
+                        if ($prev instanceof HTMLPurifier_Token_Start) array_pop($this->stack);
+                        elseif ($prev instanceof HTMLPurifier_Token_End) $this->stack[] = $prev->start;
+                    }
+                }
+                $i = false;
+            }
+
+            // handle case of document end
+            if (!isset($tokens[$t])) {
+                // kill processing if stack is empty
+                if (empty($this->stack)) break;
+
+                // peek
+                $top_nesting = array_pop($this->stack);
+                $this->stack[] = $top_nesting;
+
+                // send error
+                if ($e && !isset($top_nesting->armor['MakeWellFormed_TagClosedError'])) {
+                    $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $top_nesting);
+                }
+
+                // append, don't splice, since this is the end
+                $tokens[] = new HTMLPurifier_Token_End($top_nesting->name);
+
+                // punt!
+                $reprocess = true;
+                continue;
+            }
+
+            $token = $tokens[$t];
+
+            //echo '<br>'; printTokens($tokens, $t); printTokens($this->stack);
+
+            // quick-check: if it's not a tag, no need to process
+            if (empty($token->is_tag)) {
+                if ($token instanceof HTMLPurifier_Token_Text) {
+                    foreach ($this->injectors as $i => $injector) {
+                        if (isset($token->skip[$i])) continue;
+                        if ($token->rewind !== null && $token->rewind !== $i) continue;
+                        $injector->handleText($token);
+                        $this->processToken($token, $i);
+                        $reprocess = true;
+                        break;
+                    }
+                }
+                // another possibility is a comment
+                continue;
+            }
+
+            if (isset($definition->info[$token->name])) {
+                $type = $definition->info[$token->name]->child->type;
+            } else {
+                $type = false; // Type is unknown, treat accordingly
+            }
+
+            // quick tag checks: anything that's *not* an end tag
+            $ok = false;
+            if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) {
+                // claims to be a start tag but is empty
+                $token = new HTMLPurifier_Token_Empty($token->name, $token->attr);
+                $ok = true;
+            } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) {
+                // claims to be empty but really is a start tag
+                $this->swap(new HTMLPurifier_Token_End($token->name));
+                $this->insertBefore(new HTMLPurifier_Token_Start($token->name, $token->attr));
+                // punt (since we had to modify the input stream in a non-trivial way)
+                $reprocess = true;
+                continue;
+            } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+                // real empty token
+                $ok = true;
+            } elseif ($token instanceof HTMLPurifier_Token_Start) {
+                // start tag
+
+                // ...unless they also have to close their parent
+                if (!empty($this->stack)) {
+
+                    $parent = array_pop($this->stack);
+                    $this->stack[] = $parent;
+
+                    if (isset($definition->info[$parent->name])) {
+                        $elements = $definition->info[$parent->name]->child->getAllowedElements($config);
+                        $autoclose = !isset($elements[$token->name]);
+                    } else {
+                        $autoclose = false;
+                    }
+
+                    $carryover = false;
+                    if ($autoclose && $definition->info[$parent->name]->formatting) {
+                        $carryover = true;
+                    }
+
+                    if ($autoclose) {
+                        // errors need to be updated
+                        $new_token = new HTMLPurifier_Token_End($parent->name);
+                        $new_token->start = $parent;
+                        if ($carryover) {
+                            $element = clone $parent;
+                            $element->armor['MakeWellFormed_TagClosedError'] = true;
+                            $element->carryover = true;
+                            $this->processToken(array($new_token, $token, $element));
+                        } else {
+                            $this->insertBefore($new_token);
+                        }
+                        if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
+                            if (!$carryover) {
+                                $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
+                            } else {
+                                $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag carryover', $parent);
+                            }
+                        }
+                        $reprocess = true;
+                        continue;
+                    }
+
+                }
+                $ok = true;
+            }
+
+            if ($ok) {
+                foreach ($this->injectors as $i => $injector) {
+                    if (isset($token->skip[$i])) continue;
+                    if ($token->rewind !== null && $token->rewind !== $i) continue;
+                    $injector->handleElement($token);
+                    $this->processToken($token, $i);
+                    $reprocess = true;
+                    break;
+                }
+                if (!$reprocess) {
+                    // ah, nothing interesting happened; do normal processing
+                    $this->swap($token);
+                    if ($token instanceof HTMLPurifier_Token_Start) {
+                        $this->stack[] = $token;
+                    } elseif ($token instanceof HTMLPurifier_Token_End) {
+                        throw new HTMLPurifier_Exception('Improper handling of end tag in start code; possible error in MakeWellFormed');
+                    }
+                }
+                continue;
+            }
+
+            // sanity check: we should be dealing with a closing tag
+            if (!$token instanceof HTMLPurifier_Token_End) {
+                throw new HTMLPurifier_Exception('Unaccounted for tag token in input stream, bug in HTML Purifier');
+            }
+
+            // make sure that we have something open
+            if (empty($this->stack)) {
+                if ($escape_invalid_tags) {
+                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
+                    $this->swap(new HTMLPurifier_Token_Text(
+                        $generator->generateFromToken($token)
+                    ));
+                } else {
+                    $this->remove();
+                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
+                }
+                $reprocess = true;
+                continue;
+            }
+
+            // first, check for the simplest case: everything closes neatly.
+            // Eventually, everything passes through here; if there are problems
+            // we modify the input stream accordingly and then punt, so that
+            // the tokens get processed again.
+            $current_parent = array_pop($this->stack);
+            if ($current_parent->name == $token->name) {
+                $token->start = $current_parent;
+                foreach ($this->injectors as $i => $injector) {
+                    if (isset($token->skip[$i])) continue;
+                    if ($token->rewind !== null && $token->rewind !== $i) continue;
+                    $injector->handleEnd($token);
+                    $this->processToken($token, $i);
+                    $this->stack[] = $current_parent;
+                    $reprocess = true;
+                    break;
+                }
+                continue;
+            }
+
+            // okay, so we're trying to close the wrong tag
+
+            // undo the pop previous pop
+            $this->stack[] = $current_parent;
+
+            // scroll back the entire nest, trying to find our tag.
+            // (feature could be to specify how far you'd like to go)
+            $size = count($this->stack);
+            // -2 because -1 is the last element, but we already checked that
+            $skipped_tags = false;
+            for ($j = $size - 2; $j >= 0; $j--) {
+                if ($this->stack[$j]->name == $token->name) {
+                    $skipped_tags = array_slice($this->stack, $j);
+                    break;
+                }
+            }
+
+            // we didn't find the tag, so remove
+            if ($skipped_tags === false) {
+                if ($escape_invalid_tags) {
+                    $this->swap(new HTMLPurifier_Token_Text(
+                        $generator->generateFromToken($token)
+                    ));
+                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
+                } else {
+                    $this->remove();
+                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
+                }
+                $reprocess = true;
+                continue;
+            }
+
+            // do errors, in REVERSE $j order: a,b,c with </a></b></c>
+            $c = count($skipped_tags);
+            if ($e) {
+                for ($j = $c - 1; $j > 0; $j--) {
+                    // notice we exclude $j == 0, i.e. the current ending tag, from
+                    // the errors...
+                    if (!isset($skipped_tags[$j]->armor['MakeWellFormed_TagClosedError'])) {
+                        $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$j]);
+                    }
+                }
+            }
+
+            // insert tags, in FORWARD $j order: c,b,a with </a></b></c>
+            $replace = array($token);
+            for ($j = 1; $j < $c; $j++) {
+                // ...as well as from the insertions
+                $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);
+                $new_token->start = $skipped_tags[$j];
+                array_unshift($replace, $new_token);
+                if (isset($definition->info[$new_token->name]) && $definition->info[$new_token->name]->formatting) {
+                    $element = clone $skipped_tags[$j];
+                    $element->carryover = true;
+                    $element->armor['MakeWellFormed_TagClosedError'] = true;
+                    $replace[] = $element;
+                }
+            }
+            $this->processToken($replace);
+            $reprocess = true;
+            continue;
+        }
+
+        $context->destroy('CurrentNesting');
+        $context->destroy('InputTokens');
+        $context->destroy('InputIndex');
+        $context->destroy('CurrentToken');
+
+        unset($this->injectors, $this->stack, $this->tokens, $this->t);
+        return $tokens;
+    }
+
+    /**
+     * Processes arbitrary token values for complicated substitution patterns.
+     * In general:
+     *
+     * If $token is an array, it is a list of tokens to substitute for the
+     * current token. These tokens then get individually processed. If there
+     * is a leading integer in the list, that integer determines how many
+     * tokens from the stream should be removed.
+     *
+     * If $token is a regular token, it is swapped with the current token.
+     *
+     * If $token is false, the current token is deleted.
+     *
+     * If $token is an integer, that number of tokens (with the first token
+     * being the current one) will be deleted.
+     *
+     * @param $token Token substitution value
+     * @param $injector Injector that performed the substitution; default is if
+     *        this is not an injector related operation.
+     */
+    protected function processToken($token, $injector = -1) {
+
+        // normalize forms of token
+        if (is_object($token)) $token = array(1, $token);
+        if (is_int($token))    $token = array($token);
+        if ($token === false)  $token = array(1);
+        if (!is_array($token)) throw new HTMLPurifier_Exception('Invalid token type from injector');
+        if (!is_int($token[0])) array_unshift($token, 1);
+        if ($token[0] === 0) throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
+
+        // $token is now an array with the following form:
+        // array(number nodes to delete, new node 1, new node 2, ...)
+
+        $delete = array_shift($token);
+        $old = array_splice($this->tokens, $this->t, $delete, $token);
+
+        if ($injector > -1) {
+            // determine appropriate skips
+            $oldskip = isset($old[0]) ? $old[0]->skip : array();
+            foreach ($token as $object) {
+                $object->skip = $oldskip;
+                $object->skip[$injector] = true;
+            }
+        }
+
+    }
+
+    /**
+     * Inserts a token before the current token. Cursor now points to this token
+     */
+    private function insertBefore($token) {
+        array_splice($this->tokens, $this->t, 0, array($token));
+    }
+
+    /**
+     * Removes current token. Cursor now points to new token occupying previously
+     * occupied space.
+     */
+    private function remove() {
+        array_splice($this->tokens, $this->t, 1);
+    }
+
+    /**
+     * Swap current token with new token. Cursor points to new token (no change).
+     */
+    private function swap($token) {
+        $this->tokens[$this->t] = $token;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
new file mode 100755
index 0000000000..d30e456db3
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
@@ -0,0 +1,171 @@
+<?php
+
+/**
+ * Removes all unrecognized tags from the list of tokens.
+ *
+ * This strategy iterates through all the tokens and removes unrecognized
+ * tokens. If a token is not recognized but a TagTransform is defined for
+ * that element, the element will be transformed accordingly.
+ */
+
+class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
+{
+
+    public function execute($tokens, $config, $context) {
+        $definition = $config->getHTMLDefinition();
+        $generator = new HTMLPurifier_Generator($config, $context);
+        $result = array();
+
+        $escape_invalid_tags = $config->get('Core', 'EscapeInvalidTags');
+        $remove_invalid_img  = $config->get('Core', 'RemoveInvalidImg');
+
+        // currently only used to determine if comments should be kept
+        $trusted = $config->get('HTML', 'Trusted');
+
+        $remove_script_contents = $config->get('Core', 'RemoveScriptContents');
+        $hidden_elements     = $config->get('Core', 'HiddenElements');
+
+        // remove script contents compatibility
+        if ($remove_script_contents === true) {
+            $hidden_elements['script'] = true;
+        } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
+            unset($hidden_elements['script']);
+        }
+
+        $attr_validator = new HTMLPurifier_AttrValidator();
+
+        // removes tokens until it reaches a closing tag with its value
+        $remove_until = false;
+
+        // converts comments into text tokens when this is equal to a tag name
+        $textify_comments = false;
+
+        $token = false;
+        $context->register('CurrentToken', $token);
+
+        $e = false;
+        if ($config->get('Core', 'CollectErrors')) {
+            $e =& $context->get('ErrorCollector');
+        }
+
+        foreach($tokens as $token) {
+            if ($remove_until) {
+                if (empty($token->is_tag) || $token->name !== $remove_until) {
+                    continue;
+                }
+            }
+            if (!empty( $token->is_tag )) {
+                // DEFINITION CALL
+
+                // before any processing, try to transform the element
+                if (
+                    isset($definition->info_tag_transform[$token->name])
+                ) {
+                    $original_name = $token->name;
+                    // there is a transformation for this tag
+                    // DEFINITION CALL
+                    $token = $definition->
+                                info_tag_transform[$token->name]->
+                                    transform($token, $config, $context);
+                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
+                }
+
+                if (isset($definition->info[$token->name])) {
+
+                    // mostly everything's good, but
+                    // we need to make sure required attributes are in order
+                    if (
+                        ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
+                        $definition->info[$token->name]->required_attr &&
+                        ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
+                    ) {
+                        $attr_validator->validateToken($token, $config, $context);
+                        $ok = true;
+                        foreach ($definition->info[$token->name]->required_attr as $name) {
+                            if (!isset($token->attr[$name])) {
+                                $ok = false;
+                                break;
+                            }
+                        }
+                        if (!$ok) {
+                            if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
+                            continue;
+                        }
+                        $token->armor['ValidateAttributes'] = true;
+                    }
+
+                    if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
+                        $textify_comments = $token->name;
+                    } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
+                        $textify_comments = false;
+                    }
+
+                } elseif ($escape_invalid_tags) {
+                    // invalid tag, generate HTML representation and insert in
+                    if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+                    $token = new HTMLPurifier_Token_Text(
+                        $generator->generateFromToken($token)
+                    );
+                } else {
+                    // check if we need to destroy all of the tag's children
+                    // CAN BE GENERICIZED
+                    if (isset($hidden_elements[$token->name])) {
+                        if ($token instanceof HTMLPurifier_Token_Start) {
+                            $remove_until = $token->name;
+                        } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+                            // do nothing: we're still looking
+                        } else {
+                            $remove_until = false;
+                        }
+                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
+                    } else {
+                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+                    }
+                    continue;
+                }
+            } elseif ($token instanceof HTMLPurifier_Token_Comment) {
+                // textify comments in script tags when they are allowed
+                if ($textify_comments !== false) {
+                    $data = $token->data;
+                    $token = new HTMLPurifier_Token_Text($data);
+                } elseif ($trusted) {
+                    // keep, but perform comment cleaning
+                    if ($e) {
+                        // perform check whether or not there's a trailing hyphen
+                        if (substr($token->data, -1) == '-') {
+                            $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed');
+                        }
+                    }
+                    $token->data = rtrim($token->data, '-');
+                    $found_double_hyphen = false;
+                    while (strpos($token->data, '--') !== false) {
+                        if ($e && !$found_double_hyphen) {
+                            $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
+                        }
+                        $found_double_hyphen = true; // prevent double-erroring
+                        $token->data = str_replace('--', '-', $token->data);
+                    }
+                } else {
+                    // strip comments
+                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+                    continue;
+                }
+            } elseif ($token instanceof HTMLPurifier_Token_Text) {
+            } else {
+                continue;
+            }
+            $result[] = $token;
+        }
+        if ($remove_until && $e) {
+            // we removed tokens until the end, throw error
+            $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
+        }
+
+        $context->destroy('CurrentToken');
+
+        return $result;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
new file mode 100755
index 0000000000..c3328a9d44
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Validate all attributes in the tokens.
+ */
+
+class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
+{
+
+    public function execute($tokens, $config, $context) {
+
+        // setup validator
+        $validator = new HTMLPurifier_AttrValidator();
+
+        $token = false;
+        $context->register('CurrentToken', $token);
+
+        foreach ($tokens as $key => $token) {
+
+            // only process tokens that have attributes,
+            //   namely start and empty tags
+            if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) continue;
+
+            // skip tokens that are armored
+            if (!empty($token->armor['ValidateAttributes'])) continue;
+
+            // note that we have no facilities here for removing tokens
+            $validator->validateToken($token, $config, $context);
+
+            $tokens[$key] = $token; // for PHP 4
+        }
+        $context->destroy('CurrentToken');
+
+        return $tokens;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHash.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHash.php
new file mode 100755
index 0000000000..62085c5c2f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHash.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This is in almost every respect equivalent to an array except
+ * that it keeps track of which keys were accessed.
+ *
+ * @warning For the sake of backwards compatibility with early versions
+ *     of PHP 5, you must not use the $hash[$key] syntax; if you do
+ *     our version of offsetGet is never called.
+ */
+class HTMLPurifier_StringHash extends ArrayObject
+{
+    protected $accessed = array();
+
+    /**
+     * Retrieves a value, and logs the access.
+     */
+    public function offsetGet($index) {
+        $this->accessed[$index] = true;
+        return parent::offsetGet($index);
+    }
+
+    /**
+     * Returns a lookup array of all array indexes that have been accessed.
+     * @return Array in form array($index => true).
+     */
+    public function getAccessed() {
+        return $this->accessed;
+    }
+
+    /**
+     * Resets the access array.
+     */
+    public function resetAccessed() {
+        $this->accessed = array();
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHashParser.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHashParser.php
new file mode 100755
index 0000000000..f3e70c712f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/StringHashParser.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * Parses string hash files. File format is as such:
+ *
+ *      DefaultKeyValue
+ *      KEY: Value
+ *      KEY2: Value2
+ *      --MULTILINE-KEY--
+ *      Multiline
+ *      value.
+ *
+ * Which would output something similar to:
+ *
+ *      array(
+ *          'ID' => 'DefaultKeyValue',
+ *          'KEY' => 'Value',
+ *          'KEY2' => 'Value2',
+ *          'MULTILINE-KEY' => "Multiline\nvalue.\n",
+ *      )
+ *
+ * We use this as an easy to use file-format for configuration schema
+ * files, but the class itself is usage agnostic.
+ *
+ * You can use ---- to forcibly terminate parsing of a single string-hash;
+ * this marker is used in multi string-hashes to delimit boundaries.
+ */
+class HTMLPurifier_StringHashParser
+{
+
+    public $default = 'ID';
+
+    /**
+     * Parses a file that contains a single string-hash.
+     */
+    public function parseFile($file) {
+        if (!file_exists($file)) return false;
+        $fh = fopen($file, 'r');
+        if (!$fh) return false;
+        $ret = $this->parseHandle($fh);
+        fclose($fh);
+        return $ret;
+    }
+
+    /**
+     * Parses a file that contains multiple string-hashes delimited by '----'
+     */
+    public function parseMultiFile($file) {
+        if (!file_exists($file)) return false;
+        $ret = array();
+        $fh = fopen($file, 'r');
+        if (!$fh) return false;
+        while (!feof($fh)) {
+            $ret[] = $this->parseHandle($fh);
+        }
+        fclose($fh);
+        return $ret;
+    }
+
+    /**
+     * Internal parser that acepts a file handle.
+     * @note While it's possible to simulate in-memory parsing by using
+     *       custom stream wrappers, if such a use-case arises we should
+     *       factor out the file handle into its own class.
+     * @param $fh File handle with pointer at start of valid string-hash
+     *            block.
+     */
+    protected function parseHandle($fh) {
+        $state   = false;
+        $single  = false;
+        $ret     = array();
+        do {
+            $line = fgets($fh);
+            if ($line === false) break;
+            $line = rtrim($line, "\n\r");
+            if (!$state && $line === '') continue;
+            if ($line === '----') break;
+            if (strncmp('--#', $line, 3) === 0) {
+                // Comment
+                continue;
+            } elseif (strncmp('--', $line, 2) === 0) {
+                // Multiline declaration
+                $state = trim($line, '- ');
+                if (!isset($ret[$state])) $ret[$state] = '';
+                continue;
+            } elseif (!$state) {
+                $single = true;
+                if (strpos($line, ':') !== false) {
+                    // Single-line declaration
+                    list($state, $line) = explode(':', $line, 2);
+                    $line = trim($line);
+                } else {
+                    // Use default declaration
+                    $state  = $this->default;
+                }
+            }
+            if ($single) {
+                $ret[$state] = $line;
+                $single = false;
+                $state  = false;
+            } else {
+                $ret[$state] .= "$line\n";
+            }
+        } while (!feof($fh));
+        return $ret;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform.php
new file mode 100755
index 0000000000..210a447217
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Defines a mutation of an obsolete tag into a valid tag.
+ */
+abstract class HTMLPurifier_TagTransform
+{
+
+    /**
+     * Tag name to transform the tag to.
+     */
+    public $transform_to;
+
+    /**
+     * Transforms the obsolete tag into the valid tag.
+     * @param $tag Tag to be transformed.
+     * @param $config Mandatory HTMLPurifier_Config object
+     * @param $context Mandatory HTMLPurifier_Context object
+     */
+    abstract public function transform($tag, $config, $context);
+
+    /**
+     * Prepends CSS properties to the style attribute, creating the
+     * attribute if it doesn't exist.
+     * @warning Copied over from AttrTransform, be sure to keep in sync
+     * @param $attr Attribute array to process (passed by reference)
+     * @param $css CSS to prepend
+     */
+    protected function prependCSS(&$attr, $css) {
+        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
+        $attr['style'] = $css . $attr['style'];
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
new file mode 100755
index 0000000000..ed2463786d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Transforms FONT tags to the proper form (SPAN with CSS styling)
+ *
+ * This transformation takes the three proprietary attributes of FONT and
+ * transforms them into their corresponding CSS attributes.  These are color,
+ * face, and size.
+ *
+ * @note Size is an interesting case because it doesn't map cleanly to CSS.
+ *       Thanks to
+ *       http://style.cleverchimp.com/font_size_intervals/altintervals.html
+ *       for reasonable mappings.
+ * @warning This doesn't work completely correctly; specifically, this
+ *          TagTransform operates before well-formedness is enforced, so
+ *          the "active formatting elements" algorithm doesn't get applied.
+ */
+class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
+{
+
+    public $transform_to = 'span';
+
+    protected $_size_lookup = array(
+        '0' => 'xx-small',
+        '1' => 'xx-small',
+        '2' => 'small',
+        '3' => 'medium',
+        '4' => 'large',
+        '5' => 'x-large',
+        '6' => 'xx-large',
+        '7' => '300%',
+        '-1' => 'smaller',
+        '-2' => '60%',
+        '+1' => 'larger',
+        '+2' => '150%',
+        '+3' => '200%',
+        '+4' => '300%'
+    );
+
+    public function transform($tag, $config, $context) {
+
+        if ($tag instanceof HTMLPurifier_Token_End) {
+            $new_tag = clone $tag;
+            $new_tag->name = $this->transform_to;
+            return $new_tag;
+        }
+
+        $attr = $tag->attr;
+        $prepend_style = '';
+
+        // handle color transform
+        if (isset($attr['color'])) {
+            $prepend_style .= 'color:' . $attr['color'] . ';';
+            unset($attr['color']);
+        }
+
+        // handle face transform
+        if (isset($attr['face'])) {
+            $prepend_style .= 'font-family:' . $attr['face'] . ';';
+            unset($attr['face']);
+        }
+
+        // handle size transform
+        if (isset($attr['size'])) {
+            // normalize large numbers
+            if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
+                $size = (int) $attr['size'];
+                if ($size < -2) $attr['size'] = '-2';
+                if ($size > 4)  $attr['size'] = '+4';
+            } else {
+                $size = (int) $attr['size'];
+                if ($size > 7) $attr['size'] = '7';
+            }
+            if (isset($this->_size_lookup[$attr['size']])) {
+                $prepend_style .= 'font-size:' .
+                  $this->_size_lookup[$attr['size']] . ';';
+            }
+            unset($attr['size']);
+        }
+
+        if ($prepend_style) {
+            $attr['style'] = isset($attr['style']) ?
+                $prepend_style . $attr['style'] :
+                $prepend_style;
+        }
+
+        $new_tag = clone $tag;
+        $new_tag->name = $this->transform_to;
+        $new_tag->attr = $attr;
+
+        return $new_tag;
+
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
new file mode 100755
index 0000000000..0e36130f25
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple transformation, just change tag name to something else,
+ * and possibly add some styling. This will cover most of the deprecated
+ * tag cases.
+ */
+class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
+{
+
+    protected $style;
+
+    /**
+     * @param $transform_to Tag name to transform to.
+     * @param $style CSS style to add to the tag
+     */
+    public function __construct($transform_to, $style = null) {
+        $this->transform_to = $transform_to;
+        $this->style = $style;
+    }
+
+    public function transform($tag, $config, $context) {
+        $new_tag = clone $tag;
+        $new_tag->name = $this->transform_to;
+        if (!is_null($this->style) &&
+            ($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
+        ) {
+            $this->prependCSS($new_tag->attr, $this->style);
+        }
+        return $new_tag;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token.php
new file mode 100755
index 0000000000..7900e6cb10
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Abstract base token class that all others inherit from.
+ */
+class HTMLPurifier_Token {
+    public $line; /**< Line number node was on in source document. Null if unknown. */
+    public $col;  /**< Column of line node was on in source document. Null if unknown. */
+
+    /**
+     * Lookup array of processing that this token is exempt from.
+     * Currently, valid values are "ValidateAttributes" and
+     * "MakeWellFormed_TagClosedError"
+     */
+    public $armor = array();
+
+    /**
+     * Used during MakeWellFormed.
+     */
+    public $skip;
+    public $rewind;
+    public $carryover;
+
+    public function __get($n) {
+      if ($n === 'type') {
+        trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
+        switch (get_class($this)) {
+          case 'HTMLPurifier_Token_Start':      return 'start';
+          case 'HTMLPurifier_Token_Empty':      return 'empty';
+          case 'HTMLPurifier_Token_End':        return 'end';
+          case 'HTMLPurifier_Token_Text':       return 'text';
+          case 'HTMLPurifier_Token_Comment':    return 'comment';
+          default: return null;
+        }
+      }
+    }
+
+    /**
+     * Sets the position of the token in the source document.
+     */
+    public function position($l = null, $c = null) {
+        $this->line = $l;
+        $this->col  = $c;
+    }
+
+    /**
+     * Convenience function for DirectLex settings line/col position.
+     */
+    public function rawPosition($l, $c) {
+        if ($c === -1) $l++;
+        $this->line = $l;
+        $this->col  = $c;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Comment.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Comment.php
new file mode 100755
index 0000000000..dc6bdcabb8
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Comment.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Concrete comment token class. Generally will be ignored.
+ */
+class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
+{
+    public $data; /**< Character data within comment. */
+    public $is_whitespace = true;
+    /**
+     * Transparent constructor.
+     *
+     * @param $data String comment data.
+     */
+    public function __construct($data, $line = null, $col = null) {
+        $this->data = $data;
+        $this->line = $line;
+        $this->col  = $col;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Empty.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Empty.php
new file mode 100755
index 0000000000..2a82b47ad1
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Empty.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Concrete empty token class.
+ */
+class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/End.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/End.php
new file mode 100755
index 0000000000..353e79daf7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/End.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Concrete end token class.
+ *
+ * @warning This class accepts attributes even though end tags cannot. This
+ * is for optimization reasons, as under normal circumstances, the Lexers
+ * do not pass attributes.
+ */
+class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
+{
+    /**
+     * Token that started this node. Added by MakeWellFormed. Please
+     * do not edit this!
+     */
+    public $start;
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Start.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Start.php
new file mode 100755
index 0000000000..e0e14fc624
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Start.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Concrete start token class.
+ */
+class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Tag.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Tag.php
new file mode 100755
index 0000000000..798be028ee
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Tag.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Abstract class of a tag token (start, end or empty), and its behavior.
+ */
+class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
+{
+    /**
+     * Static bool marker that indicates the class is a tag.
+     *
+     * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
+     * without having to use a function call <tt>is_a()</tt>.
+     */
+    public $is_tag = true;
+
+    /**
+     * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
+     *
+     * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
+     * be lower-casing them, but these tokens cater to HTML tags, which are
+     * insensitive.
+     */
+    public $name;
+
+    /**
+     * Associative array of the tag's attributes.
+     */
+    public $attr = array();
+
+    /**
+     * Non-overloaded constructor, which lower-cases passed tag name.
+     *
+     * @param $name String name.
+     * @param $attr Associative array of attributes.
+     */
+    public function __construct($name, $attr = array(), $line = null, $col = null) {
+        $this->name = ctype_lower($name) ? $name : strtolower($name);
+        foreach ($attr as $key => $value) {
+            // normalization only necessary when key is not lowercase
+            if (!ctype_lower($key)) {
+                $new_key = strtolower($key);
+                if (!isset($attr[$new_key])) {
+                    $attr[$new_key] = $attr[$key];
+                }
+                if ($new_key !== $key) {
+                    unset($attr[$key]);
+                }
+            }
+        }
+        $this->attr = $attr;
+        $this->line = $line;
+        $this->col  = $col;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Text.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Text.php
new file mode 100755
index 0000000000..82efd823d6
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/Token/Text.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Concrete text token class.
+ *
+ * Text tokens comprise of regular parsed character data (PCDATA) and raw
+ * character data (from the CDATA sections). Internally, their
+ * data is parsed with all entities expanded. Surprisingly, the text token
+ * does have a "tag name" called #PCDATA, which is how the DTD represents it
+ * in permissible child nodes.
+ */
+class HTMLPurifier_Token_Text extends HTMLPurifier_Token
+{
+
+    public $name = '#PCDATA'; /**< PCDATA tag name compatible with DTD. */
+    public $data; /**< Parsed character data of text. */
+    public $is_whitespace; /**< Bool indicating if node is whitespace. */
+
+    /**
+     * Constructor, accepts data and determines if it is whitespace.
+     *
+     * @param $data String parsed character data.
+     */
+    public function __construct($data, $line = null, $col = null) {
+        $this->data = $data;
+        $this->is_whitespace = ctype_space($data);
+        $this->line = $line;
+        $this->col  = $col;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TokenFactory.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TokenFactory.php
new file mode 100755
index 0000000000..7cf48fb41c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/TokenFactory.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * Factory for token generation.
+ *
+ * @note Doing some benchmarking indicates that the new operator is much
+ *       slower than the clone operator (even discounting the cost of the
+ *       constructor).  This class is for that optimization.
+ *       Other then that, there's not much point as we don't
+ *       maintain parallel HTMLPurifier_Token hierarchies (the main reason why
+ *       you'd want to use an abstract factory).
+ * @todo Port DirectLex to use this
+ */
+class HTMLPurifier_TokenFactory
+{
+
+    /**
+     * Prototypes that will be cloned.
+     * @private
+     */
+    // p stands for prototype
+    private $p_start, $p_end, $p_empty, $p_text, $p_comment;
+
+    /**
+     * Generates blank prototypes for cloning.
+     */
+    public function __construct() {
+        $this->p_start  = new HTMLPurifier_Token_Start('', array());
+        $this->p_end    = new HTMLPurifier_Token_End('');
+        $this->p_empty  = new HTMLPurifier_Token_Empty('', array());
+        $this->p_text   = new HTMLPurifier_Token_Text('');
+        $this->p_comment= new HTMLPurifier_Token_Comment('');
+    }
+
+    /**
+     * Creates a HTMLPurifier_Token_Start.
+     * @param $name Tag name
+     * @param $attr Associative array of attributes
+     * @return Generated HTMLPurifier_Token_Start
+     */
+    public function createStart($name, $attr = array()) {
+        $p = clone $this->p_start;
+        $p->__construct($name, $attr);
+        return $p;
+    }
+
+    /**
+     * Creates a HTMLPurifier_Token_End.
+     * @param $name Tag name
+     * @return Generated HTMLPurifier_Token_End
+     */
+    public function createEnd($name) {
+        $p = clone $this->p_end;
+        $p->__construct($name);
+        return $p;
+    }
+
+    /**
+     * Creates a HTMLPurifier_Token_Empty.
+     * @param $name Tag name
+     * @param $attr Associative array of attributes
+     * @return Generated HTMLPurifier_Token_Empty
+     */
+    public function createEmpty($name, $attr = array()) {
+        $p = clone $this->p_empty;
+        $p->__construct($name, $attr);
+        return $p;
+    }
+
+    /**
+     * Creates a HTMLPurifier_Token_Text.
+     * @param $data Data of text token
+     * @return Generated HTMLPurifier_Token_Text
+     */
+    public function createText($data) {
+        $p = clone $this->p_text;
+        $p->__construct($data);
+        return $p;
+    }
+
+    /**
+     * Creates a HTMLPurifier_Token_Comment.
+     * @param $data Data of comment token
+     * @return Generated HTMLPurifier_Token_Comment
+     */
+    public function createComment($data) {
+        $p = clone $this->p_comment;
+        $p->__construct($data);
+        return $p;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URI.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URI.php
new file mode 100755
index 0000000000..8b50d0d18d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URI.php
@@ -0,0 +1,173 @@
+<?php
+
+/**
+ * HTML Purifier's internal representation of a URI.
+ * @note
+ *      Internal data-structures are completely escaped. If the data needs
+ *      to be used in a non-URI context (which is very unlikely), be sure
+ *      to decode it first. The URI may not necessarily be well-formed until
+ *      validate() is called.
+ */
+class HTMLPurifier_URI
+{
+
+    public $scheme, $userinfo, $host, $port, $path, $query, $fragment;
+
+    /**
+     * @note Automatically normalizes scheme and port
+     */
+    public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
+        $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
+        $this->userinfo = $userinfo;
+        $this->host = $host;
+        $this->port = is_null($port) ? $port : (int) $port;
+        $this->path = $path;
+        $this->query = $query;
+        $this->fragment = $fragment;
+    }
+
+    /**
+     * Retrieves a scheme object corresponding to the URI's scheme/default
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @return Scheme object appropriate for validating this URI
+     */
+    public function getSchemeObj($config, $context) {
+        $registry = HTMLPurifier_URISchemeRegistry::instance();
+        if ($this->scheme !== null) {
+            $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
+            if (!$scheme_obj) return false; // invalid scheme, clean it out
+        } else {
+            // no scheme: retrieve the default one
+            $def = $config->getDefinition('URI');
+            $scheme_obj = $registry->getScheme($def->defaultScheme, $config, $context);
+            if (!$scheme_obj) {
+                // something funky happened to the default scheme object
+                trigger_error(
+                    'Default scheme object "' . $def->defaultScheme . '" was not readable',
+                    E_USER_WARNING
+                );
+                return false;
+            }
+        }
+        return $scheme_obj;
+    }
+
+    /**
+     * Generic validation method applicable for all schemes. May modify
+     * this URI in order to get it into a compliant form.
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @return True if validation/filtering succeeds, false if failure
+     */
+    public function validate($config, $context) {
+
+        // ABNF definitions from RFC 3986
+        $chars_sub_delims = '!$&\'()*+,;=';
+        $chars_gen_delims = ':/?#[]@';
+        $chars_pchar = $chars_sub_delims . ':@';
+
+        // validate scheme (MUST BE FIRST!)
+        if (!is_null($this->scheme) && is_null($this->host)) {
+            $def = $config->getDefinition('URI');
+            if ($def->defaultScheme === $this->scheme) {
+                $this->scheme = null;
+            }
+        }
+
+        // validate host
+        if (!is_null($this->host)) {
+            $host_def = new HTMLPurifier_AttrDef_URI_Host();
+            $this->host = $host_def->validate($this->host, $config, $context);
+            if ($this->host === false) $this->host = null;
+        }
+
+        // validate username
+        if (!is_null($this->userinfo)) {
+            $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
+            $this->userinfo = $encoder->encode($this->userinfo);
+        }
+
+        // validate port
+        if (!is_null($this->port)) {
+            if ($this->port < 1 || $this->port > 65535) $this->port = null;
+        }
+
+        // validate path
+        $path_parts = array();
+        $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
+        if (!is_null($this->host)) {
+            // path-abempty (hier and relative)
+            $this->path = $segments_encoder->encode($this->path);
+        } elseif ($this->path !== '' && $this->path[0] === '/') {
+            // path-absolute (hier and relative)
+            if (strlen($this->path) >= 2 && $this->path[1] === '/') {
+                // This shouldn't ever happen!
+                $this->path = '';
+            } else {
+                $this->path = $segments_encoder->encode($this->path);
+            }
+        } elseif (!is_null($this->scheme) && $this->path !== '') {
+            // path-rootless (hier)
+            // Short circuit evaluation means we don't need to check nz
+            $this->path = $segments_encoder->encode($this->path);
+        } elseif (is_null($this->scheme) && $this->path !== '') {
+            // path-noscheme (relative)
+            // (once again, not checking nz)
+            $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
+            $c = strpos($this->path, '/');
+            if ($c !== false) {
+                $this->path =
+                    $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
+                    $segments_encoder->encode(substr($this->path, $c));
+            } else {
+                $this->path = $segment_nc_encoder->encode($this->path);
+            }
+        } else {
+            // path-empty (hier and relative)
+            $this->path = ''; // just to be safe
+        }
+
+        // qf = query and fragment
+        $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
+
+        if (!is_null($this->query)) {
+            $this->query = $qf_encoder->encode($this->query);
+        }
+
+        if (!is_null($this->fragment)) {
+            $this->fragment = $qf_encoder->encode($this->fragment);
+        }
+
+        return true;
+
+    }
+
+    /**
+     * Convert URI back to string
+     * @return String URI appropriate for output
+     */
+    public function toString() {
+        // reconstruct authority
+        $authority = null;
+        if (!is_null($this->host)) {
+            $authority = '';
+            if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
+            $authority .= $this->host;
+            if(!is_null($this->port))     $authority .= ':' . $this->port;
+        }
+
+        // reconstruct the result
+        $result = '';
+        if (!is_null($this->scheme))    $result .= $this->scheme . ':';
+        if (!is_null($authority))       $result .=  '//' . $authority;
+        $result .= $this->path;
+        if (!is_null($this->query))     $result .= '?' . $this->query;
+        if (!is_null($this->fragment))  $result .= '#' . $this->fragment;
+
+        return $result;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIDefinition.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIDefinition.php
new file mode 100755
index 0000000000..183fcfc7e7
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIDefinition.php
@@ -0,0 +1,93 @@
+<?php
+
+class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
+{
+
+    public $type = 'URI';
+    protected $filters = array();
+    protected $postFilters = array();
+    protected $registeredFilters = array();
+
+    /**
+     * HTMLPurifier_URI object of the base specified at %URI.Base
+     */
+    public $base;
+
+    /**
+     * String host to consider "home" base, derived off of $base
+     */
+    public $host;
+
+    /**
+     * Name of default scheme based on %URI.DefaultScheme and %URI.Base
+     */
+    public $defaultScheme;
+
+    public function __construct() {
+        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
+        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
+        $this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
+        $this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
+        $this->registerFilter(new HTMLPurifier_URIFilter_Munge());
+    }
+
+    public function registerFilter($filter) {
+        $this->registeredFilters[$filter->name] = $filter;
+    }
+
+    public function addFilter($filter, $config) {
+        $r = $filter->prepare($config);
+        if ($r === false) return; // null is ok, for backwards compat
+        if ($filter->post) {
+            $this->postFilters[$filter->name] = $filter;
+        } else {
+            $this->filters[$filter->name] = $filter;
+        }
+    }
+
+    protected function doSetup($config) {
+        $this->setupMemberVariables($config);
+        $this->setupFilters($config);
+    }
+
+    protected function setupFilters($config) {
+        foreach ($this->registeredFilters as $name => $filter) {
+            $conf = $config->get('URI', $name);
+            if ($conf !== false && $conf !== null) {
+                $this->addFilter($filter, $config);
+            }
+        }
+        unset($this->registeredFilters);
+    }
+
+    protected function setupMemberVariables($config) {
+        $this->host = $config->get('URI', 'Host');
+        $base_uri = $config->get('URI', 'Base');
+        if (!is_null($base_uri)) {
+            $parser = new HTMLPurifier_URIParser();
+            $this->base = $parser->parse($base_uri);
+            $this->defaultScheme = $this->base->scheme;
+            if (is_null($this->host)) $this->host = $this->base->host;
+        }
+        if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI', 'DefaultScheme');
+    }
+
+    public function filter(&$uri, $config, $context) {
+        foreach ($this->filters as $name => $f) {
+            $result = $f->filter($uri, $config, $context);
+            if (!$result) return false;
+        }
+        return true;
+    }
+
+    public function postFilter(&$uri, $config, $context) {
+        foreach ($this->postFilters as $name => $f) {
+            $result = $f->filter($uri, $config, $context);
+            if (!$result) return false;
+        }
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter.php
new file mode 100755
index 0000000000..c116f93dff
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Chainable filters for custom URI processing.
+ *
+ * These filters can perform custom actions on a URI filter object,
+ * including transformation or blacklisting.
+ *
+ * @warning This filter is called before scheme object validation occurs.
+ *          Make sure, if you require a specific scheme object, you
+ *          you check that it exists. This allows filters to convert
+ *          proprietary URI schemes into regular ones.
+ */
+abstract class HTMLPurifier_URIFilter
+{
+
+    /**
+     * Unique identifier of filter
+     */
+    public $name;
+
+    /**
+     * True if this filter should be run after scheme validation.
+     */
+    public $post = false;
+
+    /**
+     * Performs initialization for the filter
+     */
+    public function prepare($config) {return true;}
+
+    /**
+     * Filter a URI object
+     * @param $uri Reference to URI object variable
+     * @param $config Instance of HTMLPurifier_Config
+     * @param $context Instance of HTMLPurifier_Context
+     * @return bool Whether or not to continue processing: false indicates
+     *         URL is no good, true indicates continue processing. Note that
+     *         all changes are committed directly on the URI object
+     */
+    abstract public function filter(&$uri, $config, $context);
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
new file mode 100755
index 0000000000..d8a39a5011
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
@@ -0,0 +1,23 @@
+<?php
+
+class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
+{
+    public $name = 'DisableExternal';
+    protected $ourHostParts = false;
+    public function prepare($config) {
+        $our_host = $config->getDefinition('URI')->host;
+        if ($our_host !== null) $this->ourHostParts = array_reverse(explode('.', $our_host));
+    }
+    public function filter(&$uri, $config, $context) {
+        if (is_null($uri->host)) return true;
+        if ($this->ourHostParts === false) return false;
+        $host_parts = array_reverse(explode('.', $uri->host));
+        foreach ($this->ourHostParts as $i => $x) {
+            if (!isset($host_parts[$i])) return false;
+            if ($host_parts[$i] != $this->ourHostParts[$i]) return false;
+        }
+        return true;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
new file mode 100755
index 0000000000..881abc43cf
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
@@ -0,0 +1,12 @@
+<?php
+
+class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
+{
+    public $name = 'DisableExternalResources';
+    public function filter(&$uri, $config, $context) {
+        if (!$context->get('EmbeddedURI', true)) return true;
+        return parent::filter($uri, $config, $context);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
new file mode 100755
index 0000000000..bac56e8b8e
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
@@ -0,0 +1,21 @@
+<?php
+
+class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
+{
+    public $name = 'HostBlacklist';
+    protected $blacklist = array();
+    public function prepare($config) {
+        $this->blacklist = $config->get('URI', 'HostBlacklist');
+        return true;
+    }
+    public function filter(&$uri, $config, $context) {
+        foreach($this->blacklist as $blacklisted_host_fragment) {
+            if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
new file mode 100755
index 0000000000..f46ab2630d
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
@@ -0,0 +1,114 @@
+<?php
+
+// does not support network paths
+
+class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
+{
+    public $name = 'MakeAbsolute';
+    protected $base;
+    protected $basePathStack = array();
+    public function prepare($config) {
+        $def = $config->getDefinition('URI');
+        $this->base = $def->base;
+        if (is_null($this->base)) {
+            trigger_error('URI.MakeAbsolute is being ignored due to lack of value for URI.Base configuration', E_USER_WARNING);
+            return false;
+        }
+        $this->base->fragment = null; // fragment is invalid for base URI
+        $stack = explode('/', $this->base->path);
+        array_pop($stack); // discard last segment
+        $stack = $this->_collapseStack($stack); // do pre-parsing
+        $this->basePathStack = $stack;
+        return true;
+    }
+    public function filter(&$uri, $config, $context) {
+        if (is_null($this->base)) return true; // abort early
+        if (
+            $uri->path === '' && is_null($uri->scheme) &&
+            is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)
+        ) {
+            // reference to current document
+            $uri = clone $this->base;
+            return true;
+        }
+        if (!is_null($uri->scheme)) {
+            // absolute URI already: don't change
+            if (!is_null($uri->host)) return true;
+            $scheme_obj = $uri->getSchemeObj($config, $context);
+            if (!$scheme_obj) {
+                // scheme not recognized
+                return false;
+            }
+            if (!$scheme_obj->hierarchical) {
+                // non-hierarchal URI with explicit scheme, don't change
+                return true;
+            }
+            // special case: had a scheme but always is hierarchical and had no authority
+        }
+        if (!is_null($uri->host)) {
+            // network path, don't bother
+            return true;
+        }
+        if ($uri->path === '') {
+            $uri->path = $this->base->path;
+        } elseif ($uri->path[0] !== '/') {
+            // relative path, needs more complicated processing
+            $stack = explode('/', $uri->path);
+            $new_stack = array_merge($this->basePathStack, $stack);
+            if ($new_stack[0] !== '' && !is_null($this->base->host)) {
+                array_unshift($new_stack, '');
+            }
+            $new_stack = $this->_collapseStack($new_stack);
+            $uri->path = implode('/', $new_stack);
+        } else {
+            // absolute path, but still we should collapse
+            $uri->path = implode('/', $this->_collapseStack(explode('/', $uri->path)));
+        }
+        // re-combine
+        $uri->scheme = $this->base->scheme;
+        if (is_null($uri->userinfo)) $uri->userinfo = $this->base->userinfo;
+        if (is_null($uri->host))     $uri->host     = $this->base->host;
+        if (is_null($uri->port))     $uri->port     = $this->base->port;
+        return true;
+    }
+
+    /**
+     * Resolve dots and double-dots in a path stack
+     */
+    private function _collapseStack($stack) {
+        $result = array();
+        $is_folder = false;
+        for ($i = 0; isset($stack[$i]); $i++) {
+            $is_folder = false;
+            // absorb an internally duplicated slash
+            if ($stack[$i] == '' && $i && isset($stack[$i+1])) continue;
+            if ($stack[$i] == '..') {
+                if (!empty($result)) {
+                    $segment = array_pop($result);
+                    if ($segment === '' && empty($result)) {
+                        // error case: attempted to back out too far:
+                        // restore the leading slash
+                        $result[] = '';
+                    } elseif ($segment === '..') {
+                        $result[] = '..'; // cannot remove .. with ..
+                    }
+                } else {
+                    // relative path, preserve the double-dots
+                    $result[] = '..';
+                }
+                $is_folder = true;
+                continue;
+            }
+            if ($stack[$i] == '.') {
+                // silently absorb
+                $is_folder = true;
+                continue;
+            }
+            $result[] = $stack[$i];
+        }
+        if ($is_folder) $result[] = '';
+        return $result;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
new file mode 100755
index 0000000000..29ed0ed1f2
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
@@ -0,0 +1,54 @@
+<?php
+
+class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
+{
+    public $name = 'Munge';
+    public $post = true;
+    private $target, $parser, $doEmbed, $secretKey;
+
+    protected $replace = array();
+
+    public function prepare($config) {
+        $this->target    = $config->get('URI', $this->name);
+        $this->parser    = new HTMLPurifier_URIParser();
+        $this->doEmbed   = $config->get('URI', 'MungeResources');
+        $this->secretKey = $config->get('URI', 'MungeSecretKey');
+        return true;
+    }
+    public function filter(&$uri, $config, $context) {
+        if ($context->get('EmbeddedURI', true) && !$this->doEmbed) return true;
+
+        $scheme_obj = $uri->getSchemeObj($config, $context);
+        if (!$scheme_obj) return true; // ignore unknown schemes, maybe another postfilter did it
+        if (is_null($uri->host) || empty($scheme_obj->browsable)) {
+            return true;
+        }
+
+        $this->makeReplace($uri, $config, $context);
+        $this->replace = array_map('rawurlencode', $this->replace);
+
+        $new_uri = strtr($this->target, $this->replace);
+        $new_uri = $this->parser->parse($new_uri);
+        // don't redirect if the target host is the same as the
+        // starting host
+        if ($uri->host === $new_uri->host) return true;
+        $uri = $new_uri; // overwrite
+        return true;
+    }
+
+    protected function makeReplace($uri, $config, $context) {
+        $string = $uri->toString();
+        // always available
+        $this->replace['%s'] = $string;
+        $this->replace['%r'] = $context->get('EmbeddedURI', true);
+        $token = $context->get('CurrentToken', true);
+        $this->replace['%n'] = $token ? $token->name : null;
+        $this->replace['%m'] = $context->get('CurrentAttr', true);
+        $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
+        // not always available
+        if ($this->secretKey) $this->replace['%t'] = sha1($this->secretKey . ':' . $string);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIParser.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIParser.php
new file mode 100755
index 0000000000..7179e4ab89
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIParser.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Parses a URI into the components and fragment identifier as specified
+ * by RFC 3986.
+ */
+class HTMLPurifier_URIParser
+{
+
+    /**
+     * Instance of HTMLPurifier_PercentEncoder to do normalization with.
+     */
+    protected $percentEncoder;
+
+    public function __construct() {
+        $this->percentEncoder = new HTMLPurifier_PercentEncoder();
+    }
+
+    /**
+     * Parses a URI.
+     * @param $uri string URI to parse
+     * @return HTMLPurifier_URI representation of URI. This representation has
+     *         not been validated yet and may not conform to RFC.
+     */
+    public function parse($uri) {
+
+        $uri = $this->percentEncoder->normalize($uri);
+
+        // Regexp is as per Appendix B.
+        // Note that ["<>] are an addition to the RFC's recommended
+        // characters, because they represent external delimeters.
+        $r_URI = '!'.
+            '(([^:/?#"<>]+):)?'. // 2. Scheme
+            '(//([^/?#"<>]*))?'. // 4. Authority
+            '([^?#"<>]*)'.       // 5. Path
+            '(\?([^#"<>]*))?'.   // 7. Query
+            '(#([^"<>]*))?'.     // 8. Fragment
+            '!';
+
+        $matches = array();
+        $result = preg_match($r_URI, $uri, $matches);
+
+        if (!$result) return false; // *really* invalid URI
+
+        // seperate out parts
+        $scheme     = !empty($matches[1]) ? $matches[2] : null;
+        $authority  = !empty($matches[3]) ? $matches[4] : null;
+        $path       = $matches[5]; // always present, can be empty
+        $query      = !empty($matches[6]) ? $matches[7] : null;
+        $fragment   = !empty($matches[8]) ? $matches[9] : null;
+
+        // further parse authority
+        if ($authority !== null) {
+            $r_authority = "/^((.+?)@)?(\[[^\]]+\]|[^:]*)(:(\d*))?/";
+            $matches = array();
+            preg_match($r_authority, $authority, $matches);
+            $userinfo   = !empty($matches[1]) ? $matches[2] : null;
+            $host       = !empty($matches[3]) ? $matches[3] : '';
+            $port       = !empty($matches[4]) ? (int) $matches[5] : null;
+        } else {
+            $port = $host = $userinfo = null;
+        }
+
+        return new HTMLPurifier_URI(
+            $scheme, $userinfo, $host, $port, $path, $query, $fragment);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme.php
new file mode 100755
index 0000000000..039710fd15
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Validator for the components of a URI for a specific scheme
+ */
+class HTMLPurifier_URIScheme
+{
+
+    /**
+     * Scheme's default port (integer)
+     */
+    public $default_port = null;
+
+    /**
+     * Whether or not URIs of this schem are locatable by a browser
+     * http and ftp are accessible, while mailto and news are not.
+     */
+    public $browsable = false;
+
+    /**
+     * Whether or not the URI always uses <hier_part>, resolves edge cases
+     * with making relative URIs absolute
+     */
+    public $hierarchical = false;
+
+    /**
+     * Validates the components of a URI
+     * @note This implementation should be called by children if they define
+     *       a default port, as it does port processing.
+     * @param $uri Instance of HTMLPurifier_URI
+     * @param $config HTMLPurifier_Config object
+     * @param $context HTMLPurifier_Context object
+     * @return Bool success or failure
+     */
+    public function validate(&$uri, $config, $context) {
+        if ($this->default_port == $uri->port) $uri->port = null;
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
new file mode 100755
index 0000000000..5849bf7ff0
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Validates ftp (File Transfer Protocol) URIs as defined by generic RFC 1738.
+ */
+class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme {
+
+    public $default_port = 21;
+    public $browsable = true; // usually
+    public $hierarchical = true;
+
+    public function validate(&$uri, $config, $context) {
+        parent::validate($uri, $config, $context);
+        $uri->query    = null;
+
+        // typecode check
+        $semicolon_pos = strrpos($uri->path, ';'); // reverse
+        if ($semicolon_pos !== false) {
+            $type = substr($uri->path, $semicolon_pos + 1); // no semicolon
+            $uri->path = substr($uri->path, 0, $semicolon_pos);
+            $type_ret = '';
+            if (strpos($type, '=') !== false) {
+                // figure out whether or not the declaration is correct
+                list($key, $typecode) = explode('=', $type, 2);
+                if ($key !== 'type') {
+                    // invalid key, tack it back on encoded
+                    $uri->path .= '%3B' . $type;
+                } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') {
+                    $type_ret = ";type=$typecode";
+                }
+            } else {
+                $uri->path .= '%3B' . $type;
+            }
+            $uri->path = str_replace(';', '%3B', $uri->path);
+            $uri->path .= $type_ret;
+        }
+
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/http.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
new file mode 100755
index 0000000000..b097a31d6a
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Validates http (HyperText Transfer Protocol) as defined by RFC 2616
+ */
+class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme {
+
+    public $default_port = 80;
+    public $browsable = true;
+    public $hierarchical = true;
+
+    public function validate(&$uri, $config, $context) {
+        parent::validate($uri, $config, $context);
+        $uri->userinfo = null;
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/https.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
new file mode 100755
index 0000000000..29e380919f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Validates https (Secure HTTP) according to http scheme.
+ */
+class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http {
+
+    public $default_port = 443;
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
new file mode 100755
index 0000000000..c1e2cd5aae
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
@@ -0,0 +1,27 @@
+<?php
+
+// VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the
+// email is valid, but be careful!
+
+/**
+ * Validates mailto (for E-mail) according to RFC 2368
+ * @todo Validate the email address
+ * @todo Filter allowed query parameters
+ */
+
+class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme {
+
+    public $browsable = false;
+
+    public function validate(&$uri, $config, $context) {
+        parent::validate($uri, $config, $context);
+        $uri->userinfo = null;
+        $uri->host     = null;
+        $uri->port     = null;
+        // we need to validate path against RFC 2368's addr-spec
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/news.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
new file mode 100755
index 0000000000..f5f54f4f56
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Validates news (Usenet) as defined by generic RFC 1738
+ */
+class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme {
+
+    public $browsable = false;
+
+    public function validate(&$uri, $config, $context) {
+        parent::validate($uri, $config, $context);
+        $uri->userinfo = null;
+        $uri->host     = null;
+        $uri->port     = null;
+        $uri->query    = null;
+        // typecode check needed on path
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
new file mode 100755
index 0000000000..5bf93ea784
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Validates nntp (Network News Transfer Protocol) as defined by generic RFC 1738
+ */
+class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme {
+
+    public $default_port = 119;
+    public $browsable = false;
+
+    public function validate(&$uri, $config, $context) {
+        parent::validate($uri, $config, $context);
+        $uri->userinfo = null;
+        $uri->query    = null;
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
new file mode 100755
index 0000000000..d24732c182
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Registry for retrieving specific URI scheme validator objects.
+ */
+class HTMLPurifier_URISchemeRegistry
+{
+
+    /**
+     * Retrieve sole instance of the registry.
+     * @param $prototype Optional prototype to overload sole instance with,
+     *                   or bool true to reset to default registry.
+     * @note Pass a registry object $prototype with a compatible interface and
+     *       the function will copy it and return it all further times.
+     */
+    public static function instance($prototype = null) {
+        static $instance = null;
+        if ($prototype !== null) {
+            $instance = $prototype;
+        } elseif ($instance === null || $prototype == true) {
+            $instance = new HTMLPurifier_URISchemeRegistry();
+        }
+        return $instance;
+    }
+
+    /**
+     * Cache of retrieved schemes.
+     */
+    protected $schemes = array();
+
+    /**
+     * Retrieves a scheme validator object
+     * @param $scheme String scheme name like http or mailto
+     * @param $config HTMLPurifier_Config object
+     * @param $config HTMLPurifier_Context object
+     */
+    public function getScheme($scheme, $config, $context) {
+        if (!$config) $config = HTMLPurifier_Config::createDefault();
+        $null = null; // for the sake of passing by reference
+
+        // important, otherwise attacker could include arbitrary file
+        $allowed_schemes = $config->get('URI', 'AllowedSchemes');
+        if (!$config->get('URI', 'OverrideAllowedSchemes') &&
+            !isset($allowed_schemes[$scheme])
+        ) {
+            return $null;
+        }
+
+        if (isset($this->schemes[$scheme])) return $this->schemes[$scheme];
+        if (!isset($allowed_schemes[$scheme])) return $null;
+
+        $class = 'HTMLPurifier_URIScheme_' . $scheme;
+        if (!class_exists($class)) return $null;
+        $this->schemes[$scheme] = new $class();
+        return $this->schemes[$scheme];
+    }
+
+    /**
+     * Registers a custom scheme to the cache, bypassing reflection.
+     * @param $scheme Scheme name
+     * @param $scheme_obj HTMLPurifier_URIScheme object
+     */
+    public function register($scheme, $scheme_obj) {
+        $this->schemes[$scheme] = $scheme_obj;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/UnitConverter.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/UnitConverter.php
new file mode 100755
index 0000000000..545d426220
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/UnitConverter.php
@@ -0,0 +1,254 @@
+<?php
+
+/**
+ * Class for converting between different unit-lengths as specified by
+ * CSS.
+ */
+class HTMLPurifier_UnitConverter
+{
+
+    const ENGLISH = 1;
+    const METRIC = 2;
+    const DIGITAL = 3;
+
+    /**
+     * Units information array. Units are grouped into measuring systems
+     * (English, Metric), and are assigned an integer representing
+     * the conversion factor between that unit and the smallest unit in
+     * the system. Numeric indexes are actually magical constants that
+     * encode conversion data from one system to the next, with a O(n^2)
+     * constraint on memory (this is generally not a problem, since
+     * the number of measuring systems is small.)
+     */
+    protected static $units = array(
+        self::ENGLISH => array(
+            'px' => 3, // This is as per CSS 2.1 and Firefox. Your mileage may vary
+            'pt' => 4,
+            'pc' => 48,
+            'in' => 288,
+            self::METRIC => array('pt', '0.352777778', 'mm'),
+        ),
+        self::METRIC => array(
+            'mm' => 1,
+            'cm' => 10,
+            self::ENGLISH => array('mm', '2.83464567', 'pt'),
+        ),
+    );
+
+    /**
+     * Minimum bcmath precision for output.
+     */
+    protected $outputPrecision;
+
+    /**
+     * Bcmath precision for internal calculations.
+     */
+    protected $internalPrecision;
+
+    /**
+     * Whether or not BCMath is available
+     */
+    private $bcmath;
+
+    public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false) {
+        $this->outputPrecision = $output_precision;
+        $this->internalPrecision = $internal_precision;
+        $this->bcmath = !$force_no_bcmath && function_exists('bcmul');
+    }
+
+    /**
+     * Converts a length object of one unit into another unit.
+     * @param HTMLPurifier_Length $length
+     *      Instance of HTMLPurifier_Length to convert. You must validate()
+     *      it before passing it here!
+     * @param string $to_unit
+     *      Unit to convert to.
+     * @note
+     *      About precision: This conversion function pays very special
+     *      attention to the incoming precision of values and attempts
+     *      to maintain a number of significant figure. Results are
+     *      fairly accurate up to nine digits. Some caveats:
+     *          - If a number is zero-padded as a result of this significant
+     *            figure tracking, the zeroes will be eliminated.
+     *          - If a number contains less than four sigfigs ($outputPrecision)
+     *            and this causes some decimals to be excluded, those
+     *            decimals will be added on.
+     */
+    public function convert($length, $to_unit) {
+
+        if (!$length->isValid()) return false;
+
+        $n    = $length->getN();
+        $unit = $length->getUnit();
+
+        if ($n === '0' || $unit === false) {
+            return new HTMLPurifier_Length('0', false);
+        }
+
+        $state = $dest_state = false;
+        foreach (self::$units as $k => $x) {
+            if (isset($x[$unit])) $state = $k;
+            if (isset($x[$to_unit])) $dest_state = $k;
+        }
+        if (!$state || !$dest_state) return false;
+
+        // Some calculations about the initial precision of the number;
+        // this will be useful when we need to do final rounding.
+        $sigfigs = $this->getSigFigs($n);
+        if ($sigfigs < $this->outputPrecision) $sigfigs = $this->outputPrecision;
+
+        // BCMath's internal precision deals only with decimals. Use
+        // our default if the initial number has no decimals, or increase
+        // it by how ever many decimals, thus, the number of guard digits
+        // will always be greater than or equal to internalPrecision.
+        $log = (int) floor(log(abs($n), 10));
+        $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; // internal precision
+
+        for ($i = 0; $i < 2; $i++) {
+
+            // Determine what unit IN THIS SYSTEM we need to convert to
+            if ($dest_state === $state) {
+                // Simple conversion
+                $dest_unit = $to_unit;
+            } else {
+                // Convert to the smallest unit, pending a system shift
+                $dest_unit = self::$units[$state][$dest_state][0];
+            }
+
+            // Do the conversion if necessary
+            if ($dest_unit !== $unit) {
+                $factor = $this->div(self::$units[$state][$unit], self::$units[$state][$dest_unit], $cp);
+                $n = $this->mul($n, $factor, $cp);
+                $unit = $dest_unit;
+            }
+
+            // Output was zero, so bail out early. Shouldn't ever happen.
+            if ($n === '') {
+                $n = '0';
+                $unit = $to_unit;
+                break;
+            }
+
+            // It was a simple conversion, so bail out
+            if ($dest_state === $state) {
+                break;
+            }
+
+            if ($i !== 0) {
+                // Conversion failed! Apparently, the system we forwarded
+                // to didn't have this unit. This should never happen!
+                return false;
+            }
+
+            // Pre-condition: $i == 0
+
+            // Perform conversion to next system of units
+            $n = $this->mul($n, self::$units[$state][$dest_state][1], $cp);
+            $unit = self::$units[$state][$dest_state][2];
+            $state = $dest_state;
+
+            // One more loop around to convert the unit in the new system.
+
+        }
+
+        // Post-condition: $unit == $to_unit
+        if ($unit !== $to_unit) return false;
+
+        // Useful for debugging:
+        //echo "<pre>n";
+        //echo "$n\nsigfigs = $sigfigs\nnew_log = $new_log\nlog = $log\nrp = $rp\n</pre>\n";
+
+        $n = $this->round($n, $sigfigs);
+        if (strpos($n, '.') !== false) $n = rtrim($n, '0');
+        $n = rtrim($n, '.');
+
+        return new HTMLPurifier_Length($n, $unit);
+    }
+
+    /**
+     * Returns the number of significant figures in a string number.
+     * @param string $n Decimal number
+     * @return int number of sigfigs
+     */
+    public function getSigFigs($n) {
+        $n = ltrim($n, '0+-');
+        $dp = strpos($n, '.'); // decimal position
+        if ($dp === false) {
+            $sigfigs = strlen(rtrim($n, '0'));
+        } else {
+            $sigfigs = strlen(ltrim($n, '0.')); // eliminate extra decimal character
+            if ($dp !== 0) $sigfigs--;
+        }
+        return $sigfigs;
+    }
+
+    /**
+     * Adds two numbers, using arbitrary precision when available.
+     */
+    private function add($s1, $s2, $scale) {
+        if ($this->bcmath) return bcadd($s1, $s2, $scale);
+        else return $this->scale($s1 + $s2, $scale);
+    }
+
+    /**
+     * Multiples two numbers, using arbitrary precision when available.
+     */
+    private function mul($s1, $s2, $scale) {
+        if ($this->bcmath) return bcmul($s1, $s2, $scale);
+        else return $this->scale($s1 * $s2, $scale);
+    }
+
+    /**
+     * Divides two numbers, using arbitrary precision when available.
+     */
+    private function div($s1, $s2, $scale) {
+        if ($this->bcmath) return bcdiv($s1, $s2, $scale);
+        else return $this->scale($s1 / $s2, $scale);
+    }
+
+    /**
+     * Rounds a number according to the number of sigfigs it should have,
+     * using arbitrary precision when available.
+     */
+    private function round($n, $sigfigs) {
+        $new_log = (int) floor(log(abs($n), 10)); // Number of digits left of decimal - 1
+        $rp = $sigfigs - $new_log - 1; // Number of decimal places needed
+        $neg = $n < 0 ? '-' : ''; // Negative sign
+        if ($this->bcmath) {
+            if ($rp >= 0) {
+                $n = bcadd($n, $neg . '0.' .  str_repeat('0', $rp) . '5', $rp + 1);
+                $n = bcdiv($n, '1', $rp);
+            } else {
+                // This algorithm partially depends on the standardized
+                // form of numbers that comes out of bcmath.
+                $n = bcadd($n, $neg . '5' . str_repeat('0', $new_log - $sigfigs), 0);
+                $n = substr($n, 0, $sigfigs + strlen($neg)) . str_repeat('0', $new_log - $sigfigs + 1);
+            }
+            return $n;
+        } else {
+            return $this->scale(round($n, $sigfigs - $new_log - 1), $rp + 1);
+        }
+    }
+
+    /**
+     * Scales a float to $scale digits right of decimal point, like BCMath.
+     */
+    private function scale($r, $scale) {
+        if ($scale < 0) {
+            // The f sprintf type doesn't support negative numbers, so we
+            // need to cludge things manually. First get the string.
+            $r = sprintf('%.0f', (float) $r);
+            // Due to floating point precision loss, $r will more than likely
+            // look something like 4652999999999.9234. We grab one more digit
+            // than we need to precise from $r and then use that to round
+            // appropriately.
+            $precise = (string) round(substr($r, 0, strlen($r) + $scale), -1);
+            // Now we return it, truncating the zero that was rounded off.
+            return substr($precise, 0, -1) . str_repeat('0', -$scale + 1);
+        }
+        return sprintf('%.' . $scale . 'f', (float) $r);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser.php
new file mode 100755
index 0000000000..68e72ae869
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Parses string representations into their corresponding native PHP
+ * variable type. The base implementation does a simple type-check.
+ */
+class HTMLPurifier_VarParser
+{
+
+    const STRING    = 1;
+    const ISTRING   = 2;
+    const TEXT      = 3;
+    const ITEXT     = 4;
+    const INT       = 5;
+    const FLOAT     = 6;
+    const BOOL      = 7;
+    const LOOKUP    = 8;
+    const ALIST     = 9;
+    const HASH      = 10;
+    const MIXED     = 11;
+
+    /**
+     * Lookup table of allowed types. Mainly for backwards compatibility, but
+     * also convenient for transforming string type names to the integer constants.
+     */
+    static public $types = array(
+        'string'    => self::STRING,
+        'istring'   => self::ISTRING,
+        'text'      => self::TEXT,
+        'itext'     => self::ITEXT,
+        'int'       => self::INT,
+        'float'     => self::FLOAT,
+        'bool'      => self::BOOL,
+        'lookup'    => self::LOOKUP,
+        'list'      => self::ALIST,
+        'hash'      => self::HASH,
+        'mixed'     => self::MIXED
+    );
+
+    /**
+     * Lookup table of types that are string, and can have aliases or
+     * allowed value lists.
+     */
+    static public $stringTypes = array(
+        self::STRING    => true,
+        self::ISTRING   => true,
+        self::TEXT      => true,
+        self::ITEXT     => true,
+    );
+
+    /**
+     * Validate a variable according to type. Throws
+     * HTMLPurifier_VarParserException if invalid.
+     * It may return NULL as a valid type if $allow_null is true.
+     *
+     * @param $var Variable to validate
+     * @param $type Type of variable, see HTMLPurifier_VarParser->types
+     * @param $allow_null Whether or not to permit null as a value
+     * @return Validated and type-coerced variable
+     */
+    final public function parse($var, $type, $allow_null = false) {
+        if (is_string($type)) {
+            if (!isset(HTMLPurifier_VarParser::$types[$type])) {
+                throw new HTMLPurifier_VarParserException("Invalid type '$type'");
+            } else {
+                $type = HTMLPurifier_VarParser::$types[$type];
+            }
+        }
+        $var = $this->parseImplementation($var, $type, $allow_null);
+        if ($allow_null && $var === null) return null;
+        // These are basic checks, to make sure nothing horribly wrong
+        // happened in our implementations.
+        switch ($type) {
+            case (self::STRING):
+            case (self::ISTRING):
+            case (self::TEXT):
+            case (self::ITEXT):
+                if (!is_string($var)) break;
+                if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var);
+                return $var;
+            case (self::INT):
+                if (!is_int($var)) break;
+                return $var;
+            case (self::FLOAT):
+                if (!is_float($var)) break;
+                return $var;
+            case (self::BOOL):
+                if (!is_bool($var)) break;
+                return $var;
+            case (self::LOOKUP):
+            case (self::ALIST):
+            case (self::HASH):
+                if (!is_array($var)) break;
+                if ($type === self::LOOKUP) {
+                    foreach ($var as $k) if ($k !== true) $this->error('Lookup table contains value other than true');
+                } elseif ($type === self::ALIST) {
+                    $keys = array_keys($var);
+                    if (array_keys($keys) !== $keys) $this->error('Indices for list are not uniform');
+                }
+                return $var;
+            case (self::MIXED):
+                return $var;
+            default:
+                $this->errorInconsistent(get_class($this), $type);
+        }
+        $this->errorGeneric($var, $type);
+    }
+
+    /**
+     * Actually implements the parsing. Base implementation is to not
+     * do anything to $var. Subclasses should overload this!
+     */
+    protected function parseImplementation($var, $type, $allow_null) {
+        return $var;
+    }
+
+    /**
+     * Throws an exception.
+     */
+    protected function error($msg) {
+        throw new HTMLPurifier_VarParserException($msg);
+    }
+
+    /**
+     * Throws an inconsistency exception.
+     * @note This should not ever be called. It would be called if we
+     *       extend the allowed values of HTMLPurifier_VarParser without
+     *       updating subclasses.
+     */
+    protected function errorInconsistent($class, $type) {
+        throw new HTMLPurifier_Exception("Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type)." not implemented");
+    }
+
+    /**
+     * Generic error for if a type didn't work.
+     */
+    protected function errorGeneric($var, $type) {
+        $vtype = gettype($var);
+        $this->error("Expected type ".HTMLPurifier_VarParser::getTypeName($type).", got $vtype");
+    }
+
+    static public function getTypeName($type) {
+        static $lookup;
+        if (!$lookup) {
+            // Lazy load the alternative lookup table
+            $lookup = array_flip(HTMLPurifier_VarParser::$types);
+        }
+        if (!isset($lookup[$type])) return 'unknown';
+        return $lookup[$type];
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
new file mode 100755
index 0000000000..c954250e9f
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Performs safe variable parsing based on types which can be used by
+ * users. This may not be able to represent all possible data inputs,
+ * however.
+ */
+class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
+{
+
+    protected function parseImplementation($var, $type, $allow_null) {
+        if ($allow_null && $var === null) return null;
+        switch ($type) {
+            // Note: if code "breaks" from the switch, it triggers a generic
+            // exception to be thrown. Specific errors can be specifically
+            // done here.
+            case self::MIXED :
+            case self::ISTRING :
+            case self::STRING :
+            case self::TEXT :
+            case self::ITEXT :
+                return $var;
+            case self::INT :
+                if (is_string($var) && ctype_digit($var)) $var = (int) $var;
+                return $var;
+            case self::FLOAT :
+                if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var;
+                return $var;
+            case self::BOOL :
+                if (is_int($var) && ($var === 0 || $var === 1)) {
+                    $var = (bool) $var;
+                } elseif (is_string($var)) {
+                    if ($var == 'on' || $var == 'true' || $var == '1') {
+                        $var = true;
+                    } elseif ($var == 'off' || $var == 'false' || $var == '0') {
+                        $var = false;
+                    } else {
+                        throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
+                    }
+                }
+                return $var;
+            case self::ALIST :
+            case self::HASH :
+            case self::LOOKUP :
+                if (is_string($var)) {
+                    // special case: technically, this is an array with
+                    // a single empty string item, but having an empty
+                    // array is more intuitive
+                    if ($var == '') return array();
+                    if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
+                        // simplistic string to array method that only works
+                        // for simple lists of tag names or alphanumeric characters
+                        $var = explode(',',$var);
+                    } else {
+                        $var = preg_split('/(,|[\n\r]+)/', $var);
+                    }
+                    // remove spaces
+                    foreach ($var as $i => $j) $var[$i] = trim($j);
+                    if ($type === self::HASH) {
+                        // key:value,key2:value2
+                        $nvar = array();
+                        foreach ($var as $keypair) {
+                            $c = explode(':', $keypair, 2);
+                            if (!isset($c[1])) continue;
+                            $nvar[$c[0]] = $c[1];
+                        }
+                        $var = $nvar;
+                    }
+                }
+                if (!is_array($var)) break;
+                $keys = array_keys($var);
+                if ($keys === array_keys($keys)) {
+                    if ($type == self::ALIST) return $var;
+                    elseif ($type == self::LOOKUP) {
+                        $new = array();
+                        foreach ($var as $key) {
+                            $new[$key] = true;
+                        }
+                        return $new;
+                    } else break;
+                }
+                if ($type === self::LOOKUP) {
+                    foreach ($var as $key => $value) {
+                        $var[$key] = true;
+                    }
+                }
+                return $var;
+            default:
+                $this->errorInconsistent(__CLASS__, $type);
+        }
+        $this->errorGeneric($var, $type);
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Native.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
new file mode 100755
index 0000000000..b02a6de54c
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This variable parser uses PHP's internal code engine. Because it does
+ * this, it can represent all inputs; however, it is dangerous and cannot
+ * be used by users.
+ */
+class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
+{
+
+    protected function parseImplementation($var, $type, $allow_null) {
+        return $this->evalExpression($var);
+    }
+
+    protected function evalExpression($expr) {
+        $var = null;
+        $result = eval("\$var = $expr;");
+        if ($result === false) {
+            throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
+        }
+        return $var;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParserException.php b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParserException.php
new file mode 100755
index 0000000000..5df3414959
--- /dev/null
+++ b/phpgwapi/inc/htmlpurifier/library/HTMLPurifier/VarParserException.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Exception type for HTMLPurifier_VarParser
+ */
+class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
+{
+
+}
+
+// vim: et sw=4 sts=4

From 7049fe4bc099086f3425d536be5d3e6d7dc80203 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 May 2009 19:23:38 +0000
Subject: [PATCH 349/510] - implemented htmlpurifier also for sitemgr (only non
 site-admins) and   knowledgebase - html::fckEditor() has optional parameter
 to NOT use htmlpurifier

---
 etemplate/inc/class.etemplate.inc.php |  5 ++---
 phpgwapi/inc/class.html.inc.php       | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 477ba5109d..76de20eb31 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1157,8 +1157,6 @@ class etemplate extends boetemplate
 				{
 					$value = nl2br(html::htmlspecialchars($value));
 				}
-				$value = html::purify($value);
-
 				if (!$readonly)
 				{
 					$mode = $mode ? $mode : 'simple';
@@ -1167,6 +1165,7 @@ class etemplate extends boetemplate
 					$fckoptions = array(
 						'toolbar_expanded' => $toolbar,
 					);
+					// html::fckEditor runs everything through html::purify
 					$html .= html::fckEditor($form_name,$value,$mode,$fckoptions,$height,$width,$baseref);
 
 					self::$request->set_to_process($form_name,$cell['type'],array(
@@ -1175,7 +1174,7 @@ class etemplate extends boetemplate
 				}
 				else
 				{
-					$html .= html::div(html::activate_links($value),'style="overflow: auto; width='. $width. '; height='. $height. '"');
+					$html .= html::div(html::purify(html::activate_links($value)),'style="overflow: auto; width='. $width. '; height='. $height. '"');
 				}
 				break;
 			case 'checkbox':
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 4c319e58fa..91cf826732 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -460,15 +460,20 @@ class html
 	* @param array  $_options (toolbar_expanded true/false)
 	* @param string $_height='400px'
 	* @param string $_width='100%'
-	* @param string $base_href='' if passed activates the browser for image at absolute path passed
+	* @param string $_base_href='' if passed activates the browser for image at absolute path passed
+	* @param boolean $_purify=true run $_content through htmlpurifier before handing it to fckEditor
 	* @return string the necessary html for the textarea
 	*/
-	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'), $_height='400px', $_width='100%',$_base_href='')
+	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
+		$_height='400px', $_width='100%',$_base_href='',$_purify=true)
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')
 		{
 			return self::textarea($_name,$_content,'style="width: '.$_width.'; height: '.$_height.';"');
 		}
+		// run content through htmlpurifier
+		if ($_purify && !empty($_content)) $_content = self::purify($_content);
+
 		include_once(EGW_INCLUDE_ROOT."/phpgwapi/js/fckeditor/fckeditor.php");
 
 		$oFCKeditor = new FCKeditor($_name) ;
@@ -969,7 +974,7 @@ class html
 		{
 			$url = "/index.php?menuaction=$url";
 		}
-		if ($url{0} == '/')		// link relative to eGW
+		if ($url[0] == '/')		// link relative to eGW
 		{
 			$url = self::link($url,$vars);
 		}
@@ -1185,7 +1190,7 @@ class html
 			}
 		}
 		// evtl. remove leading delimiter
-		if ($_selected{0} == $delimiter) $_selected = substr($_selected,1);
+		if ($_selected[0] == $delimiter) $_selected = substr($_selected,1);
 		foreach($_folders as $path => $data)
 		{
 			if (!is_array($data))
@@ -1198,7 +1203,7 @@ class html
 				$image1 = $image2 = $image3 = "'".$data['image']."'";
 			}
 			// evtl. remove leading delimiter
-			if ($path{0} == $delimiter) $path = substr($path,1);
+			if ($path[0] == $delimiter) $path = substr($path,1);
 			$folderParts = explode($delimiter,$path);
 
 			//get rightmost folderpart
@@ -1255,6 +1260,8 @@ class html
 	{
 		static $purifier;
 
+		if (empty($html)) return $html;	// no need to process further
+
 		if (is_null($purifier) || !is_null($config))
 		{
 			// add htmlpurifiers library to include_path

From 1600e3b1a1221f3e2d8affb0b03edb3eabe9bd8c Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 20 May 2009 14:59:15 +0000
Subject: [PATCH 350/510] added some German translation for Infolog

---
 infolog/setup/egw_de.lang | 1 +
 infolog/setup/egw_en.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/infolog/setup/egw_de.lang b/infolog/setup/egw_de.lang
index ceb3ddee47..5b452774a8 100644
--- a/infolog/setup/egw_de.lang
+++ b/infolog/setup/egw_de.lang
@@ -149,6 +149,7 @@ finish	infolog	de	wenn erledigt
 for which types should this field be used	infolog	de	für welche Typen soll dieses Feld benutzt werden
 from	infolog	de	Von
 general	infolog	de	Allgemein
+global categories	infolog	de	Globale Kategorien
 group owner for	infolog	de	Gruppeneigentümer für
 high	infolog	de	hoch
 history	infolog	de	Historie
diff --git a/infolog/setup/egw_en.lang b/infolog/setup/egw_en.lang
index 08eedc40b9..80254112cf 100644
--- a/infolog/setup/egw_en.lang
+++ b/infolog/setup/egw_en.lang
@@ -149,6 +149,7 @@ finish	infolog	en	finish
 for which types should this field be used	infolog	en	for which types should this field be used
 from	infolog	en	From
 general	infolog	en	General
+global categories	infolog	en	Global Categories
 group owner for	infolog	en	Group owner for
 high	infolog	en	high
 history	infolog	en	History

From c1aca74de263453795dad51cd8a71b3d464ec721 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 20 May 2009 15:10:09 +0000
Subject: [PATCH 351/510] added some German translation for Filemgr

---
 filemanager/setup/egw_de.lang | 7 ++++++-
 filemanager/setup/egw_en.lang | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/filemanager/setup/egw_de.lang b/filemanager/setup/egw_de.lang
index 8babf82688..72f3022e2e 100644
--- a/filemanager/setup/egw_de.lang
+++ b/filemanager/setup/egw_de.lang
@@ -13,7 +13,7 @@
 %1 files moved.	filemanager	de	%1 Dateien verschoben.
 %1 starts with '%2'	filemanager	de	%1 beginnt mit '%2'
 %1 successful uploaded.	filemanager	de	%1 erfolgreich hochgeladen.
-%1 the following files into current directory	filemanager	de	Die foldenden Dateien in das aktuelle Verzeichnis %1
+%1 the following files into current directory	filemanager	de	Die folgenden Dateien in das aktuelle Verzeichnis %1
 %1 urls %2 to clipboard.	filemanager	de	%1 Adressen in die Zwischenablage %2.
 accessrights	filemanager	de	Zugangsberechtigungen
 acl added.	filemanager	de	Zugriffsrecht hinzugefügt.
@@ -53,6 +53,7 @@ created %1,%2	filemanager	de	Erstellt %1, %2
 created between	filemanager	de	erstellt zwischen
 created directory %1	filemanager	de	Verzeichis %1 erstellt
 current directory	filemanager	de	Aktuelles Verzeichnis
+custom fields	filemanager	de	Benutzerdefinierte Felder
 cut	filemanager	de	Ausschneiden
 cut to clipboard	filemanager	de	Ausschneiden in die Zwischenablage
 default behavior is no. the link will not be shown, but you are still able to navigate to this location, or configure this paricular location as startfolder or folderlink.	filemanager	de	Vorgabe is NEIN. Der Verweis wird nicht angezeit, Sie können aber immer zu diesem Verzeichnis navigieren, oder Sie konfigurieren das Verzeichnis als Startverzeichnis oder als Verzeichnisverweis.
@@ -73,6 +74,7 @@ edit settings	filemanager	de	Einstellungen bearbeiten
 enter setup user and password	filemanager	de	Setup Benutzer und Passwort eingeben
 enter setup user and password to get root rights	filemanager	de	Setup Benutzers und Passwort einzugeben um root Rechte zu bekommen
 enter the complete vfs path to specify a fast access link to a folder	filemanager	de	Geben Sie den kompletten VFS Pfad ein, um einen Verweis zu diesem Ordner im Seitenmenu zu erzeugen
+enter the complete vfs path to specify a fast access link to a folder (1).	filemanager	de	Geben Sie den kompletten Pfad ein, um einen Schnelle Zugangsverknüpfung zu einem Verzeichnis zu erzeugen (1)
 enter the complete vfs path to specify your desired start folder.	filemanager	de	Geben Sie den kompletten VFS Pfad zu Ihrem gewünschten Anfangsverzeichnis ein
 error adding the acl!	filemanager	de	Fehler beim Hinzufügen des Zugriffsrechts!
 error creating symlink to target %1!	filemanager	de	Fehler beim Anlegen einer Verknüpfung zu %1!
@@ -83,6 +85,7 @@ extended access control list	filemanager	de	Erweiterte Zugriffsrechte
 extended acl	filemanager	de	Erweiterte ACL
 failed to change permissions of %1!	filemanager	de	Konnte Zugriffsrechte von %1 nicht ändern!
 failed to create directory!	filemanager	de	Konnte Verzeichnis nicht anlegen!
+favorites	filemanager	de	Favoriten
 file	filemanager	de	Datei
 file %1 already exists. please edit it or delete it first.	filemanager	de	Datei %1 existiert bereits. Bitte editieren Sie diese, oder löschen Sie sie.
 file %1 could not be created.	filemanager	de	Die Datei %1 konnte nicht erzeugt werden
@@ -122,6 +125,7 @@ no files in this directory.	filemanager	de	Keine Dateien in diesem Verzeichnis.
 no preview available	filemanager	de	Keine Vorschau verfügbar
 no version history for this file/directory	filemanager	de	Keine Versionshistorie für diese Datei oder dieses Verzeichnis
 only owner can rename or delete the content	filemanager	de	Nur der Besitzer kann den Inhalt umbenennen oder löschen
+open	filemanager	de	Öffnen
 operation	filemanager	de	Vorgang
 permission denied!	filemanager	de	Zugriff verweigert!
 permissions	filemanager	de	Zugriffsrechte
@@ -130,6 +134,7 @@ please select a file to delete.	filemanager	de	Bitte wählen Sie eine Datei zum
 preview	filemanager	de	Vorschau
 preview %1	filemanager	de	Vorschau %1
 preview of %1	filemanager	de	Vorschau von %1
+projectmanager	filemanager	de	Projektmanager
 properties saved.	filemanager	de	Eigenschaften gespeichert.
 quick jump to	filemanager	de	Springe zu
 read & write access	filemanager	de	Lese- und Schreibzugriff
diff --git a/filemanager/setup/egw_en.lang b/filemanager/setup/egw_en.lang
index 61e00908a7..074f6c0741 100644
--- a/filemanager/setup/egw_en.lang
+++ b/filemanager/setup/egw_en.lang
@@ -53,6 +53,7 @@ created %1,%2	filemanager	en	Created %1,%2
 created between	filemanager	en	created between
 created directory %1	filemanager	en	Created directory %1
 current directory	filemanager	en	Current directory
+custom fields	filemanager	en	Custom fields
 cut	filemanager	en	cut
 cut to clipboard	filemanager	en	Cut to clipboard
 default behavior is no. the link will not be shown, but you are still able to navigate to this location, or configure this paricular location as startfolder or folderlink.	filemanager	en	Default behavior is NO. The link will not be shown, but you are still able to navigate to this location, or configure this paricular location as startfolder or folderlink.
@@ -73,6 +74,7 @@ edit settings	filemanager	en	Edit settings
 enter setup user and password	filemanager	en	Enter setup user and password
 enter setup user and password to get root rights	filemanager	en	Enter setup user and password to get root rights
 enter the complete vfs path to specify a fast access link to a folder	filemanager	en	Enter the complete VFS path to specify a fast access link to a folder
+enter the complete vfs path to specify a fast access link to a folder (1).	filemanager	en	Enter the complete VFS path to specify a fast access link to a folder (1).
 enter the complete vfs path to specify your desired start folder.	filemanager	en	Enter the complete VFS path to specify your desired start folder.
 error adding the acl!	filemanager	en	Error adding the ACL!
 error creating symlink to target %1!	filemanager	en	Error creating symlink to target %1!
@@ -83,6 +85,7 @@ extended access control list	filemanager	en	Extended access control list
 extended acl	filemanager	en	Extended ACL
 failed to change permissions of %1!	filemanager	en	Failed to change permissions of %1!
 failed to create directory!	filemanager	en	Failed to create directory!
+favorites	filemanager	en	Favorites
 file	filemanager	en	File
 file %1 already exists. please edit it or delete it first.	filemanager	en	File %1 already exists. Please edit it or delete it first.
 file %1 could not be created.	filemanager	en	File %1 could not be created.
@@ -122,6 +125,7 @@ no files in this directory.	filemanager	en	No files in this directory.
 no preview available	filemanager	en	No preview available
 no version history for this file/directory	filemanager	en	No version history for this file/directory
 only owner can rename or delete the content	filemanager	en	Only owner can rename or delete the content
+open	filemanager	en	Open
 operation	filemanager	en	Operation
 permission denied!	filemanager	en	Permission denied!
 permissions	filemanager	en	Permissions
@@ -130,6 +134,7 @@ please select a file to delete.	filemanager	en	Please select a file to delete.
 preview	filemanager	en	Preview
 preview %1	filemanager	en	Preview %1
 preview of %1	filemanager	en	Preview of %1
+projectmanager	filemanager	en	Projectmanager
 properties saved.	filemanager	en	Properties saved.
 quick jump to	filemanager	en	Quick jump to
 read & write access	filemanager	en	Read & write access

From b0d5906f04e345fee9a9e94c2bb1d23b9d0680f8 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 20 May 2009 15:20:20 +0000
Subject: [PATCH 352/510] added some German translation for calendar

---
 calendar/setup/egw_de.lang | 5 +++++
 calendar/setup/egw_en.lang | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/calendar/setup/egw_de.lang b/calendar/setup/egw_de.lang
index ba55dfe88b..e633909133 100644
--- a/calendar/setup/egw_de.lang
+++ b/calendar/setup/egw_de.lang
@@ -143,6 +143,7 @@ fri	calendar	de	Fr
 full description	calendar	de	vollständige Beschreibung
 fullname of person to notify	calendar	de	Name der zu benachrichtigenden Person
 general	calendar	de	Allgemein
+global categories	calendar	de	Globale Kategorien
 global public and group public	calendar	de	Global öffentlich und Gruppen-öffentlich
 global public only	calendar	de	nur Global öffentlich
 group invitation	calendar	de	Gruppeneinladung
@@ -271,6 +272,7 @@ setting lock time calender	admin	de	Zeitintervall für Datensatzlock (default 1
 should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	de	Sollen Einladungen welche von Ihnen abgelehnt wurden in Ihrem Kalender angezeigt werden?<br> Sie können diese Einladungen dann später akzeptieren (z. B. wenn Sie eine Terminkolission gelöst haben), wenn Sie in Ihrem Kalender noch vorhanden sind!
 should new events created as private by default ?	calendar	de	Sollen neue Termine generell als Privat angelegt werden?
 should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	de	Sollen nicht angemeldete Personen ihre Belegtzeiten einsehen können? Sie können ein Passwort setzen um diese Informationen zu schützen. Das Passwort sollte sich von Ihrem normalen Passwort unterscheiden. Die Belegtzeiten sind im iCal Format und enthalten ausschließlich die Zeiten an denen sie nicht verfügbar sind. Sie enthalten NICHT den Namen, die Beschreibung oder den Ort des Termins. Die Adresse (URL) Ihrer Belegtzeiten ist %1.
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is <a href="http://localhost/egroupware/calendar/freebusy.php?user=stivi" target="_blank">http://localhost/egroupware/calendar/freebusy.php?user=stivi</a>.	calendar	de	Sollten Ihre Free/Bussy Zeiten nicht so geschützt sein das diese Daten nur bestimmten Personen zugänglich gemacht werden können? Sie können dafür ein Passwort, abweichend fom eGroupware Passwort vergeben. Die freebusy Information sind im iCal Format und nur dann inkludiert, wenn Sie keine Zeit haben. Die Eventnamen oder  die Veranstaltungsorte werden nicht mit übertragen. Die URL zu den freebusy Information ist <a href="http://localhost/egroupware/calendar/freebusy.php?user=stivi" target="_blank">http://localhost/egroupware/calendar/freebusy.php?user=stivi</a>.
 should the planner display an empty row for users or categories without any appointment.	calendar	de	Soll der Planer eine leere Zeile für Benutzer oder Kategorien ohne einen Termin anzeigen.
 should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	de	Soll der Status (Zugesagt,Abgesagt ...)der Termin- Teilnehmer in Klammern hinter jeden Teilnehmer angezeigt werden?
 show birthdays from addressbook	admin	de	Zeige Geburtstage vom Adressbuch
@@ -293,6 +295,7 @@ submit to repository	calendar	de	Ãœbertragen zu eGroupWare.org
 sun	calendar	de	So
 tentative	calendar	de	Vorläufige Zusage
 test import (show importable records <u>only</u> in browser)	calendar	de	Test Import (zeigt importierte Datensätze <u>nur</u> im Webbrowser an)
+the resource you selected is already overbooked:	calendar	de	Die Ressource, die sie buchen wollen ist beeits überbucht.
 this day is shown as first day in the week or month view.	calendar	de	Dieser Tag wird als erster in der Wochen- oder Monatsansicht angezeigt
 this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	de	Diese Zeit definiert das Ende des Arbeitstags in der Tagesansicht. Alle späteren Einträge werden darunter dargestellt.
 this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	de	Diese Zeit definiert den Anfang des Arbeitstags in der Tagesansicht. Alle früheren Einträge werden darüber dargestellt.
@@ -341,6 +344,7 @@ work day ends on	calendar	de	Arbeitstag endet um
 work day starts on	calendar	de	Arbeitstag beginnt um
 yearly	calendar	de	Jährlich
 yearview	calendar	de	Jahresansicht
+you are not allowed to book the resource selected:	calendar	de	Sie sind nicht berechtigt die ausgewählte Ressource zu buchen.
 you can either set a year or a occurence, not both !!!	calendar	de	Sie können nur entweder das Jahr oder die Wiederholung angeben, nicht beides!
 you can only set a year or a occurence !!!	calendar	de	Sie können nur ein Jahr oder eine Wiederholung angeben !
 you do not have permission to read this record!	calendar	de	Sie haben keine Berechtigung diesen Eintrag zu lesen!
@@ -349,5 +353,6 @@ you have been disinvited from the meeting at %1	calendar	de	Sie wurden vom Termi
 you need to select an account, contact or resource first!	calendar	de	Sie müssen zuerst einen Benutzer, einen Kontakt oder eine Ressource auswählen!
 you need to select an ical file first	calendar	de	Sie müssen zuerst eine iCal Datei auswählen
 you need to set either a day or a occurence !!!	calendar	de	Sie müssen entweder einen Tag oder eine Wiederholung angeben !!!
+you requested more than available for the selected resource:	calendar	de	Sie versuchen mehr zu buchen, als zur Verfügung steht.
 your meeting scheduled for %1 has been canceled	calendar	de	Ihr Termin am %1 wurde abgesagt.
 your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	de	Ihr Termin am %1 wurde auf %2 verschoben.
diff --git a/calendar/setup/egw_en.lang b/calendar/setup/egw_en.lang
index af1cf6ddb9..fb1bcbe4a9 100644
--- a/calendar/setup/egw_en.lang
+++ b/calendar/setup/egw_en.lang
@@ -143,6 +143,7 @@ fri	calendar	en	Fri
 full description	calendar	en	Full description
 fullname of person to notify	calendar	en	Fullname of person to notify
 general	calendar	en	General
+global categories	calendar	en	Global Categories
 global public and group public	calendar	en	global public and group public
 global public only	calendar	en	global public only
 group invitation	calendar	en	Group invitation
@@ -271,6 +272,7 @@ setting lock time calender	admin	en	Setting Datalock Time for Calendar (default
 should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	en	Should invitations you rejected still be shown in your calendar ?<br>You can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!
 should new events created as private by default ?	calendar	en	Should new events created as private by default ?
 should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	en	Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is %1.
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is <a href="http://localhost/egroupware/calendar/freebusy.php?user=stivi" target="_blank">http://localhost/egroupware/calendar/freebusy.php?user=stivi</a>.	calendar	en	Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is <a href="http://localhost/egroupware/calendar/freebusy.php?user=stivi" target="_blank">http://localhost/egroupware/calendar/freebusy.php?user=stivi</a>.
 should the planner display an empty row for users or categories without any appointment.	calendar	en	Should the planner display an empty row for users or categories without any appointment.
 should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	en	Should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?
 show birthdays from addressbook	admin	en	Show birthdays from addressbook
@@ -293,6 +295,7 @@ submit to repository	calendar	en	Submit to Repository
 sun	calendar	en	Sun
 tentative	calendar	en	Tentative
 test import (show importable records <u>only</u> in browser)	calendar	en	Test Import (show importable records <u>only</u> in browser)
+the resource you selected is already overbooked:	calendar	en	The resource you selected is already overbooked:
 this day is shown as first day in the week or month view.	calendar	en	This day is shown as first day in the week or month view.
 this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	en	This defines the end of your dayview. Events after this time, are shown below the dayview.
 this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	en	This defines the start of your dayview. Events before this time, are shown above the dayview.<br>This time is also used as a default starttime for new events.
@@ -341,6 +344,7 @@ work day ends on	calendar	en	work day ends on
 work day starts on	calendar	en	work day starts on
 yearly	calendar	en	Yearly
 yearview	calendar	en	yearview
+you are not allowed to book the resource selected:	calendar	en	You are not allowed to book the resource selected:
 you can either set a year or a occurence, not both !!!	calendar	en	You can either set a Year or a Occurence, not both !!!
 you can only set a year or a occurence !!!	calendar	en	You can only set a year or a occurence !!!
 you do not have permission to read this record!	calendar	en	You do not have permission to read this record!
@@ -349,5 +353,6 @@ you have been disinvited from the meeting at %1	calendar	en	You have been disinv
 you need to select an account, contact or resource first!	calendar	en	You need to select an account, contact or resource first!
 you need to select an ical file first	calendar	en	You need to select an iCal file first
 you need to set either a day or a occurence !!!	calendar	en	You need to set either a day or a occurence !!!
+you requested more than available for the selected resource:	calendar	en	You requested more than available for the selected resource:
 your meeting scheduled for %1 has been canceled	calendar	en	Your meeting scheduled for %1 has been canceled
 your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	en	Your meeting that had been scheduled for %1 has been rescheduled to %2

From 1c4a76faee459eab1f82d57c24c59ab4a224f1c1 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 20 May 2009 15:27:17 +0000
Subject: [PATCH 353/510] added some German translation for admin

---
 admin/setup/egw_de.lang | 3 +++
 admin/setup/egw_en.lang | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/admin/setup/egw_de.lang b/admin/setup/egw_de.lang
index a8dbb68ff5..e36d76a9a7 100644
--- a/admin/setup/egw_de.lang
+++ b/admin/setup/egw_de.lang
@@ -218,7 +218,9 @@ enter the site username for peer servers	admin	de	Site-Benutzername für Peer-Se
 enter the title for your site	admin	de	Titel der eGroupWare-Installation
 enter the title of your logo	admin	de	Titel Ihres Logos
 enter the url or filename (in phpgwapi/templates/default/images) of your logo	admin	de	URL oder Dateiname (in phpgwapi/templates/default/images) Ihres Logos
+enter the url or filename (in your templates image directory) of your favicon (the little icon that appears in the browsers tabs)	admin	de	Geben Sie eine URL oder einen Dateinamen (in Ihrem Templates Bilder Verzeichnis) für Ihrem Favoriten (das kleine Icon oben links im Browserfenster) an.
 enter the url where your logo should link to	admin	de	URL mit der das Logo verlinkt werden soll
+enter the vfs-path where additional images, icons or logos can be placed (and found by egroupwares applications). the path must start with /,and be readable by all users	admin	de	Geben sie den VFS-Pfad an, indem sich noch mehr Bilder oder Icons abgelegt und von EGroupware Applikationen gefunden werden können. Der Pfad MUS mit einem / beginnen und von allen Benutzer lesbar sein.
 enter your default ftp server	admin	de	Standard-FTP-Server
 enter your default mail domain ( from: user@domain )	admin	de	Standard E-Mail-Domain (Von: benutzer@domain)
 enter your http proxy server	admin	de	HTTP-Proxy-Server
@@ -314,6 +316,7 @@ login history	admin	de	Login-Kontrolle
 login message	admin	de	Meldung der Login-Seite
 login screen	admin	de	Login-Seite
 login shell	admin	de	Login-Komandointerpreter (Login-Shell)
+login time	admin	de	Login Zeit
 loginid	admin	de	Login-ID
 logintime	admin	de	Anmeldezeit
 logoutime	admin	de	Abmeldezeit
diff --git a/admin/setup/egw_en.lang b/admin/setup/egw_en.lang
index 74cd9adf10..a837291d92 100644
--- a/admin/setup/egw_en.lang
+++ b/admin/setup/egw_en.lang
@@ -216,7 +216,9 @@ enter the site username for peer servers	admin	en	Enter the site username for pe
 enter the title for your site	admin	en	Enter the title for your site
 enter the title of your logo	admin	en	Enter the title of your logo
 enter the url or filename (in phpgwapi/templates/default/images) of your logo	admin	en	Enter the URL or filename (in phpgwapi/templates/default/images) of your logo
+enter the url or filename (in your templates image directory) of your favicon (the little icon that appears in the browsers tabs)	admin	en	Enter the URL or filename (in your templates image directory) of your favicon (the little icon that appears in the browsers tabs)
 enter the url where your logo should link to	admin	en	Enter the url where your logo should link to
+enter the vfs-path where additional images, icons or logos can be placed (and found by egroupwares applications). the path must start with /,and be readable by all users	admin	en	Enter the VFS-Path where additional images, icons or logos can be placed (and found by EGroupwares applications). The path MUST start with /,and be readable by all users
 enter your default ftp server	admin	en	Enter your default FTP server
 enter your default mail domain ( from: user@domain )	admin	en	Enter your default mail domain ( From: user@domain )
 enter your http proxy server	admin	en	Enter your HTTP proxy server
@@ -312,6 +314,7 @@ login history	admin	en	Login History
 login message	admin	en	Login message
 login screen	admin	en	Login screen
 login shell	admin	en	Login shell
+login time	admin	en	Login Time
 loginid	admin	en	LoginID
 logintime	admin	en	Logintime
 logoutime	admin	en	Logoutime

From 554f8cce6a2962cf04f3c2a6fb1912ba5d326140 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 20 May 2009 15:34:33 +0000
Subject: [PATCH 354/510] added some German translation

---
 etemplate/setup/egw_de.lang | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/etemplate/setup/egw_de.lang b/etemplate/setup/egw_de.lang
index 4dc06be2e6..2d5b305613 100644
--- a/etemplate/setup/egw_de.lang
+++ b/etemplate/setup/egw_de.lang
@@ -3,6 +3,7 @@
 %1 etemplates for application '%2' dumped to '%3'	etemplate	de	%1 eTemplates für die Anwendung '%2' nach '%3' geschrieben
 %1 etemplates found	etemplate	de	%1 eTemplates gefunden
 %1 matches on search criteria	etemplate	de	%1 Treffer bei der Suche
+%1 more...	etemplate	de	%1 mehr...
 %1 new etemplates imported for application '%2'	etemplate	de	%1 neue eTemplates importiert für die Anwendung '%2'
 %s disabled	etemplate	de	%s deaktiviert
 %s needed	etemplate	de	%s benötigt
@@ -10,9 +11,11 @@
 %s onchange	etemplate	de	%s onChange
 %s readonly	etemplate	de	%s Schreibschutz
 '%1' has an invalid format !!!	etemplate	de	'%1' hat ein ungültiges Format !!!
+'%1' is no php file in the egw server root (%2)!	etemplate	de	'%1' ist keine php Datei in dem EGW Server Wurzelverzeichnis (%2)!
 '%1' is not a valid date !!!	etemplate	de	'%1' ist ein ungültiges Datum !!!
 '%1' is not a valid floatingpoint number !!!	etemplate	de	'%1' ist keine gültige Kommazahl !!!
 '%1' is not a valid integer !!!	etemplate	de	'%1' ist keine gültige Ganzzahl !!!
+'%1' is not allowed ('%2')!	etemplate	de	'%1' ist NICHT erlaubt ('%2')!
 a pattern to be searched for	etemplate	de	ein Muster nach dem gesucht werden soll
 accesskey	etemplate	de	Tastaturkürzel
 accesskeys can also be specified with an & in the label (eg. &name)	etemplate	de	Ein Tastaturkürzel kann auch über ein & in der Beschriftung angegeben werden
@@ -225,10 +228,12 @@ linklist	etemplate	de	VerknüpfungListe
 linkstring	etemplate	de	VerknüpfungZeichenkette
 linkto	etemplate	de	VerknüpfungZu
 load this template into the editor	etemplate	de	lädt diese Template zum Bearbeiten
+message ...	etemplate	de	Nachricht ...
 middle	etemplate	de	Mittig
 minute	etemplate	de	Minute
 minutes	etemplate	de	Minuten
 month	etemplate	de	Monat
+more than 1 match for '%1'	etemplate	de	Mehr als 1 trift für '%1' zu
 multicolumn indices	etemplate	de	Mehrspaltige Indices
 name	etemplate	de	Name
 name of other table where column is a key from	etemplate	de	Name der anderen Tabelle von der diese Spalte ein Schlüssel ist
@@ -248,6 +253,7 @@ nextmatch sortheader	etemplate	de	Nextmatch Sortierkopf
 no column to swap with !!!	etemplate	de	Keine Spalte um damit zu tauschen !!!
 no file	etemplate	de	keine Datei
 no filename given or selected via browse...	etemplate	de	kein Dateiname angegeben oder mit [Browse...] ausgewählt
+no matches found	etemplate	de	Keine Treffer gefunden
 no row to swap with !!!	etemplate	de	Keine Zeile um damit zu tauschen !!!
 not null	etemplate	de	NOT NULL
 nothing	etemplate	de	nichts
@@ -284,6 +290,7 @@ read etemplate from database (for the keys above)	etemplate	de	ließt ein eTempl
 readonly	etemplate	de	nur lesen
 remove row (can not be undone!!!)	etemplate	de	löscht eine Zeile (NICHT rückgängig zu machen)
 remove this link (not the entry itself)	etemplate	de	entfernt diese Verknüpfung (nicht den Eintrag selbst)
+required	etemplate	de	Benötigt
 returns savely, without deleting	etemplate	de	Abbruch, OHNE zu löschen
 right	etemplate	de	Rechts
 row...	etemplate	de	Zeile...
@@ -403,3 +410,5 @@ writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of
 xml-file to import	etemplate	de	XML Datei zum Importieren
 xslt template	etemplate	de	XSLT Template
 year	etemplate	de	Jahr
+you are not allowed to export more then %1 entries!	etemplate	de	Sie sind nicht berechtigt mehr als %1 Datensätze zu exportieren!
+you can respond by visiting:	etemplate	de	Sie können unter dem folgenden Verweis antworten:

From 1dc9b8ded6c31db9eb50e792b003d968e17faed9 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 20 May 2009 15:39:50 +0000
Subject: [PATCH 355/510] added some German translation

---
 home/setup/egw_de.lang | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 home/setup/egw_de.lang

diff --git a/home/setup/egw_de.lang b/home/setup/egw_de.lang
new file mode 100644
index 0000000000..00f0b4daee
--- /dev/null
+++ b/home/setup/egw_de.lang
@@ -0,0 +1,5 @@
+displays home	home	de	Home anzeigen
+egroupware	home	de	EGRoupware
+home	home	de	Home
+mainscreen_message	home	de	Meldung auf dem Hauptbildschirm
+there is a new version of egroupware available	home	de	Es steht eine neuere Version von EGroupware zur Verfügung

From f5408f8f4463eeda0e3bfd48f5f0491ad093b489 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Wed, 20 May 2009 16:14:19 +0000
Subject: [PATCH 356/510] added some German translation

---
 timesheet/setup/egw_de.lang | 6 ++++++
 timesheet/setup/egw_en.lang | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/timesheet/setup/egw_de.lang b/timesheet/setup/egw_de.lang
index 096b36d0e9..d388bb5c9d 100644
--- a/timesheet/setup/egw_de.lang
+++ b/timesheet/setup/egw_de.lang
@@ -14,9 +14,11 @@ both: allow to use projectmanager and free project-names	admin	de	Beides: verwen
 by	timesheet	de	von
 changed status	timesheet	de	Status geändert
 check all	timesheet	de	Alle selektieren
+comment by %1 at %2:	timesheet	de	Ãœbertragen von %1 am %2
 create new links	timesheet	de	Neue Verknüpfung erstellen
 creates a new field	timesheet	de	neues Feld anlegen
 creating new entry	timesheet	de	neuen Eintrag anlegen
+custom fields	timesheet	de	Benutzerdefinierte Felder
 delete this entry	timesheet	de	Diesen Eintrag löschen
 delete this status	timesheet	de	Diesen Status löschen
 delete timesheet	timesheet	de	Stundenzettel löschen
@@ -39,6 +41,7 @@ exports entries from your timesheet into a csv file. csv means 'comma seperated
 field must not be empty !!!	timesheet	de	Dieses Feld darf nicht leer sein!!!
 full: use only projectmanager	admin	de	Komplett: verwende nur Projektmanager
 general	timesheet	de	Allgemein
+global categories	timesheet	de	Globale Kategorien
 last modified	timesheet	de	Zuletzt geändert
 last month	timesheet	de	Letzten Monat
 last week	timesheet	de	Letzte Woche
@@ -49,6 +52,7 @@ length<br>rows	timesheet	de	Länge<br>Reihe
 links	timesheet	de	Verknüpfungen
 max length of the input [, length of the inputfield (optional)]	timesheet	de	maximale Länge der Eingabe[,Länge des Eingabefeldes (optional)]
 modify the status of the timesheet	timesheet	de	Status des Stundenzettels verändern
+new ticket submitted by %1 at %2	timesheet	de	Neues Ticket erstellt von %1 am %2
 no details	timesheet	de	Keine Details
 no project	timesheet	de	Kein Projekt
 none: use only free project-names	admin	de	Keine: verwende nur freie Projektnamen
@@ -80,12 +84,14 @@ the text displayed to the user	timesheet	de	der Text wird dem Benutzer angezeigt
 this month	timesheet	de	Diesen Monat
 this week	timesheet	de	Diese Woche
 this year	timesheet	de	Dieses Jahr
+ticket modified by %1 at %2	timesheet	de	Ticket geändert von %1 am %2
 timesheet	common	de	Stundenzettel
 timesheet csv export	timesheet	de	Export des  Stundenzettels als CSV
 timesheet openoffice export	timesheet	de	Export des  Stundenzettels als Open Office
 timesheet status-%1 '%2' added.	timesheet	de	Stundenzettel Status %1 '%2' hinzugefügt.
 timesheet-%1 '%2' updated.	timesheet	de	Stundenzettel Status %1 '%2' geändert
 timesheet-%1 deleted.	timesheet	de	Stundenzettel %1 gelöscht
+tracker	timesheet	de	Verfolgungssystem
 unitprice	timesheet	de	Preis pro Einheit
 values for selectbox	timesheet	de	Werte der Auswahlbox
 view this entry	timesheet	de	Diesen Eintrag anzeigen
diff --git a/timesheet/setup/egw_en.lang b/timesheet/setup/egw_en.lang
index 8fcbef477c..e3cbbfab2a 100644
--- a/timesheet/setup/egw_en.lang
+++ b/timesheet/setup/egw_en.lang
@@ -14,9 +14,11 @@ both: allow to use projectmanager and free project-names	admin	en	Both: allow to
 by	timesheet	en	by
 changed status	timesheet	en	changed status
 check all	timesheet	en	Check all
+comment by %1 at %2:	timesheet	en	Comment by %1 at %2:
 create new links	timesheet	en	Create new links
 creates a new field	timesheet	en	creates a new field
 creating new entry	timesheet	en	creating new entry
+custom fields	timesheet	en	Custom fields
 delete this entry	timesheet	en	Delete this entry
 delete this status	timesheet	en	Delete this status
 delete timesheet	timesheet	en	Delete Timesheet
@@ -39,6 +41,7 @@ exports entries from your timesheet into a csv file. csv means 'comma seperated
 field must not be empty !!!	timesheet	en	Field must not be empty !!!
 full: use only projectmanager	admin	en	Full: use only ProjectManager
 general	timesheet	en	General
+global categories	timesheet	en	Global Categories
 last modified	timesheet	en	Last modified
 last month	timesheet	en	Last month
 last week	timesheet	en	Last week
@@ -49,6 +52,7 @@ length<br>rows	timesheet	en	Length<br>Rows
 links	timesheet	en	Links
 max length of the input [, length of the inputfield (optional)]	timesheet	en	max length of the input [, length of the inputfield (optional)]
 modify the status of the timesheet	timesheet	en	Modify the Status of the Timesheet
+new ticket submitted by %1 at %2	timesheet	en	New ticket submitted by %1 at %2
 no details	timesheet	en	no details
 no project	timesheet	en	No project
 none: use only free project-names	admin	en	None: use only free project-names
@@ -80,12 +84,14 @@ the text displayed to the user	timesheet	en	the text displayed to the user
 this month	timesheet	en	This month
 this week	timesheet	en	This week
 this year	timesheet	en	This year
+ticket modified by %1 at %2	timesheet	en	Ticket modified by %1 at %2
 timesheet	common	en	TimeSheet
 timesheet csv export	timesheet	en	Timesheet CSV export
 timesheet openoffice export	timesheet	en	Timesheet OpenOffice export
 timesheet status-%1 '%2' added.	timesheet	en	Timesheet Status-%1 '%2' added.
 timesheet-%1 '%2' updated.	timesheet	en	Timesheet-%1 '%2' updated.
 timesheet-%1 deleted.	timesheet	en	Timesheet-%1 deleted.
+tracker	timesheet	en	Tracker
 unitprice	timesheet	en	Unitprice
 values for selectbox	timesheet	en	Values for selectbox
 view this entry	timesheet	en	View this entry

From 040139dfacceda10b44a627a00332d2cfadb53d3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 21 May 2009 17:04:58 +0000
Subject: [PATCH 357/510] Fix key handling - Stop search on up/down arrow, so
 you can use them to go through results again - Cancel search timer on up/down
 arrow - Pull key codes into a separate array so they're easier to maintain

---
 etemplate/js/ajax_select.js | 42 ++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/etemplate/js/ajax_select.js b/etemplate/js/ajax_select.js
index 3d8cbab40b..3ded8a26fe 100644
--- a/etemplate/js/ajax_select.js
+++ b/etemplate/js/ajax_select.js
@@ -26,6 +26,13 @@ var current_app = 'etemplate';
 var ajax_select_timer_id = 0;
 var ajax_select_timeout = 300;
 
+// These keys will not trigger a search if the results box is currently displayed
+var no_search_keys = [
+	'9',		// Tab
+	'38', '63232', 	// Up
+	'40', '63233'	// Down
+];
+
 function ajax_select_widget_setup(widget_id, onchange, options, currentapp) {
 	current_app = currentapp;
 	if(onchange) {
@@ -93,10 +100,17 @@ function checkKey(e, value) {
 	/*
 	 * We check for Tab, Up and Down
 	 */
-	if (e.keyCode != '9' // Tab
-		&& e.keyCode != '38' && e.keyCode != '63232' 	// Up
-		&& e.keyCode != '40' && e.keyCode != '63233'	// Down
-	) return; // The user has not pressed anything we're interested in
+	var interested = false;
+	for(var i = 0; i < no_search_keys.length; i++) {
+		if(e.keyCode == no_search_keys[i]) {
+			interested = true;
+			break;
+		}
+	}
+	if (!interested) {
+		return; // The user has not pressed anything we're interested in
+	}
+
 	if(e.target) {
 		var target = e.target;
 	} else if (e.srcElement) {
@@ -116,6 +130,7 @@ function checkKey(e, value) {
 	if(results.childNodes.length > 0) {
 		e.cancelBubble = true;
 		if(e.stopPropegation) e.stopPropegation();
+		clearTimeout(ajax_select_timer_id);
 	} else {
 		return false;
 	}
@@ -231,12 +246,25 @@ function change(e, value) {
 	}
 
 	var base_id = id.substr(0, id.lastIndexOf('['));
+
 	if(document.getElementById(base_id + '[results]')) {
 		set_id = base_id + '[results]'; 
-		// Tab doesn't trigger the search
-		if(e.keyCode == 9 ) {
-			return;
+
+		/*
+		 * We check for Tab, Up and Down
+		 */
+		var interested = false;
+		for(var i = 0; i < no_search_keys.length; i++) {
+			if(e.keyCode == no_search_keys[i]) {
+				interested = true;
+				break;
+			}
 		}
+		if (interested && document.getElementById(set_id).style.display == 'block') {
+			clearTimeout(ajax_select_timer_id);
+			return; // Results are shown, allow keys to move the selection cursor
+		}
+
 	} else {
 		set_id = base_id + '[search]';
 	}

From ef1227767ad6e7e9685fe6a315f426ed6907e6e1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 21 May 2009 19:16:32 +0000
Subject: [PATCH 358/510] "validation error in named tab (eg.
 \"tabs=general|one|two\") did not change to tab with field causing the
 validation error"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 76de20eb31..03b839e7f9 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -420,13 +420,15 @@ class etemplate extends boetemplate
 			{
 				foreach($this->get_widgets_by_type('tab') as $widget)
 				{
-					foreach(explode('|',$widget['name']) as $tab)
+					$tab_name = $tabs = $widget['name'];
+					if (strpos($tabs,'=') !== false) list($tab_name,$tabs) = explode('=',$tabs,2);
+					foreach(explode('|',$tabs) as $tab)
 					{
 						if (strpos('.',$tab) === false) $tab = $this->name.'.'.$tab;
 						$tab_tpl = new etemplate($tab);
 						if ($tab_tpl->get_widget_by_name($name))
 						{
-							$content[$widget['name']] = $tab;
+							$content[$tab_name] = $tab;
 							break 3;
 						}
 					}

From 9ebd2fab616c529ea0de9371652de58257cf368f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 21 May 2009 22:16:09 +0000
Subject: [PATCH 359/510] "new sub-command to drop database and user"

---
 setup/inc/class.setup_cmd_database.inc.php | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/setup/inc/class.setup_cmd_database.inc.php b/setup/inc/class.setup_cmd_database.inc.php
index de3dd83cba..938f94503e 100644
--- a/setup/inc/class.setup_cmd_database.inc.php
+++ b/setup/inc/class.setup_cmd_database.inc.php
@@ -93,6 +93,9 @@ class setup_cmd_database extends setup_cmd
 				case 'test_db':
 					$msg = $this->connect();
 					break;
+				case 'drop':
+					$msg = $this->drop();
+					break;
 				case 'create_db':
 				default:
 					$msg = $this->create();
@@ -189,6 +192,29 @@ class setup_cmd_database extends setup_cmd
 		return $msg;
 	}
 
+	/**
+	 * Drop database and user
+	 *
+	 * @return string with success message
+	 * @throws egw_exception_wrong_userinput
+	 * @throws egw_db_exception if database not exist
+	 */
+	private function drop()
+	{
+		$this->connect($this->db_root,$this->db_root_pw,$this->db_meta);
+		$this->test_db->query('DROP DATABASE '.$this->test_db->name_quote($this->db_name),__LINE__,__FILE__);
+		$msg = lang('Datebase %1 droped.',$this->db_name);
+		try {
+			$this->test_db->query('DROP USER '.$this->test_db->quote($this->db_user).'@'.
+				$this->test_db->quote($this->db_grant_host?$this->db_grant_host:'%'),__LINE__,__FILE__);
+		}
+		catch (egw_db_exception $e) {
+			// we make this no fatal error, as the granthost might be something else ...
+			$msg .= ' '.lang('Error dropping User!');
+		}
+		return $msg;
+	}
+
 	/**
 	 * Return default database settings for a given domain
 	 *

From 53a8d50bb0358641949876455026c52e17c361e4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 22 May 2009 07:04:55 +0000
Subject: [PATCH 360/510] "fixed date-time widget to correctly write seconds,
 eg. if output format is \"Y-m-d H:i:s\""

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

diff --git a/etemplate/inc/class.date_widget.inc.php b/etemplate/inc/class.date_widget.inc.php
index cd8f0d9a79..8e61f8033d 100644
--- a/etemplate/inc/class.date_widget.inc.php
+++ b/etemplate/inc/class.date_widget.inc.php
@@ -626,7 +626,7 @@ class date_widget
 			{
 				for ($n = 0,$str = ''; $n < strlen($data_format); ++$n)
 				{
-					if (strpos('YmdHi',$c = $data_format[$n]) !== false)
+					if (strpos('YmdHis',$c = $data_format[$n]) !== false)
 					{
 						$str .= sprintf($c=='Y'?'%04d':'%02d',$value[$c]);
 					}

From 13cd6b296b18f6dbeddfe0d30adeb64c5dd3e7d5 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Fri, 22 May 2009 12:51:41 +0000
Subject: [PATCH 361/510] fixed small Bug, time planed was not shown in new tag
 times and times planed

---
 infolog/setup/etemplates.inc.php    | 74 ++++++++++++++++++++++++++++-
 infolog/templates/default/index.xet | 21 +++++---
 2 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index 587b39b0b7..43b243c5ea 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-17 13:43
+	* generated by soetemplate::dump4setup() 2009-05-22 14:50
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -14,12 +14,17 @@ $templ_version=1;
 
 $templ_data[] = array('name' => 'infolog.close','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"h4";s:2:"50";s:2:"c3";s:7:",bottom";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:5:"align";s:6:"center";s:4:"name";s:27:"infolog.index.rows-noheader";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:44:"Are you shure you want to close this entry ?";s:5:"align";s:6:"center";}}i:4;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"Yes - Close";s:4:"name";s:5:"close";s:4:"help";s:30:"Sub-entries will not be closed";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:33:"Yes - Close including sub-entries";s:4:"name";s:10:"close_subs";s:4:"help";s:43:"Close this entry and all listed sub-entries";}s:5:"align";s:6:"center";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"No - Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:22:"Abort without deleting";}}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1240392317',);
 
+$templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:3:"typ";s:8:"onchange";s:1:"1";s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
+.error_msg { color: red; font-style: italics; }','modified' => '1061729975',);
+
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:3:{s:1:"F";s:3:"80%";s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:19:"applies the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1159943136',);
 
 $templ_data[] = array('name' => 'infolog.customfields','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:3:{s:2:"c2";s:6:"header";s:2:"c4";s:6:"header";s:1:"F";s:3:"80%";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"type2";s:8:"onchange";i:1;s:4:"help";s:52:"select a typ to edit it\'s status-values or delete it";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:24:"deletes the selected typ";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"10,40";s:4:"name";s:8:"new_name";s:4:"help";s:26:"name of new type to create";s:4:"blur";s:8:"new name";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:14:"button[create]";s:4:"help";s:37:"creates a new typ with the given name";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",error_msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:9:"error_msg";}}i:2;a:6:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Custom status for typ";s:4:"name";s:3:"typ";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"status";s:4:"span";s:3:"all";s:4:"name";s:6:"status";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:13:"Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:6:"fields";s:4:"span";s:3:"all";s:4:"name";s:6:"fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:7:",header";s:5:"label";s:15:"Group owner for";s:4:"name";s:5:"type2";}i:2;a:5:{s:4:"type";s:14:"select-account";s:4:"size";s:11:"None,groups";s:4:"name";s:11:"group_owner";s:4:"help";s:119:"If a type has a group owner, all entries of that type will be owned by the given group and NOT the user who created it!";s:4:"span";s:10:",lpadding5";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:33:"saves the changes made and leaves";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"help";s:17:"apply the changes";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:22:"leaves without saveing";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }','modified' => '1173687088',);
 
+$templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;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:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"G";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:7:{s:1:"A";a:4:{s:4:"type";s:6:"select";s:4:"size";s:3:"All";s:4:"name";s:11:"${row}[typ]";s:4:"help";s:41:"for which types should this field be used";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"F";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"G";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '','modified' => '1061734964',);
+
 $templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;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:8:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"3";s:4:"name";s:13:"${row}[type2]";s:4:"help";s:41:"for which types should this field be used";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"${row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1061734964',);
 
 $templ_data[] = array('name' => 'infolog.customfields.fields','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;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:8:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Typ";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Values for selectbox";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Length<br>Rows";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Order";}s:1:"H";a:4:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:5:"align";s:6:"center";s:4:"help";s:18:"deletes this field";}}i:2;a:8:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"3";s:4:"name";s:13:"${row}[type2]";s:4:"help";s:41:"for which types should this field be used";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,32";s:4:"name";s:12:"${row}[name]";s:4:"help";s:83:"the name used internaly (<= 20 chars), changeing it makes existing data unavailible";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"name";s:13:"${row}[label]";s:4:"help";s:30:"the text displayed to the user";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[label]";}}s:1:"D";a:3:{s:4:"type";s:18:"customfields-types";s:4:"name";s:12:"${row}[type]";s:4:"help";s:19:"Type of customfield";}s:1:"E";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,30";s:4:"name";s:14:"${row}[values]";s:4:"help";s:40:"each value is a line like <id>[=<label>]";}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:11:"${row}[len]";s:4:"help";s:63:"max length of the input [, length of the inputfield (optional)]";}i:2;a:5:{s:4:"type";s:3:"int";s:4:"size";s:6:"0,10,2";s:4:"name";s:12:"${row}[rows]";s:4:"help";s:70:"number of row for a multiline inputfield or line of a multi-select-box";s:4:"blur";s:1:"1";}}s:1:"G";a:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:13:"${row}[order]";s:4:"help";s:45:"determines the order the fields are displayed";}s:1:"H";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:"Delete";s:4:"name";s:23:"delete[$row_cont[name]]";s:4:"help";s:18:"deletes this field";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Create";s:4:"name";s:21:"create$row_cont[name]";s:4:"help";s:19:"creates a new field";}}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1061734964',);
@@ -32,6 +37,14 @@ $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','
 
 $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"h4";s:2:"50";s:2:"c3";s:7:",bottom";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:5:"align";s:6:"center";s:4:"name";s:27:"infolog.index.rows-noheader";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:45:"Are you shure you want to delete this entry ?";s:5:"align";s:6:"center";}}i:4;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Yes - Delete";s:4:"name";s:6:"delete";s:4:"help";s:75:"Sub-entries become subs of the parent or main entries, if there\'s no parent";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:34:"Yes - Delete including sub-entries";s:4:"name";s:11:"delete_subs";s:4:"help";s:44:"Delete this entry and all listed sub-entries";}s:5:"align";s:6:"center";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"No - Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:22:"Abort without deleting";}}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1131742953',);
 
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"span";s:3:"all";s:4:"name";s:9:"info_type";s:8:"onchange";s:1:"1";s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:6:"needed";s:1:"1";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142602276',);
+
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
+.link_select select { width: 250px; }','modified' => '1159943980',);
+
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
+.link_select select { width: 250px; }','modified' => '1159943980',);
+
 $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
 .link_select select { width: 250px; }
 .description textarea { width: 98%; }','modified' => '1207297595',);
@@ -54,6 +67,10 @@ $templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang
 
 $templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:2:"th";s:2:"c5";s:7:"row,top";s:2:"c6";s:3:"row";s:2:"h6";s:2:",1";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:7:"General";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:3:{s:4:"name";s:13:"info_priority";s:4:"type";s:6:"select";s:4:"help";s:31:"select a priority for this task";}}i:3;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"size";s:6:"80,255";s:4:"name";s:13:"info_location";s:4:"type";s:4:"text";}}i:4;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:10:"Delegation";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"size";s:19:",,,info_responsible";s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"info_responsible";s:4:"size";s:7:"10,both";s:4:"help";s:66:"select a responsible user: a person you want to delegate this task";}}i:6;a:2:{s:1:"A";a:3:{s:4:"size";s:15:",,,info_confirm";s:4:"type";s:5:"label";s:5:"label";s:7:"Confirm";}s:1:"B";a:3:{s:4:"name";s:12:"info_confirm";s:4:"type";s:6:"select";s:4:"help";s:87:"do you want a confirmation of the responsible on: accepting, finishing the task or both";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:8:"100%,245";}}','size' => '100%,245','style' => '','modified' => '1217409875',);
 
+$templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '0.9.15.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"15,80";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:7:"100%,,0";}}','size' => '100%,,0','style' => '','modified' => '1051391600',);
+
+$templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"13,75";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1051391600',);
+
 $templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:8:"textarea";s:4:"size";s:2:"13";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";s:4:"span";s:12:",description";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1207297749',);
 
 $templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:11:"Description";s:4:"size";s:11:",,,info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:8:"textarea";s:4:"size";s:2:"13";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";s:4:"span";s:12:",description";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1229074983',);
@@ -62,6 +79,8 @@ $templ_data[] = array('name' => 'infolog.edit.GroupType','template' => '','lang'
 
 $templ_data[] = array('name' => 'infolog.edit.history','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,250,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"250";i:6;s:4:"auto";}}}','size' => '100%,250,,,,,auto','style' => '','modified' => '1181576846',);
 
+$templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '0.9.15.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"h4";s:3:"164";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1075977056',);
+
 $templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:17:"100%,245,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";}}}','size' => '100%,245,,,,,auto','style' => '','modified' => '1075977056',);
 
 $templ_data[] = array('name' => 'infolog.edit.links','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:7:{s:1:"A";s:3:"100";s:2:"h1";s:13:",@status_only";s:2:"h2";s:13:",@status_only";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c4";s:2:"th";s:2:"c5";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"link-add";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:4:"size";s:17:"100%,245,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";}}}','size' => '100%,245,,,,,auto','style' => '','modified' => '1075977056',);
@@ -70,25 +89,78 @@ $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' =
 
 $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c6";s:7:"row,top";s:2:"h6";s:3:"60%";s:2:"c5";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Projectmanager";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Project";}s:1:"B";a:4:{s:4:"type";s:21:"projectmanager-select";s:4:"name";s:5:"pm_id";s:8:"onchange";s:1:"1";s:4:"size";s:4:"None";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Price";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:207:"this.form[\'exec[info_price]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:10:"info_price";s:4:"span";s:3:"all";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:20:",,,info_planned_time";s:5:"label";s:12:"planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:17:"info_planned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:22:",,,info_replanned_time";s:5:"label";s:15:"Re-planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"info_replanned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,info_used_time";s:5:"label";s:9:"used time";s:4:"help";s:64:"Leave blank to get the used time calculated by timesheet entries";}s:1:"B";a:2:{s:4:"type";s:13:"date-duration";s:4:"name";s:14:"info_used_time";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:8:"100%,245";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"245";}}}','size' => '100%,245','style' => '','modified' => '1223093893',);
 
+$templ_data[] = array('name' => 'infolog.edit.Sales','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"c1";s:7:"noPrint";s:1:"C";s:2:"1%";s:2:"c3";s:7:"noPrint";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:12:"infolog.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:7:"onclick";s:15:"window.print();";}s:1:"D";a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:5:"Email";s:7:"onclick";s:1042:"formular = document.createElement(\'FORM\');formular.name = \'sendmail\';formular.target=\'sendmyemail\';formular.method = \'post\';formular.action = \'/egroupware/index.php?menuaction=felamimail.uicompose.compose\';formularfieldto = document.createElement(\'input\');email= \'\'; if (document.getElementById(\'info_contact[email]\').firstChild) {email = document.getElementById(\'info_contact[email]\').firstChild.data;}formularfieldto.name=\'preset[to]\';formularfieldto.value=email;formularfieldsubject = document.createElement(\'input\');formularfieldsubject.name=\'preset[subject]\';formularfieldsubject.value=document.getElementById(\'exec[info_subject]\').value;formularfieldbody = document.createElement(\'textarea\');formularfieldbody.name=\'preset[body]\';formularfieldbody.value=template::styles(\'infolog.edit.Sales.print\')+document.getElementById(\'infolog.edit.Sales.print\').innerHTML;document.body.appendChild(formular);formular.appendChild(formularfieldto);formular.appendChild(formularfieldsubject);formular.appendChild(formularfieldbody);formular.submit();";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:24:"infolog.edit.Sales.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1232467679',);
+
+$templ_data[] = array('name' => 'infolog.edit.Sales.print','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:2:{s:2:"c6";s:7:",bottom";s:2:"h6";s:2:"40";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:13:"contact-value";s:5:"label";s:7:"E-mail:";s:4:"size";s:5:"email";s:4:"name";s:12:"info_contact";}s:1:"B";a:5:{s:4:"type";s:13:"infolog-value";s:4:"size";s:20:"info_link_id,,,email";s:4:"name";s:7:"info_id";s:7:"options";a:2:{i:0;s:12:"info_link_id";i:3;s:5:"email";}s:4:"span";s:5:",bold";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:10:"Tagespreis";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Sendung von";s:4:"name";s:4:"#von";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Sendung nach";s:4:"name";s:5:"#nach";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:13:"contact-value";s:4:"size";s:8:"org_name";s:4:"name";s:12:"info_contact";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:25:"Mit freundlichen Grüßen";s:4:"span";s:5:",blue";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:15:"contact-account";s:4:"size";s:4:"n_fn";s:4:"name";s:10:"info_owner";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:15:",,,sendforemail";s:7:"options";a:1:{i:3;s:12:"sendforemail";}}}','size' => ',,,sendforemail','style' => '.bold { font-weight: bold; }
+.blue { color: blue; }','modified' => '1232469093',);
+
+$templ_data[] = array('name' => 'infolog.edit.Tagespreis','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c2";s:7:"noPrint";s:2:"c1";s:7:"noPrint";s:1:"C";s:2:"1%";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:12:"infolog.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"hrule";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:7:"onclick";s:15:"window.print();";}s:1:"D";a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:5:"Email";s:7:"onclick";s:1058:"document.createElement(\'FORM\');formular.name = \'sendmail\'; formular.target=\'sendmyemail\'; formular.method = \'post\';formular.action = \'egw::link(\'/index.php\',\'menuaction=felamimail.uicompose.compose\')\'; formularfieldto = document.createElement(\'input\'); email= \'\';if (document.getElementById(\'info_contact[email]\').firstChild) {email = document.getElementById(\'info_contact[email]\').firstChild.data;} formularfieldto.name=\'preset[to]\';formularfieldto.value=email; formularfieldsubject = document.createElement(\'input\'); formularfieldsubject.name=\'preset[subject]\'; formularfieldsubject.value=document.getElementById(\'exec[info_subject]\').value; formularfieldbody = document.createElement(\'textarea\'); formularfieldbody.name=\'preset[body]\'; formularfieldbody.value=template::styles(\'infolog.edit.Tagespreis.print\')+document.getElementById(\'infolog.edit.Tagespreis.print\').innerHTML; document.body.appendChild(formular); formular.appendChild(formularfieldto);formular.appendChild(formularfieldsubject); formular.appendChild(formularfieldbody);formular.submit();";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:29:"infolog.edit.Tagespreis.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1202292659',);
+
+$templ_data[] = array('name' => 'infolog.edit.Tagespreis.print','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:2:{s:2:"c6";s:7:",bottom";s:2:"h6";s:2:"40";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:13:"contact-value";s:5:"label";s:7:"E-mail:";s:4:"size";s:5:"email";s:4:"name";s:12:"info_contact";}s:1:"B";a:5:{s:4:"type";s:13:"infolog-value";s:4:"size";s:20:"info_link_id,,,email";s:4:"name";s:7:"info_id";s:7:"options";a:2:{i:0;s:12:"info_link_id";i:3;s:5:"email";}s:4:"span";s:5:",bold";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:10:"Tagespreis";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Sendung von";s:4:"name";s:4:"#von";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Sendung nach";s:4:"name";s:5:"#nach";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:13:"contact-value";s:4:"size";s:8:"org_name";s:4:"name";s:12:"info_contact";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:25:"Mit freundlichen Grüßen";s:4:"span";s:5:",blue";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:15:"contact-account";s:4:"size";s:4:"n_fn";s:4:"name";s:10:"info_owner";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:15:",,,sendforemail";s:7:"options";a:1:{i:3;s:12:"sendforemail";}}}','size' => ',,,sendforemail','style' => '.bold { font-weight: bold; }
+.blue { color: blue; }','modified' => '1202293022',);
+
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
+
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
+
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:244:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
+
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:244:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
+
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1223355813',);
 
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1242033158',);
 
+$templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:6:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";s:2:"h1";s:6:",!@css";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:245:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id={$cont[nm][cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1242996117',);
+
 $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:16:",headertext bold";s:5:"label";s:7:"InfoLog";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:8:",,0,,0,0";}}','size' => ',,0,,0,0','style' => '.bold { font-weight: bold; }','modified' => '1056876864',);
 
 $templ_data[] = array('name' => 'infolog.index.header_left','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"span";s:16:",headertext bold";s:5:"label";s:7:"InfoLog";}}','size' => ',,0,,0,0','style' => '.bold { font-weight: bold; }','modified' => '1056876864',);
 
+$templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=610,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:218:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=550,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=550,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
+
+$templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:218:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
+
 $templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:238:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=task&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:240:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:238:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
 
 $templ_data[] = array('name' => 'infolog.index.header_right','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:4:"Add:";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"task";s:5:"label";s:4:"ToDo";s:4:"name";s:9:"add[task]";s:4:"help";s:14:"Add a new ToDo";s:7:"onclick";s:239:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=task&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:5:"phone";s:5:"label";s:9:"Phonecall";s:4:"name";s:10:"add[phone]";s:4:"help";s:19:"Add a new Phonecall";s:7:"onclick";s:241:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=phone&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]}\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"note";s:5:"label";s:4:"Note";s:4:"name";s:9:"add[note]";s:4:"help";s:14:"Add a new Note";s:7:"onclick";s:239:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&type=note&action=$cont[action]&action_id=$cont[action_id]&cat_id=$cont[cat_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}}','size' => ',,0,,0,0','style' => '','modified' => '1131789124',);
 
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";}i:2;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:11:"Responsible";s:4:"help";s:31:"Select to filter by responsible";}}s:1:"F";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:7:"options";a:1:{i:0;s:1:"3";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1093714137',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:1:"A";s:2:"2%";s:1:"F";s:34:"8%,@no_info_owner_info_responsible";s:1:"G";s:3:"12%";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"I";s:14:"3%,@no_actions";s:1:"D";s:3:"120";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"G";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1093714137',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1195812360',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.4.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1197290396',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:4;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1197290396',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1223128790',);
+
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1229074929',);
+
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"G";s:34:"8%,@no_info_owner_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:3:"12%";s:1:"I";s:14:"3%,@no_actions";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:9:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}s:7:"options";a:1:{i:0;s:1:"2";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"H";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401028',);
 
 $templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:34:"8%,@no_info_owner_info_responsible";s:1:"I";s:3:"12%";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";s:1:"K";s:14:"3%,@no_actions";}i:1;a:11:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"I";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"K";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:11:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:8:",infoDes";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"I";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"J";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"parent";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"K";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:11;}}','size' => '','style' => '','modified' => '1240401028',);
 
+$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:34:"8%,@no_info_owner_info_responsible";s:1:"I";s:3:"12%";s:1:"J";s:14:"3%,@no_actions";s:1:"E";s:3:"120";s:1:"C";s:17:",@no_customfields";s:1:"K";s:14:"3%,@no_actions";}i:1;a:11:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:4:"Type";s:4:"name";s:9:"info_type";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:6:"Status";s:4:"name";s:11:"info_status";s:5:"align";s:6:"center";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Completed";s:4:"name";s:12:"info_percent";s:5:"align";s:5:"right";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:6:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Creation";s:5:"align";s:5:"right";s:4:"name";s:7:"info_id";s:4:"size";s:4:"DESC";s:4:"span";s:8:",noPrint";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:6:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:8:",noPrint";s:5:"align";s:5:"right";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:19:"customfields-header";s:4:"size";s:13:"@customfields";s:5:"align";s:5:"right";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:0:{}}s:4:"name";s:12:"customfields";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"info_datecompleted";s:5:"label";s:14:"Date completed";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Times";s:4:"name";s:14:"info_used_time";}i:2;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:17:"info_planned_time";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:19:"info_replanned_time";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";s:4:"span";s:12:",user_filter";}i:2;a:5:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:16:"Responsible,both";s:4:"help";s:31:"Select to filter by responsible";s:4:"span";s:12:",user_filter";}}s:1:"I";a:4:{s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"K";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:11:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:8:",infoDes";i:1;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";s:4:"size";s:3:",,1";}}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:3:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[info_cat]";s:8:"readonly";s:1:"1";}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"F";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:8:"readonly";s:1:"1";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:8:"readonly";s:1:"1";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:1:{s:4:"type";s:5:"label";}}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"r_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:9:"planified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"I";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"J";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"parent";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:261:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&cat_id=$row_cont[info_cat]&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"K";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}s:4:"span";s:8:",noPrint";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:11;}}','size' => '','style' => '','modified' => '1242995548',);
+
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:12:"8%,@no_users";s:1:"F";s:16:"12%,@no_modified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:10:",@no_times";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
+
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"A";s:2:"2%";s:1:"C";s:3:"120";s:1:"E";s:34:"8%,@no_info_onwer_info_responsible";s:1:"F";s:25:"12%,@no_info_datemodified";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:37:",@no_info_used_time_info_planned_time";}i:1;a:8:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:8:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"G";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"H";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:8;}}','size' => '','style' => '','modified' => '1142615238',);
+
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:233:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.uitimesheet.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
+
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"E";s:37:",@no_info_used_time_info_planned_time";s:1:"F";s:34:"8%,@no_info_onwer_info_responsible";s:1:"G";s:25:"12%,@no_info_datemodified";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:14:"3%,@no_actions";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"H";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"F";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"H";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;}}','size' => '','style' => '','modified' => '1195819535',);
 
 $templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"F";s:37:",@no_info_used_time_info_planned_time";s:1:"G";s:34:"8%,@no_info_onwer_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:25:"12%,@no_info_datemodified";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";s:1:"J";s:14:"3%,@no_actions";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1240401005',);
 
+$templ_data[] = array('name' => 'infolog.index.rows-noheader','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:10:{s:1:"A";s:2:"2%";s:1:"F";s:37:",@no_info_used_time_info_planned_time";s:1:"G";s:34:"8%,@no_info_onwer_info_responsible";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"H";s:25:"12%,@no_info_datemodified";s:1:"D";s:3:"120";s:1:"I";s:14:"3%,@no_actions";s:1:"C";s:17:",@no_customfields";s:1:"J";s:14:"3%,@no_actions";}i:1;a:10:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:5:"align";s:6:"center";}i:3;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:5:"align";s:5:"right";}}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:7:"options";a:1:{i:0;s:1:"2";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:12:"customfields";s:4:"size";s:13:"Custom fields";}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:1:"A";s:17:",@no_customfields";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";s:4:"size";s:13:"Custom fields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Date completed";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Times";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"span";s:8:",planned";s:5:"label";s:7:"planned";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"span";s:10:",replanned";s:5:"label";s:10:"Re-planned";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"last changed";}s:1:"I";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";s:4:"span";s:8:",noPrint";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";s:4:"span";s:8:",noPrint";}}i:2;a:10:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:57:"$row_cont[info_status_label],$row_cont[info_status_label]";s:5:"label";s:28:"$row_cont[info_status_label]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:23:"$row_cont[info_percent]";s:5:"label";s:23:"$row_cont[info_percent]";s:4:"name";s:32:"edit_percent[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:4;a:4:{s:4:"type";s:5:"image";s:5:"label";s:24:"$row_cont[info_percent2]";s:4:"name";s:21:"{$row}[info_percent2]";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}}s:1:"B";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:4:"link";s:5:"label";s:23:"%s $row_cont[info_addr]";s:4:"name";s:17:"${row}[info_link]";s:4:"size";s:1:"b";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:2;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:19:"{$row}[info_number]";s:4:"span";s:7:",infoId";}}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}s:4:"span";s:10:",fullWidth";}s:1:"C";a:4:{s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"D";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:8:"3,,0,0,1";s:4:"data";a:4:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}}s:4:"rows";i:3;s:4:"cols";i:1;i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:33:",$row_cont[end_class] fixedHeight";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:26:"${row}[info_datecompleted]";s:8:"readonly";s:1:"1";s:4:"span";s:12:",fixedHeight";}}s:1:"E";a:7:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:8:"readonly";s:1:"1";s:4:"size";s:6:"2,,1,0";i:1;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}}s:1:"F";a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:4:{i:0;a:1:{s:2:"h2";s:14:",@no_timesheet";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}i:3;a:1:{s:1:"A";a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:5:",,,,1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:6:"3,,0,0";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:5:"Times";s:4:"name";s:9:"timesheet";}i:2;a:4:{s:4:"type";s:13:"date-duration";s:4:"name";s:22:"${row}[info_used_time]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"l_used_time";i:3;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_sum_timesheets]";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";s:4:"span";s:10:",timesheet";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:12:"planned time";s:4:"name";s:11:"k_alarm.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:25:"${row}[info_planned_time]";s:4:"span";s:11:"all,planned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:10:"lplanified";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,1,0";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:15:"Re-planned time";s:4:"name";s:14:"agt_reload.png";}i:2;a:5:{s:4:"type";s:13:"date-duration";s:4:"name";s:27:"${row}[info_replanned_time]";s:4:"span";s:13:"all,replanned";s:8:"readonly";s:1:"1";s:4:"size";s:16:"@duration_format";}s:4:"name";s:11:"replanified";}}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";s:4:"size";s:1:"5";}}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"I";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";s:5:"align";s:6:"center";i:1;a:7:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";s:7:"onclick";s:199:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&action=sp&action_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:234:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=infolog&link_id[]=$row_cont[info_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";s:5:"align";s:6:"center";}s:4:"span";s:8:",noPrint";}s:1:"J";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:187:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.infolog_ui.edit&info_id=$row_cont[info_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:64:"return $row_cont[info_anz_subs] || confirm(\'Delete this entry\');";}}i:2;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"4,0,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"done";s:5:"label";s:5:"Close";s:4:"name";s:25:"close[$row_cont[info_id]]";s:4:"help";s:37:"Sets the status of this entry to done";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"done_all";s:5:"label";s:9:"Close all";s:4:"name";s:29:"close_all[$row_cont[info_id]]";s:4:"help";s:50:"Sets the status of this entry and its subs to done";}s:4:"span";s:8:",noPrint";i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}}s:4:"span";s:8:",noPrint";i:3;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:92:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/infolog/$row_cont[info_id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}s:4:"rows";i:2;s:4:"cols";i:10;}}','size' => '','style' => '','modified' => '1242996156',);
+
+$templ_data[] = array('name' => 'infolog.Lebert.Baienfurt.Kopf','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:17:"Lebert + Co. GmbH";s:4:"span";s:11:",my_heading";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:23:"International Spedition";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Eisenbahnstrasse 4";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:15:"88255 Baienfurt";}}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:8:"logo.png";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:14:"100%,,,my_form";s:7:"options";a:2:{i:3;s:7:"my_form";i:0;s:4:"100%";}}}','size' => '100%,,,my_form','style' => '.xmy_form td { font-size: 20pt; }
+.my_heading { font-size: 120%; font-weight: bold; }','modified' => '1158752011',);
+
+$templ_data[] = array('name' => 'infolog.test','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:19:"customfields-header";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1197441373',);
+
 $templ_data[] = array('name' => 'infolog.widget.infolog-value','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:2:"c1";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c2";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@type=button";s:2:"c3";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:6:{s:4:"type";s:14:"infolog-fields";s:4:"name";s:10:"options[0]";s:4:"help";s:21:"Contact field to show";s:4:"span";s:3:"all";s:5:"label";s:5:"Field";s:7:"options";a:0:{}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Compare";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";s:4:"help";s:69:"show a X if content equals this compare value, otherwise show nothing";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"span";s:3:"all";s:5:"label";s:12:"Alternatives";s:4:"name";s:10:"options[2]";s:4:"help";s:77:"colon (:) separated list of field names to use if value is empty or to sum up";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Contactfield";}s:1:"B";a:2:{s:4:"type";s:14:"contact-fields";s:4:"name";s:10:"options[3]";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:19:"Regular expression ";s:4:"name";s:10:"options[4]";s:4:"help";s:31:"first argument for preg_replace";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:11:"Replacement";s:4:"name";s:10:"options[5]";s:4:"help";s:33:"second parameter for preg_replace";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";s:5:"label";s:11:"Span, Class";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1242559977',);
 
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 3cd4b1d471..9906a794f0 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -13,8 +13,8 @@
 			<button image="note" label="Note" id="add[note]" statustext="Add a new Note" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=note&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
 		</hbox>
 	</template>
-	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.001">
-		<grid>
+	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.003">
+		<grid width="100%" class="my_form">
 			<columns>
 				<column width="2%"/>
 				<column/>
@@ -96,7 +96,10 @@
 						<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
 					</vbox>
 					<vbox rows="3" cols="1">
-						<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+						<hbox readonly="true" options="1,0">
+							<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+							<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
+						</hbox>
 						<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
 					</vbox>
 					<vbox rows="3" cols="1" options="0,0">
@@ -149,7 +152,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.index.rows" template="" lang="" group="0" version="1.7.002">
+	<template id="infolog.index.rows" template="" lang="" group="0" version="1.7.003">
 		<grid>
 			<columns>
 				<column width="2%"/>
@@ -243,7 +246,13 @@
 						<date-time id="${row}[info_datecompleted]" readonly="true" class="fixedHeight"/>
 					</vbox>
 					<vbox rows="3" cols="1" options="0,0">
-						<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+						<hbox readonly="true">
+							<hbox readonly="true" options="1,0">
+								<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
+								<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
+							</hbox>
+							<description/>
+						</hbox>
 						<date-duration id="${row}[info_planned_time]" span="all" class="planned" readonly="true" options="@duration_format"/>
 					</vbox>
 					<vbox rows="3" cols="1" options="0,0">
@@ -294,7 +303,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.index" template="" lang="" group="0" version="1.7.001">
+	<template id="infolog.index" template="" lang="" group="0" version="1.7.003">
 		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="90%"/>

From 9bf9debe631b0b87da7b608aed653ebc49ff919a Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Fri, 22 May 2009 13:26:42 +0000
Subject: [PATCH 362/510] changing template to make a infolog as a subinfolog

---
 infolog/setup/egw_de.lang          |  9 +++++++++
 infolog/setup/egw_en.lang          |  9 +++++++++
 infolog/setup/etemplates.inc.php   | 30 +++++-------------------------
 infolog/templates/default/edit.xet | 27 ++++++++++++++++-----------
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/infolog/setup/egw_de.lang b/infolog/setup/egw_de.lang
index 5b452774a8..8fceacdc30 100644
--- a/infolog/setup/egw_de.lang
+++ b/infolog/setup/egw_de.lang
@@ -41,8 +41,10 @@ add:	infolog	de	Hinzufügen:
 all	infolog	de	alle
 all links and attachments	infolog	de	alle Verknüpfungen und Anhänge
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	de	erlaubt den Status eines Eintrags zu setzen, zB. eine Aufgabe auf erledigt wenn sie beendet ist (Werte hängen vom Type des Eintrags ab)
+alternatives	infolog	de	Alternativen
 apply the changes	infolog	de	Übernimmt die Änderungen
 archive	infolog	de	Archiviert
+are you shure you want to close this entry ?	infolog	de	Wollen Sie wirklich den Infolog schliessen?
 are you shure you want to delete this entry ?	infolog	de	Sind Sie sicher, dass Sie diesen Eintrag löschen wollen?
 attach a file	infolog	de	Datei anhängen
 attach file	infolog	de	Datei anhängen
@@ -64,6 +66,8 @@ check to specify custom contact	infolog	de	Ankreutzen um einen eigenen Kontakt a
 click here to create the link	infolog	de	hier klicken um die Verknüpfung zu erzeugen
 click here to start the search	infolog	de	hier klicken um die Suche zu starten
 close	infolog	de	Schließen
+close all	infolog	de	Alle schließen
+close this entry and all listed sub-entries	infolog	de	Diesen Eintrag und alle Untereintraäge schliessen
 comment	infolog	de	Kommentar
 completed	infolog	de	Erledigt
 configuration	infolog	de	Konfiguration
@@ -124,6 +128,7 @@ don't show infolog	infolog	de	InfoLog NICHT anzeigen
 done	infolog	de	erledigt
 download	infolog	de	Datei laden
 duration	infolog	de	Dauer
+e-mail:	infolog	de	E-Mail
 each value is a line like <id>[=<label>]	infolog	de	jeder Wert ist eine Zeile im Format id=[angezeigter Wert]
 edit	infolog	de	Bearbeiten
 edit or create categories for ingolog	infolog	de	Kategorien für InfoLog bearbeiten oder neu anlegen
@@ -235,6 +240,7 @@ own open	infolog	de	eigene offen
 own overdue	infolog	de	eigene überfällig
 own upcoming	infolog	de	eigene zukünftig
 parent	infolog	de	Elterneintrag
+parent infolog	infolog	de	Ãœbergeordneter Infolog
 path on (web-)serverside<br>eg. /var/samba/share	infolog	de	Pfad auf (Web-)Server<br>zB. /var/samba/Share
 path to user and group files has to be outside of the webservers document-root!!!	infolog	de	Pfad zu Benutzer- und Gruppen-Dateien MUSS AUSSERHALB des Wurzelverzeichnisses des Webservers (document-root) liegen!!!
 pattern for search in addressbook	infolog	de	Muster für Suche im Adressbuch
@@ -253,6 +259,7 @@ priority	infolog	de	Priorität
 private	infolog	de	Privat
 project	infolog	de	Projekt
 project settings: price, times	infolog	de	Einstellungen zum Projekt: Preis, Zeiten
+projectmanager	infolog	de	Projektmanager
 re-planned	infolog	de	Umgeplant
 re-planned time	infolog	de	Umgeplante Zeit
 re:	infolog	de	Re:
@@ -363,6 +370,8 @@ which implicit acl rights should the responsible get?	infolog	de	Welche implizit
 which types should the calendar show	infolog	de	Welche Typen soll der Kalender anzeigen
 will-call	infolog	de	ruft zurück
 write (add or update) a record by passing its fields.	infolog	de	Schreiben (zufügen oder aktualisieren) eines Datensatzes durch Angabe seiner Felder.
+yes - close	infolog	de	Ja schließen
+yes - close including sub-entries	infolog	de	Ja- schließen inclusive Untereinträge
 yes - delete	infolog	de	Ja - Löschen
 yes - delete including sub-entries	infolog	de	Ja - Löschen einschließlich Untereinträge
 yes, noone can purge deleted items	infolog	de	Ja, niemand darf gelöschte Einträge bereinigen
diff --git a/infolog/setup/egw_en.lang b/infolog/setup/egw_en.lang
index 80254112cf..bca393de0c 100644
--- a/infolog/setup/egw_en.lang
+++ b/infolog/setup/egw_en.lang
@@ -41,8 +41,10 @@ add:	infolog	en	Add:
 all	infolog	en	All
 all links and attachments	infolog	en	all links and attachments
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	en	allows to set the status of an entry, eg. set a ToDo to done if it's finished (values depend on entry-type)
+alternatives	infolog	en	Alternatives
 apply the changes	infolog	en	Apply the changes
 archive	infolog	en	archive
+are you shure you want to close this entry ?	infolog	en	Are you shure you want to close this entry ?
 are you shure you want to delete this entry ?	infolog	en	Are you sure you want to delete this entry ?
 attach a file	infolog	en	Attach a file
 attach file	infolog	en	Attach file
@@ -64,6 +66,8 @@ check to specify custom contact	infolog	en	Check to specify custom contact
 click here to create the link	infolog	en	click here to create the Link
 click here to start the search	infolog	en	click here to start the search
 close	infolog	en	Close
+close all	infolog	en	Close all
+close this entry and all listed sub-entries	infolog	en	Close this entry and all listed sub-entries
 comment	infolog	en	Comment
 completed	infolog	en	Completed
 configuration	infolog	en	Configuration
@@ -124,6 +128,7 @@ don't show infolog	infolog	en	DON'T show InfoLog
 done	infolog	en	done
 download	infolog	en	Download
 duration	infolog	en	Duration
+e-mail:	infolog	en	E-mail:
 each value is a line like <id>[=<label>]	infolog	en	each value is a line like <id>[=<label>]
 edit	infolog	en	Edit
 edit or create categories for ingolog	infolog	en	Edit or create categories for IngoLog
@@ -235,6 +240,7 @@ own open	infolog	en	own open
 own overdue	infolog	en	own overdue
 own upcoming	infolog	en	own upcoming
 parent	infolog	en	Parent
+parent infolog	infolog	en	Parent Infolog
 path on (web-)serverside<br>eg. /var/samba/share	infolog	en	path on (web-)serverside<br>eg. /var/samba/Share
 path to user and group files has to be outside of the webservers document-root!!!	infolog	en	Path to user and group files HAS TO BE OUTSIDE of the webservers document-root!!!
 pattern for search in addressbook	infolog	en	pattern for search in Addressbook
@@ -253,6 +259,7 @@ priority	infolog	en	Priority
 private	infolog	en	Private
 project	infolog	en	Project
 project settings: price, times	infolog	en	Project settings: price, times
+projectmanager	infolog	en	Projectmanager
 re-planned	infolog	en	Re-planned
 re-planned time	infolog	en	Re-planned time
 re:	infolog	en	Re:
@@ -360,6 +367,8 @@ which implicit acl rights should the responsible get?	infolog	en	Which implicit
 which types should the calendar show	infolog	en	Which types should the calendar show
 will-call	infolog	en	will call
 write (add or update) a record by passing its fields.	infolog	en	Write (add or update) a record by passing its fields.
+yes - close	infolog	en	Yes - Close
+yes - close including sub-entries	infolog	en	Yes - Close including sub-entries
 yes - delete	infolog	en	Yes - Delete
 yes - delete including sub-entries	infolog	en	Yes - Delete including sub-entries
 yes, noone can purge deleted items	infolog	en	Yes, noone can purge deleted items
diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index 43b243c5ea..2fafb36cc2 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-22 14:50
+	* generated by soetemplate::dump4setup() 2009-05-22 15:25
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -37,27 +37,17 @@ $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','
 
 $templ_data[] = array('name' => 'infolog.delete','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"h4";s:2:"50";s:2:"c3";s:7:",bottom";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:5:"align";s:6:"center";s:4:"name";s:27:"infolog.index.rows-noheader";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:11:",headertext";s:5:"label";s:45:"Are you shure you want to delete this entry ?";s:5:"align";s:6:"center";}}i:4;a:1:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Yes - Delete";s:4:"name";s:6:"delete";s:4:"help";s:75:"Sub-entries become subs of the parent or main entries, if there\'s no parent";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:34:"Yes - Delete including sub-entries";s:4:"name";s:11:"delete_subs";s:4:"help";s:44:"Delete this entry and all listed sub-entries";}s:5:"align";s:6:"center";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:11:"No - Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:22:"Abort without deleting";}}}i:5;a:1:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}}}s:4:"rows";i:5;s:4:"cols";i:1;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1131742953',);
 
-$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.2.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"span";s:3:"all";s:4:"name";s:9:"info_type";s:8:"onchange";s:1:"1";s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:6:"needed";s:1:"1";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1142602276',);
-
-$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:56:"Description|Links|Delegation|Projectmanager|Customfields";s:4:"name";s:49:"description|links|delegation|project|customfields";s:4:"help";s:118:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
-.link_select select { width: 250px; }','modified' => '1159943980',);
-
-$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
-.link_select select { width: 250px; }','modified' => '1159943980',);
-
 $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:18:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";s:4:"size";s:13:",,,_info_addr";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
 .link_select select { width: 250px; }
 .description textarea { width: 98%; }','modified' => '1207297595',);
 
-$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:19:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";s:1:"D";s:3:"27%";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:12:",,,info_addr";s:5:"label";s:11:"Phone/Email";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";s:4:"span";s:15:",inputFullWidth";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:19:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";s:1:"D";s:3:"27%";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:12:",,,info_addr";s:5:"label";s:11:"Phone/Email";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";s:4:"span";s:15:",inputFullWidth";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
 .link_select select { width: 250px; }
 .description textarea { width: 98%; }','modified' => '1207297595',);
 
-$templ_data[] = array('name' => 'infolog.edit.Angebot','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"A";s:3:"100";s:1:"B";s:2:"1%";s:2:"c2";s:7:"noPrint";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:12:"infolog.edit";s:4:"span";s:11:"all,noPrint";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"hrule";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:5:"align";s:5:"right";s:7:"onclick";s:15:"window.print();";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:26:"infolog.edit.Angebot.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1158750796',);
-
-$templ_data[] = array('name' => 'infolog.edit.Angebot','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:1:"B";s:2:"1%";s:2:"c2";s:7:"noPrint";s:2:"c1";s:7:"noPrint";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:12:"infolog.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"hrule";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:7:"onclick";s:31:"document.print(); return false;";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:26:"infolog.edit.Angebot.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1160039724',);
-
-$templ_data[] = array('name' => 'infolog.edit.Angebot.print','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:13:"contact-value";s:4:"size";s:4:"n_fn";s:4:"name";s:12:"info_contact";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1160042614',);
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:19:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";s:1:"D";s:3:"27%";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:5:{s:4:"type";s:10:"link-entry";s:4:"size";s:7:"infolog";s:4:"span";s:3:"all";s:5:"label";s:14:"Parent Infolog";s:4:"name";s:14:"info_id_parent";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:12:",,,info_addr";s:5:"label";s:11:"Phone/Email";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";s:4:"span";s:15:",inputFullWidth";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
+.link_select select { width: 250px; }
+.description textarea { width: 98%; }','modified' => '1242997132',);
 
 $templ_data[] = array('name' => 'infolog.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.0.0.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:15:"100%,100%,,,0,0";}}','size' => '100%,100%,,,0,0','style' => '','modified' => '1061732462',);
 
@@ -89,16 +79,6 @@ $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' =
 
 $templ_data[] = array('name' => 'infolog.edit.project','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c6";s:7:"row,top";s:2:"h6";s:3:"60%";s:2:"c5";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Projectmanager";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Project";}s:1:"B";a:4:{s:4:"type";s:21:"projectmanager-select";s:4:"name";s:5:"pm_id";s:8:"onchange";s:1:"1";s:4:"size";s:4:"None";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Price";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:24:"projectmanager-pricelist";s:4:"name";s:5:"pl_id";s:4:"size";s:4:"None";s:8:"onchange";s:207:"this.form[\'exec[info_price]\'].value=this.options[this.selectedIndex].text.lastIndexOf(\'(\') < 0 ? \'\' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf(\'(\')+1,-1);";}i:2;a:3:{s:4:"type";s:5:"float";s:4:"name";s:10:"info_price";s:4:"span";s:3:"all";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:20:",,,info_planned_time";s:5:"label";s:12:"planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:17:"info_planned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:22:",,,info_replanned_time";s:5:"label";s:15:"Re-planned time";}s:1:"B";a:3:{s:4:"type";s:13:"date-duration";s:4:"name";s:19:"info_replanned_time";s:4:"size";s:23:",$cont[duration_format]";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,info_used_time";s:5:"label";s:9:"used time";s:4:"help";s:64:"Leave blank to get the used time calculated by timesheet entries";}s:1:"B";a:2:{s:4:"type";s:13:"date-duration";s:4:"name";s:14:"info_used_time";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:8:"100%,245";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"245";}}}','size' => '100%,245','style' => '','modified' => '1223093893',);
 
-$templ_data[] = array('name' => 'infolog.edit.Sales','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"c1";s:7:"noPrint";s:1:"C";s:2:"1%";s:2:"c3";s:7:"noPrint";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:12:"infolog.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:7:"onclick";s:15:"window.print();";}s:1:"D";a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:5:"Email";s:7:"onclick";s:1042:"formular = document.createElement(\'FORM\');formular.name = \'sendmail\';formular.target=\'sendmyemail\';formular.method = \'post\';formular.action = \'/egroupware/index.php?menuaction=felamimail.uicompose.compose\';formularfieldto = document.createElement(\'input\');email= \'\'; if (document.getElementById(\'info_contact[email]\').firstChild) {email = document.getElementById(\'info_contact[email]\').firstChild.data;}formularfieldto.name=\'preset[to]\';formularfieldto.value=email;formularfieldsubject = document.createElement(\'input\');formularfieldsubject.name=\'preset[subject]\';formularfieldsubject.value=document.getElementById(\'exec[info_subject]\').value;formularfieldbody = document.createElement(\'textarea\');formularfieldbody.name=\'preset[body]\';formularfieldbody.value=template::styles(\'infolog.edit.Sales.print\')+document.getElementById(\'infolog.edit.Sales.print\').innerHTML;document.body.appendChild(formular);formular.appendChild(formularfieldto);formular.appendChild(formularfieldsubject);formular.appendChild(formularfieldbody);formular.submit();";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:24:"infolog.edit.Sales.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1232467679',);
-
-$templ_data[] = array('name' => 'infolog.edit.Sales.print','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:2:{s:2:"c6";s:7:",bottom";s:2:"h6";s:2:"40";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:13:"contact-value";s:5:"label";s:7:"E-mail:";s:4:"size";s:5:"email";s:4:"name";s:12:"info_contact";}s:1:"B";a:5:{s:4:"type";s:13:"infolog-value";s:4:"size";s:20:"info_link_id,,,email";s:4:"name";s:7:"info_id";s:7:"options";a:2:{i:0;s:12:"info_link_id";i:3;s:5:"email";}s:4:"span";s:5:",bold";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:10:"Tagespreis";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Sendung von";s:4:"name";s:4:"#von";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Sendung nach";s:4:"name";s:5:"#nach";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:13:"contact-value";s:4:"size";s:8:"org_name";s:4:"name";s:12:"info_contact";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:25:"Mit freundlichen Grüßen";s:4:"span";s:5:",blue";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:15:"contact-account";s:4:"size";s:4:"n_fn";s:4:"name";s:10:"info_owner";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:15:",,,sendforemail";s:7:"options";a:1:{i:3;s:12:"sendforemail";}}}','size' => ',,,sendforemail','style' => '.bold { font-weight: bold; }
-.blue { color: blue; }','modified' => '1232469093',);
-
-$templ_data[] = array('name' => 'infolog.edit.Tagespreis','template' => '','lang' => '','group' => '0','version' => '1.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c2";s:7:"noPrint";s:2:"c1";s:7:"noPrint";s:1:"C";s:2:"1%";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:12:"infolog.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"hrule";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Print";s:7:"onclick";s:15:"window.print();";}s:1:"D";a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:5:"Email";s:7:"onclick";s:1058:"document.createElement(\'FORM\');formular.name = \'sendmail\'; formular.target=\'sendmyemail\'; formular.method = \'post\';formular.action = \'egw::link(\'/index.php\',\'menuaction=felamimail.uicompose.compose\')\'; formularfieldto = document.createElement(\'input\'); email= \'\';if (document.getElementById(\'info_contact[email]\').firstChild) {email = document.getElementById(\'info_contact[email]\').firstChild.data;} formularfieldto.name=\'preset[to]\';formularfieldto.value=email; formularfieldsubject = document.createElement(\'input\'); formularfieldsubject.name=\'preset[subject]\'; formularfieldsubject.value=document.getElementById(\'exec[info_subject]\').value; formularfieldbody = document.createElement(\'textarea\'); formularfieldbody.name=\'preset[body]\'; formularfieldbody.value=template::styles(\'infolog.edit.Tagespreis.print\')+document.getElementById(\'infolog.edit.Tagespreis.print\').innerHTML; document.body.appendChild(formular); formular.appendChild(formularfieldto);formular.appendChild(formularfieldsubject); formular.appendChild(formularfieldbody);formular.submit();";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:29:"infolog.edit.Tagespreis.print";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1202292659',);
-
-$templ_data[] = array('name' => 'infolog.edit.Tagespreis.print','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:2:{s:2:"c6";s:7:",bottom";s:2:"h6";s:2:"40";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:13:"contact-value";s:5:"label";s:7:"E-mail:";s:4:"size";s:5:"email";s:4:"name";s:12:"info_contact";}s:1:"B";a:5:{s:4:"type";s:13:"infolog-value";s:4:"size";s:20:"info_link_id,,,email";s:4:"name";s:7:"info_id";s:7:"options";a:2:{i:0;s:12:"info_link_id";i:3;s:5:"email";}s:4:"span";s:5:",bold";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:10:"Tagespreis";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Sendung von";s:4:"name";s:4:"#von";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Sendung nach";s:4:"name";s:5:"#nach";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:13:"contact-value";s:4:"size";s:8:"org_name";s:4:"name";s:12:"info_contact";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:25:"Mit freundlichen Grüßen";s:4:"span";s:5:",blue";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:15:"contact-account";s:4:"size";s:4:"n_fn";s:4:"name";s:10:"info_owner";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:15:",,,sendforemail";s:7:"options";a:1:{i:3;s:12:"sendforemail";}}}','size' => ',,,sendforemail','style' => '.bold { font-weight: bold; }
-.blue { color: blue; }','modified' => '1202293022',);
-
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
 
 $templ_data[] = array('name' => 'infolog.index','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:1:"A";s:3:"90%";s:2:"h3";s:2:",1";s:2:"h2";s:6:",!@msg";s:2:"c6";s:7:"noPrint";s:2:"h4";s:7:",!@main";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:11:"header_left";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:12:"header_right";}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"main";s:4:"span";s:3:"all";s:4:"name";s:27:"infolog.index.rows-noheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:20:"infolog.index.rows,1";s:4:"span";s:3:"all";s:4:"name";s:2:"nm";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{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:5:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:9:"add[note]";s:4:"help";s:15:"Add a new Entry";s:7:"onclick";s:217:"window.open(egw::link(\'/index.php\',\'menuaction=infolog.uiinfolog.edit&type=note&action=$cont[action]&action_id=$cont[action_id]\'),\'_blank\',\'dependent=yes,width=750,height=600,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:17:"Back to main list";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:4:"size";s:12:"100%,,0,,0,0";}}','size' => '100%,,0,,0,0','style' => '','modified' => '1121355584',);
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index e3e9f5d587..ae1d076541 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="infolog.edit.description" template="" lang="" group="0" version="1.0.1.002">
+	<template id="infolog.edit.description" template="" lang="" group="0" version="1.6.001">
 		<grid width="100%" height="245" border="0">
 			<columns>
 				<column width="100"/>
@@ -54,24 +54,24 @@
 					<description span="all" value="General"/>
 				</row>
 				<row class="row">
-					<description value="Priority" options=",,,info_priority"/>
+					<description options=",,,info_priority" value="Priority"/>
 					<menulist>
 						<menupopup id="info_priority" statustext="select a priority for this task"/>
 					</menulist>
 				</row>
 				<row class="row">
 					<description options=",,,info_location" value="Location"/>
-					<textbox id="info_location" size="80" maxlength="255"/>
+					<textbox size="80" maxlength="255" id="info_location"/>
 				</row>
 				<row class="th">
 					<description span="all" value="Delegation"/>
 				</row>
 				<row class="row" valign="top">
-					<description value="Responsible" options=",,,info_responsible"/>
-					<listbox type="select-account" rows="10" options="both" id="info_responsible" statustext="select a responsible user: a person you want to delegate this task"/>
+					<description options=",,,info_responsible" value="Responsible"/>
+					<listbox type="select-account" id="info_responsible" rows="10" options="both" statustext="select a responsible user: a person you want to delegate this task"/>
 				</row>
 				<row class="row" disabled="1">
-					<description value="Confirm" options=",,,info_confirm"/>
+					<description options=",,,info_confirm" value="Confirm"/>
 					<menulist>
 						<menupopup id="info_confirm" statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both"/>
 					</menulist>
@@ -79,7 +79,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.edit.project" template="" lang="" group="0" version="1.2.001">
+	<template id="infolog.edit.project" template="" lang="" group="0" version="1.5.004">
 		<grid width="100%" height="245">
 			<columns>
 				<column width="100"/>
@@ -104,8 +104,12 @@
 					<description options=",,,info_planned_time" value="planned time"/>
 					<date-duration id="info_planned_time" options=",$cont[duration_format]"/>
 				</row>
+				<row class="row">
+					<description options=",,,info_replanned_time" value="Re-planned time"/>
+					<date-duration id="info_replanned_time" options=",$cont[duration_format]"/>
+				</row>
 				<row class="row" valign="top" height="60%">
-					<description options=",,,info_used_time" value="used time"/>
+					<description options=",,,info_used_time" value="used time" statustext="Leave blank to get the used time calculated by timesheet entries"/>
 					<date-duration id="info_used_time"/>
 				</row>
 			</rows>
@@ -138,7 +142,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.edit" template="" lang="" group="0" version="1.5.001">
+	<template id="infolog.edit" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column width="103"/>
@@ -164,9 +168,10 @@
 				</row>
 				<row class="row">
 					<description value="Category" options=",,,info_cat"/>
-					<menulist span="all">
+					<menulist>
 						<menupopup type="select-cat" options="None" id="info_cat" statustext="select a category for this entry"/>
 					</menulist>
+					<link-entry options="infolog" span="all" label="Parent Infolog" id="info_id_parent"/>
 				</row>
 				<row class="row">
 					<description value="Contact" options=",,,info_from"/>
@@ -185,7 +190,7 @@
 					<textbox size="80" maxlength="255" span="all" id="info_subject" statustext="a short subject for the entry"/>
 				</row>
 				<row valign="top" height="250">
-					<tabbox span="all">
+					<tabbox span="all" id="description|links|delegation|project|customfields|history">
 						<tabs>
 							<tab label="Description" statustext="longer textual description"/>
 							<tab label="Links" statustext="Links of this entry"/>

From 73bb5ca1c59cf74a46863b0c497f7807c737a85d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 23 May 2009 10:25:45 +0000
Subject: [PATCH 363/510] "small changes to get setup-cli working with current
 EGroupware"

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

diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index c5ddfe2f39..0da7036f8a 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -37,9 +37,10 @@ if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.
 	ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
 }
 // setting up the $GLOBALS['egw_setup'] object AND including the header.inc.php if it exists
+$_POST['FormDomain'] = $arguments[0];
 $GLOBALS['egw_info'] = array(
 	'flags' => array(
-		'currentapp' => 'home',
+		'currentapp' => 'setup',
 		'noapi' => true,
 		'no_exception_handler' => 'cli',
 ));

From 2175ee37b0131f0249c3c2c2182c63056044c7e8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 24 May 2009 13:41:39 +0000
Subject: [PATCH 364/510] "allow to call directly via setup-cli"

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

diff --git a/setup/inc/class.setup_cmd_install.inc.php b/setup/inc/class.setup_cmd_install.inc.php
index 104e6178db..88c301df54 100644
--- a/setup/inc/class.setup_cmd_install.inc.php
+++ b/setup/inc/class.setup_cmd_install.inc.php
@@ -15,6 +15,11 @@
  */
 class setup_cmd_install extends setup_cmd
 {
+	/**
+	 * Allow to run this command via setup-cli
+	 */
+	const SETUP_CLI_CALLABLE = true;
+
 	/**
 	 * Constructor
 	 *

From 02587c2153403d28ba74beb2548aabbf52f1e292 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 24 May 2009 13:59:03 +0000
Subject: [PATCH 365/510] "when directly calling cmd object: - set domain as
 first argument, to select the right domain in header include - allow to give
 1-dimensional arrays on command line (like php does it with urls, eg.
 'config[name]=value')"

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

diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index 0da7036f8a..91fa0ade61 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -6,7 +6,7 @@
  * @link http://www.egroupware.org
  * @package setup
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2006-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2006-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -112,7 +112,8 @@ switch($action)
 		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
 			is_subclass_of($class,'admin_cmd') && constant($class.'::SETUP_CLI_CALLABLE'))
 		{
-			$args = null;
+			$args = array();
+			$args['domain'] = array_shift($arguments);	// domain must be first argument, to ensure right domain get's selected in header-include
 			foreach($arguments as $arg)
 			{
 				list($name,$value) = explode('=',$arg,2);
@@ -120,7 +121,15 @@ switch($action)
 				{
 					throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90);
 				}
-				$args[$name] = $value;
+				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				{
+					list($name,$sub) = explode('[',substr($name,0,-1),2);
+					$args[$name][$sub] = $value;
+				}
+				else
+				{
+					$args[$name] = $value;
+				}
 			}
 			$cmd = new $class($args);
 			$msg = $cmd->run();

From 3dadb5abe39c6df7dc603c4d6a64bc7bfdda181d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 24 May 2009 18:02:54 +0000
Subject: [PATCH 366/510] - allow to specify on sub-type level, if post_process
 method should be   used for extensions - if extension is called with empty
 name, it can set a name in   cell[name], which then get's used for the
 content (extensions can use   eg. an option to select the name)

---
 etemplate/inc/class.boetemplate.inc.php | 10 ++++++++--
 etemplate/inc/class.etemplate.inc.php   |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 418a5b8ca7..f935f3f2b8 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -426,8 +426,14 @@ class boetemplate extends soetemplate
 	 */
 	protected function haveExtension($type,$function='')
 	{
-		return (self::$extensions[$type] || $this->loadExtension($type,$ui)) &&
-						($function == '' || self::$extensions[$type]->public_functions[$function]);
+		if (self::$extensions[$type] || $this->loadExtension($type,$ui))
+		{
+			if (empty($function)) return true;
+
+			return isset(self::$extensions[$type]->public_functions[$function]) ?
+				self::$extensions[$type]->public_functions[$function] : false;
+		}
+		return false;
 	}
 
 	/**
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 03b839e7f9..7a321e7cb1 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -989,6 +989,7 @@ class etemplate extends boetemplate
 
 			$readonly = $cell['readonly'] !== false && ($readonly || $cell['readonly']);	// might be set or unset (===false) by extension
 
+			if (is_null($name)) $name = $cell['name'];
 			self::set_array($content,$name,$value);
 
 			if ($cell['type'] == $type.'-'.$sub_type) break;	// stop if no further type-change
@@ -1661,7 +1662,8 @@ class etemplate extends boetemplate
 				break;
 		}
 		// extension-processing need to be after all other and only with diff. name
-		if ($ext_type && !$readonly && $this->haveExtension($ext_type,'post_process'))
+		if ($ext_type && !$readonly && ($have = $this->haveExtension($ext_type,'post_process')) &&
+			($have === true || isset($have[$cell['type']])))	// check if post-process should be used for all sub-types
 		{	// unset it first, if it is already set, to be after the other widgets of the ext.
 			$to_process = self::$request->get_to_process($form_name);
 			self::$request->unset_to_process($form_name);

From 5e9699a5b5bbeacaf5310e6e77f4a0f5d3198bfa Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 24 May 2009 20:03:28 +0000
Subject: [PATCH 367/510] reverting again r27107, as it has to many (unwanted)
 sideeffects

---
 etemplate/inc/class.boetemplate.inc.php | 10 ++--------
 etemplate/inc/class.etemplate.inc.php   |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index f935f3f2b8..418a5b8ca7 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -426,14 +426,8 @@ class boetemplate extends soetemplate
 	 */
 	protected function haveExtension($type,$function='')
 	{
-		if (self::$extensions[$type] || $this->loadExtension($type,$ui))
-		{
-			if (empty($function)) return true;
-
-			return isset(self::$extensions[$type]->public_functions[$function]) ?
-				self::$extensions[$type]->public_functions[$function] : false;
-		}
-		return false;
+		return (self::$extensions[$type] || $this->loadExtension($type,$ui)) &&
+						($function == '' || self::$extensions[$type]->public_functions[$function]);
 	}
 
 	/**
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 7a321e7cb1..03b839e7f9 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -989,7 +989,6 @@ class etemplate extends boetemplate
 
 			$readonly = $cell['readonly'] !== false && ($readonly || $cell['readonly']);	// might be set or unset (===false) by extension
 
-			if (is_null($name)) $name = $cell['name'];
 			self::set_array($content,$name,$value);
 
 			if ($cell['type'] == $type.'-'.$sub_type) break;	// stop if no further type-change
@@ -1662,8 +1661,7 @@ class etemplate extends boetemplate
 				break;
 		}
 		// extension-processing need to be after all other and only with diff. name
-		if ($ext_type && !$readonly && ($have = $this->haveExtension($ext_type,'post_process')) &&
-			($have === true || isset($have[$cell['type']])))	// check if post-process should be used for all sub-types
+		if ($ext_type && !$readonly && $this->haveExtension($ext_type,'post_process'))
 		{	// unset it first, if it is already set, to be after the other widgets of the ext.
 			$to_process = self::$request->get_to_process($form_name);
 			self::$request->unset_to_process($form_name);

From 6d72b2b2974048869ce35c0913bc60c37afa94ef Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 25 May 2009 06:39:38 +0000
Subject: [PATCH 368/510] - fixed in some cases not working setup-cli (domain
 not detected) - make update a separat setup-cmd-object - fixed handling of
 egw_exception_wrong_userinput, to not include a   trace (which is unneeded
 for regular input-validation)

---
 phpgwapi/inc/common_functions.inc.php    |  8 ++-
 setup/inc/class.setup_cmd_update.inc.php | 80 ++++++++++++++++++++++++
 setup/setup-cli.php                      | 20 ++----
 3 files changed, 92 insertions(+), 16 deletions(-)
 create mode 100644 setup/inc/class.setup_cmd_update.inc.php

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 3220603c14..3d49d1c346 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1433,6 +1433,10 @@ function egw_exception_handler(Exception $e)
 	{
 		$headline = try_lang('Database error');
 	}
+	elseif ($e instanceof egw_exception_wrong_userinput)
+	{
+		$headline = '';	// message contains the whole message, it's usually no real error but some input validation
+	}
 	else
 	{
 		$headline = try_lang('An error happend');
@@ -1446,8 +1450,8 @@ function egw_exception_handler(Exception $e)
 	// exception handler for cli (command line interface) clients, no html
 	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
 	{
-		echo $headline.': '.$e->getMessage()."\n";
-		echo $e->getTraceAsString()."\n";
+		echo ($headline ? $headline.': ' : '').$e->getMessage()."\n";
+		if (!($e instanceof egw_exception_wrong_userinput)) echo $e->getTraceAsString()."\n";
 		exit($e->getCode() ? $e->getCode() : 9999);		// allways give a non-zero exit code
 	}
 	// regular GUI exception
diff --git a/setup/inc/class.setup_cmd_update.inc.php b/setup/inc/class.setup_cmd_update.inc.php
new file mode 100644
index 0000000000..8dead4e326
--- /dev/null
+++ b/setup/inc/class.setup_cmd_update.inc.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * EGroupware setup - update one EGroupware instances
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @package setup
+ * @copyright (c) 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+/**
+ * setup command: update one EGroupware instances
+ */
+class setup_cmd_update extends setup_cmd
+{
+	/**
+	 * Allow to run this command via setup-cli
+	 */
+	const SETUP_CLI_CALLABLE = true;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string|array $domain string with domain-name or array with all arguments
+	 * @param string $config_user=null user to config the domain (or header_admin_user)
+	 * @param string $config_passwd=null pw of above user
+	 * @param string $backup=null filename of backup to use instead of new install, default new install
+	 * @param boolean $verbose=false if true, echos out some status information during the run
+	 */
+	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false)
+	{
+		if (!is_array($domain))
+		{
+			$domain = array(
+				'domain'        => $domain,
+				'config_user'   => $config_user,
+				'config_passwd' => $config_passwd,
+				'backup'        => $backup,
+				'verbose'       => $verbose,
+			);
+		}
+		//echo __CLASS__.'::__construct()'; _debug_array($domain);
+		admin_cmd::__construct($domain);
+	}
+
+	/**
+	 * run the command: update
+	 *
+	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @return string serialized $GLOBALS defined in the header.inc.php
+	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
+	 * @throws Exception('header.inc.php not found!');
+	 */
+	protected function exec($check_only=false)
+	{
+		global $setup_info;
+
+		// instanciate setup object and check authorisation
+		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+
+		$this->check_installed($this->domain,array(14),$this->verbose);
+
+		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
+
+		self::_echo_message($this->verbose,lang('Start updating the database ...'));
+
+		ob_start();
+		self::$egw_setup->process->init_process();	// we need a new schema-proc instance for each new domain
+		self::$egw_setup->process->pass($setup_info,'upgrade',false);
+		$messages = ob_get_contents();
+		ob_end_clean();
+		if ($messages && $this->verbose) echo strip_tags($messages)."\n";
+
+		$this->restore_db();
+
+		return lang('Update finished.');
+	}
+}
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index 91fa0ade61..6cb1b1e017 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -22,6 +22,7 @@ elseif ($_SERVER['argc'] > 1)
 	$arguments = $_SERVER['argv'];
 	array_shift($arguments);
 	$action = array_shift($arguments);
+	list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
 }
 else
 {
@@ -37,7 +38,6 @@ if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.
 	ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
 }
 // setting up the $GLOBALS['egw_setup'] object AND including the header.inc.php if it exists
-$_POST['FormDomain'] = $arguments[0];
 $GLOBALS['egw_info'] = array(
 	'flags' => array(
 		'currentapp' => 'setup',
@@ -261,7 +261,8 @@ function do_update($arg)
 {
 	global $setup_info;
 
-	list($domain,,,$no_backup) = $options = explode(',',$arg);
+	list($domain,$user,$password,$backup) = explode(',',$arg);
+	_fetch_user_password($user,$password);
 
 	$domains = $GLOBALS['egw_domain'];
 	if ($domain && $domain != 'all')
@@ -270,8 +271,7 @@ function do_update($arg)
 	}
 	foreach($domains as $domain => $data)
 	{
-		$options[0] = $domain;
-		$arg = implode(',',$options);
+		$arg = "$domain,$user,$password,$backup";
 
 		_check_auth_config($arg,14);
 
@@ -281,18 +281,10 @@ function do_update($arg)
 		}
 		else
 		{
-			echo lang('Start updating the database ...')."\n";
-
 			do_backup($arg,true);
 
-			ob_start();
-			$GLOBALS['egw_setup']->process->init_process();	// we need a new schema-proc instance for each new domain
-			$GLOBALS['egw_setup']->process->pass($setup_info,'upgrade',false);
-			$messages = ob_get_contents();
-			ob_end_clean();
-			if ($messages) echo strip_tags($messages)."\n";
-
-			echo lang('Update finished.')."\n";
+			$cmd = new setup_cmd_update($domain,$user,$password,$backup,true);
+			echo $cmd->run()."\n";
 		}
 	}
 }

From e763445dee1090891796220e61a0abb629487023 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 25 May 2009 07:44:03 +0000
Subject: [PATCH 369/510] "do NOT run an update, if none necessary"

---
 setup/inc/class.setup_cmd_update.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup/inc/class.setup_cmd_update.inc.php b/setup/inc/class.setup_cmd_update.inc.php
index 8dead4e326..4d1723038b 100644
--- a/setup/inc/class.setup_cmd_update.inc.php
+++ b/setup/inc/class.setup_cmd_update.inc.php
@@ -62,6 +62,10 @@ class setup_cmd_update extends setup_cmd
 
 		$this->check_installed($this->domain,array(14),$this->verbose);
 
+		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4)
+		{
+			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
+		}
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
 		self::_echo_message($this->verbose,lang('Start updating the database ...'));

From 39903fc957307280ce0e7ba1e2ddb70616b481c4 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Mon, 25 May 2009 08:42:29 +0000
Subject: [PATCH 370/510] changed again template of Infolog as subentry

---
 infolog/setup/etemplates.inc.php   |  6 +++++-
 infolog/templates/default/edit.xet | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index 2fafb36cc2..1a9294ba55 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application infolog
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-22 15:25
+	* generated by soetemplate::dump4setup() 2009-05-25 10:41
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package infolog
@@ -49,6 +49,10 @@ $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','gr
 .link_select select { width: 250px; }
 .description textarea { width: 98%; }','modified' => '1242997132',);
 
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:13:{i:0;a:19:{s:1:"A";s:3:"103";s:1:"B";s:3:"260";s:1:"C";s:3:"140";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:6:"row_on";s:2:"c9";s:3:"row";s:2:"c7";s:2:"th";s:2:"c6";s:4:",top";s:2:"c5";s:3:"row";s:2:"c2";s:2:"th";s:2:"h6";s:3:"250";s:2:"h7";s:2:",1";s:2:"h2";s:2:"28";s:2:"h1";s:6:",!@msg";s:3:"c11";s:3:"row";s:3:"h11";s:13:",!@info_owner";s:3:"c10";s:3:"row";s:1:"D";s:3:"27%";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:4:"html";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"size";s:12:",,,info_type";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:3:"all";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:6:"select";s:4:"name";s:9:"info_type";s:8:"onchange";i:1;s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:3:"int";s:4:"name";s:11:"info_number";s:4:"span";s:7:",infoId";s:8:"readonly";s:1:"1";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"size";s:11:",,,info_cat";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Parent";}i:2;a:5:{s:4:"type";s:10:"link-entry";s:4:"size";s:7:"infolog";s:4:"name";s:14:"info_id_parent";s:5:"align";s:5:"right";s:4:"span";s:7:",noWrap";}s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";s:4:"size";s:12:",,,info_from";}s:1:"B";a:38:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:12:"info_contact";s:4:"span";s:7:",noWrap";}i:2;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:16:"info_custom_from";s:8:"onchange";s:91:"document.getElementById(form::name(\'info_from\')).style.display=this.checked?\'block\':\'none\';";s:4:"help";s:31:"Check to specify custom contact";}}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:6:"36,255";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";s:4:"span";s:21:",$cont[hide_from_css]";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:12:",,,info_addr";s:5:"label";s:11:"Phone/Email";}s:1:"D";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"30,255";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";s:4:"span";s:15:",inputFullWidth";}}i:5;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";s:4:"size";s:15:",,,info_subject";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:64:"Description|Links|Delegation|Projectmanager|Customfields|History";s:4:"name";s:57:"description|links|delegation|project|customfields|history";s:4:"help";s:133:"longer textual description|Links of this entry|responsible user, priority|Project settings: price, times|Custom fields|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";s:4:"size";s:17:",,,info_startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";s:4:"size";s:15:",,,info_enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:9;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";s:4:"size";s:14:",,,info_status";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";s:8:"onchange";s:183:"if (this.value==\'done\' || this.value==\'billed\') set_element(this.form,\'exec[info_percent]\',\'100\'); else if (this.value==\'not-started\') set_element(this.form,\'exec[info_percent]\',\'0\');";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Completed";s:4:"size";s:15:",,,info_percent";}s:1:"D";a:4:{s:4:"type";s:14:"select-percent";s:4:"name";s:12:"info_percent";s:4:"help";s:17:"Percent completed";s:8:"onchange";s:570:"if (this.value==100 && this.form[\'exec[info_status]\'].value != \'done\' && this.form[\'exec[info_status]\'].value != \'billed\' && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=\'done\'; else if (this.value != 100 && this.form[\'exec[info_status]\'].value != \'cancelled\') this.form[\'exec[info_status]\'].value=this.value != 0 ? \'ongoing\' : \'not-started\'; else if (this.value==0 && this.form[\'exec[info_status]\'].value != \'cancelled\' && this.form[\'exec[info_status]\'].value != \'offer\') this.form[\'exec[info_status]\'].value=\'not-started\'; ";}}i:10;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:21:",,,info_datecompleted";s:5:"label";s:14:"Date completed";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:18:"info_datecompleted";s:4:"help";s:84:"Date completed (leave it empty to have it automatic set if status is done or billed)";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:14:",,,info_access";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:11;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:12;a:4:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:16:"Saves this entry";}s:4:"span";s:1:"2";i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"Apply the changes";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"help";s:31:"leave without saveing the entry";s:7:"onclick";s:15:"window.close();";}i:4;a:2:{s:4:"type";s:4:"html";s:4:"name";s:2:"js";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"delete this entry";s:7:"onclick";s:60:"return $cont[info_anz_subs] || confirm(\'Delete this entry\');";}}}s:4:"rows";i:12;s:4:"cols";i:4;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.hideFrom input { display: none; }
+.link_select select { width: 250px; }
+.description textarea { width: 98%; }','modified' => '1243240333',);
+
 $templ_data[] = array('name' => 'infolog.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.0.0.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:15:"100%,100%,,,0,0";}}','size' => '100%,100%,,,0,0','style' => '','modified' => '1061732462',);
 
 $templ_data[] = array('name' => 'infolog.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:10:"@info_type";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,245,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,245,,row_on,0,0,auto','style' => '','modified' => '1061732462',);
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index ae1d076541..c51183fc73 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="infolog.edit.description" template="" lang="" group="0" version="1.6.001">
-		<grid width="100%" height="245" border="0">
+		<grid>
 			<columns>
 				<column width="100"/>
 				<column/>
@@ -19,7 +19,7 @@
 		</grid>
 	</template>
 	<template id="infolog.edit.links" template="" lang="" group="0" version="1.3.001">
-		<grid width="100%" height="245" overflow="auto">
+		<grid width="100%" height="245">
 			<columns>
 				<column width="100"/>
 				<column/>
@@ -44,7 +44,7 @@
 		</grid>
 	</template>
 	<template id="infolog.edit.delegation" template="" lang="" group="0" version="1.3.001">
-		<grid width="100%" height="245">
+		<grid width="100%" border="0">
 			<columns>
 				<column width="100"/>
 				<column/>
@@ -80,7 +80,7 @@
 		</grid>
 	</template>
 	<template id="infolog.edit.project" template="" lang="" group="0" version="1.5.004">
-		<grid width="100%" height="245">
+		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="100"/>
 				<column/>
@@ -116,7 +116,7 @@
 		</grid>
 	</template>
 	<template id="infolog.edit.customfields" template="" lang="" group="0" version="1.0.1.001">
-		<grid width="100%" height="245" class="row_on" spacing="0" padding="0" overflow="auto">
+		<grid width="100%" height="245">
 			<columns>
 				<column/>
 			</columns>
@@ -131,7 +131,7 @@
 		</grid>
 	</template>
 	<template id="infolog.edit.history" template="" lang="" group="0" version="1.3.002">
-		<grid width="100%" height="250" overflow="auto">
+		<grid width="100%">
 			<columns>
 				<column/>
 			</columns>
@@ -142,7 +142,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.edit" template="" lang="" group="0" version="1.7.001">
+	<template id="infolog.edit" template="" lang="" group="0" version="1.7.002">
 		<grid width="100%">
 			<columns>
 				<column width="103"/>
@@ -171,7 +171,10 @@
 					<menulist>
 						<menupopup type="select-cat" options="None" id="info_cat" statustext="select a category for this entry"/>
 					</menulist>
-					<link-entry options="infolog" span="all" label="Parent Infolog" id="info_id_parent"/>
+					<hbox span="all">
+						<description value="Parent"/>
+						<link-entry options="infolog" id="info_id_parent" align="right" class="noWrap"/>
+					</hbox>
 				</row>
 				<row class="row">
 					<description value="Contact" options=",,,info_from"/>

From 07825af683b684426ebde2ecaa98ad6971f566a0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 26 May 2009 11:55:52 +0000
Subject: [PATCH 371/510] "fixed not always executed hooks for disabled
 applications (using app-names from existing hooks now, instead of
 egw_info[apps])"

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

diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index 6a4f7cc1ef..070da43371 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -48,7 +48,7 @@ class hooks
 	 *
 	 * @param object $db=null database class, if null we use $GLOBALS['egw']->db
 	 */
-	function hooks($db=null)
+	function __construct($db=null)
 	{
 		$this->db = $db ? $db : $GLOBALS['egw']->db;	// this is to allow setup to set the db
 
@@ -95,16 +95,14 @@ class hooks
 		/* Then add the rest */
 		if ($no_permission_check)
 		{
-			$apps = $GLOBALS['egw_info']['apps'];
+			$apps = array_keys($this->found_hooks);
 		}
-		else
+		elseif(is_array($GLOBALS['egw_info']['user']['apps']))
 		{
-			$apps = $GLOBALS['egw_info']['user']['apps'];
+			$apps = array_keys($GLOBALS['egw_info']['user']['apps']);
 		}
-		settype($apps,'array');
-		foreach($apps as $app)
+		foreach((array)$apps as $appname)
 		{
-			$appname = $app['name'];
 			if (!isset($results[$appname]))
 			{
 				$results[$appname] = $this->single($args,$appname,$no_permission_check);
@@ -203,7 +201,7 @@ class hooks
 	{
 		//if (!is_array($this->found_hooks))
 		//{
-			$this->hooks();
+			$this->__construct();
 		//}
 		return $this->found_hooks;
 	}

From 0e4a75f027b0d370aefd586e3855d35ccd6070ea Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 26 May 2009 13:42:05 +0000
Subject: [PATCH 372/510] added windows-1257 as it seems to be used widely, to
 display baltic letters

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 65f1697126..401839e788 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -496,6 +496,9 @@ class translation
 				case 'windows-1250':
 					$from = 'iso-8859-2';
 					break;
+				case 'windows-1257':
+					$from = 'iso-8859-13';
+					break;
 			}
 			if (!$to)
 			{

From 7c8bd81149543dafd19e8b170181224205990e1e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 26 May 2009 14:44:29 +0000
Subject: [PATCH 373/510] "return a reference to the var in the session!"

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

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index 93ca5c3b8c..658b94107c 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -269,6 +269,8 @@ class egw_cache
 	/**
 	 * Get some data from the cache for the whole source tree (all instances)
 	 *
+	 * Returns a reference to the var in the session!
+	 *
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param callback $callback=null callback to get/create the value, if it's not cache
@@ -276,7 +278,7 @@ class egw_cache
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getSession($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	static public function &getSession($app,$location,$callback=null,array $callback_params=null,$expiration=0)
 	{
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{

From b32ded3400e888a17b8b983908efc0e9f6109bdf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 26 May 2009 17:26:24 +0000
Subject: [PATCH 374/510] "re-added (depricated) php4 constructor, as it get's
 called by some old apps"

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

diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index 070da43371..b947e6c426 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -46,7 +46,7 @@ class hooks
 	/**
 	 * constructor, reads and caches the complete hooks table
 	 *
-	 * @param object $db=null database class, if null we use $GLOBALS['egw']->db
+	 * @param egw_db $db=null database class, if null we use $GLOBALS['egw']->db
 	 */
 	function __construct($db=null)
 	{
@@ -59,6 +59,17 @@ class hooks
 		//_debug_array($this->found_hooks);
 	}
 
+	/**
+	 * php4 constructor
+	 *
+	 * @param egw_db $db
+	 * @deprecated use __construct()
+	 */
+	function hooks($db=null)
+	{
+		self::__construct();
+	}
+
 	/**
 	 * executes all the hooks (the user has rights to) for a given location
 	 *

From bbee5b34bbff3319e79294280a596440a56862bd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 27 May 2009 05:38:35 +0000
Subject: [PATCH 375/510] fixed powerpoint icon as suggested by
 tinpos@gmail.com

---
 ...gif => mime16_application_vnd.ms-powerpoint.gif} | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename etemplate/templates/default/images/{mime16_application_mspowerpoint.gif => mime16_application_vnd.ms-powerpoint.gif} (100%)

diff --git a/etemplate/templates/default/images/mime16_application_mspowerpoint.gif b/etemplate/templates/default/images/mime16_application_vnd.ms-powerpoint.gif
similarity index 100%
rename from etemplate/templates/default/images/mime16_application_mspowerpoint.gif
rename to etemplate/templates/default/images/mime16_application_vnd.ms-powerpoint.gif

From f124b889d8aedb0144650226e9c37183386eae6a Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 27 May 2009 14:57:29 +0000
Subject: [PATCH 376/510] Need to define a __isset() method so empty() works
 with __get().  Fixes missing body javascript when looping.

---
 etemplate/inc/class.etemplate_request.inc.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/etemplate/inc/class.etemplate_request.inc.php b/etemplate/inc/class.etemplate_request.inc.php
index abbf5e0ab7..2eb2d309ce 100644
--- a/etemplate/inc/class.etemplate_request.inc.php
+++ b/etemplate/inc/class.etemplate_request.inc.php
@@ -283,6 +283,18 @@ class etemplate_request
 		return $this->data[$var];
 	}
 
+	
+	/**
+	 * magic function to see if a request-var has been set
+	 *
+	 * @param string $var
+	 * @return boolean
+	 */
+	public function __isset($var)
+	{
+		return array_key_exists($var, $this->data);
+	}
+
 	/**
 	 * Get the names / keys of existing variables
 	 *
@@ -379,4 +391,4 @@ class etemplate_request
 			self::$mcrypt = null;
 		}
 	}
-}
\ No newline at end of file
+}

From 88c9aca3f3feac7f7170ea8e24613738a3242493 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 28 May 2009 11:29:17 +0000
Subject: [PATCH 377/510] "allow egw_vfs::mount() to work in setup: - need to
 read fs-tab - need to load wrapper (otherwise file_exists($url) fails)"

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

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 9cc2a4cd67..48fb9d1bfd 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -280,6 +280,15 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function mount($url=null,$path=null)
 	{
+		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))	// happens eg. in setup
+		{
+			$api_config = config::read('phpgwapi');
+			if (isset($api_config['vfs_fstab']) && is_array($api_config['vfs_fstab']))
+			{
+				self::$fstab = $api_config['vfs_fstab'];
+			}
+			unset($api_config);
+		}
 		if (is_null($url) || is_null($path))
 		{
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
@@ -295,6 +304,8 @@ class egw_vfs extends vfs_stream_wrapper
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
 			return true;	// already mounted
 		}
+		self::load_wrapper(parse_url($url,PHP_URL_SCHEME));
+
 		if (!file_exists($url) || opendir($url) === false)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');

From 6503d6d0cc66ede8d860286a598bb044f87a3e9c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 28 May 2009 11:33:30 +0000
Subject: [PATCH 378/510] - updated documentation - add feature to allow apps
 to choose to be automatic installed on   updated:
 $setup_info[$app]['autoinstall'] = {true|'1.x.xxx'}; - run
 default_records.inc.php (if exists) also for apps without tables,   as they
 might need to initialise some stuff

---
 setup/applications.php                  |    8 +-
 setup/inc/class.setup_detection.inc.php |   57 +-
 setup/inc/class.setup_process.inc.php   | 1230 ++++++++++++-----------
 3 files changed, 676 insertions(+), 619 deletions(-)

diff --git a/setup/applications.php b/setup/applications.php
index 78043dfed7..d6d952fe33 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -127,7 +127,7 @@ if(@get_var('submit',Array('POST')))
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
-			$terror[] = $setup_info[$appname];
+			$terror[$appname] = $setup_info[$appname];
 
 			if ($setup_info[$appname]['tables'])
 			{
@@ -162,7 +162,7 @@ if(@get_var('submit',Array('POST')))
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
-			$terror[] = $setup_info[$appname];
+			$terror[$appname] = $setup_info[$appname];
 
 			if ($setup_info[$appname]['tables'])
 			{
@@ -173,6 +173,8 @@ if(@get_var('submit',Array('POST')))
 			}
 			else
 			{
+				// check default_records for apps without tables, they might need some initial work too
+				$terror = $GLOBALS['egw_setup']->process->default_records($terror,$DEBUG);
 				if ($GLOBALS['egw_setup']->app_registered($setup_info[$appname]['name']))
 				{
 					$GLOBALS['egw_setup']->update_app($setup_info[$appname]['name']);
@@ -199,7 +201,7 @@ if(@get_var('submit',Array('POST')))
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
-			$terror[] = $setup_info[$appname];
+			$terror[$appname] = $setup_info[$appname];
 
 			$GLOBALS['egw_setup']->process->upgrade($terror,$DEBUG);
 			if ($setup_info[$appname]['tables'])
diff --git a/setup/inc/class.setup_detection.inc.php b/setup/inc/class.setup_detection.inc.php
index 515d6347c7..e141c04a1d 100755
--- a/setup/inc/class.setup_detection.inc.php
+++ b/setup/inc/class.setup_detection.inc.php
@@ -6,12 +6,21 @@
  * @package setup
  * @author Dan Kuykendall <seek3r@phpgroupware.org>
  * @author Miles Lott <milos@groupwhere.org>
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
+/**
+ * Class detecting the current installation status of EGroupware
+ */
 class setup_detection
 {
+	/**
+	 * Get available application versions and data from filesystem
+	 *
+	 * @return array $setup_info
+	 */
 	function get_versions()
 	{
 		$d = dir(EGW_SERVER_ROOT);
@@ -34,7 +43,13 @@ class setup_detection
 		return $setup_info;
 	}
 
-	function get_db_versions($setup_info='')
+	/**
+	 * Get versions of installed applications from database
+	 *
+	 * @param array $setup_info
+	 * @return array $setup_info
+	 */
+	function get_db_versions($setup_info=null)
 	{
 		$tname = Array();
 		$GLOBALS['egw_setup']->db->Halt_On_Error = 'no';
@@ -97,16 +112,17 @@ class setup_detection
 		return $setup_info;
 	}
 
-	/* app status values:
-	U	Upgrade required/available
-	R	upgrade in pRogress
-	C	upgrade Completed successfully
-	D	Dependency failure
-	P	Post-install dependency failure
-	F	upgrade Failed
-	V	Version mismatch at end of upgrade (Not used, proposed only)
-	M	Missing files at start of upgrade (Not used, proposed only)
-	*/
+	/**
+	 * Compare versions from filesystem and database and set status:
+	 * 	U	Upgrade required/available
+	 * 	R	upgrade in pRogress
+	 * 	C	upgrade Completed successfully
+	 * 	D	Dependency failure
+	 * 	P	Post-install dependency failure
+	 * 	F	upgrade Failed
+	 * 	V	Version mismatch at end of upgrade (Not used, proposed only)
+	 * 	M	Missing files at start of upgrade (Not used, proposed only)
+	 */
 	function compare_versions($setup_info)
 	{
 		foreach($setup_info as $key => $value)
@@ -208,10 +224,10 @@ class setup_detection
 		return $setup_info;
 	}
 
-	/*
-	 Called during the mass upgrade routine (Stage 1) to check for apps
-	 that wish to be excluded from this process.
-	*/
+	/**
+	 * Called during the mass upgrade routine (Stage 1) to check for apps
+	 * that wish to be excluded from this process.
+	 */
 	function upgrade_exclude($setup_info)
 	{
 		foreach($setup_info as $key => $value)
@@ -224,6 +240,11 @@ class setup_detection
 		return $setup_info;
 	}
 
+	/**
+	 * Check if header exists and is up to date
+	 *
+	 * @return int 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
+	 */
 	function check_header()
 	{
 		if(!file_exists('../header.inc.php'))
@@ -254,6 +275,12 @@ class setup_detection
 		return '10';
 	}
 
+	/**
+	 * Check if database exists
+	 *
+	 * @param array $setup_info
+	 * @return int 1=no database, 3=empty, 4=need upgrade, 10=complete
+	 */
 	function check_db($setup_info='')
 	{
 		$setup_info = $setup_info ? $setup_info : $GLOBALS['setup_info'];
diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php
index 0cf06832e2..5f0fb3b1ef 100755
--- a/setup/inc/class.setup_process.inc.php
+++ b/setup/inc/class.setup_process.inc.php
@@ -1,373 +1,358 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - Setup                                                       *
-	* http://www.egroupware.org                                                *
-	* --------------------------------------------                             *
-	* This file written by Miles Lott <milos@groupwhere.org>                   *
-	*  Originally written for phpGroupWare.                                    *
-	* (C) 2001-2004 Miles Lott                                                 *
-	* Upgrade process rewritten by <RalfBecker@outdoor-training.de> to no      *
-	* longer require tables_baseline files and delta-upgrades                  *
-	* --------------------------------------------                             *
-	*  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$ */
+/**
+ * EGroupware setup - update / install an EGroupware instance
+ *
+ * @link http://www.egroupware.org
+ * @author Miles Lott <milos@groupwhere.org>
+ * @copyright 2001-2004 Miles Lott <milos@groupwhere.org>
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * Upgrade process rewritten by <RalfBecker@outdoor-training.de> to no longer require tables_baseline files and delta-upgrades
+ * @package setup
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* app status values:
-	U	Upgrade required/available
-	R	upgrade in pRogress
-	C	upgrade Completed successfully
-	D	Dependency failure
-	F	upgrade Failed
-	V	Version mismatch at end of upgrade (Not used, proposed only)
-	M	Missing files at start of upgrade (Not used, proposed only)
-	*/
+/**
+ * Update / install an EGroupware instance
+ *
+ * app status values:
+ *	U	Upgrade required/available
+ *	R	upgrade in pRogress
+ *	C	upgrade Completed successfully
+ *	D	Dependency failure
+ *	F	upgrade Failed
+ *	V	Version mismatch at end of upgrade (Not used, proposed only)
+ *	M	Missing files at start of upgrade (Not used, proposed only)
+ */
+class setup_process
+{
+	var $tables;
+	var $updateincluded = array();
 
-	class setup_process
+	/**
+	 * Target version of a complete upgrade, set by pass()
+	 *
+	 * @var string
+	 */
+	var $api_version_target;
+
+	/**
+	 * instance of setup's translation class
+	 *
+	 * @var setup_translation
+	 */
+	var $translation;
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
 	{
-		var $oProc;
-		var $tables;
-		var $updateincluded = array();
-		var $translation;
+		$this->translation = new setup_translation();
+	}
 
-		function setup_process()
+	/**
+	 * create schema_proc object
+	 *
+	 * @param none
+	 */
+	function init_process()
+	{
+		$GLOBALS['egw_setup']->oProc = new schema_proc();
+	}
+
+	/**
+	 * the mother of all multipass upgrade parental loop functions
+	 *
+	 * @param array $setup_info	array of application info from setup.inc.php files
+	 * @param string $type='new' defaults to new(install), could also be 'upgrade'
+	 * @param boolean $DEBUG=false print debugging info
+	 * @param boolean $force_en=false install english language files
+	 * @param string $system_charset=null charset to use
+	 * @param array $preset_config=array()
+	 */
+	function pass(array $setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array())
+	{
+		if(!$method)
 		{
-			$this->translation =& CreateObject('setup.setup_translation');
+			return False;
 		}
+		// Place api first
+		$pass['phpgwapi'] = $setup_info['phpgwapi'];
+		$pass['admin']    = $setup_info['admin'];
+		$pass['preferences'] = $setup_info['preferences'];
+		$pass['etemplate'] = $setup_info['etemplate'];	// helps to minimize passes, as many apps depend on it
+		@reset($setup_info);
+		$setup_info = $GLOBALS['egw_setup']->detection->get_versions($setup_info);
+		@reset($setup_info);
 
-		/**
-		 * create schema_proc object
-		 *
-		 * @param none
-		 */
-		function init_process()
+		// setting api-target-version for general use
+		$this->api_version_target = $setup_info['phpgwapi']['version'];
+
+		$i = 1;
+		$passed = array();
+		$passing = array();
+		$pass_string = implode (':', $pass);
+		$passing_string = implode (':', $passing);
+		$do_langs = false;
+		while($pass_string != $passing_string)
 		{
-			$GLOBALS['egw_setup']->oProc =& CreateObject('phpgwapi.schema_proc');
-		}
-
-		/**
-		 * the mother of all multipass upgrade parental loop functions
-		 *
-		 * @param array $setup_info	array of application info from setup.inc.php files
-		 * @param string $type='new' defaults to new(install), could also be 'upgrade'
-		 * @param boolean $DEBUG=false print debugging info
-		 * @param boolean $force_en=false install english language files
-		 * @param string $system_charset=null charset to use
-		 * @param array $preset_config=array()
-		 */
-		function pass($setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array())
-		{
-			if(!$method)
-			{
-				return False;
-			}
-			// Place api first
-			$pass['phpgwapi'] = $setup_info['phpgwapi'];
-			$pass['admin']    = $setup_info['admin'];
-			$pass['preferences'] = $setup_info['preferences'];
-			@reset($setup_info);
-			$setup_info = $GLOBALS['egw_setup']->detection->get_versions($setup_info);
-			@reset($setup_info);
-
-			$i = 1;
-			$passed = array();
 			$passing = array();
-			$pass_string = implode (':', $pass);
-			$passing_string = implode (':', $passing);
-			$do_langs = false;
-			while($pass_string != $passing_string)
+			if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
+			/* Check current versions and dependencies */
+			$setup_info = $GLOBALS['egw_setup']->detection->get_db_versions($setup_info);
+			$setup_info = $GLOBALS['egw_setup']->detection->compare_versions($setup_info);
+			//_debug_array($setup_info);exit;
+			$setup_info = $GLOBALS['egw_setup']->detection->check_depends($setup_info);
+			//if($i==2) { _debug_array($passed);exit; }
+
+			/* stuff the rest of the apps, but only those with available upgrades */
+			foreach($setup_info as $key => $value)
 			{
-				$passing = array();
-				if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
-				/* Check current versions and dependencies */
-				$setup_info = $GLOBALS['egw_setup']->detection->get_db_versions($setup_info);
-				$setup_info = $GLOBALS['egw_setup']->detection->compare_versions($setup_info);
-				//_debug_array($setup_info);exit;
-				$setup_info = $GLOBALS['egw_setup']->detection->check_depends($setup_info);
-				//if($i==2) { _debug_array($passed);exit; }
-
-				/* stuff the rest of the apps, but only those with available upgrades */
-				while(list($key,$value) = @each($setup_info))
+				if (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']))
 				{
-					if (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']))
-					{
-						continue;	// app does not support this db-type, dont try installing it
-					}
-					if(($value['name'] != 'phpgwapi') && ($value['status'] == 'U'))
-					{
-						if(($passed[$value['name']]['status'] != 'F') && ($passed[$value['name']]['status'] != 'C'))
-						{
-							$pass[$value['name']] = $setup_info[$value['name']];
-						}
-					}
-					/*
-					Now if we are on the 2nd or more passes, add api in
-					if (!$pass['phpgwapi'])
-					{
-						$pass['phpgwapi'] = $setup_info['phpgwapi'];
-					}
-					*/
+					continue;	// app does not support this db-type, dont try installing it
 				}
-
-				switch($method)
+				if($value['name'] != 'phpgwapi' && $value['status'] == 'U')
 				{
-					case 'new':
-						/* Create tables and insert new records for each app in this list */
-						$passing = $this->current($pass,$DEBUG);
-						$this->save_minimal_config($preset_config);
-						$passing = $this->default_records($passing,$DEBUG);
-						$do_langs = true;	// just do it once at the end of all passes
-						break;
-					case 'upgrade':
-						/* Run upgrade scripts on each app in the list */
-						$passing = $this->upgrade($pass,$DEBUG);
-						$do_langs = true;	// just do it once at the end of all passes
-						//_debug_array($pass);exit;
-						break;
-					default:
-						/* What the heck are you doing? */
-						return False;
-						break;
-				}
-
-				$pass = array();
-				@reset($passing);
-				while(list($key,$value) = @each($passing))
-				{
-					if($value['status'] == 'C')
-					{
-						$passed[$value['name']] = $passing[$value['name']];
-						if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
-					}
-					elseif($value['status'] == 'F')
-					{
-						$setup_info[$value['name']] = $passing[$value['name']];
-						if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
-					}
-					elseif($value['status'] == 'D')
+					if($passed[$value['name']]['status'] != 'F' && $passed[$value['name']]['status'] != 'C')
 					{
 						$pass[$value['name']] = $setup_info[$value['name']];
-						if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
-					}
-					else
-					{
-						$tmp = $passing[$value['name']]['name'];
-						if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
 					}
 				}
+			}
 
-				$i++;
-				if($i == 20) /* Then oops it broke */
+			switch($method)
+			{
+				case 'new':
+					/* Create tables and insert new records for each app in this list */
+					$passing = $this->current($pass,$DEBUG);
+					$this->save_minimal_config($preset_config);
+					$passing = $this->default_records($passing,$DEBUG);
+					$do_langs = true;	// just do it once at the end of all passes
+					break;
+				case 'upgrade':
+					/* Run upgrade scripts on each app in the list */
+					$passing = $this->upgrade($pass,$DEBUG);
+					$do_langs = true;	// just do it once at the end of all passes
+					//_debug_array($pass);exit;
+					break;
+				default:
+					/* What the heck are you doing? */
+					return False;
+					break;
+			}
+
+			$pass = array();
+			foreach($passing as $key => $value)
+			{
+				if($value['status'] == 'C')
 				{
-					echo '<br>Setup failure: excess looping in process->pass():'."\n";
-					echo '<br>Pass:<br>'."\n";
-					_debug_array($pass);
-					echo '<br>Passed:<br>'."\n";
-					_debug_array($passed);
-					exit;
+					$passed[$value['name']] = $passing[$value['name']];
+					if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
 				}
-				$pass_string = implode (':', $pass);
-				$passing_string = implode (':', $passing);
-			}
-			if ($do_langs)	// just do it once at the end of all passes
-			{
-				$langs = false;
-				if ($method == 'new')
+				elseif($value['status'] == 'F')
 				{
-					$langs[] = ($own_lang = get_var('ConfigLang',Array('POST','COOKIE')));
-					if ($own_lang != 'en') $langs[] = 'en';
+					$setup_info[$value['name']] = $passing[$value['name']];
+					if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
 				}
-				$this->translation->drop_add_all_langs($langs);
-			}
-			/* now return the list */
-			return $setup_info = array_merge($setup_info,$passed);
-		}
-
-		/**
-		 * saves a minimal default config, so you get a running install without entering and saveing Step #2 config
-		 *
-		 * @param array $preset_config=array()
-		 */
-		function save_minimal_config(array $preset_config=array())
-		{
-			$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
-
-			$current_config['site_title'] = 'eGroupWare';
-			$current_config['hostname']  = $_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : 'localhost';
-
-			// guessing the eGW url
-			$parts = explode('/',$_SERVER['PHP_SELF']);
-			array_pop($parts);	// remove config.php
-			array_pop($parts);	// remove setup
-			$current_config['webserver_url'] = implode('/',$parts);
-			$egroupwareDirName = end($parts);
-
-			if(!$is_windows) {
-				if(@is_dir('/tmp')) {
-					$current_config['temp_dir'] = '/tmp';
-				} else {
-					$current_config['temp_dir'] = '/path/to/temp/dir';
-				}
-				$current_config['files_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/files';
-				$current_config['backup_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/backup';
-			} else {
-				if(@is_dir('c:\\windows\\temp')) {
-					$current_config['temp_dir'] = 'c:\\windows\\temp';
-				} else {
-					$current_config['temp_dir'] = 'c:\\path\\to\\temp\\dir';
-				}
-				$current_config['files_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files';
-				$current_config['backup_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\backup';
-			}
-			$datetime =& CreateObject('phpgwapi.egw_datetime');
-			$current_config['tz_offset'] = $datetime->getbestguess();
-			unset($datetime);
-
-			// RalfBecker: php.net recommend this for security reasons, it should be our default too
-			$current_config['usecookies'] = 'True';
-
-			if ($GLOBALS['egw_setup']->system_charset)
-			{
-				$current_config['system_charset'] = $GLOBALS['egw_setup']->system_charset;
-			}
-
-			$current_config['install_id'] = md5($_SERVER['HTTP_HOST'].microtime(true).$GLOBALS['egw_setup']->ConfigDomain);
-
-			if ($preset_config)
-			{
-				$current_config = array_merge($current_config,$preset_config);
-			}
-
-			foreach($current_config as $name => $value)
-			{
-				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
-					'config_value' => $value,
-				),array(
-					'config_app' => 'phpgwapi',
-					'config_name' => $name,
-				),__FILE__,__LINE__);
-			}
-
-			// so the default_records use the current data
-			$GLOBALS['egw_setup']->setup_account_object($current_config);
-		}
-
-		/**
-		 * drop tables per application, check that they are in the db first
-		 *
-		 * @param $setup_info	array of application info from setup.inc.php files, etc.
-		 */
-		function droptables($setup_info,$DEBUG=False)
-		{
-			if(!@$GLOBALS['egw_setup']->oProc)
-			{
-				$this->init_process();
-			}
-			/* The following is built so below we won't try to drop a table that isn't there. */
-			$tablenames = $GLOBALS['egw_setup']->db->table_names();
-			if (!is_array($setup_info) || !is_array($tablenames))
-			{
-				return $setup_info;	// nothing to do
-			}
-			$tables = array();
-			foreach($tablenames as $data)
-			{
-				$tables[] = $data['table_name'];
-			}
-
-			if (!is_array($setup_info))
-			{
-				return $setup_info;
-			}
-			foreach($setup_info as $app_name => $data)
-			{
-				if(is_array($data['tables']))
+				elseif($value['status'] == 'D')
 				{
-					foreach($data['tables'] as $table)
-					{
-						//echo $table;
-						if(in_array($table,$tables))
-						{
-							if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
-							$GLOBALS['egw_setup']->oProc->DropTable($table);
-							// Update the array values for return below
-							$setup_info[$app_name]['status'] = 'U';
-						}
-					}
-				}
-			}
-
-			/* Done, return current status */
-			return $setup_info;
-		}
-
-		/**
-		 * process current table setup in each application/setup dir
-		 *
-		 * @param array $setup_info	array of application info from setup.inc.php files, etc.
-		 * @param boolean $DEBUG=false
-		 */
-		function current($setup_info,$DEBUG=False)
-		{
-			if(!@$GLOBALS['egw_setup']->oProc)
-			{
-				$this->init_process();
-			}
-			@reset($setup_info);
-			while(list($key,$null) = @each($setup_info))
-			{
-				$enabled = False;
-				$appname  = $setup_info[$key]['name'];
-				$apptitle = $setup_info[$key]['title'];
-
-				if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $setup_info[$key]['status']; }
-
-				$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
-
-				if($setup_info[$key]['tables'] && file_exists($appdir.'tables_current.inc.php'))
-				{
-					if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
-					include ($appdir.'tables_current.inc.php');
-					$ret = $this->post_process($phpgw_baseline,$DEBUG);
-					if($ret)
-					{
-						if($GLOBALS['egw_setup']->app_registered($appname))
-						{
-							$GLOBALS['egw_setup']->update_app($appname);
-							$GLOBALS['egw_setup']->update_hooks($appname);
-						}
-						else
-						{
-							$GLOBALS['egw_setup']->register_app($appname);
-							$GLOBALS['egw_setup']->register_hooks($appname);
-						}
-						// Update the array values for return below
-						$setup_info[$key]['status'] = 'C';
-					}
-					else
-					{
-						/* script processing failed */
-						if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $setup_info[$key]['status']; }
-						$setup_info[$key]['status'] = 'F';
-					}
+					$pass[$value['name']] = $setup_info[$value['name']];
+					if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
 				}
 				else
 				{
-					if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
-					/*
-					 Add the app, but disable it if it has tables defined.
-					 A manual sql script install is needed, but we do add the hooks
-					*/
-					$enabled = 99;
-					if($setup_info[$key]['tables'][0] != '')
+					$tmp = $passing[$value['name']]['name'];
+					if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
+				}
+			}
+
+			$i++;
+			if($i == 20) /* Then oops it broke */
+			{
+				echo '<br>Setup failure: excess looping in process->pass():'."\n";
+				echo '<br>Pass:<br>'."\n";
+				_debug_array($pass);
+				echo '<br>Passed:<br>'."\n";
+				_debug_array($passed);
+				exit;
+			}
+			$pass_string = implode (':', $pass);
+			$passing_string = implode (':', $passing);
+		}
+		if ($do_langs)	// just do it once at the end of all passes
+		{
+			$langs = false;
+			if ($method == 'new')
+			{
+				$langs[] = ($own_lang = get_var('ConfigLang',Array('POST','COOKIE')));
+				if ($own_lang != 'en') $langs[] = 'en';
+			}
+			$this->translation->drop_add_all_langs($langs);
+		}
+		/* now return the list */
+		return $setup_info = array_merge($setup_info,$passed);
+	}
+
+	/**
+	 * saves a minimal default config, so you get a running install without entering and saveing Step #2 config
+	 *
+	 * @param array $preset_config=array()
+	 */
+	function save_minimal_config(array $preset_config=array())
+	{
+		$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
+
+		$current_config['site_title'] = 'eGroupWare';
+		$current_config['hostname']  = $_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : 'localhost';
+
+		// guessing the eGW url
+		$parts = explode('/',$_SERVER['PHP_SELF']);
+		array_pop($parts);	// remove config.php
+		array_pop($parts);	// remove setup
+		$current_config['webserver_url'] = implode('/',$parts);
+		$egroupwareDirName = end($parts);
+
+		if(!$is_windows) {
+			if(@is_dir('/tmp'))
+			{
+				$current_config['temp_dir'] = '/tmp';
+			}
+			else
+			{
+				$current_config['temp_dir'] = '/path/to/temp/dir';
+			}
+			$current_config['files_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/files';
+			$current_config['backup_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/backup';
+		}
+		else
+		{
+			if(@is_dir('c:\\windows\\temp'))
+			{
+				$current_config['temp_dir'] = 'c:\\windows\\temp';
+			}
+			else
+			{
+				$current_config['temp_dir'] = 'c:\\path\\to\\temp\\dir';
+			}
+			$current_config['files_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files';
+			$current_config['backup_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\backup';
+		}
+		$datetime =& CreateObject('phpgwapi.egw_datetime');
+		$current_config['tz_offset'] = $datetime->getbestguess();
+		unset($datetime);
+
+		// RalfBecker: php.net recommend this for security reasons, it should be our default too
+		$current_config['usecookies'] = 'True';
+
+		if ($GLOBALS['egw_setup']->system_charset)
+		{
+			$current_config['system_charset'] = $GLOBALS['egw_setup']->system_charset;
+		}
+
+		$current_config['install_id'] = md5($_SERVER['HTTP_HOST'].microtime(true).$GLOBALS['egw_setup']->ConfigDomain);
+
+		if ($preset_config)
+		{
+			$current_config = array_merge($current_config,$preset_config);
+		}
+
+		foreach($current_config as $name => $value)
+		{
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+				'config_value' => $value,
+			),array(
+				'config_app' => 'phpgwapi',
+				'config_name' => $name,
+			),__FILE__,__LINE__);
+		}
+
+		// so the default_records use the current data
+		$GLOBALS['egw_setup']->setup_account_object($current_config);
+	}
+
+	/**
+	 * drop tables per application, check that they are in the db first
+	 *
+	 * @param $setup_info	array of application info from setup.inc.php files, etc.
+	 */
+	function droptables(array $setup_info,$DEBUG=False)
+	{
+		if(!@$GLOBALS['egw_setup']->oProc)
+		{
+			$this->init_process();
+		}
+		/* The following is built so below we won't try to drop a table that isn't there. */
+		$tablenames = $GLOBALS['egw_setup']->db->table_names();
+		if (!is_array($setup_info) || !is_array($tablenames))
+		{
+			return $setup_info;	// nothing to do
+		}
+		$tables = array();
+		foreach($tablenames as $data)
+		{
+			$tables[] = $data['table_name'];
+		}
+
+		if (!is_array($setup_info))
+		{
+			return $setup_info;
+		}
+		foreach($setup_info as $app_name => $data)
+		{
+			if(is_array($data['tables']))
+			{
+				foreach($data['tables'] as $table)
+				{
+					//echo $table;
+					if(in_array($table,$tables))
 					{
-						$enabled = False;
+						if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
+						$GLOBALS['egw_setup']->oProc->DropTable($table);
+						// Update the array values for return below
+						$setup_info[$app_name]['status'] = 'U';
 					}
+				}
+			}
+		}
+
+		/* Done, return current status */
+		return $setup_info;
+	}
+
+	/**
+	 * process current table setup in each application/setup dir
+	 *
+	 * @param array $setup_info	array of application info from setup.inc.php files, etc.
+	 * @param boolean $DEBUG=false output further diagnostics
+	 * @return array $setup_info
+	 */
+	function current(array $setup_info,$DEBUG=False)
+	{
+		//echo __METHOD__; _debug_array($setup_info);
+		if(!isset($GLOBALS['egw_setup']->oProc))
+		{
+			$this->init_process();
+		}
+		foreach($setup_info as $appname => &$appdata)
+		{
+			$enabled = False;
+			$apptitle = $appdata['title'];
+
+			if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
+
+			$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
+
+			if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
+			{
+				if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
+				include ($appdir.'tables_current.inc.php');
+				$ret = $this->post_process($phpgw_baseline,$DEBUG);
+				if($ret)
+				{
 					if($GLOBALS['egw_setup']->app_registered($appname))
 					{
 						$GLOBALS['egw_setup']->update_app($appname);
@@ -375,306 +360,349 @@
 					}
 					else
 					{
-						$GLOBALS['egw_setup']->register_app($appname,$enabled);
+						$GLOBALS['egw_setup']->register_app($appname);
 						$GLOBALS['egw_setup']->register_hooks($appname);
 					}
-					$setup_info[$key]['status'] = 'C';
-				}
-				if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $setup_info[$key]['status']; }
-			}
-
-			/* Done, return current status */
-			return ($setup_info);
-		}
-
-		/**
-		 * process default_records.inc.php in each application/setup dir
-		 *
-		 * @param $setup_info	array of application info from setup.inc.php files, etc.
-		 */
-		function default_records($setup_info,$DEBUG=False)
-		{
-			if(!@$GLOBALS['egw_setup']->oProc)
-			{
-				$this->init_process();
-			}
-			@reset($setup_info);
-			while(list($key,$null) = @each($setup_info))
-			{
-				$appname = $setup_info[$key]['name'];
-				$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
-
-				if($setup_info[$key]['tables'] && file_exists($appdir.'default_records.inc.php'))
-				{
-					if($DEBUG)
-					{
-						echo '<br>process->default_records(): Including default records for ' . $appname . "\n";
-					}
-					$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
-					$oProc = &$GLOBALS['egw_setup']->oProc;	// to be compatible with old apps
-					include ($appdir.'default_records.inc.php');
-					$GLOBALS['egw_setup']->oProc->m_odb->transaction_commit();
-				}
-				/* $setup_info[$key]['status'] = 'C'; */
-			}
-
-			/* Done, return current status */
-			return ($setup_info);
-		}
-
-		/**
-		 * process test_data.inc.php in each application/setup dir for developer tests
-		 *
-		 * This data should work with the baseline tables
-		 * @param $setup_info	array of application info from setup.inc.php files, etc.
-		 */
-		function test_data($setup_info,$DEBUG=False)
-		{
-			if(!@$GLOBALS['egw_setup']->oProc)
-			{
-				$this->init_process();
-			}
-			@reset($setup_info);
-			while(list($key,$null) = @each($setup_info))
-			{
-				$appname = $setup_info[$key]['name'];
-				$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
-
-				if(file_exists($appdir.'test_data.inc.php'))
-				{
-					if($DEBUG)
-					{
-						echo '<br>process->test_data(): Including baseline test data for ' . $appname . "\n";
-					}
-					$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
-					include ($appdir.'test_data.inc.php');
-					$GLOBALS['egw_setup']->oProc->m_odb->transaction_commit();
-				}
-			}
-
-			/* Done, return current status */
-			return ($setup_info);
-		}
-
-		/**
-		 * process baseline table setup in each application/setup dir
-		 *
-		 * @param $appinfo	array of application info from setup.inc.php files, etc.
-		 */
-		function baseline($setup_info,$DEBUG=False)
-		{
-			if(!@$GLOBALS['egw_setup']->oProc)
-			{
-				$this->init_process();
-			}
-
-			@reset($setup_info);
-			while(list($key,$null) = @each($setup_info))
-			{
-				$appname = $setup_info[$key]['name'];
-				$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
-
-				if(file_exists($appdir.'tables_baseline.inc.php'))
-				{
-					if($DEBUG)
-					{
-						echo '<br>process->baseline(): Including baseline tables for ' . $appname . "\n";
-					}
-					include ($appdir.'tables_baseline.inc.php');
-					$GLOBALS['egw_setup']->oProc->GenerateScripts($phpgw_baseline, $DEBUG);
-					$this->post_process($phpgw_baseline,$DEBUG);
-
-					/* Update the array values for return below */
-					/* $setup_info[$key]['status'] = 'R'; */
+					// Update the array values for return below
+					$appdata['status'] = 'C';
 				}
 				else
 				{
-					if($DEBUG)
-					{
-						echo '<br>process->baseline(): No baseline tables for ' . $appname . "\n";
-					}
-					//$setup_info[$key]['status'] = 'C';
+					/* script processing failed */
+					if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
+					$appdata['status'] = 'F';
 				}
 			}
-
-			/* Done, return current status */
-			return ($setup_info);
+			else
+			{
+				if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
+				/*
+				 Add the app, but disable it if it has tables defined.
+				 A manual sql script install is needed, but we do add the hooks
+				*/
+				$enabled = 99;
+				if($appdata['tables'][0] != '')
+				{
+					$enabled = False;
+				}
+				if($GLOBALS['egw_setup']->app_registered($appname))
+				{
+					$GLOBALS['egw_setup']->update_app($appname);
+					$GLOBALS['egw_setup']->update_hooks($appname);
+				}
+				else
+				{
+					$GLOBALS['egw_setup']->register_app($appname,$enabled);
+					$GLOBALS['egw_setup']->register_hooks($appname);
+				}
+				$appdata['status'] = 'C';
+			}
+			if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
 		}
 
-		/**
-		 * process available upgrades in each application/setup dir
-		 *
-		 * @param $appinfo	array of application info from setup.inc.php files, etc.
-		 */
-		function upgrade($setup_info,$DEBUG=False)
+		/* Done, return current status */
+		return $setup_info;
+	}
+
+	/**
+	 * process default_records.inc.php in each application/setup dir
+	 *
+	 * @param array $setup_info	array of application info from setup.inc.php files, etc.
+	 * @param boolean $DEBUG=false output further diagnostics
+	 * @return array $setup_info
+	 */
+	function default_records(array $setup_info,$DEBUG=False)
+	{
+		//echo __METHOD__; _debug_array($setup_info);
+		if(!@$GLOBALS['egw_setup']->oProc)
 		{
-			if(!@$GLOBALS['egw_setup']->oProc)
-			{
-				$this->init_process();
-			}
-			$GLOBALS['egw_setup']->oProc->m_odb->HaltOnError = 'yes';
+			$this->init_process();
+		}
+		foreach($setup_info as $appname => &$appdata)
+		{
+			$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
 
-			foreach($setup_info as $key => $appdata)
+			if(file_exists($appdir.'default_records.inc.php'))
 			{
-				$appname = $appdata['name'];
-				/* Don't try to upgrade an app that is not installed */
-				if(!$GLOBALS['egw_setup']->app_registered($appname))
-				{
-					if($DEBUG)
-					{
-						echo "<p>process->upgrade(): Application not installed: $appname</p>\n";
-					}
-					unset($setup_info[$appname]);
-					continue;
-				}
-
-				/* if upgrade required, or if we are running again after an upgrade or dependency failure */
 				if($DEBUG)
 				{
-					echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
+					echo '<br>process->default_records(): Including default records for ' . $appname . "\n";
 				}
-				if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
-				{
-					$currentver = $appdata['currentver'];
-					$targetver  = $appdata['version'];	// The version we need to match when done
-					$appdir     = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
+				$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
+				$oProc = &$GLOBALS['egw_setup']->oProc;	// to be compatible with old apps
+				include ($appdir.'default_records.inc.php');
+				$GLOBALS['egw_setup']->oProc->m_odb->transaction_commit();
+			}
+			/* $appdata['status'] = 'C'; */
+		}
 
-					if(file_exists($appdir . 'tables_update.inc.php'))
+		/* Done, return current status */
+		return ($setup_info);
+	}
+
+	/**
+	 * process test_data.inc.php in each application/setup dir for developer tests
+	 *
+	 * This data should work with the baseline tables
+	 *
+	 * @param array $setup_info	array of application info from setup.inc.php files, etc.
+	 * @param boolean $DEBUG=false output further diagnostics
+	 * @return array $setup_info
+	 */
+	function test_data(array $setup_info,$DEBUG=False)
+	{
+		if(!@$GLOBALS['egw_setup']->oProc)
+		{
+			$this->init_process();
+		}
+		foreach($setup_info as $appname => &$appdata)
+		{
+			$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
+
+			if(file_exists($appdir.'test_data.inc.php'))
+			{
+				if($DEBUG)
+				{
+					echo '<br>process->test_data(): Including baseline test data for ' . $appname . "\n";
+				}
+				$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
+				include ($appdir.'test_data.inc.php');
+				$GLOBALS['egw_setup']->oProc->m_odb->transaction_commit();
+			}
+		}
+
+		/* Done, return current status */
+		return ($setup_info);
+	}
+
+	/**
+	 * process baseline table setup in each application/setup dir
+	 *
+	 * @param array $setup_info	array of application info from setup.inc.php files, etc.
+	 * @param boolean $DEBUG=false output further diagnostics
+	 * @return array $setup_info
+	 */
+	function baseline(array $setup_info,$DEBUG=False)
+	{
+		if(!@$GLOBALS['egw_setup']->oProc)
+		{
+			$this->init_process();
+		}
+		foreach($setup_info as $appname => &$appdata)
+		{
+			$appdir  = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
+
+			if(file_exists($appdir.'tables_baseline.inc.php'))
+			{
+				if($DEBUG)
+				{
+					echo '<br>process->baseline(): Including baseline tables for ' . $appname . "\n";
+				}
+				include ($appdir.'tables_baseline.inc.php');
+				$GLOBALS['egw_setup']->oProc->GenerateScripts($phpgw_baseline, $DEBUG);
+				$this->post_process($phpgw_baseline,$DEBUG);
+
+				/* Update the array values for return below */
+				/* $setup_info[$key]['status'] = 'R'; */
+			}
+			else
+			{
+				if($DEBUG)
+				{
+					echo '<br>process->baseline(): No baseline tables for ' . $appname . "\n";
+				}
+				//$setup_info[$key]['status'] = 'C';
+			}
+		}
+
+		/* Done, return current status */
+		return ($setup_info);
+	}
+
+	/**
+	 * process available upgrades in each application/setup dir
+	 *
+	 * @param array $setup_info array of application info from setup.inc.php files, etc.
+	 * @param boolean $DEBUG=false output further diagnostics
+	 * @return array $setup_info
+	 */
+	function upgrade($setup_info,$DEBUG=False)
+	{
+		//echo __METHOD__; _debug_array($setup_info);
+		if(!@$GLOBALS['egw_setup']->oProc)
+		{
+			$this->init_process();
+		}
+		$GLOBALS['egw_setup']->oProc->m_odb->HaltOnError = 'yes';
+
+		foreach($setup_info as $appname => &$appdata)
+		{
+			// check if app is NOT installed
+			if(!$GLOBALS['egw_setup']->app_registered($appname))
+			{
+				// check if app wants to be automatically installed on update to version x or allways
+				if (isset($appdata['autoinstall']) && ($appdata['autoinstall'] === true ||
+					$appdata['autoinstall'] === $this->api_version_target))
+				{
+					$info = $this->current(array($appname => $appdata),$DEBUG);
+					$info = $this->default_records($info,$DEBUG);
+					$appdata = $info[$appname];
+					continue;
+				}
+				/* Don't try to upgrade an app that is not installed */
+				if($DEBUG)
+				{
+					echo "<p>process->upgrade(): Application not installed: $appname</p>\n";
+				}
+				unset($setup_info[$appname]);
+				continue;
+			}
+
+			/* if upgrade required, or if we are running again after an upgrade or dependency failure */
+			if($DEBUG)
+			{
+				echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
+			}
+			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
+			{
+				$currentver = $appdata['currentver'];
+				$targetver  = $appdata['version'];	// The version we need to match when done
+				$appdir     = EGW_SERVER_ROOT . SEP . $appname . SEP . 'setup' . SEP;
+
+				if(file_exists($appdir . 'tables_update.inc.php'))
+				{
+					if (!@$this->updateincluded[$appname])
 					{
-						if (!@$this->updateincluded[$appname])
-						{
-							include ($appdir . 'tables_update.inc.php');
-							$this->updateincluded[$appname] = True;
-						}
-						while ($currentver && $currentver != $targetver &&
-							function_exists($function = $appname . '_upgrade' . str_replace('.','_',$currentver)))
-						{
-							if($DEBUG)
-							{
-								echo "<br>process->upgrade(): $appname($currentver --> $targetver): running $function()\n";
-							}
-							if (!($currentver = $function()))
-							{
-								if($DEBUG)
-								{
-									echo "<b>failed!!!</b>\n";
-								}
-								$appstatus  = 'F';
-							}
-							else
-							{
-								if($DEBUG)
-								{
-									echo "--> $currentver\n";
-								}
-							}
-						}
-						if ($currentver == $targetver)	// upgrades succesful
-						{
-							if($DEBUG)
-							{
-								echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
-							}
-							$appstatus = 'C';
-						}
-						elseif ($currentver)
-						{
-							if($DEBUG)
-							{
-								echo "<br><b>process->upgrade(): No table upgrade available for appname: $appname, version: $currentver</b>\n";
-							}
-							$setup_info[$key]['currentver'] = $targetver;
-							$appstatus  = 'F';
-						}
+						include ($appdir . 'tables_update.inc.php');
+						$this->updateincluded[$appname] = True;
 					}
-					else
+					while ($currentver && $currentver != $targetver &&
+						function_exists($function = $appname . '_upgrade' . str_replace('.','_',$currentver)))
 					{
 						if($DEBUG)
 						{
-							echo "<br>process->upgrade(): No table upgrade required/availible for $appname\n";
+							echo "<br>process->upgrade(): $appname($currentver --> $targetver): running $function()\n";
 						}
-						$appstatus  = 'C';
-					}
-					if ($appstatus == 'C')	// update successful completed
-					{
-						$setup_info[$key]['currentver'] = $targetver;
-
-						if($GLOBALS['egw_setup']->app_registered($appname))
+						if (!($currentver = $function()))
 						{
-							$GLOBALS['egw_setup']->update_app($appname);
-							$GLOBALS['egw_setup']->update_hooks($appname);
+							if($DEBUG)
+							{
+								echo "<b>failed!!!</b>\n";
+							}
+							$appstatus  = 'F';
 						}
 						else
 						{
-							$GLOBALS['egw_setup']->register_app($appname);
-							$GLOBALS['egw_setup']->register_hooks($appname);
+							if($DEBUG)
+							{
+								echo "--> $currentver\n";
+							}
 						}
 					}
-
+					if ($currentver == $targetver)	// upgrades succesful
+					{
+						if($DEBUG)
+						{
+							echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
+						}
+						$appstatus = 'C';
+					}
+					elseif ($currentver)
+					{
+						if($DEBUG)
+						{
+							echo "<br><b>process->upgrade(): No table upgrade available for appname: $appname, version: $currentver</b>\n";
+						}
+						$appdate['currentver'] = $targetver;
+						$appstatus  = 'F';
+					}
 				}
 				else
 				{
 					if($DEBUG)
 					{
-						echo "<br>process->upgrade(): No upgrade required for $appname\n";
+						echo "<br>process->upgrade(): No table upgrade required/availible for $appname\n";
 					}
 					$appstatus  = 'C';
 				}
-				/* Done with this app, update status */
+				if ($appstatus == 'C')	// update successful completed
+				{
+					$appdata['currentver'] = $targetver;
+
+					if($GLOBALS['egw_setup']->app_registered($appname))
+					{
+						$GLOBALS['egw_setup']->update_app($appname);
+						$GLOBALS['egw_setup']->update_hooks($appname);
+					}
+					else
+					{
+						$GLOBALS['egw_setup']->register_app($appname);
+						$GLOBALS['egw_setup']->register_hooks($appname);
+					}
+				}
+
+			}
+			else
+			{
 				if($DEBUG)
 				{
-					echo "<br>process->upgrade(): Outgoing : appname: $appname, status: $appstatus</div>\n";
+					echo "<br>process->upgrade(): No upgrade required for $appname\n";
 				}
-				$setup_info[$key]['status'] = $appstatus;
+				$appstatus  = 'C';
 			}
-
-			/* Done, return current status */
-			return ($setup_info);
+			/* Done with this app, update status */
+			if($DEBUG)
+			{
+				echo "<br>process->upgrade(): Outgoing : appname: $appname, status: $appstatus</div>\n";
+			}
+			$appdate['status'] = $appstatus;
 		}
 
-		/**
-		 * commit above processing to the db
-		 *
-		 */
-		function post_process($tables,$DEBUG=False)
-		{
-			if(!$tables)
-			{
-				return False;
-			}
-
-			return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables,$DEBUG);
-		}
-
-		/**
-		 * send this a table name, returns printable column spec and keys for the table from schema_proc
-		 *
-		 * @param	$tablename	table whose array you want to see
-		 */
-		function sql_to_array($tablename='')
-		{
-			if(!$tablename)
-			{
-				return False;
-			}
-
-			if(!$GLOBALS['egw_setup']->oProc)
-			{
-				$this->init_process();
-			}
-
-			$GLOBALS['egw_setup']->oProc->m_oTranslator->_GetColumns($GLOBALS['egw_setup']->oProc, $tablename, $sColumns, $sColumnName);
-
-			while(list($key,$tbldata) = each($GLOBALS['egw_setup']->oProc->m_oTranslator->sCol))
-			{
-				$arr .= $tbldata;
-			}
-			$pk = $GLOBALS['egw_setup']->oProc->m_oTranslator->pk;
-			$fk = $GLOBALS['egw_setup']->oProc->m_oTranslator->fk;
-			$ix = $GLOBALS['egw_setup']->oProc->m_oTranslator->ix;
-			$uc = $GLOBALS['egw_setup']->oProc->m_oTranslator->uc;
-
-			return array($arr,$pk,$fk,$ix,$uc);
-		}
+		/* Done, return current status */
+		return $setup_info;
 	}
-?>
+
+	/**
+	 * commit above processing to the db
+	 *
+	 */
+	function post_process($tables,$DEBUG=False)
+	{
+		if(!$tables)
+		{
+			return False;
+		}
+		return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables,$DEBUG);
+	}
+
+	/**
+	 * send this a table name, returns printable column spec and keys for the table from schema_proc
+	 *
+	 * @param	$tablename	table whose array you want to see
+	 */
+	function sql_to_array($tablename='')
+	{
+		if(!$tablename)
+		{
+			return False;
+		}
+
+		if(!$GLOBALS['egw_setup']->oProc)
+		{
+			$this->init_process();
+		}
+
+		$GLOBALS['egw_setup']->oProc->m_oTranslator->_GetColumns($GLOBALS['egw_setup']->oProc, $tablename, $sColumns, $sColumnName);
+
+		while(list($key,$tbldata) = each($GLOBALS['egw_setup']->oProc->m_oTranslator->sCol))
+		{
+			$arr .= $tbldata;
+		}
+		$pk = $GLOBALS['egw_setup']->oProc->m_oTranslator->pk;
+		$fk = $GLOBALS['egw_setup']->oProc->m_oTranslator->fk;
+		$ix = $GLOBALS['egw_setup']->oProc->m_oTranslator->ix;
+		$uc = $GLOBALS['egw_setup']->oProc->m_oTranslator->uc;
+
+		return array($arr,$pk,$fk,$ix,$uc);
+	}
+}

From 613e56e8b73d4b13b785381b6f86f130a4d1c983 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Fri, 29 May 2009 08:37:47 +0000
Subject: [PATCH 379/510] added Birthday to the Adressbook list as new field

---
 addressbook/setup/etemplates.inc.php    | 24 ++++++++++++++++++++++--
 addressbook/templates/default/index.xet |  7 +++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php
index 0ea50e103a..6943c47e0e 100755
--- a/addressbook/setup/etemplates.inc.php
+++ b/addressbook/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application addressbook
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-11 08:46
+	* generated by soetemplate::dump4setup() 2009-05-29 10:35
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package addressbook
@@ -24,6 +24,12 @@ $templ_data[] = array('name' => 'addressbook.display','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'addressbook.display.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:17:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:17:",!@show[org_name]";s:1:"C";s:17:",!@show[org_unit]";s:1:"D";s:13:",!@show[n_fn]";s:1:"E";s:14:",!@show[email]";s:1:"F";s:17:",!@show[tel_work]";s:1:"G";s:17:",!@show[tel_cell]";s:1:"H";s:16:",!@show[tel_fax]";s:1:"I";s:17:",!@show[org_home]";s:1:"J";s:12:",!@show[url]";s:1:"K";s:23:",!@show[adr_one_street]";s:1:"L";s:27:",!@show[adr_one_postalcode]";s:1:"M";s:25:",!@show[adr_one_locality]";s:1:"N";s:23:",!@show[adr_one_region]";s:1:"O";s:16:",!@show[custom1]";s:1:"P";s:16:",!@show[custom2]";}i:1;a:17:{s:1:"A";a:2:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:4:"type";}s:1:"B";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Company";s:4:"name";s:8:"org_name";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Department";s:4:"name";s:8:"org_unit";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Contact";s:4:"name";s:4:"n_fn";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Email";s:4:"name";s:5:"email";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business phone";s:4:"name";s:8:"tel_work";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}s:1:"H";a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:7:"tel_fax";s:5:"label";s:3:"Fax";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Home phone";s:4:"name";s:8:"tel_home";}s:1:"J";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Internet";s:4:"name";s:3:"url";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:6:"Street";s:4:"name";s:14:"adr_one_street";}s:1:"L";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"ZIP Code";s:4:"name";s:18:"adr_one_postalcode";}s:1:"M";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"City";s:4:"name";s:16:"adr_one_locality";}s:1:"N";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:6:"Region";s:4:"name";s:14:"adr_one_region";}s:1:"O";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:15:"@customlabel[1]";s:4:"name";s:7:"custom1";}s:1:"P";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:15:"@customlabel[2]";s:4:"name";s:7:"custom2";}s:1:"Q";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"select country";s:4:"name";s:7:"country";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}}}i:2;a:17:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:4:"size";s:1:"1";s:4:"name";s:12:"${row}[type]";s:8:"readonly";s:1:"1";s:5:"label";s:21:"$row_cont[type_label]";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_name]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[email]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_work]";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_cell]";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[tel_fax]";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home]";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[url]";}s:1:"K";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[adr_one_street]";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";}}s:1:"L";a:2:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";}s:1:"M";a:2:{s:4:"type";s:5:"label";s:4:"name";s:24:"${row}[adr_one_locality]";}s:1:"N";a:2:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[adr_one_region]";}s:1:"O";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[custom1]";}s:1:"P";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[custom2]";}s:1:"Q";a:2:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";}}}s:4:"rows";i:2;s:4:"cols";i:17;s:4:"size";s:14:"100%,,,,,,auto";s:7:"options";a:2:{i:0;s:4:"100%";i:6;s:4:"auto";}}}','size' => '100%,,,,,,auto','style' => '','modified' => '1195309977',);
 
+$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:60:"General|Categories|Private|Details|Links|Extra|Extra private";s:4:"name";s:53:"general|cats|home|details|links|custom|custom_private";s:4:"help";s:117:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:5:"28,64";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:5:"28,64";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:185:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1200547119',);
+
+$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.5.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:60:"General|Categories|Private|Details|Links|Extra|Extra private";s:4:"name";s:53:"general|cats|home|details|links|custom|custom_private";s:4:"help";s:117:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:5:"28,64";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:5:"28,64";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:185:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1200547119',);
+
+$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:79:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private";s:4:"name";s:71:"general|cats|home|details|links|distribution_list|custom|custom_private";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1201775611',);
+
 $templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.5.005','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:79:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private";s:4:"name";s:71:"general|cats|home|details|links|distribution_list|custom|custom_private";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1201775611',);
 
 $templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.5.006','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";s:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:3:"tab";s:5:"label";s:79:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private";s:4:"name";s:71:"general|cats|home|details|links|distribution_list|custom|custom_private";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:3:"url";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1216641537',);
@@ -36,6 +42,8 @@ $templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang'
 
 $templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:4:",top";s:1:"C";s:14:",@cat_tab=Tree";s:1:"D";s:15:",!@cat_tab=Tree";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:14:"013,,width:99%";}s:1:"D";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1165513081',);
 
+$templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1165512859',);
+
 $templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:22:",$cont[no_private_cfs]";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1200540144',);
 
 $templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:32:"$cont[tid],$cont[no_private_cfs]";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,258,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,258,,row_on,0,0,auto','style' => '','modified' => '1200540144',);
@@ -76,6 +84,8 @@ $templ_data[] = array('name' => 'addressbook.edit.personal.upload','template' =>
 
 $templ_data[] = array('name' => 'addressbook.edit.upload','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:12:",!@jpegphoto";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"checkbox";s:5:"label";s:6:"delete";s:4:"name";s:12:"delete_photo";s:4:"help";s:17:"Deletes the photo";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"file";s:4:"name";s:12:"upload_photo";s:4:"span";s:6:",photo";s:4:"help";s:74:"Select a portrait format jpeg photo. It will be resized to 60 pixel width.";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:2:"Ok";s:5:"align";s:6:"center";s:7:"onclick";s:73:"set_style_by_class(\'table\',\'uploadphoto\',\'display\',\'none\'); return false;";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:14:",,,uploadphoto";s:7:"options";a:1:{i:3;s:11:"uploadphoto";}}}','size' => ',,,uploadphoto','style' => '','modified' => '1165505380',);
 
+$templ_data[] = array('name' => 'addressbook.editphones','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:18:{i:0;a:1:{s:2:"c2";s:2:"th";}i:1;a:3:{s:1:"A";a:6:{s:4:"type";s:5:"label";s:4:"span";s:16:"all,windowheader";s:5:"label";s:20:"Edit Phonenumbers - ";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:2:"fn";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Number";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"pref";}}i:3;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:12:",,,tel_work2";s:4:"span";s:5:",bold";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_work2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_work";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:12:",,,tel_cell2";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_cell2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_cell";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";s:4:"size";s:10:",,,tel_fax";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_fax";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_fax";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:6;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"car phone";s:4:"size";s:10:",,,tel_car";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_car";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_car";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:7;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"pager";s:4:"size";s:12:",,,tel_pager";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_pager";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_pager";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:9;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:9:"Assistent";s:4:"size";s:12:",,,assistent";s:4:"span";s:5:",bold";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"35";s:4:"name";s:9:"assistent";s:4:"span";s:1:"2";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:10;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"number";s:4:"size";s:16:",,,tel_assistent";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:13:"tel_assistent";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:13:"tel_assistent";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:11;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:12;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:12:",,,tel_home2";s:4:"span";s:5:",bold";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_home2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_home";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:13;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:19:",,,tel_cell_private";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:16:"tel_cell_private";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_cell_private";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:14;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";s:4:"size";s:15:",,,tel_fax_home";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:12:"tel_fax_home";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:12:"tel_fax_home";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:15;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:16;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:" Other Phone";s:4:"size";s:12:",,,tel_other";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_other";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_other";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:17;a:3:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:5:"label";s:2:"Ok";s:7:"onclick";s:118:"set_style_by_class(\'table\',\'editphones\',\'display\',\'none\'); if (window.hidephones) hidephones(this.form); return false;";s:4:"span";s:3:"all";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:17;s:4:"cols";i:3;s:4:"size";s:13:",,,editphones";s:7:"options";a:1:{i:3;s:10:"editphones";}}}','size' => ',,,editphones','style' => '','modified' => '1131901207',);
+
 $templ_data[] = array('name' => 'addressbook.editphones','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:18:{i:0;a:1:{s:2:"c2";s:2:"th";}i:1;a:3:{s:1:"A";a:6:{s:4:"type";s:5:"label";s:4:"span";s:16:"all,windowheader";s:5:"label";s:20:"Edit Phonenumbers - ";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:2:"fn";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Number";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"pref";}}i:3;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:12:",,,tel_work2";s:4:"span";s:5:",bold";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_work2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:12:",,,tel_cell2";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_cell2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";s:4:"size";s:10:",,,tel_fax";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:8:"tel_fax2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:6;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"car phone";s:4:"size";s:10:",,,tel_car";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_car";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_car,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:7;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"pager";s:4:"size";s:12:",,,tel_pager";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_pager";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:18:"tel_pager,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:9;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:9:"Assistent";s:4:"size";s:12:",,,assistent";s:4:"span";s:5:",bold";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"35";s:4:"name";s:9:"assistent";s:4:"span";s:1:"2";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:10;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"number";s:4:"size";s:16:",,,tel_assistent";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:13:"tel_assistent";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:22:"tel_assistent,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:11;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:12;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:12:",,,tel_home2";s:4:"span";s:5:",bold";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_home2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:13;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:19:",,,tel_cell_private";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:16:"tel_cell_private";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:25:"tel_cell_private,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:14;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";s:4:"size";s:15:",,,tel_fax_home";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:12:"tel_fax_home";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:21:"tel_fax_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:15;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:16;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:" Other Phone";s:4:"size";s:12:",,,tel_other";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_other";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:18:"tel_other,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:17;a:3:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:5:"label";s:2:"Ok";s:7:"onclick";s:118:"set_style_by_class(\'table\',\'editphones\',\'display\',\'none\'); if (window.hidephones) hidephones(this.form); return false;";s:4:"span";s:3:"all";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:17;s:4:"cols";i:3;s:4:"size";s:13:",,,editphones";s:7:"options";a:1:{i:3;s:10:"editphones";}}}','size' => ',,,editphones','style' => '','modified' => '1131901207',);
 
 $templ_data[] = array('name' => 'addressbook.editphones','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:18:{i:0;a:1:{s:2:"c2";s:2:"th";}i:1;a:3:{s:1:"A";a:6:{s:4:"type";s:5:"label";s:4:"span";s:16:"all,windowheader";s:5:"label";s:20:"Edit Phonenumbers - ";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:2:"fn";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Number";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"pref";}}i:3;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:12:",,,tel_work2";s:4:"span";s:5:",bold";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_work2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:12:",,,tel_cell2";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_cell2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";s:4:"size";s:10:",,,tel_fax";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:8:"tel_fax2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_fax,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:6;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"car phone";s:4:"size";s:10:",,,tel_car";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_car";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:16:"tel_car,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:7;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"pager";s:4:"size";s:12:",,,tel_pager";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_pager";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:18:"tel_pager,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:9;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:9:"Assistent";s:4:"size";s:12:",,,assistent";s:4:"span";s:5:",bold";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"35";s:4:"name";s:9:"assistent";s:4:"span";s:1:"2";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:10;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"number";s:4:"size";s:16:",,,tel_assistent";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:13:"tel_assistent";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:22:"tel_assistent,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:11;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:12;a:3:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:12:",,,tel_home2";s:4:"span";s:5:",bold";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_home2";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:13;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:19:",,,tel_cell_private";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:16:"tel_cell_private";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:25:"tel_cell_private,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:14;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";s:4:"size";s:15:",,,tel_fax_home";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:12:"tel_fax_home";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:21:"tel_fax_home,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:15;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:16;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:" Other Phone";s:4:"size";s:12:",,,tel_other";}s:1:"B";a:3:{s:4:"type";s:9:"url-phone";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_other";}s:1:"C";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:18:"tel_other,&hearts;";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:17;a:3:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:5:"label";s:2:"Ok";s:7:"onclick";s:118:"set_style_by_class(\'table\',\'editphones\',\'display\',\'none\'); if (window.hidephones) hidephones(this.form); return false;";s:4:"span";s:3:"all";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:17;s:4:"cols";i:3;s:4:"size";s:13:",,,editphones";s:7:"options";a:1:{i:3;s:10:"editphones";}}}','size' => ',,,editphones','style' => '','modified' => '1131901207',);
@@ -104,10 +114,14 @@ $templ_data[] = array('name' => 'addressbook.index','template' => '','lang' => '
 
 $templ_data[] = array('name' => 'addressbook.index','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.index.left";}s:1:"B";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:27:"addressbook.index.right_add";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"addressbook.index.rows";s:4:"name";s:2:"nm";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"name";s:3:"add";s:5:"label";s:3:"Add";s:4:"help";s:17:"Add a new contact";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"use_all";s:5:"label";s:11:"whole query";s:8:"onchange";s:126:"if (this.checked==true && !confirm(\'Apply the action on the whole query, NOT only the shown contacts!!!\')) this.checked=false;";s:4:"help";s:67:"Apply the action on the whole query, NOT only the shown contacts!!!";}i:2;a:6:{s:4:"type";s:6:"select";s:8:"onchange";s:16:"do_action(this);";s:4:"size";s:45:"Select an action or addressbook to move to...";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"action";s:4:"help";s:42:"Select an action or addressbook to move to";}i:3;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1208264210',);
 
+$templ_data[] = array('name' => 'addressbook.index','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:3:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.index.left";}s:1:"B";a:3:{s:4:"type";s:8:"template";s:5:"align";s:5:"right";s:4:"name";s:27:"addressbook.index.right_add";}}i:3;a:2:{s:1:"A";a:4:{s:4:"type";s:9:"nextmatch";s:4:"size";s:22:"addressbook.index.rows";s:4:"name";s:2:"nm";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:5:{s:4:"type";s:6:"button";s:4:"name";s:3:"add";s:5:"label";s:3:"Add";s:4:"help";s:17:"Add a new contact";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"use_all";s:5:"label";s:11:"whole query";s:8:"onchange";s:126:"if (this.checked==true && !confirm(\'Apply the action on the whole query, NOT only the shown contacts!!!\')) this.checked=false;";s:4:"help";s:67:"Apply the action on the whole query, NOT only the shown contacts!!!";}i:2;a:6:{s:4:"type";s:6:"select";s:8:"onchange";s:16:"do_action(this);";s:4:"size";s:45:"Select an action or addressbook to move to...";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"action";s:4:"help";s:42:"Select an action or addressbook to move to";}i:3;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1243585623',);
+
 $templ_data[] = array('name' => 'addressbook.index.cat_add','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:4:",top";s:1:"C";s:14:",@cat_tab=Tree";s:1:"D";s:15:",!@cat_tab=Tree";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:14:"013,,width:99%";}s:1:"D";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"add";s:4:"name";s:7:"cat_add";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"delete";s:4:"name";s:10:"cat_delete";}s:4:"span";s:3:"all";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"cancel";s:4:"name";s:10:"cat_cancel";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"300";i:6;s:4:"auto";}}}','size' => '100%,300,,,,,auto','style' => '','modified' => '1204881537',);
 
 $templ_data[] = array('name' => 'addressbook.index.left','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:8:"org_view";s:7:"no_lang";s:1:"1";s:4:"help";s:13:"Select a view";s:4:"span";s:5:",bold";s:8:"onchange";i:1;s:4:"size";s:12:"All contacts";}}','size' => '','style' => '','modified' => '1146123855',);
 
+$templ_data[] = array('name' => 'addressbook.index.org_rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"G";s:2:"90";s:1:"F";s:17:",@no_customfields";}i:1;a:7:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:5:"label";s:1:"#";s:5:"align";s:6:"center";}s:1:"C";a:3:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"department";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Business address";}s:1:"F";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"G";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:7:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:7:{s:4:"type";s:3:"int";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:4:"name";s:17:"${row}[org_count]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"C";a:8:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:16:"${row}[org_name]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:14:",60,,,0,0,auto";s:4:"name";s:20:"${row}[customfields]";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:4:{i:1;s:2:"60";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}s:1:"G";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"4,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:38:"Show the contacts of this organisation";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:3:"Add";s:7:"onclick";s:182:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&org=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:18:"add[$row_cont[id]]";s:4:"help";s:34:"Add a contact to this organisation";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:51:"Delete this organisation including ALL its contacts";s:7:"onclick";s:70:"return confirm(\'Delete this organisation including ALL its contacts\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:7;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1161600299',);
+
 $templ_data[] = array('name' => 'addressbook.index.org_rows','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"F";s:2:"90";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:8:{s:4:"type";s:16:"nextmatch-header";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:5:"label";s:1:"#";s:5:"align";s:6:"center";s:4:"name";s:6:"number";s:4:"size";s:6:"Number";}s:1:"C";a:3:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Department";s:4:"name";s:8:"org_unit";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}s:1:"F";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:6:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:7:{s:4:"type";s:3:"int";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:4:"name";s:17:"${row}[org_count]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"C";a:8:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:16:"${row}[org_name]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"F";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:38:"Show the contacts of this organisation";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:3:"Add";s:7:"onclick";s:182:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&org=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:18:"add[$row_cont[id]]";s:4:"help";s:34:"Add a contact to this organisation";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:51:"Delete this organisation including ALL its contacts";s:7:"onclick";s:70:"return confirm(\'Delete this organisation including ALL its contacts\');";}i:4;a:5:{s:4:"type";s:6:"button";s:4:"size";s:7:"infolog";s:5:"label";s:7:"InfoLog";s:4:"name";s:22:"infolog[$row_cont[id]]";s:4:"help";s:42:"Show InfoLog entries for this organisation";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1161600281',);
 
 $templ_data[] = array('name' => 'addressbook.index.org_rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"F";s:2:"90";}i:1;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:8:{s:4:"type";s:16:"nextmatch-header";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:5:"label";s:1:"#";s:5:"align";s:6:"center";s:4:"name";s:6:"number";s:4:"size";s:6:"Number";}s:1:"C";a:3:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Department";s:4:"name";s:8:"org_unit";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}s:1:"F";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:6:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:7:{s:4:"type";s:3:"int";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:4:"name";s:17:"${row}[org_count]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"C";a:8:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:16:"${row}[org_name]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"F";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:38:"Show the contacts of this organisation";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:3:"Add";s:7:"onclick";s:186:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&org=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:18:"add[$row_cont[id]]";s:4:"help";s:34:"Add a contact to this organisation";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:51:"Delete this organisation including ALL its contacts";s:7:"onclick";s:70:"return confirm(\'Delete this organisation including ALL its contacts\');";}i:4;a:5:{s:4:"type";s:6:"button";s:4:"size";s:7:"infolog";s:5:"label";s:7:"InfoLog";s:4:"name";s:22:"infolog[$row_cont[id]]";s:4:"help";s:42:"Show InfoLog entries for this organisation";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1161600281',);
@@ -120,9 +134,15 @@ $templ_data[] = array('name' => 'addressbook.index.right_add','template' => '','
 
 $templ_data[] = array('name' => 'addressbook.index.right_add','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:10:"buttononly";s:4:"name";s:6:"search";s:5:"label";s:15:"Advanced search";s:7:"onclick";s:170:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.search\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:3:"add";s:5:"label";s:3:"Add";s:4:"help";s:17:"Add a new contact";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:12:",rightPadAdd";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:6:"manual";s:4:"span";s:12:",rightPadAdd";}}}','size' => '','style' => '.rightPadAdd { width: 30px; }','modified' => '1169256471',);
 
+$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"N";s:2:"90";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_work_link],,,calling,$cont[call_popup]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_cell]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_cell_link],,,calling,$cont[call_popup]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_home_link],,,calling,$cont[call_popup]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[tel_fax]";s:7:"no_lang";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"${row}[url]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"size";s:52:",@${row}[email_link],,,_blank,$row_cont[email_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:7:"no_lang";s:1:"1";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"size";s:62:",@${row}[email_home_link],,,_blank,$row_cont[email_home_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:7:"no_lang";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"size";s:52:"addressbook.uicontacts.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1210170353',);
+
+$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.005','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"N";s:2:"90";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_work_link],,,calling,$cont[call_popup]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_cell]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_cell_link],,,calling,$cont[call_popup]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_home_link],,,calling,$cont[call_popup]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[tel_fax]";s:7:"no_lang";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"${row}[url]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"size";s:52:",@${row}[email_link],,,_blank,$row_cont[email_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:7:"no_lang";s:1:"1";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"size";s:62:",@${row}[email_home_link],,,_blank,$row_cont[email_home_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:7:"no_lang";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1210170353',);
+
+$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.006','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"N";s:2:"90";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_cell]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_home]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:9:"url-phone";s:4:"name";s:15:"${row}[tel_fax]";s:8:"readonly";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";s:4:"name";s:11:"${row}[url]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:8:"readonly";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1210170353',);
+
 $templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.5.007','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"N";s:2:"90";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_cell]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_home]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:9:"url-phone";s:4:"name";s:15:"${row}[tel_fax]";s:8:"readonly";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";s:4:"name";s:11:"${row}[url]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:8:"readonly";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"5,0,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:4;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}s:4:"span";s:8:",noPrint";i:5;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1216641439',);
 
-$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"J";s:17:",@no_customfields";s:1:"K";s:22:",@no_distribution_list";s:1:"G";s:9:",@no_home";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";s:1:"N";s:2:"75";}i:1;a:14:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"J";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"N";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:14:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_cell]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_home]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:9:"url-phone";s:4:"name";s:15:"${row}[tel_fax]";s:8:"readonly";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"I";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";s:4:"name";s:11:"${row}[url]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:8:"readonly";s:1:"1";}}s:1:"J";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"L";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"M";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"N";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,0";i:1;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"2,,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:91:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/addressbook/$row_cont[id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}}s:4:"rows";i:2;s:4:"cols";i:14;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1216641439',);
+$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:2:"c1";s:2:"th";s:2:"c2";s:21:"$row_cont[cat_id],top";s:1:"K";s:17:",@no_customfields";s:1:"E";s:12:"60,@no_photo";s:1:"C";s:9:",@no_role";s:1:"O";s:2:"75";s:1:"L";s:22:",@no_distribution_list";s:1:"H";s:9:",@no_home";}i:1;a:15:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"role";s:4:"name";s:4:"role";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:4:"bday";s:5:"label";s:8:"Birthday";}s:1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:18:"adr_one_postalcode";s:5:"label";s:8:"zip code";}}s:1:"H";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";}s:1:"I";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"J";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"K";a:4:{s:4:"type";s:22:"nextmatch-customfields";i:1;a:1:{s:4:"type";s:22:"nextmatch-customfields";}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";}s:4:"name";s:12:"customfields";}s:1:"L";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";}i:2;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";}}s:1:"N";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:15:"contact_created";s:5:"label";s:7:"Created";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:16:"contact_modified";s:5:"label";s:13:"Last modified";}}s:1:"O";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:15:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[role]";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:8:"readonly";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"F";a:4:{s:4:"type";s:4:"date";s:4:"name";s:12:"${row}[bday]";s:8:"readonly";s:1:"1";s:4:"size";s:5:"Y-m-d";}s:1:"G";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"3,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"I";a:7:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_cell]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:16:"${row}[tel_home]";s:4:"span";s:11:",telNumbers";s:8:"readonly";s:1:"1";}i:4;a:3:{s:4:"type";s:9:"url-phone";s:4:"name";s:15:"${row}[tel_fax]";s:8:"readonly";s:1:"1";}i:5;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"J";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";s:4:"name";s:11:"${row}[url]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:8:"readonly";s:1:"1";}}s:1:"K";a:6:{s:4:"type";s:17:"customfields-list";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"$row";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:4:"$row";s:4:"span";s:13:",customfields";}s:1:"L";a:2:{s:4:"type";s:5:"label";s:4:"name";s:21:"${row}[distrib_lists]";}s:1:"M";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[last_link]";}i:2;a:2:{s:4:"type";s:4:"link";s:4:"name";s:17:"${row}[next_link]";}}s:1:"N";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"${row}[modifier]";s:8:"readonly";s:1:"1";}}s:1:"O";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";s:4:"span";s:8:",noPrint";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"4,,0";i:1;a:4:{s:4:"type";s:5:"image";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"2,,0";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"size";s:3:"new";s:5:"label";s:18:"Insert in document";}i:2;a:5:{s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"size";s:91:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/addressbook/$row_cont[id]";s:4:"span";s:8:",image16";s:5:"label";s:11:"Filemanager";}}}}}s:4:"rows";i:2;s:4:"cols";i:15;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1216641439',);
 
 $templ_data[] = array('name' => 'addressbook.search','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:16:"addressbook.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:5:"label";s:8:"Operator";s:4:"name";s:8:"operator";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:6:"select";s:4:"name";s:11:"meth_select";s:7:"no_lang";s:1:"1";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{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:6:"button";s:5:"label";s:6:"Search";s:4:"name";s:14:"button[search]";s:7:"onclick";s:37:"xajax_eT_wrapper(this); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:29:"window.close(); return false;";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1161707411',);
 
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index a9aa87bc58..c898ae8335 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -15,7 +15,7 @@
 		<styles>.rightPadAdd { width: 30px; }</styles>
 	</template>
 	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.7.001">
-		<grid width="100%">
+		<grid>
 			<columns>
 				<column/>
 				<column/>
@@ -23,6 +23,7 @@
 				<column/>
 				<column width="60" disabled="@no_photo"/>
 				<column/>
+				<column/>
 				<column disabled="@no_home"/>
 				<column/>
 				<column/>
@@ -67,6 +68,7 @@
 					<nextmatch-header label="role" id="role"/>
 					<nextmatch-header label="Category" id="cat_id"/>
 					<nextmatch-header label="Photo" id="photo"/>
+					<nextmatch-header id="bday" label="Birthday"/>
 					<vbox options="0,0">
 						<nextmatch-header label="Business address" id="business"/>
 						<nextmatch-customfilter id="adr_one_countryname" options="select-country,Country,1" class="countrySelect"/>
@@ -113,6 +115,7 @@
 						<menupopup type="select-cat" options="1" id="${row}[cat_id]" readonly="true"/>
 					</menulist>
 					<image src="${row}[photo]"/>
+					<date id="${row}[bday]" readonly="true" options="Y-m-d"/>
 					<vbox options="0,0">
 						<description id="${row}[adr_one_countryname]" no_lang="1"/>
 						<hbox options="0,0" orient="0">
@@ -177,7 +180,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="addressbook.index" template="" lang="" group="0" version="1.5.002">
+	<template id="addressbook.index" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column/>

From 31ad0b04801e52244a73c8ac453b5ba2fdb0f251 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 29 May 2009 10:48:19 +0000
Subject: [PATCH 380/510] "- show filemanager prefs only if user has access to
 prefs app - returning settings instead of using global var - docu upate"

---
 .../inc/class.filemanager_hooks.inc.php       | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php
index 7509965e76..cf0e0bf360 100644
--- a/filemanager/inc/class.filemanager_hooks.inc.php
+++ b/filemanager/inc/class.filemanager_hooks.inc.php
@@ -58,12 +58,14 @@ class filemanager_hooks
 			}
 			display_sidebox(self::$appname,$title,$file);
 		}
-		self::preferences(self::$appname);
+		if ($GLOBALS['egw_info']['user']['apps']['preferences']) self::preferences(self::$appname);
 		if ($GLOBALS['egw_info']['user']['apps']['admin']) self::admin(self::$appname);
 	}
 
 	/**
 	 * Entries for filemanagers's admin menu
+	 *
+	 * @param string|array $location ='admin' hook name or params
 	 */
 	static function admin($location = 'admin')
 	{
@@ -81,6 +83,11 @@ class filemanager_hooks
 		}
 	}
 
+	/**
+	 * Entries for filemanagers's preferences menu
+	 *
+	 * @param string|array $location ='preferences' hook name or params
+	 */
 	static function preferences($location = 'preferences')
 	{
 		$file = array(
@@ -96,6 +103,11 @@ class filemanager_hooks
 		}
 	}
 
+	/**
+	 * Settings for preferences
+	 *
+	 * @return array with settings
+	 */
 	static function settings()
 	{
 		$config = config::read(self::$appname);
@@ -113,7 +125,7 @@ class filemanager_hooks
 			'yes' => lang('Yes')
 		);
 
-        $GLOBALS['settings'] = array(
+        $settings = array(
 			'showbase'	=> array(
 				'type'		=> 'select',
 				'name'		=> 'showbase',
@@ -133,19 +145,10 @@ class filemanager_hooks
 				'xmlrpc'	=> True,
 				'amin'		=> False
 			),
-#            'show_upload_boxes' => array(
-#                'type'   => 'select',
-#                'label'  => 'Default number of upload fields to show',
-#                'name'   => 'show_upload_boxes',
-#                'values' => $upload_boxes,
-#                'help'   => 'How many upload slots should be available for uploading files? (The boxes are displayed at the bottom of the file listing)',
-#                'xmlrpc' => True,
-#                'admin'  => False
-#            ),
 		);
 		for ($i=1; $i <= self::$foldercount; $i++)
 		{
-			$GLOBALS['settings']['folderlink'.$i]	= array(
+			$settings['folderlink'.$i]	= array(
 				'type'		=> 'input',
 				'name'		=> 'folderlink'.$i,
 				'size'		=> 60,
@@ -155,6 +158,6 @@ class filemanager_hooks
 				'amin'		=> False
 			);
 		}
-		return true;
+		return $settings;
 	}
 }

From 53264e2c2bf2402cdb4a6df7cf4dc485a324feca Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 30 May 2009 06:58:48 +0000
Subject: [PATCH 381/510] "new static method to get an attribute of a column,
 eg. the comment"

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

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 32ac272a50..d32daf7d4b 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -1581,6 +1581,32 @@ class egw_db
 		return $table ? $this->app_data['table_defs'][$table] : $this->app_data['table_defs'];
 	}
 
+	/**
+	 * Get specified attribute (default comment) of a colum or whole definition (if $attribute === null)
+	 *
+	 * Can be used static, in which case the global db object is used ($GLOBALS['egw']->db) and $app should be specified
+	 *
+	 * @param string $column name of column
+	 * @param string $table name of table
+	 * @param string $app=null app name or NULL to use $this->app, set via egw_db::set_app()
+	 * @param string $attribute='comment' what field to return, NULL for array with all fields, default 'comment' to return the comment
+	 * @return string|array NULL if table or column or attribute not found
+	 */
+	/* static */ function get_column_attribute($column,$table,$app=null,$attribute='comment')
+	{
+		static $cached_columns,$cached_table;	// some caching
+
+		if ($cached_table !== $table || is_null($cached_columns))
+		{
+			$db = isset($this) ? $this : $GLOBALS['egw']->db;
+			$table_def = $db->get_table_definitions($app,$table);
+			$cached_columns = is_array($table_def) ? $table_def['fd'] : false;
+		}
+		if ($cached_columns === false) return null;
+
+		return is_null($attribute) ? $cached_columns[$column] : $cached_columns[$column][$attribute];
+	}
+
 	/**
 	* Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
 	*

From 75f4a3920e78f1e3002535271005f08a8ea52f9a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 30 May 2009 07:03:57 +0000
Subject: [PATCH 382/510] =?UTF-8?q?"Patch=20from=20Carsten=20Wolf:=20Times?=
 =?UTF-8?q?heet-Eintr=C3=A4ge=20mit=20Uhrzeit=200:00,=20die=20in=20der=20W?=
 =?UTF-8?q?interzeit=20gemacht=20wurden,=20werden=20in=20einem=20Union-Que?=
 =?UTF-8?q?ry,=20der=20in=20der=20Sommerzeit=20stattfindet,=20dem=20falsch?=
 =?UTF-8?q?en=20Tag=20zugeordnet.=20Vermutlich=20stimmt=20dies=20nur=20f?=
 =?UTF-8?q?=C3=BCr=20den=20PostgreSQL=20query=20und=20ist=20Dir=20deshalb?=
 =?UTF-8?q?=20bisher=20nicht=20aufgefallen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Der Patch:
Ändert den PostgreSQL-spezifischen Teil des queries so um, dass er
Zeitzoneninformationen berücksichtigt."
---
 phpgwapi/inc/class.egw_db.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index d32daf7d4b..8d7ef094be 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -595,7 +595,7 @@ class egw_db
 	 */
 	function from_bool($val)
 	{
-		return $val && $val{0} !== 'f';	// everthing other then 0 or f[alse] is returned as true
+		return $val && $val[0] !== 'f';	// everthing other then 0 or f[alse] is returned as true
 	}
 
 	/**
@@ -1235,8 +1235,8 @@ class egw_db
 			case 'mysql':
 				return "FROM_UNIXTIME($expr)";
 
-			case 'pgsql':	// we use date(,0) as we store server-time
-				return "(timestamp '".date('Y-m-d H:i:s',0)."' + ($expr) * interval '1 sec')";
+			case 'pgsql':
+				return "(timestamp with time zone 'epoch' + ($expr) * interval '1 sec')";
 
 			case 'mssql':	// we use date(,0) as we store server-time
 				return "DATEADD(second,($expr),'".date('Y-m-d H:i:s',0)."')";

From 88d92e78f9b4d287ed80299f66fa3a126539d1d7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 30 May 2009 07:39:58 +0000
Subject: [PATCH 383/510] "- fix for bug #2097: Addressbook bug when
 filemanager is disabled - fixed not working export limit"

---
 addressbook/inc/class.addressbook_ui.inc.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 53191104bd..b4d1b0b932 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -71,7 +71,7 @@ class addressbook_ui extends addressbook_bo
 		$this->config =& $GLOBALS['egw_info']['server'];
 
 		// check if a contact specific export limit is set, if yes use it also for etemplate's csv export
-		if (!$this->config['contact_export_limit'])
+		if ($this->config['contact_export_limit'])
 		{
 			$this->config['export_limit'] = $this->config['contact_export_limit'];
 		}
@@ -311,9 +311,6 @@ class addressbook_ui extends addressbook_bo
 				$sel_options['col_filter[tid]'][$tid] = $data['name'];
 			}
 		}
-		// disable filemanger icon if user has no access to filemanager
-		$readonlys['filemanager/navbar'] = !isset($GLOBALS['egw_info']['user']['apps']['filemanager']);
-
 		// get the availible org-views plus the label of the contacts view of one org
 		$sel_options['org_view'] = $this->org_views;
 		if (isset($org_view)) $content['nm']['org_view'] = $org_view;
@@ -1065,11 +1062,8 @@ class addressbook_ui extends addressbook_bo
 			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']);
 			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']);
 		}
-		if ($show_distributionlist) {
-			$readonlys['no_distrib_lists'] =true;
-		} else {
-			$readonlys['no_distrib_lists'] =false;
-		}
+		$readonlys['no_distrib_lists'] = (bool)$show_distributionlist;
+
 		if (!$this->prefs['no_auto_hide'])
 		{
 			// disable photo column, if view contains no photo(s)
@@ -1082,6 +1076,9 @@ class addressbook_ui extends addressbook_bo
 		// disable customfields column, if we have no customefield(s)
 		if (!$this->customfields/* || !$this->prefs['no_auto_hide'] && !$customfields*/) $rows['no_customfields'] = true;
 
+		// disable filemanger icon if user has no access to filemanager
+		$readonlys['filemanager/navbar'] = !isset($GLOBALS['egw_info']['user']['apps']['filemanager']);
+
 		$rows['order'] = $order;
 		$rows['call_popup'] = $this->config['call_popup'];
 		$rows['customfields'] = array_values($this->customfields);
@@ -1102,7 +1099,7 @@ class addressbook_ui extends addressbook_bo
 		}
 		if($query['advanced_search'])
 		{
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Advanced search');
+			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Advanced search');
 		}
 		if ($query['cat_id'])
 		{

From 132297a502a46d477e6558253939efc18fd32416 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 30 May 2009 09:18:04 +0000
Subject: [PATCH 384/510] "add system-charset to keys of tree-wide cache, if
 not utf-8, as content depends on charset!"

---
 phpgwapi/inc/class.egw_cache.inc.php | 46 +++++++++++++++++++---------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index 658b94107c..b71ff4bd46 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -440,6 +440,31 @@ class egw_cache
 		return $providers[$level];
 	}
 
+	/**
+	 * Get a system configuration, even if in setup and it's not read
+	 *
+	 * @param string $name
+	 * @return mixed
+	 */
+	static protected function get_system_config($name)
+	{
+		if(!isset($GLOBALS['egw_info']['server'][$name]))
+		{
+			if (isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db))
+			{
+				$GLOBALS['egw_info']['server'][$name] = $GLOBALS['egw_setup']->db->select(config::TABLE,'config_value',array(
+					'config_app'	=> 'phpgwapi',
+					'config_name'	=> $name,
+				),__LINE__,__FILE__)->fetchColumn();
+			}
+			if (!$GLOBALS['egw_info']['server'][$name])
+			{
+				throw new Exception (__METHOD__."($name) \$GLOBALS['egw_info']['server']['$name'] is NOT set!");
+			}
+		}
+		return $GLOBALS['egw_info']['server'][$name];
+	}
+
 	/**
 	 * Get keys array from $level, $app and $location
 	 *
@@ -458,23 +483,14 @@ class egw_cache
 			{
 				case self::TREE:
 					$bases[$level] = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT);
+					// add charset to key, if not utf-8 (as everything we store depends on charset!)
+					if (($charset = self::get_system_config('system_charset')) && $charset != 'utf-8')
+					{
+						$bases[$level] .= '-'.$charset;
+					}
 					break;
 				case self::INSTANCE:
-					if(!isset($GLOBALS['egw_info']['server']['install_id']))
-					{
-						if (isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db))
-						{
-							$GLOBALS['egw_info']['server']['install_id'] = $GLOBALS['egw_setup']->db->select(config::TABLE,'config_value',array(
-								'config_app'	=> 'phpgwapi',
-								'config_name'	=> 'install_id',
-							),__LINE__,__FILE__)->fetchColumn();
-						}
-						if (!$GLOBALS['egw_info']['server']['install_id'])
-						{
-							throw new Exception (__METHOD__."($level,$app,$location) server/install_id is NOT set!");
-						}
-					}
-					$bases[$level] = $level.'-'.$GLOBALS['egw_info']['server']['install_id'];
+					$bases[$level] = $level.'-'.self::get_system_config('install_id');
 					break;
 			}
 		}

From 3ec3c205ee72c79263246d3ae57f87b9145c3fac Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 30 May 2009 20:15:31 +0000
Subject: [PATCH 385/510] created a rpm post script to automatic install or
 update EGroupware: - cleaned up exceptions in cli code (no need to log, as it
 goes direct to the user) - regarding small rpm redirect header (< 200 bytes)
 as no header - fixed wrong detected vars for cli install (eg. webserver_url)
 - fixed egw_cache to not stall if system_charset is not yet in db

---
 doc/rpm-build/rpm_post_install.php       | 245 +++++++++++++++++++++++
 phpgwapi/inc/class.egw.inc.php           |   2 +-
 phpgwapi/inc/class.egw_cache.inc.php     |   9 +-
 phpgwapi/inc/common_functions.inc.php    |  19 +-
 setup/inc/class.setup_cmd.inc.php        |   4 +-
 setup/inc/class.setup_cmd_header.inc.php |  12 +-
 setup/inc/class.setup_process.inc.php    |  24 ++-
 setup/setup-cli.php                      |   2 +-
 8 files changed, 287 insertions(+), 30 deletions(-)
 create mode 100755 doc/rpm-build/rpm_post_install.php

diff --git a/doc/rpm-build/rpm_post_install.php b/doc/rpm-build/rpm_post_install.php
new file mode 100755
index 0000000000..81307df5b2
--- /dev/null
+++ b/doc/rpm-build/rpm_post_install.php
@@ -0,0 +1,245 @@
+#!/usr/bin/php
+<?php
+/**
+ * eGroupWare - RPM post install: automatic install or update EGroupware
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author RalfBecker@outdoor-training.de
+ * @version $Id$
+ */
+
+if (isset($_SERVER['HTTP_HOST']))	// security precaution: forbit calling setup-cli as web-page
+{
+	die('<h1>rpm_post_install.php must NOT be called as web-page --> exiting !!!</h1>');
+}
+$verbose = false;
+$config = array(
+	'php'         => '/usr/bin/php',
+	'source_dir'  => '/usr/share/egroupware',
+	'data_dir'    => '/var/lib/egroupware',
+	'header'      => '/var/lib/egroupware/header.inc.php',	// symlinked to source_dir by rpm
+	'setup-cli'   => '/usr/share/egroupware/setup/setup-cli.php',
+	'domain'      => 'default',
+	'config_user' => 'admin',
+	'config_passwd'   => randomstring(),
+	'db_type'     => 'mysql',
+	'db_host'     => 'localhost',
+	'db_port'     => 3306,
+	'db_name'     => 'egroupware',
+	'db_user'     => 'egroupware',
+	'db_pass'     => randomstring(),
+	'db_grant_host' => 'localhost',
+	'db_root'     => 'root',	// mysql root user/pw to create database
+	'db_root_pw'  => '',
+	'backup'      => '',
+	'admin_user'  => 'sysop',
+	'admin_passwd'=> randomstring(),
+	'lang'        => 'en',	// languages for admin user and extra lang to install
+	'charset'     => 'utf-8',
+	'start_db'    => '/etc/init.d/mysqld',
+	'autostart_db' => '/sbin/chkconfig --level 3 mysqld on',
+	'start_webserver' => '/etc/init.d/httpd',
+	'autostart_webserver' => '/sbin/chkconfig --level 3 httpd on',
+);
+// read language from LANG enviroment variable
+if (($lang = $_ENV['LANG']))
+{
+	list($lang,$nat) = split('[_.]',$lang);
+	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
+	{
+		$lang .= '-'.strtolower($nat);
+	}
+	$config['lang'] = $lang;
+}
+// read config from command line
+$argv = $_SERVER['argv'];
+$prog = array_shift($argv);
+
+while(($arg = array_shift($argv)))
+{
+	if ($arg == '-v' || $arg == '--verbose')
+	{
+		$verbose = true;
+	}
+	elseif($arg == '-h' || $arg == '--help')
+	{
+		usage();
+	}
+	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	{
+		$config[$name] = array_shift($argv);
+	}
+	else
+	{
+		usage("Unknown argument '$arg'!");
+	}
+}
+// basic config checks
+foreach(array('php','source_dir','data_dir','setup-cli') as $name)
+{
+	if (!file_exists($config[$name])) bail_out(1,$config[$name].' not found!');
+}
+$setup_cli = $config['php'].' '.$config['setup-cli'];
+
+if (!file_exists($config['header']) || filesize($config['header']) < 200)	// default header redirecting to setup is 147 bytes
+{
+	// --> new install
+
+	// create header
+	@unlink($config['header']);	// remove redirect header, setup-cli stalls otherwise
+	$setup_header = $setup_cli.' --create-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']).
+		' --domain '.escapeshellarg($config['domain'].','.$config['db_name'].','.$config['db_user'].','.$config['db_pass'].
+			','.$config['db_type'].','.$config['db_host'].','.$config['db_port']);
+	run_cmd($setup_header);
+
+	// check for localhost if database server is started and start it (permanent) if not
+	if ($config['db_host'] == 'localhost' && file_exists($config['start_db']))
+	{
+		if (exec($config['start_db'].' status',$dummy,$ret) && $ret)
+		{
+			system($config['start_db'].' start');
+			system($config['autostart_db']);
+		}
+	}
+	// create database
+	$setup_db = $setup_cli.' --setup-cmd-database sub_command=create_db';
+	foreach(array('domain','db_type','db_host','db_port','db_name','db_user','db_pass','db_root','db_root_pw','db_grant_host') as $name)
+	{
+		$setup_db .= ' '.escapeshellarg($name.'='.$config[$name]);
+	}
+	run_cmd($setup_db);
+
+	// install egroupware
+	$setup_install = $setup_cli.' --install '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd'].','.$config['backup'].','.$config['charset'].','.$config['lang']);
+	run_cmd($setup_install);
+
+	if ($config['data_dir'] != '/var/lib/egroupware')
+	{
+		// set files dir different from default
+		$setup_config = $setup_cli.' --config '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd']).
+			' --files-dir '.escapeshellarg($config['data_dir'].'/files').' --backup-dir '.escapeshellarg($config['data_dir'].'/backup');
+		run_cmd($setup_config);
+	}
+
+	// create first user
+	$setup_admin = $setup_cli.' --admin '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd'].','.
+		$config['admin_user'].','.$config['admin_passwd'].',,,,'.$config['lang']);
+	run_cmd($setup_admin);
+
+	// check if webserver is started and start it (permanent) if not
+	if (file_exists($config['start_webserver']))
+	{
+		if (exec($config['start_webserver'].' status',$dummy,$ret) && $ret)
+		{
+			system($config['start_webserver'].' start');
+			system($config['autostart_webserver']);
+		}
+	}
+	echo "\n";
+	echo "EGroupware successful installed\n";
+	echo "===============================\n";
+	echo "\n";
+	echo "Please note the following user names and passwords:\n";
+	echo "\n";
+	echo "Setup username:      $config[config_user]\n";
+	echo "      password:      $config[config_passwd]\n";
+	echo "\n";
+	echo "EGroupware username: $config[admin_user]\n";
+	echo "           password: $config[admin_passwd]\n";
+	echo "\n";
+	echo "You can log into EGroupware by pointing your browser to http://localhost/egroupware/\n";
+	echo "Please replace localhost with the appropriate hostname, if you connect remote.\n\n";
+
+	if (empty($config['db_root_pw']))
+	{
+		echo "*** Database has no root password set, please fix that immediatly: mysqladmin -u root password NEWPASSWORD\n\n";
+	}
+}
+else
+{
+	// --> existing install --> update
+
+	// get user from header and replace password, as we dont know it
+	$header = file_get_contents($config['header']);
+	if (!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_user'] = '")."([^']+)';/m",$header,$matches))
+	{
+		bail_out(1,$config['header']." is no regular EGroupware header.inc.php!");
+	}
+	$tmp_header= preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '")."([^']+)';/m",
+		"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$config['config_passwd']."';",$header);
+	file_put_contents($config['header'],$tmp_header);
+
+	// update egroupware
+	$setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd']);
+	run_cmd($setup_update);
+
+	// restore original header
+	file_put_contents($config['header'],$header);
+
+	echo "EGroupware successful updated\n";
+}
+
+function run_cmd($cmd,array &$output=null)
+{
+	global $verbose;
+
+	if ($verbose)
+	{
+		echo $cmd."\n";
+		system($cmd,$ret);
+	}
+	else
+	{
+		$output[] = $cmd;
+		exec($cmd,$output,$ret);
+	}
+	if ($ret) bail_out($ret,$verbose?null:$output);
+}
+
+function bail_out($ret=1,$output=null)
+{
+	if ($output) echo implode("\n",(array)$output);
+	echo "\n\nInstallation failed --> exiting!\n\n";
+	exit($ret);
+}
+
+/**
+ * Return a rand string, eg. to generate passwords
+ *
+ * @param int $len=16
+ * @return string
+ */
+function randomstring($len=16)
+{
+	static $usedchars = array(
+		'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
+		'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
+		'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
+		'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+		'@','!','$','%','&','/','(',')','=','?',';',':','#','_','-','<',
+		'>','|','{','[',']','}',	// dont add \,'" as we have problems dealing with them
+	);
+
+	$str = '';
+	for($i=0; $i < $len; $i++)
+	{
+		$str .= $usedchars[mt_rand(0,count($usedchars)-1)];
+	}
+	return $str;
+}
+
+function usage($error=null)
+{
+	global $prog,$config;
+	
+	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
+	echo "options and their defaults:\n";
+	foreach($config as $name => $default)
+	{
+		if (in_array($name,array('config_passwd','db_pass','admin_passwd'))) $default = '<16 char random string>';
+		echo '--'.str_pad($name,20).$default."\n";
+	}
+	if ($error) echo "$error\n\n";
+	exit(1);
+}
diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php
index cd4a637ae4..8c2e3fa349 100644
--- a/phpgwapi/inc/class.egw.inc.php
+++ b/phpgwapi/inc/class.egw.inc.php
@@ -555,7 +555,7 @@ class egw_minimal
 
 		if (!isset(self::$sub_objects[$name]) && !class_exists($name))
 		{
-			error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
+			if ($name != 'ADOdb') error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
 			return null;
 		}
 		switch($name)
diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index b71ff4bd46..8d4b77e49e 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -444,9 +444,10 @@ class egw_cache
 	 * Get a system configuration, even if in setup and it's not read
 	 *
 	 * @param string $name
-	 * @return mixed
+	 * @param boolean $throw=true throw an exception, if we can't retriev the value
+	 * @return string|boolean string with config or false if not found and !$throw
 	 */
-	static protected function get_system_config($name)
+	static protected function get_system_config($name,$throw=true)
 	{
 		if(!isset($GLOBALS['egw_info']['server'][$name]))
 		{
@@ -457,7 +458,7 @@ class egw_cache
 					'config_name'	=> $name,
 				),__LINE__,__FILE__)->fetchColumn();
 			}
-			if (!$GLOBALS['egw_info']['server'][$name])
+			if (!$GLOBALS['egw_info']['server'][$name] && $throw)
 			{
 				throw new Exception (__METHOD__."($name) \$GLOBALS['egw_info']['server']['$name'] is NOT set!");
 			}
@@ -484,7 +485,7 @@ class egw_cache
 				case self::TREE:
 					$bases[$level] = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT);
 					// add charset to key, if not utf-8 (as everything we store depends on charset!)
-					if (($charset = self::get_system_config('system_charset')) && $charset != 'utf-8')
+					if (($charset = self::get_system_config('system_charset',false)) && $charset != 'utf-8')
 					{
 						$bases[$level] .= '-'.$charset;
 					}
diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 3d49d1c346..547103584e 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1441,21 +1441,24 @@ function egw_exception_handler(Exception $e)
 	{
 		$headline = try_lang('An error happend');
 	}
+	// exception handler for cli (command line interface) clients, no html, no logging
+	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
+	{
+		echo ($headline ? $headline.': ' : '').$e->getMessage()."\n";
+		if ($GLOBALS['egw_info']['server']['exception_show_trace'])
+		{
+			echo $e->getTraceAsString()."\n";
+		}
+		exit($e->getCode() ? $e->getCode() : 9999);		// allways give a non-zero exit code
+	}
 	// logging all exceptions to the error_log
 	error_log($headline.': '.$e->getMessage());
 	foreach(explode("\n",$e->getTraceAsString()) as $line) error_log($line);
 	error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', URL='.
 		($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 
-	// exception handler for cli (command line interface) clients, no html
-	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
-	{
-		echo ($headline ? $headline.': ' : '').$e->getMessage()."\n";
-		if (!($e instanceof egw_exception_wrong_userinput)) echo $e->getTraceAsString()."\n";
-		exit($e->getCode() ? $e->getCode() : 9999);		// allways give a non-zero exit code
-	}
 	// regular GUI exception
-	elseif (!isset($GLOBALS['egw_info']['flags']['no_exception_handler']))
+	if (!isset($GLOBALS['egw_info']['flags']['no_exception_handler']))
 	{
 		$message = '<h3>'.$headline."</h3>\n".
 			'<pre><b>'.$e->getMessage()."</b>\n\n";
diff --git a/setup/inc/class.setup_cmd.inc.php b/setup/inc/class.setup_cmd.inc.php
index 0b68a14a65..82d2bfe0db 100644
--- a/setup/inc/class.setup_cmd.inc.php
+++ b/setup/inc/class.setup_cmd.inc.php
@@ -25,7 +25,7 @@ abstract class setup_cmd extends admin_cmd
 	/**
 	 * Should be called by every command usually requiring header admin rights
 	 *
-	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
+	 * @throws egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 */
 	protected function _check_header_access()
 	{
@@ -41,7 +41,7 @@ abstract class setup_cmd extends admin_cmd
 		if ($this->header_secret != $secret)
 		{
 			//echo "_check_header_access: header_secret='$this->header_secret' != '$secret'=_calc_header_secret({$GLOBALS['egw_info']['server']['header_admin_user']},{$GLOBALS['egw_info']['server']['header_admin_password']})\n";
-			throw new Exception (lang('Wrong credentials to access the header.inc.php file!'),2);
+			throw new egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'),2);
 		}
 
 	}
diff --git a/setup/inc/class.setup_cmd_header.inc.php b/setup/inc/class.setup_cmd_header.inc.php
index 03de2cf75c..a934fa4c2c 100644
--- a/setup/inc/class.setup_cmd_header.inc.php
+++ b/setup/inc/class.setup_cmd_header.inc.php
@@ -48,9 +48,8 @@ class setup_cmd_header extends setup_cmd
 		//echo __CLASS__.'::__construct()'; _debug_array($domain);
 		admin_cmd::__construct($sub_command);
 
-		// header is 2 levels lower then this command in setup/inc
-		$this->header_path = realpath(dirname(__FILE__).'/../../header.inc.php');
-
+		// header is 3 levels lower then this command in setup/inc
+		$this->header_path = dirname(dirname(dirname(__FILE__))).'/header.inc.php';
 		$this->setup_header =& new setup_header();
 	}
 
@@ -68,7 +67,7 @@ class setup_cmd_header extends setup_cmd
 		{
 			return true;	// can only check locally
 		}
-		if (!file_exists($this->header_path))
+		if (!file_exists($this->header_path) || filesize($this->header_path) < 200)	// redirect header in rpms is ~150 byte
 		{
 			if ($this->sub_command != 'create')
 			{
@@ -126,10 +125,11 @@ class setup_cmd_header extends setup_cmd
 		{
 			echo $header;	// for cli, we echo the header
 		}
-		if (file_exists($this->header_path) && is_writable($this->header_path) || is_writable(dirname($this->header_path)))
+		if (file_exists($this->header_path) && is_writable($this->header_path) || is_writable(dirname($this->header_path)) ||
+			function_exists('posix_getuid') && !posix_getuid())	// root has all rights
 		{
 			if (is_writable(dirname($this->header_path)) && file_exists($this->header_path)) unlink($this->header_path);
-			if (($f = fopen($this->header_path,'wb')) && fwrite($f,$header))
+			if (($f = fopen($this->header_path,'wb')) && ($w=fwrite($f,$header)))
 			{
 				fclose($f);
 				return lang('header.inc.php successful written.');
diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php
index 5f0fb3b1ef..def3150ff8 100755
--- a/setup/inc/class.setup_process.inc.php
+++ b/setup/inc/class.setup_process.inc.php
@@ -207,16 +207,24 @@ class setup_process
 		$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
 
 		$current_config['site_title'] = 'eGroupWare';
-		$current_config['hostname']  = $_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : 'localhost';
+		$current_config['hostname']  = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
 
 		// guessing the eGW url
-		$parts = explode('/',$_SERVER['PHP_SELF']);
-		array_pop($parts);	// remove config.php
-		array_pop($parts);	// remove setup
-		$current_config['webserver_url'] = implode('/',$parts);
-		$egroupwareDirName = end($parts);
-
-		if(!$is_windows) {
+		if (isset($_SERVER['HTTP_HOST']))
+		{
+			$parts = explode('/',$_SERVER['PHP_SELF']);
+			array_pop($parts);	// remove config.php
+			array_pop($parts);	// remove setup
+			$current_config['webserver_url'] = implode('/',$parts);
+			$egroupwareDirName = end($parts);
+		}
+		else	// eg. cli install --> use defaults
+		{
+			$current_config['webserver_url'] = '/egroupware';
+			$egroupwareDirName = 'egroupware';
+		}
+		if(!$is_windows) 
+		{
 			if(@is_dir('/tmp'))
 			{
 				$current_config['temp_dir'] = '/tmp';
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index 6cb1b1e017..a84705b9d2 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -22,7 +22,7 @@ elseif ($_SERVER['argc'] > 1)
 	$arguments = $_SERVER['argv'];
 	array_shift($arguments);
 	$action = array_shift($arguments);
-	list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
+	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
 }
 else
 {

From aff7c9ef3493fbc86fee07f770d992275d85c93b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 30 May 2009 20:23:30 +0000
Subject: [PATCH 386/510] propset Id


From f14596e3b0519433bfe9a24df59b677f85c04310 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 31 May 2009 08:14:00 +0000
Subject: [PATCH 387/510] remove not used/needed css

---
 setup/templates/default/head.tpl | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl
index c5d3c1a0fa..9bb1a079ef 100644
--- a/setup/templates/default/head.tpl
+++ b/setup/templates/default/head.tpl
@@ -13,36 +13,6 @@
 		<link rel="icon" href="../phpgwapi/templates/default/images/favicon.ico" type="image/x-ico" />
 		<link rel="shortcut icon" href="../phpgwapi/templates/default/images/favicon.ico" />
 		<link href="../phpgwapi/templates/idots/css/idots.css" type="text/css" rel="stylesheet" />
-		<!--
-		{css}
-		-->
-
-		<style type="text/css">
-			<!--
-			.row_on { color: #000000; background-color: #eeeeee; }
-			.row_off { color: #000000; background-color: #e8f0f0; }
-			.th
-			{
-				color: #000000;
-				background-color: #cccccc;
-				font-weight:bold;
-				font-size:120%;
-			}
-
-			td
-			{
-				line-height:170%;
-			}
-
-			/* some styles specially for setup */
-			#tbl_manage_header td
-			{
-				vertical-align: top;
-				padding-bottom: 3px;
-				padding-left: 5px;
-			}
-			-->
-		</style>
 
 		<!--{java_script}-->
 

From 8a66799414ffd1d400fbc634370f295f24123167 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 31 May 2009 08:15:11 +0000
Subject: [PATCH 388/510] get exit codes for setup-cli working again (was
 broken in 1.6)

---
 setup/inc/class.setup_cmd.inc.php |  2 +-
 setup/setup-cli.php               | 32 +++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/setup/inc/class.setup_cmd.inc.php b/setup/inc/class.setup_cmd.inc.php
index 82d2bfe0db..de855e6020 100644
--- a/setup/inc/class.setup_cmd.inc.php
+++ b/setup/inc/class.setup_cmd.inc.php
@@ -41,7 +41,7 @@ abstract class setup_cmd extends admin_cmd
 		if ($this->header_secret != $secret)
 		{
 			//echo "_check_header_access: header_secret='$this->header_secret' != '$secret'=_calc_header_secret({$GLOBALS['egw_info']['server']['header_admin_user']},{$GLOBALS['egw_info']['server']['header_admin_password']})\n";
-			throw new egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'),2);
+			throw new egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'),5);
 		}
 
 	}
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index a84705b9d2..d1171a6a2c 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -49,7 +49,7 @@ $GLOBALS['egw_setup']->system_charset = $charset;
 
 if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
 {
-	fail(98,lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version));
+	throw new egw_exception_wrong_userinput(lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version),98);
 }
 
 switch($action)
@@ -246,7 +246,7 @@ function do_backup($arg,$quite_check=false)
 			}
 			else	// backup failed ==> dont start the upgrade
 			{
-				fail(50,lang('Backup failed').': '.$f);
+				throw new egw_exception_wrong_userinput(lang('Backup failed').': '.$f,50);
 			}
 		}
 	}
@@ -561,12 +561,32 @@ function list_exit_codes()
 	error_reporting(error_reporting() & ~E_NOTICE);
 
 	$codes = array('Ok');
-	foreach(file(__FILE__) as $n => $line)
+	$setup_dir = EGW_SERVER_ROOT.'/setup/';
+	//$files = array('setup-cli.php');
+	foreach(scandir($setup_dir.'/inc') as $file)
 	{
-		if (preg_match('/fail\(([0-9]+),(.*)\);/',$line,$matches))
+		if (substr($file,0,strlen('class.setup_cmd')) == 'class.setup_cmd')
 		{
-			//echo "Line $n: $matches[1]: $matches[2]\n";
-			@eval('$codes['.$matches[1].'] = '.$matches[2].';');
+			$files[] = 'inc/'.$file;
+		}
+	}
+	foreach($files as $file)
+	{
+		$content = file_get_contents($setup_dir.'/'.$file);
+
+		if (preg_match_all('/throw new (egw_exception[a-z_]*)\((.*),([0-9]+)\);/m',$content,$matches))
+		{
+			//echo $file.":\n"; print_r($matches);
+			foreach($matches[3] as $key => $code)
+			{
+				//if (isset($codes[$code])) echo "$file redifines #$code: {$codes[$code]}\n";
+
+				$src = $matches[2][$key];
+				$src = preg_replace('/self::\$[a-z_>-]/i',"''",$src);	// gives fatal error otherwise
+				@eval($src='$codes['.$code.'] = '.$src.';');
+				//echo "- codes[$code] => '{$codes[$code]}'\n";
+			}
+			//echo $file.":\n"; print_r($codes);
 		}
 	}
 	ksort($codes,SORT_NUMERIC);

From bf7e7889cfe6e7513672b76b45e7bf0052072d67 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 31 May 2009 09:51:57 +0000
Subject: [PATCH 389/510] if header is a symlink --> work on it's target

---
 setup/inc/class.setup_cmd_header.inc.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setup/inc/class.setup_cmd_header.inc.php b/setup/inc/class.setup_cmd_header.inc.php
index a934fa4c2c..91b7349088 100644
--- a/setup/inc/class.setup_cmd_header.inc.php
+++ b/setup/inc/class.setup_cmd_header.inc.php
@@ -50,6 +50,16 @@ class setup_cmd_header extends setup_cmd
 
 		// header is 3 levels lower then this command in setup/inc
 		$this->header_path = dirname(dirname(dirname(__FILE__))).'/header.inc.php';
+
+		// if header is a symlink --> work on it's target
+		if (is_link($this->header_path))
+		{
+			$this->header_path = readlink($this->header_path);
+			if ($this->header_path[0] != '/' && $this->header_path[1] != ':')
+			{
+				$this->header_path = dirname(dirname(dirname(__FILE__))).'/'.$this->header_path;
+			}
+		}
 		$this->setup_header =& new setup_header();
 	}
 

From 2d7f5720cd9c323915a4d0e597c9d6c52c5facbf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 31 May 2009 09:54:08 +0000
Subject: [PATCH 390/510] - implemented header-updates - dont give fatal error,
 if everything is up to date, but config is missing - always patch existing
 password back into the header - docu update

---
 doc/rpm-build/rpm_post_install.php | 94 ++++++++++++++++++++++++------
 1 file changed, 77 insertions(+), 17 deletions(-)

diff --git a/doc/rpm-build/rpm_post_install.php b/doc/rpm-build/rpm_post_install.php
index 81307df5b2..7ebc31dc74 100755
--- a/doc/rpm-build/rpm_post_install.php
+++ b/doc/rpm-build/rpm_post_install.php
@@ -161,26 +161,67 @@ else
 	// --> existing install --> update
 
 	// get user from header and replace password, as we dont know it
-	$header = file_get_contents($config['header']);
-	if (!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_user'] = '")."([^']+)';/m",$header,$matches))
-	{
-		bail_out(1,$config['header']." is no regular EGroupware header.inc.php!");
-	}
-	$tmp_header= preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '")."([^']+)';/m",
-		"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$config['config_passwd']."';",$header);
-	file_put_contents($config['header'],$tmp_header);
+	$old_password = patch_header($config['header'],$config['config_user'],$config['config_passwd']);
+	// register a shutdown function to put old password back in any case
+	register_shutdown_function('patch_header',$config['header'],$config['config_user'],$old_password);
 
 	// update egroupware
 	$setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd']);
-	run_cmd($setup_update);
+	$ret = run_cmd($setup_update,$output,array(4,15));
 
-	// restore original header
-	file_put_contents($config['header'],$header);
+	switch($ret)
+	{
+		case 4:		// header needs an update
+			$header_update = $setup_cli.' --update-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']);
+			run_cmd($header_update);
+			$ret = run_cmd($setup_update,$output,15);
+			if ($ret != 15) break;
+			// fall through
+		case 15:	// missing configuration (eg. mailserver)
+			if (!$verbose) echo implode("\n",(array)$output)."\n";
+			break;
 
-	echo "EGroupware successful updated\n";
+		case 0:
+			echo "\nEGroupware successful updated\n";
+			break;
+	}
+	exit($ret);
 }
 
-function run_cmd($cmd,array &$output=null)
+/**
+ * Patches a given password (for header admin) into the EGroupware header.inc.php and returns the old one
+ *
+ * @param string $filename
+ * @param string &$user username on return(!)
+ * @param string $password new password
+ * @return string old password
+ */
+function patch_header($filename,&$user,$password)
+{
+	$header = file_get_contents($filename);
+
+	if (!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_user'] = '")."([^']+)';/m",$header,$umatches) ||
+		!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '")."([^']*)';/m",$header,$pmatches))
+	{
+		bail_out(99,"$filename is no regular EGroupware header.inc.php!");
+	}
+	file_put_contents($filename,preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '")."([^']*)';/m",
+		"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$password."';",$header));
+
+	$user = $umatches[1];
+
+	return $pmatches[1];
+}
+
+/**
+ * Runs given shell command, exists with error-code after echoing the output of the failed command (if not already running verbose)
+ *
+ * @param string $cmd
+ * @param array &$output=null $output of command
+ * @param int|array $no_bailout=null exit code(s) to NOT bail out
+ * @return int exit code of $cmd
+ */
+function run_cmd($cmd,array &$output=null,$no_bailout=null)
 {
 	global $verbose;
 
@@ -194,9 +235,19 @@ function run_cmd($cmd,array &$output=null)
 		$output[] = $cmd;
 		exec($cmd,$output,$ret);
 	}
-	if ($ret) bail_out($ret,$verbose?null:$output);
+	if ($ret && !in_array($ret,(array)$no_bailout))
+	{
+		bail_out($ret,$verbose?null:$output);
+	}
+	return $ret;
 }
 
+/**
+ * Stop programm execution with a given exit code and optional extra message
+ *
+ * @param int $ret=1
+ * @param array|string $output line(s) to output before temination notice
+ */
 function bail_out($ret=1,$output=null)
 {
 	if ($output) echo implode("\n",(array)$output);
@@ -229,10 +280,15 @@ function randomstring($len=16)
 	return $str;
 }
 
+/**
+ * Give usage information and an optional error-message, before stoping program execution with exit-code 90 or 0
+ *
+ * @param string $error=null optional error-message
+ */
 function usage($error=null)
 {
 	global $prog,$config;
-	
+
 	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
 	echo "options and their defaults:\n";
 	foreach($config as $name => $default)
@@ -240,6 +296,10 @@ function usage($error=null)
 		if (in_array($name,array('config_passwd','db_pass','admin_passwd'))) $default = '<16 char random string>';
 		echo '--'.str_pad($name,20).$default."\n";
 	}
-	if ($error) echo "$error\n\n";
-	exit(1);
+	if ($error)
+	{
+		echo "$error\n\n";
+		exit(90);
+	}
+	exit(0);
 }

From b65c8fbf610f1c5c9432109bd8d909269869ce4b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 1 Jun 2009 11:53:03 +0000
Subject: [PATCH 391/510] new script to build egroupware archives

---
 doc/rpm-build/build-egw-rpms.sh           | 155 ----------
 doc/rpm-build/checkout-build-archives.php | 347 ++++++++++++++++++++++
 2 files changed, 347 insertions(+), 155 deletions(-)
 delete mode 100755 doc/rpm-build/build-egw-rpms.sh
 create mode 100755 doc/rpm-build/checkout-build-archives.php

diff --git a/doc/rpm-build/build-egw-rpms.sh b/doc/rpm-build/build-egw-rpms.sh
deleted file mode 100755
index d10e52b552..0000000000
--- a/doc/rpm-build/build-egw-rpms.sh
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash -x
-# This script work for generating rpms without Root rights
-# When you create rmp's with Root rights and you have as example
-# the follow command rm -rf / in your script you are in trouble :-)
-#
-# Change the path names for ANONCVSDIR and RHBASE to you needs.
-#
-# When you would create daily rpm's with update from CVS include
-# delete the # sign at the start from the follow lines
-#
-# cd $ANONCVSDIR
-# cvs update -Pd
-# This scipt create auotmaticly signed rpm's
-# When you don't want signed rpm's change the follow line from
-#
-# rpmbuild -bb --sign egroupware-rh.spec             >> $LOGFILE 2>&1
-#
-# to
-# rpmbuild -bb egroupware-rh.spec                    >> $LOGFILE 2>&1
-#
-# in the script
-# How to create GPG keys to sign your rpm's you will found in a seperate
-# Document
-#
-# Script changed 2004 May 21 Reiner Jung
-# Script changed 2005 Apr 15 by Ralf Becker and Wim Bonis
-# 2005 Sep 20 Ralf Becker: disabled fedora 2 build
-
-#SVNURL="http://svn.egroupware.org/egroupware/branches/1.6/"
-#SVNURL="http://svn.egroupware.org/egroupware/tags/1.6pre1/"
-SVNURL="http://svn.egroupware.org/egroupware/trunk/"
-
-SPECFILE="egroupware-1.6.spec"
-SOURCEFILES="egroupware_fedora.tar.bz2 egroupware_suse.tar.bz2 manageheader.php.patch class.uiasyncservice.inc.php.patch"
-
-CONTRIB="gallery icalsrv mydms"
-EXTRAPACKAGES="egw-pear $CONTRIB"
-for p in $EXTRAPACKAGES
-do
-   EXCLUDE_CONTRIB="$EXCLUDE_CONTRIB --exclude=egroupware/$p"
-   ONLY_CONTRIB="$ONLY_CONTRIB egroupware/$p"
-done
-
-PACKAGENAME=`grep "%define packagename" $SPECFILE | cut -f3 -d' '`
-VERSION=`grep "%define egwversion" $SPECFILE | cut -f3 -d' '`
-PACKAGING=`grep "%define packaging" $SPECFILE | cut -f3 -d' '`
-
-HOMEBUILDDIR=`whoami`
-ANONCVSDIR=/tmp/build_root/egw_buildroot-svn
-NOSVNDIR=/tmp/build_root/egw_buildroot
-RHBASE=$HOME/rpm
-SRCDIR=$RHBASE/SOURCES
-SPECDIR=$RHBASE/SPECS
-LOGFILE=$RHBASE/LOG/build-$PACKAGENAME-$VERSION.$PACKAGING.log
-VIRUSSCAN=$SPECDIR/clamav_scan-$PACKAGENAME-$VERSION.$PACKAGING.log
-MD5SUM=$SRCDIR/md5sum-$PACKAGENAME-$VERSION.$PACKAGING.txt
-
-mkdir -p $RHBASE/SOURCES $RHBASE/SPECS $RHBASE/BUILD $RHBASE/SRPMS $RHBASE/RPMS $RHBASE/LOG $ANONCVSDIR $NOSVNDIR
-
-cp *.spec $RHBASE/SPECS/
-cp $SOURCEFILES $RHBASE/SOURCES/
-echo "Starting build process of - $PACKAGENAME $VERSION"                     		>  $LOGFILE
-echo ""											>> $LOGFILE 2>&1
-date                                                        				>> $LOGFILE 2>&1
-cd $ANONCVSDIR
-
-if [ ! -d egroupware/phpgwapi ]	# new checkout
-then
-	if [ -z "$SVNREVISION" ]; then
-		echo -n "Creating a new checkout ... "					>> $LOGFILE 2>&1
-		svn checkout $SVNURL"aliases/default" ./
-	else
-		echo -n "Creating a new checkout for revision $SVNREVISION ... "	>> $LOGFILE 2>&1
-		svn checkout -r $SVNREVISION $SVNURL"aliases/default" ./
-	fi
-
-	cd egroupware
-	for CONTRIBMODULE in $CONTRIB; do
-		if [ -z "$CONTRIB_SVNREVISION" ]; then
-			svn checkout $SVNURL"$CONTRIBMODULE"
-		else
-			svn checkout -r $SVNREVISION $SVNURL"$CONTRIBMODULE"
-		fi
-	done
-else
-	[ -z "$SVNREVISION" ] && SVNREVISION=HEAD
-	echo -n "Updating existing checkout ... "					>> $LOGFILE 2>&1
-	cd egroupware
-	svn update -r $SVNREVISION . *
-fi
-
-cd $ANONCVSDIR
-
-echo "done"										>> $LOGFILE 2>&1
-
-echo -n "Change directory rights back ... "		>> $LOGFILE 2>&1
-chmod -R u=rwX,g=rX,o=rX .						>> $LOGFILE 2>&1
-chmod +x egroupware/*/*cli.php egroupware/phpgwapi/cron/*.php	>> $LOGFILE 2>&1
-echo "done"										>> $LOGFILE 2>&1
-
-echo -n "Starting anti virus scan ... "							>> $LOGFILE 2>&1
-test -x /usr/bin/clamscan && /usr/bin/clamscan --quiet -r $ANONCVSDIR --log=$VIRUSSCAN
-echo "done"										>> $LOGFILE 2>&1
-
-rm -rf $NOSVNDIR/egroupware
-cp -ra $ANONCVSDIR/egroupware $NOSVNDIR
-find $NOSVNDIR -name .svn | xargs rm -rf
-
-cd $NOSVNDIR
-echo -n "building tar.gz ... "								>> $LOGFILE 2>&1
-tar --owner=root --group=root -czf $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING.tar.gz $EXCLUDE_CONTRIB egroupware  	2>&1 | tee -a $LOGFILE
-for CONTRIBMODULE in $EXTRAPACKAGES; do
-	tar --owner=root --group=root -czf $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING.tar.gz egroupware/$CONTRIBMODULE 		>> $LOGFILE 2>&1
-done
-echo "done"										>> $LOGFILE 2>&1
-
-echo -n "building tar.bz2 ... "						     		>> $LOGFILE 2>&1
-tar --owner=root --group=root -cjf $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING.tar.bz2 $EXCLUDE_CONTRIB egroupware	>> $LOGFILE 2>&1
-for CONTRIBMODULE in $EXTRAPACKAGES; do
-	tar --owner=root --group=root -cjf $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING.tar.bz2 egroupware/$CONTRIBMODULE 		>> $LOGFILE 2>&1
-done
-echo "done"										>> $LOGFILE 2>&1
-
-echo -n "building zip ... "								>> $LOGFILE 2>&1
-for CONTRIBMODULE in $EXTRAPACKAGES; do
-	zip -q -r -9 $SRCDIR/$PACKAGENAME-$CONTRIBMODULE-$VERSION.$PACKAGING.zip egroupware/$CONTRIBMODULE 	>> $LOGFILE 2>&1
-done
-rm -rf $ONLY_CONTRIB >> $LOGFILE 2>&1
-zip -q -r -9 $SRCDIR/$PACKAGENAME-$VERSION.$PACKAGING.zip egroupware >> $LOGFILE 2>&1
-echo "done"										>> $LOGFILE 2>&1
-
-echo "Building tar.gz, tar.bz and zip archives finnished"				>> $LOGFILE 2>&1
-
-echo "------------------------------------------"              				>> $LOGFILE 2>&1
-echo "Create the md5sum file for tar.gz, tar.bz, zip ($MD5SUM)"				>> $LOGFILE 2>&1
-echo "------------------------------------------"              				>> $LOGFILE 2>&1
-
-cd $SRCDIR
-for f in eGroupware*-$VERSION.$PACKAGING.*
-do
-	md5sum $f >> $MD5SUM 2>&1
-done
-
-echo "sign the md5sum file"													>> $LOGFILE 2>&1
-rm -f $MD5SUM.asc															>> $LOGFILE 2>&1
-gpg --local-user packager@egroupware.org --clearsign $MD5SUM				>> $LOGFILE 2>&1
-
-echo "delete the original md5sum file"										>> $LOGFILE 2>&1
-rm -rf $MD5SUM			  	 												>> $LOGFILE 2>&1
-
-echo "------------------------------------------"              				>> $LOGFILE 2>&1
-echo "End Create md5sum of tar.gz, tar.bz, zip"              				>> $LOGFILE 2>&1
-echo "------------------------------------------"              				>> $LOGFILE 2>&1
-
-echo "Building of $PACKAGENAME $VERSION finnished"							>> $LOGFILE 2>&1
diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
new file mode 100755
index 0000000000..23b45315e0
--- /dev/null
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -0,0 +1,347 @@
+#!/usr/bin/php -qC
+<?php
+/**
+ * EGroupware - checkout and build EGroupware tgz
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author RalfBecker@outdoor-training.de
+ * @version $Id$
+ */
+
+if (isset($_SERVER['HTTP_HOST']))	// security precaution: forbit calling setup-cli as web-page
+{
+	die('<h1>checkout-build-tgz.php must NOT be called as web-page --> exiting !!!</h1>');
+}
+
+$verbose = 0;
+$config = array(
+	'packagename' => 'eGroupware',
+	'version' => 'trunk',				// '1.6'
+	'packaging' => date('Ymd'),			// '001'
+	'egwdir' => 'egroupware',
+	'svndir' => '/tmp/build_root/egw_buildroot-svn',
+	'egw_buildroot' => '/tmp/build_root/egw_buildroot',
+	'sourcedir' => '~/rpm/SOURCES',
+	'svnbase' => 'http://svn.egroupware.org/egroupware',
+	'svnbranch' => 'trunk',				// 'branches/1.6' or 'tags/1.6.001'
+	'svnalias' => 'aliases/default',	// default alias
+	'aliasdir' => 'egroupware',			// directory created by the alias
+	'extra' => array('egw-pear','gallery','mydms','icalsrv'),
+	'types' => array('tar.bz2','tar.gz','zip'),
+	'svn' => '/usr/bin/svn',
+	'clamscan' => '/usr/bin/clamscan',
+	'freshclam' => '/usr/bin/freshclam',
+	'skip' => array(),
+	'run' => array('checkout','copy','virusscan','create','sign')
+);
+
+// process config from command line
+$argv = $_SERVER['argv'];
+$prog = array_shift($argv);
+
+while(($arg = array_shift($argv)))
+{
+	if ($arg == '-v' || $arg == '--verbose')
+	{
+		++$verbose;
+	}
+	elseif($arg == '-h' || $arg == '--help')
+	{
+		usage();
+	}
+	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	{
+		$value = array_shift($argv);
+		switch($name)
+		{
+			case 'extra':	// stored as array and allow to add/delete items with +/- prefix
+			case 'types':
+			case 'skip':
+			case 'run':
+				if ($value[0] == '+')
+				{
+					$config[$name] = array_unique(array_merge($config['name'],split('[ ,]+',$value)));
+				}
+				elseif ($value[0] == '-')
+				{
+					$config[$name] = array_diff($config['name'],split('[ ,]+',$value));
+				}
+				else
+				{
+					$config[$name] = array_unique(split('[ ,]+',$value));
+				}
+				break;
+
+			default:
+				$config[$name] = $value;
+				break;
+		}
+	}
+	else
+	{
+		usage("Unknown argument '$arg'!");
+	}
+}
+if ($verbose > 1)
+{
+	echo "Using following config:\n";
+	print_r($config);
+}
+$svn = $config['svn'];
+
+foreach(array_diff($config['run'],$config['skip']) as $func)
+{
+	$func = 'do_'.$func;
+	$func();
+}
+
+/**
+ * Sign sha1sum file
+ */
+function do_sign()
+{
+	global $config,$verbose;
+
+	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	{
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+	}
+	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
+
+	if (!file_exists($sumsfile))
+	{
+		echo "sha1sum file '$sumsfile' not found!\n";
+		return;
+	}
+	// signing it
+	if (!file_exists('/usr/bin/gpg'))
+	{
+		echo "/usr/bin/gpg not found --> skipping signing sha1sum file!\n";
+		return;
+	}
+	echo "Signing sha1sum file:\n";
+	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
+	$cmd = '/usr/bin/gpg --local-user packager@egroupware.org --clearsign '.$sumsfile;
+	run_cmd($cmd);
+	unlink($sumsfile);	// delete the unsigned file
+}
+
+/**
+ * Create archives
+ */
+function do_create()
+{
+	global $config,$verbose;
+
+	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
+	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	{
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+	}
+	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
+	$sums = '';
+
+	chdir($config['egw_buildroot']);
+
+	if($config['extra'])
+	{
+		$exclude_extra = ' --exclude=egroupware/'.implode(' --exclude=egroupware/',$config['extra']);
+	}
+	foreach($config['types'] as $type)
+	{
+		echo "Creating $type archives\n";
+		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
+
+		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
+		switch($type)
+		{
+			case 'tar.bz2':
+			case 'tar.gz':
+				$cmd = '/bin/tar --owner=root --group=root -c'.$tar_type.'f '.$file.' '.$exclude_extra.' egroupware';
+				break;
+			case 'zip':
+				$cmd = '/bin/mv egroupware/'.implode(' egroupware/',$config['extra']).' . ;';
+				$cmd .= '/usr/bin/zip -q -r -9 '.$file.' egroupware ;';
+				$cmd .= '/bin/mv '.implode(' ',$config['extra']).' egroupware';
+				break;
+		}
+		run_cmd($cmd);
+		$sums .= sha1_file($file)."\t".basename($file)."\n";
+
+		foreach($config['extra'] as $module)
+		{
+			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$module.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
+			switch($type)
+			{
+				case 'tar.bz2':
+				case 'tar.gz':
+					$cmd = '/bin/tar --owner=root --group=root -c'.$tar_type.'f '.$file.' egroupware/'.$module;
+					break;
+				case 'zip':
+					$cmd = '/usr/bin/zip -q -r -9 '.$file.' egroupware/'.$module;
+					break;
+			}
+			run_cmd($cmd);
+			$sums .= sha1_file($file)."\t".basename($file)."\n";
+		}
+	}
+	// writing sha1sum file
+	file_put_contents($sumsfile,$sums);
+}
+
+/**
+ * Scan checkout for viruses, if clamscan is installed (not fatal if not!)
+ */
+function do_virusscan()
+{
+	global $config,$verbose;
+
+	if (!file_exists($config['clamscan']) || !is_executable($config['clamscan']))
+	{
+		echo "Virusscanner '$config[clamscan]' not found --> skipping virus scan!\n";
+		return;
+	}
+	// try updating virus database
+	if (file_exists($config['freshclam']))
+	{
+		echo "Updating virus signatures\n";
+		$cmd = '/usr/bin/sudo '.$config['freshclam'];
+		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
+		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
+	}
+	echo "Starting virusscan\n";
+	$cmd = $config['clamscan'].' --quiet -r '.$config['egw_buildroot'];
+	run_cmd($cmd);
+	echo "Virusscan successful (no viruses found).\n";
+}
+
+/**
+ * Copy non .svn parts to egw_buildroot and fix permissions and ownership
+ */
+function do_copy()
+{
+	global $config;
+
+	// copy everything, but .svn dirs from svndir to egw_buildroot
+	echo "Copying non-svn dirs to buildroot\n";
+	$cmd = '/usr/bin/rsync -r --delete --exclude .svn '.$config['svndir'].'/'.$config['aliasdir'].' '.$config['egw_buildroot'];
+	run_cmd($cmd);
+
+	// fix permissions
+	echo "Fixing permissions\n";
+	chdir($config['egw_buildroot'].'/'.$config['aliasdir']);
+	$cmd = '/bin/chmod -R a-x,u=rwX,g=rX,o=rX .';
+	run_cmd($cmd);
+	$cmd = '/bin/chmod +x */*cli.php phpgwapi/cron/*.php svn-helper.php';
+	run_cmd($cmd);
+}
+
+/**
+ * Checkout or update EGroupware
+ *
+ * Ensures an existing checkout is from the correct branch! Otherwise it get's deleted
+ */
+function do_checkout()
+{
+	global $config,$svn,$verbose;
+
+	echo "Starting svn checkout/update\n";
+	if (!file_exists($config['svndir']))
+	{
+		mkdir($config['svndir'],0755,true);
+	}
+	elseif (!is_dir($config['svndir']) || !is_writable($config['svndir']))
+	{
+		throw new Exception("svn checkout directory '{$config['svndir']} exists and is NO directory or NOT writable!");
+	}
+	chdir($config['svndir']);
+	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
+	if (file_exists($config['aliasdir']))
+	{
+		// check if correct branch
+		$cmd = 'LANG=C '.$svn.' info '.$config['aliasdir'];
+		exec($cmd,$output,$ret);
+		foreach($output as $line)
+		{
+			if ($ret || substr($line,0,5) == 'URL: ')
+			{
+				$url = substr($line,5);
+				if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+				{
+					echo "Checkout is of wrong branch --> deleting it\n";
+					system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
+					clearstatcache();
+				}
+				break;
+			}
+		}
+	}
+	$url = $svnbranch.'/'.$config['svnalias'];
+	$cmd = $svn.' co '.$url.' .';
+	run_cmd($cmd);
+
+	chdir($config['aliasdir']);
+	foreach($config['extra'] as $module)
+	{
+		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+		$url .= $module;
+		$cmd = $svn.' co '.$url;
+		run_cmd($cmd);
+	}
+}
+
+/**
+ * Runs given shell command, exists with error-code after echoing the output of the failed command (if not already running verbose)
+ *
+ * @param string $cmd
+ * @param array &$output=null $output of command
+ * @param int|array $no_bailout=null exit code(s) to NOT bail out
+ * @return int exit code of $cmd
+ */
+function run_cmd($cmd,array &$output=null,$no_bailout=null)
+{
+	global $verbose;
+
+	if ($verbose)
+	{
+		echo $cmd."\n";
+		system($cmd,$ret);
+	}
+	else
+	{
+		$output[] = $cmd;
+		exec($cmd,$output,$ret);
+	}
+	if ($ret && !in_array($ret,(array)$no_bailout))
+	{
+		if (!$verbose) echo implode("\n",$output)."\n";
+		throw new Exception("Error during '$cmd' --> aborting",$ret);
+	}
+	return $ret;
+}
+
+/**
+ * Give usage information and an optional error-message, before stoping program execution with exit-code 90 or 0
+ *
+ * @param string $error=null optional error-message
+ */
+function usage($error=null)
+{
+	global $prog,$config;
+
+	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
+	echo "options and their defaults:\n";
+	foreach($config as $name => $default)
+	{
+		if (is_array($default)) $default = implode(' ',$default);
+		echo '--'.str_pad($name,20).$default."\n";
+	}
+	if ($error)
+	{
+		echo "$error\n\n";
+		exit(90);
+	}
+	exit(0);
+}
+

From b8dbca81913f5d9a9163c119c32829a10b47bd88 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 1 Jun 2009 12:35:00 +0000
Subject: [PATCH 392/510] "- made package configurable - allow to use
 configuration in module names - check branch agains checkout dir not
 aliasdir"

---
 doc/rpm-build/checkout-build-archives.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index 23b45315e0..9f125618ee 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -32,6 +32,8 @@ $config = array(
 	'svn' => '/usr/bin/svn',
 	'clamscan' => '/usr/bin/clamscan',
 	'freshclam' => '/usr/bin/freshclam',
+	'gpg' => '/usr/bin/gpg',
+	'packager' => 'packager@egroupware.org',
 	'skip' => array(),
 	'run' => array('checkout','copy','virusscan','create','sign')
 );
@@ -115,14 +117,14 @@ function do_sign()
 		return;
 	}
 	// signing it
-	if (!file_exists('/usr/bin/gpg'))
+	if (empty($config['gpg']) || !file_exists($config['gpg']))
 	{
-		echo "/usr/bin/gpg not found --> skipping signing sha1sum file!\n";
+		if (!empty($config['gpg'])) echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
 		return;
 	}
 	echo "Signing sha1sum file:\n";
 	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
-	$cmd = '/usr/bin/gpg --local-user packager@egroupware.org --clearsign '.$sumsfile;
+	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
 	unlink($sumsfile);	// delete the unsigned file
 }
@@ -146,6 +148,10 @@ function do_create()
 
 	if($config['extra'])
 	{
+		foreach($config['extra'] as $key => $module)
+		{
+			if (strpos($module,'/') !== false) $config['extra'][$key] = basename($module);
+		}
 		$exclude_extra = ' --exclude=egroupware/'.implode(' --exclude=egroupware/',$config['extra']);
 	}
 	foreach($config['types'] as $type)
@@ -260,7 +266,7 @@ function do_checkout()
 	if (file_exists($config['aliasdir']))
 	{
 		// check if correct branch
-		$cmd = 'LANG=C '.$svn.' info '.$config['aliasdir'];
+		$cmd = 'LANG=C '.$svn.' info';
 		exec($cmd,$output,$ret);
 		foreach($output as $line)
 		{
@@ -284,6 +290,12 @@ function do_checkout()
 	chdir($config['aliasdir']);
 	foreach($config['extra'] as $module)
 	{
+		if (strpos($module,'$') !== false)	// allow to use config vars like $svnbranch in module
+		{
+			$translate = array();
+			foreach($config as $name => $value) $translate['$'.$name] = $value;
+			$module = strtr($module,$translate);
+		}
 		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
 		$cmd = $svn.' co '.$url;

From 608697c1d42b5ab2d3d193c995ef34a58783d0b0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 1 Jun 2009 18:32:41 +0000
Subject: [PATCH 393/510] fixed patch to match current class

---
 .../class.uiasyncservice.inc.php.patch        | 88 +++++++++----------
 1 file changed, 40 insertions(+), 48 deletions(-)

diff --git a/doc/rpm-build/class.uiasyncservice.inc.php.patch b/doc/rpm-build/class.uiasyncservice.inc.php.patch
index b55cdfa48e..f578dd397f 100644
--- a/doc/rpm-build/class.uiasyncservice.inc.php.patch
+++ b/doc/rpm-build/class.uiasyncservice.inc.php.patch
@@ -1,52 +1,44 @@
---- egroupware.orig/admin/inc/class.uiasyncservice.inc.php	2005-10-14 19:03:16.000000000 +0200
-+++ egroupware/admin/inc/class.uiasyncservice.inc.php	2006-03-09 21:37:20.000000000 +0100
-@@ -106,7 +106,7 @@
- 
- 			$last_run = $async->last_check_run();
- 			$lr_date = $last_run['end'] ? $GLOBALS['egw']->common->show_date($last_run['end']) : lang('never');
--			echo '<p><b>'.lang('Async services last executed').'</b>: '.$lr_date.' ('.$last_run['run_by'].")</p>\n<hr>\n";
-+			echo '<p><b>'. lang('Async services last executed'). '</b>: '. $lr_date. ' ('. $last_run['run_by']. ")</p>\n<hr>\n";
- 
- 			if (isset($_POST['asyncservice']) && $_POST['asyncservice'] != $GLOBALS['egw_info']['server']['asyncservice'])
+Index: egroupware/admin/inc/class.uiasyncservice.inc.php
+===================================================================
+--- egroupware/admin/inc/class.uiasyncservice.inc.php	(Revision 27137)
++++ egroupware/admin/inc/class.uiasyncservice.inc.php	(Arbeitskopie)
+@@ -96,16 +96,20 @@
+ 			$config->save_repository();
+ 			unset($config);
+ 		}
++/*
+ 		if (!$async->only_fallback)
+ 		{
+ 			$installed = $async->installed();
+ 			if (is_array($installed) && isset($installed['cronline']))
  			{
-@@ -116,16 +116,17 @@
- 				$config->save_repository();
- 				unset($config);
++*/
+ 				$async_use['cron'] = lang('crontab only (recomended)');
++/*
  			}
--			if (!$async->only_fallback)
-+
-+			/*if (!$async->only_fallback)
- 			{
- 				$installed = $async->installed();
- 				if (is_array($installed) && isset($installed['cronline']))
--				{
-+				{*/
- 					$async_use['cron'] = lang('crontab only (recomended)');
--				}
-+			/*	}
- 			}
- 			$async_use['']    = lang('fallback (after each pageview)');
--			$async_use['off'] = lang('disabled (not recomended)');
-+			$async_use['off'] = lang('disabled (not recomended)'); */
- 			echo '<p><b>'.lang('Run Asynchronous services').'</b>'.
- 				' <select name="asyncservice" onChange="this.form.submit();">';
- 			foreach ($async_use as $key => $label)
-@@ -147,8 +148,9 @@
- 			}
- 			else
- 			{
--				echo '<p>'.lang('Installed crontab').": \n";
-+				echo '<p>'.lang('Installed crontab').": /etc/cron.d/egroupware\n";
+ 		}
+ 		$async_use['']    = lang('fallback (after each pageview)');
+ 		$async_use['off'] = lang('disabled (not recomended)');
++*/
+ 		echo '<p><b>'.lang('Run Asynchronous services').'</b>'.
+ 			' <select name="asyncservice" onChange="this.form.submit();">';
+ 		foreach ($async_use as $key => $label)
+@@ -127,8 +131,9 @@
+ 		}
+ 		else
+ 		{
+-			echo '<p>'.lang('Installed crontab').": \n";
++			echo '<p>'.lang('Installed crontab').": /etc/cron.d/egroupware\n";
  
-+				/*
- 				if (is_array($installed) && isset($installed['cronline']))
- 				{
- 					echo "$installed[cronline]</p>";
-@@ -161,6 +163,7 @@
- 				{
- 					echo '<b>'.lang('asyncservices not yet installed or other error (%1) !!!',$installed['error'])."</b></p>\n";
- 				}
-+				*/
- 				echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n".
- 					lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n";
++/*
+ 			if (is_array($installed) && isset($installed['cronline']))
+ 			{
+ 				echo "$installed[cronline]</p>";
+@@ -143,6 +148,7 @@
  			}
+ 			echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n".
+ 				lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n";
++*/
+ 		}
+ 
+ 		echo "<hr><table border=0><tr>\n";

From af18ea1f7d4640c25cd0d3b6a980381aebb0c101 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 1 Jun 2009 19:13:48 +0000
Subject: [PATCH 394/510] "fix for bug #2106 - Addressbook warning message when
 deleting LDAP contact"

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

diff --git a/addressbook/inc/class.addressbook_so.inc.php b/addressbook/inc/class.addressbook_so.inc.php
index 239b294d87..0ff78328ed 100755
--- a/addressbook/inc/class.addressbook_so.inc.php
+++ b/addressbook/inc/class.addressbook_so.inc.php
@@ -259,7 +259,8 @@ class addressbook_so
 				$this->account_extra_search = array('uid');
 			}
 		}
-		if ($this->contact_repository == 'sql' || $this->contact_repository = 'sql-ldap') {
+		if ($this->contact_repository == 'sql' || $this->contact_repository == 'sql-ldap')
+		{
 			$tda2list = $this->db->get_table_definitions('phpgwapi','egw_addressbook2list');
 			$tdlists = $this->db->get_table_definitions('phpgwapi','egw_addressbook_lists');
 			$this->distributionlist_tabledef = array('fd' => array(
@@ -269,7 +270,7 @@ class addressbook_so
 					$this->distri_value => $tdlists['fd'][$this->distri_value],
 				), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(),
 			);
-		}  
+		}
 		// add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access,
 		// if he has not set the hide_accounts preference
 		// ToDo: be more specific for 'groupmembers', they should be able to see the groupmembers

From 9ce701cb1833077eea53b660240c63b66fb97913 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 1 Jun 2009 21:08:51 +0000
Subject: [PATCH 395/510] "- allow to use config vars in config vars, eg.
 'header'  => '$data_dir/header.inc.php' - use LANG from $_SERVER, if not set
 in $_ENV (happens somehow on openSUSE)"

---
 doc/rpm-build/rpm_post_install.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/rpm-build/rpm_post_install.php b/doc/rpm-build/rpm_post_install.php
index 7ebc31dc74..df9e482432 100755
--- a/doc/rpm-build/rpm_post_install.php
+++ b/doc/rpm-build/rpm_post_install.php
@@ -18,8 +18,8 @@ $config = array(
 	'php'         => '/usr/bin/php',
 	'source_dir'  => '/usr/share/egroupware',
 	'data_dir'    => '/var/lib/egroupware',
-	'header'      => '/var/lib/egroupware/header.inc.php',	// symlinked to source_dir by rpm
-	'setup-cli'   => '/usr/share/egroupware/setup/setup-cli.php',
+	'header'      => '$data_dir/header.inc.php',	// symlinked to source_dir by rpm
+	'setup-cli'   => '$source_dir/setup/setup-cli.php',
 	'domain'      => 'default',
 	'config_user' => 'admin',
 	'config_passwd'   => randomstring(),
@@ -42,8 +42,9 @@ $config = array(
 	'start_webserver' => '/etc/init.d/httpd',
 	'autostart_webserver' => '/sbin/chkconfig --level 3 httpd on',
 );
+
 // read language from LANG enviroment variable
-if (($lang = $_ENV['LANG']))
+if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG']))
 {
 	list($lang,$nat) = split('[_.]',$lang);
 	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
@@ -75,6 +76,16 @@ while(($arg = array_shift($argv)))
 		usage("Unknown argument '$arg'!");
 	}
 }
+
+$replace = array();
+foreach($config as $name => $value)
+{
+	$replace['$'.$name] = $value;
+	if (strpos($value,'$') !== false)
+	{
+		$config[$name] = strtr($value,$replace);
+	}
+}
 // basic config checks
 foreach(array('php','source_dir','data_dir','setup-cli') as $name)
 {

From ce882c3e641421dadb58cc6fe5b89fe81022ed09 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 1 Jun 2009 22:05:07 +0000
Subject: [PATCH 396/510] "- detecting source dir - --suse opton to set suse
 defaults (default is red hat)"

---
 doc/rpm-build/rpm_post_install.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/rpm-build/rpm_post_install.php b/doc/rpm-build/rpm_post_install.php
index df9e482432..7b0b4fa822 100755
--- a/doc/rpm-build/rpm_post_install.php
+++ b/doc/rpm-build/rpm_post_install.php
@@ -38,9 +38,9 @@ $config = array(
 	'lang'        => 'en',	// languages for admin user and extra lang to install
 	'charset'     => 'utf-8',
 	'start_db'    => '/etc/init.d/mysqld',
-	'autostart_db' => '/sbin/chkconfig --level 3 mysqld on',
+	'autostart_db' => '/sbin/chkconfig --level 345 mysqld on',
 	'start_webserver' => '/etc/init.d/httpd',
-	'autostart_webserver' => '/sbin/chkconfig --level 3 httpd on',
+	'autostart_webserver' => '/sbin/chkconfig --level 345 httpd on',
 );
 
 // read language from LANG enviroment variable
@@ -53,6 +53,8 @@ if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG']))
 	}
 	$config['lang'] = $lang;
 }
+$config['source_dir'] = dirname(dirname(dirname(__FILE__)));
+
 // read config from command line
 $argv = $_SERVER['argv'];
 $prog = array_shift($argv);
@@ -67,6 +69,14 @@ while(($arg = array_shift($argv)))
 	{
 		usage();
 	}
+	elseif($arg == '--suse')
+	{
+		$config['php'] = '/usr/bin/php5';
+		$config['start_db'] = '/etc/init.d/mysql';
+		$config['autostart_db'] = '/sbin/chkconfig --level 345 mysql on';
+		$config['start_webserver'] = '/etc/init.d/apache2';
+		$config['autostart_webserver'] = '/sbin/chkconfig --level 345 apach2 on';
+	}
 	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
 	{
 		$config[$name] = array_shift($argv);
@@ -300,7 +310,7 @@ function usage($error=null)
 {
 	global $prog,$config;
 
-	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
+	echo "Usage: $prog [-h|--help] [-v|--verbose] [--suse] [options, ...]\n\n";
 	echo "options and their defaults:\n";
 	foreach($config as $name => $default)
 	{

From 1fc84471d4506fbf8276d3f71517229a7e52b42c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 3 Jun 2009 08:27:27 +0000
Subject: [PATCH 397/510] "Fixed not working async wrapper under SUSE ($_ENV is
 NOT set)"

---
 phpgwapi/cron/asyncwrapper.php | 48 ++++++++++++++--------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/phpgwapi/cron/asyncwrapper.php b/phpgwapi/cron/asyncwrapper.php
index 868ac08ffd..60aff1ac8f 100644
--- a/phpgwapi/cron/asyncwrapper.php
+++ b/phpgwapi/cron/asyncwrapper.php
@@ -1,33 +1,23 @@
+#!/usr/bin/php -qC
 <?php
-	/**************************************************************************\
-	* eGroupWare API - Timed Asynchron Services for eGroupWare                 *
-	* Written by Lars Kneschke <l.kneschke@metaways.de>                        *
-	* This script executes the asyncservice for all domains                    *
-	* -------------------------------------------------------------------------*
-	* This library is part of the eGroupWare API                               *
-	* http://www.egroupware.org/                                               *
-	* ------------------------------------------------------------------------ *
-	* This library is free software; you can redistribute it and/or modify it  *
-	* under the terms of the GNU Lesser General Public License as published by *
-	* the Free Software Foundation; version 2.1 of the License.                *
-	* This library is distributed in the hope that it will be useful, but      *
-	* WITHOUT ANY WARRANTY; without even the implied warranty of               *
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
-	* See the GNU Lesser General Public License for more details.              *
-	* You should have received a copy of the GNU Lesser General Public License *
-	* along with this library; if not, write to the Free Software Foundation,  *
-	* Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
-	\**************************************************************************/
+/**
+ * API - run Timed Asynchron Services for all EGroupware domain/instances
+ *
+ * @link http://www.egroupware.org
+ * @author Lars Kneschke
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @access public
+ * @version $Id$
+ */
 
-	/* $Id$ */
+$path_to_egroupware = realpath(dirname(__FILE__).'/../..');	//  need to be adapted if this script is moved somewhere else
+$php = isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_'];
 
-	$path_to_egroupware = realpath(dirname(__FILE__).'/../..');	//  need to be adapted if this script is moved somewhere else
-	
-	$headerIncPHP = file($path_to_egroupware. '/header.inc.php');
-	
-	foreach($headerIncPHP as $line) {
-		if(preg_match("/GLOBALS\['egw_domain']\['(.*)']/", $line, $matches)) {
-			system($_ENV["_"]. ' -q -d memory_limit=16M '.$path_to_egroupware.'/phpgwapi/cron/asyncservices.php '. $matches[1]);
-		}
+foreach(file($path_to_egroupware. '/header.inc.php') as $line)
+{
+	if(preg_match("/GLOBALS\['egw_domain']\['(.*)']/", $line, $matches))
+	{
+		system($php. ' -q -d memory_limit=32M '.$path_to_egroupware.'/phpgwapi/cron/asyncservices.php '. $matches[1]);
 	}
-?>
\ No newline at end of file
+}

From 6776235671a5c01315b5e90693923e6e9f0b61a0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 4 Jun 2009 13:57:16 +0000
Subject: [PATCH 398/510] "fixed wrong order of private column in csv import"

---
 addressbook/csv_import.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index 06e38080bc..d34b214ce8 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -271,6 +271,10 @@ switch($_POST['action'])
 
 		$log = '<table border="1" style="border: 1px dotted black; border-collapse: collapse;">'."\n\t<tr><td>#</td>\n";
 
+		if (!in_array('private',$addr_fields))	// autocreate public access if not set by user
+		{
+			$log .= "\t\t<td><b>private</b></td>\n";
+		}
 		foreach($addr_fields as $csv_idx => $addr)
 		{	// convert $_POST['trans'][$csv_idx] into array of pattern => value
 			// if (!$_POST['debug']) echo "<p>$csv_idx: ".$csv_fields[$csv_idx].": $addr".($_POST['trans'][$csv_idx] ? ': '.$_POST['trans'][$csv_idx] : '')."</p>";
@@ -296,10 +300,6 @@ switch($_POST['action'])
 			}
 			$log .= "\t\t<td><b>$addr</b></td>\n";
 		}
-		if (!in_array('private',$addr_fields))	// autocreate public access if not set by user
-		{
-			$log .= "\t\t<td><b>private</b></td>\n";
-		}
 		$start = $_POST['start'] < 1 ? 1 : $_POST['start'];
 
 		// ignore empty lines, is_null($fields[0]) is returned on empty lines !!!

From a1299aff046d6bf28b89ff1f15479dc8f4d837e2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 7 Jun 2009 15:24:29 +0000
Subject: [PATCH 399/510] "flatten values first (some selectbox values are
 given multi-dimensional), causing eg. default for notifications not being
 displayed"

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

diff --git a/preferences/inc/class.uisettings.inc.php b/preferences/inc/class.uisettings.inc.php
index db70d069ea..87c9b92be3 100755
--- a/preferences/inc/class.uisettings.inc.php
+++ b/preferences/inc/class.uisettings.inc.php
@@ -542,6 +542,15 @@
 			}
 			if($GLOBALS['type'] == 'user' && $GLOBALS['egw']->preferences->default[$_appname][$name])
 			{
+				// flatten values first (some selectbox values are given multi-dimensional)
+				foreach($values as $id => $val)
+				{
+					if (is_array($val))
+					{
+						unset($values[$id]);
+						$values += $val;
+					}
+				}
 				$defs = array();
 				foreach(explode(',',$GLOBALS['egw']->preferences->default[$_appname][$name]) as $def)
 				{

From f601537b956cec41037181e54a7e05171de0a38d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 7 Jun 2009 15:49:12 +0000
Subject: [PATCH 400/510] fix for php5.3, which by default seems NOT include
 content of $_COOKIE in $_REQUEST (request_order php.ini variable)

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

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index 5ad87b7f1f..46e653abb7 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -736,6 +736,10 @@ class egw_session
 		{
 			$sessionid = $_REQUEST[self::EGW_SESSION_NAME];
 		}
+		elseif(!$only_basic_auth && isset($_COOKIE[self::EGW_SESSION_NAME]))
+		{
+			$sessionid = $_COOKIE[self::EGW_SESSION_NAME];
+		}
 		else
 		{
 			$sessionid = false;

From 9965d89a0f35c84175fab2e98653c6af27ed4745 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 7 Jun 2009 16:28:43 +0000
Subject: [PATCH 401/510] removed not (longer) needed files

---
 doc/modernize.php | 219 ----------------------------------------------
 1 file changed, 219 deletions(-)
 delete mode 100755 doc/modernize.php

diff --git a/doc/modernize.php b/doc/modernize.php
deleted file mode 100755
index 2660f813b1..0000000000
--- a/doc/modernize.php
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/php -qC
-<?php
-/**************************************************************************\
-* eGroupWare - Tool to modernize the eGW code automaticaly                 *
-* http://www.eGroupWare.org                                                *
-* Written and (c) by Ralf Becker <RalfBecker@outdoor-training.de>          *
-* -------------------------------------------------------                  *
-*  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$ */
-
-error_reporting(E_ALL & ~ E_NOTICE);
-
-// defaults
-$no_phpgw = $do_replace = false;
-$remove_space_indention = 2;	// replace 2 space with a tab
-
-while ($argc > 2)
-{
-	switch($argv[1])
-	{
-		case '--no-phpgw':
-			$no_phpgw = true;
-			break;
-			
-		case '--remove-space-indention':
-			$remove_space_indention = (int) $argv[2];
-			array_shift($argv);
-			--$argc;
-			break;
-			
-		case '--replace':
-			$do_replace = true;
-			break;
-		
-		default:
-			$argc = 0;	// invalid parameter ==> break the loop and give usage message
-			break;
-	}		
-	array_shift($argv);
-	--$argc;
-}
-	
-if ($argc != 2 || !file_exists($file = $argv[1])) 
-{
-	if ($argc == 2) echo "File '$file' not found !!!\n\n";
-	echo "Usage: modernize.php [--no-phpgw] [--remove-space-indention N] [--replace] <filename>\n";
-	echo "--no-phpgw dont change phpgw to egw, necessary for some API files\n";
-	echo "--remove-space-indention N substitute every N space at the beginning of a line with a tab (default 2)\n";
-	echo "--replace replaces the given file (plus creating a backup) instead of acting as filter\n\n";
-	exit;
-}
-
-if ($do_replace)
-{
-	if (!is_writable($file) && !is_writable(dirname($file)))
-	{
-		echo "'$file' is NOT writeable !!!\n";
-		exit;
-	}
-	$do_replace = $file;
-	$file .= '.bak';
-	if (is_writable(dirname($file)))
-	{
-		rename($do_replace,$file);
-	}
-	else	// only file is writable not the directory, so we cant create a backup
-	{
-		$file = $do_replace;
-	}
-	ob_start();
-}
-	
-
-// some code modernizations
-$modernize = array(
-	// saves an unnecessary copy
-	'= CreateObject'           => '=& CreateObject',
-	'= new'                    => '=& new',
-	// php5 cloning of the DB object
-	'= $GLOBALS[\'phpgw\']->db;' => '= clone($GLOBALS[\'egw\']->db);',
-	'= $this->db;'             => '= clone($this->db);',
-	// remove windows lineends (CR)
-	"\r"                       => '',
-);
-
-foreach(array('GET','POST','SERVER','SESSION') as $name)
-{
-	$modernize['$HTTP_'.$name.'_VARS'] = '$_'.$name;
-	$modernize['$GLOBALS[\'HTTP_'.$name.'_VARS\']'] = '$_'.$name;
-	$modernize['$GLOBALS["HTTP_'.$name.'_VARS"]'] = '$_'.$name;
-}
-
-if (!$no_phpgw)
-{
-	$modernize += array(
-		// phpGW --> eGW
-// done now separate as it is case sensitve		'PHPGW_'	               => 'EGW_',
-		'global $phpgw_info;'      => '',
-		'global $phpgw;'           => '',
-		'$GLOBALS[\'phpgw_info\']' => '$GLOBALS[\'egw_info\']',
-		'$GLOBALS["phpgw_info"]'   => '$GLOBALS[\'egw_info\']',
-		'$phpgw_info['             => '$GLOBALS[\'egw_info\'][',
-		'$GLOBALS[\'phpgw\']'      => '$GLOBALS[\'egw\']',
-		'$GLOBALS["phpgw"]'        => '$GLOBALS[\'egw\']',
-		'$phpgw->'                 => '$GLOBALS[\'egw\']->',
-		'common->phpgw_header'     => 'common->egw_header',
-		'common->phpgw_footer'     => 'common->egw_footer',
-		'common->phpgw_exit'       => 'common->egw_exit',
-		'common->phpgw_final'      => 'common->egw_final',
-	);
-}
-
-
-$modernize_from = array_keys($modernize);
-$modernize_to = array_values($modernize);
-
-$in_doc_block = false;
-foreach(file($file) as $n => $line)
-{
-	$func = function_exists('str_ireplace') ? 'str_ireplace' : 'str_replace';
-	$line = str_replace('PHPGW_','EGW_',$func($modernize_from,$modernize_to,$line));
-
-	if ($remove_space_indention)
-	{
-		while (preg_match("/^(\t*)".str_repeat(' ',$remove_space_indention).'/',$line))
-		{
-			$line = preg_replace("/^(\t*)".str_repeat(' ',$remove_space_indention).'/',"\\1\t",$line);
-		}
-	}
-	
-	if (!$in_doc_block) 
-	{
-		$parts = explode('/*!',$line);
-		if (count($parts) <= 1)
-		{
-			echo $line;
-			continue;
-		}
-		$in_doc_block = true;
-
-		list($indent,$rest) = $parts;
-		echo $indent."/**\n";
-		if (strlen($rest) <= 2)
-		{
-			continue;
-		}
-		$line = $indent.$rest;
-		
-		if (($one_line_block = strstr($line,'*/') !== false)) $line = str_replace('*/','',$line);
-	}
-	// now we are inside a comment-block
-
-	if (preg_match('/[ \t]*\*\//',$line))	// exiting the comment-block
-	{
-		$in_doc_block = false;
-		echo str_replace('*/',' */',$line);
-		continue;
-	}
-	if (preg_match('/^(.*)@([a-zA-Z]+) (.*)$/',$line,$parts))
-	{
-		list(,$indent,$cmd,$value) = $parts;
-		switch ($cmd)
-		{
-			// to ignore
-			case 'syntax':
-			case 'function':
-			case 'class':
-				break;
-			
-			case 'abstract':
-				echo $indent.' * '.$value."\n".$indent." *\n";
-				break;
-				
-			case 'discussion':
-			case 'example':
-			default:
-				echo $indent.' * '.$value."\n";
-				break;
-				
-			case 'result': 
-				$cmd = 'return';
-				// fall through
-			case 'param':
-			case 'return':
-			case 'var':
-			case 'author':
-			case 'copyright':
-			case 'licence':
-			case 'package':
-			case 'access':
-				echo $indent.' * @'.$cmd.' '.$value."\n";
-				break;
-		}
-	}
-	else
-	{
-		echo str_replace($indent,$indent.' * ',$line);
-	}
-	if ($one_line_block)
-	{
-		echo $indent." */\n";
-		$one_line_block = $in_doc_block = false;
-	}
-}
-
-if ($do_replace && ($f = fopen($do_replace,'wb')))
-{
-	fwrite($f,ob_get_contents());
-	fclose($f);
-}
-else
-{
-	ob_flush();
-}

From 35a2353a1ef883fff4b2bcc3dab40da09d00f974 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 7 Jun 2009 16:29:13 +0000
Subject: [PATCH 402/510] removed not (longer) needed files

---
 doc/SECURITY | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100755 doc/SECURITY

diff --git a/doc/SECURITY b/doc/SECURITY
deleted file mode 100755
index 553f1ec9c3..0000000000
--- a/doc/SECURITY
+++ /dev/null
@@ -1 +0,0 @@
-See the SECURITY in phpgwapi/doc
\ No newline at end of file

From c28be373a6d2b21abcb64dd17286bc02f61fa3e0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 8 Jun 2009 15:46:45 +0000
Subject: [PATCH 403/510] fixed wrong default parameter for $callback_params,
 call_user_func_array requires an empty array and not null (gives a fatal
 error under php5.3)

---
 phpgwapi/inc/class.egw_cache.inc.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index 8d4b77e49e..df06cecc3b 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -106,11 +106,11 @@ class egw_cache
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param callback $callback=null callback to get/create the value, if it's not cache
-	 * @param array $callback_params=null array with parameters for the callback
+	 * @param array $callback_params=array() array with parameters for the callback
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getCache($level,$app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	static public function getCache($level,$app,$location,$callback=null,array $callback_params=array(),$expiration=0)
 	{
 		switch($level)
 		{
@@ -183,11 +183,11 @@ class egw_cache
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param callback $callback=null callback to get/create the value, if it's not cache
-	 * @param array $callback_params=null array with parameters for the callback
+	 * @param array $callback_params=array() array with parameters for the callback
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getTree($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	static public function getTree($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
 	{
 		return self::getCache(self::TREE,$app,$location,$callback,$callback_params,$expiration);
 	}
@@ -224,11 +224,11 @@ class egw_cache
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param callback $callback=null callback to get/create the value, if it's not cache
-	 * @param array $callback_params=null array with parameters for the callback
+	 * @param array $callback_params=array() array with parameters for the callback
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getInstance($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	static public function getInstance($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
 	{
 		return self::getCache(self::INSTANCE,$app,$location,$callback,$callback_params,$expiration);
 	}
@@ -274,11 +274,11 @@ class egw_cache
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param callback $callback=null callback to get/create the value, if it's not cache
-	 * @param array $callback_params=null array with parameters for the callback
+	 * @param array $callback_params=array() array with parameters for the callback
 	 * @param int $expiration=0 expiration time in seconds, default 0 = never
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function &getSession($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	static public function &getSession($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
 	{
 		if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
 		{
@@ -344,11 +344,11 @@ class egw_cache
 	 * @param string $app application storing data
 	 * @param string $location location name for data
 	 * @param callback $callback=null callback to get/create the value, if it's not cache
-	 * @param array $callback_params=null array with parameters for the callback
+	 * @param array $callback_params=array() array with parameters for the callback
 	 * @param int $expiration=0 expiration time is NOT used for REQUEST!
 	 * @return mixed NULL if data not found in cache (and no callback specified)
 	 */
-	static public function getRequest($app,$location,$callback=null,array $callback_params=null,$expiration=0)
+	static public function getRequest($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
 	{
 		if (!isset(self::$request_cache[$app][$location]) && !is_null($callback))
 		{

From 232252475fee23eb006dff7b9878f91a2eb06538 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 8 Jun 2009 16:21:14 +0000
Subject: [PATCH 404/510] patch fixing many depricated functions (eg. posix
 regular expressions) and features, which fill up the error_log under php5.3
 (and will no longer be available under php6). Patch is mostly created by
 script in egroupware/doc/fix_depricated.php in separate commit. I do NOT
 advice to apply this patch to a production system (it's commited to trunk!),
 as the automatic modified regular expressions have a good change to break
 something ...

---
 addressbook/csv_import.php                    |  8 ++--
 .../inc/class.addressbook_groupdav.inc.php    |  4 +-
 .../inc/class.addressbook_ldap.inc.php        |  2 +-
 .../inc/class.addressbook_merge.inc.php       |  4 +-
 addressbook/inc/class.addressbook_so.inc.php  |  4 +-
 addressbook/inc/class.addressbook_sql.inc.php |  4 +-
 .../inc/class.addressbook_tracking.inc.php    |  2 +-
 addressbook/inc/class.addressbook_ui.inc.php  |  6 +--
 .../inc/class.addressbook_vcal.inc.php        |  2 +-
 addressbook/inc/hook_home.inc.php             |  2 +-
 admin/inc/class.admin_cmd.inc.php             |  6 +--
 admin/inc/class.admin_cmd_change_pw.inc.php   |  2 +-
 admin/inc/class.bocurrentsessions.inc.php     |  2 +-
 admin/inc/class.customfields.inc.php          |  2 +-
 admin/inc/class.uiaccounts.inc.php            |  2 +-
 admin/inc/class.uiconfig.inc.php              |  4 +-
 calendar/csv_import.php                       | 10 ++--
 calendar/inc/class.bocalendar.inc.php         |  2 +-
 calendar/inc/class.boholiday.inc.php          |  2 +-
 calendar/inc/class.calendar_ajax.inc.php      |  2 +-
 calendar/inc/class.calendar_groupdav.inc.php  |  4 +-
 calendar/inc/class.calendar_ical.inc.php      |  8 ++--
 calendar/inc/class.calendar_sif.inc.php       |  4 +-
 calendar/inc/class.calendar_so.inc.php        |  4 +-
 calendar/inc/class.sbox.inc.php               |  2 +-
 calendar/inc/class.soholiday.inc.php          |  2 +-
 doc/rpm-build/checkout-build-archives.php     |  2 +-
 doc/rpm-build/rpm_post_install.php            |  2 +-
 .../inc/class.advancedsearch_widget.inc.php   |  4 +-
 .../inc/class.ajax_select_widget.inc.php      |  2 +-
 etemplate/inc/class.date_widget.inc.php       | 10 ++--
 etemplate/inc/class.db_tools.inc.php          |  4 +-
 etemplate/inc/class.editor.inc.php            | 12 ++---
 etemplate/inc/class.etemplate.inc.php         |  8 ++--
 etemplate/inc/class.historylog_widget.inc.php |  4 +-
 etemplate/inc/class.link_widget.inc.php       |  6 +--
 etemplate/inc/class.nextmatch_widget.inc.php  |  8 ++--
 etemplate/inc/class.so_sql.inc.php            |  4 +-
 etemplate/inc/class.soetemplate.inc.php       |  8 ++--
 etemplate/inc/class.solangfile.inc.php        |  4 +-
 etemplate/inc/class.tab_widget.inc.php        |  6 +--
 etemplate/inc/class.tree_widget.inc.php       |  2 +-
 etemplate/inc/class.uietemplate_gtk.inc.php   | 46 +++++++++---------
 etemplate/inc/class.xmltool.inc.php           | 16 +++----
 etemplate/inc/class.xul_io.inc.php            | 42 ++++++++--------
 importexport/inc/class.uidefinitions.inc.php  | 12 ++---
 importexport/inc/class.uiexport.inc.php       |  2 +-
 infolog/csv_import.php                        |  6 +--
 infolog/inc/class.infolog_bo.inc.php          |  8 ++--
 .../inc/class.infolog_customfields.inc.php    |  2 +-
 infolog/inc/class.infolog_datasource.inc.php  |  4 +-
 infolog/inc/class.infolog_groupdav.inc.php    |  4 +-
 infolog/inc/class.infolog_hooks.inc.php       |  2 +-
 infolog/inc/class.infolog_ical.inc.php        |  8 ++--
 infolog/inc/class.infolog_sif.inc.php         | 12 ++---
 infolog/inc/class.infolog_so.inc.php          |  2 +-
 infolog/inc/class.infolog_ui.inc.php          |  4 +-
 infolog/inc/class.infolog_widget.inc.php      |  2 +-
 login.php                                     |  2 +-
 phpgwapi/inc/adodb/adodb-datadict.inc.php     |  2 +-
 phpgwapi/inc/adodb/adodb-pear.inc.php         |  4 +-
 phpgwapi/inc/adodb/adodb-perf.inc.php         |  4 +-
 phpgwapi/inc/adodb/adodb-time.inc.php         |  4 +-
 phpgwapi/inc/adodb/adodb-xmlschema.inc.php    |  4 +-
 phpgwapi/inc/adodb/adodb.inc.php              |  4 +-
 .../adodb/drivers/adodb-informix72.inc.php    |  2 +-
 phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php |  2 +-
 .../adodb/drivers/adodb-postgres64.inc.php    |  2 +-
 .../adodb/drivers/adodb-sybase_ase.inc.php    |  2 +-
 .../inc/adodb/session/adodb-encrypt-md5.php   |  4 +-
 phpgwapi/inc/class.accounts_sql.inc.php       |  2 +-
 phpgwapi/inc/class.acl.inc.php                |  2 +-
 phpgwapi/inc/class.asyncservice.inc.php       |  2 +-
 phpgwapi/inc/class.auth_ads.inc.php           |  2 +-
 phpgwapi/inc/class.auth_sql.inc.php           |  2 +-
 phpgwapi/inc/class.browser.inc.php            | 16 +++----
 phpgwapi/inc/class.common.inc.php             |  8 ++--
 phpgwapi/inc/class.contenthistory.inc.php     |  4 +-
 phpgwapi/inc/class.egw_db.inc.php             |  2 +-
 phpgwapi/inc/class.egw_framework.inc.php      |  2 +-
 phpgwapi/inc/class.egw_session.inc.php        |  4 +-
 phpgwapi/inc/class.error.inc.php              |  2 +-
 phpgwapi/inc/class.html.inc.php               |  8 ++--
 phpgwapi/inc/class.http.inc.php               |  2 +-
 phpgwapi/inc/class.interserver.inc.php        |  2 +-
 phpgwapi/inc/class.javascript.inc.php         |  2 +-
 phpgwapi/inc/class.jscalendar.inc.php         |  4 +-
 phpgwapi/inc/class.phpmailer.inc.php          |  4 +-
 phpgwapi/inc/class.soap_client.inc.php        |  4 +-
 phpgwapi/inc/class.soap_parser.inc.php        | 16 +++----
 phpgwapi/inc/class.soap_server.inc.php        | 10 ++--
 phpgwapi/inc/class.soapmsg.inc.php            |  8 ++--
 phpgwapi/inc/class.soapval.inc.php            |  4 +-
 phpgwapi/inc/class.validator.inc.php          |  4 +-
 phpgwapi/inc/class.vcard.inc.php              | 20 ++++----
 phpgwapi/inc/class.wsdl.inc.php               |  2 +-
 phpgwapi/inc/class.xml.inc.php                | 48 +++++++++----------
 phpgwapi/inc/class.xmlrpc_client.inc.php      | 14 +++---
 phpgwapi/inc/class.xmlrpc_server.inc.php      |  4 +-
 phpgwapi/inc/class.xmlrpc_server_epi.inc.php  |  6 +--
 phpgwapi/inc/class.xmlrpc_server_php.inc.php  | 10 ++--
 phpgwapi/inc/class.xmlrpcmsg.inc.php          | 10 ++--
 phpgwapi/inc/class.xmlrpcresp.inc.php         |  2 +-
 phpgwapi/inc/class.xmlrpcval.inc.php          |  2 +-
 phpgwapi/inc/common_functions.inc.php         | 18 +++----
 phpgwapi/inc/fpdf/tutorial/tuto6.php          |  2 +-
 phpgwapi/inc/functions.inc.php                |  5 +-
 phpgwapi/inc/horde/Horde/Browser/imode.php    |  3 +-
 phpgwapi/inc/horde/Horde/RPC.php              |  2 +-
 phpgwapi/inc/horde/Horde/RPC/syncml.php       |  6 +--
 phpgwapi/inc/horde/Horde/RPC/syncml_wbxml.php |  4 +-
 phpgwapi/inc/horde/Horde/SyncML.php           | 14 +++---
 phpgwapi/inc/horde/Horde/SyncML/Command.php   |  2 +-
 .../inc/horde/Horde/SyncML/Command/Alert.php  |  8 ++--
 .../inc/horde/Horde/SyncML/Command/Get.php    |  2 +-
 .../inc/horde/Horde/SyncML/Command/Map.php    |  2 +-
 .../inc/horde/Horde/SyncML/Command/Put.php    |  2 +-
 .../horde/Horde/SyncML/Command/Results.php    |  2 +-
 .../inc/horde/Horde/SyncML/Command/Sync.php   |  2 +-
 .../horde/Horde/SyncML/Command/Sync/Add.php   |  2 +-
 .../Horde/SyncML/Command/Sync/Delete.php      |  2 +-
 .../Horde/SyncML/Command/Sync/Replace.php     |  2 +-
 .../Horde/SyncML/Command/Sync/SyncElement.php |  2 +-
 phpgwapi/inc/horde/Horde/SyncML/State.php     |  8 ++--
 phpgwapi/inc/horde/Horde/SyncML/State_egw.php | 12 ++---
 phpgwapi/inc/horde/Horde/SyncML/Sync.php      | 12 ++---
 .../SyncML/Sync/RefreshFromServerSync.php     |  2 +-
 .../inc/horde/Horde/SyncML/Sync/SlowSync.php  |  2 +-
 .../horde/Horde/SyncML/Sync/TwoWaySync.php    |  6 +--
 phpgwapi/inc/horde/Horde/iCalendar.php        |  8 ++--
 phpgwapi/inc/horde/Horde/iCalendar/vcard.php  |  2 +-
 .../inc/horde/XML/WBXML/ContentHandler.php    |  2 +-
 phpgwapi/inc/horde/XML/WBXML/Decoder.php      |  8 ++--
 phpgwapi/inc/horde/XML/WBXML/Encoder.php      |  6 +--
 phpgwapi/inc/horde/lib/base.php               |  2 +-
 phpgwapi/inc/savant2/Savant2.php              |  8 ++--
 .../Savant2/Savant2_Compiler_basic.php        |  2 +-
 .../inc/savant2/Savant2/tests/1_assign.php    |  2 +-
 .../inc/savant2/Savant2/tests/2_display.php   |  2 +-
 .../inc/savant2/Savant2/tests/3_fetch.php     |  2 +-
 .../inc/savant2/Savant2/tests/4_plugins.php   |  2 +-
 .../inc/savant2/Savant2/tests/5_filters.php   |  2 +-
 .../inc/savant2/Savant2/tests/6_paths.php     |  2 +-
 .../inc/savant2/Savant2/tests/7_include.php   |  2 +-
 .../inc/savant2/Savant2/tests/8_extend.php    |  2 +-
 .../inc/savant2/Savant2/tests/9_errors.php    |  2 +-
 .../inc/savant2/Savant2/tests/compile.php     |  4 +-
 phpgwapi/inc/savant2/Savant2/tests/form.php   |  2 +-
 phpgwapi/inc/savant2/Savant2/tests/form2.php  |  2 +-
 .../tests/templates/compile_bad.tpl.php       |  2 +-
 phpgwapi/inc/xml_functions.inc.php            | 12 ++---
 phpgwapi/setup/tables_update_1_4.inc.php      |  4 +-
 .../idots/class.idots_framework.inc.php       |  8 ++--
 preferences/inc/class.ajaxpreferences.inc.php |  2 +-
 .../inc/class.resources_select_widget.inc.php |  2 +-
 setup/inc/class.setup_cmd_header.inc.php      |  4 +-
 setup/inc/class.setup_cmd_install.inc.php     |  2 +-
 setup/inc/class.setup_html.inc.php            |  2 +-
 setup/inc/functions.inc.php                   |  2 +-
 setup/lang.php                                |  2 +-
 setup/manageheader.php                        |  2 +-
 setup/setup-cli.php                           |  2 +-
 soap.php                                      |  4 +-
 timesheet/fix_lost_links.php                  |  4 +-
 .../inc/class.timesheet_datasource.inc.php    |  2 +-
 timesheet/inc/class.timesheet_ui.inc.php      |  4 +-
 xajax.php                                     |  4 +-
 xmlrpc.php                                    |  4 +-
 168 files changed, 441 insertions(+), 439 deletions(-)

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index d34b214ce8..4091409d94 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -92,7 +92,7 @@ function cat_id($cats)
 		return '';
 	}
 	$ids = array();
-	foreach(split(' *[,;] *',$cats) as $cat)
+	foreach(preg_split('/ *[,;] */',$cats) as $cat)
 	{
 		if (is_numeric($cat) && $GLOBALS['egw']->categories->id2name($cat) != '--')
 		{
@@ -330,8 +330,8 @@ switch($_POST['action'])
 					{
 						if(ereg((string) $pattern,$val))
 						{
-							// echo "<p>csv_idx='$csv_idx',info='$addr',trans_csv=".print_r($trans_csv).",ereg_replace('$pattern','$replace','$val') = ";
-							$val = ereg_replace((string) $pattern,str_replace($VPre,'\\',$replace),(string) $val);
+							// echo "<p>csv_idx='$csv_idx',info='$addr',trans_csv=".print_r($trans_csv).",preg_replace('/$pattern/','$replace','$val') = ";
+							$val = preg_replace('/'.(string) $pattern.'/',str_replace($VPre,'\\',$replace),(string) $val);
 							// echo "'$val'</p>";
 
 							$reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
@@ -377,7 +377,7 @@ switch($_POST['action'])
 				if (isset($values[$date]) && !is_numeric($date))
 				{
 					// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
-					$values[$date] = ereg_replace('([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})','\3-\2-\1',$values[$date]);
+					$values[$date] = preg_replace('/([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})/','\3-\2-\1',$values[$date]);
 					// remove fractures of seconds if present at the end of the string
 					if (ereg('(.*)\.[0-9]+',$values[$date],$parts)) $values[$date] = $parts[1];
 					$values[$date] = strtotime($values[$date]);
diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index cd0bb6056b..9c9275bafc 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -57,7 +57,7 @@ class addressbook_groupdav extends groupdav_handler
 	{
 		parent::__construct($app,$debug,$base_uri);
 
-		$this->bo =& new addressbook_bo();
+		$this->bo = new addressbook_bo();
 		//$this->starttime = microtime(true);	    
 	}
 
@@ -310,7 +310,7 @@ class addressbook_groupdav extends groupdav_handler
 	 */
 	private function _get_handler()
 	{
-		$handler =& new addressbook_vcal();
+		$handler = new addressbook_vcal();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 
 		return $handler;
diff --git a/addressbook/inc/class.addressbook_ldap.inc.php b/addressbook/inc/class.addressbook_ldap.inc.php
index fff1a49a34..06b2826dff 100644
--- a/addressbook/inc/class.addressbook_ldap.inc.php
+++ b/addressbook/inc/class.addressbook_ldap.inc.php
@@ -936,7 +936,7 @@ class addressbook_ldap
 			return $this->_error(__LINE__);	// baseDN does NOT exist and we cant/wont create it
 		}
 		// create a admin connection to add the needed DN
-		$adminLDAP =& new ldap;
+		$adminLDAP = new ldap;
 		$adminDS = $adminLDAP->ldapConnect();
 
 		list(,$ou) = explode(',',$baseDN);
diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index dadfe45238..48506e7a12 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -35,7 +35,7 @@ class addressbook_merge	// extends bo_merge
 	 */
 	function __construct()
 	{
-		$this->contacts =& new addressbook_bo();
+		$this->contacts = new addressbook_bo();
 	}
 
 	/**
@@ -131,7 +131,7 @@ class addressbook_merge	// extends bo_merge
 	function calendar_replacements($id,$last_event_too=false)
 	{
 		require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.calendar_boupdate.inc.php');
-		$calendar =& new calendar_boupdate();
+		$calendar = new calendar_boupdate();
 
 		// next events
 		$events = $calendar->search(array(
diff --git a/addressbook/inc/class.addressbook_so.inc.php b/addressbook/inc/class.addressbook_so.inc.php
index 0ff78328ed..e99a39a5ab 100755
--- a/addressbook/inc/class.addressbook_so.inc.php
+++ b/addressbook/inc/class.addressbook_so.inc.php
@@ -217,7 +217,7 @@ class addressbook_so
 		if($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
 		{
 			$this->contact_repository = 'ldap';
-			$this->somain =& new addressbook_ldap();
+			$this->somain = new addressbook_ldap();
 
 			if ($this->user)	// not set eg. in setup
 			{
@@ -236,7 +236,7 @@ class addressbook_so
 			{
 				$this->contact_repository = 'sql-ldap';
 			}
-			$this->somain =& new addressbook_sql();
+			$this->somain = new addressbook_sql();
 
 			if ($this->user)	// not set eg. in setup
 			{
diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 30c602cea8..57c0d43831 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -516,7 +516,7 @@ class addressbook_sql extends so_sql
 		if ($this->db->select($this->lists_table,'list_id',array(
 			'list_name' => $name,
 			'list_owner' => $owner,
-		),__LINE__,__FILE__)->fetchSingle())
+		),__LINE__,__FILE__)->fetchColumn())
 		{
 			return true;	// return existing list-id
 		}
@@ -551,7 +551,7 @@ class addressbook_sql extends so_sql
 		if ($this->db->select($this->ab2list_table,'list_id',array(
 			'contact_id' => $contact,
 			'list_id' => $list,
-		),__LINE__,__FILE__)->fetchSingle())
+		),__LINE__,__FILE__)->fetchColumn())
 		{
 			return true;	// no need to insert it, would give sql error
 		}
diff --git a/addressbook/inc/class.addressbook_tracking.inc.php b/addressbook/inc/class.addressbook_tracking.inc.php
index d5cba6b78c..916448c01e 100644
--- a/addressbook/inc/class.addressbook_tracking.inc.php
+++ b/addressbook/inc/class.addressbook_tracking.inc.php
@@ -92,7 +92,7 @@ class addressbook_tracking extends bo_tracking
 			case 'copy':
 				if ($data['is_contactform'])
 				{
-					return split(', ?',$data['email_contactform']);
+					return preg_split('/, ?/',$data['email_contactform']);
 				}
 				break;
 
diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index b4d1b0b932..48faa8af8c 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -421,7 +421,7 @@ class addressbook_ui extends addressbook_bo
 		$query['filter2'] = (int)$list;
 		$this->action($email_type,array(),true,$success,$failed,$action_msg,$query,$msg);
 
-		$response =& new xajaxResponse();
+		$response = new xajaxResponse();
 
 		if ($success) $response->addScript($GLOBALS['egw']->js->body['onLoad']);
 
@@ -1497,7 +1497,7 @@ class addressbook_ui extends addressbook_bo
 			'n_suffix' => $n_suffix,
 			'org_name' => $org_name,
 		);
-		$response =& new xajaxResponse();
+		$response = new xajaxResponse();
 		$response->addScript("setOptions('".addslashes(implode("\b",$this->fileas_options($names)))."');");
 
 		return $response->getXML();
@@ -2003,7 +2003,7 @@ $readonlys['button[vcard]'] = true;
 			return lang("Document '%1' does not exist or is not readable for you!",$document);
 		}
 		require_once(EGW_INCLUDE_ROOT.'/addressbook/inc/class.addressbook_merge.inc.php');
-		$document_merge =& new addressbook_merge();
+		$document_merge = new addressbook_merge();
 
 		return $document_merge->download($document,$ids);
 	}
diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index cd0970352f..8a718a8973 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -64,7 +64,7 @@ class addressbook_vcal extends addressbook_bo
 	{
 		require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php');
 
-		$vCard =& new Horde_iCalendar_vcard;
+		$vCard = new Horde_iCalendar_vcard;
 		
 		if(!is_array($this->supportedFields)) {
 			$this->setSupportedFields();
diff --git a/addressbook/inc/hook_home.inc.php b/addressbook/inc/hook_home.inc.php
index abe1ddd6fe..d0ea313c0c 100644
--- a/addressbook/inc/hook_home.inc.php
+++ b/addressbook/inc/hook_home.inc.php
@@ -15,7 +15,7 @@ if ($GLOBALS['egw_info']['user']['apps']['addressbook'] &&
 
 	if (!(int) $days) $days = 1;	// old pref
 
-	$contacts =& new addressbook_bo();
+	$contacts = new addressbook_bo();
 
 	$month_start = date('*-m-*',$contacts->now_su);
 	$bdays =& $contacts->search(array('bday' => $month_start),array('id','n_family','n_given','bday'),'n_given,n_family');
diff --git a/admin/inc/class.admin_cmd.inc.php b/admin/inc/class.admin_cmd.inc.php
index 7747fd51f6..15043050dc 100644
--- a/admin/inc/class.admin_cmd.inc.php
+++ b/admin/inc/class.admin_cmd.inc.php
@@ -487,7 +487,7 @@ abstract class admin_cmd
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	protected function __set($property,$value)
+	function __set($property,$value)
 	{
 		$this->data[$property] = $value;
 	}
@@ -497,7 +497,7 @@ abstract class admin_cmd
 	 *
 	 * @param string $property
 	 */
-	protected function __unset($property)
+	function __unset($property)
 	{
 		unset($this->data[$property]);
 	}
@@ -795,7 +795,7 @@ abstract class admin_cmd
 			return admin_cmd::run_queued_jobs();
 		}
 		include_once(EGW_API_INC.'/class.asyncservice.inc.php');
-		$async =& new asyncservice();
+		$async = new asyncservice();
 		
 		// we cant use this class as callback, as it's abstract and ExecMethod used by the async service instanciated the class!
 		list($app) = explode('_',$class=$next['type']);
diff --git a/admin/inc/class.admin_cmd_change_pw.inc.php b/admin/inc/class.admin_cmd_change_pw.inc.php
index 939c9c1b29..211ea10777 100644
--- a/admin/inc/class.admin_cmd_change_pw.inc.php
+++ b/admin/inc/class.admin_cmd_change_pw.inc.php
@@ -50,7 +50,7 @@ class admin_cmd_change_pw extends admin_cmd
 		
 		if ($check_only) return true;
 		
-		$auth =& new auth;
+		$auth = new auth;
 		
 		if (!$auth->change_password(null, $this->password, $account_id))
 		{
diff --git a/admin/inc/class.bocurrentsessions.inc.php b/admin/inc/class.bocurrentsessions.inc.php
index 06a6fd8034..814b7d4b34 100644
--- a/admin/inc/class.bocurrentsessions.inc.php
+++ b/admin/inc/class.bocurrentsessions.inc.php
@@ -33,7 +33,7 @@
 			{
 				if (ereg('@',$value['session_lid']))
 				{
-					$t = split('@',$value['session_lid']);
+					$t = explode('@',$value['session_lid']);
 					$session_lid = $t[0];
 				}
 				else
diff --git a/admin/inc/class.customfields.inc.php b/admin/inc/class.customfields.inc.php
index 4eb1594743..0276abd154 100644
--- a/admin/inc/class.customfields.inc.php
+++ b/admin/inc/class.customfields.inc.php
@@ -230,7 +230,7 @@ class customfields
 			{
 				foreach(explode("\n",$field['values']) as $line)
 				{
-					list($var,$value) = split('=',trim($line),2);
+					list($var,$value) = explode('=',trim($line),2);
 					$var = trim($var);
 					$values[$var] = empty($value) ? $var : $value;
 				}
diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 70e0c108b0..dcc160d26f 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -1583,7 +1583,7 @@
 
 		function ajax_check_account_email($first,$last,$account_lid,$account_id,$email,$id)
 		{
-			$response =& new xajaxResponse();
+			$response = new xajaxResponse();
 			if (!$email)
 			{
 				$response->addAssign('email','value',$GLOBALS['egw']->common->email_address($first,$last,$account_lid));
diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php
index 5aec610fd6..9c0f8b8c7f 100644
--- a/admin/inc/class.uiconfig.inc.php
+++ b/admin/inc/class.uiconfig.inc.php
@@ -108,7 +108,7 @@
 						}
 					}
 					/* don't erase passwords, since we also don't print them */
-					elseif(!ereg('passwd',$key) && !ereg('password',$key) && !ereg('root_pw',$key))
+					elseif(strpos($key,'passwd') === false && strpos($key,'password') === false && strpos($key,'root_pw') === false)
 					{
 						unset($c->config_data[$key]);
 					}
@@ -181,7 +181,7 @@
 					case 'value':
 						$newval = str_replace(' ','_',$newval);
 						/* Don't show passwords in the form */
-						if(ereg('passwd',$value) || ereg('password',$value) || ereg('root_pw',$value))
+						if(strpos($value,'passwd') !== false || strpos($value,'password') !== false || strpos($value,'root_pw') !== false)
 						{
 							$t->set_var($value,'');
 						}
diff --git a/calendar/csv_import.php b/calendar/csv_import.php
index 317f793db4..bdb66695f4 100644
--- a/calendar/csv_import.php
+++ b/calendar/csv_import.php
@@ -104,7 +104,7 @@ function cat_id($cats)
 		return '';
 	}
 
-	foreach(split('[,;]',$cats) as $cat)
+	foreach(preg_split('/[,;]/',$cats) as $cat)
 	{
 		if (isset($cat2id[$cat]))
 		{
@@ -374,8 +374,8 @@ case 'import':
 				{
 					if (ereg((string) $pattern,$val))
 					{
-						//echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",ereg_replace('$pattern','$replace','$val') = ";
-						$val = ereg_replace((string) $pattern,str_replace($VPre,'\\',$replace),(string) $val);
+						//echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",preg_replace('/$pattern/','$replace','$val') = ";
+						$val = preg_replace('/'.(string) $pattern.'/',str_replace($VPre,'\\',$replace),(string) $val);
 						//echo "'$val'";
 
 						$reg = $CPreReg.'([a-zA-Z_0-9 ]+)'.$CPosReg;
@@ -440,14 +440,14 @@ case 'import':
 				if (isset($values[$date]) && !is_numeric($date))
 				{
 					// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
-					$values[$date] = ereg_replace('([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})','\3-\2-\1',$values[$date]);
+					$values[$date] = preg_replace('/([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})/','\3-\2-\1',$values[$date]);
 					// remove fractures of seconds if present at the end of the string
 					if (ereg('(.*)\.[0-9]+',$values[$date],$parts)) $values[$date] = $parts[1];
 					$values[$date] = strtotime($values[$date]);
 				}
 			}
 			// convert participants-names to user-id's
-			$parts = $values['participants'] ? split('[,;]',$values['participants']) : array();
+			$parts = $values['participants'] ? preg_split('/[,;]/',$values['participants']) : array();
 			$values['participants'] = array();
 			foreach($parts as $part_status)
 			{
diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
index 66236cba0a..cb8d0f095a 100755
--- a/calendar/inc/class.bocalendar.inc.php
+++ b/calendar/inc/class.bocalendar.inc.php
@@ -35,7 +35,7 @@ class bocalendar
 
 	function __construct()
 	{
-		$this->cal =& new calendar_boupdate();
+		$this->cal = new calendar_boupdate();
 
 		if (is_object($GLOBALS['server']) && $GLOBALS['server']->simpledate)
 		{
diff --git a/calendar/inc/class.boholiday.inc.php b/calendar/inc/class.boholiday.inc.php
index f541d84931..58be3188f0 100755
--- a/calendar/inc/class.boholiday.inc.php
+++ b/calendar/inc/class.boholiday.inc.php
@@ -301,7 +301,7 @@
 				// reading the holidayfile from egroupware.org via network::gethttpsocketfile contains all the headers!
 				foreach($lines as $n => $line)
 				{
-					$fields = split("[\t\n ]+",$line);
+					$fields = preg_split("/[\t\n ]+/",$line);
 
 					if ($fields[0] == 'charset' && $fields[1])
 					{
diff --git a/calendar/inc/class.calendar_ajax.inc.php b/calendar/inc/class.calendar_ajax.inc.php
index 8e2f16eaf9..a76b0aa21f 100644
--- a/calendar/inc/class.calendar_ajax.inc.php
+++ b/calendar/inc/class.calendar_ajax.inc.php
@@ -52,7 +52,7 @@ class calendar_ajax {
 
 		$conflicts=$this->calendar->update($event);
 
-		$response =& new xajaxResponse();
+		$response = new xajaxResponse();
 		if(!is_array($conflicts))
 		{
 			$response->addRedirect('');
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 00db6f0bce..b9b78e2836 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -47,7 +47,7 @@ class calendar_groupdav extends groupdav_handler
 	{
 		parent::__construct($app,$debug,$base_uri);
 
-		$this->bo =& new calendar_boupdate();
+		$this->bo = new calendar_boupdate();
 	}
 
 	const PATH_ATTRIBUTE = 'id';
@@ -425,7 +425,7 @@ class calendar_groupdav extends groupdav_handler
 	 */
 	private function _get_handler()
 	{
-		$handler =& new calendar_ical();
+		$handler = new calendar_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 		if ($this->debug > 1) error_log("ical Handler called:" . $this->agent);
 		return $handler;
diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 22555f2c66..ab46449f65 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -145,7 +145,7 @@ class calendar_ical extends calendar_boupdate
 			$palm_enddate_workaround=True;
 		}
 
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		$vcal->setAttribute('PRODID','-//eGroupWare//NONSGML eGroupWare Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION',$version);
@@ -516,7 +516,7 @@ class calendar_ical extends calendar_boupdate
 	{
 		// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
 		$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		if(!$vcal->parsevCalendar($_vcalData))
 		{
 			return FALSE;
@@ -1331,7 +1331,7 @@ class calendar_ical extends calendar_boupdate
 		// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
 		$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
 
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		if(!$vcal->parsevCalendar($_vcalData))
 		{
 			return FALSE;
@@ -1662,7 +1662,7 @@ class calendar_ical extends calendar_boupdate
 	{
 		if (!$end) $end = $this->now_su + 100*DAY_s;	// default next 100 days
 
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		$vcal->setAttribute('PRODID','-//eGroupWare//NONSGML eGroupWare Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION','2.0');
diff --git a/calendar/inc/class.calendar_sif.inc.php b/calendar/inc/class.calendar_sif.inc.php
index f47a8ef9e6..85c1338a8e 100644
--- a/calendar/inc/class.calendar_sif.inc.php
+++ b/calendar/inc/class.calendar_sif.inc.php
@@ -84,7 +84,7 @@ class calendar_sif extends calendar_boupdate
 	}
 
 	function siftoegw($_sifdata) {
-		$vcal		= &new Horde_iCalendar;
+		$vcal		= new Horde_iCalendar;
 		$finalEvent	= array();
 		$sysCharSet	= $GLOBALS['egw']->translation->charset();
 		$sifData	= base64_decode($_sifdata);
@@ -324,7 +324,7 @@ class calendar_sif extends calendar_boupdate
 
 		if($event = $this->read($_id,null,false,'server')) {
 			$sysCharSet	= $GLOBALS['egw']->translation->charset();
-			$vcal		= &new Horde_iCalendar;
+			$vcal		= new Horde_iCalendar;
 
 
 			$sifEvent = '<appointment>';
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 26ecc626e1..8d07d90ce9 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -583,7 +583,7 @@ ORDER BY cal_user_type, cal_usre_id
 			if ($set_recurrences)
 			{
 				// delete all, but the lowest dates record
-				$min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchSingle();
+				$min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
 
 				$this->db->delete($this->dates_table,array(
 					'cal_id' => $cal_id,
@@ -657,7 +657,7 @@ ORDER BY cal_user_type, cal_usre_id
 		}
 		if (is_null($etag))
 		{
-			$etag = $this->db->select($this->cal_table,'cal_etag',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetchSingle();
+			$etag = $this->db->select($this->cal_table,'cal_etag',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
 		}
 		return $cal_id;
 	}
diff --git a/calendar/inc/class.sbox.inc.php b/calendar/inc/class.sbox.inc.php
index 58038b6c40..c641087742 100644
--- a/calendar/inc/class.sbox.inc.php
+++ b/calendar/inc/class.sbox.inc.php
@@ -265,7 +265,7 @@
 				"group" => "Group public"
 			);
 
-			if (ereg(",", $selected))
+			if (strpos($selected,",") !== false)
 			{
 				$selected = "group";
 			}
diff --git a/calendar/inc/class.soholiday.inc.php b/calendar/inc/class.soholiday.inc.php
index 15d5f6c274..442d9d8a62 100755
--- a/calendar/inc/class.soholiday.inc.php
+++ b/calendar/inc/class.soholiday.inc.php
@@ -192,7 +192,7 @@ class soholiday
 			echo 'HOLIDAY_TOTAL : '.$where.'<br>'."\n";
 		}
 		
-		$retval = $this->db->select($this->table,'count(*)',$where,__LINE__,__FILE__,false,'','calendar')->fetchSingle();
+		$retval = $this->db->select($this->table,'count(*)',$where,__LINE__,__FILE__,false,'','calendar')->fetchColumn();
 
 		if($this->debug)
 		{
diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index 9f125618ee..28cfc7b2c1 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -71,7 +71,7 @@ while(($arg = array_shift($argv)))
 				}
 				else
 				{
-					$config[$name] = array_unique(split('[ ,]+',$value));
+					$config[$name] = array_unique(preg_split('/[ ,]+/',$value));
 				}
 				break;
 
diff --git a/doc/rpm-build/rpm_post_install.php b/doc/rpm-build/rpm_post_install.php
index 7b0b4fa822..846153ff8e 100755
--- a/doc/rpm-build/rpm_post_install.php
+++ b/doc/rpm-build/rpm_post_install.php
@@ -46,7 +46,7 @@ $config = array(
 // read language from LANG enviroment variable
 if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG']))
 {
-	list($lang,$nat) = split('[_.]',$lang);
+	list($lang,$nat) = preg_split('/[_.]/',$lang);
 	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
 	{
 		$lang .= '-'.strtolower($nat);
diff --git a/etemplate/inc/class.advancedsearch_widget.inc.php b/etemplate/inc/class.advancedsearch_widget.inc.php
index 3422242bd6..b270f40faf 100644
--- a/etemplate/inc/class.advancedsearch_widget.inc.php
+++ b/etemplate/inc/class.advancedsearch_widget.inc.php
@@ -76,7 +76,7 @@
 				(is_array($GLOBALS['egw']->session->appsession('advanced_search_query',$GLOBALS['egw_info']['flags']['currentapp'])) ? 
 				$GLOBALS['egw']->session->appsession('advanced_search_query',$GLOBALS['egw_info']['flags']['currentapp']) : $value);
 			
-			$tpl =& new etemplate;
+			$tpl = new etemplate;
 			$tpl->init('*** generated advanced search widget','','',0,'',0,0);	// make an empty template
 
 			if($extension_data['message'])
@@ -96,7 +96,7 @@
 // 					'width' => '800px',
 				)));
 
-				$result_rows_tpl =& new etemplate;
+				$result_rows_tpl = new etemplate;
 				$result_rows_tpl->init('*** generated rows template for advanced search results','','',0,'',0,0);
 				$grid =& $result_rows_tpl->children[0];
 				foreach((array)$extension_data['colums_to_present'] as $field => $label)
diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php
index f2d6403734..e984c2e6a3 100644
--- a/etemplate/inc/class.ajax_select_widget.inc.php
+++ b/etemplate/inc/class.ajax_select_widget.inc.php
@@ -146,7 +146,7 @@ class ajax_select_widget
 		$cell['type'] = 'template';
 		$cell['size'] = $cell['name'];
 		$value = array('value' => $current_value, 'search' => $title);
-		$widget =& new etemplate('etemplate.ajax_select_widget');
+		$widget = new etemplate('etemplate.ajax_select_widget');
 		$widget->no_onclick = True;
 
 		// Link if readonly & link is set
diff --git a/etemplate/inc/class.date_widget.inc.php b/etemplate/inc/class.date_widget.inc.php
index 8e61f8033d..5e1663c4ab 100644
--- a/etemplate/inc/class.date_widget.inc.php
+++ b/etemplate/inc/class.date_widget.inc.php
@@ -113,9 +113,9 @@ class date_widget
 		}
 		elseif ($data_format != '')
 		{
-			$date = split('[- /.:,]',$value);
+			$date = preg_split('/[- \\/.:,]/',$value);
 			//echo "date=<pre>"; print_r($date); echo "</pre>";
-			$mdy  = split('[- /.:,]',$data_format);
+			$mdy  = preg_split('/[- \\/.:,]/',$data_format);
 
 			if (count($mdy) == 1)	// no seperators, eg. YmdHi
 			{
@@ -166,7 +166,7 @@ class date_widget
 			$value['H'] = $value['H'] % 12 ?  $value['H'] % 12 : 12;	// no leading 0 and 0h => 12am
 			$timeformat += array(5 => 'a');
 		}
-		$format = split('[/.-]',$this->dateformat);
+		$format = preg_split('/[\\/.-]/',$this->dateformat);
 
 		// no time also if $options&8 and readonly and time=0h0
 		if ($type != 'date' && !($readonly && ($options & 8) && $time_0h0))
@@ -235,7 +235,7 @@ class date_widget
 				'needed' => $cell['needed'],
 			));
 		}
-		$tpl =& new etemplate;
+		$tpl = new etemplate;
 		$tpl->init('*** generated fields for date','','',0,'',0,0);	// make an empty template
 		// keep the editor away from the generated tmpls
 		$tpl->no_onclick = true;
@@ -410,7 +410,7 @@ class date_widget
 				'value' => $value,
 				'unit'  => $unit,
 			);
-			$tpl =& new etemplate;
+			$tpl = new etemplate;
 			$tpl->init('*** generated fields for duration','','',0,'',0,0);	// make an empty template
 			// keep the editor away from the generated tmpls
 			$tpl->no_onclick = true;
diff --git a/etemplate/inc/class.db_tools.inc.php b/etemplate/inc/class.db_tools.inc.php
index 91462aca3b..6c7004132c 100644
--- a/etemplate/inc/class.db_tools.inc.php
+++ b/etemplate/inc/class.db_tools.inc.php
@@ -330,7 +330,7 @@ class db_tools
 		$new_version[$minor] = sprintf('%03d',1+$new_version[$minor]);
 		$content['new_version'] = implode('.',$new_version);
 
-		$tmpl =& new etemplate('etemplate.db-tools.ask_save');
+		$tmpl = new etemplate('etemplate.db-tools.ask_save');
 
 		if (!file_exists(EGW_SERVER_ROOT."/$posted_app/setup/tables_current.inc.php"))
 		{
@@ -516,7 +516,7 @@ class db_tools
 									$opts = array();
 									foreach(explode(',',$col['options']) as $opt)
 									{
-										list($db,$opt) = split('[(:)]',$opt);
+										list($db,$opt) = preg_split('/[(:)]/',$opt);
 										$opts[$db] = is_numeric($opt) ? intval($opt) : $opt;
 									}
 									$table[$prop][] = array(
diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index 8c6d9aed05..412100f65c 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -276,7 +276,7 @@ class editor
 		{
 			$content[$row] = $param;
 		}
-		$list_result =& new etemplate('etemplate.editor.list_result');
+		$list_result = new etemplate('etemplate.editor.list_result');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Editable Templates - Search');
 		$list_result->exec('etemplate.editor.list_result',$content,'','',array(
 			'result' => $result,
@@ -465,7 +465,7 @@ class editor
 			'xml' => $xml ? '<pre>'.html::htmlspecialchars($xml)."</pre>\n" : '',
 		);
 
-		$editor =& new etemplate('etemplate.editor.new');
+		$editor = new etemplate('etemplate.editor.new');
 		if (!$msg && isset($content['values']) && !isset($content['vals']))
 		{
 			$r = 1;
@@ -1337,8 +1337,8 @@ class editor
 
 		$content['cell']['options'] = explode(',',$content['cell']['size']);
 
-		$editor =& new etemplate('etemplate.editor.widget');
-		$type_tmpl =& new etemplate;
+		$editor = new etemplate('etemplate.editor.widget');
+		$type_tmpl = new etemplate;
 
 		list($ext_type) = explode('-',$widget['type']);
 		// allow to read template of app-specific widgets from their app: eg. "infolog-value" --> "infolog.widget.infolog-value"
@@ -1488,7 +1488,7 @@ class editor
 			'java_script' => $js ? '<script>'.$js.'</script>' : '',
 			'msg' => $msg
 		);
-		$tmpl =& new etemplate('etemplate.editor.styles');
+		$tmpl = new etemplate('etemplate.editor.styles');
 
 		if ($content['from'])
 		{
@@ -1542,7 +1542,7 @@ class editor
 		$dir = @opendir(EGW_SERVER_ROOT.'/'.$app.'/inc');
 		while ($dir && ($file = readdir($dir)))
 		{
-			if (ereg('class\\.([a-zA-Z0-9_]*)_widget.inc.php',$file,$regs) &&
+			if (preg_match('/class\\.([a-zA-Z0-9_]*)_widget.inc.php/',$file,$regs) &&
 				($regs[1] != 'xslt' || $this->etemplate->xslt) &&
 				($ext = $this->etemplate->loadExtension($regs[1].'.'.$app,$this->etemplate)))
 			{
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 03b839e7f9..d5b980aa62 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -309,7 +309,7 @@ class etemplate extends boetemplate
 					echo '<div id="popupMainDiv">'."\n";
 					if ($GLOBALS['egw_info']['user']['apps']['manual'])	// adding a manual icon to every popup
 					{
-						$manual =& new etemplate('etemplate.popup.manual');
+						$manual = new etemplate('etemplate.popup.manual');
 						echo $manual->show(array());
 						unset($manual);
 						echo '<style type="text/css">.ajax-loader { position: absolute; right: 27px; top: 24px; display: none; }</style>'."\n";
@@ -1331,7 +1331,7 @@ class etemplate extends boetemplate
 				$obj_read = 'already loaded';
 				if (is_array($cell['obj']))
 				{
-					$obj =& new etemplate();
+					$obj = new etemplate();
 					$obj->init($cell['obj']);
 					$cell['obj'] =& $obj;
 					unset($obj);
@@ -1344,12 +1344,12 @@ class etemplate extends boetemplate
 						$obj_read = is_object($cell['obj']) ? 'obj from content' : 'obj read, obj-name from content';
 						if (!is_object($cell['obj']))
 						{
-							$cell['obj'] =& new etemplate($cell['obj'],$this->as_array());
+							$cell['obj'] = new etemplate($cell['obj'],$this->as_array());
 						}
 					}
 					else
 					{  $obj_read = 'obj read';
-						$cell['obj'] =& new etemplate($name,$this->as_array());
+						$cell['obj'] = new etemplate($name,$this->as_array());
 					}
 				}
 				if (is_int($this->debug) && $this->debug >= 3 || $this->debug == $cell['type'])
diff --git a/etemplate/inc/class.historylog_widget.inc.php b/etemplate/inc/class.historylog_widget.inc.php
index ed62c7351b..c2cf819b59 100644
--- a/etemplate/inc/class.historylog_widget.inc.php
+++ b/etemplate/inc/class.historylog_widget.inc.php
@@ -61,14 +61,14 @@ class historylog_widget
 		$status_widgets = is_array($value) && isset($value['status-widgets']) ? $value['status-widgets'] : null;
 		$id = is_array($value) ? $value['id'] : $value;
 
-		$historylog =& new historylog($app);
+		$historylog = new historylog($app);
 		if (!$id || method_exists($historylog,'search'))
 		{
 			$value = $id ? $historylog->search($id) : false;
 		}
 		unset($historylog);
 
-		$tpl =& new etemplate;
+		$tpl = new etemplate;
 		$tpl->init('*** generated fields for historylog','','',0,'',0,0);	// make an empty template
 		// keep the editor away from the generated tmpls
 		$tpl->no_onclick = true;
diff --git a/etemplate/inc/class.link_widget.inc.php b/etemplate/inc/class.link_widget.inc.php
index f9bb0919c9..210e64278f 100644
--- a/etemplate/inc/class.link_widget.inc.php
+++ b/etemplate/inc/class.link_widget.inc.php
@@ -254,7 +254,7 @@ class link_widget
 				// modify add_app default to the action used as value
 				if (isset($value['add_app']) && $app == $value['add_app']) $value['add_app'] = $action;
 			}
-			$tpl =& new etemplate('etemplate.link_widget.add');
+			$tpl = new etemplate('etemplate.link_widget.add');
 			break;
 
 		case 'link-to':
@@ -288,7 +288,7 @@ class link_widget
 				return True;
 			}
 			$value['link_list_format'] = $GLOBALS['egw_info']['user']['preferences']['common']['link_list_format'];
-			$tpl =& new etemplate('etemplate.link_widget.list');
+			$tpl = new etemplate('etemplate.link_widget.list');
 			for($row=$tpl->rows-1; list(,$link) = each($links); ++$row)
 			{
 				$value[$row] = $link;
@@ -324,7 +324,7 @@ class link_widget
 
 		case 'link-entry':
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
-			$tpl =& new etemplate('etemplate.link_widget.entry');
+			$tpl = new etemplate('etemplate.link_widget.entry');
 			$options = $cell['size'] ? explode(',',$cell['size']) : array();
 			$app = $extension_data['app'] = $options[0];
 			// handle extra args for onclick like: values2url(this.form,'start,end,duration,participants,recur_type,whole_day')+'&exec[event_id]=
diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 4da07089b1..71e6a1de03 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -363,7 +363,7 @@ class nextmatch_widget
 		}
 		if (!is_object($value['template']))
 		{
-			$value['template'] =& new etemplate($value['template'],$tmpl->as_array());
+			$value['template'] = new etemplate($value['template'],$tmpl->as_array());
 		}
 		if (is_array($value['rows'][0]))	// pad 0 based arrays with rows-1 false values
 		{
@@ -386,7 +386,7 @@ class nextmatch_widget
 		{											// disable whole nextmatch line if no scrolling necessary
 			if ($value['header_left'] || $value['header_right'])
 			{
-				$nextmatch =& new etemplate('etemplate.nextmatch_widget.header_only');
+				$nextmatch = new etemplate('etemplate.nextmatch_widget.header_only');
 				$cell['size'] = $cell['name'];
 				$cell['obj'] = &$nextmatch;
 				$cell['name'] = $nextmatch->name;
@@ -400,7 +400,7 @@ class nextmatch_widget
 		}
 		else
 		{
-			$nextmatch =& new etemplate('etemplate.nextmatch_widget');
+			$nextmatch = new etemplate('etemplate.nextmatch_widget');
 			$nextmatch->read('etemplate.nextmatch_widget');
 			// keep the editor away from the generated tmpls
 			$nextmatch->no_onclick = true;
@@ -1129,7 +1129,7 @@ class nextmatch_widget
 		if ($app)
 		{
 			include_once(EGW_API_INC.'/class.config.inc.php');
-			$config =& new config($app);
+			$config = new config($app);
 			$config->read_repository();
 
 			$customfields = isset($config->config_data['customfields']) ? $config->config_data['customfields'] : $config->config_data['custom_fields'];
diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index 46a99f59f1..f33c8233d5 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -841,7 +841,7 @@ class so_sql
 				}
 				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
 				{
-					$this->total = $this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__,false,'',$this->app,0,$join)->fetchSingle();
+					$this->total = $this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__,false,'',$this->app,0,$join)->fetchColumn();
 				}
 				else	// cant do a count, have to run the query without limit
 				{
@@ -857,7 +857,7 @@ class so_sql
 
 		if ($mysql_calc_rows)
 		{
-			$this->total = $this->db->query('SELECT FOUND_ROWS()')->fetchSingle();
+			$this->total = $this->db->query('SELECT FOUND_ROWS()')->fetchColumn();
 		}
 		$arr = array();
 		if ($rs) foreach($rs as $row)
diff --git a/etemplate/inc/class.soetemplate.inc.php b/etemplate/inc/class.soetemplate.inc.php
index c7248763fb..86c14e4ba8 100644
--- a/etemplate/inc/class.soetemplate.inc.php
+++ b/etemplate/inc/class.soetemplate.inc.php
@@ -953,7 +953,7 @@ class soetemplate
 
 		$tpls = $this->search($app);
 
-		$tpl =& new soetemplate;	// to not alter our own data
+		$tpl = new soetemplate;	// to not alter our own data
 
 		while (list(,$keys) = each($tpls))
 		{
@@ -1062,7 +1062,7 @@ class soetemplate
 		$templ_version=0;
 
 		include($path = EGW_SERVER_ROOT."/$app/setup/etemplates.inc.php");
-		$templ =& new etemplate($app);
+		$templ = new etemplate($app);
 
 		foreach($templ_data as $data)
 		{
@@ -1106,7 +1106,7 @@ class soetemplate
 
 		if ($time = @filemtime($path))
 		{
-			$templ =& new soetemplate(".$app",'','##');
+			$templ = new soetemplate(".$app",'','##');
 			if ($templ->lang != '##' || $templ->modified < $time) // need to import
 			{
 				$ret = self::import_dump($app);
@@ -1288,7 +1288,7 @@ class soetemplate
 			case 'template':
 				if (!isset($widget['obj']) && $widget['name'][0] != '@')
 				{
-					$widget['obj'] =& new etemplate;
+					$widget['obj'] = new etemplate;
 					if (!$widget['obj']->read($widget['name'])) $widget['obj'] = false;
 				}
 				if (!is_object($widget['obj'])) break;	// cant descent into template
diff --git a/etemplate/inc/class.solangfile.inc.php b/etemplate/inc/class.solangfile.inc.php
index a12bd2967c..5338e882e6 100644
--- a/etemplate/inc/class.solangfile.inc.php
+++ b/etemplate/inc/class.solangfile.inc.php
@@ -74,7 +74,7 @@ class solangfile
 		}
 		foreach($lines as $n => $line)
 		{
-			while (ereg('\{lang_([^}]+)\}(.*)',$line,$found))
+			while (preg_match('/\{lang_([^}]+)\}(.*)/',$line,$found))
 			{
 				$lang = str_replace('_',' ',$found[1]);
 				$this->plist[$lang] = $app;
@@ -256,7 +256,7 @@ class solangfile
 								}
 								$rest = substr($rest,$next+1);
 							}
-							if(!ereg("[ \t\n]*,[ \t\n]*(.*)$",$rest,$parts))
+							if(!preg_match('/'."[ \t\n]*,[ \t\n]*(.*)$".'/',$rest,$parts))
 							{
 								break;	// nothing found
 							}
diff --git a/etemplate/inc/class.tab_widget.inc.php b/etemplate/inc/class.tab_widget.inc.php
index 2d24624263..1fb0dce492 100644
--- a/etemplate/inc/class.tab_widget.inc.php
+++ b/etemplate/inc/class.tab_widget.inc.php
@@ -86,7 +86,7 @@
 			}
 			$all_names = implode('|',$names);
 
-			$tab_widget =& new etemplate('etemplate.tab_widget');
+			$tab_widget = new etemplate('etemplate.tab_widget');
 			$tab_widget->no_onclick = true;
 
 			if ($value && strpos($value,'.') === false)
@@ -150,7 +150,7 @@
 				foreach($names as $n => $name)
 				{
 					$bcell = $tab_widget->empty_cell('template',$name);
-					$bcell['obj'] =& new etemplate($name,$tmpl->as_array());
+					$bcell['obj'] = new etemplate($name,$tmpl->as_array());
 					$tab_widget->set_cell_attribute('body',$n+1,$bcell);
 				}
 				$tab_widget->set_cell_attribute('body','type','deck');
@@ -160,7 +160,7 @@
 			}
 			else
 			{
-				$stab =& new etemplate($selected_tab,$tmpl->as_array());
+				$stab = new etemplate($selected_tab,$tmpl->as_array());
 				$tab_widget->set_cell_attribute('body','type','template');
 				$tab_widget->set_cell_attribute('body','size','');	// the deck has a '1' there
 				$tab_widget->set_cell_attribute('body','obj',$stab);
diff --git a/etemplate/inc/class.tree_widget.inc.php b/etemplate/inc/class.tree_widget.inc.php
index c1a8f33c79..5b7bc699d4 100644
--- a/etemplate/inc/class.tree_widget.inc.php
+++ b/etemplate/inc/class.tree_widget.inc.php
@@ -81,7 +81,7 @@ class tree_widget
 				}
 				else	// we need to instanciate a new cat object for the correct application
 				{
-					$categories =& new categories('',$type3);
+					$categories = new categories('',$type3);
 				}
 				$cat2path=array();
 				foreach((array)$categories->return_sorted_array(0,False,'','','',!$type) as $cat)
diff --git a/etemplate/inc/class.uietemplate_gtk.inc.php b/etemplate/inc/class.uietemplate_gtk.inc.php
index 7a5e1128f4..a564cbe149 100644
--- a/etemplate/inc/class.uietemplate_gtk.inc.php
+++ b/etemplate/inc/class.uietemplate_gtk.inc.php
@@ -108,7 +108,7 @@
 			*/
 			if (!$GLOBALS['egw_info']['etemplate']['window'])
 			{
-				$window = &new GtkWindow();
+				$window = new GtkWindow();
 				$window->connect('destroy',array('etemplate','destroy'));
 				$window->connect('delete-event',array('etemplate','delete_event'));
 				$window->set_title('eGroupWareGTK: '.$GLOBALS['egw_info']['server']['site_title']);
@@ -125,7 +125,7 @@
 			$table->set_border_width(10);
 			$table->show();
 
-			$swindow = &new GtkScrolledWindow(null,null);
+			$swindow = new GtkScrolledWindow(null,null);
 			$swindow->set_policy(GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
 			$swindow->add_with_viewport($table);
 			$swindow->show();
@@ -287,7 +287,7 @@
 				'.row' => $show_row
 			);
 
-			$table = &new GtkTable($this->rows,$this->cols,False);
+			$table = new GtkTable($this->rows,$this->cols,False);
 			$table->set_row_spacings(2);
 			$table->set_col_spacings(5);
 			$table->show();
@@ -369,7 +369,7 @@
 								default:
 									$align = 0.0;
 							}
-							$align = &new GtkAlignment($align,$valign,$cell['type'] == 'hrule' ? 1.0 : 0.0,0.0);
+							$align = new GtkAlignment($align,$valign,$cell['type'] == 'hrule' ? 1.0 : 0.0,0.0);
 							$align->add($widget);
 						}
 						$table->attach($align ? $align : $widget, $c, $c+$colspan, $r, $r+1,GTK_FILL,GTK_FILL,0,0);
@@ -444,7 +444,7 @@
 			$name = $this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
 
 			// building the form-field-name depending on prefix $cname and possibl. Array-subscript in name
-			if (ereg('^([^[]*)(\\[.*\\])$',$name,$regs))	// name contains array-index
+			if (preg_match('/^([^[]*)(\\[.*\\])$/',$name,$regs))	// name contains array-index
 			{
 				$form_name = $cname == '' ? $name : $cname.'['.$regs[1].']'.$regs[2];
 				eval(str_replace(']',"']",str_replace('[',"['",'$value = $content['.$regs[1].']'.$regs[2].';')));
@@ -492,7 +492,7 @@
 
 					if ($value)
 					{
-						$widget = &new GtkLabel($value);
+						$widget = new GtkLabel($value);
 						if ($cell['align'] != 'center')
 						{
 							$widget->set_justify($cell['align'] == 'right' ? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT);
@@ -520,7 +520,7 @@
 						//$html .= $this->html->input($form_name,$value,'',$options.$this->html->formatOptions($cell['size'],'SIZE,MAXLENGTH'));
 					}
 					list($len,$max) = explode(',',$cell['size']);
-					$widget = &new GtkEntry();
+					$widget = new GtkEntry();
 					$widget->set_text($value);
 					if ($max)
 					{
@@ -534,15 +534,15 @@
 					break;
 				case 'textarea':	// Multiline Text Input, size: [rows][,cols]
 					//$html .= $this->html->textarea($form_name,$value,$options.$this->html->formatOptions($cell['size'],'ROWS,COLS'));
-					$widget = &new GtkText(null,null);
+					$widget = new GtkText(null,null);
 					$widget->insert_text($value,strlen($value));
 					$widget->set_editable(!$readonly);
 					break;
 /*				case 'date':
 					if ($cell['size'] != '')
 					{
-						$date = split('[/.-]',$value);
-						$mdy  = split('[/.-]',$cell['size']);
+						$date = preg_split('/[\\/.-]/',$value);
+						$mdy  = preg_split('/[\\/.-]/',$cell['size']);
 						for ($value=array(),$n = 0; $n < 3; ++$n)
 						{
 							switch($mdy[$n])
@@ -572,7 +572,7 @@
 						$options .= ' CHECKED';
 					}
 					//$html .= $this->html->input($form_name,'1','CHECKBOX',$options);
-					$widget = &new GtkCheckButton($right_label);
+					$widget = new GtkCheckButton($right_label);
 					$right_label = '';
 					$widget->set_active($value);
 					break;
@@ -584,23 +584,23 @@
 					//$html .= $this->html->input($form_name,$cell['size'],'RADIO',$options);
 					if (isset($this->buttongroup[$form_name]))
 					{
-						$widget = &new GtkRadioButton($this->buttongroup[$form_name],$right_label);
+						$widget = new GtkRadioButton($this->buttongroup[$form_name],$right_label);
 					}
 					else
 					{
-						$this->buttongroup[$form_name] = $widget = &new GtkRadioButton(null,$right_label);
+						$this->buttongroup[$form_name] = $widget = new GtkRadioButton(null,$right_label);
 					}
 					$right_label = '';
 					$widget->set_active($value == $cell['size']);
 					break;
 				case 'button':
 					//$html .= $this->html->submit_button($form_name,$cell['label'],'',strlen($cell['label']) <= 1 || $cell['no_lang'],$options);
-					$widget = &new GtkButton(strlen($cell['label']) > 1 ? lang($cell['label']) : $cell['label']);
+					$widget = new GtkButton(strlen($cell['label']) > 1 ? lang($cell['label']) : $cell['label']);
 					$widget->connect_object('clicked', array('etemplate', 'button_clicked'),&$var,$form_name);
 					break;
 				case 'hrule':
 					//$html .= $this->html->hr($cell['size']);
-					$widget = &new GtkHSeparator();
+					$widget = new GtkHSeparator();
 					break;
 				case 'template':	// size: index in content-array (if not full content is past further on)
 					if ($this->autorepeat_idx($cell,$show_c,$show_row,$idx,$idx_cname) || $cell['size'] != '')
@@ -661,7 +661,7 @@
 							$maxlen = $len;
 						}
 					}
-					$widget = &new GtkCombo();
+					$widget = new GtkCombo();
 					$widget->set_popdown_strings($sel_options);
 					$entry = $widget->entry;
 					$entry->set_text($sel_options[$value]);
@@ -709,7 +709,7 @@
 					$pixbuf = &$GLOBALS['egw_info']['etemplate']['pixbufs'][$path];
 					if ($pixbuf)
 					{
-						$widget = &new GtkDrawingArea();
+						$widget = new GtkDrawingArea();
 						$widget->size($pixbuf->get_width(),$pixbuf->get_height());
 						$widget->connect('expose_event',array('etemplate','draw_image'),$pixbuf);
 					}
@@ -720,7 +720,7 @@
 					break;
 				default:
 					//$html .= '<i>unknown type</i>';
-					$widget = &new GtkLabel('unknown type: '.$cell['type']);
+					$widget = new GtkLabel('unknown type: '.$cell['type']);
 					$widget->set_justify(GTK_JUSTIFY_LEFT);
 					break;
 			}
@@ -738,14 +738,14 @@
 			{
 				if (!$widget && !$right_label)
 				{
-					$widget = &new GtkLabel($left_label);
+					$widget = new GtkLabel($left_label);
 				}
 				else
 				{
-					$hbox = &new GtkHBox(False,5);
+					$hbox = new GtkHBox(False,5);
 					if ($left_label)
 					{
-						$left = &new GtkLabel($left_label);
+						$left = new GtkLabel($left_label);
 						$left->show();
 						$hbox->add($left);
 					}
@@ -756,7 +756,7 @@
 					}
 					if ($right_label)
 					{
-						$right = &new GtkLabel($right_label);
+						$right = new GtkLabel($right_label);
 						$right->show();
 						$hbox->add($right);
 					}
@@ -766,7 +766,7 @@
 			{
 				if (!$this->tooltips)
 				{
-					$this->tooltips = &new GtkTooltips();
+					$this->tooltips = new GtkTooltips();
 				}
 				$this->tooltips->set_tip($widget,lang($cell['help']),$this->name.'/'.$form_name);
 			}
diff --git a/etemplate/inc/class.xmltool.inc.php b/etemplate/inc/class.xmltool.inc.php
index c90ee21a39..27404d3da0 100644
--- a/etemplate/inc/class.xmltool.inc.php
+++ b/etemplate/inc/class.xmltool.inc.php
@@ -12,7 +12,7 @@
 
 	function var2xml($name, $data)
 	{
-		$doc =& new xmltool('root','','');
+		$doc = new xmltool('root','','');
 		return $doc->import_var($name,$data,True,True);
 	}
 
@@ -167,7 +167,7 @@
 		function import_var($name, $value,$is_root=False,$export_xml=False)
 		{
 			//echo "<p>import_var: this->indentstring='$this->indentstring'</p>\n";
-			$node =& new xmltool('node',$name,$this->indentstring);
+			$node = new xmltool('node',$name,$this->indentstring);
 			switch (gettype($value))
 			{
 				case 'string':
@@ -220,12 +220,12 @@
 							case 'integer':
 							case 'double':
 							case 'NULL':
-								$subnode =& new xmltool('node', $nextkey,$this->indentstring);
+								$subnode = new xmltool('node', $nextkey,$this->indentstring);
 								$subnode->set_value($val);
 								$node->add_node($subnode);							
 								break;
 							case 'boolean':
-								$subnode =& new xmltool('node', $nextkey,$this->indentstring);
+								$subnode = new xmltool('node', $nextkey,$this->indentstring);
 								if($val == True)
 								{
 									$subnode->set_value('1');
@@ -251,7 +251,7 @@
 								}
 								break;
 							case 'object':
-								$subnode =& new xmltool('node', $nextkey,$this->indentstring);
+								$subnode = new xmltool('node', $nextkey,$this->indentstring);
 								$subnode->set_value('PHP_SERIALIZED_OBJECT&:'.serialize($val));
 								$node->add_node($subnode);							
 								break;
@@ -390,7 +390,7 @@
 				{
 					case 'cdata':
 					case 'complete':
-						$node =& new xmltool('node',$data[$i]['tag'],$this->indentstring);
+						$node = new xmltool('node',$data[$i]['tag'],$this->indentstring);
 						if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
 						{
 							while(list($k,$v)=each($data[$i]['attributes']))
@@ -402,7 +402,7 @@
 						$parent_node->add_node($node);
 						break;
 					case 'open':
-						$node =& new xmltool('node',$data[$i]['tag'],$this->indentstring);
+						$node = new xmltool('node',$data[$i]['tag'],$this->indentstring);
 						if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
 						{
 							while(list($k,$v)=each($data[$i]['attributes']))
@@ -428,7 +428,7 @@
 			xml_parse_into_struct($parser, $xmldata, $vals, $index);
 			xml_parser_free($parser);
 			unset($index);	
-			$node =& new xmltool('node',$vals[0]['tag'],$this->indentstring);
+			$node = new xmltool('node',$vals[0]['tag'],$this->indentstring);
 			if(isset($vals[0]['attributes']))
 			{
 				while(list($key,$value) = each($vals[0]['attributes']))
diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index 374df3f182..92f5a306b1 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -165,16 +165,16 @@
 			$widgetattr2xul = isset($this->widget2xul[$type]) ? $this->widget2xul[$type] : array();
 			$type = isset($widgetattr2xul['.name']) ? $widgetattr2xul['.name'] : $type;
 			list($type,$child,$child2) = explode(',',$type);
-			$widget =& new xmlnode($type);
+			$widget = new xmlnode($type);
 			$attr_widget = &$widget;
 			if ($child)
 			{
-				$child =& new xmlnode($child);
+				$child = new xmlnode($child);
 				if ($type != 'tabbox') $attr_widget = &$child;
 			}
 			if ($child2)
 			{
-				$child2 =& new xmlnode($child2);
+				$child2 = new xmlnode($child2);
 			}
 			if (isset($widgetattr2xul['.set']))	// set default-attr for type
 			{
@@ -189,7 +189,7 @@
 			{
 			case 'nextmatch':
 				list($tpl) = explode(',',$cell['size']);
-				$embeded =& new etemplate($tpl,$this->load_via);
+				$embeded = new etemplate($tpl,$this->load_via);
 				if ($embeded_too)
 				{
 					$this->add_etempl($embeded,$embeded_too);
@@ -207,17 +207,17 @@
 				$names  = explode('|',$tab_names);
 				for ($n = 0; $n < count($labels); ++$n)
 				{
-					$tab =& new xmlnode('tab');
+					$tab = new xmlnode('tab');
 					$tab->set_attribute('label',$labels[$n]);
 					$tab->set_attribute('statustext',$helps[$n]);
 					$child->add_node($tab);
 
-					$embeded =& new etemplate($names[$n],$this->load_via);
+					$embeded = new etemplate($names[$n],$this->load_via);
 					if ($embeded_too)
 					{
 						$this->add_etempl($embeded,$embeded_too);
 					}
-					$template =& new xmlnode('template');
+					$template = new xmlnode('template');
 					$template->set_attribute('id',$embeded->name);
 					$child2->add_node($template);
 					unset($embeded);
@@ -240,7 +240,7 @@
 			case 'groupbox':
 				if ($cell['label'])
 				{
-					$caption =& new xmlnode('caption');
+					$caption = new xmlnode('caption');
 					$caption->set_attribute('label',$cell['label']);
 					$widget->add_node($caption);
 					unset($cell['label']);
@@ -250,7 +250,7 @@
 			case 'hbox':
 			case 'box':
 			case 'deck':
-				list($anz,$orient,$options) = split(',',$cell['size'],3);
+				list($anz,$orient,$options) = explode(',',$cell['size'],3);
 				for ($n = 1; $n <= $anz; ++$n)
 				{
 					$this->add_widget($widget,$cell[$n],$embeded_too);
@@ -265,7 +265,7 @@
 			case 'template':
 				if ($cell['name'][0] != '@' && $embeded_too)
 				{
-					$templ =& new etemplate();
+					$templ = new etemplate();
 					if ($templ->read(boetemplate::expand_name($cell['name'],0,0),'default','default',0,'',$this->load_via))
 					{
 						$this->add_etempl($templ,$embeded_too);
@@ -314,18 +314,18 @@
 		 */
 		function add_grid(&$parent,$grid,&$embeded_too)
 		{
-			$xul_grid =& new xmlnode('grid');
+			$xul_grid = new xmlnode('grid');
 			$this->set_attributes($xul_grid,'width,height,border,class,spacing,padding,overflow',$grid['size']);
 			$this->set_attributes($xul_grid,'id',$grid['name']);
 
-			$xul_columns =& new xmlnode('columns');
-			$xul_rows =& new xmlnode('rows');
+			$xul_columns = new xmlnode('columns');
+			$xul_rows = new xmlnode('rows');
 
 			reset($grid['data']);
 			list(,$opts) = each ($grid['data']); // read over options-row
 			while (list($r,$row) = each ($grid['data']))
 			{
-				$xul_row =& new xmlnode('row');
+				$xul_row = new xmlnode('row');
 				$this->set_attributes($xul_row,'class,valign',$opts["c$r"]);
 				$this->set_attributes($xul_row,'height,disabled,part',$opts["h$r"]);
 
@@ -334,7 +334,7 @@
 				{
 					if ($r == '1')	// write columns only once in the first row
 					{
-						$xul_column =& new xmlnode('column');
+						$xul_column = new xmlnode('column');
 						$this->set_attributes($xul_column,'width,disabled',$opts[$c]);
 						$xul_columns->add_node($xul_column);
 					}
@@ -375,7 +375,7 @@
 			}
 			$embeded_too[$etempl->name] = True;
 
-			$template =& new xmlnode('template');
+			$template = new xmlnode('template');
 			$template->set_attribute('id',$etempl->name);
 			$template->set_attribute('template',$etempl->template);
 			$template->set_attribute('lang',$etempl->lang);
@@ -388,7 +388,7 @@
 			}
 			if ($etempl->style != '')
 			{
-				$styles =& new xmlnode('styles');
+				$styles = new xmlnode('styles');
 				$styles->set_value(str_replace("\r",'',$etempl->style));
 				$template->add_node($styles);
 			}
@@ -407,10 +407,10 @@
 			{
 				echo "<p>etempl->data = "; _debug_array($etempl->data);
 			}
-			$doc =& new xmldoc();
+			$doc = new xmldoc();
 			$doc->add_comment('$'.'Id$');
 
-			$this->xul_overlay =& new xmlnode('overlay');	// global for all add_etempl calls
+			$this->xul_overlay = new xmlnode('overlay');	// global for all add_etempl calls
 			$this->load_via = $etempl->as_array();
 
 			$embeded_too = True;
@@ -572,7 +572,7 @@
 						{
 							break;
 						}
-						$nul = null; soetemplate::add_child($parent,$nul);	// null =& new row
+						$nul = null; soetemplate::add_child($parent,$nul);	// null = new row
 						$parent['data'][0]['c'.$parent['rows']] = $attr['class'] . ($attr['valign'] ? ','.$attr['valign'] : '');
 						$parent['data'][0]['h'.$parent['rows']] = $attr['height'] .
 							($attr['disabled']||$attr['part'] ? ','.$attr['disabled'] : '').
@@ -696,7 +696,7 @@
 								unset($attr['src']);
 								break;
 							case 'listbox':
-								$attr['size'] = ereg_replace(',*$','',$attr['rows'].','.$attr['size']);
+								$attr['size'] = preg_replace('/,*$/','',$attr['rows'].','.$attr['size']);
 								unset($attr['rows']);
 								break;
 							case 'button':
diff --git a/importexport/inc/class.uidefinitions.inc.php b/importexport/inc/class.uidefinitions.inc.php
index c28b32d4d3..a6c648a875 100644
--- a/importexport/inc/class.uidefinitions.inc.php
+++ b/importexport/inc/class.uidefinitions.inc.php
@@ -59,7 +59,7 @@ class uidefinitions
 		$GLOBALS['egw_info']['flags']['currentapp'] = self::_appname;
 
 		$GLOBALS['egw_info']['flags']['include_xajax'] = true;
-		$this->etpl =& new etemplate();
+		$this->etpl = new etemplate();
 		$this->clock = html::image(self::_appname,'clock');
 		$this->steps = array(
 			'wizzard_step10' => lang('Choose an application'),
@@ -112,7 +112,7 @@ class uidefinitions
 			}
 
 		}
-		$etpl =& new etemplate(self::_appname.'.definition_index');
+		$etpl = new etemplate(self::_appname.'.definition_index');
 
 		// we need an offset because of autocontinued rows in etemplate ...
 		$definitions = array('row0');
@@ -213,7 +213,7 @@ class uidefinitions
 
 		if(class_exists('xajaxResponse'))
 		{
-			$this->response =& new xajaxResponse();
+			$this->response = new xajaxResponse();
 
 			if ($content['closewindow'])
 			{
@@ -245,7 +245,7 @@ class uidefinitions
 			// adding a manual icon to every popup
 			if ($GLOBALS['egw_info']['user']['apps']['manual'])
 			{
-				$manual =& new etemplate('etemplate.popup.manual');
+				$manual = new etemplate('etemplate.popup.manual');
 				echo $manual->exec(self::_appname.'.uidefinitions.wizzard',$content,$sel_options,$readonlys,$preserv,1);
 				unset($manual);
 			}
@@ -271,7 +271,7 @@ class uidefinitions
 		/*if($content['plugin'] && $content['application']&& !is_object($this->plugin))
 		{
 			$plugin_definition =  $this->plugins[$content['application']][$content['plugin']]['definition'];
-			if($plugin_definition) $this->plugin =& new $plugin_definition;
+			if($plugin_definition) $this->plugin = new $plugin_definition;
 		}*/
 		if(is_object($this->plugin))
 		{
@@ -446,7 +446,7 @@ class uidefinitions
 		}
 		else
 		{
-			$etpl =& new etemplate(self::_appname.'.import_definition');
+			$etpl = new etemplate(self::_appname.'.import_definition');
 			return $etpl->exec(self::_appname.'.uidefinitions.import_definition',$content,array(),$readonlys,$preserv);
 		}
 	}
diff --git a/importexport/inc/class.uiexport.inc.php b/importexport/inc/class.uiexport.inc.php
index 114e937b29..211e6a46c1 100644
--- a/importexport/inc/class.uiexport.inc.php
+++ b/importexport/inc/class.uiexport.inc.php
@@ -167,7 +167,7 @@ class uiexport {
 		elseif(class_exists('xajaxResponse'))
 		{
 			//error_log(__LINE__.__FILE__.'$_content: '.print_r($_content,true));
-			$response =& new xajaxResponse();
+			$response = new xajaxResponse();
 			
 			if ($_content['defintion'] == 'expert') {
 				$definition = new definition();
diff --git a/infolog/csv_import.php b/infolog/csv_import.php
index d7fdab1897..64bce4dc8c 100644
--- a/infolog/csv_import.php
+++ b/infolog/csv_import.php
@@ -429,8 +429,8 @@ case 'import':
 				{
 					if (ereg((string) $pattern,$val))
 					{
-						// echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",ereg_replace('$pattern','$replace','$val') = ";
-						$val = ereg_replace((string) $pattern,str_replace($VPre,'\\',$replace),(string) $val);
+						// echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",preg_replace('/$pattern/','$replace','$val') = ";
+						$val = preg_replace('/'.(string) $pattern.'/',str_replace($VPre,'\\',$replace),(string) $val);
 						// echo "'$val'</p>";
 
 						$reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
@@ -485,7 +485,7 @@ case 'import':
 		{
 			$responsible = $values['responsible'];
 			$values['responsible'] = array();
-			foreach(split('[,;]',$responsible) as $user)
+			foreach(preg_split('/[,;]/',$responsible) as $user)
 			{
 				if (preg_match('/\[([^\]]+)\]/',$user,$matches)) $user = $matches[1];
 				if ($user && !is_numeric($user)) $user = $GLOBALS['egw']->accounts->name2id($user);
diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index ae4ff0348a..7b0448910f 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -236,7 +236,7 @@ class infolog_bo
 		$this->user_time_now = time() + $this->tz_offset_s;
 
 		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
-		$this->so =& new infolog_so($this->grants);
+		$this->so = new infolog_so($this->grants);
 
 		if ($info_id)
 		{
@@ -516,7 +516,7 @@ class infolog_bo
 			require_once(EGW_INCLUDE_ROOT.'/infolog/inc/class.infolog_tracking.inc.php');
 			if (!is_object($this->tracking))
 			{
-				$this->tracking =& new infolog_tracking($this);
+				$this->tracking = new infolog_tracking($this);
 			}
 			$this->tracking->track($deleted,$info,$this->user,true);
 		}
@@ -720,7 +720,7 @@ class infolog_bo
 			// send email notifications and do the history logging
 			if (!is_object($this->tracking))
 			{
-				$this->tracking =& new infolog_tracking($this);
+				$this->tracking = new infolog_tracking($this);
 			}
 			$this->tracking->track($values,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted');
 		}
@@ -1146,7 +1146,7 @@ class infolog_bo
 			$GLOBALS['egw']->acl->acl($user);
 			$GLOBALS['egw']->acl->read_repository();
 			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
-			$this->so =& new infolog_so($this->grants);	// so caches it's filters
+			$this->so = new infolog_so($this->grants);	// so caches it's filters
 
 			$notified_info_ids = array();
 			foreach(array(
diff --git a/infolog/inc/class.infolog_customfields.inc.php b/infolog/inc/class.infolog_customfields.inc.php
index ab86b03371..6639f977f4 100644
--- a/infolog/inc/class.infolog_customfields.inc.php
+++ b/infolog/inc/class.infolog_customfields.inc.php
@@ -209,7 +209,7 @@ class infolog_customfields
 			{
 				foreach(explode("\n",$field['values']) as $line)
 				{
-					list($var,$value) = split('=',trim($line),2);
+					list($var,$value) = explode('=',trim($line),2);
 					$var = trim($var);
 					$values[$var] = empty($value) ? $var : $value;
 				}
diff --git a/infolog/inc/class.infolog_datasource.inc.php b/infolog/inc/class.infolog_datasource.inc.php
index 4937856249..3101233680 100644
--- a/infolog/inc/class.infolog_datasource.inc.php
+++ b/infolog/inc/class.infolog_datasource.inc.php
@@ -44,7 +44,7 @@ class infolog_datasource extends datasource
 		// we use $GLOBALS['infolog_bo'] as an already running instance might be availible there
 		if (!is_object($GLOBALS['infolog_bo']))
 		{
-			$GLOBALS['infolog_bo'] =& new infolog_bo();
+			$GLOBALS['infolog_bo'] = new infolog_bo();
 		}
 		$this->infolog_bo =& $GLOBALS['infolog_bo'];
 	}
@@ -150,7 +150,7 @@ class infolog_datasource extends datasource
 		if (!is_object($GLOBALS['infolog_bo']))
 		{
 			include_once(EGW_INCLUDE_ROOT.'/infolog/inc/class.infolog_bo.inc.php');
-			$GLOBALS['infolog_bo'] =& new infolog_bo();
+			$GLOBALS['infolog_bo'] = new infolog_bo();
 		}
 		// dont delete infolog, which are linked to other elements, but their project
 		if (count(egw_link::get_links('infolog',$id)) > 1)
diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php
index 0fa8a23a46..f0e3a5471e 100644
--- a/infolog/inc/class.infolog_groupdav.inc.php
+++ b/infolog/inc/class.infolog_groupdav.inc.php
@@ -36,7 +36,7 @@ class infolog_groupdav extends groupdav_handler
 		if (self::$debugInfo) error_log(__METHOD__." called ");
 		parent::__construct($app,$debug,$base_uri);
 		if (self::$debugInfo) error_log(__METHOD__." parent constructed with $app,$debug,$base_uri; initializing infolog_bo ");
-		$this->bo =& new infolog_bo();
+		$this->bo = new infolog_bo();
 	}
 
 	const PATH_ATTRIBUTE = 'info_id';
@@ -231,7 +231,7 @@ class infolog_groupdav extends groupdav_handler
 	private function _get_handler()
 	{
 		if (self::$debugInfo) error_log(__METHOD__." called ");
-		$handler =& new infolog_ical();
+		$handler = new infolog_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 
 		return $handler;
diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php
index 160d606185..28dbd9fb81 100644
--- a/infolog/inc/class.infolog_hooks.inc.php
+++ b/infolog/inc/class.infolog_hooks.inc.php
@@ -357,7 +357,7 @@ class infolog_hooks
 		if ($data['prefs']['notify_due_delegated'] || $data['prefs']['notify_due_responsible'] ||
 			$data['prefs']['notify_start_delegated'] || $data['prefs']['notify_start_responsible'])
 		{
-			$async =& new asyncservice();
+			$async = new asyncservice();
 
 			if (!$async->read('infolog-async-notification'))
 			{
diff --git a/infolog/inc/class.infolog_ical.inc.php b/infolog/inc/class.infolog_ical.inc.php
index e331ca5f6e..5dd4609b77 100644
--- a/infolog/inc/class.infolog_ical.inc.php
+++ b/infolog/inc/class.infolog_ical.inc.php
@@ -57,7 +57,7 @@ class infolog_ical extends infolog_bo
 
 		$taskGUID = $GLOBALS['egw']->common->generate_uid('infolog_task',$_taskID);
 
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		$vcal->setAttribute('VERSION',$_version);
 		$vcal->setAttribute('METHOD',$_method);
 
@@ -164,7 +164,7 @@ class infolog_ical extends infolog_bo
 
 	function vtodotoegw($_vcalData,$_taskID=-1)
 	{
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		if(!$vcal->parsevCalendar($_vcalData))
 		{
 			return FALSE;
@@ -274,7 +274,7 @@ class infolog_ical extends infolog_bo
 
 			case 'text/x-vnote':
 				$noteGUID = $GLOBALS['egw']->common->generate_uid('infolog_note',$_noteID);
-				$vnote = &new Horde_iCalendar_vnote();
+				$vnote = new Horde_iCalendar_vnote();
 				$vNote->setAttribute('VERSION', '1.1');
 				$vnote->setAttribute('SUMMARY',$note['info_subject']);
 				$vnote->setAttribute('BODY',$note['info_des']);
@@ -368,7 +368,7 @@ class infolog_ical extends infolog_bo
 				break;
 
 			case 'text/x-vnote':
-				$vnote = &new Horde_iCalendar;
+				$vnote = new Horde_iCalendar;
 				if (!$vcal->parsevCalendar($_data))
 				{
 					return FALSE;
diff --git a/infolog/inc/class.infolog_sif.inc.php b/infolog/inc/class.infolog_sif.inc.php
index c7f50bc410..8c24beda10 100644
--- a/infolog/inc/class.infolog_sif.inc.php
+++ b/infolog/inc/class.infolog_sif.inc.php
@@ -129,7 +129,7 @@ class infolog_sif extends infolog_bo
 		switch($_sifType) {
 			case 'task':
 				$taskData	= array();
-				$vcal		= &new Horde_iCalendar;
+				$vcal		= new Horde_iCalendar;
 
 				$taskData['info_type'] = 'task';
 
@@ -201,7 +201,7 @@ class infolog_sif extends infolog_bo
 			case 'note':
 				$noteData = array();
 				$noteData['info_type'] = 'note';
-				$vcal		= &new Horde_iCalendar;
+				$vcal		= new Horde_iCalendar;
 
 				foreach($this->_extractedSIFData as $key => $value)
 				{
@@ -280,7 +280,7 @@ class infolog_sif extends infolog_bo
 			case 'task':
 				if($taskData = $this->read($_id)) {
 					$sysCharSet	= $GLOBALS['egw']->translation->charset();
-					$vcal		= &new Horde_iCalendar;
+					$vcal		= new Horde_iCalendar;
 
 					$sifTask = '<task>';
 
@@ -388,7 +388,7 @@ class infolog_sif extends infolog_bo
 			case 'note':
 				if($taskData = $this->read($_id)) {
 					$sysCharSet	= $GLOBALS['egw']->translation->charset();
-					$vcal		= &new Horde_iCalendar;
+					$vcal		= new Horde_iCalendar;
 
 					$sifNote = '<note>';
 
@@ -448,7 +448,7 @@ class infolog_sif extends infolog_bo
 
 		$taskGUID = $GLOBALS['phpgw']->common->generate_uid('infolog_task',$_taskID);
 
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		$vcal->setAttribute('VERSION',$_version);
 		$vcal->setAttribute('METHOD','PUBLISH');
 
@@ -492,7 +492,7 @@ class infolog_sif extends infolog_bo
 	{
 		$botranslation  = CreateObject('phpgwapi.translation');
 
-		$vcal = &new Horde_iCalendar;
+		$vcal = new Horde_iCalendar;
 		if(!$vcal->parsevCalendar($_vcalData))
 		{
 			return FALSE;
diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index 5f653e298e..f9de5e2d22 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -284,7 +284,7 @@ class infolog_so
 		preg_match('/(upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$filter,$vars);
 		$filter = $vars[1];
 
-		if (isset($vars[2]) && !empty($vars[2]) && ($date = split('[-/.]',$vars[2])))
+		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/',$vars[2])))
 		{
 			$today = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2]),intval($date[0]));
 			$tomorrow = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2])+1,intval($date[0]));
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 5cfab4cfbb..68cee705ca 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -91,7 +91,7 @@ class infolog_ui
 	 */
 	function __construct()
 	{
-		$this->bo =& new infolog_bo();
+		$this->bo = new infolog_bo();
 
 		$this->tmpl = new etemplate();
 
@@ -302,7 +302,7 @@ class infolog_ui
 		unset($query['custom_fields']);
 		if ($query['col_filter']['info_type'])
 		{
-			$tpl =& new etemplate;
+			$tpl = new etemplate;
 			if ($tpl->read('infolog.index.rows.'.$query['col_filter']['info_type']))
 			{
 				$query['template'] =& $tpl;
diff --git a/infolog/inc/class.infolog_widget.inc.php b/infolog/inc/class.infolog_widget.inc.php
index 6cf3826acb..0ebbf25d86 100644
--- a/infolog/inc/class.infolog_widget.inc.php
+++ b/infolog/inc/class.infolog_widget.inc.php
@@ -60,7 +60,7 @@ class infolog_widget
 	function infolog_widget($ui)
 	{
 		$this->ui = $ui;
-		$this->infolog =& new infolog_bo();
+		$this->infolog = new infolog_bo();
 	}
 
 	/**
diff --git a/login.php b/login.php
index 2e8c93a1e8..73476c1d30 100755
--- a/login.php
+++ b/login.php
@@ -385,7 +385,7 @@ else
 
 	foreach($_GET as $name => $value)
 	{
-		if(ereg('phpgw_',$name))
+		if(strpos($name,'phpgw_') !== false)
 		{
 			$extra_vars .= '&' . $name . '=' . urlencode($value);
 		}
diff --git a/phpgwapi/inc/adodb/adodb-datadict.inc.php b/phpgwapi/inc/adodb/adodb-datadict.inc.php
index ec309f197b..1a76021f7f 100644
--- a/phpgwapi/inc/adodb/adodb-datadict.inc.php
+++ b/phpgwapi/inc/adodb/adodb-datadict.inc.php
@@ -390,7 +390,7 @@ class ADODB_DataDict {
 		if ($flds) {
 			list($lines,$pkey) = $this->_GenFields($flds);
 			list(,$first) = each($lines);
-			list(,$column_def) = split("[\t ]+",$first,2);
+			list(,$column_def) = preg_split("/[\t ]+/",$first,2);
 		}
 		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
 	}
diff --git a/phpgwapi/inc/adodb/adodb-pear.inc.php b/phpgwapi/inc/adodb/adodb-pear.inc.php
index 9a938b5c29..b99080f670 100644
--- a/phpgwapi/inc/adodb/adodb-pear.inc.php
+++ b/phpgwapi/inc/adodb/adodb-pear.inc.php
@@ -113,7 +113,7 @@ class DB
 	{
 		include_once(ADODB_DIR."/drivers/adodb-$type.inc.php");
 		$obj = &NewADOConnection($type);
-		if (!is_object($obj)) $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
+		if (!is_object($obj)) $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
 		return $obj;
 	}
 
@@ -159,7 +159,7 @@ class DB
 
 		@$obj =& NewADOConnection($type);
 		if (!is_object($obj)) {
-			$obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
+			$obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
 			return $obj;
 		}
 		if (is_array($options)) {
diff --git a/phpgwapi/inc/adodb/adodb-perf.inc.php b/phpgwapi/inc/adodb/adodb-perf.inc.php
index 4895809c33..2f25283b8f 100644
--- a/phpgwapi/inc/adodb/adodb-perf.inc.php
+++ b/phpgwapi/inc/adodb/adodb-perf.inc.php
@@ -75,10 +75,10 @@ function& adodb_log_sql(&$conn,$sql,$inputarr)
 		$conn->_logsql = false; // disable logsql error simulation
 		$dbT = $conn->databaseType;
 		
-		$a0 = split(' ',$t0);
+		$a0 = explode(' ',$t0);
 		$a0 = (float)$a0[1]+(float)$a0[0];
 		
-		$a1 = split(' ',$t1);
+		$a1 = explode(' ',$t1);
 		$a1 = (float)$a1[1]+(float)$a1[0];
 		
 		$time = $a1 - $a0;
diff --git a/phpgwapi/inc/adodb/adodb-time.inc.php b/phpgwapi/inc/adodb/adodb-time.inc.php
index 896e9a23ee..91486e15b3 100644
--- a/phpgwapi/inc/adodb/adodb-time.inc.php
+++ b/phpgwapi/inc/adodb/adodb-time.inc.php
@@ -656,7 +656,7 @@ function adodb_get_gmt_diff()
 static $TZ;
 	if (isset($TZ)) return $TZ;
 	
-	$TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
+	$TZ = mktime(0,0,0,1,2,1970) - gmmktime(0,0,0,1,2,1970);
 	return $TZ;
 }
 
@@ -1284,4 +1284,4 @@ global $ADODB_DATE_LOCALE;
 }
 
 
-?>
\ No newline at end of file
+?>
diff --git a/phpgwapi/inc/adodb/adodb-xmlschema.inc.php b/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
index 7b92a7b81a..7a6a857bb7 100644
--- a/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
+++ b/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
@@ -350,7 +350,7 @@ class dbTable extends dbObject {
 	*/
 	function &addIndex( $attributes ) {
 		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] =& new dbIndex( $this, $attributes );
+		$this->indexes[$name] = new dbIndex( $this, $attributes );
 		return $this->indexes[$name];
 	}
 	
@@ -362,7 +362,7 @@ class dbTable extends dbObject {
 	*/
 	function &addData( $attributes ) {
 		if( !isset( $this->data ) ) {
-			$this->data =& new dbData( $this, $attributes );
+			$this->data = new dbData( $this, $attributes );
 		}
 		return $this->data;
 	}
diff --git a/phpgwapi/inc/adodb/adodb.inc.php b/phpgwapi/inc/adodb/adodb.inc.php
index 9e6cab9fb4..ebd3d7d309 100644
--- a/phpgwapi/inc/adodb/adodb.inc.php
+++ b/phpgwapi/inc/adodb/adodb.inc.php
@@ -885,7 +885,7 @@
 		}
 
 		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
-			$rs =& new ADORecordSet_empty();
+			$rs = new ADORecordSet_empty();
 			return $rs;
 		}
 
@@ -1853,7 +1853,7 @@
 
 		if (empty($this->_metars)) {
 			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars =& new $rsclass(false,$this->fetchMode);
+			$this->_metars = new $rsclass(false,$this->fetchMode);
 		}
 
 		return $this->_metars->MetaType($t,$len,$fieldobj);
diff --git a/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php b/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
index ca03cb6ba8..cb0f138c91 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
@@ -369,7 +369,7 @@ class ADORecordset_informix72 extends ADORecordSet {
 			foreach($fp as $k => $v) {
 				$o = new ADOFieldObject;
 				$o->name = $k;
-				$arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
+				$arr = explode(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
 				$o->type = $arr[0];
 				$o->max_length = $arr[1];
 				$this->_fieldprops[] = $o;
diff --git a/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php b/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
index fc07584ad8..de70e7de79 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
@@ -422,7 +422,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od
 		}
 		if (empty($qid)) return $false;
 		
-		$rs =& new ADORecordSet_odbc($qid);
+		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
 		
 		if (!$rs) return $false;
diff --git a/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php b/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
index cd3be2848c..eafd5473d2 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
@@ -647,7 +647,7 @@ WHERE c2.relname=\'%s\' or c2.relname=lower(\'%s\')';
 			if (strlen($db) == 0) $db = 'template1';
 			$db = adodb_addslashes($db);
 		   	if ($str)  {
-			 	$host = split(":", $str);
+			 	$host = explode(":", $str);
 				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
 				else $str = 'host=localhost';
 				if (isset($host[1])) $str .= " port=$host[1]";
diff --git a/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php b/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
index 4f4b0e0a41..e356fcd01f 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
@@ -77,7 +77,7 @@ class ADODB_sybase_ase extends ADODB_sybase {
 
 			$retarr = array();
 			while (!$rs->EOF) {
-				$fld =& new ADOFieldObject();
+				$fld = new ADOFieldObject();
 				$fld->name = $rs->Fields('field_name');
 				$fld->type = $rs->Fields('type');
 				$fld->max_length = $rs->Fields('width');
diff --git a/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php b/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
index 87269be12a..607e60f398 100644
--- a/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
+++ b/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
@@ -21,14 +21,14 @@ class ADODB_Encrypt_MD5 {
 	/**
 	 */
 	function write($data, $key) {
-		$md5crypt =& new MD5Crypt();
+		$md5crypt = new MD5Crypt();
 		return $md5crypt->encrypt($data, $key);
 	}
 
 	/**
 	 */
 	function read($data, $key) {
-		$md5crypt =& new MD5Crypt();
+		$md5crypt = new MD5Crypt();
 		return $md5crypt->decrypt($data, $key);
 	}
 
diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index a022cf4671..6b751622a2 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -481,7 +481,7 @@ class accounts_sql
 	 */
 	function update_lastlogin($account_id, $ip)
 	{
-		$previous_login = $this->db->select($this->table,'account_lastlogin',array('account_id'=>abs($account_id)),__LINE__,__FILE__)->fetchSingle();
+		$previous_login = $this->db->select($this->table,'account_lastlogin',array('account_id'=>abs($account_id)),__LINE__,__FILE__)->fetchColumn();
 
 		$this->db->update($this->table,array(
 			'account_lastloginfrom' => $ip,
diff --git a/phpgwapi/inc/class.acl.inc.php b/phpgwapi/inc/class.acl.inc.php
index 8330e3ac83..bfdac2467e 100644
--- a/phpgwapi/inc/class.acl.inc.php
+++ b/phpgwapi/inc/class.acl.inc.php
@@ -436,7 +436,7 @@ class acl
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__)->fetchSingle();
+		),__LINE__,__FILE__)->fetchColumn();
 	}
 	
 	/**
diff --git a/phpgwapi/inc/class.asyncservice.inc.php b/phpgwapi/inc/class.asyncservice.inc.php
index bb7c3aded2..c51bd754ef 100644
--- a/phpgwapi/inc/class.asyncservice.inc.php
+++ b/phpgwapi/inc/class.asyncservice.inc.php
@@ -604,7 +604,7 @@ class asyncservice
 			while ($line = fgets($crontab,256))
 			{
 				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
-				$parts = split(' ',$line,6);
+				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
 				{
diff --git a/phpgwapi/inc/class.auth_ads.inc.php b/phpgwapi/inc/class.auth_ads.inc.php
index 6b59b91265..bf649ba79d 100644
--- a/phpgwapi/inc/class.auth_ads.inc.php
+++ b/phpgwapi/inc/class.auth_ads.inc.php
@@ -31,7 +31,7 @@
 
 		function authenticate($username, $passwd)
 		{
-			if (ereg('[()|&=*,<>!~]',$username))
+			if (preg_match('/[()|&=*,<>!~]/',$username))
 			{
 				return False;
 			}
diff --git a/phpgwapi/inc/class.auth_sql.inc.php b/phpgwapi/inc/class.auth_sql.inc.php
index 2dce59c721..aa0b4f3e2b 100644
--- a/phpgwapi/inc/class.auth_sql.inc.php
+++ b/phpgwapi/inc/class.auth_sql.inc.php
@@ -130,7 +130,7 @@ class auth_
 			'account_id'     => $account_id,
 			'account_type'   => 'u',
 			'account_status' => 'A',
-		),__LINE__,__FILE__)->fetchSingle()) === false)
+		),__LINE__,__FILE__)->fetchColumn()) === false)
 		{
 			return false;	// account not found
 		}
diff --git a/phpgwapi/inc/class.browser.inc.php b/phpgwapi/inc/class.browser.inc.php
index 68e98328b9..8ab2e85134 100644
--- a/phpgwapi/inc/class.browser.inc.php
+++ b/phpgwapi/inc/class.browser.inc.php
@@ -39,30 +39,30 @@
 			/*
 				Determine browser and version
 			*/
-			if(ereg('MSIE ([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))
+			if(preg_match('/MSIE ([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version))
 			{
 				$this->BROWSER_VER = $log_version[1];
 				$this->BROWSER_AGENT = 'IE';
 			}
-			elseif(ereg('Opera ([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version) ||
-				ereg('Opera/([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))
+			elseif(preg_match('/Opera ([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version) ||
+				preg_match('/Opera\\/([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version))
 			{
 				$this->BROWSER_VER   = $log_version[1];
 				$this->BROWSER_AGENT = 'OPERA';
 			}
-			elseif(eregi('iCab ([0-9].[0-9a-zA-Z]{1,4})',$HTTP_USER_AGENT,$log_version) ||
-				eregi('iCab/([0-9].[0-9a-zA-Z]{1,4})',$HTTP_USER_AGENT,$log_version))
+			elseif(preg_match('/iCab ([0-9].[0-9a-zA-Z]{1,4})/i',$HTTP_USER_AGENT,$log_version) ||
+				preg_match('/iCab\\/([0-9].[0-9a-zA-Z]{1,4})/i',$HTTP_USER_AGENT,$log_version))
 			{
 				$this->BROWSER_VER   = $log_version[1];
 				$this->BROWSER_AGENT = 'iCab';
 			} 
-			elseif(ereg('Gecko',$HTTP_USER_AGENT,$log_version))
+			elseif(strpos($HTTP_USER_AGENT,'Gecko') !== false)
 			{
 				$this->BROWSER_VER   = $log_version[1];
 				$this->BROWSER_AGENT = 'MOZILLA';
 			}
-			elseif(ereg('Konqueror/([0-9].[0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version) ||
-				ereg('Konqueror/([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))
+			elseif(preg_match('/Konqueror\\/([0-9].[0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version) ||
+				preg_match('/Konqueror\\/([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version))
 			{
 				$this->BROWSER_VER=$log_version[1];
 				$this->BROWSER_AGENT='Konqueror';
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 702404b442..3c798d1bbb 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -581,7 +581,7 @@ class common
 		{
 			while ($file = readdir($dh))
 			{
-				if (eregi("\.css$", $file) && $file != 'phpgw.css')
+				if (preg_match('/'."\.css$".'/i', $file) && $file != 'phpgw.css')
 				{
 					$list[] = substr($file,0,strpos($file,'.'));
 				}
@@ -593,7 +593,7 @@ class common
 			$dh = opendir(EGW_SERVER_ROOT . '/phpgwapi/themes');
 			while ($file = readdir($dh))
 			{
-				if (eregi("\.theme$", $file))
+				if (preg_match('/'."\.theme$".'/i', $file))
 				{
 					$list[] = substr($file,0,strpos($file,'.'));
 				}
@@ -1563,7 +1563,7 @@ class common
 			return -1;
 		}
 
-		$id = (int) $GLOBALS['egw']->db->select(self::NEXTID_TABLE,'id',array('appname' => $appname),__LINE__,__FILE__)->fetchSingle();
+		$id = (int) $GLOBALS['egw']->db->select(self::NEXTID_TABLE,'id',array('appname' => $appname),__LINE__,__FILE__)->fetchColumn();
 
 		if ($max && $id >= $max)
 		{
@@ -1593,7 +1593,7 @@ class common
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw']->db->select(self::NEXTID_TABLE,'id',array('appname' => $appname),__LINE__,__FILE__)->fetchSingle();
+		$id = (int)$GLOBALS['egw']->db->select(self::NEXTID_TABLE,'id',array('appname' => $appname),__LINE__,__FILE__)->fetchColumn();
 
 		if (!$id || $id < $min)
 		{
diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index 44429c4008..afd7bf9ac5 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -116,7 +116,7 @@ class contenthistory
 			'sync_contentid' => $_id,
 		);
 
-		if (($ts = $this->db->select(self::TABLE,$col,$where,__LINE__,__FILE__)->fetchSingle()))
+		if (($ts = $this->db->select(self::TABLE,$col,$where,__LINE__,__FILE__)->fetchColumn()))
 		{
 			$ts = $this->db->from_timestamp($ts);
 		}
@@ -155,7 +155,7 @@ class contenthistory
 					'sync_contentid'	=> $_id,
 				);
 
-				if (!$this->db->select(self::TABLE,'sync_contentid',$where,__LINE__,__FILE__)->fetchSingle())
+				if (!$this->db->select(self::TABLE,'sync_contentid',$where,__LINE__,__FILE__)->fetchColumn())
 				{
 					$this->db->insert(self::TABLE,$newData,array(),__LINE__,__FILE__);
 				}
diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 8d7ef094be..aa9b67281a 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -39,7 +39,7 @@
  * egw_db allows to use exceptions to catch sql-erros, not existing tables or failure to connect to the database, eg.:
  *		try {
  *			$this->db->connect();
- *			$num_config = $this->db->select(config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchSingle();
+ *			$num_config = $this->db->select(config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
  *		}
  *		catch(Exception $e) {
  *			echo "Connection to DB failed (".$e->getMessage().")!\n";
diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 69da1f8e20..052b0be5f8 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -651,7 +651,7 @@ abstract class egw_framework
 		{
 			require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/xajax.inc.php');
 
-			$xajax =& new xajax($GLOBALS['egw']->link('/xajax.php'), 'xajax_', $GLOBALS['egw']->translation->charset());
+			$xajax = new xajax($GLOBALS['egw']->link('/xajax.php'), 'xajax_', $GLOBALS['egw']->translation->charset());
 			$xajax->waitCursorOff();
 			$xajax->registerFunction("doXMLHTTP");
 
diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index 46e653abb7..f80865b2fb 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -679,7 +679,7 @@ class egw_session
 			'account_id = 0',
 			'ip'         => $ip,
 			"li > $block_time",
-		),__LINE__,__FILE__)->fetchSingle()) > $GLOBALS['egw_info']['server']['num_unsuccessful_ip'])
+		),__LINE__,__FILE__)->fetchColumn()) > $GLOBALS['egw_info']['server']['num_unsuccessful_ip'])
 		{
 			//echo "<p>login_blocked: ip='$ip' ".$this->db->f(0)." trys (".$GLOBALS['egw_info']['server']['num_unsuccessful_ip']." max.) since ".date('Y/m/d H:i',$block_time)."</p>\n";
 			$blocked = true;
@@ -688,7 +688,7 @@ class egw_session
 			'account_id = 0',
 			'(loginid = '.$GLOBALS['egw']->db->quote($login).' OR loginid LIKE '.$GLOBALS['egw']->db->quote($login.'@%').')',
 			"li > $block_time",
-		),__LINE__,__FILE__)->fetchSingle()) > $GLOBALS['egw_info']['server']['num_unsuccessful_id'])
+		),__LINE__,__FILE__)->fetchColumn()) > $GLOBALS['egw_info']['server']['num_unsuccessful_id'])
 		{
 			//echo "<p>login_blocked: login='$login' ".$this->db->f(0)." trys (".$GLOBALS['egw_info']['server']['num_unsuccessful_id']." max.) since ".date('Y/m/d H:i',$block_time)."</p>\n";
 			$blocked = true;
diff --git a/phpgwapi/inc/class.error.inc.php b/phpgwapi/inc/class.error.inc.php
index c661d206ec..cf2695ec31 100755
--- a/phpgwapi/inc/class.error.inc.php
+++ b/phpgwapi/inc/class.error.inc.php
@@ -61,7 +61,7 @@
 			}
 			$fname = $parms['file'];
 			$line  = $parms['line'];
-			if (eregi('([DIWEF])-([[:alnum:]]*)\, (.*)',$etext,$match))
+			if (preg_match('/([DIWEF])-([[:alnum:]]*)\, (.*)/i',$etext,$match))
 			{
 				$this->severity = strtoupper($match[1]);
 				$this->code     = $match[2];
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 91cf826732..3a8122d473 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -886,14 +886,14 @@ class html
 	 */
 	static function image( $app,$name,$title='',$options='' )
 	{
-		if (substr($name,0,5) == 'vfs:/')	// vfs pseudo protocoll
-		{
-			$name = egw_vfs::download_url(substr($name,4));
-		}
 		if (is_array($name))	// menuaction and other get-vars
 		{
 			$name = $GLOBALS['egw']->link('/index.php',$name);
 		}
+		if (substr($name,0,5) == 'vfs:/')	// vfs pseudo protocoll
+		{
+			$name = egw_vfs::download_url(substr($name,4));
+		}
 		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://' || stripos($name,'etemplate/thumbnail.php') )
 		{
 			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')) $name = '/'.$name;
diff --git a/phpgwapi/inc/class.http.inc.php b/phpgwapi/inc/class.http.inc.php
index 7324072b8e..58b42523b5 100644
--- a/phpgwapi/inc/class.http.inc.php
+++ b/phpgwapi/inc/class.http.inc.php
@@ -459,7 +459,7 @@
 									}
 									break;
 								case 'expires':
-									if(ereg("^((Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday|Sun|Sunday), )?([0-9]{2})\\-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\-([0-9]{2,4}) ([0-9]{2})\\:([0-9]{2})\\:([0-9]{2}) GMT$",$value,$matches))
+									if(preg_match('/'."^((Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday|Sun|Sunday), )?([0-9]{2})\\-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\-([0-9]{2,4}) ([0-9]{2})\\:([0-9]{2})\\:([0-9]{2}) GMT$".'/',$value,$matches))
 									{
 										$year = (int)$matches[5];
 										if($year<1900)
diff --git a/phpgwapi/inc/class.interserver.inc.php b/phpgwapi/inc/class.interserver.inc.php
index 337fa9147a..11704860c9 100644
--- a/phpgwapi/inc/class.interserver.inc.php
+++ b/phpgwapi/inc/class.interserver.inc.php
@@ -81,7 +81,7 @@
 
 		function interserver($serverid='')
 		{
-			$url = eregi_replace('https*://[^/]*/','',$GLOBALS['egw_info']['server']['webserver_url']);
+			$url = preg_replace('/https*:\\/\\/[^\\/]*\\//i','',$GLOBALS['egw_info']['server']['webserver_url']);
 			$this->urlparts = array(
 				'xmlrpc' => $url.'/xmlrpc.php',
 				'soap'   => $url.'/soap.php'
diff --git a/phpgwapi/inc/class.javascript.inc.php b/phpgwapi/inc/class.javascript.inc.php
index d303e0ea76..f144de598d 100644
--- a/phpgwapi/inc/class.javascript.inc.php
+++ b/phpgwapi/inc/class.javascript.inc.php
@@ -309,7 +309,7 @@
 					$thyapi_comp = 'thyapi_comp_gecko.js';
 			}
 
-			$GLOBALS['egw_info']['flags']['java_script_globals']['jsapi']['imgDir'] = $GLOBALS['egw_info']['server']['webserver_url'].'/'.'phpgwapi/images';
+			$GLOBALS['egw_info']['flags']['java_script_globals']['jsapi']['imgDir'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images';
 			if (EGW_UNCOMPRESSED_THYAPI)
 			{
 				$jsCode  = "<!-- JS Global Variables and ThyAPI Insertion -->\n" .
diff --git a/phpgwapi/inc/class.jscalendar.inc.php b/phpgwapi/inc/class.jscalendar.inc.php
index ae37eaee02..e0ade483fc 100644
--- a/phpgwapi/inc/class.jscalendar.inc.php
+++ b/phpgwapi/inc/class.jscalendar.inc.php
@@ -204,8 +204,8 @@ function monthClicked(calendar,monthstart) {
 		{
 			return False;
 		}
-		$fields = split('[./-]',$datestr);
-		foreach(split('[./-]',$this->dateformat) as $n => $field)
+		$fields = preg_split('/[.\\/-]/',$datestr);
+		foreach(preg_split('/[.\\/-]/',$this->dateformat) as $n => $field)
 		{
 			if ($field == 'M')
 			{
diff --git a/phpgwapi/inc/class.phpmailer.inc.php b/phpgwapi/inc/class.phpmailer.inc.php
index f9f367814a..82abf5bd95 100644
--- a/phpgwapi/inc/class.phpmailer.inc.php
+++ b/phpgwapi/inc/class.phpmailer.inc.php
@@ -496,7 +496,7 @@ class PHPMailer {
       $to .= $this->AddrFormat($this->to[$i]);
     }
 
-    $toArr = split(',', $to);
+    $toArr = explode(',', $to);
 
     $params = sprintf("-oi -f %s", $this->Sender);
     if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
@@ -1779,7 +1779,7 @@ class PHPMailer {
           $directory = dirname($url);
           ($directory == '.')?$directory='':'';
           $cid = 'cid:' . md5($filename);
-          $fileParts = split("\.", $filename);
+          $fileParts = explode("\.", $filename);
           $ext = $fileParts[1];
           $mimeType = $this->_mime_types($ext);
           if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
diff --git a/phpgwapi/inc/class.soap_client.inc.php b/phpgwapi/inc/class.soap_client.inc.php
index b6c31397c8..ad3c6cfdc1 100644
--- a/phpgwapi/inc/class.soap_client.inc.php
+++ b/phpgwapi/inc/class.soap_client.inc.php
@@ -53,12 +53,12 @@
 			$this->action = '';
 
 			// endpoint mangling
-			if(ereg("^http://",$path))
+			if(preg_match('/'."^http:\\/\\/".'/',$path))
 			{
 				$path = str_replace('http://','',$path);
 				$this->path = strstr($path,'/');
 				$this->debug("path = $this->path");
-				if(ereg(':',$path))
+				if(preg_match('/:/',$path))
 				{
 					$this->server = substr($path,0,strpos($path,':'));
 					$this->port = substr(strstr($path,':'),1);
diff --git a/phpgwapi/inc/class.soap_parser.inc.php b/phpgwapi/inc/class.soap_parser.inc.php
index 0e5228719d..ec7d3d22d6 100644
--- a/phpgwapi/inc/class.soap_parser.inc.php
+++ b/phpgwapi/inc/class.soap_parser.inc.php
@@ -134,15 +134,15 @@
 			$this->parent = $pos;
 
 			// set status
-			if(ereg(":Envelope$",$name))
+			if(preg_match('/'.":Envelope$".'/',$name))
 			{
 				$this->status = 'envelope';
 			}
-			elseif(ereg(":Header$",$name))
+			elseif(preg_match('/'.":Header$".'/',$name))
 			{
 				$this->status = 'header';
 			}
-			elseif(ereg(":Body$",$name))
+			elseif(preg_match('/'.":Body$".'/',$name))
 			{
 				$this->status = 'body';
 			// set method
@@ -150,7 +150,7 @@
 			elseif($this->status == 'body')
 			{
 				$this->status = 'method';
-				if(ereg(':',$name))
+				if(preg_match('/:/',$name))
 				{
 					$this->root_struct_name = substr(strrchr($name,':'),1);
 				}
@@ -169,7 +169,7 @@
 			// set attrs
 			$this->message[$pos]['attrs'] = $attrs;
 			// get namespace
-			if(ereg(":",$name))
+			if(preg_match('/'.":".'/',$name))
 			{
 				$namespace = substr($name,0,strpos($name,':'));
 				$this->message[$pos]['namespace'] = $namespace;
@@ -185,7 +185,7 @@
 			/* foreach($attrs as $key => $value) */
 			{
 				// if ns declarations, add to class level array of valid namespaces
-				if(ereg('xmlns:',$key))
+				if(preg_match('/xmlns:/',$key))
 				{
 					$namespaces[substr(strrchr($key,':'),1)] = $value;
 					if($name == $this->root_struct_name)
@@ -280,11 +280,11 @@
 			{
 				$this->status = 'body';
 			}
-			elseif(ereg(':Body',$name))
+			elseif(preg_match('/:Body/',$name))
 			{
 				$this->status = 'header';
 	 		}
-			elseif(ereg(':Header',$name))
+			elseif(preg_match('/:Header/',$name))
 			{
 				$this->status = 'envelope';
 			}
diff --git a/phpgwapi/inc/class.soap_server.inc.php b/phpgwapi/inc/class.soap_server.inc.php
index badabeff8c..0861ebe3db 100644
--- a/phpgwapi/inc/class.soap_server.inc.php
+++ b/phpgwapi/inc/class.soap_server.inc.php
@@ -81,13 +81,13 @@
 			if($headers_array["SOAPAction"])
 			{
 				$action = str_replace('"','',$headers_array["SOAPAction"]);
-				if(ereg("^urn:",$action))
+				if(preg_match('/'."^urn:".'/',$action))
 				{
 					$this->service = substr($action,4);
 				}
-				elseif(ereg(".php",$action))
+				elseif(preg_match('/'.".php".'/',$action))
 				{
-					$this->service = ereg_replace('"|/','',substr(strrchr($action,".php"),4,strlen(strrchr($action,"/"))));
+					$this->service = preg_replace('/"|\\//','',substr(strrchr($action,".php"),4,strlen(strrchr($action,"/"))));
 				}
 				$this->debug("got service: $this->service");
 			}
@@ -105,7 +105,7 @@
 			$this->debug("method name: $this->methodname");
 
 			// does method exist?
-			$test = ereg_replace("\.",'_',$this->methodname);
+			$test = preg_replace('/'."\.".'/','_',$this->methodname);
 			if(function_exists($test))
 			{
 				$method = $this->methodname = $test;
@@ -115,7 +115,7 @@
 			{
 				/* egroupware customization - createobject based on methodname */
 				list($app,$class,$method) = explode('.',$this->methodname);
-				if(ereg("^service",$app))
+				if(preg_match('/'."^service".'/',$app))
 				{
 					$args  = $class;
 					$class = 'service';
diff --git a/phpgwapi/inc/class.soapmsg.inc.php b/phpgwapi/inc/class.soapmsg.inc.php
index cdd9208c3f..30900c03c9 100644
--- a/phpgwapi/inc/class.soapmsg.inc.php
+++ b/phpgwapi/inc/class.soapmsg.inc.php
@@ -111,12 +111,12 @@
 			$this->debug("Entering parseResponse()");
 			//$this->debug(" w/ data $data");
 			// strip headers here
-			//$clean_data = ereg_replace("\r\n","\n", $data);
-			if(ereg("^.*\r\n\r\n<",$data))
+			//$clean_data = preg_replace('/'."\r\n".'/',"\n", $data);
+			if(preg_match('/'."^.*\r\n\r\n<".'/',$data))
 			{
 				$this->debug("found proper seperation of headers and document");
 				$this->debug("getting rid of headers, stringlen: ".strlen($data));
-				$clean_data = ereg_replace("^.*\r\n\r\n<","<", $data);
+				$clean_data = preg_replace('/'."^.*\r\n\r\n<".'/',"<", $data);
 				$this->debug("cleaned data, stringlen: ".strlen($clean_data));
 			}
 			else
@@ -134,7 +134,7 @@
 			}
 	/*
 			// if response is a proper http response, and is not a 200
-			if(ereg("^HTTP",$clean_data) && !ereg("200$", $clean_data))
+			if(preg_match('/'."^HTTP".'/',$clean_data) && !preg_match('/'."200$".'/', $clean_data))
 			{
 				// get error data
 				$errstr = substr($clean_data, 0, strpos($clean_data, "\n")-1);
diff --git a/phpgwapi/inc/class.soapval.inc.php b/phpgwapi/inc/class.soapval.inc.php
index 9127ce6a1a..01e2a93b97 100644
--- a/phpgwapi/inc/class.soapval.inc.php
+++ b/phpgwapi/inc/class.soapval.inc.php
@@ -94,7 +94,7 @@
 			}
 
 			// get type prefix
-			if(ereg(":",$type))
+			if(preg_match('/'.":".'/',$type))
 			{
 				$this->type = substr(strrchr($type,':'),1,strlen(strrchr($type,':')));
 				$this->type_prefix = substr($type,0,strpos($type,':'));
@@ -198,7 +198,7 @@
 								$type = 'array';
 							}
 						}
-						elseif(!ereg("^[0-9]*$",$k) && in_array($k,array_keys($this->soapTypes)))
+						elseif(!preg_match('/'."^[0-9]*$".'/',$k) && in_array($k,array_keys($this->soapTypes)))
 						{
 							$type = $k;
 						}
diff --git a/phpgwapi/inc/class.validator.inc.php b/phpgwapi/inc/class.validator.inc.php
index 9eeafce78b..2e250bf724 100644
--- a/phpgwapi/inc/class.validator.inc.php
+++ b/phpgwapi/inc/class.validator.inc.php
@@ -50,7 +50,7 @@
 		/* strips all whitespace from a string */
 		function strip_space($text)
 		{
-			return ereg_replace("( |\n|\t|\r)+", '', $text);
+			return preg_replace('/'."( |\n|\t|\r)+".'/', '', $text);
 		}
 
 		function is_allnumbers($text)
@@ -196,7 +196,7 @@
 				foreach($segs as $seg)
 				{
 					//echo "Checking $seg<br>";
-					if(eregi("[a-z0-9\-]{0,62}",$seg))
+					if(preg_match('/'."[a-z0-9\-]{0,62}".'/i',$seg))
 					{
 						$return = True;
 					}
diff --git a/phpgwapi/inc/class.vcard.inc.php b/phpgwapi/inc/class.vcard.inc.php
index 82a71db278..7d38cdfe0b 100644
--- a/phpgwapi/inc/class.vcard.inc.php
+++ b/phpgwapi/inc/class.vcard.inc.php
@@ -123,7 +123,7 @@
 			$fp = fopen($filename,'r');
 			while($data = fgets($fp,8000))
 			{
-				list($name,$value,$extra) = split(':', $data);
+				list($name,$value,$extra) = explode(':', $data);
 				if(substr($value,0,5) == 'http')
 				{
 					$value = $value . ':'.$extra;
@@ -216,12 +216,12 @@
 			settype($buffer,'array');
 			foreach($buffer as $name => $value)
 			{
-				$field  = split(';',$name);
-				$field[0] = ereg_replace("A\.",'',$field[0]);
-				$field[0] = ereg_replace("B\.",'',$field[0]);
-				$field[0] = ereg_replace("C\.",'',$field[0]);
-				$field[0] = ereg_replace("D\.",'',$field[0]);
-				$values = split(';',$value);
+				$field  = explode(';',$name);
+				$field[0] = preg_replace('/'."A\.".'/','',$field[0]);
+				$field[0] = preg_replace('/'."B\.".'/','',$field[0]);
+				$field[0] = preg_replace('/'."C\.".'/','',$field[0]);
+				$field[0] = preg_replace('/'."D\.".'/','',$field[0]);
+				$values = explode(';',$value);
 				if($field[1])
 				{
 					//echo $field[0];
@@ -594,7 +594,7 @@
 							}
 							else
 							{
-								$tmp = split('-',$values[0]);
+								$tmp = explode('-',$values[0]);
 								if($tmp[0])
 								{
 									$entry['bday'] = $tmp[1] . '/' . $tmp[2] . '/' . $tmp[0];
@@ -612,7 +612,7 @@
 			$entry['adr_one_type'] = substr($buffer['adr_one_type'],0,-1);
 			$entry['adr_two_type'] = substr($buffer['adr_two_type'],0,-1);
 
-			if(count($street = split("\r*\n",$buffer['adr_one_street'],3)) > 1)
+			if(count($street = preg_split("/\r*\n/",$buffer['adr_one_street'],3)) > 1)
 			{
 				$entry['adr_one_street'] = $street[0];	// RB 2001/05/08 added for Lotus Organizer to split multiline adresses
 				$entry['address2'] = $street[1];
@@ -650,7 +650,7 @@
 						}
 						elseif($value == 'BDAY')
 						{
-							$tmp = split('/',$buffer[$value]); # 12/31/1969 -> 1969-12-31
+							$tmp = explode('/',$buffer[$value]); # 12/31/1969 -> 1969-12-31
 							if($tmp[0])
 							{
 								if(strlen($tmp[0]) == 1) { $tmp[0] = '0'.$tmp[0]; }
diff --git a/phpgwapi/inc/class.wsdl.inc.php b/phpgwapi/inc/class.wsdl.inc.php
index a633f4967a..b1e2770030 100644
--- a/phpgwapi/inc/class.wsdl.inc.php
+++ b/phpgwapi/inc/class.wsdl.inc.php
@@ -205,7 +205,7 @@
 					break;
 			}
 			// get element prefix
-			if(ereg(":",$name))
+			if(preg_match('/'.":".'/',$name))
 			{
 				$prefix = substr($name,0,strpos($name,':'));
 			}
diff --git a/phpgwapi/inc/class.xml.inc.php b/phpgwapi/inc/class.xml.inc.php
index efd56fc1e7..e67033b26a 100644
--- a/phpgwapi/inc/class.xml.inc.php
+++ b/phpgwapi/inc/class.xml.inc.php
@@ -494,7 +494,7 @@ class XML
     function remove_node ( $node )
     {
         // Check whether the node is an attribute node.
-        if ( ereg("/attribute::", $node) )
+        if ( preg_match('/'."\\/attribute::".'/', $node) )
         {
             // Get the path to the attribute node's parent.
             $parent = $this->prestr($node, "/attribute::");
@@ -612,7 +612,7 @@ class XML
     function add_content ( $path, $value )
     {
         // Check whether it's an attribute node.
-        if ( ereg("/attribute::", $path) )
+        if ( preg_match('/'."\\/attribute::".'/', $path) )
         {
             // Get the path to the attribute node's parent.
             $parent = $this->prestr($path, "/attribute::");
@@ -649,7 +649,7 @@ class XML
     function set_content ( $path, $value )
     {
         // Check whether it's an attribute node.
-        if ( ereg("/attribute::", $path) )
+        if ( preg_match('/'."\\/attribute::".'/', $path) )
         {
             // Get the path to the attribute node's parent.
             $parent = $this->prestr($path, "/attribute::");
@@ -688,7 +688,7 @@ class XML
     function get_content ( $path )
     {
         // Check whether it's an attribute node.
-        if ( ereg("/attribute::", $path) )
+        if ( preg_match('/'."\\/attribute::".'/', $path) )
         {
             // Get the path to the attribute node's parent.
             $parent = $this->prestr($path, "/attribute::");
@@ -1053,7 +1053,7 @@ class XML
         );
         
         // Check whether there are predicates.
-        if ( ereg("\[", $step) )
+        if ( preg_match('/'."\[".'/', $step) )
         {
             // Get the predicates.
             $predicates = substr($step, strpos($step, "["));
@@ -1099,7 +1099,7 @@ class XML
                 $axis["axis"]      = "child";
                 $axis["node-test"] = "*";
             }
-            elseif ( ereg("\(", $step) )
+            elseif ( preg_match('/'."\(".'/', $step) )
             {
                 // Check whether it's a function.
                 if ( $this->is_function($this->prestr($step, "(")) )
@@ -1130,13 +1130,13 @@ class XML
                     $axis["node-test"] = $step;
                 }
             }
-            elseif ( eregi("^@", $step) )
+            elseif ( preg_match('/'."^@".'/i', $step) )
             {
                 // Use the attribute axis and select the attribute.
                 $axis["axis"]      = "attribute";
                 $axis["node-test"] = substr($step, 1);
             }
-            elseif ( eregi("\]$", $step) )
+            elseif ( preg_match('/'."\]$".'/i', $step) )
             {
                 // Use the child axis and select a position.
                 $axis["axis"]      = "child";
@@ -1154,7 +1154,7 @@ class XML
                 $axis["axis"]      = "parent";
                 $axis["node-test"] = "*";
             }
-            elseif ( ereg("^[a-zA-Z0-9\-_]+$", $step) )
+            elseif ( preg_match('/'."^[a-zA-Z0-9\-_]+$".'/', $step) )
             {
                 // Select the child axis and the child.
                 $axis["axis"]      = "child";
@@ -1496,7 +1496,7 @@ class XML
             foreach ( $this->functions as $function )
             {
                 // Check whether there's a - sign in the function name.
-                if ( ereg("-", $function) )
+                if ( preg_match('/'."-".'/', $function) )
                 {
                     // Get the position of the - in the function name.
                     $sign = strpos($function, "-");
@@ -1615,7 +1615,7 @@ class XML
         }
         
         // Check whether the predicate is a function.
-        if ( ereg("\(", $predicate) )
+        if ( preg_match('/'."\(".'/', $predicate) )
         {
             // Get the position of the first bracket.
             $start = strpos($predicate, "(");
@@ -1664,8 +1664,8 @@ class XML
         }
         
         // Check whether the predicate is just a digit.
-        if ( ereg("^[0-9]+(\.[0-9]+)?$", $predicate) ||
-            ereg("^\.[0-9]+$", $predicate) )
+        if ( preg_match('/'."^[0-9]+(\.[0-9]+)?$".'/', $predicate) ||
+            preg_match('/'."^\.[0-9]+$".'/', $predicate) )
         {
             // Return the value of the digit.
             return doubleval($predicate);
@@ -1718,7 +1718,7 @@ class XML
             foreach ( $predicates as $predicate )
             {
                 // Check whether the predicate is just an number.
-                if ( ereg("^[0-9]+$", $predicate) )
+                if ( preg_match('/'."^[0-9]+$".'/', $predicate) )
                 {
                     // Enhance the predicate.
                     $predicate .= "=position()";
@@ -1786,7 +1786,7 @@ class XML
     function check_node_test ( $context, $node_test )
     {
         // Check whether it's a function.
-        if ( ereg("\(", $node_test) )
+        if ( preg_match('/'."\(".'/', $node_test) )
         {
             // Get the type of function to use.
             $function = $this->prestr($node_test, "(");
@@ -1862,7 +1862,7 @@ class XML
             // Add this node to the node-set.
             return true;
         }
-        elseif ( ereg("^[a-zA-Z0-9\-_]+", $node_test) )
+        elseif ( preg_match('/'."^[a-zA-Z0-9\-_]+".'/', $node_test) )
         {
             // Check whether the node-test can be fulfilled.
             if ( $this->nodes[$context]["name"] == $node_test )
@@ -2592,8 +2592,8 @@ class XML
     function handle_function_string ( $node, $arguments )
     {
         // Check what type of parameter is given
-        if ( ereg("^[0-9]+(\.[0-9]+)?$", $arguments) ||
-            ereg("^\.[0-9]+$", $arguments) )
+        if ( preg_match('/'."^[0-9]+(\.[0-9]+)?$".'/', $arguments) ||
+            preg_match('/'."^\.[0-9]+$".'/', $arguments) )
         {
             // Convert the digits to a number.
             $number = doubleval($arguments);
@@ -2701,7 +2701,7 @@ class XML
         $second = $this->evaluate_predicate($node, $second);
             
         // Check whether the first string starts with the second one.
-        if ( ereg("^".$second, $first) )
+        if ( preg_match('/'."^".$second.'/', $first) )
         {
             // Return true.
             return true;
@@ -2935,8 +2935,8 @@ class XML
         $arguments = trim($arguments);
         
         // Check what type of parameter is given
-        if ( ereg("^[0-9]+(\.[0-9]+)?$", $arguments) ||
-            ereg("^\.[0-9]+$", $arguments) )
+        if ( preg_match('/'."^[0-9]+(\.[0-9]+)?$".'/', $arguments) ||
+            preg_match('/'."^\.[0-9]+$".'/', $arguments) )
         {
             // Convert the digits to a number.
             $number = doubleval($arguments);
@@ -3128,8 +3128,8 @@ class XML
     function handle_function_number ( $node, $arguments )
     {
         // Check the type of argument.
-        if ( ereg("^[0-9]+(\.[0-9]+)?$", $arguments) ||
-            ereg("^\.[0-9]+$", $arguments) )
+        if ( preg_match('/'."^[0-9]+(\.[0-9]+)?$".'/', $arguments) ||
+            preg_match('/'."^\.[0-9]+$".'/', $arguments) )
         {
             // Return the argument as a number.
             return doubleval($arguments);
@@ -3367,7 +3367,7 @@ class XML
 			}
 			
 			// Replace the last separator.
-			$command = eregi_replace(", $", ");", $command);
+			$command = preg_replace('/'.", $".'/i', ");", $command);
 			
 			// Execute the command.
 			eval($command);
diff --git a/phpgwapi/inc/class.xmlrpc_client.inc.php b/phpgwapi/inc/class.xmlrpc_client.inc.php
index 87f36bf2c0..19e773d779 100644
--- a/phpgwapi/inc/class.xmlrpc_client.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_client.inc.php
@@ -211,7 +211,7 @@
 			}
 			elseif(is_string($msg))
 			{
-				$n =& new xmlrpcmsg('');
+				$n = new xmlrpcmsg('');
 				$n->payload = $msg;
 				$msg = $n;
 			}
@@ -668,17 +668,17 @@
 			$calls = array();
 			foreach($msgs as $msg)
 			{
-				$call['methodName'] =& new xmlrpcval($msg->method(),'string');
+				$call['methodName'] = new xmlrpcval($msg->method(),'string');
 				$numParams = $msg->getNumParams();
 				$params = array();
 				for($i = 0; $i < $numParams; $i++)
 				{
 					$params[$i] = $msg->getParam($i);
 				}
-				$call['params'] =& new xmlrpcval($params, 'array');
-				$calls[] =& new xmlrpcval($call, 'struct');
+				$call['params'] = new xmlrpcval($params, 'array');
+				$calls[] = new xmlrpcval($call, 'struct');
 			}
-			$multicall =& new xmlrpcmsg('system.multicall');
+			$multicall = new xmlrpcmsg('system.multicall');
 			$multicall->addParam(new xmlrpcval($calls, 'array'));
 
 			// Attempt RPC call
@@ -717,7 +717,7 @@
 							return false;		// Bad value
 						}
 						// Normal return value
-						$response[$i] =& new xmlrpcresp($val->arraymem(0));
+						$response[$i] = new xmlrpcresp($val->arraymem(0));
 						break;
 					case 'struct':
 						$code = $val->structmem('faultCode');
@@ -730,7 +730,7 @@
 						{
 							return false;
 						}
-						$response[$i] =& new xmlrpcresp(0, $code->scalarval(), $str->scalarval());
+						$response[$i] = new xmlrpcresp(0, $code->scalarval(), $str->scalarval());
 						break;
 					default:
 						return false;
diff --git a/phpgwapi/inc/class.xmlrpc_server.inc.php b/phpgwapi/inc/class.xmlrpc_server.inc.php
index 80540ea0bb..16e842646e 100644
--- a/phpgwapi/inc/class.xmlrpc_server.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_server.inc.php
@@ -52,12 +52,12 @@
 		{
 			$arr = array();
 
-			if (ereg('^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})$',$isodate,$arr))
+			if (preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})$/',$isodate,$arr))
 			{
 				// $isodate is simple ISO8601, remove the difference between split and ereg
 				array_shift($arr);
 			}
-			elseif (($arr = split('[-:T]',$isodate)) && count($arr) == 6)
+			elseif (($arr = preg_split('/[-:T]/',$isodate)) && count($arr) == 6)
 			{
 				// $isodate is extended ISO8601, do nothing
 			}
diff --git a/phpgwapi/inc/class.xmlrpc_server_epi.inc.php b/phpgwapi/inc/class.xmlrpc_server_epi.inc.php
index 6cc0c8166d..199dc2015a 100644
--- a/phpgwapi/inc/class.xmlrpc_server_epi.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_server_epi.inc.php
@@ -161,7 +161,7 @@
 			$syscall = 0;
 
 			/* Setup dispatch map based on the function, if this is a system call */
-			if(ereg('^system\.', $methName))
+			if(preg_match('/^system\./', $methName))
 			{
 				foreach($GLOBALS['_xmlrpcs_dmap'] as $meth => $dat)
 				{
@@ -170,8 +170,8 @@
 				$sysCall = 1;
 				$dmap = $this->dmap;
 			}
-			elseif(ereg('^examples\.',$methName) ||
-				ereg('^validator1\.',$methName) ||
+			elseif(preg_match('/^examples\./',$methName) ||
+				preg_match('/^validator1\./',$methName) ||
 				ereg('^interopEchoTests\.', $methName)
 			)
 			{
diff --git a/phpgwapi/inc/class.xmlrpc_server_php.inc.php b/phpgwapi/inc/class.xmlrpc_server_php.inc.php
index 18575dd742..fb66925eb1 100644
--- a/phpgwapi/inc/class.xmlrpc_server_php.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_server_php.inc.php
@@ -238,8 +238,8 @@
 			}
 			$_type = (is_integer($_res) ? 'int' : gettype($_res));
 
-			if ($_type == 'string' && (ereg('^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}$',$_res) ||
-				ereg('^[0-9]{4}[0-9]{2}[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}$',$_res)))
+			if ($_type == 'string' && (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/',$_res) ||
+				preg_match('/^[0-9]{4}[0-9]{2}[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/',$_res)))
 			{
 				$_type = 'dateTime.iso8601';
 			}
@@ -312,7 +312,7 @@
 				$_methName = $GLOBALS['_xh'][$parser]['method'];
 				$this->last_method = $methName;
 
-				if(ereg("^system\.", $methName))
+				if(preg_match('/'."^system\.".'/', $methName))
 				{
 					$dmap = $GLOBALS['_xmlrpcs_dmap'];
 					$sysCall=1;
@@ -346,7 +346,7 @@
 						$service  = $tmp[1];
 						$class    = $tmp[0];
 
-						if(ereg('^service',$method))
+						if(preg_match('/^service/',$method))
 						{
 							$t = 'phpgwapi.' . $class . '.exec';
 							$dmap = ExecMethod($t,array($service,'list_methods','xmlrpc'));
@@ -420,7 +420,7 @@
 								// decode from utf-8 to our charset
 								$this->req_array = $GLOBALS['egw']->translation->convert($this->req_array,'utf-8');
 								//_debug_array($this->req_array);
-								if (ereg('^service',$method))
+								if (preg_match('/^service/',$method))
 								{
 									$res = ExecMethod('phpgwapi.service.exec',array($service,$methName,$this->req_array));
 								}
diff --git a/phpgwapi/inc/class.xmlrpcmsg.inc.php b/phpgwapi/inc/class.xmlrpcmsg.inc.php
index b4e406da6b..38bb94f821 100644
--- a/phpgwapi/inc/class.xmlrpcmsg.inc.php
+++ b/phpgwapi/inc/class.xmlrpcmsg.inc.php
@@ -130,10 +130,10 @@
 			}
 			// see if we got an HTTP 200 OK, else bomb
 			// but only do this if we're using the HTTP protocol.
-			if(ereg("^HTTP",$data))
+			if(preg_match('/'."^HTTP".'/',$data))
 			{
 				// Strip HTTP 1.1 100 Continue header if present
-				while(ereg('^HTTP/1.1 1[0-9]{2} ', $data))
+				while(preg_match('/^HTTP\\/1.1 1[0-9]{2} /', $data))
 				{
 					$pos = strpos($data, 'HTTP', 12);
 					// server sent a Continue header without any (valid) content following...
@@ -144,7 +144,7 @@
 					}
 					$data = substr($data, $pos);
 				}
-				if(!ereg("^HTTP/[0-9\\.]+ 200 ", $data))
+				if(!preg_match('/'."^HTTP\\/[0-9\\.]+ 200 ".'/', $data))
 				{
 					$errstr= substr($data, 0, strpos($data, "\n")-1);
 					error_log('HTTP error, got response: ' .$errstr);
@@ -159,7 +159,7 @@
 			$GLOBALS['_xh'][$parser]['valuestack'] = array();
 
 			// separate HTTP headers from data
-			if(ereg("^HTTP", $data))
+			if(preg_match('/'."^HTTP".'/', $data))
 			{
 				// be tolerant to usage of \n instead of \r\n to separate headers and data
 				// (even though it is not valid http)
@@ -182,7 +182,7 @@
 					}
 				}
 				// be tolerant to line endings, and extra empty lines
-				$ar = split("\r?\n", trim(substr($data, 0, $pos)));
+				$ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));
 				while(list(,$line) = @each($ar))
 				{
 					// take care of multi-line headers
diff --git a/phpgwapi/inc/class.xmlrpcresp.inc.php b/phpgwapi/inc/class.xmlrpcresp.inc.php
index 0d1c327287..41b8522d33 100644
--- a/phpgwapi/inc/class.xmlrpcresp.inc.php
+++ b/phpgwapi/inc/class.xmlrpcresp.inc.php
@@ -40,7 +40,7 @@
 				// programmer error
 				// TODO
 				error_log("Invalid type '" . gettype($val) . "' (value: $val) passed to xmlrpcresp. Defaulting to empty value.");
-				$this->val =& new xmlrpcval();
+				$this->val = new xmlrpcval();
 			}
 			else
 			{
diff --git a/phpgwapi/inc/class.xmlrpcval.inc.php b/phpgwapi/inc/class.xmlrpcval.inc.php
index 812c27227c..520ae28f95 100644
--- a/phpgwapi/inc/class.xmlrpcval.inc.php
+++ b/phpgwapi/inc/class.xmlrpcval.inc.php
@@ -84,7 +84,7 @@
 				case 2:
 					// we're adding a scalar value to an array here
 					//$ar=$this->me['array'];
-					//$ar[]=&new xmlrpcval($val, $type);
+					//$ar[]= new xmlrpcval($val, $type);
 					//$this->me['array']=$ar;
 					// Faster (?) avoid all the costly array-copy-by-val done here...
 					$this->me['array'][]=& CreateObject('phpgwapi.xmlrpcval',$val, $type);
diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 547103584e..1900e71b82 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -152,7 +152,7 @@ function print_debug($message,$var = 'messageonly',$part = 'app', $level = 3)
 				/*
 				if (!!(DEBUG_OUTPUT & 32))
 				{
-					$obj_debug =& new COM('Some_COM_App.Class','localhost');
+					$obj_debug = new COM('Some_COM_App.Class','localhost');
 					if (is_object($obj_debug))
 					{
 						$DebugMessage_return = $obj_debug->DebugMessage($output);
@@ -376,9 +376,9 @@ function sanitize($string,$type)
 			}
 			break;
 		case 'ip':
-			if (eregi("^[0-9]{1,3}(\.[0-9]{1,3}){3}$",$string))
+			if (preg_match('/'."^[0-9]{1,3}(\.[0-9]{1,3}){3}$".'/i',$string))
 			{
-				$octets = split('\.',$string);
+				$octets = preg_split('/\./',$string);
 				for ($i=0; $i != count($octets); $i++)
 				{
 					if ($octets[$i] < 0 || $octets[$i] > 255)
@@ -397,7 +397,7 @@ function sanitize($string,$type)
 			}
 			break;
 		case 'email':
-			if (eregi("^([[:alnum:]_%+=.-]+)@([[:alnum:]_.-]+)\.([a-z]{2,3}|[0-9]{1,3})$",$string))
+			if (preg_match('/'."^([[:alnum:]_%+=.-]+)@([[:alnum:]_.-]+)\.([a-z]{2,3}|[0-9]{1,3})$".'/i',$string))
 			{
 				return True;
 			}
@@ -749,19 +749,19 @@ function &CreateObject($class)
 	switch(count($args))
 	{
 		case 1:
-			$obj =& new $classname;
+			$obj = new $classname;
 			break;
 		case 2:
-			$obj =& new $classname($args[1]);
+			$obj = new $classname($args[1]);
 			break;
 		case 3:
-			$obj =& new $classname($args[1],$args[2]);
+			$obj = new $classname($args[1],$args[2]);
 			break;
 		case 4:
-			$obj =& new $classname($args[1],$args[2],$args[3]);
+			$obj = new $classname($args[1],$args[2],$args[3]);
 			break;
 		default:
-			$code = '$obj =& new ' . $classname . '(';
+			$code = '$obj = new ' . $classname . '(';
 			foreach($args as $n => $arg)
 			{
 				if ($n)
diff --git a/phpgwapi/inc/fpdf/tutorial/tuto6.php b/phpgwapi/inc/fpdf/tutorial/tuto6.php
index 0d81a706ea..1893fbe6ff 100755
--- a/phpgwapi/inc/fpdf/tutorial/tuto6.php
+++ b/phpgwapi/inc/fpdf/tutorial/tuto6.php
@@ -47,7 +47,7 @@ function WriteHTML($html)
 				$tag=strtoupper(array_shift($a2));
 				$attr=array();
 				foreach($a2 as $v)
-					if(ereg('^([^=]*)=["\']?([^"\']*)["\']?$',$v,$a3))
+					if(preg_match('/^([^=]*)=["\']?([^"\']*)["\']?$/',$v,$a3))
 						$attr[strtoupper($a3[1])]=$a3[2];
 				$this->OpenTag($tag,$attr);
 			}
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 591ab09700..2314265898 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -18,7 +18,10 @@
  */
 
 error_reporting(E_ALL & ~E_NOTICE);
-magic_quotes_runtime(false);
+if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime())
+{
+	set_magic_quotes_runtime(false);
+}
 
 $egw_min_php_version = '5.1';
 if (!function_exists('version_compare') || version_compare(PHP_VERSION,$egw_min_php_version) < 0)
diff --git a/phpgwapi/inc/horde/Horde/Browser/imode.php b/phpgwapi/inc/horde/Horde/Browser/imode.php
index 9c244af1a0..6e0641e7e2 100644
--- a/phpgwapi/inc/horde/Horde/Browser/imode.php
+++ b/phpgwapi/inc/horde/Horde/Browser/imode.php
@@ -289,14 +289,13 @@ class Browser_imode {
     var $_manufacturer;
     var $_httpversion;
     var $_cache = 5;
-    var $_extra;
 
     /**
      * Does not handle bogus user_agents or most of the other error
      * situation properly yet.
      *
      * Example usage:
-     *   $ua = &new Browser_imode($_SERVEr['HTTP_USER_AGENT']);
+     *   $ua = new Browser_imode($_SERVEr['HTTP_USER_AGENT']);
      *
      * @param string $input  The user agent to match.
      */
diff --git a/phpgwapi/inc/horde/Horde/RPC.php b/phpgwapi/inc/horde/Horde/RPC.php
index 0be53fa29b..4f01799312 100644
--- a/phpgwapi/inc/horde/Horde/RPC.php
+++ b/phpgwapi/inc/horde/Horde/RPC.php
@@ -206,7 +206,7 @@ class Horde_RPC {
         }
         $class = 'Horde_RPC_' . $driver;
         if (class_exists($class)) {
-            $rpc = &new $class($params);
+            $rpc = new $class($params);
         } else {
             require_once 'PEAR.php';
             $rpc = PEAR::raiseError('Class definition of ' . $class . ' not found.');
diff --git a/phpgwapi/inc/horde/Horde/RPC/syncml.php b/phpgwapi/inc/horde/Horde/RPC/syncml.php
index a25ab8a63c..f276e2f6b2 100644
--- a/phpgwapi/inc/horde/Horde/RPC/syncml.php
+++ b/phpgwapi/inc/horde/Horde/RPC/syncml.php
@@ -89,7 +89,7 @@ class Horde_RPC_syncml extends Horde_RPC {
         }
 
         require_once 'XML/WBXML/ContentHandler.php';
-        $this->_output = &new XML_WBXML_ContentHandler();
+        $this->_output = new XML_WBXML_ContentHandler();
 
         $this->_parse($request);
         $response = $this->_output->getOutput();
@@ -200,7 +200,7 @@ class Horde_RPC_syncml extends Horde_RPC {
             // Either <SyncML><SyncHdr> or <SyncML><SyncBody>
             if (!isset($this->_contentHandler)) {
                 // If not defined then create SyncHdr.
-                $this->_contentHandler = &new Horde_SyncML_SyncmlHdr();
+                $this->_contentHandler = new Horde_SyncML_SyncmlHdr();
                 $this->_contentHandler->setOutput($this->_output);
             }
 
@@ -233,7 +233,7 @@ class Horde_RPC_syncml extends Horde_RPC {
 
                 unset($this->_contentHandler);
 
-                $this->_contentHandler = &new Horde_SyncML_SyncmlBody();
+                $this->_contentHandler = new Horde_SyncML_SyncmlBody();
                 $this->_contentHandler->setOutput($this->_output);
             } else {
                 // No longer used.
diff --git a/phpgwapi/inc/horde/Horde/RPC/syncml_wbxml.php b/phpgwapi/inc/horde/Horde/RPC/syncml_wbxml.php
index 1cf5920b17..3d478996a3 100644
--- a/phpgwapi/inc/horde/Horde/RPC/syncml_wbxml.php
+++ b/phpgwapi/inc/horde/Horde/RPC/syncml_wbxml.php
@@ -51,8 +51,8 @@ class Horde_RPC_syncml_wbxml extends Horde_RPC_syncml {
         }
 
 
-        $decoder = &new XML_WBXML_Decoder();
-        $this->_output = &new XML_WBXML_Encoder();
+        $decoder = new XML_WBXML_Decoder();
+        $this->_output = new XML_WBXML_Encoder();
 
         $decoder->setContentHandler($this);
 
diff --git a/phpgwapi/inc/horde/Horde/SyncML.php b/phpgwapi/inc/horde/Horde/SyncML.php
index e57da5d0ec..50bd3935bd 100644
--- a/phpgwapi/inc/horde/Horde/SyncML.php
+++ b/phpgwapi/inc/horde/Horde/SyncML.php
@@ -174,8 +174,8 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
             // Create a new state if one does not already exist.
             Horde::logMessage('SyncML['. session_id() .']: create new session state variable', __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-# LK        $_SESSION['SyncML.state'] = &new Horde_SyncML_State($sourceURI, $locName, $sessionID);
-            $_SESSION['SyncML.state'] = &new EGW_SyncML_State($sourceURI, $locName, $sessionID);
+# LK        $_SESSION['SyncML.state'] = new Horde_SyncML_State($sourceURI, $locName, $sessionID);
+            $_SESSION['SyncML.state'] = new EGW_SyncML_State($sourceURI, $locName, $sessionID);
         }
         #if($_SESSION['SyncML.state']->_isAuthorized)
         #	Horde::logMessage('SyncML['. session_id() .']: is session authorized', __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -269,7 +269,7 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
                 $this->_credData = base64_decode($this->_credData);
                 //}
 
-                $tmp = split(':', $this->_credData, 2);
+                $tmp = explode(':', $this->_credData, 2);
                 // set only if not set by LocName already
                 if(!isset($this->_locName))
                 {
@@ -463,13 +463,13 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 	    if($state->getLocName())
 	    {
             	// Right our status about the header.
-            	$status = &new Horde_SyncML_Command_Status(($state->isAuthorized()) ?
+            	$status = new Horde_SyncML_Command_Status(($state->isAuthorized()) ?
                                                        RESPONSE_AUTHENTICATION_ACCEPTED : RESPONSE_INVALID_CREDENTIALS, 'SyncHdr');
             }
             else
             {
             	// Request credentials if not sent so far
-            	$status = &new Horde_SyncML_Command_Status(RESPONSE_MISSING_CREDENTIALS, 'SyncHdr');
+            	$status = new Horde_SyncML_Command_Status(RESPONSE_MISSING_CREDENTIALS, 'SyncHdr');
             }
 
             $status->setSourceRef($state->getSourceURI());
@@ -533,14 +533,14 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 				// we do still have some data to send OR
 				// we should reply to the Sync command
 				if($state->getSyncStatus() >= CLIENT_SYNC_ACKNOWLEDGED && $state->getSyncStatus() < SERVER_SYNC_FINNISHED) {
-					$sync = &new Horde_SyncML_Command_Sync();
+					$sync = new Horde_SyncML_Command_Sync();
 					$this->_currentCmdID = $sync->syncToClient($this->_currentCmdID, $this->_output);
 				}
 
 				// send the Final tag if possible
 				#if($state->getSyncStatus() != SERVER_SYNC_DATA_PENDING && $state->getSyncStatus() != CLIENT_SYNC_STARTED) {
 				if($state->getSyncStatus() >= SERVER_SYNC_FINNISHED || $state->_sendFinal) {
-					$final = &new Horde_SyncML_Command_Final();
+					$final = new Horde_SyncML_Command_Final();
 					$this->_currentCmdID = $final->output($this->_currentCmdID, $this->_output);
 				}
 
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command.php b/phpgwapi/inc/horde/Horde/SyncML/Command.php
index e67c41d1d6..97a2236109 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command.php
@@ -30,7 +30,7 @@ class Horde_SyncML_Command {
         include_once 'Horde/SyncML/Command/' . $command . '.php';
         $class = 'Horde_SyncML_Command_' . $command;
         if (class_exists($class)) {
-            return $cmd = &new $class($params);
+            return $cmd = new $class($params);
         } else {
             Horde::logMessage('SyncML: Class definition of ' . $class . ' not found.', __FILE__, __LINE__, PEAR_LOG_ERR);
             require_once 'PEAR.php';
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
index cc5c90d089..642211165d 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
@@ -70,7 +70,7 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
 
         // Handle unauthorized first.
         if (!$state->isAuthorized()) {
-            $status = &new Horde_SyncML_Command_Status(RESPONSE_INVALID_CREDENTIALS, 'Alert');
+            $status = new Horde_SyncML_Command_Status(RESPONSE_INVALID_CREDENTIALS, 'Alert');
             $status->setCmdRef($this->_cmdID);
             $currentCmdID = $status->output($currentCmdID, $output);
             return $currentCmdID;
@@ -127,7 +127,7 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
 		    //$state->removeAllUID($this->_targetLocURI);
         	}
 
-        	$status = &new Horde_SyncML_Command_Status($code, 'Alert');
+        	$status = new Horde_SyncML_Command_Status($code, 'Alert');
         	$status->setCmdRef($this->_cmdID);
         	if ($this->_sourceLocURI != null) {
         	    $status->setSourceRef($this->_sourceLocURI);
@@ -241,7 +241,7 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
         	}
 
 	} elseif ($this->_alert == ALERT_NEXT_MESSAGE) {
-        	$status = &new Horde_SyncML_Command_Status(RESPONSE_OK, 'Alert');
+        	$status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Alert');
         	$status->setCmdRef($this->_cmdID);
         	if ($this->_targetLocURI != null) {
         	    $status->setTargetRef((isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI));
@@ -256,7 +256,7 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
         	$state->setAlert222Received(true);
 
 	} else {
-        	$status = &new Horde_SyncML_Command_Status(RESPONSE_OK, 'Alert');
+        	$status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Alert');
         	$status->setCmdRef($this->_cmdID);
         	if ($this->_sourceLocURI != null) {
         	    $status->setSourceRef($this->_sourceLocURI);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
index ddcc6122ae..82199ab933 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
@@ -28,7 +28,7 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
 
         $ref = ($state->getVersion() == 0) ? './devinf10' : './devinf11';
 
-        $status = &new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Get');
+        $status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Get');
         $status->setCmdRef($this->_cmdID);
         $status->setTargetRef($ref);
         $currentCmdID = $status->output($currentCmdID, $output);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php
index 264682de77..fcca7b266c 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php
@@ -46,7 +46,7 @@ class Horde_SyncML_Command_Map extends Horde_SyncML_Command {
 
         $state = $_SESSION['SyncML.state'];
 
-        $status = &new Horde_SyncML_Command_Status($state->isAuthorized() ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS, 'Map');
+        $status = new Horde_SyncML_Command_Status($state->isAuthorized() ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS, 'Map');
         $status->setCmdRef($this->_cmdID);
         if ($this->_sourceLocURI != null) {
             $status->setSourceRef($this->_sourceLocURI);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
index 3834cf320e..09f78e784f 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
@@ -240,7 +240,7 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 	function output($currentCmdID, &$output ) {
 		$state = &$_SESSION['SyncML.state'];
 		
-		$status = &new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Put');
+		$status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Put');
 		$status->setCmdRef($this->_cmdID);
 		
 		$ref = ($state->getVersion() == 0) ? './devinf10' : './devinf11';
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php
index 6adec7fcef..ca06ebd60c 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php
@@ -184,7 +184,7 @@ class Horde_SyncML_Command_Results extends Horde_SyncML_Command {
 			#Horde::logMessage('SyncML: BIG TODO!!!!!!!!!!!!!!!!!! parse reply', __FILE__, __LINE__, PEAR_LOG_DEBUG);
 			$state = &$_SESSION['SyncML.state'];
 			
-			$status = &new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Results');
+			$status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Results');
 			$status->setCmdRef($this->_cmdID);
 			
 			$ref = ($state->getVersion() == 0) ? './devinf10' : './devinf11';
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
index ad88fdcb7f..c5ff34d483 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
@@ -35,7 +35,7 @@ class Horde_SyncML_Command_Sync extends Horde_Syncml_Command {
 		
 		Horde::logMessage('SyncML: $this->_targetURI = ' . $this->_targetURI, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 		
-		$status = &new Horde_SyncML_Command_Status(RESPONSE_OK, 'Sync');
+		$status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Sync');
 		
 		// $status->setState($state);
 		
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php
index 8aacf9845a..7b4bec7f43 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php
@@ -21,7 +21,7 @@ class Horde_SyncML_Command_Sync_Add extends Horde_SyncML_Command_Sync_SyncElemen
 
     function output($currentCmdID, &$output)
     {
-        $status = &new Horde_SyncML_Command_Status($this->_status, 'Add');
+        $status = new Horde_SyncML_Command_Status($this->_status, 'Add');
         $status->setCmdRef($this->_cmdID);
 
         if (isset($this->_luid)) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php
index 5ed168b5fc..57132f981d 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php
@@ -19,7 +19,7 @@ class Horde_SyncML_Command_Sync_Delete extends Horde_SyncML_Command_Sync_SyncEle
 
     function output($currentCmdID, &$output)
     {
-        $status = &new Horde_SyncML_Command_Status($this->_status, 'Delete');
+        $status = new Horde_SyncML_Command_Status($this->_status, 'Delete');
         $status->setCmdRef($this->_cmdID);
 
         if (isset($this->_luid)) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php
index dc08fb741d..2168700d11 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php
@@ -17,7 +17,7 @@ include_once 'Horde/SyncML/Command/Sync/SyncElement.php';
  */
 class Horde_SyncML_Command_Sync_Replace extends Horde_SyncML_Command_Sync_SyncElement {
 	function output($currentCmdID, &$output) {
-		$status = &new Horde_SyncML_Command_Status($this->_status, 'Replace');
+		$status = new Horde_SyncML_Command_Status($this->_status, 'Replace');
 		$status->setCmdRef($this->_cmdID);
 		
 		if (isset($this->_luid)) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php
index d4d742a07f..9adef9aabf 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php
@@ -34,7 +34,7 @@ class Horde_SyncML_Command_Sync_SyncElement extends Horde_SyncML_Command {
 		
 		if (class_exists($class)) {
 			#Horde::logMessage('SyncML: Class definition of ' . $class . ' found in SyncElement::factory.', __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			return $element = &new $class($params);
+			return $element = new $class($params);
 		} else {
 			Horde::logMessage('SyncML: Class definition of ' . $class . ' not found in SyncElement::factory.', __FILE__, __LINE__, PEAR_LOG_DEBUG);
 			require_once 'PEAR.php';
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State.php b/phpgwapi/inc/horde/Horde/SyncML/State.php
index cdda954520..515771d6f3 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State.php
@@ -554,7 +554,7 @@ class Horde_SyncML_State {
         $dt = &$this->getDataTree();
 
         // Set $locid.
-        $gid = &new DataTreeObject($this->_locName . $this->_sourceURI . $type . $guid);
+        $gid = new DataTreeObject($this->_locName . $this->_sourceURI . $type . $guid);
         $gid->set('type', $type);
         $gid->set('locid', $locid);
         $gid->set('ts', $ts);
@@ -567,7 +567,7 @@ class Horde_SyncML_State {
         $this->dieOnError($r, __FILE__, __LINE__);
 
         // Set $globaluid
-        $lid = &new DataTreeObject($this->_locName . $this->_sourceURI . $type . $locid);
+        $lid = new DataTreeObject($this->_locName . $this->_sourceURI . $type . $locid);
         $lid->set('globaluid', $guid);
         $r = $dt->add($lid);
         if (is_a($r, 'PEAR_Error')) {
@@ -926,7 +926,7 @@ class Horde_SyncML_State {
         $s = $this->_locName . $this->_sourceURI . 'deviceInfo';
 
         // Set $locid.
-        $info = &new DataTreeObject($s);
+        $info = new DataTreeObject($s);
         $info->set('ClientDeviceInfo', $this->_clientDeviceInfo);
         $r = $dt->add($info);
         if (is_a($r, 'PEAR_Error')) {
@@ -952,7 +952,7 @@ class Horde_SyncML_State {
             $s = $this->_locName . $this->_sourceURI . $type . 'syncSummary';
 
             // Set $locid.
-            $info = &new DataTreeObject($s);
+            $info = new DataTreeObject($s);
             $info->set('ClientAnchor', $this->_clientAnchorNext);
             $info->set('ServerAnchor', $this->_serverAnchorNext);
             $r = $dt->add($info);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
index 3e5be1abdc..e1570c9409 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
@@ -92,7 +92,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
     	if ($ts = $GLOBALS['egw']->db->select('egw_contentmap', 'map_timestamp', array(
     		'map_id'	=> $mapID,
     		'map_guid'	=> $guid,
-    	), __LINE__, __FILE__, false, '', 'syncml')->fetchSingle())
+    	), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn())
 	    {
     		#Horde::logMessage('SyncML: getChangeTS changets is ' . $GLOBALS['egw']->db->from_timestamp($ts), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 			return $GLOBALS['egw']->db->from_timestamp($ts);
@@ -112,7 +112,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
 		if(($deviceID = $GLOBALS['egw']->db->select('egw_syncmldeviceowner', 'owner_devid',array (
 			'owner_locname'		=> $this->_locName,
 			'owner_deviceid'	=> $this->_sourceURI,
-		), __LINE__, __FILE__, false, '', 'syncml')->fetchSingle()))
+		), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
 		{
 			$cols = array(
 				'dev_dtdversion',
@@ -190,7 +190,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
     		'map_id'		=> $mapID,
     		'map_locuid'	=> $locid,
     		'map_expired'	=> 0,
-    	), __LINE__, __FILE__, false, '', 'syncml')->fetchSingle();
+    	), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn();
     }
 
     /**
@@ -208,7 +208,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
     	if (($locuid = $GLOBALS['egw']->db->select('egw_contentmap', 'map_locuid', array(
     		'map_id'	=> $mapID,
     		'map_guid'	=> $guid
-    	), __LINE__, __FILE__, false, '', 'syncml')->fetchSingle()))
+    	), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
     	{
 	   		Horde::logMessage('SyncML: found LocID: '.$locuid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
     	}
@@ -337,7 +337,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
 			'map_locuid'	=> $locid
 		);
 
-		if (!($guid = $GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', $where, __LINE__, __FILE__, false, '', 'syncml')->fetchSingle()))
+		if (!($guid = $GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', $where, __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
 		{
 			Horde::logMessage("SyncML: state->removeUID(type=$type,locid=$locid) : nothing to remove", __FILE__, __LINE__, PEAR_LOG_INFO);
 			return false;
@@ -437,7 +437,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
 			'dev_fwversion'		=> $firmwareVersion,
 		);
 
-		if (($deviceID = $GLOBALS['egw']->db->select('egw_syncmldevinfo', 'dev_id', $where, __LINE__, __FILE__, false, '', 'syncml')->fetchSingle()))
+		if (($deviceID = $GLOBALS['egw']->db->select('egw_syncmldevinfo', 'dev_id', $where, __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
 		{
 			$data = array (
 				'dev_datastore'		=> serialize($this->_clientDeviceInfo['dataStore']),
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
index 970e831c07..184cb2761d 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
@@ -42,27 +42,27 @@ class Horde_SyncML_Sync {
         switch ($alert) {
         case ALERT_TWO_WAY:
             include_once 'Horde/SyncML/Sync/TwoWaySync.php';
-            return $sync = &new Horde_SyncML_Sync_TwoWaySync();
+            return $sync = new Horde_SyncML_Sync_TwoWaySync();
 
         case ALERT_SLOW_SYNC:
             include_once 'Horde/SyncML/Sync/SlowSync.php';
-            return $sync = &new Horde_SyncML_Sync_SlowSync();
+            return $sync = new Horde_SyncML_Sync_SlowSync();
 
         case ALERT_ONE_WAY_FROM_CLIENT:
             include_once 'Horde/SyncML/Sync/OneWayFromClientSync.php';
-            return $sync = &new Horde_SyncML_Sync_OneWayFromClientSync();
+            return $sync = new Horde_SyncML_Sync_OneWayFromClientSync();
 
         case ALERT_REFRESH_FROM_CLIENT:
             include_once 'Horde/SyncML/Sync/RefreshFromClientSync.php';
-            return $sync = &new Horde_SyncML_Sync_RefreshFromClientSync();
+            return $sync = new Horde_SyncML_Sync_RefreshFromClientSync();
 
         case ALERT_ONE_WAY_FROM_SERVER:
             include_once 'Horde/SyncML/Sync/OneWayFromServerSync.php';
-            return $sync = &new Horde_SyncML_Sync_OneWayFromServerSync();
+            return $sync = new Horde_SyncML_Sync_OneWayFromServerSync();
 
         case ALERT_REFRESH_FROM_SERVER:
             include_once 'Horde/SyncML/Sync/RefreshFromServerSync.php';
-            return $sync = &new Horde_SyncML_Sync_RefreshFromServerSync();
+            return $sync = new Horde_SyncML_Sync_RefreshFromServerSync();
         }
 
         require_once 'PEAR.php';
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
index cf2f7ff507..4a5c957f9b 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
@@ -36,7 +36,7 @@ class Horde_SyncML_Sync_RefreshFromServerSync extends Horde_SyncML_Sync_TwoWaySy
 				}
 				
 				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
-				$cmd = &new Horde_SyncML_Command_Sync_ContentSyncElement();
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
 				$c = $registry->call($hordeType . '/export', array('guid' => $guid, 'contentType' => $contentType));
 				Horde::logMessage("SyncML: slowsync add $guid to client ". print_r($c, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				if (!is_a($c, 'PEAR_Error')) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
index 68485d2c17..de538829c7 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
@@ -41,7 +41,7 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
 				}
 				
 				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
-				$cmd = &new Horde_SyncML_Command_Sync_ContentSyncElement();
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
 				$c = $registry->call($hordeType . '/export', array('guid' => $guid, 'contentType' => $contentType));
 				#Horde::logMessage("SyncML: slowsync add guid $guid to client ". print_r($c, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				if (!is_a($c, 'PEAR_Error')) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
index 78f02ab0cf..2ff089d12f 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
@@ -85,7 +85,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
 				if (!is_a($c, 'PEAR_Error')) {
 					// Item in history but not in database. Strange, but can happen.
 					Horde::logMessage("SyncML: change: $guid export content: $c", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-					$cmd = &new Horde_SyncML_Command_Sync_ContentSyncElement();
+					$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
 # LK					$cmd->setContent($state->convertServer2Client($c, $contentType));
 					$cmd->setContent($c);
 					$cmd->setSourceURI($guid);
@@ -133,7 +133,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
 
 				Horde::logMessage("SyncML: delete: $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				// Create a Delete request for client.
-				$cmd = &new Horde_SyncML_Command_Sync_ContentSyncElement();
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
 				$cmd->setTargetURI($locid);
 				$cmd->setSourceURI($guid);
 				$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Delete');
@@ -187,7 +187,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
 				// Create an Add request for client.
 				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
 
-				$cmd = &new Horde_SyncML_Command_Sync_ContentSyncElement();
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
 				$c = $registry->call($hordeType . '/export',
 					array(
 						'guid'		=> $guid ,
diff --git a/phpgwapi/inc/horde/Horde/iCalendar.php b/phpgwapi/inc/horde/Horde/iCalendar.php
index f91d2d3da4..d11227aaed 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar.php
@@ -55,7 +55,7 @@ class Horde_iCalendar {
 		}
 		if (class_exists($class)) {
 			#include_once dirname(__FILE__) . '/iCalendar/' . $type . '.php';
-			$component = &new $class();
+			$component = new $class();
 			if ($container !== false) {
 				$component->_container = &$container;
 			}
@@ -608,7 +608,7 @@ class Horde_iCalendar {
 
                 // Geo fields.
                 case 'GEO':
-                    $floats = split(';', $value);
+                    $floats = explode(';', $value);
                     $value['latitude'] = floatval($floats[0]);
                     $value['longitude'] = floatval($floats[1]);
                     $this->setAttribute($tag, $value, $params);
@@ -881,7 +881,7 @@ class Horde_iCalendar {
      */
     function _parsePeriod($text)
     {
-        $periodParts = split('/', $text);
+        $periodParts = explode('/', $text);
 
         $start = $this->_parseDateTime($periodParts[0]);
 
@@ -912,7 +912,7 @@ class Horde_iCalendar {
      */
     function _parseDateTime($text)
     {
-        $dateParts = split('T', $text);
+        $dateParts = explode('T', $text);
         if (count($dateParts) != 2 && !empty($text)) {
             // Not a datetime field but may be just a date field.
             if (!$date = $this->_parseDate($text)) {
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vcard.php b/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
index 6a08c90343..465e044169 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
@@ -123,7 +123,7 @@ class Horde_iCalendar_vcard extends Horde_iCalendar {
 
         static $rfc822;
         if (is_null($rfc822)) {
-            $rfc822 = &new Mail_RFC822();
+            $rfc822 = new Mail_RFC822();
         }
 
         $rfc822->validateMailbox($address);
diff --git a/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php b/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
index 86337cd9b1..98cdcba8c7 100644
--- a/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
+++ b/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
@@ -32,7 +32,7 @@ class XML_WBXML_ContentHandler {
 
     function XML_WBXML_ContentHandler()
     {
-        $this->_currentUri = &new XML_WBXML_LifoQueue();
+        $this->_currentUri = new XML_WBXML_LifoQueue();
     }
 
     function raiseError($error)
diff --git a/phpgwapi/inc/horde/XML/WBXML/Decoder.php b/phpgwapi/inc/horde/XML/WBXML/Decoder.php
index 85faa20c54..9ef6695659 100644
--- a/phpgwapi/inc/horde/XML/WBXML/Decoder.php
+++ b/phpgwapi/inc/horde/XML/WBXML/Decoder.php
@@ -75,7 +75,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
      */
     function XML_WBXML_Decoder()
     {
-        $this->_dtdManager = &new XML_WBXML_DTDManager();
+        $this->_dtdManager = new XML_WBXML_DTDManager();
     }
 
     /**
@@ -112,7 +112,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
      */
     function decodeToString($wbxml)
     {
-        $this->_ch = &new XML_WBXML_ContentHandler();
+        $this->_ch = new XML_WBXML_ContentHandler();
 
         $r = $this->decode($wbxml);
         if (is_a($r, 'PEAR_Error')) {
@@ -174,7 +174,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
 
 
         // Default content handler.
-        $this->_dtdManager = &new XML_WBXML_DTDManager();
+        $this->_dtdManager = new XML_WBXML_DTDManager();
 
         // Get the starting DTD.
         $this->_tagDTD = $this->_dtdManager->getInstance($this->_dpi);
@@ -382,7 +382,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
             // document and thus start a new wbxml decoder instance on it.
 
             if ($this->_isData && ord($b) <= 10) {
-                $decoder = &new XML_WBXML_Decoder(true);
+                $decoder = new XML_WBXML_Decoder(true);
                 $decoder->setContentHandler($this->_ch);
                 $s = $decoder->decode($b);
         //                /* // @todo: FIXME currently we can't decode Nokia
diff --git a/phpgwapi/inc/horde/XML/WBXML/Encoder.php b/phpgwapi/inc/horde/XML/WBXML/Encoder.php
index 8efe94e1d0..2633302443 100644
--- a/phpgwapi/inc/horde/XML/WBXML/Encoder.php
+++ b/phpgwapi/inc/horde/XML/WBXML/Encoder.php
@@ -58,8 +58,8 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
      */
     function XML_WBXML_Encoder()
     {
-        $this->_dtdManager = &new XML_WBXML_DTDManager();
-        $this->_stringTable = &new XML_WBXML_HashTable();
+        $this->_dtdManager = new XML_WBXML_DTDManager();
+        $this->_stringTable = new XML_WBXML_HashTable();
     }
 
     /**
@@ -390,7 +390,7 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
             $this->_currentURI = $uri;
 
         } else {
-            $this->_subParser = &new XML_WBXML_Encoder(true);
+            $this->_subParser = new XML_WBXML_Encoder(true);
             $this->_subParserStack = 1;
         }
     }
diff --git a/phpgwapi/inc/horde/lib/base.php b/phpgwapi/inc/horde/lib/base.php
index b658f5f03c..3137eb1efd 100644
--- a/phpgwapi/inc/horde/lib/base.php
+++ b/phpgwapi/inc/horde/lib/base.php
@@ -48,7 +48,7 @@ $conf = &$GLOBALS['conf'];
 
 /* Set up the menu. */
 #require_once 'Horde/Menu.php';
-#$menu = &new Menu();
+#$menu = new Menu();
 
 // Compress output
 #Horde::compressOutput();
diff --git a/phpgwapi/inc/savant2/Savant2.php b/phpgwapi/inc/savant2/Savant2.php
index 54c5c9f08c..9fc16c7627 100755
--- a/phpgwapi/inc/savant2/Savant2.php
+++ b/phpgwapi/inc/savant2/Savant2.php
@@ -657,7 +657,7 @@ class Savant2 {
 	* 
 	* <code>
 	* 
-	* $Savant2 =& new Savant2();
+	* $Savant2 = new Savant2();
 	* 
 	* // assign directly
 	* $Savant2->var1 = 'something';
@@ -1114,7 +1114,7 @@ class Savant2 {
 			! is_a($this->_resource['plugin'][$name], $class)) {
 			
 			// instantiate it
-			$this->_resource['plugin'][$name] =& new $class($conf);
+			$this->_resource['plugin'][$name] = new $class($conf);
 			
 			// add a Savant reference if requested
 			if ($savantRef) {
@@ -1316,7 +1316,7 @@ class Savant2 {
 			! is_a($this->_resource['filter'][$name], $class)) {
 			
 			// instantiate it
-			$this->_resource['filter'][$name] =& new $class($conf);
+			$this->_resource['filter'][$name] = new $class($conf);
 			
 			// add a Savant reference if requested
 			if ($savantRef) {
@@ -1455,7 +1455,7 @@ class Savant2 {
 		}
 		
 		// instantiate and return the error class
-		$err =& new $class($conf);
+		$err = new $class($conf);
 		return $err;
 	}
 	
diff --git a/phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php b/phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php
index 440949e89c..e7b6b985ea 100755
--- a/phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php
+++ b/phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php
@@ -225,7 +225,7 @@ class Savant2_Compiler_basic extends Savant2_Compiler {
 	function Savant2_Compiler_basic($conf = array())
 	{
 		parent::Savant2_Compiler($conf);
-		$this->ca =& new PHPCodeAnalyzer();
+		$this->ca = new PHPCodeAnalyzer();
 		$this->allowedFunctions = $this->allowedFunctions();
 		$this->allowedStatic = $this->allowedStatic();
 	}
diff --git a/phpgwapi/inc/savant2/Savant2/tests/1_assign.php b/phpgwapi/inc/savant2/Savant2/tests/1_assign.php
index 1cc7577532..ce10658b3e 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/1_assign.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/1_assign.php
@@ -12,7 +12,7 @@
 error_reporting(E_ALL);
 
 require_once 'Savant2.php';
-$savant =& new Savant2(array('template_path' => 'templates'));
+$savant = new Savant2(array('template_path' => 'templates'));
 
 echo "<h1>assign 0 (string, null)</h1>";
 $val = null;
diff --git a/phpgwapi/inc/savant2/Savant2/tests/2_display.php b/phpgwapi/inc/savant2/Savant2/tests/2_display.php
index 15337ac820..aa5ec1a33b 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/2_display.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/2_display.php
@@ -17,7 +17,7 @@ $conf = array(
 	'resource_path' => 'resources'
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 $array = array(
 	'key0' => 'val0',
diff --git a/phpgwapi/inc/savant2/Savant2/tests/3_fetch.php b/phpgwapi/inc/savant2/Savant2/tests/3_fetch.php
index ff02c6088f..d797dc0b91 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/3_fetch.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/3_fetch.php
@@ -17,7 +17,7 @@ $conf = array(
 	'resource_path' => 'resources'
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 $array = array(
 	'key0' => 'val0',
diff --git a/phpgwapi/inc/savant2/Savant2/tests/4_plugins.php b/phpgwapi/inc/savant2/Savant2/tests/4_plugins.php
index 2f10a157c1..9b20e1aff9 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/4_plugins.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/4_plugins.php
@@ -17,7 +17,7 @@ $conf = array(
 	'resource_path' => 'resources'
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 $array = array(
 	'key0' => 'val0',
diff --git a/phpgwapi/inc/savant2/Savant2/tests/5_filters.php b/phpgwapi/inc/savant2/Savant2/tests/5_filters.php
index 9193088827..0dc1af2202 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/5_filters.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/5_filters.php
@@ -18,7 +18,7 @@ $conf = array(
 	'resource_path' => 'resources'
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 // set up filters
 $savant->loadFilter('colorizeCode');
diff --git a/phpgwapi/inc/savant2/Savant2/tests/6_paths.php b/phpgwapi/inc/savant2/Savant2/tests/6_paths.php
index 59bec9e74c..22fbfbc5cb 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/6_paths.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/6_paths.php
@@ -24,7 +24,7 @@ $conf = array(
 	'resource_path' => 'resources'
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 echo "<h1>Paths to begin with</h1>\n";
 preprint($savant->getPath('resource'));
diff --git a/phpgwapi/inc/savant2/Savant2/tests/7_include.php b/phpgwapi/inc/savant2/Savant2/tests/7_include.php
index c85b782d00..296aded7e6 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/7_include.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/7_include.php
@@ -17,7 +17,7 @@ $conf = array(
 	'resource_path' => 'resources'
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 $array = array(
 	'key0' => 'val0',
diff --git a/phpgwapi/inc/savant2/Savant2/tests/8_extend.php b/phpgwapi/inc/savant2/Savant2/tests/8_extend.php
index d8498d781c..9c783136cc 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/8_extend.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/8_extend.php
@@ -17,7 +17,7 @@ $conf = array(
 	'resource_path' => 'resources'
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 $savant->display('extend.tpl.php');
 
diff --git a/phpgwapi/inc/savant2/Savant2/tests/9_errors.php b/phpgwapi/inc/savant2/Savant2/tests/9_errors.php
index 58ab1dcff8..32397e3fd0 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/9_errors.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/9_errors.php
@@ -12,7 +12,7 @@ error_reporting(E_ALL);
 
 require_once 'Savant2.php';
 
-$savant =& new Savant2();
+$savant = new Savant2();
 
 require_once 'PEAR.php';
 PEAR::setErrorHandling(PEAR_ERROR_PRINT);
diff --git a/phpgwapi/inc/savant2/Savant2/tests/compile.php b/phpgwapi/inc/savant2/Savant2/tests/compile.php
index a68ed08de5..3949cccad1 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/compile.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/compile.php
@@ -26,11 +26,11 @@ $conf = array(
 	'restrict' => true // adding path restrictions!
 );
 
-$savant =& new Savant2($conf);
+$savant = new Savant2($conf);
 
 // instantiate a compiler...
 require_once 'Savant2/Savant2_Compiler_basic.php';
-$compiler =& new Savant2_Compiler_basic();
+$compiler = new Savant2_Compiler_basic();
 $compiler->compileDir = '/tmp/';
 $compiler->forceCompile = true;
 
diff --git a/phpgwapi/inc/savant2/Savant2/tests/form.php b/phpgwapi/inc/savant2/Savant2/tests/form.php
index 2412870312..d6d67e5bdc 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/form.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/form.php
@@ -2,7 +2,7 @@
 error_reporting(E_ALL);
 
 require_once 'Savant2.php';
-$Savant2 =& new Savant2();
+$Savant2 = new Savant2();
 $Savant2->addPath('template', 'templates/');
 $Savant2->addPath('resource', 'resources/');
 
diff --git a/phpgwapi/inc/savant2/Savant2/tests/form2.php b/phpgwapi/inc/savant2/Savant2/tests/form2.php
index cad4706396..04c3ce2901 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/form2.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/form2.php
@@ -2,7 +2,7 @@
 error_reporting(E_ALL);
 
 require_once 'Savant2.php';
-$Savant2 =& new Savant2();
+$Savant2 = new Savant2();
 $Savant2->addPath('template', 'templates/');
 $Savant2->addPath('resource', 'resources/');
 
diff --git a/phpgwapi/inc/savant2/Savant2/tests/templates/compile_bad.tpl.php b/phpgwapi/inc/savant2/Savant2/tests/templates/compile_bad.tpl.php
index 29310f6e88..5c0529a20a 100755
--- a/phpgwapi/inc/savant2/Savant2/tests/templates/compile_bad.tpl.php
+++ b/phpgwapi/inc/savant2/Savant2/tests/templates/compile_bad.tpl.php
@@ -4,7 +4,7 @@
 
 <p>{$varivari; $this->$varivari}</p>
 <p>{$this->variable1; global $_SERVER;}</p>
-<p>{$this->variable2; $obj =& new StdClass;}</p>
+<p>{$this->variable2; $obj = new StdClass;}</p>
 <p>{$this->variable3; eval("echo 'bad guy!';")}</p>
 <p>{$this->key0; print_r($this->_compiler);}</p>
 <p>{$this->key1; File::read('/etc/passwd');}</p>
diff --git a/phpgwapi/inc/xml_functions.inc.php b/phpgwapi/inc/xml_functions.inc.php
index b400043074..76a37a75e1 100644
--- a/phpgwapi/inc/xml_functions.inc.php
+++ b/phpgwapi/inc/xml_functions.inc.php
@@ -219,7 +219,7 @@
 		{
 			return $GLOBALS['xmlEntities'][strtolower($ent)];
 		}
-		if (ereg("^#([0-9]+)$", $ent, $regs))
+		if (preg_match('/'."^#([0-9]+)$".'/', $ent, $regs))
 		{
 			return chr($regs[1]);
 		}
@@ -465,7 +465,7 @@
 					error_log('XML-RPC: missing VALUE inside PARAM in received xml');
 					break;
 				case 'METHODNAME':
-					$GLOBALS['_xh'][$parser]['method']=ereg_replace("^[\n\r\t ]+", '', $GLOBALS['_xh'][$parser]['ac']);
+					$GLOBALS['_xh'][$parser]['method']=preg_replace('/'."^[\n\r\t ]+".'/', '', $GLOBALS['_xh'][$parser]['ac']);
 					break;
 				case 'PARAMS':
 				case 'FAULT':
@@ -482,7 +482,7 @@
 
 	function xmlrpc_cd($parser, $data)
 	{
-		//if(ereg("^[\n\r \t]+$", $data)) return;
+		//if(preg_match('/'."^[\n\r \t]+$".'/', $data)) return;
 		// print "adding [${data}]\n";
 
 		// skip processing if xml fault already detected
@@ -560,7 +560,7 @@
 	{
 		// return a time in the localtime, or UTC
 		$t = 0;
-		if (ereg("([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})",$idate, $regs))
+		if (preg_match('/'."([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})".'/',$idate, $regs))
 		{
 			if ($utc)
 			{
@@ -693,7 +693,7 @@
 	{
 		$methName = $m->getParam(0);
 		$methName = $methName->scalarval();
-		if (ereg("^system\.", $methName))
+		if (preg_match('/'."^system\.".'/', $methName))
 		{
 			$dmap = $GLOBALS['_xmlrpcs_dmap'];
 			$sysCall = 1;
@@ -740,7 +740,7 @@
 	{
 		$methName = $m->getParam(0);
 		$methName = $methName->scalarval();
-		if (ereg("^system\.", $methName))
+		if (preg_match('/'."^system\.".'/', $methName))
 		{
 			$dmap = $GLOBALS['_xmlrpcs_dmap'];
 			$sysCall=1;
diff --git a/phpgwapi/setup/tables_update_1_4.inc.php b/phpgwapi/setup/tables_update_1_4.inc.php
index 5423cd1fad..70c3e2e07e 100644
--- a/phpgwapi/setup/tables_update_1_4.inc.php
+++ b/phpgwapi/setup/tables_update_1_4.inc.php
@@ -243,7 +243,7 @@ function phpgwapi_upgrade1_5_005()
 	$files_dir = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
 		'config_name' => 'files_dir',
 		'config_app' => 'phpgwapi',
-	),__LINE__,__FILE__)->fetchSingle();
+	),__LINE__,__FILE__)->fetchColumn();
 
 	if ($files_dir && file_exists($files_dir) && file_exists($files_dir.'/infolog'))
 	{
@@ -281,7 +281,7 @@ function phpgwapi_upgrade1_5_006()
 	);
 	$filescenter_app = $GLOBALS['egw_setup']->db->select('egw_applications','*',array(
 		'app_name' => 'filescenter',
-	),__LINE__,__FILE__)->fetchSingle();
+	),__LINE__,__FILE__)->fetchColumn();
 
 	if (!$filescenter_app || !is_dir(EGW_INCLUDE_ROOT.'/filescenter'))
 	{
diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index 724a344879..45d0c31e25 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -71,7 +71,7 @@ class idots_framework extends egw_framework
 		$GLOBALS['egw_info']['flags']['include_xajax'] = True;
 		$this->egw_framework($template);		// call the constructor of the extended class
 
-		$this->tplsav2 =& new tplsavant2();
+		$this->tplsav2 = new tplsavant2();
 		$this->tplsav2->set_tpl_path(EGW_SERVER_ROOT.SEP.'phpgwapi'.SEP.'templates'.SEP.'idots');
 	}
 
@@ -103,7 +103,7 @@ class idots_framework extends egw_framework
 
 		// the instanciation of the template has to be here and not in the constructor,
 		// as the old Template class has problems if restored from the session (php-restore)
-		$this->tpl =& new Template(EGW_TEMPLATE_DIR);
+		$this->tpl = new Template(EGW_TEMPLATE_DIR);
 		$this->tpl->set_file(array('_head' => 'head.tpl'));
 		$this->tpl->set_block('_head','head');
 
@@ -282,7 +282,7 @@ class idots_framework extends egw_framework
 	*/
 	function login_screen($extra_vars)
 	{
-		$tmpl =& new Template($GLOBALS['egw_info']['server']['template_dir']);
+		$tmpl = new Template($GLOBALS['egw_info']['server']['template_dir']);
 
 		$tmpl->set_file(array('login_form' => 'login.tpl'));
 
@@ -433,7 +433,7 @@ class idots_framework extends egw_framework
 	*/
 	function denylogin_screen()
 	{
-		$tmpl =& new Template($GLOBALS['egw_info']['server']['template_dir']);
+		$tmpl = new Template($GLOBALS['egw_info']['server']['template_dir']);
 
 		$tmpl->set_file(array(
 			'login_form' => 'login_denylogin.tpl'
diff --git a/preferences/inc/class.ajaxpreferences.inc.php b/preferences/inc/class.ajaxpreferences.inc.php
index 33d5ca8869..56c66c1123 100644
--- a/preferences/inc/class.ajaxpreferences.inc.php
+++ b/preferences/inc/class.ajaxpreferences.inc.php
@@ -25,7 +25,7 @@
 	  */
 	  function storeEGWPref($repository,$key,$value)
 	  {
-		 $response =& new xajaxResponse();
+		 $response = new xajaxResponse();
 		 $GLOBALS['egw']->preferences->read_repository();
 		 $GLOBALS['egw']->preferences->change($repository,$key,$value);
 		 $GLOBALS['egw']->preferences->save_repository(True);
diff --git a/resources/inc/class.resources_select_widget.inc.php b/resources/inc/class.resources_select_widget.inc.php
index fcf6865e8d..47a01424f1 100644
--- a/resources/inc/class.resources_select_widget.inc.php
+++ b/resources/inc/class.resources_select_widget.inc.php
@@ -70,7 +70,7 @@ class resources_select_widget
 			$cell['label'] = 'no resources';
 			return false;
 		}
-		$tpl =& new etemplate('resources.resource_selectbox');
+		$tpl = new etemplate('resources.resource_selectbox');
 		// keep the editor away from the generated tmpls
 		$tpl->no_onclick = true;			
 		
diff --git a/setup/inc/class.setup_cmd_header.inc.php b/setup/inc/class.setup_cmd_header.inc.php
index 91b7349088..0b52abb6f6 100644
--- a/setup/inc/class.setup_cmd_header.inc.php
+++ b/setup/inc/class.setup_cmd_header.inc.php
@@ -60,7 +60,7 @@ class setup_cmd_header extends setup_cmd
 				$this->header_path = dirname(dirname(dirname(__FILE__))).'/'.$this->header_path;
 			}
 		}
-		$this->setup_header =& new setup_header();
+		$this->setup_header = new setup_header();
 	}
 
 	/**
@@ -155,7 +155,7 @@ class setup_cmd_header extends setup_cmd
 	 * @param array $args=null
 	 * @return mixed
 	 */
-	protected function __call($method,array $args=null)
+	function __call($method,array $args=null)
 	{
 		if (method_exists($this->setup_header,$method))
 		{
diff --git a/setup/inc/class.setup_cmd_install.inc.php b/setup/inc/class.setup_cmd_install.inc.php
index 88c301df54..2860787b90 100644
--- a/setup/inc/class.setup_cmd_install.inc.php
+++ b/setup/inc/class.setup_cmd_install.inc.php
@@ -75,7 +75,7 @@ class setup_cmd_install extends setup_cmd
 		// use uploaded backup, instead installing from scratch
 		if ($this->backup)
 		{
-			$db_backup =& new db_backup();
+			$db_backup = new db_backup();
 
 			if (!is_resource($f = $db_backup->fopen_backup($this->backup,true)))
 			{
diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php
index 00d50a9c51..4bfa346aa8 100644
--- a/setup/inc/class.setup_html.inc.php
+++ b/setup/inc/class.setup_html.inc.php
@@ -309,7 +309,7 @@
 			$dh = dir(EGW_SERVER_ROOT . '/phpgwapi/themes');
 			while ($file = $dh->read())
 			{
-				if (eregi("\.theme$", $file))
+				if (preg_match('/'."\.theme$".'/i', $file))
 				{
 					$list[] = substr($file,0,strpos($file,'.'));
 				}
diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index f044f91c69..a96608f91a 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.inc.php
@@ -83,7 +83,7 @@ function get_langs()
 	$f = fopen('./lang/languages','rb');
 	while($line = fgets($f,200))
 	{
-		list($x,$y) = split("\t",$line);
+		list($x,$y) = explode("\t",$line);
 		$languages[$x]['lang']  = trim($x);
 		$languages[$x]['descr'] = trim($y);
 		$languages[$x]['available'] = False;
diff --git a/setup/lang.php b/setup/lang.php
index 4081f0d40d..832189b5d7 100644
--- a/setup/lang.php
+++ b/setup/lang.php
@@ -92,7 +92,7 @@ if($_POST['debug'] && count(translation::$line_rejected))
 	$str = '';
 	foreach(translation::$line_rejected as $badline)
 	{
-		$_f_buffer = split("[/\\]", $badline['appfile']);
+		$_f_buffer = preg_split("/[\\/\\]/", $badline['appfile']);
 		$str .= lang('Application: %1, File: %2, Line: "%3"','<b>'.$_f_buffer[count($_f_buffer)-3].'</b>',
 			'<b>'.$_f_buffer[count($_f_buffer)-1].'</b>',$badline['line'])."<br />\n";
 	}
diff --git a/setup/manageheader.php b/setup/manageheader.php
index 19da70b432..561d614840 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -13,7 +13,7 @@
 include('./inc/functions.inc.php');
 
 require_once('./inc/class.setup_header.inc.php');
-$GLOBALS['egw_setup']->header =& new setup_header();
+$GLOBALS['egw_setup']->header = new setup_header();
 
 $setup_tpl = CreateObject('phpgwapi.Template','./templates/default');
 $setup_tpl->set_file(array(
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index d1171a6a2c..a9128e1337 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -433,7 +433,7 @@ function do_header($create,&$arguments)
  */
 function get_lang(&$charset)
 {
-	@list($lang,$nation,$charset) = split("[_.]",strtolower($_SERVER['LANG']));
+	@list($lang,$nation,$charset) = preg_split("/[_.]/",strtolower($_SERVER['LANG']));
 
 	foreach(file('lang/languages') as $line)
 	{
diff --git a/soap.php b/soap.php
index a91e61fca2..6749866fff 100644
--- a/soap.php
+++ b/soap.php
@@ -44,7 +44,7 @@
 			settype($headers,'array');
 			foreach($_SERVER as $h => $v)
 			{
-				if(ereg('HTTP_(.+)',$h,$hp))
+				if(preg_match('/HTTP_(.+)/',$h,$hp))
 				{
 					$headers[$hp[1]] = $v;
 				}
@@ -60,7 +60,7 @@
 		$tmp = str_replace(' ','',$tmp);
 		$tmp = str_replace('Basic','',$tmp);
 		$auth = base64_decode(trim($tmp));
-		list($sessionid,$kp3) = split(':',$auth);
+		list($sessionid,$kp3) = explode(':',$auth);
 
 		if($GLOBALS['egw']->session->verify($sessionid,$kp3))
 		{
diff --git a/timesheet/fix_lost_links.php b/timesheet/fix_lost_links.php
index f61e8f45e2..97bb17293f 100644
--- a/timesheet/fix_lost_links.php
+++ b/timesheet/fix_lost_links.php
@@ -18,8 +18,8 @@ include('../header.inc.php');
 
 require_once(EGW_INCLUDE_ROOT.'/timesheet/inc/class.botimesheet.inc.php');
 
-$bots =& new botimesheet();
-$so_sql =& new so_sql('timesheet',$bots->table_name);
+$bots = new botimesheet();
+$so_sql = new so_sql('timesheet',$bots->table_name);
 
 // search timesheet which have a project-field identical to an exiting PM project, but no link to it
 $rows = $so_sql->search(false,'ts_id,ts_project,ts_title','','pm_id,link_id','',false,'AND',false,array('link_id IS NULL'),
diff --git a/timesheet/inc/class.timesheet_datasource.inc.php b/timesheet/inc/class.timesheet_datasource.inc.php
index 8dd5c77370..211e4c9a6c 100644
--- a/timesheet/inc/class.timesheet_datasource.inc.php
+++ b/timesheet/inc/class.timesheet_datasource.inc.php
@@ -39,7 +39,7 @@ class timesheet_datasource extends datasource
 		// we use $GLOBALS['timesheet_bo'] as an already running instance is availible there
 		if (!is_object($GLOBALS['timesheet_bo']))
 		{
-			$GLOBALS['timesheet_bo'] =& new timesheet_bo();
+			$GLOBALS['timesheet_bo'] = new timesheet_bo();
 		}
 		if (!is_array($data_id))
 		{
diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 1ec97e34f7..1b92cde03f 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -59,7 +59,7 @@ class timesheet_ui extends timesheet_bo
 	function edit($content = null,$view = false)
 	{
 		$tabs = 'general|notes|links|customfields';
-		$etpl =& new etemplate('timesheet.edit');
+		$etpl = new etemplate('timesheet.edit');
 
 		if (!is_array($content))
 		{
@@ -641,7 +641,7 @@ class timesheet_ui extends timesheet_bo
 	 */
 	function index($content = null,$msg='')
 	{
-		$etpl =& new etemplate('timesheet.index');
+		$etpl = new etemplate('timesheet.index');
 
 		if ($_GET['msg']) $msg = $_GET['msg'];
 
diff --git a/xajax.php b/xajax.php
index 325eff7b4b..dd1f649926 100644
--- a/xajax.php
+++ b/xajax.php
@@ -25,7 +25,7 @@ function xajax_redirect(&$anon_account)
 	$GLOBALS['xajax']->setCharEncoding($GLOBALS['egw']->translation->charset());
 	define('XAJAX_DEFAULT_CHAR_ENCODING',$GLOBALS['egw']->translation->charset());
 
-	$response =& new xajaxResponse();
+	$response = new xajaxResponse();
 	$response->addScript("location.href='".$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10'."';");
 
 	header('Content-type: text/xml; charset='.$GLOBALS['egw']->translation->charset());
@@ -42,7 +42,7 @@ function xajax_redirect(&$anon_account)
  */
 function ajax_exception_handler(Exception $e)
 {
-	$response =& new xajaxResponse();
+	$response = new xajaxResponse();
 	$response->addAlert($e->getMessage()."\n\n".$e->getTraceAsString());
 	header('Content-type: text/xml; charset='.(is_object($GLOBALS['egw'])?$GLOBALS['egw']->translation->charset():'utf-8'));
 	echo $response->getXML();
diff --git a/xmlrpc.php b/xmlrpc.php
index 1a99e9271a..15456a3dca 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -49,7 +49,7 @@
 			settype($headers,'array');
 			foreach($_SERVER as $h => $v)
 			{
-				if(ereg('HTTP_(.+)',$h,$hp))
+				if(preg_match('/HTTP_(.+)/',$h,$hp))
 				{
 					$headers[$hp[1]] = $v;
 				}
@@ -65,7 +65,7 @@
 	$server->setSimpleDate($isodate);
 	$auth_header = $headers['Authorization'] ? $headers['Authorization'] : $headers['authorization'];
 
-	if(eregi('Basic *([^ ]*)',$auth_header,$auth))
+	if(preg_match('/Basic *([^ ]*)/i',$auth_header,$auth))
 	{
 		list($sessionid,$kp3) = explode(':',base64_decode($auth[1]));
 		//echo "auth='$auth[1]', sessionid='$sessionid', kp3='$kp3'\n";

From 83867b61787e166365b42da709895216fa560264 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 8 Jun 2009 16:22:21 +0000
Subject: [PATCH 405/510] script used to fix depricated functions & features
 for php53

---
 doc/fix_depricated.php | 216 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 216 insertions(+)
 create mode 100755 doc/fix_depricated.php

diff --git a/doc/fix_depricated.php b/doc/fix_depricated.php
new file mode 100755
index 0000000000..e40d6e3f25
--- /dev/null
+++ b/doc/fix_depricated.php
@@ -0,0 +1,216 @@
+#!/usr/bin/php -qC
+<?php
+/**
+ * EGroupware - fix in 5.3 depricated (in 6 not longer existing) functions and constructs
+ *
+ * The depricated warnings fill up the log files, as they can not be swichted off in the logs.
+ * The biggest issue are posix regular expressions (ereg, split, ereg_replace) and
+ * php4 assignment of objects (specially new obj()) by reference.
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author RalfBecker@outdoor-training.de
+ * @version $Id$
+ */
+
+if (isset($_SERVER['HTTP_HOST']))	// security precaution: forbit calling as web-page
+{
+	die('<h1>fix_depricated.php must NOT be called as web-page --> exiting !!!</h1>');
+}
+
+/**
+ * Fix depricated stuff in a given file
+ *
+ * @param string $file filename
+ * @param boolean $replace_file=false replace existing file if modifications are necessary, otherwise .php53 file is created
+ * @return boolean false on error
+ */
+function fix_depricated($file,$replace_file=false)
+{
+	$orig = $lines = file_get_contents($file);
+	if ($lines === false) return false;
+	global $prog;
+	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+
+	// PHP Deprecated:  Assigning the return value of new by reference is deprecated
+	if (preg_match('/= *& *new /m',$lines))
+	{
+		$lines = preg_replace('/= *& *new /','= new ',$lines);
+	}
+	// PHP Deprecated:  Function split() is deprecated
+	if (preg_match_all('/[= \t(]+spliti? *\\(("[^"]*"|\'[^\']*\'),/m',$lines,$matches))
+	{
+		$replace = array();
+		//print_r($matches);
+		foreach($matches[1] as $key => $pattern)
+		{
+			$full_pattern = $matches[0][$key];
+			// single char --> just explode
+			if (strlen($pattern) == 3 || strlen($pattern) == 4 && substr($pattern,0,2) == '"\\')
+			{
+				$replace[$full_pattern] = str_replace('split','explode',$full_pattern);
+			}
+			else
+			{
+				$preg_pattern = $pattern[0].'/'.str_replace('/','\\\\/',substr($pattern,1,-1)).'/'.$pattern[0];
+				if (strpos($full_pattern,'spliti')) $preg_pattern = substr($preg_pattern,0,-1).'i'.$pattern[0];
+				$replace[$full_pattern] = str_replace(array('spliti','split',$pattern),array('preg_split','preg_split',$preg_pattern),$full_pattern);
+			}
+		}
+		//print_r($replace);
+		$lines = strtr($lines,$replace);
+	}
+	// PHP Deprecated:  Function ereg() is deprecated
+	if (preg_match_all('/!?eregi? *\\(("[^"]+"[^,]*|\'[^\']+\'[^,]*), *(\$[A-Za-z0-9_]+)(, *\$[A-Za-z0-9_]+)?\)([ )&|]+)/m',$lines,$matches))
+	{
+		$replace = array();
+		//print_r($matches);
+		foreach($matches[1] as $key => $pattern)
+		{
+			$full_pattern = $matches[0][$key];
+			$what = $matches[2][$key];
+
+			// simple existence check --> use strpos()
+			if (preg_quote($pattern) == $pattern)
+			{
+
+				$replace[$full_pattern] = (strpos($full_pattern,'eregi')!==false?'strposi':'strpos').'('.$what.','.$pattern.
+					') '.($full_pattern[0]=='!'?'===':'!==').' false'.$matches[4][$key];
+			}
+			else
+			{
+				// full ereg regular expression --> preg_match
+				$preg_pattern = "'/'.".str_replace('/','\\\\/',$pattern).(strpos($full_pattern,'eregi') !== false ? ".'/i'" : ".'/'");
+				$replace[$full_pattern] = str_replace(array('eregi','ereg',$pattern),array('preg_match','preg_match',$preg_pattern),$full_pattern);
+			}
+		}
+		//print_r($replace);
+		$lines = strtr($lines,$replace);
+	}
+	// PHP Deprecated:  Function ereg_replace() is deprecated
+	if (preg_match_all('/eregi?_replace *\\((".+"|\'.+\'|[^,]+), *(.+), *[\'s$].+\)[,; =]/m',$lines,$matches))
+	{
+		$replace = array();
+		//print_r($matches);
+		foreach($matches[1] as $key => $pattern)
+		{
+			$full_pattern = $matches[0][$key];
+			$other = $matches[2][$key];
+
+			// simple replace --> use str_replace()
+			if (preg_quote($pattern) == $pattern)
+			{
+				$replace[$full_pattern] = str_replace(array('eregi_replace','ereg_replace'),array('stri_replace','str_replace'),$full_pattern);
+			}
+			else
+			{
+				// full ereg regular expression --> preg_replace
+				$preg_pattern = "'/'.".str_replace('/','\\\\/',$pattern).(strpos($full_pattern,'eregi') !== false ? ".'/i'" : ".'/'");
+				$replace[$full_pattern] = str_replace(array('eregi_replace','ereg_replace',$pattern),
+					array('preg_replace','preg_replace',$preg_pattern),$full_pattern);
+			}
+		}
+		//print_r($replace);
+		$lines = strtr($lines,$replace);
+	}
+	// remove extra '/' from regular expressions
+	$lines = str_replace(array("'/'.'","'.'/'","'.'/i'"),array("'/","/'","/i'"),$lines);
+
+	// fix call to not longer existing PDO method $result->fetchSingle()
+	$lines = str_replace('->fetchSingle(','->fetchColumn(',$lines);
+
+	if ($lines != $orig)
+	{
+		file_put_contents($file.'53',$lines);
+		system('/usr/bin/php -l '.$file.'53',$ret);
+		system('/usr/bin/diff -u '.$file.' '.$file.'53');
+		if (!$ret && $replace_file)
+		{
+			unlink($file);
+			rename($file.'53',$file);
+		}
+		return !$ret;
+	}
+	return true;
+}
+
+/**
+ * Loop recursive through directory and call fix_depricated for each php file
+ *
+ * @param string $dir
+ * @param boolean $replace_file=false replace existing file if modifications are necessary, otherwise .php53 file is created
+ * @return boolean false on error
+ */
+function fix_depricated_recursive($dir,$replace_file=false)
+{
+	if (!is_dir($dir)) return false;
+
+	foreach(scandir($dir) as $file)
+	{
+		if ($file == '.' || $file == '..') continue;
+
+		if (is_dir($dir.'/'.$file))
+		{
+			fix_depricated_recursive($dir.'/'.$file,$replace_file);
+		}
+		elseif(substr($file,-4) == '.php')
+		{
+			echo "\r".str_repeat(' ',100)."\r".$dir.'/'.$file.': ';
+			fix_depricated($dir.'/'.$file,$replace_file);
+		}
+	}
+	echo "\r".str_repeat(' ',100)."\r";
+	return true;
+}
+
+/**
+ * Give usage
+ *
+ * @param string $error=null
+ */
+function usage($error=null)
+{
+	global $prog;
+	echo "Usage: $prog [--replace] [-h|--help] file or dir\n\n";
+	if ($error) echo $error."\n\n";
+	exit($error ? 1 : 0);
+}
+
+$args = $_SERVER['argv'];
+$prog = basename(array_shift($args));
+
+if (!$args) usage();
+
+$replace_file = false;
+while(($arg = array_shift($args)))
+{
+	switch($arg)
+	{
+		case '-h':
+		case '--help':
+			usage();
+			break;
+
+		case '--replace':
+			$replace_file = true;
+			break;
+
+		default:
+			if ($args)	// not last argument
+			{
+				usage("Unknown argument '$arg'!");
+			}
+			break 2;
+	}
+}
+
+if (!file_exists($arg)) usage("Error: $arg not found!");
+
+if (!is_dir($arg))
+{
+	fix_depricated($arg,$replace_file);
+}
+else
+{
+	fix_depricated_recursive($arg,$replace_file);
+}
\ No newline at end of file

From 1ec13cce8846ab1832329d1997b459569a14228f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 8 Jun 2009 16:34:30 +0000
Subject: [PATCH 406/510] proset Id


From 8058dfdfb11f290901c1e3861e142aaf9bed6249 Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Mon, 8 Jun 2009 19:48:26 +0000
Subject: [PATCH 407/510] fixed wrong date format in rtf addressbook template

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

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index 48506e7a12..776c0895a1 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -67,7 +67,7 @@ class addressbook_merge	// extends bo_merge
 					if ($value)
 					{
 						list($y,$m,$d) = explode('-',$value);
-						$contact[$name] = $GLOBALS['egw']->common->dateformatorder($y,$m,$d,true);
+						$value = $GLOBALS['egw']->common->dateformatorder($y,$m,$d,true);
 					}
 					break;
 				case 'owner': case 'creator': case 'modifier':

From 70a8820eaf61f4417d14c9385586a59770d2e26a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 9 Jun 2009 05:44:16 +0000
Subject: [PATCH 408/510] "added (executable) scripts in doc/rpm-build"

---
 doc/rpm-build/checkout-build-archives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index 28cfc7b2c1..0425ce6b14 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -239,7 +239,7 @@ function do_copy()
 	chdir($config['egw_buildroot'].'/'.$config['aliasdir']);
 	$cmd = '/bin/chmod -R a-x,u=rwX,g=rX,o=rX .';
 	run_cmd($cmd);
-	$cmd = '/bin/chmod +x */*cli.php phpgwapi/cron/*.php svn-helper.php';
+	$cmd = '/bin/chmod +x */*cli.php phpgwapi/cron/*.php svn-helper.php doc/rpm-build/*.php';
 	run_cmd($cmd);
 }
 

From 8cd899c36cd25851d1a55b3f0cddf41cafa3c087 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 9 Jun 2009 11:22:23 +0000
Subject: [PATCH 409/510] added automatic detection for suse and debian

---
 ...{rpm_post_install.php => post_install.php} | 49 ++++++++++++++++---
 1 file changed, 43 insertions(+), 6 deletions(-)
 rename doc/rpm-build/{rpm_post_install.php => post_install.php} (88%)

diff --git a/doc/rpm-build/rpm_post_install.php b/doc/rpm-build/post_install.php
similarity index 88%
rename from doc/rpm-build/rpm_post_install.php
rename to doc/rpm-build/post_install.php
index 846153ff8e..81bf29ddbe 100755
--- a/doc/rpm-build/rpm_post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -41,6 +41,7 @@ $config = array(
 	'autostart_db' => '/sbin/chkconfig --level 345 mysqld on',
 	'start_webserver' => '/etc/init.d/httpd',
 	'autostart_webserver' => '/sbin/chkconfig --level 345 httpd on',
+	'distro'      => 'rh',
 );
 
 // read language from LANG enviroment variable
@@ -55,6 +56,42 @@ if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG']))
 }
 $config['source_dir'] = dirname(dirname(dirname(__FILE__)));
 
+/**
+ * Set distribution spezific defaults
+ *
+ * @param string $distro=null default autodetect
+ */
+function set_distro_defaults($distro=null)
+{
+	global $config;
+	if (is_null($distro))
+	{
+		$distro = file_exists('/etc/SuSE-release') ? 'suse' : (file_exists('/etc/debian_version') ? 'debian' : 'rh');
+	}
+	switch (($config['distro'] = $distro))
+	{
+		case 'suse':
+			$config['php'] = '/usr/bin/php5';
+			$config['start_db'] = '/etc/init.d/mysql';
+			$config['autostart_db'] = '/sbin/chkconfig --level 345 mysql on';
+			$config['start_webserver'] = '/etc/init.d/apache2';
+			$config['autostart_webserver'] = '/sbin/chkconfig --level 345 apache2 on';
+			break;
+		case 'debian':
+			$config['start_db'] = '/etc/init.d/mysql';
+			$config['autostart_db'] = '/usr/sbin/update-rc.d mysql defaults';
+			$config['start_webserver'] = '/etc/init.d/apache2';
+			$config['autostart_webserver'] = '/usr/sbin/update-rc.d apache2 defaults';
+			break;
+		default:
+			$config['distro'] = 'rh';
+			// fall through
+		case 'rh':	// nothing to do, defaults are already set
+			break;
+	}
+}
+set_distro_defaults();
+
 // read config from command line
 $argv = $_SERVER['argv'];
 $prog = array_shift($argv);
@@ -71,11 +108,11 @@ while(($arg = array_shift($argv)))
 	}
 	elseif($arg == '--suse')
 	{
-		$config['php'] = '/usr/bin/php5';
-		$config['start_db'] = '/etc/init.d/mysql';
-		$config['autostart_db'] = '/sbin/chkconfig --level 345 mysql on';
-		$config['start_webserver'] = '/etc/init.d/apache2';
-		$config['autostart_webserver'] = '/sbin/chkconfig --level 345 apach2 on';
+		set_distro_defaults('suse');
+	}
+	elseif($arg == '--distro')
+	{
+		set_distro_defaults(array_shift($argv));
 	}
 	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
 	{
@@ -310,7 +347,7 @@ function usage($error=null)
 {
 	global $prog,$config;
 
-	echo "Usage: $prog [-h|--help] [-v|--verbose] [--suse] [options, ...]\n\n";
+	echo "Usage: $prog [-h|--help] [-v|--verbose] [--distro=(suse|rh|debian)] [options, ...]\n\n";
 	echo "options and their defaults:\n";
 	foreach($config as $name => $default)
 	{

From 78ce775f178ef3b8741c5b1c2f8efbb096f6447b Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Tue, 9 Jun 2009 12:16:15 +0000
Subject: [PATCH 410/510] freebussy ACL added into calender. Now if you only
 give that right, you will see, that the time is blocked without a read right
 of user or group. But will see everything as private

---
 calendar/inc/class.calendar_bo.inc.php        | 287 +++++++++---------
 calendar/inc/class.calendar_ui.inc.php        |   4 +-
 calendar/setup/egw_de.lang                    |   2 +
 calendar/setup/egw_en.lang                    |   2 +
 .../templates/default/preference_acl_row.tpl  |   1 +
 .../templates/default/preference_colspan.tpl  |   1 +
 6 files changed, 151 insertions(+), 146 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index ad2411823f..3f7045c4c1 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -24,6 +24,7 @@ define('WEEK_s',7*DAY_s);
  * Used be the addressbook.
  */
 define('EGW_ACL_READ_FOR_PARTICIPANTS',EGW_ACL_CUSTOM_1);
+define('EGW_ACL_FREEBUSY',EGW_ACL_CUSTOM_2);
 
 /**
  * Required (!) include, as we use the MCAL_* constants, BEFORE instanciating (and therefore autoloading) the class
@@ -95,34 +96,34 @@ class calendar_bo
 	 * @var array $verbose_status translated 1-char status values to a verbose name, run through lang() by the constructor
 	 */
 	var $verbose_status = array(
-		'A' => 'Accepted',
-		'R' => 'Rejected',
-		'T' => 'Tentative',
-		'U' => 'No Response',
-		'G' => 'Group invitation',
+	'A' => 'Accepted',
+	'R' => 'Rejected',
+	'T' => 'Tentative',
+	'U' => 'No Response',
+	'G' => 'Group invitation',
 	);
 	/**
 	 * @var array recur_types translates MCAL recur-types to verbose labels
 	 */
 	var $recur_types = Array(
-		MCAL_RECUR_NONE         => 'None',
-		MCAL_RECUR_DAILY        => 'Daily',
-		MCAL_RECUR_WEEKLY       => 'Weekly',
-		MCAL_RECUR_MONTHLY_WDAY => 'Monthly (by day)',
-		MCAL_RECUR_MONTHLY_MDAY => 'Monthly (by date)',
-		MCAL_RECUR_YEARLY       => 'Yearly'
+	MCAL_RECUR_NONE         => 'None',
+	MCAL_RECUR_DAILY        => 'Daily',
+	MCAL_RECUR_WEEKLY       => 'Weekly',
+	MCAL_RECUR_MONTHLY_WDAY => 'Monthly (by day)',
+	MCAL_RECUR_MONTHLY_MDAY => 'Monthly (by date)',
+	MCAL_RECUR_YEARLY       => 'Yearly'
 	);
 	/**
 	 * @var array recur_days translates MCAL recur-days to verbose labels
 	 */
 	var $recur_days = array(
-		MCAL_M_MONDAY    => 'Monday',
-		MCAL_M_TUESDAY   => 'Tuesday',
-		MCAL_M_WEDNESDAY => 'Wednesday',
-		MCAL_M_THURSDAY  => 'Thursday',
-		MCAL_M_FRIDAY    => 'Friday',
-		MCAL_M_SATURDAY  => 'Saturday',
-		MCAL_M_SUNDAY    => 'Sunday',
+	MCAL_M_MONDAY    => 'Monday',
+	MCAL_M_TUESDAY   => 'Tuesday',
+	MCAL_M_WEDNESDAY => 'Wednesday',
+	MCAL_M_THURSDAY  => 'Thursday',
+	MCAL_M_FRIDAY    => 'Friday',
+	MCAL_M_SATURDAY  => 'Saturday',
+	MCAL_M_SUNDAY    => 'Sunday',
 	);
 	/**
 	 * @var array $resources registered scheduling resources of the calendar (gets chached in the session for performance reasons)
@@ -186,9 +187,9 @@ class calendar_bo
 				}
 			}
 			$this->resources['e'] = array(
-				'type' => 'e',
-				'info' => __CLASS__.'::email_info',
-				'app'  => 'email',
+			'type' => 'e',
+			'info' => __CLASS__.'::email_info',
+			'app'  => 'email',
 			);
 			$GLOBALS['egw']->session->appsession('resources','calendar',$this->resources);
 		}
@@ -218,10 +219,10 @@ class calendar_bo
 				$email = $matches[2];
 			}
 			$data[] = array(
-				'res_id' => $id,
-				'email' => $email,
-				'rights' => EGW_ACL_READ_FOR_PARTICIPANTS,
-				'name' => $name,
+			'res_id' => $id,
+			'email' => $email,
+			'rights' => EGW_ACL_READ_FOR_PARTICIPANTS,
+			'name' => $name,
 			);
 		}
 		//echo "<p>email_info(".print_r($ids,true).")="; _debug_array($data);
@@ -240,7 +241,7 @@ class calendar_bo
 		foreach($event['participants'] as $uid => $status)
 		{
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
-				($members = $GLOBALS['egw']->accounts->member($uid)))
+			($members = $GLOBALS['egw']->accounts->member($uid)))
 			{
 				foreach($members as $member)
 				{
@@ -290,7 +291,7 @@ class calendar_bo
 		$params_in = $params;
 
 		if (!isset($params['users']) || !$params['users'] ||
-			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
+		count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
 		{
 			// for a search use all account you have read grants from
 			$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
@@ -303,7 +304,7 @@ class calendar_bo
 		$users = array();
 		foreach($params['users'] as $user)
 		{
-			if ($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS,0,$user))
+			if ($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$user))
 			{
 				if ($user && !in_array($user,$users))	// already added?
 				{
@@ -327,7 +328,7 @@ class calendar_bo
 					{
 						// use only members which gave the user a read-grant
 						if (!in_array($member['account_id'],$users) &&
-							($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ,0,$member['account_id'])))
+						($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id'])))
 						{
 							$users[] = $member['account_id'];
 						}
@@ -371,11 +372,11 @@ class calendar_bo
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
 		{
 			$this->debug_message('bocal::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, show_rejected=%11)',
-				True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
+			True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
 		}
 		// date2ts(,true) converts to server time, db2data converts again to user-time
 		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
-			$users,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected,$params['cols'],$params['append']);
+		$users,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected,$params['cols'],$params['append']);
 
 		if (isset($params['cols']))
 		{
@@ -485,14 +486,14 @@ class calendar_bo
 	function clear_private_infos(&$event,$allowed_participants = array())
 	{
 		$event = array(
-			'id'    => $event['id'],
-			'start' => $event['start'],
-			'end'   => $event['end'],
-			'title' => lang('private'),
-			'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
-			'public'=> 0,
- 			'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
- 			'non_blocking' => $event['non_blocking'],
+		'id'    => $event['id'],
+		'start' => $event['start'],
+		'end'   => $event['end'],
+		'title' => lang('private'),
+		'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
+		'public'=> 0,
+		'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
+		'non_blocking' => $event['non_blocking'],
 		);
 	}
 
@@ -656,8 +657,8 @@ class calendar_bo
 		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms(EGW_ACL_READ,$ids,0,$date_format,$date)))
 		{
 			if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
-				self::$cached_event_date_format != $date_format ||
-				self::$cached_event['recur_type'] != MCAL_RECUR_NONE && !is_null($date) && (!$date || self::$cached_event['start'] < $date))
+			self::$cached_event_date_format != $date_format ||
+			self::$cached_event['recur_type'] != MCAL_RECUR_NONE && !is_null($date) && (!$date || self::$cached_event['start'] < $date))
 			{
 				$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0);
 
@@ -764,7 +765,7 @@ class calendar_bo
 			if ($this->debug && ((int) $this->debug > 3 || $this->debug == 'insert_all_repetions' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions'))
 			{
 				$this->debug_message('bocal::insert_all_repetions(...,%1) checking recur_exceptions[%2] and event[recur_exceptions]=%3 ==> %4',False,
-					$recur_exceptions,$search_date_ymd,$event['recur_exception'],$have_exception);
+				$recur_exceptions,$search_date_ymd,$event['recur_exception'],$have_exception);
 			}
 			if ($have_exception)
 			{
@@ -848,7 +849,7 @@ class calendar_bo
 					}
 
 					if (($GLOBALS['egw']->datetime->day_of_week($event_start_arr['year'],$event_start_arr['month'],$event_start_arr['day']) == $GLOBALS['egw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day)) &&
-						(ceil($event_start_arr['day']/7) == ceil($search_date_day/7)))
+					(ceil($event_start_arr['day']/7) == ceil($search_date_day/7)))
 					{
 						$this->add_adjusted_event($events,$event,$search_date_ymd);
 					}
@@ -928,11 +929,11 @@ class calendar_bo
 			if (is_numeric($uid))
 			{
 				$info = array(
-					'res_id'    => $uid,
-					'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
-					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
-									$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
-					'type'  => $GLOBALS['egw']->accounts->get_type($uid),
+				'res_id'    => $uid,
+				'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
+				'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
+				$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
+				'type'  => $GLOBALS['egw']->accounts->get_type($uid),
 				);
 			}
 			else
@@ -977,7 +978,6 @@ class calendar_bo
 		if ($other && !is_numeric($other))
 		{
 			$resource = $this->resource_info($other);
-
 			return $needed & $resource['rights'];
 		}
 		if (is_int($event) && $event == 0)
@@ -1003,7 +1003,6 @@ class calendar_bo
 		}
 		$user = $GLOBALS['egw_info']['user']['account_id'];
 		$grants = $this->grants[$owner];
-
 		if (is_array($event) && $needed == EGW_ACL_READ)
 		{
 			// Check if the $user is one of the participants or has a read-grant from one of them
@@ -1016,7 +1015,7 @@ class calendar_bo
 					if ($uid == $user || $uid < 0 && in_array($user,$GLOBALS['egw']->accounts->members($uid,true)))
 					{
 						// if we are a participant, we have an implicite READ and PRIVAT grant
-						$grants |= EGW_ACL_READ | EGW_ACL_PRIVATE;
+						$grants |= EGW_ACL_READ;
 						break;
 					}
 					elseif ($this->grants[$uid] & EGW_ACL_READ)
@@ -1038,7 +1037,6 @@ class calendar_bo
 				error_log(__METHOD__." no participants for event:".print_r($event,true));
 			}
 		}
-
 		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == EGW_ACL_ADD)
 		{
 			$access = False;	// a group can't be the owner of an event
@@ -1070,54 +1068,54 @@ class calendar_bo
 		switch(gettype($date))
 		{
 			case 'string':	// YYYYMMDD or iso8601 YYYY-MM-DDThh:mm:ss[Z|[+-]hh:mm] string
-				if (is_numeric($date) && $date > 21000000)
+			if (is_numeric($date) && $date > 21000000)
+			{
+				$date = (int) $date;	// this is already as timestamp
+				break;
+			}
+			// evaluate evtl. added timezone
+			if (strlen($date) > 12)
+			{
+				if (substr($date,-1) == 'Z')
 				{
-					$date = (int) $date;	// this is already as timestamp
-					break;
+					$time_offset = date('Z');
 				}
-				// evaluate evtl. added timezone
-				if (strlen($date) > 12)
+				elseif(preg_match('/([+-]{1})([0-9]{2}):?([0-9]{2})$/',$date,$matches))
 				{
-					if (substr($date,-1) == 'Z')
-					{
-						$time_offset = date('Z');
-					}
-					elseif(preg_match('/([+-]{1})([0-9]{2}):?([0-9]{2})$/',$date,$matches))
-					{
-						$time_offset = date('Z')-($matches[1] == '+' ? 1 : -1)*(3600*$matches[2]+60*$matches[3]);
-					}
+					$time_offset = date('Z')-($matches[1] == '+' ? 1 : -1)*(3600*$matches[2]+60*$matches[3]);
 				}
-				// removing all non-nummerical chars, gives YYYYMMDDhhmmss, independent of the iso8601 format
-				$date = str_replace(array('-',':','T','Z',' ','+'),'',$date);
-				$date = array(
-					'year'   => (int) substr($date,0,4),
-					'month'  => (int) substr($date,4,2),
-					'day'    => (int) substr($date,6,2),
-					'hour'   => (int) substr($date,8,2),
-					'minute' => (int) substr($date,10,2),
-					'second' => (int) substr($date,12,2),
-				);
-				// fall-through
+			}
+			// removing all non-nummerical chars, gives YYYYMMDDhhmmss, independent of the iso8601 format
+			$date = str_replace(array('-',':','T','Z',' ','+'),'',$date);
+			$date = array(
+			'year'   => (int) substr($date,0,4),
+			'month'  => (int) substr($date,4,2),
+			'day'    => (int) substr($date,6,2),
+			'hour'   => (int) substr($date,8,2),
+			'minute' => (int) substr($date,10,2),
+			'second' => (int) substr($date,12,2),
+			);
+			// fall-through
 			case 'array':	// day, month and year keys
-				if (isset($date['raw']) && $date['raw'])	// we already have a timestamp
-				{
-					$date = $date['raw'];
-					break;
-				}
-				if (!isset($date['year']) && isset($date['full']))
-				{
-					$date['year']  = (int) substr($date['full'],0,4);
-					$date['month'] = (int) substr($date['full'],4,2);
-					$date['day']   = (int) substr($date['full'],6,2);
-				}
-				$date = adodb_mktime((int)$date['hour'],(int)$date['minute'],(int)$date['second'],(int)$date['month'],
-					(int) (isset($date['day']) ? $date['day'] : $date['mday']),(int)$date['year']);
+			if (isset($date['raw']) && $date['raw'])	// we already have a timestamp
+			{
+				$date = $date['raw'];
 				break;
+			}
+			if (!isset($date['year']) && isset($date['full']))
+			{
+				$date['year']  = (int) substr($date['full'],0,4);
+				$date['month'] = (int) substr($date['full'],4,2);
+				$date['day']   = (int) substr($date['full'],6,2);
+			}
+			$date = adodb_mktime((int)$date['hour'],(int)$date['minute'],(int)$date['second'],(int)$date['month'],
+			(int) (isset($date['day']) ? $date['day'] : $date['mday']),(int)$date['year']);
+			break;
 			case 'integer':		// already a timestamp
-				break;
+			break;
 			default:		// eg. boolean, means now in user-time (!)
-				$date = $this->now_su;
-				break;
+			$date = $this->now_su;
+			break;
 		}
 		if ($time_offset)
 		{
@@ -1262,12 +1260,13 @@ class calendar_bo
 	function debug_message($msg,$backtrace=True)
 	{
 		static $acl2string = array(
-			0               => 'ACL-UNKNOWN',
-			EGW_ACL_READ    => 'ACL_READ',
-			EGW_ACL_ADD     => 'ACL_ADD',
-			EGW_ACL_EDIT    => 'ACL_EDIT',
-			EGW_ACL_DELETE  => 'ACL_DELETE',
-			EGW_ACL_PRIVATE => 'ACL_PRIVATE',
+		0               => 'ACL-UNKNOWN',
+		EGW_ACL_READ    => 'ACL_READ',
+		EGW_ACL_ADD     => 'ACL_ADD',
+		EGW_ACL_EDIT    => 'ACL_EDIT',
+		EGW_ACL_DELETE  => 'ACL_DELETE',
+		EGW_ACL_PRIVATE => 'ACL_PRIVATE',
+		EGW_ACL_FREEBUSY => 'ACL_FREEBUSY',
 		);
 		for($i = 2; $i < func_num_args(); ++$i)
 		{
@@ -1331,7 +1330,7 @@ class calendar_bo
 		$timefmt = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
 		$month_before_day = strtolower($datefmt[0]) == 'm' ||
-			strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
+		strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
 
 		if ($display_day)
 		{
@@ -1485,21 +1484,21 @@ class calendar_bo
 				switch($status)
 				{
 					case 'A':	// accepted
-						$status = html::image('calendar','agt_action_success',$this->verbose_status[$status]);
-						break;
+					$status = html::image('calendar','agt_action_success',$this->verbose_status[$status]);
+					break;
 					case 'R':	// rejected
-						$status = html::image('calendar','agt_action_fail',$this->verbose_status[$status]);
-						break;
+					$status = html::image('calendar','agt_action_fail',$this->verbose_status[$status]);
+					break;
 					case 'T':	// tentative
-						$status = html::image('calendar','tentative',$this->verbose_status[$status]);
-						break;
+					$status = html::image('calendar','tentative',$this->verbose_status[$status]);
+					break;
 					case 'U':	// no response = unknown
-						$status = html::image('calendar','cnr-pending',$this->verbose_status[$status]);
-						break;
+					$status = html::image('calendar','cnr-pending',$this->verbose_status[$status]);
+					break;
 					case 'G':	// group invitation
-						// Todo: Image, seems not to be used
-						$status = '('.$this->verbose_status[$status].')';
-						break;
+					// Todo: Image, seems not to be used
+					$status = '('.$this->verbose_status[$status].')';
+					break;
 				}
 			}
 			else
@@ -1562,9 +1561,9 @@ class calendar_bo
 			$arr = &$users;
 		}
 		$arr[$name] = Array(
-			'grantor' => $id,
-			'value'   => ($type == 'g' ? 'g_' : '') . $id,
-			'name'    => $name
+		'grantor' => $id,
+		'value'   => ($type == 'g' ? 'g_' : '') . $id,
+		'name'    => $name
 		);
 	}
 
@@ -1696,12 +1695,12 @@ class calendar_bo
 						list($m,$d,$y) = explode('/',$pers['bday']);
 						if ($y > $year) continue; 	// not yet born
 						$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
-							'day'       => $d,
-							'month'     => $m,
-							'occurence' => 0,
-							'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
-								$pers['n_family'].($y && !$GLOBALS['egw_info']['server']['hide_birthdays'] ? ' ('.$y.')' : ''),
-							'birthyear' => $y,	// this can be used to identify birthdays from holidays
+						'day'       => $d,
+						'month'     => $m,
+						'occurence' => 0,
+						'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
+						$pers['n_family'].($y && !$GLOBALS['egw_info']['server']['hide_birthdays'] ? ' ('.$y.')' : ''),
+						'birthyear' => $y,	// this can be used to identify birthdays from holidays
 						);
 					}
 				}
@@ -1788,28 +1787,28 @@ class calendar_bo
 		}
 		$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
 		$defaults = array(
-			'defaultcalendar' => 'week',
-			'mainscreen_showevents' => '0',
-			'summary'         => 'no',
-			'receive_updates' => 'no',
-			'update_format'   => 'extended',
-			'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
-			'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
-			'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
-			'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
-			'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
-			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
-			'show_rejected'   => '0',
-			'display_status'  => '1',
-			'weekdaystarts'   => 'Monday',
-			'workdaystarts'   => '9',
-			'workdayends'     => '17',
-			'interval'        => '30',
-			'defaultlength'   => '60',
-			'planner_start_with_group' => $planner_start_with_group,
-			'defaultfilter'   => 'all',
-			'default_private' => '0',
-			'defaultresource_sel' => 'resources',
+		'defaultcalendar' => 'week',
+		'mainscreen_showevents' => '0',
+		'summary'         => 'no',
+		'receive_updates' => 'no',
+		'update_format'   => 'extended',
+		'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
+		'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
+		'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
+		'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
+		'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
+		'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
+		'show_rejected'   => '0',
+		'display_status'  => '1',
+		'weekdaystarts'   => 'Monday',
+		'workdaystarts'   => '9',
+		'workdayends'     => '17',
+		'interval'        => '30',
+		'defaultlength'   => '60',
+		'planner_start_with_group' => $planner_start_with_group,
+		'defaultfilter'   => 'all',
+		'default_private' => '0',
+		'defaultresource_sel' => 'resources',
 		);
 		foreach($defaults as $var => $default)
 		{
@@ -1837,8 +1836,8 @@ class calendar_bo
 		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
 
 		return (!$GLOBALS['egw_info']['server']['webserver_url'] || $GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
-			($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
-			$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.urlencode($user).
-			($pw ? '&password='.urlencode($pw) : '');
+		($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
+		$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.urlencode($user).
+		($pw ? '&password='.urlencode($pw) : '');
 	}
 }
diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 21908ee525..fb54aef42a 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -188,13 +188,13 @@ class calendar_ui
 				foreach($GLOBALS['egw']->accounts->member($owner) as $member)
 				{
 					$member = $member['account_id'];
-					if (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS,0,$member))
+					if (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$member))
 					{
 						$no_access_group[$member] = $this->bo->participant_name($member);
 					}
 				}
 			}
-			elseif (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS,0,$owner))
+			elseif (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$owner))
 			{
 				$no_access[$owner] = $this->bo->participant_name($owner);
 			}
diff --git a/calendar/setup/egw_de.lang b/calendar/setup/egw_de.lang
index e633909133..228ffbb968 100644
--- a/calendar/setup/egw_de.lang
+++ b/calendar/setup/egw_de.lang
@@ -65,6 +65,7 @@ csv	calendar	de	CSV
 csv-fieldname	calendar	de	CSV-Feldname
 csv-filename	calendar	de	CSV-Dateiname
 custom fields	common	de	Benutzerdefinierte Felder
+custom_2	common	de	freebussy
 daily	calendar	de	Täglich
 days	calendar	de	Tage
 days of the week for a weekly repeated event	calendar	de	Wochentage für wöchentlich wiederholten Termin
@@ -137,6 +138,7 @@ format of event updates	calendar	de	Format der Benachrichtigungen
 forward half a month	calendar	de	einen halben Monat weiter
 forward one month	calendar	de	einen Monat weiter
 four days view	calendar	de	Vier-Tagesansicht
+freebusy	common	de	Frei/Belegt
 freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	de	Belegtzeiten: Unbekannter Benutzername '%1', falsches Passwort oder nicht verfügbar für nicht angemeldete Benutzer !!!
 freetime search	calendar	de	Terminsuche
 fri	calendar	de	Fr
diff --git a/calendar/setup/egw_en.lang b/calendar/setup/egw_en.lang
index fb1bcbe4a9..16752e1e59 100644
--- a/calendar/setup/egw_en.lang
+++ b/calendar/setup/egw_en.lang
@@ -65,6 +65,7 @@ csv	calendar	en	CSV
 csv-fieldname	calendar	en	CSV-Fieldname
 csv-filename	calendar	en	CSV-Filename
 custom fields	common	en	Custom fields
+custom_2	common	en	freebussy
 daily	calendar	en	Daily
 days	calendar	en	days
 days of the week for a weekly repeated event	calendar	en	Days of the week for a weekly repeated event
@@ -137,6 +138,7 @@ format of event updates	calendar	en	Format of event updates
 forward half a month	calendar	en	forward half a month
 forward one month	calendar	en	forward one month
 four days view	calendar	en	Four days view
+freebusy	common	en	Free/Busy
 freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	en	freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!
 freetime search	calendar	en	Freetime Search
 fri	calendar	en	Fri
diff --git a/calendar/templates/default/preference_acl_row.tpl b/calendar/templates/default/preference_acl_row.tpl
index 942e7eccc3..6cb7ca8ddf 100755
--- a/calendar/templates/default/preference_acl_row.tpl
+++ b/calendar/templates/default/preference_acl_row.tpl
@@ -1,6 +1,7 @@
 <!-- $Id$ -->
    <tr class="{row_class}">
     <td>{user}</td>
+    <td align="center"><input type="checkbox" name="{custom_2}" value="Y"{custom_2_selected}></td>
     <td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
     <td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
     <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
diff --git a/calendar/templates/default/preference_colspan.tpl b/calendar/templates/default/preference_colspan.tpl
index 00cf26c771..97c9822545 100755
--- a/calendar/templates/default/preference_colspan.tpl
+++ b/calendar/templates/default/preference_colspan.tpl
@@ -1,5 +1,6 @@
   <tr class="th">
     <td>{string}</td>
+    <td align="center">{lang_freebusy}</td>
     <td align="center">{lang_read}</td>
     <td align="center">{lang_add}</td>
     <td align="center">{lang_edit}</td>

From 4f418e87666bf6218966d13dcb002e526c7f6e8e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 10 Jun 2009 08:55:51 +0000
Subject: [PATCH 411/510] "fix for email addressbook popup: going to next page,
 readds already added email again --> caused by using old global var in
 addressbook code, which is now a static var of etemplate object"

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

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 48faa8af8c..bb82268c4d 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -776,7 +776,7 @@ class addressbook_ui extends addressbook_bo
 		{
 			$query['advanced_search'] = $old_state['advanced_search'];
 		}
-		if ($do_email && $GLOBALS['egw_info']['etemplate']['loop'] && is_object($GLOBALS['egw']->js))
+		if ($do_email && etemplate::$loop && is_object($GLOBALS['egw']->js))
 		{	// remove previous addEmail() calls, otherwise they will be run again
 			$GLOBALS['egw']->js->body['onLoad'] = preg_replace('/addEmail\([^)]+\);/','',$GLOBALS['egw']->js->body['onLoad']);
 		}

From af523b59046bb7eeb9c24f394e01d8fe6d462541 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 10 Jun 2009 10:31:28 +0000
Subject: [PATCH 412/510] propfind: fix regarding the retrieval of sqlfs_props,
 if key of array with a single entry is the vfspath for the file in question

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 6c33e16ac0..15f941b3ee 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -1701,9 +1701,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 				$id = $stat['ino'];
 			}
 		}
-		if (count($ids) > 1) array_map(create_function('&$v','$v = (int)$v;'),$ids);
+		if (count($ids) >= 1) array_map(create_function('&$v','$v = (int)$v;'),$ids);
 		$query = 'SELECT * FROM '.self::PROPS_TABLE.' WHERE (fs_id'.
-			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',',$ids).')').')'.
+			(count($ids) == 1 ? '='.(int)implode('',$ids) : ' IN ('.implode(',',$ids).')').')'.
 			(!is_null($ns) ? ' AND prop_namespace=?' : '');
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 

From aaab800d80c866e093b02a527d5fa1da68b27856 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 10 Jun 2009 12:51:26 +0000
Subject: [PATCH 413/510] "removed css to capitalize first letter of sidebox
 menu items It makes problemes (hides first letter) with following browsers: -
 Konqueror (Linux) - Safari (Mac & Windows)"

---
 phpgwapi/templates/idots/css/traditional.css | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index 666ba948ac..e365f2b405 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -211,12 +211,6 @@ a.textSidebox
 	padding-bottom:3px;
 	border-top: solid #aaaaaa 1px;
 }
-/*
- ** make the sidebox entries consistently start with a capital letter
- */
-.textSidebox:first-letter {
-	text-transform:uppercase;
-}
 
 .sideboxSpace
 {

From 855d379b434613893a94715524771bdcbb213dfc Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 12 Jun 2009 13:12:12 +0000
Subject: [PATCH 414/510] fixing a problem reported for chrome and safari
 regarding the multiple upload of files in filemanager

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

diff --git a/etemplate/js/etemplate.js b/etemplate/js/etemplate.js
index 2647a2cc2d..ab52a5eb4d 100644
--- a/etemplate/js/etemplate.js
+++ b/etemplate/js/etemplate.js
@@ -295,5 +295,6 @@ function add_upload(upload)
 	var br = document.createElement('br');
 	parent.insertBefore(br,upload);
 	upload.id += parent.childNodes.length;
-	upload.value = '';
+	newUpload.value = '';
+	parent.insertBefore(upload,newUpload);
 }

From 0ada07748c95a58b9470e5f94fd97619956bfa32 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 14 Jun 2009 08:42:34 +0000
Subject: [PATCH 415/510] "reload apache, if it's already running"

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

diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php
index 81bf29ddbe..85cd209ec8 100755
--- a/doc/rpm-build/post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -193,6 +193,10 @@ if (!file_exists($config['header']) || filesize($config['header']) < 200)	// def
 			system($config['start_webserver'].' start');
 			system($config['autostart_webserver']);
 		}
+		else
+		{
+			system($config['start_webserver'].' reload');
+		}
 	}
 	echo "\n";
 	echo "EGroupware successful installed\n";

From c0cab3f834b487c91d0943dc49204c6d9c3ba090 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 14 Jun 2009 10:29:01 +0000
Subject: [PATCH 416/510] "improved default preferences - setting country from
 lang - setting dateformat for lang != en to 'd.m.Y' - setting curreny for
 lang != en to 'EUR'"

---
 setup/admin_account.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setup/admin_account.php b/setup/admin_account.php
index 576aba8737..4c64f623c1 100644
--- a/setup/admin_account.php
+++ b/setup/admin_account.php
@@ -137,6 +137,10 @@ else
 	// give admin access to default apps, not yet set for the default group
 	function insert_default_prefs($accountid)
 	{
+		$lang = get_var('ConfigLang',Array('POST','COOKIE'),'en');
+		list(,$country) = explode('-',$lang);
+		if (empty($country)) $country = $lang;
+
 		$defaultprefs = array(
 			'common' => array(
 				'maxmatchs'     => 15,
@@ -144,11 +148,12 @@ else
 				'theme'         => 'idots',
 				'navbar_format' => 'icons',
 				'tz_offset'     => 0,
-				'dateformat'    => 'Y/m/d',
+				'dateformat'    => $lang == 'en' ? 'Y/m/d' : 'd.m.Y',
 				'timeformat'    => '24',
-				'lang'          => get_var('ConfigLang',Array('POST','COOKIE'),'en'),
+				'lang'          => $lang,
+				'country'       => strtoupper($country),
 				'default_app'   => 'calendar',
-				'currency'      => '$',
+				'currency'      => $lang == 'en' ? '$' : 'EUR',
 				'show_help'     => True,
 				'max_icons'		=> 12,
 			),

From 8fa0c12341a94414a25e6004db77d005ddb3594e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 14 Jun 2009 10:37:01 +0000
Subject: [PATCH 417/510] "also setting spellcheck_lang (no idea why this is a
 separate option)"

---
 setup/admin_account.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/admin_account.php b/setup/admin_account.php
index 4c64f623c1..280ca525b2 100644
--- a/setup/admin_account.php
+++ b/setup/admin_account.php
@@ -151,6 +151,7 @@ else
 				'dateformat'    => $lang == 'en' ? 'Y/m/d' : 'd.m.Y',
 				'timeformat'    => '24',
 				'lang'          => $lang,
+				'spellchecker_lang' => $lang,
 				'country'       => strtoupper($country),
 				'default_app'   => 'calendar',
 				'currency'      => $lang == 'en' ? '$' : 'EUR',

From ea13efc0af5ab7bad2d94adbc0587bab604dcb0e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 14 Jun 2009 13:26:07 +0000
Subject: [PATCH 418/510] "- if user wants to change permissions of all
 subfolders, do NOT check if permissions of current folder is realy changed
 (as the requested change can be elsewhere) - only give \"permissions
 changed/failed\" message once"

---
 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 a4faebec3e..440ab63ec2 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -729,7 +729,9 @@ class filemanager_ui
 				$props = array();
 				foreach($content['old'] as $name => $old_value)
 				{
-					if (isset($content[$name]) && $old_value != $content[$name])
+					if (isset($content[$name]) && ($old_value != $content[$name] ||
+						// do not check for modification, if modify_subs is checked!
+						$content['modify_subs'] && in_array($name,array('uid','gid','perms'))) && $name != 'uid' || egw_vfs::$is_root)
 					{
 						if ($name == 'name')
 						{
@@ -791,12 +793,12 @@ class filemanager_ui
 								}
 								if ($ok && !$failed)
 								{
-									$msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									if(!$perm_changed++) $msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
 									$content['old'][$name] = $content[$name];
 								}
 								elseif($failed)
 								{
-									$msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
+									if(!$perm_failed++) $msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
 										($ok ? ' ('.lang('%1 failed, %2 succeded',$failed,$ok).')' : ''));
 								}
 							}

From bacf86c1a8284d4e6763a885182b3cac3b65b87b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 15 Jun 2009 13:48:09 +0000
Subject: [PATCH 419/510] Fixed display of birthdays from addressbook on home
 page: - dont display year, if calendar config forbidds to display of
 birthyear - dont display them at all, if they are forbidden in calendar

---
 .../inc/class.addressbook_hooks.inc.php       | 33 ++++++++++---------
 addressbook/inc/hook_home.inc.php             |  4 ++-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php
index d5427bcb86..d1feb36961 100644
--- a/addressbook/inc/class.addressbook_hooks.inc.php
+++ b/addressbook/inc/class.addressbook_hooks.inc.php
@@ -118,21 +118,24 @@ class addressbook_hooks
 			'xmlrpc' => True,
 			'admin'  => False,
 		);
-		$settings['mainscreen_showbirthdays'] = array(
-			'type'   => 'select',
-			'label'  => 'Show birthday reminders on main screen',
-			'name'   => 'mainscreen_showbirthdays',
-			'help'   => 'Displays a remider for birthdays on the startpage (page you get when you enter eGroupWare or click on the homepage icon).',
-			'values' => array(
-				0 => lang('No'),
-				1 => lang('Yes, for today and tomorrow'),
-				3 => lang('Yes, for the next three days'),
-				7 => lang('Yes, for the next week'),
-				14=> lang('Yes, for the next two weeks'),
-			),
-			'xmlrpc' => True,
-			'admin'  => False,
-		);
+		if ($GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')
+		{
+			$settings['mainscreen_showbirthdays'] = array(
+				'type'   => 'select',
+				'label'  => 'Show birthday reminders on main screen',
+				'name'   => 'mainscreen_showbirthdays',
+				'help'   => 'Displays a remider for birthdays on the startpage (page you get when you enter eGroupWare or click on the homepage icon).',
+				'values' => array(
+					0 => lang('No'),
+					1 => lang('Yes, for today and tomorrow'),
+					3 => lang('Yes, for the next three days'),
+					7 => lang('Yes, for the next week'),
+					14=> lang('Yes, for the next two weeks'),
+				),
+				'xmlrpc' => True,
+				'admin'  => False,
+			);
+		}
 		$settings['no_auto_hide'] = array(
 			'type'   => 'check',
 			'label'  => 'Don\'t hide empty columns',
diff --git a/addressbook/inc/hook_home.inc.php b/addressbook/inc/hook_home.inc.php
index d0ea313c0c..f03d15d0ce 100644
--- a/addressbook/inc/hook_home.inc.php
+++ b/addressbook/inc/hook_home.inc.php
@@ -9,7 +9,8 @@
  */
 
 if ($GLOBALS['egw_info']['user']['apps']['addressbook'] &&
-	($days = $GLOBALS['egw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays']))
+	($days = $GLOBALS['egw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays']) &&
+	$GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')
 {
 	echo "\n<!-- Birthday info -->\n";
 
@@ -74,6 +75,7 @@ if ($GLOBALS['egw_info']['user']['apps']['addressbook'] &&
 							break;
 						default:
 							list($y,$m,$d) = explode('-',$contact['bday']);
+							if ($GLOBALS['egw_info']['server']['hide_birthdays'] == 'dateonly') $y = '';
 							$text = lang("In %1 days (%2) is %3's birthday.",$n,
 								$GLOBALS['egw']->common->dateformatorder($y,$m,$d,true),
 								$contact['n_given'].' '.$contact['n_family']);

From 6aaf8e1d846d7e5b9981a43ab8a44500f4831ca3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 18 Jun 2009 10:59:10 +0000
Subject: [PATCH 420/510] "switch of output buffering (switched on in header),
 as otherwise we run against memory_limit, for big files"

---
 webdav.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webdav.php b/webdav.php
index 05aed7a4f3..76d3062767 100644
--- a/webdav.php
+++ b/webdav.php
@@ -89,6 +89,9 @@ catch (egw_exception_no_permission_app $e)
 }
 $headertime = microtime(true);
 
+// switch of output buffering (switched on in header), as otherwise we run against memory_limit, for big files
+ob_end_flush();
+
 $webdav_server = new vfs_webdav_server();
 $webdav_server->ServeRequest();
 //error_log(sprintf("WebDAV %s request took %5.3f s (header include took %5.3f s)",$_SERVER['REQUEST_METHOD'],microtime(true)-$starttime,$headertime-$starttime));

From ca6164f5ce8c1eba3f8db5f4aca94dd9d749e61a Mon Sep 17 00:00:00 2001
From: Stefan Becker <sb@stylite.de>
Date: Thu, 18 Jun 2009 12:08:37 +0000
Subject: [PATCH 421/510] fixed with klaus the Group initation behavior,
 Readaccess you can also invite participants, but you can only change the
 status, if you have edit rights

---
 calendar/inc/class.calendar_uiforms.inc.php | 27 +++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index e5a8578418..1603bca961 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -892,14 +892,27 @@ class calendar_uiforms extends calendar_ui
 					$sel_options['status']['G'] = lang('Select one');
 					foreach($members as $member)
 					{
-						if (!isset($participants[$member]) && $this->bo->check_perms(EGW_ACL_EDIT,0,$member))
+						if (!isset($participants[$member]))
 						{
-							$preserv['participants'][$row] = $content['participants'][$row] = array(
-								'app'      => 'Group invitation',
-								'uid'      => $member,
-								'status'   => 'G',
-							);
-							$readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] = true;
+							//IF Readaccess you can also invite participants, but you can only change the status, if you have edit rights
+							if ($this->bo->check_perms(EGW_ACL_READ,0,$member) && !$this->bo->check_perms(EGW_ACL_EDIT,0,$member))
+							{
+								$preserv['participants'][$row] = $content['participants'][$row] = array(
+									'app'      => 'Group invitation',
+									'uid'      => $member,
+									'status'   => $status[0],
+								);
+								$readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] =$readonlys[$row]['status']= true;
+							}
+							elseif ($this->bo->check_perms(EGW_ACL_EDIT,0,$member))
+							{
+								$preserv['participants'][$row] = $content['participants'][$row] = array(
+									'app'      => 'Group invitation',
+									'uid'      => $member,
+									'status'   => 'G',
+								);
+								$readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] = true;
+							}
 							$content['participants'][$row++]['title'] = $GLOBALS['egw']->common->grab_owner_name($member);
 						}
 					}

From 53e7c66f515b12408e910424df2fe8a52658458b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 18 Jun 2009 13:21:05 +0000
Subject: [PATCH 422/510] "fixed group invitations got changed to regular
 invitations, after inviting a second group"

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

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 1603bca961..d7fb5c999e 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2004-8 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2004-9 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -892,25 +892,20 @@ class calendar_uiforms extends calendar_ui
 					$sel_options['status']['G'] = lang('Select one');
 					foreach($members as $member)
 					{
-						if (!isset($participants[$member]))
+						if (!isset($participants[$member]) && $this->bo->check_perms(EGW_ACL_READ,0,$member))
 						{
-							//IF Readaccess you can also invite participants, but you can only change the status, if you have edit rights
-							if ($this->bo->check_perms(EGW_ACL_READ,0,$member) && !$this->bo->check_perms(EGW_ACL_EDIT,0,$member))
+							$preserv['participants'][$row] = $content['participants'][$row] = array(
+								'app'      => 'Group invitation',
+								'uid'      => $member,
+								'status'   => 'G',
+							);
+							// read access is enought to invite participants, but you edit rights to change status
+							if (!$this->bo->check_perms(EGW_ACL_EDIT,0,$member))
 							{
-								$preserv['participants'][$row] = $content['participants'][$row] = array(
-									'app'      => 'Group invitation',
-									'uid'      => $member,
-									'status'   => $status[0],
-								);
 								$readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] =$readonlys[$row]['status']= true;
 							}
-							elseif ($this->bo->check_perms(EGW_ACL_EDIT,0,$member))
+							else
 							{
-								$preserv['participants'][$row] = $content['participants'][$row] = array(
-									'app'      => 'Group invitation',
-									'uid'      => $member,
-									'status'   => 'G',
-								);
 								$readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] = true;
 							}
 							$content['participants'][$row++]['title'] = $GLOBALS['egw']->common->grab_owner_name($member);

From 66451aa99d2f4f47faa3b61f8ffadb646234ab2f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 18 Jun 2009 21:21:20 +0000
Subject: [PATCH 423/510] "dont unlink header.inc.php for root user, as it get
 created again with owner root"

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

diff --git a/setup/inc/class.setup_cmd_header.inc.php b/setup/inc/class.setup_cmd_header.inc.php
index 0b52abb6f6..6a4de645a2 100644
--- a/setup/inc/class.setup_cmd_header.inc.php
+++ b/setup/inc/class.setup_cmd_header.inc.php
@@ -138,7 +138,10 @@ class setup_cmd_header extends setup_cmd
 		if (file_exists($this->header_path) && is_writable($this->header_path) || is_writable(dirname($this->header_path)) ||
 			function_exists('posix_getuid') && !posix_getuid())	// root has all rights
 		{
-			if (is_writable(dirname($this->header_path)) && file_exists($this->header_path)) unlink($this->header_path);
+			if (posix_getuid() && is_writable(dirname($this->header_path)) && file_exists($this->header_path))
+			{
+				unlink($this->header_path);
+			}
 			if (($f = fopen($this->header_path,'wb')) && ($w=fwrite($f,$header)))
 			{
 				fclose($f);

From d9c28b9de29dbabcf4c500de78d2287783124ab5 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 19 Jun 2009 08:28:03 +0000
Subject: [PATCH 424/510] redirection via go, by rebuilding the query string;
 suggested by zorg; seems to work without sideeffects in my enviroment; please
 give feedback to the '[eGroupWare-developers] bug with
 notification,felamimail and redirect' entry

---
 redirect.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/redirect.php b/redirect.php
index 89d2707e62..9057ffe256 100644
--- a/redirect.php
+++ b/redirect.php
@@ -34,7 +34,11 @@
 
 	if($_GET['go'])
 	{
-		Header('Location: ' . html_entity_decode(urldecode($_GET['go'])));
+		$url= html_entity_decode(urldecode($_GET['go']));
+		unset($_GET['go']);
+		$url=$url."&".http_build_query($_GET);
+
+		Header('Location: ' . html_entity_decode(urldecode($url)));
 		exit;
 	}
 	else

From 1c94011502fa81abf0e6c84f6b6a1567bf0a3227 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 21 Jun 2009 12:34:02 +0000
Subject: [PATCH 425/510] "only delete header, if it does exist and is NOT
 writable (otherwise the header is owned by the user running the script)"

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

diff --git a/setup/inc/class.setup_cmd_header.inc.php b/setup/inc/class.setup_cmd_header.inc.php
index 6a4de645a2..92756eeef5 100644
--- a/setup/inc/class.setup_cmd_header.inc.php
+++ b/setup/inc/class.setup_cmd_header.inc.php
@@ -138,7 +138,7 @@ class setup_cmd_header extends setup_cmd
 		if (file_exists($this->header_path) && is_writable($this->header_path) || is_writable(dirname($this->header_path)) ||
 			function_exists('posix_getuid') && !posix_getuid())	// root has all rights
 		{
-			if (posix_getuid() && is_writable(dirname($this->header_path)) && file_exists($this->header_path))
+			if (file_exists($this->header_path) && !is_writable($this->header_path))
 			{
 				unlink($this->header_path);
 			}

From 6587813d2de468d6b5d875b3ef07b5d44ba11c02 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 21 Jun 2009 12:35:13 +0000
Subject: [PATCH 426/510] "dont delete header (otherwise the header is owned by
 the user running the script)"

---
 doc/rpm-build/post_install.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php
index 85cd209ec8..5f5657479e 100755
--- a/doc/rpm-build/post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -145,7 +145,6 @@ if (!file_exists($config['header']) || filesize($config['header']) < 200)	// def
 	// --> new install
 
 	// create header
-	@unlink($config['header']);	// remove redirect header, setup-cli stalls otherwise
 	$setup_header = $setup_cli.' --create-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']).
 		' --domain '.escapeshellarg($config['domain'].','.$config['db_name'].','.$config['db_user'].','.$config['db_pass'].
 			','.$config['db_type'].','.$config['db_host'].','.$config['db_port']);

From 50cac4e9b66938ad7487f619e4454970a0e27f20 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 22 Jun 2009 12:46:41 +0000
Subject: [PATCH 427/510] "Bugfix for tracker priorities 2-4 displayed wrong:
 use += instead of array_merge, as we have phrases with numerical index, which
 get renumbered by array_merge "

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 401839e788..d7619bbda0 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -253,7 +253,7 @@ class translation
 			$loaded =& egw_cache::getCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE,
 				__CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang));
 
-			self::$lang_arr = self::$lang_arr ? array_merge(self::$lang_arr,$loaded) : $loaded;
+			self::$lang_arr += $loaded;	// use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge
 			self::$loaded_apps[$app] = $lang;
 			//error_log(__METHOD__."($app,$lang) took ".(1000*(microtime(true)-$start))." ms, loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr).": ".function_backtrace());
 		}

From 587cf2f1f565fd54004accb390636091212a858f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 22 Jun 2009 14:46:10 +0000
Subject: [PATCH 428/510] bugfix for files got lost, while converting to
 infolog immediately after send, if attached via vfs

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

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index 7b0448910f..f80cf427ec 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -853,7 +853,12 @@ class infolog_bo
 		{
 			foreach ($_attachments as $attachment)
 			{
-				if(is_readable($attachment['tmp_name']))
+				$is_vfs = false;
+				if (parse_url($attachment['tmp_name'],PHP_URL_SCHEME) == 'vfs' && egw_vfs::is_readable($attachment['tmp_name']))
+				{
+					$is_vfs = true;
+				}
+				if(is_readable($attachment['tmp_name']) || $is_vfs)
 				{
 					egw_link::link('infolog',$info['link_to']['to_id'],'file',$attachment);
 				}

From 5e7b1d3fd682d7c00b6984cbf6a07be5a766885c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 24 Jun 2009 15:13:19 +0000
Subject: [PATCH 429/510] little bugfix for the retrieval of images configured
 to load from vfs (vfs_imagedir)

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

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 3c798d1bbb..a0ec97c651 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -861,7 +861,8 @@ class common
 				{
 					if (!egw_vfs::is_dir($vfs_imagedir.'/'.$entry))
 					{
-						if (list($type,$subtype) = explode('/',egw_vfs::mime_content_type($vfs_imagedir.'/'.$entry)) && $type == 'image')
+						list($type,$subtype) = explode('/',egw_vfs::mime_content_type($vfs_imagedir.'/'.$entry));
+						if ($type == 'image')
 						{
 							self::$found_files['vfs'][$entry] = $vfs_imagedir;
 						}

From 3cc93307254239890c6841f2ea3751d16210282c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 25 Jun 2009 07:24:40 +0000
Subject: [PATCH 430/510] "switch of output buffering (switched on in header),
 as otherwise we run against memory_limit, for big files only do it if no
 output_handler is set in php.ini, as at least with zlib.output_handler it
 stalls ... if (!ini_get('output_handler')) ob_end_flush(); "

---
 webdav.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webdav.php b/webdav.php
index 76d3062767..0d8b6aea6a 100644
--- a/webdav.php
+++ b/webdav.php
@@ -90,7 +90,8 @@ catch (egw_exception_no_permission_app $e)
 $headertime = microtime(true);
 
 // switch of output buffering (switched on in header), as otherwise we run against memory_limit, for big files
-ob_end_flush();
+// only do it if no output_handler is set in php.ini, as at least with zlib.output_handler it stalls ...
+if (!ini_get('output_handler')) ob_end_flush();
 
 $webdav_server = new vfs_webdav_server();
 $webdav_server->ServeRequest();

From 90fa0dc0e20deffd57d661ae7bf6cb883d901e20 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 25 Jun 2009 10:25:35 +0000
Subject: [PATCH 431/510] "reverting my inition comit to switch output
 buffering off in webdav.php, as it makes problems on system with do automatic
 output compression, eg. debian5 --> modified header template to not switch it
 on in first place, for webdav.php"

---
 webdav.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webdav.php b/webdav.php
index 0d8b6aea6a..05aed7a4f3 100644
--- a/webdav.php
+++ b/webdav.php
@@ -89,10 +89,6 @@ catch (egw_exception_no_permission_app $e)
 }
 $headertime = microtime(true);
 
-// switch of output buffering (switched on in header), as otherwise we run against memory_limit, for big files
-// only do it if no output_handler is set in php.ini, as at least with zlib.output_handler it stalls ...
-if (!ini_get('output_handler')) ob_end_flush();
-
 $webdav_server = new vfs_webdav_server();
 $webdav_server->ServeRequest();
 //error_log(sprintf("WebDAV %s request took %5.3f s (header include took %5.3f s)",$_SERVER['REQUEST_METHOD'],microtime(true)-$starttime,$headertime-$starttime));

From 05fadb2049d0f70e26dca7068168212129765818 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 25 Jun 2009 10:31:53 +0000
Subject: [PATCH 432/510] "reverting my inition comit to switch output
 buffering off in webdav.php, as it makes problems on system with do automatic
 output compression, eg. debian5 --> modified header template to not switch it
 on in first place, for webdav.php"

---
 header.inc.php.template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/header.inc.php.template b/header.inc.php.template
index 67f0a9eb4a..67c1d77677 100644
--- a/header.inc.php.template
+++ b/header.inc.php.template
@@ -96,7 +96,10 @@ $GLOBALS['egw_info']['server']['versions']['header'] = '1.29';
 
 if(!isset($GLOBALS['egw_info']['flags']['noapi']) || !$GLOBALS['egw_info']['flags']['noapi'])
 {
-	ob_start();	// to prevent error messages to be send before our headers
+	if (substr($_SERVER['SCRIPT_NAME'],-10) != 'webdav.php')	// dont do it for webdav, as we can not savely switch it off again
+	{
+		ob_start();	// to prevent error messages to be send before our headers
+	}
 	require_once(EGW_API_INC . '/functions.inc.php');
 }
 else

From 19090879c4253b92d930a49b0ac85d830b10330e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 26 Jun 2009 14:26:14 +0000
Subject: [PATCH 433/510] Add ability to find out next run time as at a given
 date, instead of just 'now'

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

diff --git a/phpgwapi/inc/class.asyncservice.inc.php b/phpgwapi/inc/class.asyncservice.inc.php
index c51bd754ef..fcfc8e824b 100644
--- a/phpgwapi/inc/class.asyncservice.inc.php
+++ b/phpgwapi/inc/class.asyncservice.inc.php
@@ -97,16 +97,19 @@ class asyncservice
 	 * 	for every 5mins in the time from 9am to 5pm. All not set units before the smallest one set,
 	 * 	are taken into account as every possible value, all after as the smallest possible value.
 	 * @param boolean $debug if True some debug-messages about syntax-errors in $times are echoed
+	 * @param int $now Use this time to calculate then next run from.  Defaults to time().
 	 * @return int a unix timestamp of the next execution time or False if no more executions
 	 */
-	function next_run($times,$debug=False)
+	function next_run($times,$debug=False, $now = null)
 	{
 		if ($this->debug)
 		{
-			echo "<p>next_run("; print_r($times); echo ",'$debug')</p>\n";
+			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
 			$debug = True;	// enable syntax-error messages too
 		}
-		$now = time();
+		if(is_null($now)) {
+			$now = time();
+		}
 
 		// $times is unix timestamp => if it's not expired return it, else False
 		//
@@ -257,7 +260,7 @@ class asyncservice
 
 			foreach($units as $u => $date_pattern)
 			{
-				$unit_now = $u != 'dow' ? (int)date($date_pattern) :
+				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) :
 					(int)date($date_pattern,mktime(12,0,0,$found['month'],$found['day'],$found['year']));
 
 				if (isset($found[$u]))

From a1d81f3e06581da45688de68def9d02becd12ced Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 27 Jun 2009 10:18:44 +0000
Subject: [PATCH 434/510] "if label_for starts with a '#', it is already an id
 - no need to create default id from it"

---
 etemplate/inc/class.etemplate.inc.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index d5b980aa62..40779d1447 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1687,8 +1687,15 @@ class etemplate extends boetemplate
 			}
 			if ($label && !$readonly && ($accesskey || $label_for || $type != 'label' && $cell['name']))
 			{
-				$label = html::label($label,$label_for ? self::form_name($cname,$label_for) :
-					$form_name.($set_val?"[$set_val]":''),$accesskey);
+				if ($label_for)		// if label_for starts with a '#', it is already an id - no need to create default id from it
+				{
+					$label_for = $label_for[0] == '#' ? substr($label_for,1) : self::form_name($cname,$label_for);
+				}
+				else
+				{
+					$label_for = $form_name.($set_val?"[$set_val]":'');
+				}
+				$label = html::label($label,$label_for,$accesskey);
 			}
 			if ($type == 'radio' || $type == 'checkbox' || $label && strpos($label,'%s')!==false)	// default for radio is label after the button
 			{

From e1dbb4688a8c1a5f2c4a35c9c36ebb75d386c88d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 29 Jun 2009 13:27:13 +0000
Subject: [PATCH 435/510] "fixed not working custom fileds in
 Insert-in-document feature"

---
 .../inc/class.addressbook_merge.inc.php       | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index 776c0895a1..05a0146b5b 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -109,14 +109,42 @@ class addressbook_merge	// extends bo_merge
 			}
 			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
 		}
-		// set all not yet set custom fields, as empty cf's are not stored!
-		foreach(array_keys($this->contacts->customfields) as $name)
+		// set custom fields
+		foreach($this->contacts->customfields as $name => $field)
 		{
-			$name = '$$#'.$name.'$$';
-			if (!isset($replacements[$name]))
+			$name = '#'.$name;
+			$value = (string)$contact[$name];
+			switch($field['type'])
 			{
-				$replacements[$name] = '';
+				case 'select-account':
+					if ($value) $value = common::grab_owner_name($value);
+					break;
+
+				case 'select':
+					if (count($field['values']) == 1 && isset($field['values']['@']))
+					{
+						$field['values'] = customfields_widget::_get_options_from_file($field['values']['@']);
+					}
+					$values = array();
+					foreach($field['rows'] > 1 ? explode(',',$value) : (array) $value as $value)
+					{
+						$values[] = $field['values'][$value];
+					}
+					$value = implode(', ',$values);
+					break;
+
+				case 'date':
+				case 'date-time':
+					if ($value)
+					{
+						$format = $field['len'] ? $field['len'] : ($field['type'] == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s');
+						$date = array_combine(preg_split('/[\\/. :-]/',$format),preg_split('/[\\/. :-]/',$value));
+						$value = common::dateformatorder($date['Y'],$date['m'],$date['d'],true);
+						if (isset($date['H'])) $value .= ' '.common::formattime($date['H'],$date['i']);
+					}
+					break;
 			}
+			$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
 		}
 		return $replacements;
 	}

From 48993a04dd7c39193148fd32bc432a61b48c5a32 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 29 Jun 2009 19:03:43 +0000
Subject: [PATCH 436/510] "fix for newest Funambol Outlook client: ignoring
 VOICE in TEL;VOICE;HOME and TEL;VOICE;WORK"

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

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index 8a718a8973..8712a1b7e9 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -65,7 +65,7 @@ class addressbook_vcal extends addressbook_bo
 		require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php');
 
 		$vCard = new Horde_iCalendar_vcard;
-		
+
 		if(!is_array($this->supportedFields)) {
 			$this->setSupportedFields();
 		}
@@ -75,10 +75,10 @@ class addressbook_vcal extends addressbook_bo
 			return false;
 		}
 		//error_log("entry before fixed:\n".print_r($entry,true));
-		
+
 		$this->fixup_contact($entry);
-		
-		
+
+
 		foreach($this->supportedFields as $vcardField => $databaseFields)
 		{
 			$values = array();
@@ -630,12 +630,12 @@ class addressbook_vcal extends addressbook_bo
 				{
 					case 'kde':             // KDE Addressbook
 						$this->supportedFields = $defaultFields[1];
-						error_log(__FILE__ . ":groupdav kde 1");	
+						error_log(__FILE__ . ":groupdav kde 1");
 						break;
 					default:
 						$this->supportedFields = $defaultFields[1];
 				}
-				break;		
+				break;
 			// the fallback for SyncML
 			default:
 				error_log(__FILE__. __METHOD__ ."\nManufacturer-Product not found: '$_productManufacturer' '$_productName'");
@@ -702,16 +702,29 @@ class addressbook_vcal extends addressbook_bo
 		// we need also to take care about ADR for example. we do not
 		// support this. We support only ADR;WORK or ADR;HOME
 
-		// njv: As the order of tag occurence is undefined and tags 1... to  n are mapped to one addressbook 
-		//	fieldname and tags 1... to n may have conflicting content eg EMAIL is set but EMAIL;INTERNET is empty 
-		//  and both are mapped to "email" who wins? 
-		
+		// njv: As the order of tag occurence is undefined and tags 1... to  n are mapped to one addressbook
+		//	fieldname and tags 1... to n may have conflicting content eg EMAIL is set but EMAIL;INTERNET is empty
+		//  and both are mapped to "email" who wins?
+
 		foreach($rowNames as $rowName => $vcardKey)
 		{
 			//	error_log("eachrownane:".print_r($rowName,true));
 
 			switch($rowName)
 			{
+				case 'TEL;VOICE;HOME':
+				case 'TEL;VOICE;WORK':	// check if we have a mapping without VOICE
+					$replace = str_replace('VOICE;','',$rowName);
+					if (!isset($rowNames[$replace]) && array_key_exists($replace, $this->supportedFields))
+					{
+						$finalRowNames[$replace] = $vcardKey;	// if yes use that
+					}
+					else
+					{
+						$finalRowNames[$rowName] = $vcardKey;	// else use existing mapping
+					}
+					break;
+
 				case 'ADR':
 				case 'TEL':
 				case 'URL':
@@ -776,7 +789,7 @@ class addressbook_vcal extends addressbook_bo
 						}
 					}
 					//		error_log("key:$akey:$vcardKey");
-					
+
 					if( $akey && !empty($vcardValues[$vcardKey]['value']))
 					{
 						//error_log("$akey : ".print_r($vcardKey,true));
@@ -788,9 +801,9 @@ class addressbook_vcal extends addressbook_bo
 					{
 						$finalRowNames['EMAIL;INTERNET;HOME'] = $vcardKey;
 					}
-					
+
 					//	error_log("email_home-key: ".print_r($bkey, true));
-					
+
 					if($bkey && !empty($vcardValues[$vcardKey]['value']))
 					{
 						//	error_log("$bkey :".print_r($vcardKey,true));

From c8ad2525662ae6add78ce7db3eedce5257010b60 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 30 Jun 2009 17:48:04 +0000
Subject: [PATCH 437/510] "bugfix: if no specific custom field is selected,
 show/query all custom fields"

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

diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index f9de5e2d22..56fd37819b 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -821,10 +821,11 @@ class infolog_so
 
 				$ids[$info['info_id']] = $info;
 			}
-			if ($ids && ($query['custom_fields'] && strchr($query['selectcols'],'#') !== false || $query['csv_export']))
+			// if no specific custom field is selected, show/query all custom fields
+			if ($ids && ($query['custom_fields'] || $query['csv_export']))
 			{
 				$where = array('info_id' => array_keys($ids));
-				if (!$query['csv_export'])
+				if (!($query['csv_export'] || strchr($query['selectcols'],'#') === false))
 				{
 					$where['info_extra_name'] = array();
 					foreach(explode(',',$query['selectcols']) as $col)

From c4e24a1e581a19a2808b46c3de1e89c9a678905f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 30 Jun 2009 18:21:15 +0000
Subject: [PATCH 438/510] if we have more then 5 cf's to display --> limit
 header height to 5 lines plus vertical scrollbar

---
 etemplate/inc/class.nextmatch_widget.inc.php | 11 +++++++++++
 etemplate/templates/default/app.css          |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 71e6a1de03..9d301deb67 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -576,6 +576,17 @@ class nextmatch_widget
 				unset($header);
 			}
 		}
+		// do we have more then 5 cf's to display --> limit header height to 5 lines plus vertical scrollbar
+		$num = !$allowed ? count($this->cfs) : count($allowed);
+		if ($num > 5)
+		{
+			$vbox = $cell;
+			$cell = etemplate::empty_cell('box','',array(
+				'size' => '0,,0,0',
+				'span' => ',cf_header_height_limit',
+			));
+			etemplate::add_child($cell,$vbox);
+		}
 		return false;	// no extra label
 	}
 
diff --git a/etemplate/templates/default/app.css b/etemplate/templates/default/app.css
index 988c1b5f20..56dc05bc6f 100644
--- a/etemplate/templates/default/app.css
+++ b/etemplate/templates/default/app.css
@@ -144,3 +144,12 @@
 	border-bottom: 4px solid red;
 	border-right: 4px solid red;
 }
+
+/**
+ * class for big (more then 5 lines) custom field nextmatch header
+ */
+.cf_header_height_limit {
+	max-height: 6.75em;
+	overflow: auto;
+	padding-right: 15px;
+}
\ No newline at end of file

From 15f7e3a1db62a2bc9a8fd46ad3a2c6c945872696 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 30 Jun 2009 18:37:30 +0000
Subject: [PATCH 439/510] "fixed not deletetable links: to delete one, you have
 to select 'New search ..."

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

diff --git a/etemplate/inc/class.link_widget.inc.php b/etemplate/inc/class.link_widget.inc.php
index 210e64278f..5c19968d30 100644
--- a/etemplate/inc/class.link_widget.inc.php
+++ b/etemplate/inc/class.link_widget.inc.php
@@ -477,7 +477,7 @@ class link_widget
 					// this was the line before the default opt, not sure it works well in all case
 					$value = $extension_data['app'] ? $value_in['id'] : $value['app'].':'.$value_in['id'];
 				}
-				return !!$value_in['id'];
+				return true;
 
 			case 'link-apps':
 				if (!$value_in && $extension_data['needed'])

From 944bb3073c01362521fa173ad41ec885e7fedca9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Jul 2009 15:17:36 +0000
Subject: [PATCH 440/510] fixed since 1.7.002 not working update from 1.4: -
 fs_link column is queried by sqlfs, but get created in 1.7.002 - pdo does not
 throw exception on sql errors, it silently ignores them   --> told it now in
 constructor to also throw exceptions - egw_vfs::find() was not always
 honoring the url option

---
 phpgwapi/inc/class.egw_vfs.inc.php              | 10 +++++++++-
 phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php | 17 ++++++++++++++---
 phpgwapi/setup/tables_update_1_4.inc.php        |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 48fb9d1bfd..76e8b3e2ba 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -568,7 +568,15 @@ class egw_vfs extends vfs_stream_wrapper
 	{
 		$type = $options['type'];	// 'd' or 'f'
 
-		if (!($stat = self::url_stat($path,STREAM_URL_STAT_LINK)))
+		if ($options['url'])
+		{
+			$stat = lstat($path);
+		}
+		else
+		{
+			$stat = self::url_stat($path,STREAM_URL_STAT_LINK);
+		}
+		if (!$stat)
 		{
 			return;	// not found, should not happen
 		}
diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 15f941b3ee..47bebde510 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -156,6 +156,15 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	protected $opened_dir;
 
+	/**
+	 * Extra columns added since the intitial introduction of sqlfs
+	 *
+	 * Can be set to empty, so get queries running on old versions of sqlfs, eg. for schema updates
+	 *
+	 * @var string;
+	 */
+	static public $extra_columns = '';//',fs_link';
+
 	/**
 	 * This method is called immediately after your stream object is created.
 	 *
@@ -901,7 +910,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			return false;
 		}
 		$this->opened_dir = array();
-		$query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_link'.
+		$query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.self::$extra_columns.
 			' FROM '.self::TABLE." WHERE fs_dir=? ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
 		//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$options)".' */ '.$query;
@@ -970,7 +979,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			self::_pdo();
 		}
-		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_link'.
+		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.self::$extra_columns.
 			' FROM '.self::TABLE.' WHERE fs_name'.self::$case_sensitive_equal.'? AND fs_dir=';
 		$parts = explode('/',$path);
 
@@ -1479,7 +1488,9 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			$pdo_available = true;
 		}
 		try {
-			self::$pdo = new PDO($dsn,$egw_db->User,$egw_db->Password);
+			self::$pdo = new PDO($dsn,$egw_db->User,$egw_db->Password,array(
+				PDO::ATTR_ERRMODE=>PDO::ERRMODE_EXCEPTION,
+			));
 		} catch(Exception $e) {
 
 			// Exception reveals password, so we ignore the exception and connect again without pw, to get the right exception without pw
diff --git a/phpgwapi/setup/tables_update_1_4.inc.php b/phpgwapi/setup/tables_update_1_4.inc.php
index 70c3e2e07e..2ba3866a58 100644
--- a/phpgwapi/setup/tables_update_1_4.inc.php
+++ b/phpgwapi/setup/tables_update_1_4.inc.php
@@ -434,6 +434,7 @@ function phpgwapi_upgrade1_5_011()
 	if ($GLOBALS['DEBUG'] && isset($_SERVER['HTTP_HOST'])) echo "<pre style='text-align: left;'>\n";
 	egw_vfs::$is_root = true;
 	egw_vfs::load_wrapper('sqlfs');
+	sqlfs_stream_wrapper::$extra_columns = '';	// no fs_link column, as it gets created in 1.7.002
 	egw_vfs::find('sqlfs://default/',array(
 		'url'  => true,
 		'depth' => true,

From 9a5c0f8d9c8d710ba85ffa0ed5167dabf12a70c8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Jul 2009 16:17:44 +0000
Subject: [PATCH 441/510] "removed forgotten comment, breaking the previous
 fix"

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

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 47bebde510..d9a48185d0 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -163,7 +163,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 	 *
 	 * @var string;
 	 */
-	static public $extra_columns = '';//',fs_link';
+	static public $extra_columns = ',fs_link';
 
 	/**
 	 * This method is called immediately after your stream object is created.

From 078edd98fd29e76e959c52716c3175607de9b5c1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 1 Jul 2009 18:03:46 +0000
Subject: [PATCH 442/510] Fixed SQL error now giving an exception: it's caused
 by vfs_stream_wrapper::get_path() returning an url without path
 (sqlfs://default <-- no trailing slash), which causes
 sqlfs_stream_wrapper::url_stat() to be called for an empty path, which gives
 the sql error.

---
 phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php |  4 ++++
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php   | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index d9a48185d0..8622932dd1 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -969,6 +969,10 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		{
 			$path = substr($path,0,-1);
 		}
+		if (empty($path))
+		{
+			return false;	// is invalid and gives sql error
+		}
 		// check if we already have the info from the last dir_open call, as the old vfs reads it anyway from the db
 		if (self::$stat_cache && isset(self::$stat_cache[$path]) && (is_null($eacl_access) || self::$stat_cache[$path] !== false))
 		{
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 3206b268c0..622684c79b 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -1018,14 +1018,18 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	 */
 	static protected function get_path($path,$only_remove_scheme=self::SCHEME)
 	{
-		if ($path[0] != '/' && (!$only_remove_scheme || parse_url($path,PHP_URL_SCHEME) == $only_remove_scheme))
+		$url_parts = parse_url($path);
+		if ($path[0] != '/' && (!$only_remove_scheme || $url_parts['scheme'] == $only_remove_scheme))
 		{
-			$path = parse_url($path,PHP_URL_PATH);
+			$path = $url_parts['path'];
 		}
 		// remove trailing slashes eg. added by WebDAV
-		while (substr($path,-1) == '/' && $path != '/')
+		if ($url_parts['path'] != '/')
 		{
-			$path = substr($path,0,-1);
+			while (substr($path,-1) == '/' && $path != '/')
+			{
+				$path = substr($path,0,-1);
+			}
 		}
 		return $path;
 	}

From 234bd6dba66aa3bd421b6683b49e7cb277a5fb60 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 2 Jul 2009 11:26:52 +0000
Subject: [PATCH 443/510] fixing calender empty resource problem (add event,
 edit participants)

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

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index d7fb5c999e..61f951899c 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -286,7 +286,7 @@ class calendar_uiforms extends calendar_ui
 						if ($app != 'addressbook' || !($data = $GLOBALS['egw']->accounts->name2id($id,'person_id')))
 						{
 							$quantity = $content['participants']['quantity'] ? $content['participants']['quantity'] : 1;
-							if ($app == "resources" && $id) {
+							if ($app == "resources" && !empty($id)) {
 								$bores =& CreateObject('resources.bo_resources');
 								$selectedres = $bores->read($id);
 								$cats = $bores->acl->get_cats(EGW_ACL_DIRECT_BOOKING);
@@ -305,9 +305,15 @@ class calendar_uiforms extends calendar_ui
 									break;
 								}
 							}
-							$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-							if ($uid) $event['participants'][$uid] = $event['participant_types'][$type][$id] =
-								$status.((int) $quantity > 1 ? (int)$quantity : '');
+							if ($uid && $id) 
+							{
+								$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
+								$event['participants'][$uid] = $event['participant_types'][$type][$id] = $status.((int) $quantity > 1 ? (int)$quantity : '');
+							}
+							else
+							{
+								unset($quantity);
+							}
 							break;
 						}
 						// fall-through for accounts entered as contact

From 28618da8759cd35722be890d80a8a1b6417a207a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 3 Jul 2009 07:43:02 +0000
Subject: [PATCH 444/510] "egw_contentmap table \"belongs\" to syncml app!"

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

diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index afd7bf9ac5..c01a878a91 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * eGW API - content history class
- * 
+ *
  * @link http://www.egroupware.org
  * @author Lars Kneschke [lkneschke@linux-at-work.de]
  * @copyright Lars Kneschke 2005
@@ -30,7 +30,7 @@ class contenthistory
 	{
 		$this->db = $GLOBALS['egw']->db;
 	}
-	
+
 	/**
 	 * mark mapping as expired
 	 *
@@ -39,7 +39,7 @@ class contenthistory
 	 *
 	 * @param string $_appName the appname example: infolog_notes
 	 * @param int $_id the internal egwapp content id
-	 * @return bool 
+	 * @return bool
 	 */
 	function expireMapping($_appName, $_id)
 	{
@@ -47,7 +47,7 @@ class contenthistory
 				'map_expired'		=> 1,
 			),array (
 				'map_guid'		=> $GLOBALS['egw']->common->generate_uid($_appName, $_id),
-			),__LINE__,__FILE__);
+			),__LINE__,__FILE__,'syncml');
 	}
 
 	/**
@@ -57,13 +57,13 @@ 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 string $_ts timestamp where to start searching from
 	 * @return array containing contentIds with changes
 	 */
 	function getHistory($_appName, $_action, $_ts)
 	{
 		$where = array('sync_appname' => $_appName);
-		
+
 		switch($_action)
 		{
 			case 'modify':
@@ -84,10 +84,10 @@ class contenthistory
 		{
 			$idList[] = $row['sync_contentid'];
 		}
-		
+
 		return $idList;
 	}
-	
+
 	/**
 	 * when got a entry last added/modified/deleted
 	 *
@@ -122,14 +122,14 @@ class contenthistory
 		}
 		return $ts;
 	}
-	
+
 	/**
 	 * update a timestamp for action
 	 *
 	 * @param string $_appName the appname example: infolog_notes
 	 * @param int $_id the app internal content id
 	 * @param string $_action can be modify, add or delete
-	 * @param string $_ts timestamp where to start searching from 
+	 * @param string $_ts timestamp where to start searching from
 	 * @return boolean returns allways true
 	 */
 	function updateTimeStamp($_appName, $_id, $_action, $_ts)
@@ -146,7 +146,7 @@ class contenthistory
 			case 'add':
 				$this->db->insert(self::TABLE,$newData,array(),__LINE__,__FILE__);
 				break;
-				
+
 			case 'modify':
 			case 'delete':
 				// first check that this entry got ever added to database already

From dcce79d92a023e08eae9b86afa573a917d385936 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 3 Jul 2009 08:38:25 +0000
Subject: [PATCH 445/510] check if application of template has a app.js file
 --> load it

---
 etemplate/inc/class.editor.inc.php    | 5 +++++
 etemplate/inc/class.etemplate.inc.php | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index 412100f65c..769f2f15f6 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -499,6 +499,11 @@ class editor
 			{
 				$new_content['onclick'] .= html::style('@import url('.$GLOBALS['egw_info']['server']['webserver_url'].'/'.$app.'/templates/default/app.css);');
 			}
+			// check if application of template has a app.js file --> load it
+			if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
+			{
+				$GLOBALS['egw']->js->validate_file('.','app',$app,false);
+			}
 			$editor->data[$editor->rows]['A']['obj'] = &$this->etemplate;
 			$vals = $content['vals'];
 			$olds = $content['olds'];
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 40779d1447..b1100ea815 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -211,6 +211,12 @@ class etemplate extends boetemplate
 		{
 			$GLOBALS['egw']->translation->add_app('etemplate');	// some extensions have own texts
 		}
+		// check if application of template has a app.js file --> load it
+		list($app) = explode('.',$this->name);
+		if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
+		{
+			$GLOBALS['egw']->js->validate_file('.','app',$app,false);
+		}
 		// use different form-names to allows multiple eTemplates in one page, eg. addressbook-view
 		self::$name_form = 'eTemplate';
 		if (in_array(self::$name_form,self::$name_forms))

From fc3cb9a798af139c72ca863e910897599d8d6cb4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 4 Jul 2009 10:50:19 +0000
Subject: [PATCH 446/510] - moved detection of implemented mime types for merge
 print to   (static) addressbook_merge::is_implemented($mimetype,$extension) -
 documented syntax for custom fields - some more mime types

---
 .../inc/class.addressbook_merge.inc.php       | 145 +++++++++++++++---
 addressbook/inc/class.addressbook_ui.inc.php  |   6 +-
 addressbook/setup/egw_de.lang                 |   3 +
 addressbook/setup/egw_en.lang                 |   3 +
 4 files changed, 132 insertions(+), 25 deletions(-)

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index 05a0146b5b..e79c3b4ae8 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package addressbook
- * @copyright (c) 2007/8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2007-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -38,6 +38,40 @@ class addressbook_merge	// extends bo_merge
 		$this->contacts = new addressbook_bo();
 	}
 
+	/**
+	 * Return if merge-print is implemented for given mime-type (and/or extension)
+	 *
+	 * @param string $mimetype eg. text/plain
+	 * @param string $extension only checked for applications/msword and .rtf
+	 */
+	static function is_implemented($mimetype,$extension=null)
+	{
+		switch ($mimetype)
+		{
+			case 'application/msword':
+				if (strtolower($extension) != '.rtf') break;
+			case 'application/rtf':
+				return true;	// rtf files
+			case 'application/vnd.oasis.opendocument.text':
+				if (!check_load_extension('zip')) break;
+				return true;	// open office write xml files
+			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
+				if (!check_load_extension('zip')) break;
+				return true;	// ms word xml format
+			default:
+				if (substr($mimetype,0,5) == 'text/')
+				{
+					return true;	// text files
+				}
+				break;
+		}
+		return false;
+
+		// As browsers not always return correct mime types, one could use a negative list instead
+		//return !($mimetype == egw_vfs::DIR_MIME_TYPE || substr($mimetype,0,6) == 'image/');
+	}
+
 	/**
 	 * Return replacements for a contact
 	 *
@@ -220,14 +254,15 @@ class addressbook_merge	// extends bo_merge
 	/**
 	 * Merges a given document with contact data
 	 *
-	 * @param string $document vfs-path of document
+	 * @param string $document path/url of document
 	 * @param array $ids array with contact id(s)
 	 * @param string &$err error-message on error
+	 * @param string $mimetype mimetype of complete document, eg. text/*, application/vnd.oasis.opendocument.text, application/rtf
 	 * @return string/boolean merged document or false on error
 	 */
-	function merge($document,$ids,&$err)
+	function &merge($document,$ids,&$err,$mimetype)
 	{
-		if (!($content = file_get_contents(egw_vfs::PREFIX.$document)))
+		if (!($content = file_get_contents($document)))
 		{
 			$err = lang("Document '%1' does not exist or is not readable for you!",$document);
 			return false;
@@ -235,9 +270,9 @@ class addressbook_merge	// extends bo_merge
 		list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
 		list($Labelstart,$Labelrepeat,$Labeltend) = preg_split('/\$\$label\$\$/',$contentrepeat,-1, PREG_SPLIT_NO_EMPTY);  //get the Lable content
 		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
-		$countlables =count($countlables[0])+1;
+		$countlables = count($countlables[0])+1;
 		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
-		if ($countlables>1) $lableprint = true;
+		if ($countlables > 1) $lableprint = true;
 		if (count($ids) > 1 && !$contentrepeat)
 		{
 			$err = lang('for more then one contact in a document use the tag pagerepeat!');
@@ -278,13 +313,9 @@ class addressbook_merge	// extends bo_merge
 			{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 				$content = preg_replace_callback('/\$\$IF ([0-9a-z_-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			}
-
 			if ($contentrepeat) $contentrep[$id] = $content;
 		}
-
-
 		if ($Labelrepeat)
-
 		{
 			$countpage=0;
 			$count=0;
@@ -299,21 +330,55 @@ class addressbook_merge	// extends bo_merge
 					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 				}
 				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
-
 			}
-
 			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/','',$contentrepeatpages[$countpage],-1);  //clean empty fields
-			return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
+
+			switch($mimetype)
+			{
+				case 'application/msword':
+					if (strtolower(substr($document,-4)) != '.rtf') break;	// no binary word documents
+				case 'application/rtf':
+					return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
+				case 'application/vnd.oasis.opendocument.text':
+					// todo OO writer files
+					break;
+				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
+					// todo ms word xml files
+					break;
+			}
+			$err = lang('%1 not implemented for %2!','$$labelplacement$$',$mimetype);
+			return false;
 		}
 
 		if ($contentrepeat)
 		{
-			return $contentstart.implode('\\par \\page\\pard\\plain',$contentrep).$contentend;
+			switch($mimetype)
+			{
+				case 'application/msword':
+					if (strtolower(substr($document,-4)) != '.rtf') break;	// no binary word documents
+				case 'application/rtf':
+					return $contentstart.implode('\\par \\page\\pard\\plain',$contentrep).$contentend;
+				case 'application/vnd.oasis.opendocument.text':
+					// todo OO writer files
+					break;
+				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
+					// todo ms word xml files
+					break;
+			}
+			$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
+			return false;
 		}
 		return $content;
 	}
 
-
+	/**
+	 * Callback for preg_replace to process $$IF
+	 *
+	 * @param array $param
+	 * @return string
+	 */
 	function replace_callback($param)
 	{
 		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
@@ -331,14 +396,45 @@ class addressbook_merge	// extends bo_merge
 	 */
 	function download($document,$ids)
 	{
-		if (!($merged = $this->merge($document,$ids,$err)))
+		$content_url = egw_vfs::PREFIX.$document;
+		switch (($mime_type = egw_vfs::mime_content_type($document)))
+		{
+			case 'application/vnd.oasis.opendocument.text':
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.odt').'-').'.odt';
+				copy($content_url,$archive);
+				$content_url = 'zip://'.$archive.'#'.($content_file = 'content.xml');
+				break;
+			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.dotx').'-').'.dotx';
+				copy($content_url,$archive);
+				$content_url = 'zip://'.$archive.'#'.($content_file = 'word/document.xml');
+				break;
+		}
+		if (!($merged =& $this->merge($content_url,$ids,$err,$mime_type)))
 		{
 			return $err;
 		}
-		$mime_type = egw_vfs::mime_content_type($document);
-		ExecMethod2('phpgwapi.browser.content_header',basename($document),$mime_type);
-		echo $merged;
-
+		if (isset($archive))
+		{
+			$zip = new ZipArchive;
+			if ($zip->open($archive,ZIPARCHIVE::CHECKCONS) !== true) throw new Exception("!ZipArchive::open('$archive',ZIPARCHIVE::OVERWRITE)");
+			if ($zip->addFromString($content_file,$merged) !== true) throw new Exception("!ZipArchive::addFromString('$content_file',\$merged)");
+			if ($zip->close() !== true) throw new Exception("!ZipArchive::close()");
+			unset($zip);
+			unset($merged);
+			if (file_exists('/usr/bin/zip'))	// fix broken zip archives generated by current php
+			{
+				exec('/usr/bin/zip -F '.escapeshellarg($archive));
+			}
+			ExecMethod2('phpgwapi.browser.content_header',basename($document),$mime_type);
+			readfile($archive,'r');
+		}
+		else
+		{
+			ExecMethod2('phpgwapi.browser.content_header',basename($document),$mime_type);
+			echo $merged;
+		}
 		$GLOBALS['egw']->common->egw_exit();
 	}
 
@@ -371,17 +467,26 @@ class addressbook_merge	// extends bo_merge
 			$n++;
 		}
 
+		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
+		foreach($this->contacts->customfields as $name => $field)
+		{
+			echo '<tr><td>$$#'.$name.'$$</td><td colspan="3">'.$field['label']."</td></tr>\n";
+		}
+
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
 		foreach(array(
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),
 			'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'),
+			'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'),
+			'labelplacement' => lang('Tag to mark positions for address labels'),
 			'IF fieldname' => lang('Example $$IF n_prefix~Mr~Hello Mr.~Hello Ms.$$ - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'),
 			) as $name => $label)
 		{
 			echo '<tr><td>$$'.$name.'$$</td><td colspan="3">'.$label."</td></tr>\n";
 		}
+
 		$GLOBALS['egw']->translation->add_app('calendar');
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')." # = 1, 2, ..., 20, -1</h3></td></tr>";
 		foreach(array(
diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index bb82268c4d..2baf95f122 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2025,11 +2025,7 @@ $readonlys['button[vcard]'] = true;
 				foreach($files as $file)
 				{
 					// return only the mime-types we support
-					if (!($file['mime'] == 'application/rtf' ||
-						$file['mime'] == 'application/msword' && !strcasecmp(substr($file['name'],-4),'.rtf') ||
-						substr($file['mime'],0,5) == 'text/')) continue;
-					// As browsers not always return the right mime_type, you could use a negative list instead
-					//if ($file['mime'] == egw_vfs::DIR_MIME_TYPE  || substr($file['mime'],0,6) == 'image/') continue;
+					if (!addressbook_merge::is_implemented($file['mime'],substr($file['name'],-4))) continue;
 
 					$actions['document-'.$file['name']] = /*lang('Insert in document').': '.*/$file['name'];
 				}
diff --git a/addressbook/setup/egw_de.lang b/addressbook/setup/egw_de.lang
index b1f4d16d51..f3baa341e3 100644
--- a/addressbook/setup/egw_de.lang
+++ b/addressbook/setup/egw_de.lang
@@ -3,6 +3,7 @@
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	de	%1 Kontakt(e) %2, %3 nicht wegen fehlender Rechte !!!
 %1 contacts updated (%2 errors).	addressbook	de	%1 Kontakte aktualisiert (%2 Fehler).
 %1 fields in %2 other organisation member(s) changed	addressbook	de	%1 Felder in %2 Mitglied(ern) der Organisation geändert
+%1 not implemented for %2!	addressbook	de	%1 nicht implementiert für %2!
 %1 records imported	addressbook	de	%1 Datensätze importiert
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	de	%1 Datensätze gelesen (noch nicht importiert, sie können %2zurück%3 gehen und Test-Import auschalten)
 %1 starts with '%2'	addressbook	de	%1 beginnt mit '%2'
@@ -361,6 +362,7 @@ street	common	de	Straße
 subject for email	addressbook	de	Betreff der Email
 successfully imported %1 records into your addressbook.	addressbook	de	%1 Kontakte wurden erfolgreich in Ihr Adressbuch importiert
 suffix	addressbook	de	Zusatz
+tag to mark positions for address labels	addressbook	de	Tag um die Positionen von Adressetiktetten zu markieren
 tel home	addressbook	de	Telefon privat
 telephony integration	admin	de	Telefonie Integration
 test import (show importable records <u>only</u> in browser)	addressbook	de	Test-Import (zeigt importierbare Datensätze <u>nur</u> im Browser an)
@@ -390,6 +392,7 @@ use an extra category tab?	addressbook	de	Separaten Reiter für Kategorien verwe
 use an extra tab for private custom fields?	admin	de	Separaten Reiter für private benutzerdefinierte Felder verwenden?
 use country list	addressbook	de	Länderliste benutzen
 use setup for a full account-migration	admin	de	für eine komplette Benutzer Migration setup verwenden
+use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	de	Benutzen Sie diesen Tag für Adressetiketten. Plazieren Sie den Inhalt, der wiederholt werden soll, zwischen zwei Tags.
 used for links and for the own sorting of the list	addressbook	de	wird für Verküpfungen und die eigene Sortierung der Liste benützt
 vcard	common	de	VCard
 vcards require a first name entry.	addressbook	de	VCards benötigen einen Vornamen.
diff --git a/addressbook/setup/egw_en.lang b/addressbook/setup/egw_en.lang
index 8e021bb0c7..68d487c7a3 100644
--- a/addressbook/setup/egw_en.lang
+++ b/addressbook/setup/egw_en.lang
@@ -3,6 +3,7 @@
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	en	%1 contact(s) %2, %3 failed because of insufficent rights !!!
 %1 contacts updated (%2 errors).	addressbook	en	%1 contacts updated (%2 errors).
 %1 fields in %2 other organisation member(s) changed	addressbook	en	%1 fields in %2 other organisation member(s) changed
+%1 not implemented for %2!	addressbook	en	%1 not implemented for %2!
 %1 records imported	addressbook	en	%1 records imported
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	en	%1 records read (not yet imported, you may go %2back%3 and uncheck Test Import)
 %1 starts with '%2'	addressbook	en	%1 starts with '%2'
@@ -361,6 +362,7 @@ street	common	en	Street
 subject for email	addressbook	en	Subject for email
 successfully imported %1 records into your addressbook.	addressbook	en	Successfully imported %1 record(s) into your addressbook.
 suffix	addressbook	en	Suffix
+tag to mark positions for address labels	addressbook	en	Tag to mark positions for address labels
 tel home	addressbook	en	tel home
 telephony integration	admin	en	Telephony integration
 test import (show importable records <u>only</u> in browser)	addressbook	en	Test Import (show importable records <u>only</u> in browser)
@@ -390,6 +392,7 @@ use an extra category tab?	addressbook	en	Use an extra category tab?
 use an extra tab for private custom fields?	admin	en	Use an extra tab for private custom fields?
 use country list	addressbook	en	Use Country List
 use setup for a full account-migration	admin	en	use setup for a full account-migration
+use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	en	Use this tag for addresslabels. Put the content, you want to repeat, between two tags.
 used for links and for the own sorting of the list	addressbook	en	used for links and for the own sorting of the list
 vcard	common	en	VCard
 vcards require a first name entry.	addressbook	en	VCards require a first name entry.

From f0173f0ea34c30dc709c4d5e1888c3e86705fb56 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 4 Jul 2009 12:37:31 +0000
Subject: [PATCH 447/510] Readded somehow lost table-row part selectbox

---
 etemplate/setup/etemplates.inc.php            | 18 ++++++++++++++++--
 etemplate/templates/default/editor.widget.xet |  4 +++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/etemplate/setup/etemplates.inc.php b/etemplate/setup/etemplates.inc.php
index 0a4ccbfe9d..763474f244 100644
--- a/etemplate/setup/etemplates.inc.php
+++ b/etemplate/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application etemplate
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2009-05-17 13:51
+	* generated by soetemplate::dump4setup() 2009-07-04 14:35
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package etemplate
@@ -71,10 +71,14 @@ $templ_data[] = array('name' => 'etemplate.db-tools.ask_save','template' => '','
 
 $templ_data[] = array('name' => 'etemplate.db-tools.ask_save','template' => '','lang' => '','group' => '0','version' => '1.0.0.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:6:{s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:7:"version";s:4:"size";s:2:"bi";s:4:"type";s:5:"label";s:5:"label";s:27:"Update from Version \'%s\' to";}s:1:"B";a:3:{s:4:"name";s:11:"new_version";s:4:"type";s:4:"text";s:4:"help";s:75:"enter the new version number here (> old_version), empty for no update-file";}}i:4;a:2:{s:1:"A";a:2:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:7:{s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:5:"table";s:4:"size";s:1:"b";s:4:"type";s:5:"label";s:5:"label";s:53:"Do you want to save the changes you made in table %s?";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:2:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:5:{s:5:"label";s:3:"Yes";s:5:"align";s:5:"right";s:4:"name";s:3:"yes";s:4:"type";s:6:"button";s:4:"help";s:39:"saves changes to tables_current.inc.php";}s:1:"B";a:4:{s:5:"label";s:2:"No";s:4:"name";s:2:"no";s:4:"type";s:6:"button";s:4:"help";s:15:"discard changes";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1112602648',);
 
+$templ_data[] = array('name' => 'etemplate.db-tools.cols','template' => '','lang' => '','group' => '0','version' => '0.9.15.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:12:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Precision";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Scale";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"NOT NULL";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Primary Key";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Indexed";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Foreign Key";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Default";}s:1:"L";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Add Column";s:5:"align";s:6:"center";s:4:"name";s:10:"add_column";s:4:"help";s:42:"Add a new column (after the existing ones)";}}i:2;a:12:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:12:"Row${row}[n]";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[name]";s:4:"help";s:127:"need to be unique in the table and no reseved word from SQL, best prefix all with a common 2-digit short for the app, eg. \'et_\'";}s:1:"C";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[type]";s:4:"help";s:18:"type of the column";}s:1:"D";a:4:{s:4:"type";s:3:"int";s:5:"align";s:6:"center";s:4:"name";s:20:"Row${row}[precision]";s:4:"help";s:64:"length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8";}s:1:"E";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"Row${row}[scale]";s:4:"help";s:15:"scale for float";}s:1:"F";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:18:"Row${row}[notnull]";s:4:"help";s:35:"can not have special SQL-value NULL";}s:1:"G";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[uc]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"H";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[pk]";s:4:"help";s:52:"Primary key for the table, gets automaticaly indexed";}s:1:"I";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[ix]";s:4:"help";s:81:"an indexed column speeds up querys using that column (cost space on the disk !!!)";}s:1:"J";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[fk]";s:4:"help";s:46:"name of other table where column is a key from";}s:1:"K";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:4:"name";s:18:"Row${row}[default]";s:4:"help";s:54:"enter \'\' for an empty default, nothing mean no default";}s:1:"L";a:5:{s:4:"type";s:6:"button";s:5:"label";s:13:"Delete Column";s:5:"align";s:6:"center";s:4:"name";s:12:"delete[$row]";s:4:"help";s:19:"Deletes this column";}}}s:4:"rows";i:2;s:4:"cols";i:12;}}','size' => '','style' => '','modified' => '1064452548',);
+
 $templ_data[] = array('name' => 'etemplate.db-tools.cols','template' => '','lang' => '','group' => '0','version' => '0.9.15.003','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:13:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Precision";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Scale";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"NOT NULL";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Primary Key";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Indexed";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Indexoptions";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Foreign Key";}s:1:"L";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Default";}s:1:"M";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Add Column";s:5:"align";s:6:"center";s:4:"name";s:10:"add_column";s:4:"help";s:42:"Add a new column (after the existing ones)";}}i:2;a:13:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:12:"Row${row}[n]";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"15";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[name]";s:4:"help";s:127:"need to be unique in the table and no reseved word from SQL, best prefix all with a common 2-digit short for the app, eg. \'et_\'";}s:1:"C";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[type]";s:4:"help";s:18:"type of the column";}s:1:"D";a:4:{s:4:"type";s:3:"int";s:5:"align";s:6:"center";s:4:"name";s:20:"Row${row}[precision]";s:4:"help";s:64:"length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8";}s:1:"E";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"Row${row}[scale]";s:4:"help";s:15:"scale for float";}s:1:"F";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:18:"Row${row}[notnull]";s:4:"help";s:35:"can not have special SQL-value NULL";}s:1:"G";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[pk]";s:4:"help";s:52:"Primary key for the table, gets automaticaly indexed";}s:1:"H";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[uc]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"I";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[ix]";s:4:"help";s:81:"an indexed column speeds up querys using that column (cost space on the disk !!!)";}s:1:"J";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"15";s:4:"name";s:18:"Row${row}[options]";s:4:"help";s:105:"DB-specific index options (comma-sep.), eg. mysql(FULLTEXT) or mysql(100) for the indexed length of a col";}s:1:"K";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[fk]";s:4:"help";s:46:"name of other table where column is a key from";}s:1:"L";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:4:"name";s:18:"Row${row}[default]";s:4:"help";s:54:"enter \'\' for an empty default, nothing mean no default";}s:1:"M";a:5:{s:4:"type";s:6:"button";s:5:"label";s:13:"Delete Column";s:5:"align";s:6:"center";s:4:"name";s:12:"delete[$row]";s:4:"help";s:19:"Deletes this column";}}}s:4:"rows";i:2;s:4:"cols";i:13;}}','size' => '','style' => '','modified' => '1067163210',);
 
 $templ_data[] = array('name' => 'etemplate.db-tools.cols','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:3:"nmh";s:2:"c2";s:3:"nmr";}i:1;a:14:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:5:"label";s:1:"#";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"ColumnName";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Precision";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Scale";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"NOT NULL";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Primary Key";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Unique";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Indexed";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Default";}s:1:"K";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Comment";}s:1:"L";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Indexoptions";}s:1:"M";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Foreign Key";}s:1:"N";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Add Column";s:5:"align";s:6:"center";s:4:"name";s:10:"add_column";s:4:"help";s:42:"Add a new column (after the existing ones)";}}i:2;a:14:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:12:"Row${row}[n]";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"15";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[name]";s:4:"help";s:127:"need to be unique in the table and no reseved word from SQL, best prefix all with a common 2-digit short for the app, eg. \'et_\'";}s:1:"C";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:15:"Row${row}[type]";s:4:"help";s:18:"type of the column";}s:1:"D";a:4:{s:4:"type";s:3:"int";s:5:"align";s:6:"center";s:4:"name";s:20:"Row${row}[precision]";s:4:"help";s:64:"length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8";}s:1:"E";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"Row${row}[scale]";s:4:"help";s:15:"scale for float";}s:1:"F";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:18:"Row${row}[notnull]";s:4:"help";s:35:"can not have special SQL-value NULL";}s:1:"G";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[pk]";s:4:"help";s:52:"Primary key for the table, gets automaticaly indexed";}s:1:"H";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[uc]";s:4:"help";s:59:"DB ensures that every row has a unique value in that column";}s:1:"I";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[ix]";s:4:"help";s:81:"an indexed column speeds up querys using that column (cost space on the disk !!!)";}s:1:"J";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:4:"name";s:18:"Row${row}[default]";s:4:"help";s:54:"enter \'\' for an empty default, nothing mean no default";}s:1:"K";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:4:"name";s:18:"Row${row}[comment]";}s:1:"L";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:4:"name";s:18:"Row${row}[options]";s:4:"help";s:105:"DB-specific index options (comma-sep.), eg. mysql(FULLTEXT) or mysql(100) for the indexed length of a col";}s:1:"M";a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"8";s:5:"align";s:6:"center";s:4:"name";s:13:"Row${row}[fk]";s:4:"help";s:46:"name of other table where column is a key from";}s:1:"N";a:5:{s:4:"type";s:6:"button";s:5:"label";s:13:"Delete Column";s:5:"align";s:6:"center";s:4:"name";s:12:"delete[$row]";s:4:"help";s:19:"Deletes this column";}}}s:4:"rows";i:2;s:4:"cols";i:14;}}','size' => '','style' => '','modified' => '1067163210',);
 
+$templ_data[] = array('name' => 'etemplate.db-tools.edit','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:1:{s:1:"D";s:2:"1%";}i:1;a:7:{s:1:"A";a:6:{s:4:"type";s:5:"label";s:4:"size";s:2:"bi";s:4:"span";s:1:"6";s:5:"label";s:29:"Editable Templates - DB-Tools";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:5:{s:4:"type";s:6:"button";s:5:"label";s:16:"eTemplate Editor";s:5:"align";s:5:"right";s:4:"name";s:6:"editor";s:4:"help";s:29:"to start the eTemplate editor";}}i:2;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"hrule";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:3;a:7:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:4;a:7:{s:1:"A";a:7:{s:4:"type";s:10:"select-app";s:4:"size";s:19:"Select one ...,,all";s:5:"label";s:11:"Application";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:8:"onchange";s:1:"1";s:4:"help";s:40:"Select an application, (*) = uninstalled";}s:1:"B";a:6:{s:4:"type";s:6:"select";s:5:"label";s:9:"TableName";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"table_name";s:8:"onchange";s:1:"1";s:4:"help";s:34:"Select an table of the application";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:5:"right";s:4:"name";s:14:"new_table_name";s:4:"help";s:20:"Name of table to add";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Table";s:4:"name";s:9:"add_table";s:4:"help";s:38:"Create a new table for the application";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";s:4:"help";s:47:"Import table-definitions from existing db-table";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Drop Table";s:4:"name";s:10:"drop_table";s:8:"disabled";s:1:"1";s:4:"help";s:37:"Drop a table - this can NOT be undone";}s:1:"G";a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Write Tables";s:4:"name";s:12:"write_tables";s:4:"help";s:40:"Write <app>/setup/tables_current.inc.php";}}i:5;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:23:"etemplate.db-tools.cols";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;s:4:"cols";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1047991954',);
+
 $templ_data[] = array('name' => 'etemplate.db-tools.edit','template' => '','lang' => '','group' => '0','version' => '0.9.15.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:1:"D";s:2:"1%";}i:1;a:7:{s:1:"A";a:7:{s:4:"type";s:10:"select-app";s:4:"size";s:19:"Select one ...,,all";s:5:"label";s:11:"Application";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:8:"onchange";s:1:"1";s:4:"help";s:40:"Select an application, (*) = uninstalled";}s:1:"B";a:6:{s:4:"type";s:6:"select";s:5:"label";s:9:"TableName";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"table_name";s:8:"onchange";s:1:"1";s:4:"help";s:34:"Select an table of the application";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:5:"right";s:4:"name";s:14:"new_table_name";s:4:"help";s:20:"Name of table to add";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Table";s:4:"name";s:9:"add_table";s:4:"help";s:38:"Create a new table for the application";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";s:4:"help";s:47:"Import table-definitions from existing db-table";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Drop Table";s:4:"name";s:10:"drop_table";s:8:"disabled";s:1:"1";s:4:"help";s:37:"Drop a table - this can NOT be undone";}s:1:"G";a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Write Tables";s:4:"name";s:12:"write_tables";s:4:"help";s:40:"Write <app>/setup/tables_current.inc.php";}}i:2;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:23:"etemplate.db-tools.cols";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:3;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:26:"etemplate.db-tools.indices";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1067164025',);
 
 $templ_data[] = array('name' => 'etemplate.db-tools.edit','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"D";s:2:"1%";s:2:"h1";s:6:",!@msg";}i:1;a:7:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:2;a:7:{s:1:"A";a:7:{s:4:"type";s:10:"select-app";s:4:"size";s:19:"Select one ...,,all";s:5:"label";s:11:"Application";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"app";s:8:"onchange";s:1:"1";s:4:"help";s:40:"Select an application, (*) = uninstalled";}s:1:"B";a:6:{s:4:"type";s:6:"select";s:5:"label";s:9:"TableName";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"table_name";s:8:"onchange";s:1:"1";s:4:"help";s:34:"Select an table of the application";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"align";s:5:"right";s:4:"name";s:14:"new_table_name";s:4:"help";s:20:"Name of table to add";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:5:"label";s:9:"Add Table";s:4:"name";s:9:"add_table";s:4:"help";s:38:"Create a new table for the application";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";s:4:"help";s:47:"Import table-definitions from existing db-table";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:10:"Drop Table";s:4:"name";s:10:"drop_table";s:8:"disabled";s:1:"1";s:4:"help";s:37:"Drop a table - this can NOT be undone";}s:1:"G";a:4:{s:4:"type";s:6:"button";s:5:"label";s:12:"Write Tables";s:4:"name";s:12:"write_tables";s:4:"help";s:40:"Write <app>/setup/tables_current.inc.php";}}i:3;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:23:"etemplate.db-tools.cols";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}i:4;a:7:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:26:"etemplate.db-tools.indices";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}s:1:"G";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:7;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1242199350',);
@@ -147,9 +151,13 @@ $templ_data[] = array('name' => 'etemplate.editor.values','template' => '','lang
 
 $templ_data[] = array('name' => 'etemplate.editor.values','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;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:3:"row";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Key";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Value";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"$col$row";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:8:"$col$row";}}}s:4:"rows";i:2;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1146315187',);
 
+$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.0.1.005','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:8:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"4,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1109104064',);
+
 $templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.0.1.006','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:1:{s:4:"type";s:5:"label";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1131206619',);
 
-$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:1:{s:4:"type";s:5:"label";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1131206619',);
+$templ_data[] = array('name' => 'etemplate.editor.widget','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:4:{s:2:"h2";s:6:",!@msg";s:2:"h6";s:11:",!@grid_row";s:2:"h7";s:14:",!@grid_column";s:2:"c1";s:2:"th";}i:1;a:2:{s:1:"A";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:6:"select";s:4:"size";s:7:"Edit...";s:4:"name";s:9:"edit_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"delete and cut save the template!";}i:2;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Box...";s:4:"name";s:8:"box_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:3;a:5:{s:4:"type";s:6:"select";s:4:"size";s:6:"Row...";s:4:"name";s:8:"row_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"size";s:9:"Column...";s:4:"name";s:11:"column_menu";s:8:"onchange";s:1:"1";s:4:"help";s:33:"all operations save the template!";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:4:"html";s:5:"label";s:4:"Name";s:4:"name";s:11:"java_script";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"template";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"lang";s:8:"readonly";s:1:"1";}i:4;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"20";s:5:"label";s:7:"Version";s:4:"name";s:7:"version";s:4:"help";s:56:"increment version to not overwrite the existing template";}i:5;a:5:{s:4:"type";s:5:"label";s:4:"span";s:5:",gray";s:5:"label";s:4:"Path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"path";}}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,goto";s:5:"label";s:4:"Path";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"path";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"goto";s:4:"help";s:25:"switch to a parent widget";}i:2;a:6:{s:4:"type";s:4:"path";s:4:"size";s:1:" ";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"goto2";s:4:"help";s:44:"switch to an other widgets of that container";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:4:"cell";s:4:"span";s:3:"all";s:4:"name";s:31:"etemplate.editor.widget.generic";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:9:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"5,horizontal";s:5:"label";s:19:"Grid row attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:6:"Height";s:4:"name";s:16:"grid_row[height]";s:4:"help";s:29:"height of row (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:18:"grid_row[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:5:"Class";s:4:"name";s:15:"grid_row[class]";s:4:"help";s:100:"CSS-class name for this row, preset: \'th\' = header, \'row\' = alternating row, \'row_off\'+\'row_on\' rows";}i:4;a:4:{s:4:"type";s:6:"select";s:5:"label";s:6:"Valign";s:4:"name";s:16:"grid_row[valign]";s:4:"help";s:25:"vertical alignment of row";}i:5;a:4:{s:4:"type";s:6:"select";s:5:"label";s:4:"Part";s:4:"name";s:14:"grid_row[part]";s:4:"help";s:61:"part of the table (header and footer have to be before body!)";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:7;a:2:{s:1:"A";a:6:{s:4:"type";s:8:"groupbox";s:4:"size";s:12:"2,horizontal";s:5:"label";s:22:"Grid column attributes";s:4:"span";s:3:"all";i:1;a:5:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:5:"Width";s:4:"name";s:18:"grid_column[width]";s:4:"help";s:31:"width of column (in % or pixel)";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:5:"label";s:8:"Disabled";s:4:"name";s:21:"grid_column[disabled]";s:4:"help";s:88:"to disable: [! = not]<value>[=<check>] eg: \'!@data\' disables if content of data is empty";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:8;a:2:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:66:"saves the template with given version number and closes the window";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:5:"apply";s:4:"help";s:56:"applies the changes to the given version of the template";}i:3;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:44:"closes the window without saving the changes";s:7:"onclick";s:15:"window.close();";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1131206619',);
+
+$templ_data[] = array('name' => 'etemplate.editor.widget.ajax_select','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:12:",@type=label";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"h8";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:5:"label";s:19:"AJAX Select options";s:7:"options";a:1:{i:0;s:1:"1";}s:4:"data";a:3:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"data";a:1:{i:0;a:0:{}}s:5:"label";s:11:"Data Source";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[0]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Title Source";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"ID Field";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[2]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Result row template";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[3]";}}}s:4:"rows";i:2;s:4:"cols";i:4;}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:8;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1163010571',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.ajax_select','template' => '','lang' => '','group' => '0','version' => '0.2','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:12:",@type=label";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"h8";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:7:{s:4:"type";s:4:"grid";s:4:"span";s:3:"all";s:5:"label";s:19:"AJAX Select options";s:7:"options";a:1:{i:0;s:1:"1";}s:4:"data";a:4:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"data";a:1:{i:0;a:0:{}}s:5:"label";s:11:"Data Source";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[0]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Title Source";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"ID Field";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[2]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:19:"Result row template";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[3]";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Link";}s:1:"B";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[6]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Icon";}s:1:"D";a:2:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[7]";}}}s:4:"rows";i:3;s:4:"cols";i:4;}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:8;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:8;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1176828301',);
 
@@ -157,12 +165,18 @@ $templ_data[] = array('name' => 'etemplate.editor.widget.contact','template' =>
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.contact','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"h4";s:14:",!@type=button";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:5:{s:4:"type";s:14:"contact-fields";s:4:"name";s:4:"size";s:4:"help";s:21:"Contact field to show";s:4:"span";s:3:"all";s:5:"label";s:5:"Field";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";s:5:"label";s:11:"Span, Class";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1242559642',);
 
+$templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:8:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@type=button";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s onChange";s:5:"align";s:6:"center";s:4:"name";s:8:"onchange";s:4:"help";s:33:"enable JavaScript onChange submit";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"73";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"58";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1118499298',);
+
+$templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.2.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:12:",@type=label";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"h7";s:14:",!@type=button";s:2:"c7";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1118499298',);
+
 $templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:12:",@type=label";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"c7";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:3:"all";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:3:"all";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1118499298',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.generic','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:10:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:12:",@type=label";s:2:"c4";s:3:"row";s:2:"h4";s:12:",@type=label";s:2:"c7";s:3:"row";s:1:"A";s:2:"70";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,size";s:5:"label";s:7:"Options";s:5:"align";s:6:"center";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"size";s:4:"help";s:187:"Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] Select:[multiselect] Date:[values: eg. \'Y-m-d\']";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:11:"Span, Class";s:5:"align";s:6:"center";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:8:"checkbox";s:4:"span";s:1:"2";s:5:"label";s:16:"%s NoTranslation";s:5:"align";s:6:"center";s:4:"name";s:7:"no_lang";s:4:"help";s:82:"select if content of field should not be translated (label gets always translated)";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";s:4:"span";s:1:"4";i:1;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:9:"%s needed";s:5:"align";s:6:"center";s:4:"name";s:6:"needed";s:4:"help";s:39:"check if field has to be filled by user";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s readonly";s:5:"align";s:6:"center";s:4:"name";s:8:"readonly";s:4:"help";s:94:"check if content should only be displayed but not altered (the content is not send back then!)";}i:3;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:5:"align";s:6:"center";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,blur";s:5:"label";s:8:"blurText";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"blur";s:4:"help";s:76:"this text gets displayed if the input-field is empty and has no focus (blur)";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"span";s:1:"4";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:3:"int";s:5:"label";s:8:"Tabindex";s:4:"span";s:1:"2";s:4:"name";s:8:"tabindex";s:4:"help";s:47:"Order to navigating by tab key through the form";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"1,1";s:4:"name";s:9:"accesskey";s:4:"help";s:67:"Accesskeys can also be specified with an & in the label (eg. &Name)";s:5:"label";s:9:"Accesskey";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,help";s:5:"label";s:4:"Help";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"71";s:4:"span";s:18:"all,inputFullWidth";s:4:"name";s:4:"help";s:4:"help";s:60:"displayed in statusline of browser if input-field gets focus";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"onChange";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:13:"onchange_type";s:4:"help";s:65:"Should the form be submitted or any custom javascript be executed";}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"50";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:8:"onchange";s:4:"help";s:30:"custom javascript for onChange";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:7;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:27:"all,leftPad5 inputFullWidth";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1242559548',);
 
 $templ_data[] = array('name' => 'etemplate.editor.widget.grid','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:4:{s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,align";s:5:"label";s:5:"Align";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,span";s:5:"label";s:4:"Span";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[3]";s:5:"label";s:5:"Class";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:10:"options[3]";s:4:"help";s:27:"CSS class for the table-tag";}}i:3;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[0]";s:5:"label";s:5:"Width";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:10:"options[0]";s:4:"help";s:71:" Width of the table in % or pixels for the table-tag and (optional) div";}s:1:"C";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[1]";s:5:"label";s:6:"Height";s:5:"align";s:5:"right";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:4:"name";s:10:"options[1]";s:4:"help";s:72:" Height of the table in % or pixels for the table-tag and (optional) div";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[6]";s:5:"label";s:8:"Overflow";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:10:"options[6]";s:4:"help";s:96:"what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[4]";s:5:"label";s:7:"Spacing";}s:1:"B";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:10:"options[4]";s:4:"help";s:29:"Cellspacing for the table-tag";s:4:"size";s:14:"Default,0,10,1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[5]";s:5:"label";s:7:"Padding";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:14:"Default,0,10,1";s:4:"name";s:10:"options[5]";s:4:"help";s:29:"Cellpadding for the table-tag";}s:1:"E";a:4:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,options[2]";s:5:"label";s:6:"Border";s:5:"align";s:5:"right";}s:1:"F";a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:14:"Default,0,10,1";s:4:"name";s:10:"options[2]";s:4:"help";s:39:"Border-line-thickness for the table-tag";}}}s:4:"rows";i:4;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1116599469',);
 
+$templ_data[] = array('name' => 'etemplate.editor.widget.infolog','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:2:"c1";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c2";s:3:"row";s:2:"c6";s:3:"row";s:2:"h6";s:14:",!@type=button";s:2:"c3";s:3:"row";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,type";s:5:"label";s:4:"Type";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:4:"name";s:4:"type";s:8:"onchange";s:1:"1";s:4:"help";s:57:"type of the field (select Label if field should be empty)";}s:1:"C";a:6:{s:4:"type";s:14:"infolog-fields";s:4:"name";s:10:"options[0]";s:4:"help";s:21:"Contact field to show";s:4:"span";s:3:"all";s:5:"label";s:5:"Field";s:7:"options";a:0:{}}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Compare";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"options[1]";s:4:"help";s:69:"show a X if content equals this compare value, otherwise show nothing";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"span";s:3:"all";s:5:"label";s:12:"Alternatives";s:4:"name";s:10:"options[2]";s:4:"help";s:77:"colon (:) separated list of field names to use if value is empty or to sum up";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Contactfield";}s:1:"B";a:2:{s:4:"type";s:14:"contact-fields";s:4:"name";s:10:"options[3]";}s:1:"C";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:19:"Regular expression ";s:4:"name";s:10:"options[4]";s:4:"help";s:31:"first argument for preg_replace";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:5:{s:4:"type";s:4:"text";s:4:"span";s:1:"2";s:5:"label";s:11:"Replacement";s:4:"name";s:10:"options[5]";s:4:"help";s:33:"second parameter for preg_replace";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:4;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,label";s:5:"label";s:5:"Label";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"label";s:4:"help";s:118:"displayed in front of input or input is inserted for a \'%s\' in the label (label of the Submitbutton or Image-filename)";}s:1:"C";a:6:{s:4:"type";s:4:"text";s:4:"size";s:2:"10";s:4:"name";s:4:"span";s:4:"help";s:111:"number of colums the field/cell should span or \'all\' for the remaining columns, CSS-class name (for the TD tag)";s:5:"label";s:11:"Span, Class";s:4:"span";s:1:"2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"Align";s:5:"align";s:6:"center";}s:1:"F";a:3:{s:4:"type";s:6:"select";s:4:"name";s:5:"align";s:4:"help";s:48:"alignment of label and input-field in table-cell";}}i:5;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,name";s:5:"label";s:4:"Name";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"help";s:78:"index/name of returned content (name of the Template, Link / Method for Image)";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:11:"%s disabled";s:4:"name";s:8:"disabled";s:4:"help";s:96:"if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell";s:4:"span";s:3:"all";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:6;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:"onclick";s:5:"label";s:7:"onClick";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"onclick_type";s:4:"help";s:43:"confirmation necesary or custom java-script";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:2:"53";s:4:"span";s:3:"all";s:4:"name";s:7:"onclick";s:4:"help";s:67:"confirmation message or custom javascript (returning true or false)";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1187334168',);
+
 $templ_data[] = array('name' => 'etemplate.groupbox.test','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"2";s:5:"label";s:18:"Selection grouping";i:1;a:4:{s:4:"type";s:5:"radio";s:4:"size";s:1:"1";s:5:"label";s:18:"%s selection #1 or";s:4:"name";s:9:"selection";}i:2;a:4:{s:4:"type";s:5:"radio";s:4:"size";s:1:"2";s:5:"label";s:15:"%s selection #2";s:4:"name";s:9:"selection";}}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1107699792',);
 
 $templ_data[] = array('name' => 'etemplate.groupbox.test-template','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:8:"Template";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:25:"etemplate.tab_widget.test";}}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1107701431',);
diff --git a/etemplate/templates/default/editor.widget.xet b/etemplate/templates/default/editor.widget.xet
index bf7452d364..1208edd546 100644
--- a/etemplate/templates/default/editor.widget.xet
+++ b/etemplate/templates/default/editor.widget.xet
@@ -132,7 +132,9 @@
 						<menulist>
 							<menupopup label="Valign" id="grid_row[valign]" statustext="vertical alignment of row"/>
 						</menulist>
-						<description/>
+						<menulist>
+							<menupopup label="Part" id="grid_row[part]" statustext="part of the table (header and footer have to be before body!)"/>
+						</menulist>
 					</groupbox>
 				</row>
 				<row disabled="!@grid_column">

From 62d3afdd363194f27ee945afed49dcf74c496014 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 4 Jul 2009 14:17:58 +0000
Subject: [PATCH 448/510] "display on horizontal scrollbar for width 100%"

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index b1100ea815..fd8a660320 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -843,9 +843,11 @@ class etemplate extends boetemplate
 			html::formatOptions($grid['span'],',class').
 			html::formatOptions($grid['name']?self::form_name($cname,$grid['name']):'','id'));
 
-		if (!empty($overflow)) {
+		if (!empty($overflow))
+		{
 			if (is_numeric($height)) $height .= 'px';
 			if (is_numeric($width)) $width .= 'px';
+			if ($width == '100%') $overflow .= '; overflow-x: hidden';	// no horizontal scrollbar
 			$div_style=' style="'.($width?"width: $width; ":'').($height ? "height: $height; ":'')."overflow: $overflow;\"";
 			$html = html::div($html,$div_style);
 		}

From 1e43e837c0f4f344560deee5a988b0b5f4d176ca Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 6 Jul 2009 09:25:19 +0000
Subject: [PATCH 449/510] fix regarding get_app in translation. array_merge
 does renumber and += seems to bear problems, if there already is a
 translation for the given key (mainscreen_message)

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index d7619bbda0..0237686ca4 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -245,15 +245,19 @@ class translation
 	static function add_app($app,$lang=False)
 	{
 		$lang = $lang ? $lang : self::$userlang;
-
 		if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang)
 		{
 			//$start = microtime(true);
 			// for loginscreen we have to use a instance specific cache!
 			$loaded =& egw_cache::getCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE,
 				__CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang));
-
-			self::$lang_arr += $loaded;	// use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge
+			foreach(array_keys($loaded) as $key) 
+			{
+				// as array_merge does renumber, and the padding of the loaded langs to the existing langs does lead to strange phenomenons 
+				// regarding the mainscreen_message, we do that the old fashioned way.
+				if (!empty($loaded[$key])) self::$lang_arr[$key] = $loaded[$key];
+			}
+			//self::$lang_arr += $loaded;	// use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge
 			self::$loaded_apps[$app] = $lang;
 			//error_log(__METHOD__."($app,$lang) took ".(1000*(microtime(true)-$start))." ms, loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr).": ".function_backtrace());
 		}

From 3307109a1cb1db51a2cc7301ee07f65d515a8f96 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 6 Jul 2009 11:11:40 +0000
Subject: [PATCH 450/510] reverted change of r72366 and fixed the real cause
 for the mainscreen_message problem: YOU SHOULD NOT HAVE TRANSLATIONS FOR
 mainscreen_message; You may have to force the reload of new language
 file-information

---
 home/setup/egw_cs.lang                 | 1 -
 home/setup/egw_de.lang                 | 1 -
 home/setup/egw_en.lang                 | 1 -
 home/setup/egw_es-es.lang              | 1 -
 home/setup/egw_fi.lang                 | 1 -
 home/setup/egw_fr.lang                 | 1 -
 home/setup/egw_it.lang                 | 1 -
 home/setup/egw_iw.lang                 | 1 -
 home/setup/egw_nl.lang                 | 1 -
 home/setup/egw_pt-br.lang              | 1 -
 home/setup/egw_pt.lang                 | 1 -
 home/setup/egw_ru.lang                 | 1 -
 home/setup/egw_sk.lang                 | 1 -
 home/setup/egw_sl.lang                 | 1 -
 home/setup/egw_sv.lang                 | 1 -
 home/setup/egw_zh-tw.lang              | 1 -
 home/setup/egw_zh.lang                 | 1 -
 phpgwapi/inc/class.translation.inc.php | 8 +-------
 18 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/home/setup/egw_cs.lang b/home/setup/egw_cs.lang
index 2e129d8997..2a426c7c4c 100644
--- a/home/setup/egw_cs.lang
+++ b/home/setup/egw_cs.lang
@@ -1,5 +1,4 @@
 displays home	home	cs	Zobrazuje hlavní stranu
 egroupware	home	cs	eGroupWare
 home	home	cs	Hlavní strana
-mainscreen_message	home	cs	mainscreen_message
 there is a new version of egroupware available	home	cs	Je k dispozici nová verze eGroupWare
diff --git a/home/setup/egw_de.lang b/home/setup/egw_de.lang
index 00f0b4daee..ab09ff2ab4 100644
--- a/home/setup/egw_de.lang
+++ b/home/setup/egw_de.lang
@@ -1,5 +1,4 @@
 displays home	home	de	Home anzeigen
 egroupware	home	de	EGRoupware
 home	home	de	Home
-mainscreen_message	home	de	Meldung auf dem Hauptbildschirm
 there is a new version of egroupware available	home	de	Es steht eine neuere Version von EGroupware zur Verfügung
diff --git a/home/setup/egw_en.lang b/home/setup/egw_en.lang
index faebcf9e3b..25720123a1 100755
--- a/home/setup/egw_en.lang
+++ b/home/setup/egw_en.lang
@@ -1,5 +1,4 @@
 displays home	home	en	Displays home
 egroupware	home	en	eGroupWare
 home	home	en	Home
-mainscreen_message	home	en	mainscreen_message
 there is a new version of egroupware available	home	en	There is a new version of eGroupWare available
diff --git a/home/setup/egw_es-es.lang b/home/setup/egw_es-es.lang
index 4f54d8de1e..d9c35efa64 100644
--- a/home/setup/egw_es-es.lang
+++ b/home/setup/egw_es-es.lang
@@ -1,5 +1,4 @@
 displays home	home	es-es	Muestra el inicio
 egroupware	home	es-es	eGroupWare
 home	home	es-es	Inicio
-mainscreen_message	home	es-es	Mensaje de la pantalla principal
 there is a new version of egroupware available	home	es-es	Hay disponible una nueva versión de eGroupWare
diff --git a/home/setup/egw_fi.lang b/home/setup/egw_fi.lang
index 924884e4ef..d3b5e107d2 100644
--- a/home/setup/egw_fi.lang
+++ b/home/setup/egw_fi.lang
@@ -1,5 +1,4 @@
 displays home	home	fi	Näytä etusivu
 egroupware	home	fi	eGroupWare
 home	home	fi	Etusivu
-mainscreen_message	home	fi	mainscreen_message
 there is a new version of egroupware available	home	fi	Uudempi versio eGroupWaresta on saatavilla
diff --git a/home/setup/egw_fr.lang b/home/setup/egw_fr.lang
index b93ef9906d..80d7a2770b 100644
--- a/home/setup/egw_fr.lang
+++ b/home/setup/egw_fr.lang
@@ -1,5 +1,4 @@
 displays home	home	fr	Afficher l'écran d'accueil
 egroupware	home	fr	eGroupWare
 home	home	fr	Accueil
-mainscreen_message	home	fr	Ecran principal des messages
 there is a new version of egroupware available	home	fr	Une nouvelle version de eGroupWare est disponible
diff --git a/home/setup/egw_it.lang b/home/setup/egw_it.lang
index fbb9a66992..459d750764 100644
--- a/home/setup/egw_it.lang
+++ b/home/setup/egw_it.lang
@@ -1,5 +1,4 @@
 displays home	home	it	Mostra home
 egroupware	home	it	eGroupware
 home	home	it	Home
-mainscreen_message	home	it	Messaggio principale
 there is a new version of egroupware available	home	it	C'è una nuova versione di eGroupWare disponibile
diff --git a/home/setup/egw_iw.lang b/home/setup/egw_iw.lang
index 21ad3bc471..81400d29a7 100644
--- a/home/setup/egw_iw.lang
+++ b/home/setup/egw_iw.lang
@@ -1,5 +1,4 @@
 displays home	home	iw	test
 egroupware	home	iw	sdg
 home	home	iw	gsg
-mainscreen_message	home	iw	sgs
 there is a new version of egroupware available	home	iw	sgsg
diff --git a/home/setup/egw_nl.lang b/home/setup/egw_nl.lang
index 39b5ade374..d70954398c 100755
--- a/home/setup/egw_nl.lang
+++ b/home/setup/egw_nl.lang
@@ -1,5 +1,4 @@
 displays home	home	nl	Toont start
 egroupware	home	nl	eGroupware
 home	home	nl	Start
-mainscreen_message	home	nl	Bericht op startscherm
 there is a new version of egroupware available	home	nl	Er is een nieuwe versie van eGroupWare beschikbaar
diff --git a/home/setup/egw_pt-br.lang b/home/setup/egw_pt-br.lang
index ace93d2d85..6fb820b0b1 100644
--- a/home/setup/egw_pt-br.lang
+++ b/home/setup/egw_pt-br.lang
@@ -1,5 +1,4 @@
 displays home	home	pt-br	Exibe Página Inicial
 egroupware	home	pt-br	eGroupWare
 home	home	pt-br	Página Inicial
-mainscreen_message	home	pt-br	Mensagem da tela principal
 there is a new version of egroupware available	home	pt-br	Há uma nova versão do eGroupWare disponível
diff --git a/home/setup/egw_pt.lang b/home/setup/egw_pt.lang
index 53464e3d2e..36cad744a5 100644
--- a/home/setup/egw_pt.lang
+++ b/home/setup/egw_pt.lang
@@ -1,2 +1 @@
-mainscreen_message	home	pt	Mensagem de boas vindas!
 there is a new version of egroupware available	home	pt	Existe uma nova versão do eGroupWare disponível
diff --git a/home/setup/egw_ru.lang b/home/setup/egw_ru.lang
index c7cf68dbd6..30498e4796 100644
--- a/home/setup/egw_ru.lang
+++ b/home/setup/egw_ru.lang
@@ -1,5 +1,4 @@
 displays home	home	ru	Показать дом
 egroupware	home	ru	eGroupWare
 home	home	ru	Домой
-mainscreen_message	home	ru	Сообщение о�новного �крана (?)
 there is a new version of egroupware available	home	ru	До�тупна нова� вер�и� eGroupWare
diff --git a/home/setup/egw_sk.lang b/home/setup/egw_sk.lang
index e141364459..cf007b31e4 100644
--- a/home/setup/egw_sk.lang
+++ b/home/setup/egw_sk.lang
@@ -1,5 +1,4 @@
 displays home	home	sk	Zobrazí Domov
 egroupware	home	sk	eGroupWare
 home	home	sk	Domov
-mainscreen_message	home	sk	-domovská stránka-
 there is a new version of egroupware available	home	sk	Existuje už novšia verzia eGroupWare
diff --git a/home/setup/egw_sl.lang b/home/setup/egw_sl.lang
index 3b841a15f0..cf7b0719e8 100644
--- a/home/setup/egw_sl.lang
+++ b/home/setup/egw_sl.lang
@@ -1,5 +1,4 @@
 displays home	home	sl	Prikaže doma�o stran
 egroupware	home	sl	eGroupWare
 home	home	sl	Domov
-mainscreen_message	home	sl	Sporo�ilo uvodnega zaslona
 there is a new version of egroupware available	home	sl	Na voljo je nova razli�ica eGroupWare-a
diff --git a/home/setup/egw_sv.lang b/home/setup/egw_sv.lang
index adbe09b041..a9ba4bf7b9 100644
--- a/home/setup/egw_sv.lang
+++ b/home/setup/egw_sv.lang
@@ -1,5 +1,4 @@
 displays home	home	sv	Visar Hemsidan
 egroupware	home	sv	eGroupWare
 home	home	sv	Hem
-mainscreen_message	home	sv	Hemsidan meddelanden
 there is a new version of egroupware available	home	sv	En uppdaterad version av eGroupWare är tillgänglig
diff --git a/home/setup/egw_zh-tw.lang b/home/setup/egw_zh-tw.lang
index 336f1c33c6..55d82a4e8b 100644
--- a/home/setup/egw_zh-tw.lang
+++ b/home/setup/egw_zh-tw.lang
@@ -1,5 +1,4 @@
 displays home	home	zh-tw	顯示首�
 egroupware	home	zh-tw	eGroupWare
 home	home	zh-tw	首�
-mainscreen_message	home	zh-tw	首�訊�
 there is a new version of egroupware available	home	zh-tw	eGroupWare 有新版本推出了
diff --git a/home/setup/egw_zh.lang b/home/setup/egw_zh.lang
index 95f8727c92..e69bc78aed 100644
--- a/home/setup/egw_zh.lang
+++ b/home/setup/egw_zh.lang
@@ -1,5 +1,4 @@
 displays home	home	zh	显示首页
 egroupware	home	zh	eGroupWare
 home	home	zh	首页
-mainscreen_message	home	zh	主窗�讯�
 there is a new version of egroupware available	home	zh	eGroupWare 有最新版本推出
diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 0237686ca4..27e9d15589 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -251,13 +251,7 @@ class translation
 			// for loginscreen we have to use a instance specific cache!
 			$loaded =& egw_cache::getCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE,
 				__CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang));
-			foreach(array_keys($loaded) as $key) 
-			{
-				// as array_merge does renumber, and the padding of the loaded langs to the existing langs does lead to strange phenomenons 
-				// regarding the mainscreen_message, we do that the old fashioned way.
-				if (!empty($loaded[$key])) self::$lang_arr[$key] = $loaded[$key];
-			}
-			//self::$lang_arr += $loaded;	// use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge
+			self::$lang_arr += $loaded;	// use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge
 			self::$loaded_apps[$app] = $lang;
 			//error_log(__METHOD__."($app,$lang) took ".(1000*(microtime(true)-$start))." ms, loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr).": ".function_backtrace());
 		}

From d160101c6553fa7e17b0bd731f9c66e0bf75f71c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 6 Jul 2009 22:20:57 +0000
Subject: [PATCH 451/510] Make delete instance / domain checkbox actually
 remove the domain.  DB still needs to be dropped manually.

---
 setup/manageheader.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup/manageheader.php b/setup/manageheader.php
index 561d614840..50fb9bb327 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -168,7 +168,12 @@ function check_header_form()
 	// setting the domain settings from the posted content
 	foreach($_POST['domains'] as $key => $domain)
 	{
-		if ($_POST['deletedomain'][$key]) continue;	// domain deleted
+		if ($_POST['deletedomain'][$key]) 
+		{
+			// Need to actually remove the domain.  Drop the DB manually.
+			unset($GLOBALS['egw_domain'][$domain]);
+			continue;
+		}
 
 		foreach($_POST['setting_'.$key] as $name => $value)
 		{

From b0efbe263749f74f4089b0dd9047d41ae5aa9eac Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 7 Jul 2009 08:58:12 +0000
Subject: [PATCH 452/510] upgrading to 2.6.4.1, removing _samples and unneeded
 connectors

---
 phpgwapi/js/fckeditor/_documentation.html     |    2 +-
 .../_plugins/findreplace/fckplugin.js         |   38 -
 .../_samples/_plugins/findreplace/find.gif    |  Bin 595 -> 0 bytes
 .../_samples/_plugins/findreplace/find.html   |  172 ---
 .../_samples/_plugins/findreplace/lang/en.js  |   33 -
 .../_samples/_plugins/findreplace/lang/fr.js  |   33 -
 .../_samples/_plugins/findreplace/lang/it.js  |   33 -
 .../_samples/_plugins/findreplace/replace.gif |  Bin 326 -> 0 bytes
 .../_plugins/findreplace/replace.html         |  135 --
 .../_samples/_plugins/samples/fckplugin.js    |   73 -
 .../_samples/adobeair/application.xml         |   34 -
 .../fckeditor/_samples/adobeair/icons/128.png |  Bin 1242 -> 0 bytes
 .../fckeditor/_samples/adobeair/icons/16.png  |  Bin 273 -> 0 bytes
 .../fckeditor/_samples/adobeair/icons/32.png  |  Bin 562 -> 0 bytes
 .../fckeditor/_samples/adobeair/icons/48.png  |  Bin 563 -> 0 bytes
 .../fckeditor/_samples/adobeair/package.bat   |   26 -
 .../js/fckeditor/_samples/adobeair/run.bat    |   26 -
 .../fckeditor/_samples/adobeair/sample01.html |   58 -
 .../_samples/adobeair/sample01_cert.pfx       |  Bin 2514 -> 0 bytes
 phpgwapi/js/fckeditor/_samples/afp/fck.afpa   |    1 -
 .../js/fckeditor/_samples/afp/fck.afpa.code   |  165 --
 .../js/fckeditor/_samples/afp/sample01.afp    |   56 -
 .../js/fckeditor/_samples/afp/sample02.afp    |  113 --
 .../js/fckeditor/_samples/afp/sample03.afp    |   91 --
 .../js/fckeditor/_samples/afp/sample04.afp    |   98 --
 .../_samples/afp/sampleposteddata.afp         |   63 -
 .../js/fckeditor/_samples/asp/sample01.asp    |   62 -
 .../js/fckeditor/_samples/asp/sample02.asp    |  108 --
 .../js/fckeditor/_samples/asp/sample03.asp    |   92 --
 .../js/fckeditor/_samples/asp/sample04.asp    |   98 --
 .../_samples/asp/sampleposteddata.asp         |   56 -
 .../js/fckeditor/_samples/cfm/sample01.cfm    |   63 -
 .../js/fckeditor/_samples/cfm/sample01_mx.cfm |   67 -
 .../js/fckeditor/_samples/cfm/sample02.cfm    |  110 --
 .../js/fckeditor/_samples/cfm/sample02_mx.cfm |  114 --
 .../js/fckeditor/_samples/cfm/sample03.cfm    |   95 --
 .../js/fckeditor/_samples/cfm/sample03_mx.cfm |   95 --
 .../js/fckeditor/_samples/cfm/sample04.cfm    |  100 --
 .../js/fckeditor/_samples/cfm/sample04_mx.cfm |  101 --
 .../_samples/cfm/sampleposteddata.cfm         |   68 -
 phpgwapi/js/fckeditor/_samples/default.html   |   35 -
 .../js/fckeditor/_samples/html/sample01.html  |   59 -
 .../js/fckeditor/_samples/html/sample02.html  |   63 -
 .../js/fckeditor/_samples/html/sample03.html  |  140 --
 .../js/fckeditor/_samples/html/sample04.html  |   95 --
 .../js/fckeditor/_samples/html/sample05.html  |  125 --
 .../_samples/html/sample06.config.js          |   49 -
 .../js/fckeditor/_samples/html/sample06.html  |   73 -
 .../js/fckeditor/_samples/html/sample07.html  |   59 -
 .../js/fckeditor/_samples/html/sample08.html  |  196 ---
 .../js/fckeditor/_samples/html/sample09.html  |  100 --
 .../js/fckeditor/_samples/html/sample10.html  |   79 -
 .../js/fckeditor/_samples/html/sample11.html  |   43 -
 .../_samples/html/sample11_frame.html         |   69 -
 .../js/fckeditor/_samples/html/sample12.html  |  124 --
 .../js/fckeditor/_samples/html/sample13.html  |  148 --
 .../_samples/html/sample14.config.js          |  121 --
 .../js/fckeditor/_samples/html/sample14.html  |   66 -
 .../_samples/html/sample14.styles.css         |  228 ---
 .../_samples/html/sampleposteddata.asp        |   72 -
 .../_samples/html/sampleposteddata.html       |   80 -
 .../fckeditor/_samples/lasso/sample01.lasso   |   55 -
 .../fckeditor/_samples/lasso/sample02.lasso   |  109 --
 .../fckeditor/_samples/lasso/sample03.lasso   |   87 --
 .../fckeditor/_samples/lasso/sample04.lasso   |   93 --
 .../_samples/lasso/sampleposteddata.lasso     |   53 -
 .../js/fckeditor/_samples/perl/sample01.cgi   |  117 --
 .../js/fckeditor/_samples/perl/sample02.cgi   |  182 ---
 .../js/fckeditor/_samples/perl/sample03.cgi   |  167 ---
 .../js/fckeditor/_samples/perl/sample04.cgi   |  174 ---
 .../_samples/perl/sampleposteddata.cgi        |  107 --
 .../js/fckeditor/_samples/php/sample01.php    |   57 -
 .../js/fckeditor/_samples/php/sample02.php    |  108 --
 .../js/fckeditor/_samples/php/sample03.php    |   89 --
 .../js/fckeditor/_samples/php/sample04.php    |   95 --
 .../_samples/php/sampleposteddata.php         |   69 -
 phpgwapi/js/fckeditor/_samples/py/sample01.py |   80 -
 .../fckeditor/_samples/py/sampleposteddata.py |   88 --
 phpgwapi/js/fckeditor/_samples/sample.css     |   74 -
 .../js/fckeditor/_samples/sampleslist.html    |  120 --
 phpgwapi/js/fckeditor/_upgrade.html           |    2 +-
 phpgwapi/js/fckeditor/_whatsnew.html          |  230 +--
 phpgwapi/js/fckeditor/_whatsnew_history.html  |  131 +-
 .../editor/_source/classes/fckcontextmenu.js  |    2 +-
 .../_source/classes/fckdataprocessor.js       |    2 +-
 .../classes/fckdocumentfragment_gecko.js      |    2 +-
 .../_source/classes/fckdocumentfragment_ie.js |    2 +-
 .../editor/_source/classes/fckdomrange.js     |    6 +-
 .../_source/classes/fckdomrange_gecko.js      |    2 +-
 .../editor/_source/classes/fckdomrange_ie.js  |    2 +-
 .../_source/classes/fckdomrangeiterator.js    |    4 +-
 .../editor/_source/classes/fckeditingarea.js  |    2 +-
 .../editor/_source/classes/fckelementpath.js  |    2 +-
 .../editor/_source/classes/fckenterkey.js     |   24 +-
 .../editor/_source/classes/fckevents.js       |    2 +-
 .../editor/_source/classes/fckhtmliterator.js |    4 +-
 .../editor/_source/classes/fckicon.js         |    2 +-
 .../editor/_source/classes/fckiecleanup.js    |    2 +-
 .../_source/classes/fckimagepreloader.js      |    2 +-
 .../_source/classes/fckkeystrokehandler.js    |    2 +-
 .../editor/_source/classes/fckmenublock.js    |    2 +-
 .../_source/classes/fckmenublockpanel.js      |    2 +-
 .../editor/_source/classes/fckmenuitem.js     |    2 +-
 .../editor/_source/classes/fckpanel.js        |   79 +-
 .../editor/_source/classes/fckplugin.js       |    2 +-
 .../editor/_source/classes/fckspecialcombo.js |    2 +-
 .../editor/_source/classes/fckstyle.js        |    2 +-
 .../editor/_source/classes/fcktoolbar.js      |    2 +-
 .../_source/classes/fcktoolbarbreak_gecko.js  |    2 +-
 .../_source/classes/fcktoolbarbreak_ie.js     |    2 +-
 .../_source/classes/fcktoolbarbutton.js       |    2 +-
 .../_source/classes/fcktoolbarbuttonui.js     |    2 +-
 .../classes/fcktoolbarfontformatcombo.js      |    2 +-
 .../_source/classes/fcktoolbarfontscombo.js   |    2 +-
 .../classes/fcktoolbarfontsizecombo.js        |    2 +-
 .../_source/classes/fcktoolbarpanelbutton.js  |    2 +-
 .../_source/classes/fcktoolbarspecialcombo.js |    2 +-
 .../_source/classes/fcktoolbarstylecombo.js   |    2 +-
 .../editor/_source/classes/fckw3crange.js     |    2 +-
 .../editor/_source/classes/fckxml.js          |    2 +-
 .../editor/_source/classes/fckxml_gecko.js    |    2 +-
 .../editor/_source/classes/fckxml_ie.js       |    2 +-
 .../commandclasses/fck_othercommands.js       |    4 +-
 .../commandclasses/fckblockquotecommand.js    |   53 +-
 .../commandclasses/fckcorestylecommand.js     |    2 +-
 .../_source/commandclasses/fckfitwindow.js    |   35 +-
 .../commandclasses/fckindentcommands.js       |    2 +-
 .../commandclasses/fckjustifycommands.js      |    2 +-
 .../_source/commandclasses/fcklistcommands.js |    2 +-
 .../_source/commandclasses/fcknamedcommand.js |    2 +-
 .../fckpasteplaintextcommand.js               |    2 +-
 .../commandclasses/fckpastewordcommand.js     |    2 +-
 .../commandclasses/fckremoveformatcommand.js  |    2 +-
 .../_source/commandclasses/fckshowblocks.js   |   11 +-
 .../fckspellcheckcommand_gecko.js             |   14 +-
 .../commandclasses/fckspellcheckcommand_ie.js |    7 +-
 .../_source/commandclasses/fckstylecommand.js |    2 +-
 .../_source/commandclasses/fcktablecommand.js |    2 +-
 .../commandclasses/fcktextcolorcommand.js     |    2 +-
 .../fckeditor/editor/_source/fckconstants.js  |    2 +-
 .../fckeditor/editor/_source/fckeditorapi.js  |   15 +-
 .../editor/_source/fckjscoreextensions.js     |    9 +-
 .../editor/_source/fckscriptloader.js         |    2 +-
 .../fckeditor/editor/_source/internals/fck.js |    8 +-
 .../_source/internals/fck_contextmenu.js      |    7 +-
 .../editor/_source/internals/fck_gecko.js     |   14 +-
 .../editor/_source/internals/fck_ie.js        |    4 +-
 .../_source/internals/fckbrowserinfo.js       |    2 +-
 .../_source/internals/fckcodeformatter.js     |   12 +-
 .../editor/_source/internals/fckcommands.js   |    2 +-
 .../editor/_source/internals/fckconfig.js     |    6 +-
 .../editor/_source/internals/fckdebug.js      |    4 +-
 .../editor/_source/internals/fckdialog.js     |    4 +-
 .../_source/internals/fckdocumentprocessor.js |    6 +-
 .../editor/_source/internals/fckdomtools.js   |    2 +-
 .../_source/internals/fcklanguagemanager.js   |    3 +-
 .../_source/internals/fcklisthandler.js       |    2 +-
 .../editor/_source/internals/fcklistslib.js   |    2 +-
 .../editor/_source/internals/fckplugins.js    |    2 +-
 .../editor/_source/internals/fckregexlib.js   |    2 +-
 .../editor/_source/internals/fckselection.js  |    2 +-
 .../_source/internals/fckselection_gecko.js   |    2 +-
 .../_source/internals/fckselection_ie.js      |   24 +-
 .../editor/_source/internals/fckstyles.js     |    2 +-
 .../_source/internals/fcktablehandler.js      |  155 +-
 .../internals/fcktablehandler_gecko.js        |    4 +-
 .../_source/internals/fcktablehandler_ie.js   |    4 +-
 .../_source/internals/fcktoolbaritems.js      |    2 +-
 .../editor/_source/internals/fcktoolbarset.js |    2 +-
 .../editor/_source/internals/fcktools.js      |    2 +-
 .../_source/internals/fcktools_gecko.js       |    2 +-
 .../editor/_source/internals/fcktools_ie.js   |    2 +-
 .../editor/_source/internals/fckundo.js       |    2 +-
 .../editor/_source/internals/fckurlparams.js  |    2 +-
 .../editor/_source/internals/fckxhtml.js      |    4 +-
 .../_source/internals/fckxhtml_gecko.js       |    2 +-
 .../editor/_source/internals/fckxhtml_ie.js   |    2 +-
 .../_source/internals/fckxhtmlentities.js     |   11 +-
 .../fckeditor/editor/css/fck_editorarea.css   |    2 +-
 .../js/fckeditor/editor/css/fck_internal.css  |    2 +-
 .../editor/css/fck_showtableborders_gecko.css |    2 +-
 .../dialog/common/fck_dialog_common.css       |    2 +-
 .../editor/dialog/common/fck_dialog_common.js |   40 +-
 .../js/fckeditor/editor/dialog/fck_about.html |    8 +-
 .../fckeditor/editor/dialog/fck_anchor.html   |    2 +-
 .../fckeditor/editor/dialog/fck_button.html   |    2 +-
 .../fckeditor/editor/dialog/fck_checkbox.html |    2 +-
 .../editor/dialog/fck_colorselector.html      |    2 +-
 .../fckeditor/editor/dialog/fck_docprops.html |    4 +-
 .../fck_docprops/fck_document_preview.html    |    2 +-
 .../js/fckeditor/editor/dialog/fck_flash.html |    2 +-
 .../editor/dialog/fck_flash/fck_flash.js      |    2 +-
 .../dialog/fck_flash/fck_flash_preview.html   |    2 +-
 .../js/fckeditor/editor/dialog/fck_form.html  |    2 +-
 .../editor/dialog/fck_hiddenfield.html        |    2 +-
 .../js/fckeditor/editor/dialog/fck_image.html |    2 +-
 .../editor/dialog/fck_image/fck_image.js      |    2 +-
 .../dialog/fck_image/fck_image_preview.html   |    2 +-
 .../js/fckeditor/editor/dialog/fck_link.html  |    2 +-
 .../editor/dialog/fck_link/fck_link.js        |    6 +-
 .../fckeditor/editor/dialog/fck_listprop.html |    2 +-
 .../js/fckeditor/editor/dialog/fck_paste.html |    3 +-
 .../editor/dialog/fck_radiobutton.html        |    2 +-
 .../fckeditor/editor/dialog/fck_replace.html  |    6 +-
 .../fckeditor/editor/dialog/fck_select.html   |   12 +-
 .../editor/dialog/fck_select/fck_select.js    |    2 +-
 .../fckeditor/editor/dialog/fck_smiley.html   |    2 +-
 .../fckeditor/editor/dialog/fck_source.html   |    2 +-
 .../editor/dialog/fck_specialchar.html        |    2 +-
 .../editor/dialog/fck_spellerpages.html       |    2 +-
 .../server-scripts/spellchecker.pl            |  362 ++---
 .../js/fckeditor/editor/dialog/fck_table.html |  203 ++-
 .../editor/dialog/fck_tablecell.html          |   64 +-
 .../fckeditor/editor/dialog/fck_template.html |    2 +-
 .../fckeditor/editor/dialog/fck_textarea.html |    2 +-
 .../editor/dialog/fck_textfield.html          |    2 +-
 .../fckeditor/editor/dtd/fck_xhtml10strict.js |    2 +-
 .../editor/dtd/fck_xhtml10transitional.js     |    2 +-
 phpgwapi/js/fckeditor/editor/fckdebug.html    |    2 +-
 phpgwapi/js/fckeditor/editor/fckdialog.html   |   11 +-
 phpgwapi/js/fckeditor/editor/fckeditor.html   |    2 +-
 .../fckeditor/editor/fckeditor.original.html  |    2 +-
 .../filemanager/browser/default/browser.css   |    2 +-
 .../filemanager/browser/default/browser.html  |    2 +-
 .../browser/default/frmactualfolder.html      |    2 +-
 .../browser/default/frmcreatefolder.html      |    2 +-
 .../browser/default/frmfolders.html           |    2 +-
 .../browser/default/frmresourceslist.html     |    2 +-
 .../browser/default/frmresourcetype.html      |    2 +-
 .../browser/default/frmupload.html            |    2 +-
 .../filemanager/browser/default/js/common.js  |    2 +-
 .../filemanager/browser/default/js/fckxml.js  |    2 +-
 .../filemanager/connectors/asp/basexml.asp    |   63 -
 .../connectors/asp/class_upload.asp           |  353 -----
 .../filemanager/connectors/asp/commands.asp   |  198 ---
 .../filemanager/connectors/asp/config.asp     |  128 --
 .../filemanager/connectors/asp/connector.asp  |   88 --
 .../editor/filemanager/connectors/asp/io.asp  |  236 ---
 .../filemanager/connectors/asp/upload.asp     |   65 -
 .../filemanager/connectors/asp/util.asp       |   55 -
 .../filemanager/connectors/aspx/config.ascx   |   98 --
 .../connectors/aspx/connector.aspx            |   32 -
 .../filemanager/connectors/aspx/upload.aspx   |   32 -
 .../connectors/cfm/ImageObject.cfc            |  273 ----
 .../connectors/cfm/cf5_connector.cfm          |  315 ----
 .../filemanager/connectors/cfm/cf5_upload.cfm |  299 ----
 .../filemanager/connectors/cfm/cf_basexml.cfm |   68 -
 .../connectors/cfm/cf_commands.cfm            |  230 ---
 .../connectors/cfm/cf_connector.cfm           |   89 --
 .../filemanager/connectors/cfm/cf_io.cfm      |  291 ----
 .../filemanager/connectors/cfm/cf_upload.cfm  |   72 -
 .../filemanager/connectors/cfm/cf_util.cfm    |  131 --
 .../filemanager/connectors/cfm/config.cfm     |  189 ---
 .../filemanager/connectors/cfm/connector.cfm  |   32 -
 .../filemanager/connectors/cfm/image.cfc      | 1324 -----------------
 .../filemanager/connectors/cfm/upload.cfm     |   31 -
 .../filemanager/connectors/lasso/config.lasso |   65 -
 .../connectors/lasso/connector.lasso          |  322 ----
 .../filemanager/connectors/lasso/upload.lasso |  168 ---
 .../filemanager/connectors/perl/basexml.pl    |   63 -
 .../filemanager/connectors/perl/commands.pl   |  187 ---
 .../filemanager/connectors/perl/connector.cgi |  136 --
 .../editor/filemanager/connectors/perl/io.pl  |  141 --
 .../filemanager/connectors/perl/upload.cgi    |  117 --
 .../filemanager/connectors/perl/upload_fck.pl |  686 ---------
 .../filemanager/connectors/perl/util.pl       |   68 -
 .../filemanager/connectors/php/basexml.php    |   10 +-
 .../filemanager/connectors/php/commands.php   |   53 +-
 .../filemanager/connectors/php/config.php     |    2 +-
 .../filemanager/connectors/php/connector.php  |    2 +-
 .../editor/filemanager/connectors/php/io.php  |   10 +-
 .../filemanager/connectors/php/upload.php     |    4 +-
 .../filemanager/connectors/php/util.php       |    2 +-
 .../filemanager/connectors/py/config.py       |  146 --
 .../filemanager/connectors/py/connector.py    |  118 --
 .../filemanager/connectors/py/fckcommands.py  |  198 ---
 .../filemanager/connectors/py/fckconnector.py |   90 --
 .../filemanager/connectors/py/fckoutput.py    |  116 --
 .../filemanager/connectors/py/fckutil.py      |  126 --
 .../filemanager/connectors/py/htaccess.txt    |   23 -
 .../filemanager/connectors/py/upload.py       |   88 --
 .../editor/filemanager/connectors/py/wsgi.py  |   58 -
 .../editor/filemanager/connectors/py/zope.py  |  188 ---
 .../editor/filemanager/connectors/test.html   |    2 +-
 .../filemanager/connectors/uploadtest.html    |    2 +-
 .../js/fckeditor/editor/js/fckadobeair.js     |    2 +-
 .../editor/js/fckeditorcode_gecko.js          |   48 +-
 .../fckeditor/editor/js/fckeditorcode_ie.js   |   50 +-
 .../editor/lang/_translationstatus.txt        |  113 +-
 phpgwapi/js/fckeditor/editor/lang/af.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/ar.js       |   28 +-
 phpgwapi/js/fckeditor/editor/lang/bg.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/bn.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/bs.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/ca.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/cs.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/da.js       |   86 +-
 phpgwapi/js/fckeditor/editor/lang/de.js       |   16 +-
 phpgwapi/js/fckeditor/editor/lang/el.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/en-au.js    |   10 +-
 phpgwapi/js/fckeditor/editor/lang/en-ca.js    |   10 +-
 phpgwapi/js/fckeditor/editor/lang/en-uk.js    |   10 +-
 phpgwapi/js/fckeditor/editor/lang/en.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/eo.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/es.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/et.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/eu.js       |   70 +-
 phpgwapi/js/fckeditor/editor/lang/fa.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/fi.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/fo.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/fr-ca.js    |   10 +-
 phpgwapi/js/fckeditor/editor/lang/fr.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/gl.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/he.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/hi.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/hr.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/hu.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/it.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/ja.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/km.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/ko.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/lt.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/lv.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/mn.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/ms.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/nb.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/nl.js       |   20 +-
 phpgwapi/js/fckeditor/editor/lang/no.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/pl.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/pt-br.js    |   10 +-
 phpgwapi/js/fckeditor/editor/lang/pt.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/ro.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/ru.js       |   26 +-
 phpgwapi/js/fckeditor/editor/lang/sk.js       |   74 +-
 phpgwapi/js/fckeditor/editor/lang/sl.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/sr-latn.js  |   10 +-
 phpgwapi/js/fckeditor/editor/lang/sr.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/sv.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/th.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/tr.js       |   58 +-
 phpgwapi/js/fckeditor/editor/lang/uk.js       |   54 +-
 phpgwapi/js/fckeditor/editor/lang/vi.js       |   10 +-
 phpgwapi/js/fckeditor/editor/lang/zh-cn.js    |   38 +-
 phpgwapi/js/fckeditor/editor/lang/zh.js       |   10 +-
 .../editor/plugins/autogrow/fckplugin.js      |  136 +-
 .../plugins/bbcode/_sample/sample.config.js   |    2 +-
 .../editor/plugins/bbcode/_sample/sample.html |    2 +-
 .../editor/plugins/bbcode/fckplugin.js        |    2 +-
 .../plugins/dragresizetable/fckplugin.js      |    5 +
 .../plugins/placeholder/fck_placeholder.html  |    2 +-
 .../editor/plugins/placeholder/fckplugin.js   |    2 +-
 .../editor/plugins/placeholder/lang/de.js     |    2 +-
 .../editor/plugins/placeholder/lang/en.js     |    2 +-
 .../editor/plugins/placeholder/lang/es.js     |    2 +-
 .../editor/plugins/placeholder/lang/fr.js     |    2 +-
 .../editor/plugins/placeholder/lang/it.js     |    2 +-
 .../editor/plugins/placeholder/lang/pl.js     |    2 +-
 .../plugins/simplecommands/fckplugin.js       |    2 +-
 .../editor/plugins/tablecommands/fckplugin.js |    2 +-
 .../editor/skins/_fckviewstrips.html          |    2 +-
 .../editor/skins/default/fck_dialog.css       |    2 +-
 .../editor/skins/default/fck_dialog_ie6.js    |    2 +-
 .../editor/skins/default/fck_editor.css       |    2 +-
 .../editor/skins/office2003/fck_dialog.css    |    2 +-
 .../editor/skins/office2003/fck_dialog_ie6.js |    2 +-
 .../editor/skins/office2003/fck_editor.css    |    2 +-
 .../editor/skins/silver/fck_dialog.css        |    2 +-
 .../editor/skins/silver/fck_dialog_ie6.js     |    2 +-
 .../editor/skins/silver/fck_editor.css        |    2 +-
 phpgwapi/js/fckeditor/egw_integration.txt     |    7 +
 phpgwapi/js/fckeditor/fckconfig.js            |    6 +-
 phpgwapi/js/fckeditor/fckeditor.afp           |    2 +-
 phpgwapi/js/fckeditor/fckeditor.asp           |    2 +-
 phpgwapi/js/fckeditor/fckeditor.cfc           |    2 +-
 phpgwapi/js/fckeditor/fckeditor.cfm           |    2 +-
 phpgwapi/js/fckeditor/fckeditor.js            |   10 +-
 phpgwapi/js/fckeditor/fckeditor.lasso         |    2 +-
 phpgwapi/js/fckeditor/fckeditor.php           |    2 +-
 phpgwapi/js/fckeditor/fckeditor.pl            |  286 ++--
 phpgwapi/js/fckeditor/fckeditor.py            |    2 +-
 phpgwapi/js/fckeditor/fckeditor_php4.php      |    2 +-
 phpgwapi/js/fckeditor/fckeditor_php5.php      |    2 +-
 phpgwapi/js/fckeditor/fckpackager.xml         |    4 +-
 phpgwapi/js/fckeditor/fckstyles.xml           |    2 +-
 phpgwapi/js/fckeditor/fcktemplates.xml        |    2 +-
 phpgwapi/js/fckeditor/fckutils.cfm            |    2 +-
 phpgwapi/js/fckeditor/license.txt             |    2 +-
 387 files changed, 2303 insertions(+), 15501 deletions(-)
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/fckplugin.js
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/find.gif
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/find.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/en.js
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/fr.js
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/it.js
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/replace.gif
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/findreplace/replace.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/_plugins/samples/fckplugin.js
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/application.xml
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/icons/128.png
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/icons/16.png
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/icons/32.png
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/icons/48.png
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/package.bat
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/run.bat
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/sample01.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/adobeair/sample01_cert.pfx
 delete mode 100644 phpgwapi/js/fckeditor/_samples/afp/fck.afpa
 delete mode 100644 phpgwapi/js/fckeditor/_samples/afp/fck.afpa.code
 delete mode 100644 phpgwapi/js/fckeditor/_samples/afp/sample01.afp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/afp/sample02.afp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/afp/sample03.afp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/afp/sample04.afp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/afp/sampleposteddata.afp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/asp/sample01.asp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/asp/sample02.asp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/asp/sample03.asp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/asp/sample04.asp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/asp/sampleposteddata.asp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample01.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample01_mx.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample02.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample02_mx.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample03.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample03_mx.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample04.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sample04_mx.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/cfm/sampleposteddata.cfm
 delete mode 100644 phpgwapi/js/fckeditor/_samples/default.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample01.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample02.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample03.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample04.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample05.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample06.config.js
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample06.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample07.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample08.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample09.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample10.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample11.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample11_frame.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample12.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample13.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample14.config.js
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample14.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sample14.styles.css
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sampleposteddata.asp
 delete mode 100644 phpgwapi/js/fckeditor/_samples/html/sampleposteddata.html
 delete mode 100644 phpgwapi/js/fckeditor/_samples/lasso/sample01.lasso
 delete mode 100644 phpgwapi/js/fckeditor/_samples/lasso/sample02.lasso
 delete mode 100644 phpgwapi/js/fckeditor/_samples/lasso/sample03.lasso
 delete mode 100644 phpgwapi/js/fckeditor/_samples/lasso/sample04.lasso
 delete mode 100644 phpgwapi/js/fckeditor/_samples/lasso/sampleposteddata.lasso
 delete mode 100644 phpgwapi/js/fckeditor/_samples/perl/sample01.cgi
 delete mode 100644 phpgwapi/js/fckeditor/_samples/perl/sample02.cgi
 delete mode 100644 phpgwapi/js/fckeditor/_samples/perl/sample03.cgi
 delete mode 100644 phpgwapi/js/fckeditor/_samples/perl/sample04.cgi
 delete mode 100644 phpgwapi/js/fckeditor/_samples/perl/sampleposteddata.cgi
 delete mode 100644 phpgwapi/js/fckeditor/_samples/php/sample01.php
 delete mode 100644 phpgwapi/js/fckeditor/_samples/php/sample02.php
 delete mode 100644 phpgwapi/js/fckeditor/_samples/php/sample03.php
 delete mode 100644 phpgwapi/js/fckeditor/_samples/php/sample04.php
 delete mode 100644 phpgwapi/js/fckeditor/_samples/php/sampleposteddata.php
 delete mode 100644 phpgwapi/js/fckeditor/_samples/py/sample01.py
 delete mode 100644 phpgwapi/js/fckeditor/_samples/py/sampleposteddata.py
 delete mode 100644 phpgwapi/js/fckeditor/_samples/sample.css
 delete mode 100644 phpgwapi/js/fckeditor/_samples/sampleslist.html
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/basexml.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/class_upload.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/commands.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/config.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/connector.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/io.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/upload.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/util.asp
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/config.ascx
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/connector.aspx
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/upload.aspx
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/config.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/connector.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/image.cfc
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/upload.cfm
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/config.lasso
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/connector.lasso
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/upload.lasso
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/basexml.pl
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/commands.pl
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/connector.cgi
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/io.pl
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload.cgi
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/util.pl
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/config.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/connector.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckcommands.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckconnector.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckoutput.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckutil.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/htaccess.txt
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/upload.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/wsgi.py
 delete mode 100644 phpgwapi/js/fckeditor/editor/filemanager/connectors/py/zope.py

diff --git a/phpgwapi/js/fckeditor/_documentation.html b/phpgwapi/js/fckeditor/_documentation.html
index 2bfcc251f4..9052d13b5d 100644
--- a/phpgwapi/js/fckeditor/_documentation.html
+++ b/phpgwapi/js/fckeditor/_documentation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/fckplugin.js b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/fckplugin.js
deleted file mode 100644
index fefd76dff2..0000000000
--- a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/fckplugin.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the sample plugin definition file.
- */
-
-// Register the related commands.
-FCKCommands.RegisterCommand( 'My_Find'		, new FCKDialogCommand( FCKLang['DlgMyFindTitle']	, FCKLang['DlgMyFindTitle']		, FCKConfig.PluginsPath + 'findreplace/find.html'	, 340, 170 ) ) ;
-FCKCommands.RegisterCommand( 'My_Replace'	, new FCKDialogCommand( FCKLang['DlgMyReplaceTitle'], FCKLang['DlgMyReplaceTitle']	, FCKConfig.PluginsPath + 'findreplace/replace.html', 340, 200 ) ) ;
-
-// Create the "Find" toolbar button.
-var oFindItem		= new FCKToolbarButton( 'My_Find', FCKLang['DlgMyFindTitle'] ) ;
-oFindItem.IconPath	= FCKConfig.PluginsPath + 'findreplace/find.gif' ;
-
-FCKToolbarItems.RegisterItem( 'My_Find', oFindItem ) ;			// 'My_Find' is the name used in the Toolbar config.
-
-// Create the "Replace" toolbar button.
-var oReplaceItem		= new FCKToolbarButton( 'My_Replace', FCKLang['DlgMyReplaceTitle'] ) ;
-oReplaceItem.IconPath	= FCKConfig.PluginsPath + 'findreplace/replace.gif' ;
-
-FCKToolbarItems.RegisterItem( 'My_Replace', oReplaceItem ) ;	// 'My_Replace' is the name used in the Toolbar config.
diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/find.gif b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/find.gif
deleted file mode 100644
index 81915f4f636678b1d7d0d8e05dc7df0eb443787f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 595
zcmbu6TThY!0EQpp8=oA64+Oyg<sj#SB7|DDJf%WfYSX|&N|xWZW}B_nx^Xc9%Vo>#
zqRrg0F1oI*f6!H%TlpjMH`G;Of1zj3^?UKWqq&iu-jamG37|rdP#aJQw5?&E#@vS~
zgU(MwD;gVuiS$QOA4t8Y^N>{CcO>7E*r#Kk<Qrmp#P^8q65A#6oM_!`qR)stC0rv^
zC0r#~CRFzcfenHi1RmpmMEgU05AfZ`w~qH7o;BL;;$FdB!o7@Z3D+Xd1)TG^=5fy9
zEYdQIV+zM4_6Zyl*vGNwY0hCA#Wsv}2<re%{a7wy>BHQE)Qyxy%3$ik*oiTTF+pP-
zLj*$@LkN8kofmB@S~sEt(T>K7&`4|>=M3g7h9G)BdLKFuq7AhcLC>Fm)Z_g>-rs@>
z6ym2-r=K8xDl40nYOPwllCO-7-`-MY<%Y_Xy!`T-W~DOOuh}XL^@(#zVI+0)dMzg>
zdoC-3av=8k;GF-gFPaFqHaj!7Hg62bHp!wm?6T1kSz1+QdgVrg>8Rzq*?UQ+l+Mf6
zrp1uZA-inu?t)Srj(LJz!^+i>bbDLYa%f&(6?e|m_76(OUysY_{LWb9%g>`1{)HbD
XJhgmz@Xp~cW%}gRx7Q)HiVJ@M=o4@Q

diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/find.html b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/find.html
deleted file mode 100644
index 546867ab0e..0000000000
--- a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/find.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the sample "Find" plugin window.
--->
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta content="noindex, nofollow" name="robots">
-		<script type="text/javascript">
-
-var oEditor = window.parent.InnerDialogLoaded() ;
-
-function OnLoad()
-{
-	// Whole word is available on IE only.
-	if ( oEditor.FCKBrowserInfo.IsIE )
-		document.getElementById('divWord').style.display = '' ;
-
-	// First of all, translate the dialog box texts.
-	oEditor.FCKLanguageManager.TranslatePage( document ) ;
-
-	window.parent.SetAutoSize( true ) ;
-}
-
-function btnStat(frm)
-{
-	document.getElementById('btnFind').disabled =
-		( document.getElementById('txtFind').value.length == 0 ) ;
-}
-
-function ReplaceTextNodes( parentNode, regex, replaceValue, replaceAll )
-{
-	for ( var i = 0 ; i < parentNode.childNodes.length ; i++ )
-	{
-		var oNode = parentNode.childNodes[i] ;
-		if ( oNode.nodeType == 3 )
-		{
-			var sReplaced = oNode.nodeValue.replace( regex, replaceValue ) ;
-			if ( oNode.nodeValue != sReplaced )
-			{
-				oNode.nodeValue = sReplaced ;
-				if ( ! replaceAll )
-					return true ;
-			}
-		}
-		else
-		{
-			if ( ReplaceTextNodes( oNode, regex, replaceValue ) )
-				return true ;
-		}
-	}
-	return false ;
-}
-
-function GetRegexExpr()
-{
-	if ( document.getElementById('chkWord').checked )
-		var sExpr = '\\b' + document.getElementById('txtFind').value + '\\b' ;
-	else
-		var sExpr = document.getElementById('txtFind').value ;
-
-	return sExpr ;
-}
-
-function GetCase()
-{
-	return ( document.getElementById('chkCase').checked ? '' : 'i' ) ;
-}
-
-function Ok()
-{
-	if ( document.getElementById('txtFind').value.length == 0 )
-		return ;
-
-	if ( oEditor.FCKBrowserInfo.IsIE )
-		FindIE() ;
-	else
-		FindGecko() ;
-}
-
-var oRange = null ;
-
-function FindIE()
-{
-	if ( oRange == null )
-		oRange = oEditor.FCK.EditorDocument.body.createTextRange() ;
-
-	var iFlags = 0 ;
-
-	if ( chkCase.checked )
-		iFlags = iFlags | 4 ;
-
-	if ( chkWord.checked )
-		iFlags = iFlags | 2 ;
-
-	var bFound = oRange.findText( document.getElementById('txtFind').value, 1, iFlags ) ;
-
-	if ( bFound )
-	{
-		oRange.scrollIntoView() ;
-		oRange.select() ;
-		oRange.collapse(false) ;
-		oLastRangeFound = oRange ;
-	}
-	else
-	{
-		oRange = null ;
-		alert( oEditor.FCKLang.DlgFindNotFoundMsg ) ;
-	}
-}
-
-function FindGecko()
-{
-	var bCase = document.getElementById('chkCase').checked ;
-	var bWord = document.getElementById('chkWord').checked ;
-
-	// window.find( searchString, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog ) ;
-	oEditor.FCK.EditorWindow.find( document.getElementById('txtFind').value, bCase, false, false, bWord, false, false ) ;
-
-}
-		</script>
-	</head>
-	<body onload="OnLoad()" scroll="no" style="OVERFLOW: hidden">
-		<div align="center">
-			This is my Plugin!
-		</div>
-		<table cellSpacing="3" cellPadding="2" width="100%" border="0">
-			<tr>
-				<td nowrap>
-					<label for="txtFind" fckLang="DlgMyReplaceFindLbl">Find what:</label>&nbsp;
-				</td>
-				<td width="100%">
-					<input id="txtFind" onkeyup="btnStat(this.form)" style="WIDTH: 100%" tabIndex="1" type="text">
-				</td>
-				<td>
-					<input id="btnFind" style="WIDTH: 100%; PADDING-RIGHT: 5px; PADDING-LEFT: 5px" disabled
-						onclick="Ok();" type="button" value="Find" fckLang="DlgMyFindFindBtn">
-				</td>
-			</tr>
-			<tr>
-				<td valign="bottom" colSpan="3">
-					&nbsp;<input id="chkCase" tabIndex="3" type="checkbox"><label for="chkCase" fckLang="DlgMyReplaceCaseChk">Match
-						case</label>
-					<br>
-					<div id="divWord" style="DISPLAY: none">
-						&nbsp;<input id="chkWord" tabIndex="4" type="checkbox"><label for="chkWord" fckLang="DlgMyReplaceWordChk">Match
-							whole word</label>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/en.js b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/en.js
deleted file mode 100644
index 8242cc94f8..0000000000
--- a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/en.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * English language file for the sample plugin.
- */
-
-FCKLang['DlgMyReplaceTitle']		= 'Plugin - Replace' ;
-FCKLang['DlgMyReplaceFindLbl']		= 'Find what:' ;
-FCKLang['DlgMyReplaceReplaceLbl']	= 'Replace with:' ;
-FCKLang['DlgMyReplaceCaseChk']		= 'Match case' ;
-FCKLang['DlgMyReplaceReplaceBtn']	= 'Replace' ;
-FCKLang['DlgMyReplaceReplAllBtn']	= 'Replace All' ;
-FCKLang['DlgMyReplaceWordChk']		= 'Match whole word' ;
-
-FCKLang['DlgMyFindTitle']			= 'Plugin - Find' ;
-FCKLang['DlgMyFindFindBtn']			= 'Find' ;
diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/fr.js b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/fr.js
deleted file mode 100644
index 9cc5bc8282..0000000000
--- a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/fr.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * French language file for the sample plugin.
- */
-
-FCKLang['DlgMyReplaceTitle']		= 'Plugin - Remplacer' ;
-FCKLang['DlgMyReplaceFindLbl']		= 'Chercher:' ;
-FCKLang['DlgMyReplaceReplaceLbl']	= 'Remplacer par:' ;
-FCKLang['DlgMyReplaceCaseChk']		= 'Respecter la casse' ;
-FCKLang['DlgMyReplaceReplaceBtn']	= 'Remplacer' ;
-FCKLang['DlgMyReplaceReplAllBtn']	= 'Remplacer Tout' ;
-FCKLang['DlgMyReplaceWordChk']		= 'Mot entier' ;
-
-FCKLang['DlgMyFindTitle']			= 'Plugin - Chercher' ;
-FCKLang['DlgMyFindFindBtn']			= 'Chercher' ;
diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/it.js b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/it.js
deleted file mode 100644
index 5cc080b66d..0000000000
--- a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/lang/it.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Italian language file for the sample plugin.
- */
-
-FCKLang['DlgMyReplaceTitle']		= 'Plugin - Sostituisci' ;
-FCKLang['DlgMyReplaceFindLbl']		= 'Trova:' ;
-FCKLang['DlgMyReplaceReplaceLbl']	= 'Sostituisci con:' ;
-FCKLang['DlgMyReplaceCaseChk']		= 'Maiuscole/minuscole' ;
-FCKLang['DlgMyReplaceReplaceBtn']	= 'Sostituisci' ;
-FCKLang['DlgMyReplaceReplAllBtn']	= 'Sostituisci tutto' ;
-FCKLang['DlgMyReplaceWordChk']		= 'Parola intera' ;
-
-FCKLang['DlgMyFindTitle']			= 'Plugin - Cerca' ;
-FCKLang['DlgMyFindFindBtn']			= 'Cerca' ;
diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/replace.gif b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/replace.gif
deleted file mode 100644
index ac0d8937007716a878b350a1a75ddf1f4beaca83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmZ?wbhEHb6krfwxXQpF=F7lm$Y5WtDP<@aINek)OitBR!nsDrFj_&@OjyNPLbHuQ
zwU$Apj6u1SL8*j6sgOY_pFu8_K{ka!Hi1DVmO&<lK`N3#I-Ef=j6uSmLBfwg+?PSb
zi9y(rLD-H#(27C8l!4!ffme$`&Qe%6SVl~fPu)Y(u|iA3ONv{B-G8ES<YFt$ItIA}
z2FU;hAxj2+0|pLB25Cb<+gx=adG7!J|1;nQia%Kx85qnMbU;c#eqvxtc9`v}qQhk?
z(Dre|O3Citu8T>pZE|^UFQ2hui_-Gf#$jh9#KZjrmGkTwbK9%)cy6XGo$|rZol`W|
w$d$>7%}K~#fzgRWN84ZAOv+48U)hY=NiA1c#7WDEHP^sZ#e}6K+>yZ=0Go<JhyVZp

diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/replace.html b/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/replace.html
deleted file mode 100644
index ab028ae57a..0000000000
--- a/phpgwapi/js/fckeditor/_samples/_plugins/findreplace/replace.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the sample "Replace" plugin window.
--->
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta content="noindex, nofollow" name="robots">
-		<script type="text/javascript">
-
-var oEditor = window.parent.InnerDialogLoaded() ;
-
-function OnLoad()
-{
-	// First of all, translate the dialog box texts
-	oEditor.FCKLanguageManager.TranslatePage( document ) ;
-
-	window.parent.SetAutoSize( true ) ;
-}
-
-function btnStat(frm)
-{
-	document.getElementById('btnReplace').disabled =
-		document.getElementById('btnReplaceAll').disabled =
-			( document.getElementById('txtFind').value.length == 0 ) ;
-}
-
-function ReplaceTextNodes( parentNode, regex, replaceValue, replaceAll, hasFound )
-{
-	for ( var i = 0 ; i < parentNode.childNodes.length ; i++ )
-	{
-		var oNode = parentNode.childNodes[i] ;
-		if ( oNode.nodeType == 3 )
-		{
-			var sReplaced = oNode.nodeValue.replace( regex, replaceValue ) ;
-			if ( oNode.nodeValue != sReplaced )
-			{
-				oNode.nodeValue = sReplaced ;
-				if ( ! replaceAll )
-					return true ;
-				hasFound = true ;
-			}
-		}
-
-		hasFound = ReplaceTextNodes( oNode, regex, replaceValue, replaceAll, hasFound ) ;
-		if ( ! replaceAll && hasFound )
-			return true ;
-	}
-
-	return hasFound ;
-}
-
-function GetRegexExpr()
-{
-	if ( document.getElementById('chkWord').checked )
-		var sExpr = '\\b' + document.getElementById('txtFind').value + '\\b' ;
-	else
-		var sExpr = document.getElementById('txtFind').value ;
-
-	return sExpr ;
-}
-
-function GetCase()
-{
-	return ( document.getElementById('chkCase').checked ? '' : 'i' ) ;
-}
-
-function Replace()
-{
-	var oRegex = new RegExp( GetRegexExpr(), GetCase() ) ;
-	ReplaceTextNodes( oEditor.FCK.EditorDocument.body, oRegex, document.getElementById('txtReplace').value, false ) ;
-}
-
-function ReplaceAll()
-{
-	var oRegex = new RegExp( GetRegexExpr(), GetCase() + 'g' ) ;
-	ReplaceTextNodes( oEditor.FCK.EditorDocument.body, oRegex, document.getElementById('txtReplace').value, true ) ;
-	window.parent.Cancel() ;
-}
-		</script>
-	</head>
-	<body onload="OnLoad()" scroll="no" style="OVERFLOW: hidden">
-		<div align="center">
-			This is my Plugin!
-		</div>
-		<table cellSpacing="3" cellPadding="2" width="100%" border="0">
-			<tr>
-				<td noWrap><label for="txtFind" fckLang="DlgMyReplaceFindLbl">Find what:</label>
-				</td>
-				<td width="100%"><input id="txtFind" onkeyup="btnStat(this.form)" style="WIDTH: 100%" tabIndex="1" type="text">
-				</td>
-				<td><input id="btnReplace" style="WIDTH: 100%" disabled onclick="Replace();" type="button"
-						value="Replace" fckLang="DlgMyReplaceReplaceBtn">
-				</td>
-			</tr>
-			<tr>
-				<td vAlign="top" nowrap><label for="txtReplace" fckLang="DlgMyReplaceReplaceLbl">Replace
-						with:</label>
-				</td>
-				<td vAlign="top"><input id="txtReplace" style="WIDTH: 100%" tabIndex="2" type="text">
-				</td>
-				<td><input id="btnReplaceAll" disabled onclick="ReplaceAll()" type="button" value="Replace All"
-						fckLang="DlgMyReplaceReplAllBtn">
-				</td>
-			</tr>
-			<tr>
-				<td vAlign="bottom" colSpan="3">&nbsp;<input id="chkCase" tabIndex="3" type="checkbox"><label for="chkCase" fckLang="DlgMyReplaceCaseChk">Match
-						case</label>
-					<br>
-					&nbsp;<input id="chkWord" tabIndex="4" type="checkbox"><label for="chkWord" fckLang="DlgMyReplaceWordChk">Match
-						whole word</label>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/_plugins/samples/fckplugin.js b/phpgwapi/js/fckeditor/_samples/_plugins/samples/fckplugin.js
deleted file mode 100644
index fbf48e1197..0000000000
--- a/phpgwapi/js/fckeditor/_samples/_plugins/samples/fckplugin.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is a sample plugin definition file.
- */
-
-// Here we define our custom Style combo, with custom widths.
-var oMyBigStyleCombo = new FCKToolbarStyleCombo() ;
-oMyBigStyleCombo.FieldWidth = 250 ;
-oMyBigStyleCombo.PanelWidth = 300 ;
-FCKToolbarItems.RegisterItem( 'My_BigStyle', oMyBigStyleCombo ) ;
-
-
-// ##### Defining a custom context menu entry.
-
-// ## 1. Define the command to be executed when selecting the context menu item.
-var oMyCMCommand = new Object() ;
-oMyCMCommand.Name = 'OpenImage' ;
-
-// This is the standard function used to execute the command (called when clicking in the context menu item).
-oMyCMCommand.Execute = function()
-{
-	// This command is called only when an image element is selected (IMG).
-	// Get image URL (src).
-	var sUrl = FCKSelection.GetSelectedElement().src ;
-
-	// Open the URL in a new window.
-	window.top.open( sUrl ) ;
-}
-
-// This is the standard function used to retrieve the command state (it could be disabled for some reason).
-oMyCMCommand.GetState = function()
-{
-	// Let's make it always enabled.
-	return FCK_TRISTATE_OFF ;
-}
-
-// ## 2. Register our custom command.
-FCKCommands.RegisterCommand( 'OpenImage', oMyCMCommand ) ;
-
-// ## 3. Define the context menu "listener".
-var oMyContextMenuListener = new Object() ;
-
-// This is the standard function called right before sowing the context menu.
-oMyContextMenuListener.AddItems = function( contextMenu, tag, tagName )
-{
-	// Let's show our custom option only for images.
-	if ( tagName == 'IMG' )
-	{
-		contextMenu.AddSeparator() ;
-		contextMenu.AddItem( 'OpenImage', 'Open image in a new window (Custom)' ) ;
-	}
-}
-
-// ## 4. Register our context menu listener.
-FCK.ContextMenu.RegisterListener( oMyContextMenuListener ) ;
diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/application.xml b/phpgwapi/js/fckeditor/_samples/adobeair/application.xml
deleted file mode 100644
index aec30231a4..0000000000
--- a/phpgwapi/js/fckeditor/_samples/adobeair/application.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<application xmlns="http://ns.adobe.com/air/application/1.0">
-	<id>net.fckeditor.air.samples.sample01</id>
-	<name>FCKeditor Sample Application 1.0</name>
-	<version>1.0</version>
-	<filename>FCKeditor AIR Sample</filename>
-	<description>This is a sample AIR application including FCKeditor.</description>
-	<copyright>Copyright (C) 2003-2008 Frederico Caldeira Knabben</copyright>
-	<initialWindow>
-		<content>_samples/adobeair/sample01.html</content>
-		<title>FCKeditor AIR Sample</title>
-		<systemChrome>standard</systemChrome>
-		<transparent>false</transparent>
-		<visible>true</visible>
-		<minimizable>true</minimizable>
-		<maximizable>true</maximizable>
-		<resizable>true</resizable>
-		<x>100</x>
-		<y>80</y>
-		<width>820</width>
-		<height>600</height>
-		<minSize>600 400</minSize>
-	</initialWindow>
-	<installFolder>FCKeditor/AIR Samples/Sample01</installFolder>
-	<programMenuFolder>FCKeditor/AIR Samples</programMenuFolder>
-	<icon>
-		<image16x16>_samples/adobeair/icons/16.png</image16x16>
-		<image32x32>_samples/adobeair/icons/32.png</image32x32>
-		<image48x48>_samples/adobeair/icons/48.png</image48x48>
-		<image128x128>_samples/adobeair/icons/128.png</image128x128>
-	</icon>
-	<customUpdateUI>false</customUpdateUI>
-	<allowBrowserInvocation>false</allowBrowserInvocation>
-</application>
diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/icons/128.png b/phpgwapi/js/fckeditor/_samples/adobeair/icons/128.png
deleted file mode 100644
index 88cb983ab56ce22f5aa52ef2e354b53ddc796472..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1242
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&v7|ftIx;Y<KVi<=^%BUJEOCt}
z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dbc6W|l#`m4w1&*qLln>zlze)uzA
z{#TRj?-iB5=V$$_)cg1K!=Ix||LmFeYiji0^IQHty7cenk-s+%|4bA74+e|gmstbN
z5h)4s3x<fGkPQC*&jo>QWASux45_%4Bp{c-AmG4rsE3*JM=K*!hhs#60^?!>2L|39
z%nVE!2V{Y=%<q7nYqDyX+W4-4^%0ou;L!1|ff2-(Dqv?|xzJ$EpwPf}hmnEN<N+T8
z#{$N3223N+mAb59X7O0};zma?Q1Qicj50?ofu>|UXK+kgBm=b9q=Z2{5NMi$lvTrA
z4WKmwys`(JrU2d5(Z(n6MEMxdIu~#D0^!F%cPv`UT+vYoGUyUx(-8}hL9ZAXmB8kd
zG6)NT%$WuB0|&?)Us;6{o;N_+quD<Qm4S3!W6Ws*d3H-FgLWcFO|ERidapJskU?)4
z^qN5WxnvLMHpmO`F#@f-z$jvpwvcGQq6bTd6Z;0^hm1@Rmqtn#2|_(FqZ90j3yf=A
zmV)eA$b6%t2;{&Ej7%=j@DY2oNf8`kHn0%Odj#_6mSP6uLa;|I8=6lnk^nmW8H1S;
z$Xh1G4EhtHQa5f10A-#suqA;#T*P3$5hN33+0Y*W@_Da}gMsiNu&yEo>x&>cF4>0c
zTk#DUK<Nt&=3b1*DFZ!P(Y=b4hzKbKhRTPaH=x+O!000aPg5>mtdycae#e@^KtUM@
z)x-nV)KSKu-3tm37wd+`H4g(0LA_8uku4C!TqJwI@9isrS3rxDZZY~?IoBQl@^>m<
z!ooc=VEKl%Rw)T$i@-@_3-b)az2{X`Ty}y|-jCG15}z68I9(|KMvCBjhATBE96x%c
ztN_VXurFBRWag)+1#)XgIYW?E%2Q#XMbkiXElcm}gq*0J0kU66=73x4p7xg@`wudn
zfe8nNUEdr$@4Epg<d;}9%xs>un_&S^{Q}1O@jxMPHpCNxj<OCJnQFWY+DE|IaCRK7
jSdw6?`fcyfz{ue9%jtd!*PCO&@`AzB)z4*}Q$iB}z6_3d

diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/icons/16.png b/phpgwapi/js/fckeditor/_samples/adobeair/icons/16.png
deleted file mode 100644
index 5465b763fda488a1719ad41b7640456eff779745..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|>?NMQuIx9M#CRnb51bE)1qvPY
zba4!+n3McxrrH4qu7t#dgoN2Y=XqS+e~C46!q5NlcYkl*BjPK#Ih=FyD%CDt4qkh^
z|NFP``yRH}<eeiW&@g#^V36#ofBz&S*><zJxe8zVV;Zq^L-vpVUrx=p)D$qA94az-
zny{jJZOza3U!qp9ZI3x*X0V~qki*m1z`&r0)8Nz#folg=Bz2zV_qmaKfcJulfz!+X
z^_`avoH)pvTKl`fn|YP|k0X*1HzZs{XFA{R07)F4WHUSPdhf)k%+uN2f+m|Yge=jT
UVSA9v80aAePgg&ebxsLQ02KslfB*mh

diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/icons/32.png b/phpgwapi/js/fckeditor/_samples/adobeair/icons/32.png
deleted file mode 100644
index e0cf25ed42b4372b31a5f630a5037c0222d0450e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00007bV*G`2iO7@
z4Hy8o$Yjd^00HJnL_t(|oYj^)OC&)Qh0nd+g9E;wh>TA*a7S5{#XtjtQ9%Pu#LUD%
zK@b+h#mHcP#wKQqU~Fh0Y@~sK3TvPusDXhp=#1KR4Z0m4)!j2amcn*$XsW2kch5ag
zl%21_M}9T{`^P%UYK(6!=l`7Fb2b1pedVe~r4%z8R004n03rgw%*NF#k%$nW-@-ZF
z!@;Hi1cWHJeMd*XPVjs{5CM+1oweosweB9Z7ysxxs9cFe1b}<yOBDcsa%Y284*$x1
z)^~?I9(XRfvmu&E<9H{?0|NvAoc+xpf-nzs0;_X~T6#HmwI`*T<{%Hkx+q7$M6S}e
zaeHLJx9g$pP>cuOh^ZXt1nTU7b~i*oglDxZBvZ^*<Q(V(vbFlKwTjmtwe;9s!$BSx
z=pss{L=e<P26Dj3REP)fC6MwuYVFn67Mp`a7wX$B0D!BU=%#p?Z+8`ygTWa+2k=|_
zc{zyYfj1IRaRXiS-x0X~FA45$OcEeo`G!Dc(nbkNE8h^{^2DeI6%Am^yE{N%26${K
zDnVG1xwhFUuj8u=lvc+ke)7;PS$5$B1ti&ybKj)8I*U#JlIjFSeAyL1z)VvsR;+}G
zqbA@Lfx5lsSX@Mi$Vcz9@Ey;m$fN<#M?c>m0igkx;--Ol5dZ)H07*qoM6N<$f)xVz
A00000

diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/icons/48.png b/phpgwapi/js/fckeditor/_samples/adobeair/icons/48.png
deleted file mode 100644
index 262ebccc51936f01d1237cf663fbafb6e861f3ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 563
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>V2l#}z{+^%ptH<Zx>xX~OZ~6P^
z(w{xk{vKQQGhhDS*AKr}RQ{S8{byy>uO{1nH;??R)cf7z`)6~<pG_TqZyf%aCiwsV
zf7?R6ECvR~Do+>3kcwML3Bn4TADCDKnD-laIxr|SG)PIXbh7mvVq#!qxuT%rWFjCU
z#=xO4$&`Ub;G`4-Q%4Ff17piFM-Jl{i9nEGBJZIUAaM@fGa3+j4wSZm(uZVDfFvY%
z&wyx->1=LGL{wVVFe)?@WC|P+Eo5MH*~HespcKjM!0_<W0R<LzAF$3RGuSv3luQa1
zWPltHtnI)cc<n&fDxf}&>;%WF3<3@;rW+Qsg2b;JXjldkKgKLP3uKh#GDe6?5hhOr
zS?F;Ms4GJ%f+GuP<d;oT7a-Z&;0>|A14J*(exUqBrGdfe`T-8Z`K;-!Oacxsq*xpy
z8$|tiSwQR=Ev-9ed<cyMhDP9VLxacb9|QgP#7huri39H%Cl_Y6L`I-%b`}D4^W6EP
f!f4jOz|6oQxN^fx^>?<w2xahe^>bP0l+XkKTHU&p

diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/package.bat b/phpgwapi/js/fckeditor/_samples/adobeair/package.bat
deleted file mode 100644
index d0a6b29e96..0000000000
--- a/phpgwapi/js/fckeditor/_samples/adobeair/package.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-@ECHO OFF
-
-::
-:: FCKeditor - The text editor for Internet - http://www.fckeditor.net
-:: Copyright (C) 2003-2008 Frederico Caldeira Knabben
-::
-:: == BEGIN LICENSE ==
-::
-:: Licensed under the terms of any of the following licenses at your
-:: choice:
-::
-::  - GNU General Public License Version 2 or later (the "GPL")
-::    http://www.gnu.org/licenses/gpl.html
-::
-::  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-::    http://www.gnu.org/licenses/lgpl.html
-::
-::  - Mozilla Public License Version 1.1 or later (the "MPL")
-::    http://www.mozilla.org/MPL/MPL-1.1.html
-::
-:: == END LICENSE ==
-::
-
-:: adt -package SIGNING_OPTIONS air_file app_xml [file_or_dir | -C dir file_or_dir | -e file dir ...] ...
-
-"C:\Adobe AIR SDK\bin\adt" -package -storetype pkcs12 -keystore sample01_cert.pfx -storepass 123abc FCKeditor.air application.xml -C ../../ .
diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/run.bat b/phpgwapi/js/fckeditor/_samples/adobeair/run.bat
deleted file mode 100644
index 9a8bac879c..0000000000
--- a/phpgwapi/js/fckeditor/_samples/adobeair/run.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-@ECHO OFF
-
-::
-:: FCKeditor - The text editor for Internet - http://www.fckeditor.net
-:: Copyright (C) 2003-2008 Frederico Caldeira Knabben
-::
-:: == BEGIN LICENSE ==
-::
-:: Licensed under the terms of any of the following licenses at your
-:: choice:
-::
-::  - GNU General Public License Version 2 or later (the "GPL")
-::    http://www.gnu.org/licenses/gpl.html
-::
-::  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-::    http://www.gnu.org/licenses/lgpl.html
-::
-::  - Mozilla Public License Version 1.1 or later (the "MPL")
-::    http://www.mozilla.org/MPL/MPL-1.1.html
-::
-:: == END LICENSE ==
-::
-
-:: adl [-runtime runtime-directory] [-pubId publisher-id] [-nodebug] application.xml [rootdirectory] [-- arguments]
-
-"C:\Adobe AIR SDK\bin\adl" application.xml ../../
diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/sample01.html b/phpgwapi/js/fckeditor/_samples/adobeair/sample01.html
deleted file mode 100644
index 0f702b190b..0000000000
--- a/phpgwapi/js/fckeditor/_samples/adobeair/sample01.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample Adobe AIR application.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Adobe AIR Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<style type="text/css">
-		body { margin: 10px ; }
-	</style>
-</head>
-<body>
-	<h1>
-		FCKeditor - Adobe AIR Sample
-	</h1>
-	<div>
-		This sample loads FCKeditor with full features enabled.
-	</div>
-	<hr />
-	<script type="text/javascript">
-
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height	= 400 ;
-oFCKeditor.Value	= '<p>FCKeditor is in the <strong>AIR</strong>!<\/p>' ;
-oFCKeditor.Create() ;
-
-	</script>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/adobeair/sample01_cert.pfx b/phpgwapi/js/fckeditor/_samples/adobeair/sample01_cert.pfx
deleted file mode 100644
index ba81d1ecd1d5a8b1e7e31238d174cecd9e578946..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2514
zcmY+Ec{CJ?7sqGUkg;c<Od(^*SQ;ct$k=L_5n_l$3@Q6AM#-oM*~&hQ^(jk<$XK5x
zvS%5ZEK`JtvP8Y!Iltd~=lyZdJ?Hbi_x^W37z%s<1O#I!@OT(pKF%a=n;Xah%%{LZ
zAryGvZ|sYqK%M>*LGcg@)ciNb{Vqco*Z;N-a{@v66v!Ti0{M=SgK_>J|2{4T5ky<|
z4WoQ!tz6}*M6~+Y4afsdJO~5<Kq!#zOWtd?T>5&!?)_=OK|ea^K0kIaz<i#ln)z>>
zuTel|jN9{gx26c?NyvGz$ku{ks>p}PsEOjK2`3trBJFU{KKIalmMh&(7?hYfZ)1L<
zw=w|i1vyn7)Sh~y)Aar6157fD6@N>*@h34T>DnjB(f;>MF>*LqyFb>=C+Bfp>1SPx
zvkFtzalL<0(WR(@xv{=qR&-R{<uZ&+G-qg@=eWe_NNiU0`je|?{Gs144?0ji%K*Qi
zdo9^-BJAe;AazlJMqAm`KoS@+=++?(s6lgTh(m9vAt!qC8uUJU8pj<nvukxkX3)fL
z`&DDzW2EyScvhMpP9tWKEW!eZ0<0GPWXHDE<Yp6M&yC&D2%QB<LkP6DferkAem0tk
zwTm!Pjf`o}+izxYZHG;v#XTJ1<=0rtBG0J75ss5Mp|iKRm%t?c@Y9BtWJ{29#Jbtd
zd#|}GuAqtVTl7`DMr-OtwkU_vm|vdshmV8aU9P}SA<{dco)T5@+ES_r@IAilRXx%r
zuF47ghaK|WBQWcDZ5{pkgqv>lpo?-j8B=!Pwgf-h@$_JsituD*RK~f00@s=zo1X>}
ze7&vXzoa8%1P%n)`sJl)sm(E-Sp^dhYO1H@X<hRQMtr3Ik&vu`X9z@;=ll&OR=LHw
z``99nlD0#zNus{9VnnAN@0>z)-#9U9`QE~Ab%Rri5Z|Vnk0!WNp2tFhwDZ((8H9XX
z>j>J(Tl+aRZ(C-gy^$H(^OcE-l-d1y5-2m($Z`*WwCv6RU-ElCe0qkUE{qzGQw7#e
zmk*L92=AwmuXyC=c^HRS@sU*`T?~if%qs>Ny63Co&WaWls%tZ!x`cN3F8@@NxiMJ%
zIIfkV?yu1f-McPy>)Ap`SzR=JgD9-p_@_mrA5B?fh>*}3!8x~pfK1MY#KxC*A=tb7
zldAPg5xF_~h6c0SYkcxF{{?pmy6ph4<B@9Q7g+rmPg*h^>0rfT4z~c`BwBn{S)udG
z<X$Y0L<~+bg7&=hZXV%ca$Zi6726FnJc2k-YBUsWyEiFeq3ACwjN}Glt7ywH2-T7F
z*z?@&3FU7>2&szRDRXoHhd-eCa$PQR?y$d+$bs+N#EV+iYs#UwBr`m^FSD$Xj4M~E
z*e}xdd!`pK&U%2acD?X^BEz-WZI6XhdDHOIz~5CQCFJ{;jzsdS`OaHXANv&jIYhBl
z_Q$ULiV(1vu`*lRWp1cx`Dsk;vj>d0@pj4$)?H~%P#w{a7JN4k+1fu9yY~L1vuC1j
z1EeV2w})`Yz#WOY?N}&m^0~#qw{UEgbBk6wl~o-Z_!hSTOttT<5a>60WYV;&JSwL~
zHzYG%JaU%eD*2J65btBkm+kxlC}>Nr{4`<8pu5^yv$-z|lpU2~WZyT{LCyJ&%K?z8
z#82koPQ*)Td%WxhdpaSSj;hISg<dY<XQ*3|<j+3<mt*o0=13_nM$b8#*lJcN1;x~q
zbBf^4bFIN1_zQZ*`Eto|Qq+#)9G4b?dt4C41m5Uh^7~%!9$vYXtMp9k+DEht2bE|<
zS*Nko?Da;k<PjNM|2>Jby@4HR+e0%N9!G7|i)FVQY3CDmYs9Z3wTQgkcdWmtU@?6E
zm=Z3i0zrZRDj3wiNJvEx!f)+)-AzhG6{CjLJf)(cf>p=-HYV3ULmaSt3V0tw0q=l-
zfZuK7-vsy{t-}7+>e7Uk99F+tRaSoHq43MY4V=9fum7#pXbSk{<h}@9>jiPKMsVE^
zzX>>lO3<%?#&>b0n)81v?2ywpn7*`pr*qRH!$@4v!1#9YVC2Rhpu?hQ(-wDMt<Ies
z^F(kcian<A_%;r^JM_iYq;p>4;EdV$zRiHrNDaFUN31Ie%*FbYFuUc(7Z#LNSC*Y)
zJc3-aa|1q+-#~&kM`c!=to98>WLc+Z)<+7$W0vnud3juIRjn;G0NNuXU9TKORD{=u
z&MTDVB`6nevYur;uy?~`uhB<BUX{PgHp@$0{B#rrMi4qwBgGZ6v&b7@wqV2UXYZ7-
z70s)r%|!>^J9k-Vk-+*K?>ZK5bpKb&f=f?~uzV$gPx$!d6e2IKFHKSAS{RkvM@MLH
zDgiMT+Pw2srdj4rAI{jbZEQ8s?FoqcClZ5I7Z9OuxKHEV_)bV<c-M!CRW0`hQ$M1z
zboZe1hi!Pz;bTGd=cu)n4jacw<vF^&y<UL~X~}T^_aANUNSc4h+J5CdtjF0Hm6W3G
z(UY3yqdf^5rRorLmA`0we;4h-0rqfQ7}H6^sxGzOc!47J(KA_(pL99o`K~)-9LQ^3
zX)haJP-pgv3u>hPU=Z!SpOafDwXT-cel%tmT}VGk5Qr>C?FlC8Yostujr8GajgLNI
z1GQ%AZ-zxdd&TVtn?E!$L`iaNE_kj~`ng9-$<~(~&2KW%XS5Vz+ZyoZX%?xTJJx!K
zMC~LBpQa>TDZOBAJOtXjU?*UFaMg3A9N{NW=wn|ta3b{RHRX+B{@OZn@()bO1-PMe
z`r>`tq3M`K&4FROWMG2pxc_wI!{nseu%IBSJNH7I&hu5WY>DfkjAK0ITMxsoR!+ZQ
zX<hA~DzbcpAJS_+>zT?p7b-8{m511YntENkOA%4G?QYEm+_~KsHz6_ECA}`?*iXQ}
zZF;TC?teDZE&jA^Wm(d2AbUMJMQiW=Xl1nWXM3tpcj-o(yf-^+RV=S{^a?9!wjUpU
z2w1rKcH8VKAjzcmI<Q^}`#r<la*RH>Rqk)haePvjk$gPUVC@I-G%Wse0CAfTh6xsI
zfOr;EN@?bgc1&sqaCEHYkFZKlWgF-lH%9|4!UP!Mq7F+!wk3EH8<~Q4G^@E^7=v9W
zlkxyc8-o3`_IvNZ0B(;@mL_Q!ntApbwSo`+WG`!L+C%FnJb`!C)NyNYJw10!)J}J-
z^I+ZU$+wN!;V#QR>P;fk6YEEte#zWNXuCJ1D{3f_^K^VAzms3hZBFE(*)FsI&(5zk
zbMY7*3<?8>K@|{SkQfvI5u6bM1Bz#n+=Yc=^=!@|D_aH=1Q8r)IkWtrW_eoL>H$gA
O9ty}A%SihB_5T9(vyLqQ

diff --git a/phpgwapi/js/fckeditor/_samples/afp/fck.afpa b/phpgwapi/js/fckeditor/_samples/afp/fck.afpa
deleted file mode 100644
index 99d03062f9..0000000000
--- a/phpgwapi/js/fckeditor/_samples/afp/fck.afpa
+++ /dev/null
@@ -1 +0,0 @@
-<application ID="fck"/>
diff --git a/phpgwapi/js/fckeditor/_samples/afp/fck.afpa.code b/phpgwapi/js/fckeditor/_samples/afp/fck.afpa.code
deleted file mode 100644
index f1015416b8..0000000000
--- a/phpgwapi/js/fckeditor/_samples/afp/fck.afpa.code
+++ /dev/null
@@ -1,165 +0,0 @@
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the class definition file for the sample pages.
- *
-
- DEFINE CLASS fckeditor AS custom
-	cInstanceName =""
-	BasePath =""
-	cWIDTH =""
-	cHEIGHT =""
-	ToolbarSet =""
-	cValue=""
-	DIMENSION aConfig(10,2)
-
-&& -----------------------------------------------------------------------
-	FUNCTION fckeditor( tcInstanceName )
-		LOCAL lnLoop,lnLoop2
-		THIS.cInstanceName	= tcInstanceName
-		THIS.BasePath	= '../../../FCKeditor/'
-		THIS.cWIDTH		= '100%'
-		THIS.cHEIGHT	= '200'
-		THIS.ToolbarSet	= 'Default'
-		THIS.cValue		= ''
-		FOR lnLoop=1 TO 10
-			FOR lnLoop2=1 TO 2
-				THIS.aConfig(lnLoop,lnLoop2)	= ""
-			NEXT
-		NEXT
-		RETURN
-	ENDFUNC
-
-
-&& -----------------------------------------------------------------------
-	FUNCTION CREATE()
-		RETURN(THIS.CreateHtml())
-	ENDFUNC
-
-&& -----------------------------------------------------------------------
-	FUNCTION CreateHtml()
-		LOCAL html
-		LOCAL lcLink
-
-		HtmlValue = THIS.cValue		&& HTMLSPECIALCHARS()
-
-		html = [<div>]
-		IF THIS.IsCompatible()
-			lcLink = THIS.BasePath+[editor/fckeditor.html?InstanceName=]+THIS.cInstanceName
-
-			IF ( !THIS.ToolbarSet == '' )
-				lcLink = lcLink + [&Toolbar=]+THIS.ToolbarSet
-			ENDIF
-
-&& Render the LINKED HIDDEN FIELD.
-			html = html + [<input type="hidden" id="]+THIS.cInstanceName +[" name="]+THIS.cInstanceName +[" value="]+HtmlValue+[">]
-
-&& Render the configurations HIDDEN FIELD.
-			html = html + [<input type="hidden" id="]+THIS.cInstanceName +[___Config" value="]+THIS.GetConfigFieldString() + [">] +CHR(13)+CHR(10)
-
-&& Render the EDITOR IFRAME.
-			html = html + [<iframe id="]+THIS.cInstanceName +[___Frame" src="]+lcLink+[" width="]+THIS.cWIDTH+[" height="]+THIS.cHEIGHT+[" frameborder="no" scrolling="no"></iframe>]
-		ELSE
-			IF ( AT("%", THIS.cWIDTH)=0 )
-				WidthCSS = THIS.cWIDTH + 'px'
-			ELSE
-				WidthCSS = THIS.cWIDTH
-			ENDIF
-
-			IF ( AT("%",THIS.cHEIGHT)=0  )
-				HeightCSS = THIS.cHEIGHT + 'px'
-			ELSE
-				HeightCSS = THIS.cHEIGHT
-			ENDIF
-
-			html = html + [<textarea name="]+THIS.cInstanceName +[" rows="4" cols="40" style="width: ]+WidthCSS+[ height: ]+HeightCSS+[" wrap="virtual">]+HtmlValue+[</textarea>]
-		ENDIF
-
-		html = html + [</div>]
-
-		RETURN (html)
-	ENDFUNC
-
-
-&& -----------------------------------------------------------------------
-	FUNCTION IsCompatible()
-		LOCAL llRetval
-		LOCAL sAgent
-
-		llRetval=.F.
-
-		sAgent= LOWER(Request.ServerVariables("HTTP_USER_AGENT"))
-
-		IF AT("msie",sAgent) >0 .AND. AT("mac",sAgent)=0 .AND. AT("opera",sAgent)=0
-			iVersion=VAL(SUBSTR(sAgent,AT("msie",sAgent)+5,3))
-			llRetval= iVersion > 5.5
-		ELSE
-			IF AT("gecko",sAgent)>0
-				iVersion=VAL(SUBSTR(sAgent,AT("gecko/",sAgent)+6,8))
-				llRetval =iVersion > 20030210
-			ENDIF
-		ENDIF
-		RETURN (llRetval)
-	ENDFUNC
-
-&& -----------------------------------------------------------------------
-	FUNCTION GetConfigFieldString()
-		LOCAL sParams
-		LOCAL bFirst
-		LOCAL sKey
-		sParams = ""
-		bFirst = .T.
-		FOR lnLoop=1 TO 10 && ALEN(this.aconfig)
-			IF !EMPTY(THIS.aConfig(lnLoop,1))
-				IF bFirst = .F.
-					sParams = sParams + "&"
-				ELSE
-					bFirst = .F.
-				ENDIF
-				sParams = sParams +THIS.aConfig(lnLoop,1)+[=]+THIS.aConfig(lnLoop,2)
-			ELSE
-				EXIT
-			ENDIF
-		NEXT
-		RETURN(sParams)
-	ENDFUNC
-&& -----------------------------------------------------------------------
-&& This function removes unwanted characters in URL parameters mostly entered by hackers
-
-	FUNCTION StripAttacks
-		LPARAMETERS tcString
-		IF !EMPTY(tcString)
-			tcString=STRTRAN(tcString,"&","")
-			tcString=STRTRAN(tcString,"?","")
-			tcString=STRTRAN(tcString,";","")
-			tcString=STRTRAN(tcString,"!","")
-			tcString=STRTRAN(tcString,"<%","")
-			tcString=STRTRAN(tcString,"%>","")
-			tcString=STRTRAN(tcString,"<","")
-			tcString=STRTRAN(tcString,">","")
-			tcString=STRTRAN(tcString,"..","")
-			tcString=STRTRAN(tcString,"/","")
-			tcString=STRTRAN(tcString,"\","")
-			tcString=STRTRAN(tcString,":","")
-		ELSE
-			tcString=""
-		ENDIF
-		RETURN (tcString)
-
-ENDDEFINE
diff --git a/phpgwapi/js/fckeditor/_samples/afp/sample01.afp b/phpgwapi/js/fckeditor/_samples/afp/sample01.afp
deleted file mode 100644
index 2450e0db49..0000000000
--- a/phpgwapi/js/fckeditor/_samples/afp/sample01.afp
+++ /dev/null
@@ -1,56 +0,0 @@
-<%
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form.
- *
-%>
-
-<html>
-	<head>
-		<title>FCKeditor - AFP Sample 1</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-		<h1>FCKeditor - AFP - Sample 1</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features enabled.
-		<hr>
-		<form action="sampleposteddata.afp" method="post" target="_blank">
-<%
-
-			sBasePath="../../../fckeditor/"		&& Change this to your local path
-
-			lcText=[<p>This is some <strong>sample text</strong>. You are using ]
-			lcText=lcText+[<a href='http://www.fckeditor.net/'>FCKeditor</a>.]
-
-			oFCKeditor = CREATEOBJECT("FCKeditor")
-			oFCKeditor.fckeditor("FCKeditor1")
-			oFCKeditor.BasePath	= sBasePath
-			oFCKeditor.cValue	= lcText
-
-			? oFCKeditor.Create()
-
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/afp/sample02.afp b/phpgwapi/js/fckeditor/_samples/afp/sample02.afp
deleted file mode 100644
index e1baf72efe..0000000000
--- a/phpgwapi/js/fckeditor/_samples/afp/sample02.afp
+++ /dev/null
@@ -1,113 +0,0 @@
-<%
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de)
- *
-%>
-
-<html>
-	<head>
-		<title>FCKeditor - AFP Sample 2</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-
-		<script type="text/javascript">
-		function FCKeditor_OnComplete( editorInstance )
-		{
-				var oCombo = document.getElementById( 'cmbLanguages' ) ;
-			for ( code in editorInstance.Language.AvailableLanguages )
-			{
-				AddComboOption( oCombo, editorInstance.Language.AvailableLanguages[code] + ' (' + code + ')', code ) ;
-			}
-			oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-		}
-
-		function AddComboOption(combo, optionText, optionValue)
-		{
-			var oOption = document.createElement("OPTION") ;
-
-			combo.options.add(oOption) ;
-
-			oOption.innerHTML = optionText ;
-			oOption.value     = optionValue ;
-
-			return oOption ;
-		}
-
-		function ChangeLanguage( languageCode )
-		{
-			window.location.href = window.location.pathname + "?Lang=" + languageCode ;
-		}
-		</script>
-		</head>
-	<body>
-		<h1>FCKeditor - AFP - Sample 2</h1>
-		This sample shows the editor in all its available languages.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select a language:&nbsp;
-				</td>
-				<td>
-					<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.afp" method="post" target="_blank">
-<%
-
-			sBasePath="../../../fckeditor/"						&& Change this to your local path
-
-			oFCKeditor = CREATEOBJECT("FCKeditor")
-			oFCKeditor.fckeditor("FCKeditor1")
-
-			lcLanguage=""										&& Initialize Variable
-			lcLanguage=request.querystring("Lang")				&& Request Parameter
-			lcLanguage=oFCKeditor.StripAttacks(lcLanguage)		&& Remove special escape characters
-			IF EMPTY(lcLanguage)
-				oFCKeditor.aconfig[1,1]="AutoDetectLanguage"
-				oFCKeditor.aconfig[1,2]="true"
-				oFCKeditor.aconfig[2,1]="DefaultLanguage"
-				oFCKeditor.aconfig[2,2]="en"
-			ELSE
-				oFCKeditor.aconfig[1,1]="AutoDetectLanguage"
-				oFCKeditor.aconfig[1,2]="false"
-				oFCKeditor.aconfig[2,1]="DefaultLanguage"
-				oFCKeditor.aconfig[2,2]=lcLanguage
-			ENDIF
-
-			lcText=[<p>This is some <strong>sample text</strong>. You are using ]
-			lcText=lcText+[<a href='http://www.fckeditor.net/'>FCKeditor</a>.]
-
-			oFCKeditor.BasePath	= sBasePath
-			oFCKeditor.cValue	= lcText
-
-			? oFCKeditor.Create()
-
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/afp/sample03.afp b/phpgwapi/js/fckeditor/_samples/afp/sample03.afp
deleted file mode 100644
index a219e74a03..0000000000
--- a/phpgwapi/js/fckeditor/_samples/afp/sample03.afp
+++ /dev/null
@@ -1,91 +0,0 @@
-<%
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de)
- *
-%>
-
-<html>
-	<head>
-		<title>FCKeditor - AFP Sample 3</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-
-		<script type="text/javascript">
-			function FCKeditor_OnComplete( editorInstance )
-			{
-				var oCombo = document.getElementById( 'cmbToolbars' ) ;
-				oCombo.value = editorInstance.ToolbarSet.Name ;
-				oCombo.style.visibility = '' ;
-			}
-
-			function ChangeToolbar( toolbarName )
-			{
-				window.location.href = window.location.pathname + "?Toolbar=" + toolbarName ;
-			}
-		</script>
-		</head>
-	<body>
-		<h1>FCKeditor - AFP - Sample 3</h1>
-		This sample shows how to change the editor toolbar.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the toolbar to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbToolbars" onchange="ChangeToolbar(this.value);" style="VISIBILITY: hidden">
-						<option value="Default" selected>Default</option>
-						<option value="Basic">Basic</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.afp" method="post" target="_blank">
-<%
-
-			sBasePath="../../../fckeditor/"						&& Change this to your local path
-
-			oFCKeditor = CREATEOBJECT("FCKeditor")
-			oFCKeditor.fckeditor("FCKeditor1")
-
-			lcToolbar=request.querystring("Toolbar")			&& Request Parameter
-			lcToolbar=oFCKeditor.StripAttacks(lcToolbar)		&& Remove special escape characters
-			IF !EMPTY(lcToolbar)
-				oFCKeditor.ToolbarSet=lcToolbar
-			ENDIF
-
-			lcText=[<p>This is some <strong>sample text</strong>. You are using ]
-			lcText=lcText+[<a href='http://www.fckeditor.net/'>FCKeditor</a>.]
-
-			oFCKeditor.BasePath	= sBasePath
-			oFCKeditor.cValue	= lcText
-
-			? oFCKeditor.Create()
-
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/afp/sample04.afp b/phpgwapi/js/fckeditor/_samples/afp/sample04.afp
deleted file mode 100644
index a9d62d755a..0000000000
--- a/phpgwapi/js/fckeditor/_samples/afp/sample04.afp
+++ /dev/null
@@ -1,98 +0,0 @@
-<%
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de)
- *
-%>
-
-<html>
-	<head>
-		<title>FCKeditor - AFP Sample 4</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-
-		<script type="text/javascript">
-		function FCKeditor_OnComplete( editorInstance )
-			{
-				var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-				// Get the active skin.
-				var sSkin = editorInstance.Config['SkinPath'] ;
-				sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-
-				oCombo.value = sSkin ;
-				oCombo.style.visibility = '' ;
-			}
-
-			function ChangeSkin( skinName )
-			{
-				window.location.href = window.location.pathname + "?Skin=" + skinName ;
-			}
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - AFP - Sample 4</h1>
-		This sample shows how to change the editor skin.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the skin to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="VISIBILITY: hidden">
-						<option value="default" selected>Default</option>
-						<option value="office2003">Office 2003</option>
-						<option value="silver">Silver</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.afp" method="post" target="_blank">
-<%
-
-			sBasePath="../../../fckeditor/"						&& <-- Change this to your local path
-
-			oFCKeditor = CREATEOBJECT("FCKeditor")
-			oFCKeditor.fckeditor("FCKeditor1")
-
-			lcSkin=request.querystring("Skin")					&& Request Parameter
-			lcSkin=oFCKeditor.StripAttacks(lcSkin)				&& Remove special escape characters
-			IF !EMPTY(lcSkin)
-				oFCKeditor.aconfig[1,1]="SkinPath"
-				oFCKeditor.aconfig[1,2]="/fckeditor/editor/skins/"+lcSkin+"/"	&& <-- Change this to your local path
-			ENDIF
-
-			lcText=[<p>This is some <strong>sample text</strong>. You are using ]
-			lcText=lcText+[<a href='http://www.fckeditor.net/'>FCKeditor</a>.]
-
-			oFCKeditor.BasePath	= sBasePath
-			oFCKeditor.cValue	= lcText
-
-			? oFCKeditor.Create()
-
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/afp/sampleposteddata.afp b/phpgwapi/js/fckeditor/_samples/afp/sampleposteddata.afp
deleted file mode 100644
index d1ab578e1f..0000000000
--- a/phpgwapi/js/fckeditor/_samples/afp/sampleposteddata.afp
+++ /dev/null
@@ -1,63 +0,0 @@
-<%
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form.
- *
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - AFP - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css">
-	</head>
-	<body>
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-		<table border="1" cellspacing="0" id="outputSample">
-			<colgroup><col width="80"><col></colgroup>
-			<thead>
-				<tr>
-					<th>Field Name</th>
-					<th>Value</th>
-				</tr>
-			</thead>
-<%
-		lcForm=REQUEST.Form()
-		lcForm=STRTRAN(lcForm,"&",CHR(13)+CHR(10))
-
-		FOR lnLoop=1 TO MEMLINES(lcForm)
-			lcZeile=ALLTRIM(MLINE(lcForm,lnLoop))
-			IF AT("=",lcZeile)>0
-				lcVariable=UPPER(ALLTRIM(LEFT(lcZeile,AT("=",lcZeile)-1)))
-				lcWert=ALLTRIM(RIGHT(lcZeile,LEN(lcZeile)-AT("=",lcZeile)))
-				lcWert=Server.UrlDecode( lcWert )
-				lcWert=STRTRAN(lcWert,"<","&lt;")
-				lcWert=STRTRAN(lcWert,">","&gt;")	&& ... if wanted remove/translate HTML Chars ...
-
-				? [<tr><th>]+lcVariable+[ =</th><td><pre>]+lcWert+[</pre></td></tr>]
-			ENDIF
-		NEXT
-%>
-		</table>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/asp/sample01.asp b/phpgwapi/js/fckeditor/_samples/asp/sample01.asp
deleted file mode 100644
index 533e91ce2c..0000000000
--- a/phpgwapi/js/fckeditor/_samples/asp/sample01.asp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@  codepage="65001" language="VBScript" %>
-<% Option Explicit %>
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %>
-<!-- #INCLUDE file="../../fckeditor.asp" -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-	<h1>
-		FCKeditor - ASP - Sample 1
-	</h1>
-	<div>
-		This sample displays a normal HTML form with an FCKeditor with full features enabled.
-	</div>
-	<hr />
-	<form action="sampleposteddata.asp" method="post" target="_blank">
-		<%
-' Automatically calculates the editor base path based on the _samples directory.
-' This is usefull only for these samples. A real application should use something like this:
-' oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-Dim sBasePath
-sBasePath = Request.ServerVariables("PATH_INFO")
-sBasePath = Left( sBasePath, InStrRev( sBasePath, "/_samples" ) )
-
-Dim oFCKeditor
-Set oFCKeditor = New FCKeditor
-oFCKeditor.BasePath	= sBasePath
-oFCKeditor.Value	= "<p>This is some <strong>sample text</strong>. You are using <a href=""http://www.fckeditor.net/"">FCKeditor</a>."
-oFCKeditor.Create "FCKeditor1"
-		%>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/asp/sample02.asp b/phpgwapi/js/fckeditor/_samples/asp/sample02.asp
deleted file mode 100644
index 5907c9786b..0000000000
--- a/phpgwapi/js/fckeditor/_samples/asp/sample02.asp
+++ /dev/null
@@ -1,108 +0,0 @@
-<%@ CodePage=65001 Language="VBScript"%>
-<% Option Explicit %>
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %>
-<!-- #INCLUDE file="../../fckeditor.asp" -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbLanguages' ) ;
-	for ( code in editorInstance.Language.AvailableLanguages )
-	{
-		AddComboOption( oCombo, editorInstance.Language.AvailableLanguages[code] + ' (' + code + ')', code ) ;
-	}
-	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-}
-
-function AddComboOption(combo, optionText, optionValue)
-{
-	var oOption = document.createElement("OPTION") ;
-
-	combo.options.add(oOption) ;
-
-	oOption.innerHTML = optionText ;
-	oOption.value     = optionValue ;
-
-	return oOption ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	window.location.href = window.location.pathname + "?Lang=" + languageCode ;
-}
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ASP - Sample 2</h1>
-		This sample shows the editor in all its available languages.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select a language:&nbsp;
-				</td>
-				<td>
-					<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.asp" method="post" target="_blank">
-<%
-' Automatically calculates the editor base path based on the _samples directory.
-' This is usefull only for these samples. A real application should use something like this:
-' oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-Dim sBasePath
-sBasePath = Request.ServerVariables("PATH_INFO")
-sBasePath = Left( sBasePath, InStrRev( sBasePath, "/_samples" ) )
-
-Dim oFCKeditor
-Set oFCKeditor = New FCKeditor
-oFCKeditor.BasePath = sBasePath
-
-If Request.QueryString("Lang") = "" Then
-	oFCKeditor.Config("AutoDetectLanguage") = True
-	oFCKeditor.Config("DefaultLanguage")    = "en"
-Else
-	oFCKeditor.Config("AutoDetectLanguage") = False
-	oFCKeditor.Config("DefaultLanguage")    = Request.QueryString("Lang")
-End If
-
-oFCKeditor.Value = "<p>This is some <strong>sample text</strong>. You are using <a href=""http://www.fckeditor.net/"">FCKeditor</a>."
-oFCKeditor.Create "FCKeditor1"
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/asp/sample03.asp b/phpgwapi/js/fckeditor/_samples/asp/sample03.asp
deleted file mode 100644
index 8e65080b8e..0000000000
--- a/phpgwapi/js/fckeditor/_samples/asp/sample03.asp
+++ /dev/null
@@ -1,92 +0,0 @@
-<%@ CodePage=65001 Language="VBScript"%>
-<% Option Explicit %>
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %>
-<!-- #INCLUDE file="../../fckeditor.asp" -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbToolbars' ) ;
-	oCombo.value = editorInstance.ToolbarSet.Name ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeToolbar( toolbarName )
-{
-	window.location.href = window.location.pathname + "?Toolbar=" + toolbarName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ASP - Sample 3</h1>
-		This sample shows how to change the editor toolbar.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the toolbar to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbToolbars" onchange="ChangeToolbar(this.value);" style="VISIBILITY: hidden">
-						<option value="Default" selected>Default</option>
-						<option value="Basic">Basic</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.asp" method="post" target="_blank">
-<%
-' Automatically calculates the editor base path based on the _samples directory.
-' This is usefull only for these samples. A real application should use something like this:
-' oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-Dim sBasePath
-sBasePath = Request.ServerVariables("PATH_INFO")
-sBasePath = Left( sBasePath, InStrRev( sBasePath, "/_samples" ) )
-
-Dim oFCKeditor
-Set oFCKeditor = New FCKeditor
-oFCKeditor.BasePath = sBasePath
-
-If Request.QueryString("Toolbar") <> "" Then
-	oFCKeditor.ToolbarSet = Server.HTMLEncode( Request.QueryString("Toolbar") )
-End If
-
-oFCKeditor.Value = "<p>This is some <strong>sample text</strong>. You are using <a href=""http://www.fckeditor.net/"">FCKeditor</a>."
-oFCKeditor.Create "FCKeditor1"
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/asp/sample04.asp b/phpgwapi/js/fckeditor/_samples/asp/sample04.asp
deleted file mode 100644
index 8c21068a85..0000000000
--- a/phpgwapi/js/fckeditor/_samples/asp/sample04.asp
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ CodePage=65001 Language="VBScript"%>
-<% Option Explicit %>
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %>
-<!-- #INCLUDE file="../../fckeditor.asp" -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-	// Get the active skin.
-	var sSkin = editorInstance.Config['SkinPath'] ;
-	sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-
-	oCombo.value = sSkin ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeSkin( skinName )
-{
-	window.location.href = window.location.pathname + "?Skin=" + skinName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ASP - Sample 4</h1>
-		This sample shows how to change the editor skin.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the skin to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="VISIBILITY: hidden">
-						<option value="default" selected>Default</option>
-						<option value="office2003">Office 2003</option>
-						<option value="silver">Silver</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.asp" method="post" target="_blank">
-<%
-' Automatically calculates the editor base path based on the _samples directory.
-' This is usefull only for these samples. A real application should use something like this:
-' oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-Dim sBasePath
-sBasePath = Request.ServerVariables("PATH_INFO")
-sBasePath = Left( sBasePath, InStrRev( sBasePath, "/_samples" ) )
-
-Dim oFCKeditor
-Set oFCKeditor = New FCKeditor
-oFCKeditor.BasePath = sBasePath
-
-If Request.QueryString("Skin") <> "" Then
-	oFCKeditor.Config("SkinPath") = sBasePath + "editor/skins/" & Server.HTMLEncode( Request.QueryString("Skin") ) + "/"
-End If
-
-oFCKeditor.Value = "<p>This is some <strong>sample text</strong>. You are using <a href=""http://www.fckeditor.net/"">FCKeditor</a>."
-oFCKeditor.Create "FCKeditor1"
-%>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/asp/sampleposteddata.asp b/phpgwapi/js/fckeditor/_samples/asp/sampleposteddata.asp
deleted file mode 100644
index 44c86c8a11..0000000000
--- a/phpgwapi/js/fckeditor/_samples/asp/sampleposteddata.asp
+++ /dev/null
@@ -1,56 +0,0 @@
-<%@ CodePage=65001 Language="VBScript"%>
-<% Option Explicit %>
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" >
-	</head>
-	<body>
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-		<table border="1" cellspacing="0" id="outputSample">
-			<colgroup><col width="80"><col></colgroup>
-			<thead>
-				<tr>
-					<th>Field Name</th>
-					<th>Value</th>
-				</tr>
-			</thead>
-			<%
-			Dim sForm
-			For Each sForm in Request.Form
-			%>
-			<tr>
-				<th><%=sForm%></th>
-				<td><pre><%=Server.HTMLEncode( Request.Form(sForm) )%></pre></td>
-			</tr>
-			<% Next %>
-		</table>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample01.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample01.cfm
deleted file mode 100644
index ce9113e2f8..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample01.cfm
+++ /dev/null
@@ -1,63 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion.
---->
-
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta name="robots" content="noindex, nofollow">
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-<h1>FCKeditor - ColdFusion - Sample 1</h1>
-
-This sample displays a normal HTML form with a FCKeditor with full features enabled.
-<hr>
-
-<form method="POST" action="sampleposteddata.cfm">
-</cfoutput>
-
-<!--- Calculate basepath for FCKeditor. It's in the folder right above _samples --->
-<cfset basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 )>
-
-<cfmodule
-	template="../../fckeditor.cfm"
-	basePath="#basePath#"
-	instanceName="myEditor"
-	value='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	width="100%"
-	height="200"
->
-
-<cfoutput>
-<br />
-<input type="submit" value="Submit">
-<hr />
-</form>
-</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample01_mx.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample01_mx.cfm
deleted file mode 100644
index 48287412bc..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample01_mx.cfm
+++ /dev/null
@@ -1,67 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion MX 6.0 and above.
---->
-
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta name="robots" content="noindex, nofollow">
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-<h1>FCKeditor - ColdFusion Component (CFC) - Sample 1</h1>
-
-This sample displays a normal HTML form with a FCKeditor with full features enabled.
-<hr>
-
-<form method="POST" action="sampleposteddata.cfm">
-</cfoutput>
-
-<cfif listFirst( server.coldFusion.productVersion ) LT 6>
-	<cfoutput><br><em style="color: red;">This sample works only with a ColdFusion MX server and higher, because it uses some advantages of this version.</em></cfoutput>
-	<cfabort>
-</cfif>
-
-<cfscript>
-	// Calculate basepath for FCKeditor. It's in the folder right above _samples
-	basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 ) ;
-
-	fckEditor = createObject( "component", "#basePath#fckeditor" ) ;
-	fckEditor.instanceName	= "myEditor" ;
-	fckEditor.value			= '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-	fckEditor.basePath		= basePath ;
-	fckEditor.Create() ; // create the editor.
-</cfscript>
-
-<cfoutput>
-<br />
-<input type="submit" value="Submit">
-<hr />
-</form>
-</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample02.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample02.cfm
deleted file mode 100644
index 26c70c19c3..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample02.cfm
+++ /dev/null
@@ -1,110 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion.
---->
-
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta name="robots" content="noindex, nofollow">
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbLanguages' ) ;
-	for ( code in editorInstance.Language.AvailableLanguages )
-	{
-		AddComboOption( oCombo, editorInstance.Language.AvailableLanguages[code] + ' (' + code + ')', code ) ;
-	}
-	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-}
-
-function AddComboOption(combo, optionText, optionValue)
-{
-	var oOption = document.createElement("OPTION") ;
-
-	combo.options.add(oOption) ;
-
-	oOption.innerHTML = optionText ;
-	oOption.value     = optionValue ;
-
-	return oOption ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	window.location.href = window.location.pathname + "?Lang=" + languageCode ;
-}
-		</script>
-</head>
-<body>
-<h1>FCKeditor - ColdFusion - Sample 2</h1>
-This sample shows the editor in all its available languages.
-<hr>
-<table cellpadding="0" cellspacing="0" border="0">
-	<tr>
-		<td>
-			Select a language:&nbsp;
-		</td>
-		<td>
-			<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-			</select>
-		</td>
-	</tr>
-</table>
-<br>
-<form action="sampleposteddata.cfm" method="post" target="_blank">
-</cfoutput>
-
-<cfset config = structNew()>
-<cfif isDefined( "URL.Lang" )>
-	<cfset config["AutoDetectLanguage"]		= false>
-	<cfset config["DefaultLanguage"]		= HTMLEditFormat( URL.Lang )>
-<cfelse>
-	<cfset config["AutoDetectLanguage"]		= true>
-	<cfset config["DefaultLanguage"]		= 'en'>
-</cfif>
-
-<!--- Calculate basepath for FCKeditor. It's in the folder right above _samples --->
-<cfset basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 )>
-
-<cfmodule
-	template="../../fckeditor.cfm"
-	basePath="#basePath#"
-	instanceName="myEditor"
-	value='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	width="100%"
-	height="200"
-	config="#config#"
->
-<cfoutput>
-	<br>
-	<input type="submit" value="Submit">
-	</form>
-</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample02_mx.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample02_mx.cfm
deleted file mode 100644
index 51afccc028..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample02_mx.cfm
+++ /dev/null
@@ -1,114 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion MX 6.0 and above.
---->
-
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta name="robots" content="noindex, nofollow">
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbLanguages' ) ;
-	for ( code in editorInstance.Language.AvailableLanguages )
-	{
-		AddComboOption( oCombo, editorInstance.Language.AvailableLanguages[code] + ' (' + code + ')', code ) ;
-	}
-	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-}
-
-function AddComboOption(combo, optionText, optionValue)
-{
-	var oOption = document.createElement("OPTION") ;
-
-	combo.options.add(oOption) ;
-
-	oOption.innerHTML = optionText ;
-	oOption.value     = optionValue ;
-
-	return oOption ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	window.location.href = window.location.pathname + "?Lang=" + languageCode ;
-}
-		</script>
-</head>
-<body>
-<h1>FCKeditor - ColdFusion Component (CFC) - Sample 2</h1>
-This sample shows the editor in all its available languages.
-<hr>
-</cfoutput>
-<cfif listFirst( server.coldFusion.productVersion ) LT 6>
-	<cfoutput><br><em style="color: red;">This sample works only with a ColdFusion MX server and higher, because it uses some advantages of this version.</em></cfoutput>
-	<cfabort>
-</cfif>
-<cfoutput>
-<table cellpadding="0" cellspacing="0" border="0">
-	<tr>
-		<td>
-			Select a language:&nbsp;
-		</td>
-		<td>
-			<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-			</select>
-		</td>
-	</tr>
-</table>
-<br>
-<form action="sampleposteddata.cfm" method="post" target="_blank">
-</cfoutput>
-	<cfscript>
-		// Calculate basepath for FCKeditor. It's in the folder right above _samples
-		basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 ) ;
-
-		fckEditor = createObject( "component", "#basePath#fckeditor" ) ;
-		fckEditor.instanceName	= "myEditor" ;
-		fckEditor.value			= '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-		fckEditor.basePath		= basePath ;
-		if ( isDefined( "URL.Lang" ) )
-		{
-			fckEditor.config["AutoDetectLanguage"]		= false ;
-			fckEditor.config["DefaultLanguage"]			= HTMLEditFormat( URL.Lang ) ;
-		}
-		else
-		{
-			fckEeditor.config["AutoDetectLanguage"]		= true ;
-			fckEeditor.config["DefaultLanguage"]		= 'en' ;
-		}
-		fckEditor.create() ; // create the editor.
-	</cfscript>
-<cfoutput>
-	<br>
-	<input type="submit" value="Submit">
-	</form>
-</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample03.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample03.cfm
deleted file mode 100644
index 758b48c50d..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample03.cfm
+++ /dev/null
@@ -1,95 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion.
---->
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbToolbars' ) ;
-	oCombo.value = editorInstance.ToolbarSet.Name ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeToolbar( toolbarName )
-{
-	window.location.href = window.location.pathname + "?Toolbar=" + toolbarName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ColdFusion - Sample 3</h1>
-		This sample shows how to change the editor toolbar.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the toolbar to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbToolbars" onchange="ChangeToolbar(this.value);" style="VISIBILITY: hidden">
-						<option value="Default" selected>Default</option>
-						<option value="Basic">Basic</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-<form action="sampleposteddata.cfm" method="post" target="_blank">
-</cfoutput>
-
-<cfif isDefined( "URL.Toolbar" )>
-	<cfset toolbarSet = HTMLEditFormat( URL.Toolbar )>
-<cfelse>
-	<cfset toolbarSet = "Default">
-</cfif>
-
-<!--- Calculate basepath for FCKeditor. It's in the folder right above _samples --->
-<cfset basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 )>
-
-<cfmodule
-	template="../../fckeditor.cfm"
-	basePath="#basePath#"
-	instanceName="myEditor"
-	value='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	width="100%"
-	height="200"
-	toolbarSet="#toolbarSet#"
->
-
-<cfoutput>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample03_mx.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample03_mx.cfm
deleted file mode 100644
index 1ad28afe4f..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample03_mx.cfm
+++ /dev/null
@@ -1,95 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion MX 6.0 and above.
---->
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbToolbars' ) ;
-	oCombo.value = editorInstance.ToolbarSet.Name ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeToolbar( toolbarName )
-{
-	window.location.href = window.location.pathname + "?Toolbar=" + toolbarName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ColdFusion Component (CFC) - Sample 3</h1>
-		This sample shows how to change the editor toolbar.
-		<hr>
-</cfoutput>
-<cfif listFirst( server.coldFusion.productVersion ) LT 6>
-	<cfoutput><br><em style="color: red;">This sample works only with a ColdFusion MX server and higher, because it uses some advantages of this version.</em></cfoutput>
-	<cfabort>
-</cfif>
-<cfoutput>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the toolbar to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbToolbars" onchange="ChangeToolbar(this.value);" style="VISIBILITY: hidden">
-						<option value="Default" selected>Default</option>
-						<option value="Basic">Basic</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-<form action="sampleposteddata.cfm" method="post" target="_blank">
-</cfoutput>
-	<cfscript>
-		// Calculate basepath for FCKeditor. It's in the folder right above _samples
-		basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 ) ;
-
-		fckEditor = createObject( "component", "#basePath#fckeditor" ) ;
-		fckEditor.instanceName	= "myEditor" ;
-		fckEditor.value			= '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-		fckEditor.basePath		= basePath ;
-		if ( isDefined( "URL.Toolbar" ) )
-		{
-			fckEditor.ToolbarSet		= HTMLEditFormat( URL.Toolbar ) ;
-		}
-		fckEditor.create() ; // create the editor.
-	</cfscript>
-<cfoutput>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample04.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample04.cfm
deleted file mode 100644
index fa0f643d68..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample04.cfm
+++ /dev/null
@@ -1,100 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion.
---->
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-	// Get the active skin.
-	var sSkin = editorInstance.Config['SkinPath'] ;
-	sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-
-	oCombo.value = sSkin ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeSkin( skinName )
-{
-	window.location.href = window.location.pathname + "?Skin=" + skinName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ColdFusion - Sample 4</h1>
-		This sample shows how to change the editor skin.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the skin to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="VISIBILITY: hidden">
-						<option value="default" selected>Default</option>
-						<option value="office2003">Office 2003</option>
-						<option value="silver">Silver</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.cfm" method="post" target="_blank">
-</cfoutput>
-
-<!--- Calculate basepath for FCKeditor. It's in the folder right above _samples --->
-<cfset basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 )>
-
-<cfset config = structNew()>
-<cfif isDefined( "URL.Skin" )>
-	<cfset config["SkinPath"] = basePath & 'editor/skins/' & HTMLEditFormat( URL.Skin ) & '/'>
-</cfif>
-
-<cfmodule
-	template="../../fckeditor.cfm"
-	basePath="#basePath#"
-	instanceName="myEditor"
-	value='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	width="100%"
-	height="200"
-	config="#config#"
->
-
-<cfoutput>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sample04_mx.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sample04_mx.cfm
deleted file mode 100644
index ac5eb2c464..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sample04_mx.cfm
+++ /dev/null
@@ -1,101 +0,0 @@
-<cfsetting enablecfoutputonly="true">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page for ColdFusion MX 6.0 and above.
---->
-<cfoutput>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-	// Get the active skin.
-	var sSkin = editorInstance.Config['SkinPath'] ;
-	sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-
-	oCombo.value = sSkin ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeSkin( skinName )
-{
-	window.location.href = window.location.pathname + "?Skin=" + skinName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ColdFusion Component (CFC) - Sample 4</h1>
-		This sample shows how to change the editor skin.
-		<hr>
-</cfoutput>
-<cfif listFirst( server.coldFusion.productVersion ) LT 6>
-	<cfoutput><br><em style="color: red;">This sample works only with a ColdFusion MX server and higher, because it uses some advantages of this version.</em></cfoutput>
-	<cfabort>
-</cfif>
-<cfoutput>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the skin to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="VISIBILITY: hidden">
-						<option value="default" selected>Default</option>
-						<option value="office2003">Office 2003</option>
-						<option value="silver">Silver</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.cfm" method="post" target="_blank">
-</cfoutput>
-	<cfscript>
-		// Calculate basepath for FCKeditor. It's in the folder right above _samples
-		basePath = Left( cgi.script_name, FindNoCase( '_samples', cgi.script_name ) - 1 ) ;
-
-		fckEditor = createObject( "component", "#basePath#fckeditor" ) ;
-		fckEditor.instanceName	= "myEditor" ;
-		fckEditor.value			= '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-		fckEditor.basePath		= basePath ;
-		if ( isDefined( "URL.Skin" ) )
-		{
-			fckEditor.config['SkinPath'] = basePath & 'editor/skins/' & HTMLEditFormat( URL.Skin ) & '/' ;
-		}
-		fckEditor.create() ; // create the editor.
-	</cfscript>
-<cfoutput>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-</cfoutput>
-<cfsetting enablecfoutputonly="false">
diff --git a/phpgwapi/js/fckeditor/_samples/cfm/sampleposteddata.cfm b/phpgwapi/js/fckeditor/_samples/cfm/sampleposteddata.cfm
deleted file mode 100644
index a463a44bbd..0000000000
--- a/phpgwapi/js/fckeditor/_samples/cfm/sampleposteddata.cfm
+++ /dev/null
@@ -1,68 +0,0 @@
-<!---
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form.
- */
---->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-<cfif listFirst( server.coldFusion.productVersion ) LT 6>
-	<cfif isDefined( 'FORM.fieldnames' )>
-		<cfoutput>
-		<hr />
-		<table border="1" cellspacing="0" id="outputSample">
-			<colgroup><col width="80"><col></colgroup>
-			<thead>
-				<tr>
-					<th>Field Name</th>
-					<th>Value</th>
-				</tr>
-			</thead>
-		<tr>
-			<th>FieldNames</th>
-			<td>#FORM.fieldNames#</td>
-		</tr>
-		<cfloop list="#FORM.fieldnames#" index="key">
-		<tr>
-			<th>#key#</th>
-			<td><pre>#HTMLEditFormat( evaluate( "FORM.#key#" ) )#</pre></td>
-		</tr>
-		</cfloop>
-		</table>
-		</cfoutput>
-	</cfif>
-<cfelse>
-	<cfdump var="#FORM#" label="Dump of FORM Variables">
-</cfif>
-
-
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/default.html b/phpgwapi/js/fckeditor/_samples/default.html
deleted file mode 100644
index 23f734fe10..0000000000
--- a/phpgwapi/js/fckeditor/_samples/default.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
-   "http://www.w3.org/TR/html4/frameset.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Samples Frameset page.
--->
-<html>
-	<head>
-		<title>FCKeditor - Samples</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-	</head>
-	<frameset rows="60,*">
-		<frame src="sampleslist.html" noresize scrolling="no">
-		<frame name="Sample" src="html/sample01.html" noresize>
-	</frameset>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample01.html b/phpgwapi/js/fckeditor/_samples/html/sample01.html
deleted file mode 100644
index ab55f7da91..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample01.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 1
-	</h1>
-	<div>
-		This sample displays a normal HTML form with an FCKeditor with full features enabled.
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height	= 300 ;
-oFCKeditor.Value	= '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample02.html b/phpgwapi/js/fckeditor/_samples/html/sample02.html
deleted file mode 100644
index f42b858d21..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample02.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-
-window.onload = function()
-{
-	// Automatically calculates the editor base path based on the _samples directory.
-	// This is usefull only for these samples. A real application should use something like this:
-	// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-	var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-	var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-	oFCKeditor.BasePath	= sBasePath ;
-	oFCKeditor.ReplaceTextarea() ;
-}
-
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 2</h1>
-	<div>
-		This sample displays a normal HTML form with an FCKeditor with full features enabled.
-		It uses the "ReplaceTextarea" command to create the editor.
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<div>
-			<textarea name="FCKeditor1" rows="10" cols="80" style="width: 100%; height: 200px">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;FCKeditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-		</div>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample03.html b/phpgwapi/js/fckeditor/_samples/html/sample03.html
deleted file mode 100644
index 6f7a75c48a..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample03.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-
-var bIsLoaded = false ;
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	if ( bIsLoaded )
-		return ;
-
-	var oCombo = document.getElementById( 'cmbLanguages' ) ;
-
-	// Remove all options. (#1399)
-	oCombo.innerHTML = '' ;
-
-	var aLanguages = new Array() ;
-
-	for ( code in editorInstance.Language.AvailableLanguages )
-		aLanguages.push( { Code : code, Name : editorInstance.Language.AvailableLanguages[code] } ) ;
-
-	aLanguages.sort( SortLanguage ) ;
-
-	for ( var i = 0 ; i < aLanguages.length ; i++ )
-		AddComboOption( oCombo, aLanguages[i].Name + ' (' + aLanguages[i].Code + ')', aLanguages[i].Code ) ;
-
-	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-
-	document.getElementById('eNumLangs').innerHTML = '(' + aLanguages.length + ' languages available!)' ;
-
-	bIsLoaded = true ;
-}
-
-function SortLanguage( langA, langB )
-{
-	return ( langA.Name < langB.Name ? -1 : langA.Name > langB.Name ? 1 : 0 ) ;
-}
-
-function AddComboOption(combo, optionText, optionValue)
-{
-	var oOption = document.createElement("OPTION") ;
-
-	combo.options.add(oOption) ;
-
-	oOption.innerHTML = optionText ;
-	oOption.value     = optionValue ;
-
-	return oOption ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	document.location.href = document.location.href.replace( /\?.*$/, '' ) + "?" + languageCode ;
-}
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 3</h1>
-	<div>
-		This sample shows the editor in all its available languages.
-	</div>
-	<hr />
-	<table cellpadding="0" cellspacing="0" border="0">
-		<tr>
-			<td>
-				Select a language:&nbsp;
-			</td>
-			<td>
-				<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-					<option>&nbsp;</option>
-				</select>
-			</td>
-			<td>
-				&nbsp;<span id="eNumLangs"></span>
-			</td>
-		</tr>
-	</table>
-	<br />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var sLang ;
-if ( document.location.search.length > 1 )
-	sLang = document.location.search.substr(1) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-if ( sLang == null )
-{
-	oFCKeditor.Config["AutoDetectLanguage"] = true ;
-	oFCKeditor.Config["DefaultLanguage"]    = "en" ;
-}
-else
-{
-	oFCKeditor.Config["AutoDetectLanguage"] = false ;
-	oFCKeditor.Config["DefaultLanguage"]    = sLang ;
-}
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample04.html b/phpgwapi/js/fckeditor/_samples/html/sample04.html
deleted file mode 100644
index 43ca07c448..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample04.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbToolbars' ) ;
-	oCombo.value = editorInstance.ToolbarSet.Name ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	document.location.href = document.location.href.replace( /\?.*$/, '' ) + "?" + languageCode ;
-}
-
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 4</h1>
-	<div>
-		This sample shows how to change the editor toolbar.
-	</div>
-	<hr />
-	<table cellpadding="0" cellspacing="0" border="0">
-		<tr>
-			<td>
-				Select the toolbar to load:&nbsp;
-			</td>
-			<td>
-				<select id="cmbToolbars" onchange="ChangeLanguage(this.value);" style="visibility: hidden">
-					<option value="Default" selected="selected">Default</option>
-					<option value="Basic">Basic</option>
-				</select>
-			</td>
-		</tr>
-	</table>
-	<br />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-// Get the toolbar from the URL.
-var sToolbar ;
-if ( document.location.search.length > 1 )
-	sToolbar = document.location.search.substr(1) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-
-if ( sToolbar != null )
-	oFCKeditor.ToolbarSet = sToolbar ;
-
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample05.html b/phpgwapi/js/fckeditor/_samples/html/sample05.html
deleted file mode 100644
index fcb4073f41..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample05.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-	// Get the active skin.
-	var sSkin = editorInstance.Config['SkinPath'] ;
-	sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-
-	oCombo.value = sSkin ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	document.location.href = document.location.href.replace( /\?.*$/, '' ) + "?" + languageCode ;
-}
-
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 5</h1>
-	<div>
-		This sample shows how to change the editor skin.
-	</div>
-	<hr />
-	<table cellpadding="0" cellspacing="0" border="0">
-		<tr>
-			<td>
-				Select the skin to load:&nbsp;
-			</td>
-			<td>
-				<select id="cmbSkins" onchange="ChangeLanguage(this.value);" style="visibility: hidden">
-					<option value="default" selected="selected">Default</option>
-					<option value="office2003">Office 2003</option>
-					<option value="silver">Silver</option>
-				</select>
-			</td>
-		</tr>
-	</table>
-	<br />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-// Get the skin from the URL.
-var sSkin ;
-if ( document.location.search.length > 1 )
-	sSkin = document.location.search.substr(1) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-
-if ( sSkin != null )
-{
-	var sSkinPath = sBasePath + 'editor/skins/' + sSkin + '/' ;
-	oFCKeditor.Config['SkinPath'] = sSkinPath ;
-
-	// The following switch is optional. It is done to enhance the loading
-	// time of the toolbar, by preloading the images used on it.
-	switch ( sSkin )
-	{
-		case 'office2003' :
-			oFCKeditor.Config['PreloadImages'] =
-				sSkinPath + 'images/toolbar.start.gif' + ';' +
-				sSkinPath + 'images/toolbar.end.gif' + ';' +
-				sSkinPath + 'images/toolbar.bg.gif' + ';' +
-				sSkinPath + 'images/toolbar.buttonarrow.gif' ;
-			break ;
-
-		case 'silver' :
-			oFCKeditor.Config['PreloadImages'] =
-				sSkinPath + 'images/toolbar.start.gif' + ';' +
-				sSkinPath + 'images/toolbar.end.gif' + ';' +
-				sSkinPath + 'images/toolbar.buttonbg.gif' + ';' +
-				sSkinPath + 'images/toolbar.buttonarrow.gif' ;
-			break ;
-	}
-}
-
-oFCKeditor.Value	= '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample06.config.js b/phpgwapi/js/fckeditor/_samples/html/sample06.config.js
deleted file mode 100644
index d5433ec6df..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample06.config.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample custom configuration settings used in the plugin sample page (sample06).
- */
-
-// Set our sample toolbar.
-FCKConfig.ToolbarSets['PluginTest'] = [
-	['SourceSimple'],
-	['My_Find','My_Replace','-','Placeholder'],
-	['StyleSimple','FontFormatSimple','FontNameSimple','FontSizeSimple'],
-	['Table','-','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableCellProp'],
-	['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink'],
-	'/',
-	['My_BigStyle','-','Smiley','-','About']
-] ;
-
-// Change the default plugin path.
-FCKConfig.PluginsPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + '_samples/_plugins/' ;
-
-// Add our plugin to the plugins list.
-//		FCKConfig.Plugins.Add( pluginName, availableLanguages )
-//			pluginName: The plugin name. The plugin directory must match this name.
-//			availableLanguages: a list of available language files for the plugin (separated by a comma).
-FCKConfig.Plugins.Add( 'findreplace', 'en,fr,it' ) ;
-FCKConfig.Plugins.Add( 'samples' ) ;
-
-// If you want to use plugins found on other directories, just use the third parameter.
-var sOtherPluginPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + 'editor/plugins/' ;
-FCKConfig.Plugins.Add( 'placeholder', 'de,en,es,fr,it,pl', sOtherPluginPath ) ;
-FCKConfig.Plugins.Add( 'tablecommands', null, sOtherPluginPath ) ;
-FCKConfig.Plugins.Add( 'simplecommands', null, sOtherPluginPath ) ;
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample06.html b/phpgwapi/js/fckeditor/_samples/html/sample06.html
deleted file mode 100644
index d68e0292f6..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample06.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - 6</h1>
-	<div>
-		This sample shows some sample plugins implementations. Things to note:<br />
-		<ul>
-			<li>In the toolbar, you will find sample "Find" and "Replace" plugins that do exactly
-				the same thing that the built in ones do. It just shows how to do that with a custom
-				implementation. Use the green toolbar buttons the test then. </li>
-			<li>There is also another sample plugin that is available in the package: the "Placeholder"
-				command (use the yellow icon). </li>
-			<li>It also shows a custom context menu option when right cliking on images (insert
-				a smiley to test it).</li>
-		</ul>
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-
-// Set the custom configurations file path (in this way the original file is mantained).
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample06.config.js' ;
-
-// Let's use a custom toolbar for this sample.
-oFCKeditor.ToolbarSet	= 'PluginTest' ;
-
-oFCKeditor.Value		= '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample07.html b/phpgwapi/js/fckeditor/_samples/html/sample07.html
deleted file mode 100644
index 8af901ce1a..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample07.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 7</h1>
-	<div>
-		In this sample the user can edit the complete page contents and header (from &lt;HTML&gt;
-		to &lt;/HTML&gt;).
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Config['FullPage'] = true ;
-oFCKeditor.Value = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>Full Page Test<\/title><meta content="text/html; charset=utf-8" http-equiv="Content-Type"><\/head><body><p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.<\/body><\/html>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample08.html b/phpgwapi/js/fckeditor/_samples/html/sample08.html
deleted file mode 100644
index a536a8a298..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample08.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-<!--
-// FCKeditor_OnComplete is a special function that is called when an editor
-// instance is loaded ad available to the API. It must be named exactly in
-// this way.
-function FCKeditor_OnComplete( editorInstance )
-{
-	// Show the editor name and description in the browser status bar.
-	document.getElementById('eMessage').innerHTML = 'Instance "' + editorInstance.Name + '" loaded - ' + editorInstance.Description ;
-
-	// Show this sample buttons.
-	document.getElementById('eButtons').style.visibility = '' ;
-}
-
-function InsertHTML()
-{
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-
-	// Check the active editing mode.
-	if ( oEditor.EditMode == FCK_EDITMODE_WYSIWYG )
-	{
-		// Insert the desired HTML.
-		oEditor.InsertHtml( '- This is some <a href="/Test1.html">sample<\/a> HTML -' ) ;
-	}
-	else
-		alert( 'You must be on WYSIWYG mode!' ) ;
-}
-
-function SetContents()
-{
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-
-	// Set the editor contents (replace the actual one).
-	oEditor.SetData( 'This is the <b>new content<\/b> I want in the editor.' ) ;
-}
-
-function GetContents()
-{
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-
-	// Get the editor contents in XHTML.
-	alert( oEditor.GetXHTML( true ) ) ;		// "true" means you want it formatted.
-}
-
-function ExecuteCommand( commandName )
-{
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-
-	// Execute the command.
-	oEditor.Commands.GetCommand( commandName ).Execute() ;
-}
-
-function GetLength()
-{
-	// This functions shows that you can interact directly with the editor area
-	// DOM. In this way you have the freedom to do anything you want with it.
-
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-
-	// Get the Editor Area DOM (Document object).
-	var oDOM = oEditor.EditorDocument ;
-
-	var iLength ;
-
-	// The are two diffent ways to get the text (without HTML markups).
-	// It is browser specific.
-
-	if ( document.all )		// If Internet Explorer.
-	{
-		iLength = oDOM.body.innerText.length ;
-	}
-	else					// If Gecko.
-	{
-		var r = oDOM.createRange() ;
-		r.selectNodeContents( oDOM.body ) ;
-		iLength = r.toString().length ;
-	}
-
-	alert( 'Actual text length (without HTML markups): ' + iLength + ' characters' ) ;
-}
-
-function GetInnerHTML()
-{
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-
-	alert( oEditor.EditorDocument.body.innerHTML ) ;
-}
-
-function CheckIsDirty()
-{
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-	alert( oEditor.IsDirty() ) ;
-}
-
-function ResetIsDirty()
-{
-	// Get the editor instance that we want to interact with.
-	var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ;
-	oEditor.ResetIsDirty() ;
-	alert( 'The "IsDirty" status has been reset' ) ;
-}
--->
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 8
-	</h1>
-	<div>
-		This sample shows how to use the FCKeditor JavaScript API to interact with the editor
-		at runtime.
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Value	= '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-	<div>
-		&nbsp;
-	</div>
-	<hr />
-	<div id="eMessage">
-		&nbsp;
-	</div>
-	<div>
-		&nbsp;
-	</div>
-	<div id="eButtons" style="visibility: hidden">
-		<input type="button" value="Insert HTML" onclick="InsertHTML();" />
-		<input type="button" value="Set Editor Contents" onclick="SetContents();" />
-		<input type="button" value="Get Editor Contents (XHTML)" onclick="GetContents();" />
-		<br />
-		<br />
-		<input type="button" value='Execute "Bold" Command' onclick="ExecuteCommand('Bold');" />
-		<input type="button" value='Execute "Link" Command' onclick="ExecuteCommand('Link');" />
-		<br />
-		<br />
-		<input type="button" value="Interact with the Editor Area DOM" onclick="GetLength();" />
-		<input type="button" value="Get innerHTML" onclick="GetInnerHTML();" />
-		<br />
-		<br />
-		<input type="button" value="Check IsDirty()" onclick="CheckIsDirty();" />
-		<input type="button" value="Reset IsDirty()" onclick="ResetIsDirty();" />
-	</div>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample09.html b/phpgwapi/js/fckeditor/_samples/html/sample09.html
deleted file mode 100644
index ff07747a62..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample09.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	editorInstance.Events.AttachEvent( 'OnBlur'	, FCKeditor_OnBlur ) ;
-	editorInstance.Events.AttachEvent( 'OnFocus', FCKeditor_OnFocus ) ;
-}
-
-function FCKeditor_OnBlur( editorInstance )
-{
-	editorInstance.ToolbarSet.Collapse() ;
-}
-
-function FCKeditor_OnFocus( editorInstance )
-{
-	editorInstance.ToolbarSet.Expand() ;
-}
-
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 9</h1>
-	<div>
-		This sample shows FCKeditor in a more complex form with two different instances.<br />
-		It also shows and interesting usage of the "OnFocus" and "OnBlur" events available
-		in the JavaScript API.
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		Normal text field:<br />
-		<input name="NormaText" value="Plain Text" />
-		<br />
-		<br />
-		FCKeditor with Basic toolbar:
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor_Basic' ) ;
-
-oFCKeditor.Config['ToolbarStartExpanded'] = false ;
-
-oFCKeditor.BasePath		= sBasePath ;
-oFCKeditor.ToolbarSet	= 'Basic' ;
-oFCKeditor.Value		= '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		FCKeditor with Default toolbar:
-		<script type="text/javascript">
-<!--
-oFCKeditor = new FCKeditor( 'FCKeditor_Default' ) ;
-
-oFCKeditor.Config['ToolbarStartExpanded'] = false ;
-
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Value	= '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample10.html b/phpgwapi/js/fckeditor/_samples/html/sample10.html
deleted file mode 100644
index 0015a52384..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample10.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 10</h1>
-	<div>
-		This sample shows a form with two FCKeditor instance. Both instances share the same
-		toolbar, available in the top.
-	</div>
-	<hr />
-	<div id="xToolbar"></div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		Normal text field:<br />
-		<input name="NormaText" value="Plain Text" />
-		<br />
-		<br />
-		FCKeditor 1:
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor_1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height = 100 ;
-oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:xToolbar' ;
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		FCKeditor 2:
-		<script type="text/javascript">
-<!--
-oFCKeditor = new FCKeditor( 'FCKeditor_2' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height = 100 ;
-oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:xToolbar' ;
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample11.html b/phpgwapi/js/fckeditor/_samples/html/sample11.html
deleted file mode 100644
index ff1030ccc4..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample11.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 11</h1>
-	<div>
-		This sample shows a form with two FCKeditor instance loaded inside an IFRAME. Both instances share the same
-		toolbar, available in the main page (top).
-	</div>
-	<hr />
-	<div id="xToolbar"></div>
-	<hr />
-	<iframe src="assets/sample11_frame.html" width="100%" height="300"></iframe>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample11_frame.html b/phpgwapi/js/fckeditor/_samples/html/sample11_frame.html
deleted file mode 100644
index 4171916290..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample11_frame.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-</head>
-<body>
-	<form action="sampleposteddata.asp" method="post" target="_blank">
-		Normal text field:<br />
-		<input name="NormaText" value="Plain Text" />
-		<br />
-		<br />
-		FCKeditor 1:
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor_1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height = 100 ;
-oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:parent(xToolbar)' ;
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		FCKeditor 2:
-		<script type="text/javascript">
-<!--
-oFCKeditor = new FCKeditor( 'FCKeditor_2' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height = 100 ;
-oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:parent(xToolbar)' ;
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample12.html b/phpgwapi/js/fckeditor/_samples/html/sample12.html
deleted file mode 100644
index dff9b86a48..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample12.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-<!--
-// The following function is used in this samples to reload the page,
-// setting the querystring parameters for the enter mode.
-function ChangeMode()
-{
-	var sEnterMode = document.getElementById('xEnter').value ;
-	var sShiftEnterMode = document.getElementById('xShiftEnter').value ;
-
-	window.location.href = window.location.pathname + '?enter=' + sEnterMode + '&shift=' + sShiftEnterMode ;
-}
--->
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 12</h1>
-	<div>
-		This sample shows the different ways to configure the [Enter] key behavior on FCKeditor.
-	</div>
-	<hr />
-	<table cellpadding="0" cellspacing="0" border="0">
-		<tr>
-			<td>
-				When [Enter] is pressed:&nbsp;
-			</td>
-			<td>
-				<select id="xEnter" onchange="ChangeMode();">
-					<option value="p" selected="selected">Create new &lt;P&gt;</option>
-					<option value="div">Create new &lt;DIV&gt;</option>
-					<option value="br">Break the line with a &lt;BR&gt;</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				When [Shift] + [Enter] is pressed:&nbsp;
-			</td>
-			<td>
-				<select id="xShiftEnter" onchange="ChangeMode();">
-					<option value="p">Create new &lt;P&gt;</option>
-					<option value="div">Create new &lt;DIV&gt;</option>
-					<option value="br" selected="selected">Break the line with a &lt;BR&gt;</option>
-				</select>
-			</td>
-		</tr>
-	</table>
-	<br />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-// The following are the default configurations for the Enter and Shift+Enter modes.
-var sEnterMode = 'p' ;
-var sShiftEnterMode = 'br' ;
-
-// Try to get the new configurations from the querystring, if available.
-if ( document.location.search.length > 1 )
-{
-	var aMatch = document.location.search.match( /enter=(p|div|br)/ ) ;
-	if ( aMatch )
-		sEnterMode = aMatch[1] ;
-
-	aMatch = document.location.search.match( /shift=(p|div|br)/ ) ;
-	if ( aMatch )
-		sShiftEnterMode = aMatch[1] ;
-}
-
-// Create the FCKeditor instance.
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Value	= 'This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.' ;
-
-// Set the configuration options for the Enter Key mode.
-oFCKeditor.Config["EnterMode"]		= sEnterMode ;
-oFCKeditor.Config["ShiftEnterMode"]	= sShiftEnterMode ;
-
-oFCKeditor.Create() ;
-
-// Update the select combos with the current values.
-document.getElementById('xEnter').value = sEnterMode ;
-document.getElementById('xShiftEnter').value = sShiftEnterMode ;
-
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample13.html b/phpgwapi/js/fckeditor/_samples/html/sample13.html
deleted file mode 100644
index 2fc26d4da9..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample13.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-	<script type="text/javascript">
-
-function Toggle()
-{
-	// Try to get the FCKeditor instance, if available.
-	var oEditor ;
-	if ( typeof( FCKeditorAPI ) != 'undefined' )
-		oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ;
-
-	// Get the _Textarea and _FCKeditor DIVs.
-	var eTextareaDiv	= document.getElementById( 'Textarea' ) ;
-	var eFCKeditorDiv	= document.getElementById( 'FCKeditor' ) ;
-
-	// If the _Textarea DIV is visible, switch to FCKeditor.
-	if ( eTextareaDiv.style.display != 'none' )
-	{
-		// If it is the first time, create the editor.
-		if ( !oEditor )
-		{
-			CreateEditor() ;
-		}
-		else
-		{
-			// Set the current text in the textarea to the editor.
-			oEditor.SetData( document.getElementById('DataTextarea').value ) ;
-		}
-
-		// Switch the DIVs display.
-		eTextareaDiv.style.display = 'none' ;
-		eFCKeditorDiv.style.display = '' ;
-
-		// This is a hack for Gecko 1.0.x ... it stops editing when the editor is hidden.
-		if ( oEditor && !document.all )
-		{
-			if ( oEditor.EditMode == FCK_EDITMODE_WYSIWYG )
-				oEditor.MakeEditable() ;
-		}
-	}
-	else
-	{
-		// Set the textarea value to the editor value.
-		document.getElementById('DataTextarea').value = oEditor.GetXHTML() ;
-
-		// Switch the DIVs display.
-		eTextareaDiv.style.display = '' ;
-		eFCKeditorDiv.style.display = 'none' ;
-	}
-}
-
-function CreateEditor()
-{
-	// Copy the value of the current textarea, to the textarea that will be used by the editor.
-	document.getElementById('DataFCKeditor').value = document.getElementById('DataTextarea').value ;
-
-	// Automatically calculates the editor base path based on the _samples directory.
-	// This is usefull only for these samples. A real application should use something like this:
-	// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-	var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-	// Create an instance of FCKeditor (using the target textarea as the name).
-	var oFCKeditor = new FCKeditor( 'DataFCKeditor' ) ;
-	oFCKeditor.BasePath = sBasePath ;
-	oFCKeditor.Width = '100%' ;
-	oFCKeditor.Height = '350' ;
-	oFCKeditor.ReplaceTextarea() ;
-}
-
-// The FCKeditor_OnComplete function is a special function called everytime an
-// editor instance is completely loaded and available for API interactions.
-function FCKeditor_OnComplete( editorInstance )
-{
-	// Enable the switch button. It is disabled at startup, waiting the editor to be loaded.
-	document.getElementById('BtnSwitchTextarea').disabled = false ;
-}
-
-function PrepareSave()
-{
-	// If the textarea isn't visible update the content from the editor.
-	if ( document.getElementById( 'Textarea' ).style.display == 'none' )
-	{
-		var oEditor = FCKeditorAPI.GetInstance( 'DataFCKeditor' ) ;
-		document.getElementById( 'DataTextarea' ).value = oEditor.GetXHTML() ;
-	}
-}
-
-	</script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 13
-	</h1>
-	<div>
-		This sample starts with a normal textarea and provides the ability to switch back
-		and forth between the textarea and FCKeditor. It uses the JavaScript API to do the
-		operations so it will work even if the internal implementation changes.
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank" onsubmit="PrepareSave();">
-		<div id="Textarea">
-			<input type="button" value="Switch to FCKeditor" onclick="Toggle()" />
-			<br />
-			<br />
-			<textarea id="DataTextarea" name="Data" cols="80" rows="20" style="width: 95%">This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;FCKeditor&lt;/a&gt;.</textarea>
-		</div>
-		<div id="FCKeditor" style="display: none">
-			<!-- Note that the following button is disabled at startup.
-				It will be enabled once the editor is completely loaded. -->
-			<input id="BtnSwitchTextarea" type="button" disabled="disabled" value="Switch to Textarea" onclick="Toggle()" />
-			<br />
-			<br />
-			<!-- Note that the following textarea doesn't have a "name", so it will not be posted. -->
-			<textarea id="DataFCKeditor" cols="80" rows="20"></textarea>
-		</div>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample14.config.js b/phpgwapi/js/fckeditor/_samples/html/sample14.config.js
deleted file mode 100644
index b668ffcd43..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample14.config.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Configuration settings used by the XHTML 1.1 sample page (sample14.html).
- */
-
-// Our intention is force all formatting features to use CSS classes or
-// semantic aware elements.
-
-// Load our custom CSS files for this sample.
-// We are using "BasePath" just for this sample convenience. In normal
-// situations it would be just pointed to the file directly,
-// like "/css/myfile.css".
-FCKConfig.EditorAreaCSS = FCKConfig.BasePath + '../_samples/html/sample14.styles.css' ;
-
-/**
- * Core styles.
- */
-FCKConfig.CoreStyles.Bold			= { Element : 'span', Attributes : { 'class' : 'Bold' } } ;
-FCKConfig.CoreStyles.Italic			= { Element : 'span', Attributes : { 'class' : 'Italic' } } ;
-FCKConfig.CoreStyles.Underline		= { Element : 'span', Attributes : { 'class' : 'Underline' } } ;
-FCKConfig.CoreStyles.StrikeThrough	= { Element : 'span', Attributes : { 'class' : 'StrikeThrough' } } ;
-
-/**
- * Font face
- */
-// List of fonts available in the toolbar combo. Each font definition is
-// separated by a semi-colon (;). We are using class names here, so each font
-// is defined by {Class Name}/{Combo Label}.
-FCKConfig.FontNames = 'FontComic/Comic Sans MS;FontCourier/Courier New;FontTimes/Times New Roman' ;
-
-// Define the way font elements will be applied to the document. The "span"
-// element will be used. When a font is selected, the font name defined in the
-// above list is passed to this definition with the name "Font", being it
-// injected in the "class" attribute.
-// We must also instruct the editor to replace span elements that are used to
-// set the font (Overrides).
-FCKConfig.CoreStyles.FontFace =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Font")' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^Font(?:Comic|Courier|Times)$/ } } ]
-	} ;
-
-/**
- * Font sizes.
- */
-FCKConfig.FontSizes		= 'FontSmaller/Smaller;FontLarger/Larger;FontSmall/8pt;FontBig/14pt;FontDouble/Double Size' ;
-FCKConfig.CoreStyles.Size =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Size")' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^Font(?:Smaller|Larger|Small|Big|Double)$/ } } ]
-	} ;
-
-/**
- * Font colors.
- */
-FCKConfig.EnableMoreFontColors = false ;
-FCKConfig.FontColors = 'ff9900/FontColor1,0066cc/FontColor2,ff0000/FontColor3' ;
-FCKConfig.CoreStyles.Color =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Color")' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^FontColor(?:1|2|3)$/ } } ]
-	} ;
-
-FCKConfig.CoreStyles.BackColor =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Color")BG' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^FontColor(?:1|2|3)BG$/ } } ]
-	} ;
-
-/**
- * Indentation.
- */
-FCKConfig.IndentClasses = [ 'Indent1', 'Indent2', 'Indent3' ] ;
-
-/**
- * Paragraph justification.
- */
-FCKConfig.JustifyClasses = [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyFull' ] ;
-
-/**
- * Styles combo.
- */
-FCKConfig.StylesXmlPath = '' ;
-FCKConfig.CustomStyles =
-	{
-		'Strong Emphasis' : { Element : 'strong' },
-		'Emphasis' : { Element : 'em' },
-
-		'Computer Code' : { Element : 'code' },
-		'Keyboard Phrase' : { Element : 'kbd' },
-		'Sample Text' : { Element : 'samp' },
-		'Variable' : { Element : 'var' },
-
-		'Deleted Text' : { Element : 'del' },
-		'Inserted Text' : { Element : 'ins' },
-
-		'Cited Work' : { Element : 'cite' },
-		'Inline Quotation' : { Element : 'q' }
-	} ;
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample14.html b/phpgwapi/js/fckeditor/_samples/html/sample14.html
deleted file mode 100644
index 29bf194234..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample14.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-</head>
-<body>
-	<h1>
-		FCKeditor - JavaScript - Sample 14
-	</h1>
-	<div>
-		This sample shows FCKeditor configured to produce <strong>XHTML 1.1</strong> compliant
-		HTML. Deprecated elements or attributes, like the &lt;font&gt; and &lt;u&gt; elements
-		or the "style" attribute, are avoided.
-	</div>
-	<hr />
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-
-// Instruct the editor to load our configurations from a custom file, leaving the
-// original configuration file untouched.
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample14.config.js' ;
-
-oFCKeditor.Height = 300 ;
-oFCKeditor.Value = '<p>This is some <span class="Bold">sample text<\/span>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sample14.styles.css b/phpgwapi/js/fckeditor/_samples/html/sample14.styles.css
deleted file mode 100644
index cb64d5b431..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sample14.styles.css
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the XHTML 1.1 sample page (sample14.html).
- */
-
-/**
- * Basic definitions for the editing area.
- */
-body
-{
-	background-color: #ffffff;
-	padding: 5px 5px 5px 5px;
-	margin: 0px;
-}
-
-body, td
-{
-	font-family: Arial, Verdana, sans-serif;
-	font-size: 12px;
-}
-
-a[href]
-{
-	color: #0000FF !important; /* For Firefox... mark as important, otherwise it becomes black */
-}
-
-/**
- * Core styles.
- */
-
-.Bold
-{
-	font-weight: bold;
-}
-
-.Italic
-{
-	font-style: italic;
-}
-
-.Underline
-{
-	text-decoration: underline;
-}
-
-.StrikeThrough
-{
-	text-decoration: line-through;
-}
-
-.Subscript
-{
-	vertical-align: sub;
-	font-size: smaller;
-}
-
-.Superscript
-{
-	vertical-align: super;
-	font-size: smaller;
-}
-
-/**
- * Font faces.
- */
-
-.FontComic
-{
-	font-family: 'Comic Sans MS';
-}
-
-.FontCourier
-{
-	font-family: 'Courier New';
-}
-
-.FontTimes
-{
-	font-family: 'Times New Roman';
-}
-
-/**
- * Font sizes.
- */
-
-.FontSmaller
-{
-	font-size: smaller;
-}
-
-.FontLarger
-{
-	font-size: larger;
-}
-
-.FontSmall
-{
-	font-size: 8pt;
-}
-
-.FontBig
-{
-	font-size: 14pt;
-}
-
-.FontDouble
-{
-	font-size: 200%;
-}
-
-/**
- * Font colors.
- */
-.FontColor1
-{
-	color: #ff9900;
-}
-
-.FontColor2
-{
-	color: #0066cc;
-}
-
-.FontColor3
-{
-	color: #ff0000;
-}
-
-.FontColor1BG
-{
-	background-color: #ff9900;
-}
-
-.FontColor2BG
-{
-	background-color: #0066cc;
-}
-
-.FontColor3BG
-{
-	background-color: #ff0000;
-}
-
-/**
- * Indentation.
- */
-
-.Indent1
-{
-	margin-left: 40px;
-}
-
-.Indent2
-{
-	margin-left: 80px;
-}
-
-.Indent3
-{
-	margin-left: 120px;
-}
-
-/**
- * Alignment.
- */
-
-.JustifyLeft
-{
-	text-align: left;
-}
-
-.JustifyRight
-{
-	text-align: right;
-}
-
-.JustifyCenter
-{
-	text-align: center;
-}
-
-.JustifyFull
-{
-	text-align: justify;
-}
-
-/**
- * Other.
- */
-
-code
-{
-	font-family: courier, monospace;
-	background-color: #eeeeee;
-	padding-left: 1px;
-	padding-right: 1px;
-	border: #c0c0c0 1px solid;
-}
-
-kbd
-{
-	padding: 0px 1px 0px 1px;
-	border-width: 1px 2px 2px 1px;
-	border-style: solid;
-}
-
-blockquote
-{
-	color: #808080;
-}
diff --git a/phpgwapi/js/fckeditor/_samples/html/sampleposteddata.asp b/phpgwapi/js/fckeditor/_samples/html/sampleposteddata.asp
deleted file mode 100644
index 26eaed03ba..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sampleposteddata.asp
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Samples - Posted Data</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-	<h1>
-		FCKeditor - Samples - Posted Data</h1>
-	<div>
-		This page lists all data posted by the form.
-	</div>
-	<hr />
-	<table width="100%" border="1" cellpadding="3" style="border-color: #999999; border-collapse: collapse;">
-		<tr style="font-weight: bold; color: #dddddd; background-color: #999999">
-			<td style="white-space: nowrap;">
-				Field Name&nbsp;&nbsp;</td>
-			<td>
-				Value</td>
-		</tr>
-		<% For Each sForm in Request.Form %>
-		<tr>
-			<td valign="top" style="white-space: nowrap;">
-				<b>
-					<%=sForm%>
-				</b>
-			</td>
-			<td style="width: 100%;">
-				<pre><%=ModifyForOutput( Request.Form(sForm) )%></pre>
-			</td>
-		</tr>
-		<% Next %>
-	</table>
-</body>
-</html>
-<%
-
-' This function is useful only for this sample page se whe can display the
-' posted data accordingly. This processing is usually not done on real
-' applications, where the posted data must be saved on a DB or file. In those
-' cases, no processing must be done, and the data is saved as posted.
-Function ModifyForOutput( value )
-
-	ModifyForOutput = Server.HTMLEncode( value )
-
-End Function
-
-%>
diff --git a/phpgwapi/js/fckeditor/_samples/html/sampleposteddata.html b/phpgwapi/js/fckeditor/_samples/html/sampleposteddata.html
deleted file mode 100644
index d8537991f5..0000000000
--- a/phpgwapi/js/fckeditor/_samples/html/sampleposteddata.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form. It uses the URL (GET data),
- * so it's limited to 2KB of data.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Samples - Posted Data</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-	<h1>
-		FCKeditor - Samples - Posted Data
-	</h1>
-	<div>
-		This page lists all data posted by the form. It uses the "QueryString" to search
-		for data submitted using the "GET" method, so it is limited to 2KB.
-	</div>
-	<hr />
-	<table width="100%" border="1" cellpadding="3" style="border-color: #999999; border-collapse: collapse;">
-		<tr style="font-weight: bold; color: #dddddd; background-color: #999999">
-			<td style="white-space: nowrap;">
-				Field</td>
-			<td>
-				Value</td>
-		</tr>
-		<script type="text/javascript">
-<!--
-
-function HTMLEncode( text )
-{
-	text = text.replace(/&/g, "&amp;") ;
-	text = text.replace(/"/g, "&quot;") ;
-	text = text.replace(/</g, "&lt;") ;
-	text = text.replace(/>/g, "&gt;") ;
-	text = text.replace(/'/g, "&#39;") ;
-
-	return text ;
-}
-
-var aParams = document.location.search.substr(1).split('&') ;
-
-for ( i = 0 ; i < aParams.length ; i++ )
-{
-	var aParam = aParams[i].split('=') ;
-	var sParamName  = aParam[0] ;
-	var sParamValue = aParam[1] ;
-
-	document.write( '<tr>' ) ;
-	document.write( '<td valign="top" style="white-space: nowrap;">' + sParamName + '</td>' ) ;
-	document.write( '<td style="width: 100%;"><pre>' + HTMLEncode( decodeURIComponent( sParamValue.replace( /\+/g, ' ' ) ) ) + '</pre></td>' ) ;
-	document.write( '</tr>' ) ;
-}
-
-//-->
-		</script>
-	</table>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/lasso/sample01.lasso b/phpgwapi/js/fckeditor/_samples/lasso/sample01.lasso
deleted file mode 100644
index f868069acd..0000000000
--- a/phpgwapi/js/fckeditor/_samples/lasso/sample01.lasso
+++ /dev/null
@@ -1,55 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-]
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-		<h1>FCKeditor - Lasso - Sample 1</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features
-		enabled.
-		<hr>
-		<form action="sampleposteddata.lasso" method="post" target="_blank">
-[//lasso
-	include('../../fckeditor.lasso');
-	var('basepath') = response_filepath->split('_samples')->get(1);
-
-	var('myeditor') = fck_editor(
-		-instancename='FCKeditor1',
-		-basepath=$basepath,
-		-initialvalue='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	);
-
-	$myeditor->create;
-]
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/lasso/sample02.lasso b/phpgwapi/js/fckeditor/_samples/lasso/sample02.lasso
deleted file mode 100644
index bd74329f73..0000000000
--- a/phpgwapi/js/fckeditor/_samples/lasso/sample02.lasso
+++ /dev/null
@@ -1,109 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-]
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-		<!--
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbLanguages' ) ;
-	for ( code in editorInstance.Language.AvailableLanguages )
-	{
-		AddComboOption( oCombo, editorInstance.Language.AvailableLanguages[code] + ' (' + code + ')', code ) ;
-	}
-	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-}
-
-function AddComboOption(combo, optionText, optionValue)
-{
-	var oOption = document.createElement("OPTION") ;
-
-	combo.options.add(oOption) ;
-
-	oOption.innerHTML = optionText ;
-	oOption.value     = optionValue ;
-
-	return oOption ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	window.location.href = window.location.pathname + "?Lang=" + languageCode ;
-}
-		//-->
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - Lasso - Sample 2</h1>
-		This sample shows the editor in all its available languages.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select a language:&nbsp;
-				</td>
-				<td>
-					<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.lasso" method="post" target="_blank">
-[//lasso
-	include('../../fckeditor.lasso');
-	var('basepath') = response_filepath->split('_samples')->get(1);
-
-	if(action_param('Lang'));
-		var('config') = array(
-			'AutoDetectLanguage' = 'false',
-			'DefaultLanguage' = action_param('Lang')
-		);
-	else;
-		var('config') = array(
-			'AutoDetectLanguage' = 'true',
-			'DefaultLanguage' = 'en'
-		);
-	/if;
-
-	var('myeditor') = fck_editor(
-		-instancename='FCKeditor1',
-		-basepath=$basepath,
-		-config=$config,
-		-initialvalue='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	);
-
-	$myeditor->create;
-]
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/lasso/sample03.lasso b/phpgwapi/js/fckeditor/_samples/lasso/sample03.lasso
deleted file mode 100644
index 6890dc9844..0000000000
--- a/phpgwapi/js/fckeditor/_samples/lasso/sample03.lasso
+++ /dev/null
@@ -1,87 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-]
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-		<!--
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbToolbars' ) ;
-	oCombo.value = editorInstance.ToolbarSet.Name ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeToolbar( toolbarName )
-{
-	window.location.href = window.location.pathname + "?Toolbar=" + toolbarName ;
-}
-		//-->
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - Lasso - Sample 3</h1>
-		This sample shows how to change the editor toolbar.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the toolbar to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbToolbars" onchange="ChangeToolbar(this.value);" style="VISIBILITY: hidden">
-						<option value="Default" selected>Default</option>
-						<option value="Basic">Basic</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.lasso" method="post" target="_blank">
-[//lasso
-	include('../../fckeditor.lasso');
-	var('basepath') = response_filepath->split('_samples')->get(1);
-
-	var('myeditor') = fck_editor(
-		-instancename='FCKeditor1',
-		-basepath=$basepath,
-		-initialvalue='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	);
-
-	if(action_param('Toolbar'));
-		$myeditor->toolbarset = action_param('Toolbar');
-	/if;
-
-	$myeditor->create;
-]
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/lasso/sample04.lasso b/phpgwapi/js/fckeditor/_samples/lasso/sample04.lasso
deleted file mode 100644
index 0e39eb969f..0000000000
--- a/phpgwapi/js/fckeditor/_samples/lasso/sample04.lasso
+++ /dev/null
@@ -1,93 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-]
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-		<!--
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-	// Get the active skin.
-	var sSkin = editorInstance.Config['SkinPath'] ;
-	sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-
-	oCombo.value = sSkin ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeSkin( skinName )
-{
-	window.location.href = window.location.pathname + "?Skin=" + skinName ;
-}
-		//-->
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - Lasso - Sample 4</h1>
-		This sample shows how to change the editor skin.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the skin to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="VISIBILITY: hidden">
-						<option value="default" selected>Default</option>
-						<option value="office2003">Office 2003</option>
-						<option value="silver">Silver</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.lasso" method="post" target="_blank">
-[//lasso
-	include('../../fckeditor.lasso');
-	var('basepath') = response_filepath->split('_samples')->get(1);
-
-	var('myeditor') = fck_editor(
-		-instancename='FCKeditor1',
-		-basepath=$basepath,
-		-initialvalue='<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>'
-	);
-
-	if(action_param('Skin'));
-		$myeditor->config = array('SkinPath' = $basepath + 'editor/skins/' + action_param('Skin') + '/');
-	/if;
-
-	$myeditor->create;
-]
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/lasso/sampleposteddata.lasso b/phpgwapi/js/fckeditor/_samples/lasso/sampleposteddata.lasso
deleted file mode 100644
index 6d04ad4999..0000000000
--- a/phpgwapi/js/fckeditor/_samples/lasso/sampleposteddata.lasso
+++ /dev/null
@@ -1,53 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-]
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css">
-	</head>
-	<body>
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-		<table border="1" cellspacing="0" id="outputSample">
-			<colgroup><col width="80"><col></colgroup>
-			<thead>
-				<tr>
-					<th>Field Name</th>
-					<th>Value</th>
-				</tr>
-			</thead>
-[iterate(client_postparams, local('this'))]
-			<tr>
-				<th>[#this->first]</th>
-				<td><pre>[#this->second]</pre></td>
-			</tr>
-[/iterate]
-		</table>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/perl/sample01.cgi b/phpgwapi/js/fckeditor/_samples/perl/sample01.cgi
deleted file mode 100644
index 3b6debc9cc..0000000000
--- a/phpgwapi/js/fckeditor/_samples/perl/sample01.cgi
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env perl
-
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  Sample page.
-#####
-
-## START: Hack for Windows (Not important to understand the editor code... Perl specific).
-if(Windows_check()) {
-	chdir(GetScriptPath($0));
-}
-
-sub Windows_check
-{
-	# IIS,PWS(NT/95)
-	$www_server_os = $^O;
-	# Win98 & NT(SP4)
-	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
-	# AnHTTPd/Omni/IIS
-	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
-	# Win Apache
-	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
-	if($www_server_os=~ /win/i) { return(1); }
-	return(0);
-}
-
-sub GetScriptPath {
-	local($path) = @_;
-	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
-	$path;
-}
-## END: Hack for IIS
-
-require '../../fckeditor.pl';
-
-# When $ENV{'PATH_INFO'} cannot be used by perl.
-# $DefRootPath = "/XXXXX/_samples/perl/sample01.cgi"; Please write in script.
-
-my $DefServerPath = "";
-my $ServerPath;
-
-	$ServerPath = &GetServerPath();
-	print "Content-type: text/html\n\n";
-	print <<"_HTML_TAG_";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-		<h1>FCKeditor - Perl - Sample 1</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features
-		enabled.
-		<hr>
-		<form action="sampleposteddata.cgi" method="post" target="_blank">
-_HTML_TAG_
-
-	#// Automatically calculates the editor base path based on the _samples directory.
-	#// This is usefull only for these samples. A real application should use something like this:
-	#// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-
-	$sBasePath = $ServerPath;
-	$sBasePath = substr($sBasePath,0,index($sBasePath,"_samples"));
-	&FCKeditor('FCKeditor1');
-	$BasePath	= $sBasePath;
-	$Value		= '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>';
-	&Create();
-
-	print <<"_HTML_TAG_";
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-_HTML_TAG_
-
-################
-#Please use this function, rewriting it depending on a server's environment.
-################
-sub GetServerPath
-{
-my $dir;
-
-	if($DefServerPath) {
-		$dir = $DefServerPath;
-	} else {
-		if($ENV{'PATH_INFO'}) {
-			$dir  = $ENV{'PATH_INFO'};
-		} elsif($ENV{'FILEPATH_INFO'}) {
-			$dir  = $ENV{'FILEPATH_INFO'};
-		} elsif($ENV{'REQUEST_URI'}) {
-			$dir  = $ENV{'REQUEST_URI'};
-		}
-	}
-	return($dir);
-}
diff --git a/phpgwapi/js/fckeditor/_samples/perl/sample02.cgi b/phpgwapi/js/fckeditor/_samples/perl/sample02.cgi
deleted file mode 100644
index dd7c26de38..0000000000
--- a/phpgwapi/js/fckeditor/_samples/perl/sample02.cgi
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/env perl
-
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  Sample page.
-#####
-
-## START: Hack for Windows (Not important to understand the editor code... Perl specific).
-if(Windows_check()) {
-	chdir(GetScriptPath($0));
-}
-
-sub Windows_check
-{
-	# IIS,PWS(NT/95)
-	$www_server_os = $^O;
-	# Win98 & NT(SP4)
-	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
-	# AnHTTPd/Omni/IIS
-	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
-	# Win Apache
-	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
-	if($www_server_os=~ /win/i) { return(1); }
-	return(0);
-}
-
-sub GetScriptPath {
-	local($path) = @_;
-	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
-	$path;
-}
-## END: Hack for IIS
-
-require '../../fckeditor.pl';
-
-# When $ENV{'PATH_INFO'} cannot be used by perl.
-# $DefRootPath = "/XXXXX/_samples/perl/sample02.cgi"; Please write in script.
-
-my $DefServerPath = "";
-my $ServerPath;
-
-	$ServerPath = &GetServerPath();
-
-	if($ENV{'REQUEST_METHOD'} eq "POST") {
-		read(STDIN, $buffer, $ENV{'CONTENT_LENGTH'});
-	} else {
-		$buffer = $ENV{'QUERY_STRING'};
-	}
-	@pairs = split(/&/,$buffer);
-	foreach $pair (@pairs) {
-		($name,$value) = split(/=/,$pair);
-		$value =~ tr/+/ /;
-		$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-		$value =~ s/\t//g;
-		$value =~ s/\r\n/\n/g;
-		$FORM{$name} .= "\0"			if(defined($FORM{$name}));
-		$FORM{$name} .= $value;
-	}
-
-	print "Content-type: text/html\n\n";
-	print <<"_HTML_TAG_";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbLanguages' ) ;
-	for ( code in editorInstance.Language.AvailableLanguages )
-	{
-		AddComboOption( oCombo, editorInstance.Language.AvailableLanguages[code] + ' (' + code + ')', code ) ;
-	}
-	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-}
-
-function AddComboOption(combo, optionText, optionValue)
-{
-	var oOption = document.createElement("OPTION") ;
-
-	combo.options.add(oOption) ;
-
-	oOption.innerHTML = optionText ;
-	oOption.value	  = optionValue ;
-
-	return oOption ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	window.location.href = window.location.pathname + "?Lang=" + languageCode ;
-}
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - Perl - Sample 2</h1>
-		This sample shows the editor in all its available languages.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select a language:&nbsp;
-				</td>
-				<td>
-					<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.cgi" method="post" target="_blank">
-_HTML_TAG_
-
-	#// Automatically calculates the editor base path based on the _samples directory.
-	#// This is usefull only for these samples. A real application should use something like this:
-	#// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-	$sBasePath = $ServerPath;
-	$sBasePath = substr( $sBasePath, 0, index($sBasePath,"_samples"));
-
-	&FCKeditor('FCKeditor1');
-	$BasePath = $sBasePath;
-
-	if($FORM{'Lang'} ne "") {
-		$Config{'AutoDetectLanguage'}	= "false";
-		$Config{'DefaultLanguage'}		= $FORM{'Lang'};
-	} else {
-		$Config{'AutoDetectLanguage'}	= "true";
-		$Config{'DefaultLanguage'}		= 'en' ;
-	}
-	$Value = '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-	&Create();
-
-	print <<"_HTML_TAG_";
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-_HTML_TAG_
-
-################
-#Please use this function, rewriting it depending on a server's environment.
-################
-sub GetServerPath
-{
-my $dir;
-
-	if($DefServerPath) {
-		$dir = $DefServerPath;
-	} else {
-		if($ENV{'PATH_INFO'}) {
-			$dir  = $ENV{'PATH_INFO'};
-		} elsif($ENV{'FILEPATH_INFO'}) {
-			$dir  = $ENV{'FILEPATH_INFO'};
-		} elsif($ENV{'REQUEST_URI'}) {
-			$dir  = $ENV{'REQUEST_URI'};
-		}
-	}
-	return($dir);
-}
diff --git a/phpgwapi/js/fckeditor/_samples/perl/sample03.cgi b/phpgwapi/js/fckeditor/_samples/perl/sample03.cgi
deleted file mode 100644
index ef9d723ce9..0000000000
--- a/phpgwapi/js/fckeditor/_samples/perl/sample03.cgi
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/env perl
-
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  Sample page.
-#####
-
-## START: Hack for Windows (Not important to understand the editor code... Perl specific).
-if(Windows_check()) {
-	chdir(GetScriptPath($0));
-}
-
-sub Windows_check
-{
-	# IIS,PWS(NT/95)
-	$www_server_os = $^O;
-	# Win98 & NT(SP4)
-	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
-	# AnHTTPd/Omni/IIS
-	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
-	# Win Apache
-	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
-	if($www_server_os=~ /win/i) { return(1); }
-	return(0);
-}
-
-sub GetScriptPath {
-	local($path) = @_;
-	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
-	$path;
-}
-## END: Hack for IIS
-
-require '../../fckeditor.pl';
-
-# When $ENV{'PATH_INFO'} cannot be used by perl.
-# $DefRootPath = "/XXXXX/_samples/perl/sample03.cgi"; Please write in script.
-
-my $DefServerPath = "";
-my $ServerPath;
-
-	$ServerPath = &GetServerPath();
-
-	if($ENV{'REQUEST_METHOD'} eq "POST") {
-		read(STDIN, $buffer, $ENV{'CONTENT_LENGTH'});
-	} else {
-		$buffer = $ENV{'QUERY_STRING'};
-	}
-	@pairs = split(/&/,$buffer);
-	foreach $pair (@pairs) {
-		($name,$value) = split(/=/,$pair);
-		$value =~ tr/+/ /;
-		$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-		$value =~ s/\t//g;
-		$value =~ s/\r\n/\n/g;
-		$FORM{$name} .= "\0"			if(defined($FORM{$name}));
-		$FORM{$name} .= $value;
-	}
-
-	print "Content-type: text/html\n\n";
-	print <<"_HTML_TAG_";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbToolbars' ) ;
-	oCombo.value = editorInstance.ToolbarSet.Name ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeToolbar( toolbarName )
-{
-	window.location.href = window.location.pathname + "?Toolbar=" + toolbarName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - Perl - Sample 3</h1>
-		This sample shows how to change the editor toolbar.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the toolbar to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbToolbars" onchange="ChangeToolbar(this.value);" style="VISIBILITY: hidden">
-						<option value="Default" selected>Default</option>
-						<option value="Basic">Basic</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.cgi" method="post" target="_blank">
-_HTML_TAG_
-
-	#// Automatically calculates the editor base path based on the _samples directory.
-	#// This is usefull only for these samples. A real application should use something like this:
-	#// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-
-	$sBasePath = $ServerPath;
-	$sBasePath = substr($sBasePath, 0, index( $sBasePath, "_samples" ));
-
-	&FCKeditor('FCKeditor1') ;
-	$BasePath = $sBasePath ;
-
-	if($FORM{'Toolbar'} ne "") {
-		$ToolbarSet = &specialchar_cnv( $FORM{'Toolbar'} );
-	}
-	$Value = '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-	&Create();
-
-	print <<"_HTML_TAG_";
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-_HTML_TAG_
-
-################
-#Please use this function, rewriting it depending on a server's environment.
-################
-sub GetServerPath
-{
-my $dir;
-
-	if($DefServerPath) {
-		$dir = $DefServerPath;
-	} else {
-		if($ENV{'PATH_INFO'}) {
-			$dir  = $ENV{'PATH_INFO'};
-		} elsif($ENV{'FILEPATH_INFO'}) {
-			$dir  = $ENV{'FILEPATH_INFO'};
-		} elsif($ENV{'REQUEST_URI'}) {
-			$dir  = $ENV{'REQUEST_URI'};
-		}
-	}
-	return($dir);
-}
diff --git a/phpgwapi/js/fckeditor/_samples/perl/sample04.cgi b/phpgwapi/js/fckeditor/_samples/perl/sample04.cgi
deleted file mode 100644
index 4eb232cce1..0000000000
--- a/phpgwapi/js/fckeditor/_samples/perl/sample04.cgi
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env perl
-
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  Sample page.
-#####
-
-## START: Hack for Windows (Not important to understand the editor code... Perl specific).
-if(Windows_check()) {
-	chdir(GetScriptPath($0));
-}
-
-sub Windows_check
-{
-	# IIS,PWS(NT/95)
-	$www_server_os = $^O;
-	# Win98 & NT(SP4)
-	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
-	# AnHTTPd/Omni/IIS
-	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
-	# Win Apache
-	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
-	if($www_server_os=~ /win/i) { return(1); }
-	return(0);
-}
-
-sub GetScriptPath {
-	local($path) = @_;
-	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
-	$path;
-}
-## END: Hack for IIS
-
-require '../../fckeditor.pl';
-
-# When $ENV{'PATH_INFO'} cannot be used by perl.
-# $DefRootPath = "/XXXXX/_samples/perl/sample04.cgi"; Please write in script.
-
-my $DefServerPath = "";
-my $ServerPath;
-
-	$ServerPath = &GetServerPath();
-
-	if($ENV{'REQUEST_METHOD'} eq "POST") {
-		read(STDIN, $buffer, $ENV{'CONTENT_LENGTH'});
-	} else {
-		$buffer = $ENV{'QUERY_STRING'};
-	}
-	@pairs = split(/&/,$buffer);
-	foreach $pair (@pairs) {
-		($name,$value) = split(/=/,$pair);
-		$value =~ tr/+/ /;
-		$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-		$value =~ s/\t//g;
-		$value =~ s/\r\n/\n/g;
-		$FORM{$name} .= "\0"			if(defined($FORM{$name}));
-		$FORM{$name} .= $value;
-	}
-
-#!!Caution javascript \ Quart
-
-	print "Content-type: text/html\n\n";
-	print <<"_HTML_TAG_";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-	// Get the active skin.
-	var sSkin = editorInstance.Config['SkinPath'] ;
-	sSkin = sSkin.match(/[^\\/]+(?=\\/\$)/g) ;
-
-	oCombo.value = sSkin ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeSkin( skinName )
-{
-	window.location.href = window.location.pathname + "?Skin=" + skinName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - Perl - Sample 4</h1>
-		This sample shows how to change the editor skin.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the skin to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="VISIBILITY: hidden">
-						<option value="default" selected>Default</option>
-						<option value="office2003">Office 2003</option>
-						<option value="silver">Silver</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.cgi" method="post" target="_blank">
-_HTML_TAG_
-
-	#// Automatically calculates the editor base path based on the _samples directory.
-	#// This is usefull only for these samples. A real application should use something like this:
-	#// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-	$sBasePath = $ServerPath;
-	$sBasePath = substr( $sBasePath, 0, index( $sBasePath, "_samples" ) ) ;
-
-	&FCKeditor('FCKeditor1');
-	$BasePath = $sBasePath;
-
-	if($FORM{'Skin'} ne "") {
-		$Config{'SkinPath'} = $sBasePath . 'editor/skins/' . &specialchar_cnv( $FORM{'Skin'} ) . '/' ;
-	}
-	$Value = '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-	&Create() ;
-
-	print <<"_HTML_TAG_";
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
-_HTML_TAG_
-
-################
-#Please use this function, rewriting it depending on a server's environment.
-################
-sub GetServerPath
-{
-my $dir;
-
-	if($DefServerPath) {
-		$dir = $DefServerPath;
-	} else {
-		if($ENV{'PATH_INFO'}) {
-			$dir  = $ENV{'PATH_INFO'};
-		} elsif($ENV{'FILEPATH_INFO'}) {
-			$dir  = $ENV{'FILEPATH_INFO'};
-		} elsif($ENV{'REQUEST_URI'}) {
-			$dir  = $ENV{'REQUEST_URI'};
-		}
-	}
-	return($dir);
-}
diff --git a/phpgwapi/js/fckeditor/_samples/perl/sampleposteddata.cgi b/phpgwapi/js/fckeditor/_samples/perl/sampleposteddata.cgi
deleted file mode 100644
index 7702ad5b17..0000000000
--- a/phpgwapi/js/fckeditor/_samples/perl/sampleposteddata.cgi
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env perl
-
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This page lists the data posted by a form.
-#####
-
-## START: Hack for Windows (Not important to understand the editor code... Perl specific).
-if(Windows_check()) {
-	chdir(GetScriptPath($0));
-}
-
-sub Windows_check
-{
-	# IIS,PWS(NT/95)
-	$www_server_os = $^O;
-	# Win98 & NT(SP4)
-	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
-	# AnHTTPd/Omni/IIS
-	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
-	# Win Apache
-	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
-	if($www_server_os=~ /win/i) { return(1); }
-	return(0);
-}
-
-sub GetScriptPath {
-	local($path) = @_;
-	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
-	$path;
-}
-## END: Hack for IIS
-
-require '../../fckeditor.pl';
-
-	if($ENV{'REQUEST_METHOD'} eq "POST") {
-		read(STDIN, $buffer, $ENV{'CONTENT_LENGTH'});
-	} else {
-		$buffer = $ENV{'QUERY_STRING'};
-	}
-	@pairs = split(/&/,$buffer);
-	foreach $pair (@pairs) {
-		($name,$value) = split(/=/,$pair);
-		$value =~ tr/+/ /;
-		$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-		$value =~ s/\t//g;
-		$value =~ s/\r\n/\n/g;
-		$FORM{$name} .= "\0"			if(defined($FORM{$name}));
-		$FORM{$name} .= $value;
-	}
-
-	print "Content-type: text/html\n\n";
-	print <<"_HTML_TAG_";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" >
-	</head>
-	<body>
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-		<table border="1" cellspacing="0" id="outputSample">
-			<colgroup><col width="80"><col></colgroup>
-			<thead>
-				<tr>
-					<th>Field Name</th>
-					<th>Value</th>
-				</tr>
-			</thead>
-_HTML_TAG_
-
-	foreach $key (keys %FORM) {
-		$postedValue = &specialchar_cnv($FORM{$key});
-		print <<"_HTML_TAG_";
-			<tr>
-				<th>$key</th>
-				<td><pre>$postedValue</pre></td>
-			</tr>
-_HTML_TAG_
-	}
-		print <<"_HTML_TAG_";
-		</table>
-	</body>
-</html>
-_HTML_TAG_
diff --git a/phpgwapi/js/fckeditor/_samples/php/sample01.php b/phpgwapi/js/fckeditor/_samples/php/sample01.php
deleted file mode 100644
index 417a3e834e..0000000000
--- a/phpgwapi/js/fckeditor/_samples/php/sample01.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-
-include("../../fckeditor.php") ;
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-		<h1>FCKeditor - PHP - Sample 1</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features
-		enabled.
-		<hr>
-		<form action="sampleposteddata.php" method="post" target="_blank">
-<?php
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-$sBasePath = $_SERVER['PHP_SELF'] ;
-$sBasePath = substr( $sBasePath, 0, strpos( $sBasePath, "_samples" ) ) ;
-
-$oFCKeditor = new FCKeditor('FCKeditor1') ;
-$oFCKeditor->BasePath	= $sBasePath ;
-$oFCKeditor->Value		= '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-$oFCKeditor->Create() ;
-?>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/php/sample02.php b/phpgwapi/js/fckeditor/_samples/php/sample02.php
deleted file mode 100644
index 3be5781a4d..0000000000
--- a/phpgwapi/js/fckeditor/_samples/php/sample02.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-
-include("../../fckeditor.php") ;
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbLanguages' ) ;
-	for ( code in editorInstance.Language.AvailableLanguages )
-	{
-		AddComboOption( oCombo, editorInstance.Language.AvailableLanguages[code] + ' (' + code + ')', code ) ;
-	}
-	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-}
-
-function AddComboOption(combo, optionText, optionValue)
-{
-	var oOption = document.createElement("OPTION") ;
-
-	combo.options.add(oOption) ;
-
-	oOption.innerHTML = optionText ;
-	oOption.value     = optionValue ;
-
-	return oOption ;
-}
-
-function ChangeLanguage( languageCode )
-{
-	window.location.href = window.location.pathname + "?Lang=" + languageCode ;
-}
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - PHP - Sample 2</h1>
-		This sample shows the editor in all its available languages.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select a language:&nbsp;
-				</td>
-				<td>
-					<select id="cmbLanguages" onchange="ChangeLanguage(this.value);">
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.php" method="post" target="_blank">
-<?php
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-$sBasePath = $_SERVER['PHP_SELF'] ;
-$sBasePath = substr( $sBasePath, 0, strpos( $sBasePath, "_samples" ) ) ;
-
-$oFCKeditor = new FCKeditor('FCKeditor1') ;
-$oFCKeditor->BasePath = $sBasePath ;
-
-if ( isset($_GET['Lang']) )
-{
-	$oFCKeditor->Config['AutoDetectLanguage']	= false ;
-	$oFCKeditor->Config['DefaultLanguage']		= $_GET['Lang'] ;
-}
-else
-{
-	$oFCKeditor->Config['AutoDetectLanguage']	= true ;
-	$oFCKeditor->Config['DefaultLanguage']		= 'en' ;
-}
-
-$oFCKeditor->Value = '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-$oFCKeditor->Create() ;
-?>			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/php/sample03.php b/phpgwapi/js/fckeditor/_samples/php/sample03.php
deleted file mode 100644
index 804e6505f5..0000000000
--- a/phpgwapi/js/fckeditor/_samples/php/sample03.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-
-include("../../fckeditor.php") ;
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbToolbars' ) ;
-	oCombo.value = editorInstance.ToolbarSet.Name ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeToolbar( toolbarName )
-{
-	window.location.href = window.location.pathname + "?Toolbar=" + toolbarName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - PHP - Sample 3</h1>
-		This sample shows how to change the editor toolbar.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the toolbar to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbToolbars" onchange="ChangeToolbar(this.value);" style="VISIBILITY: hidden">
-						<option value="Default" selected>Default</option>
-						<option value="Basic">Basic</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.php" method="post" target="_blank">
-<?php
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-$sBasePath = $_SERVER['PHP_SELF'] ;
-$sBasePath = substr( $sBasePath, 0, strpos( $sBasePath, "_samples" ) ) ;
-
-$oFCKeditor = new FCKeditor('FCKeditor1') ;
-$oFCKeditor->BasePath = $sBasePath ;
-
-if ( isset($_GET['Toolbar']) )
-	$oFCKeditor->ToolbarSet = htmlspecialchars($_GET['Toolbar']);
-
-$oFCKeditor->Value = '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-$oFCKeditor->Create() ;
-?>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/php/sample04.php b/phpgwapi/js/fckeditor/_samples/php/sample04.php
deleted file mode 100644
index 6163bf9b37..0000000000
--- a/phpgwapi/js/fckeditor/_samples/php/sample04.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Sample page.
- */
-
-include("../../fckeditor.php") ;
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	var oCombo = document.getElementById( 'cmbSkins' ) ;
-
-	// Get the active skin.
-	var sSkin = editorInstance.Config['SkinPath'] ;
-	sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-
-	oCombo.value = sSkin ;
-	oCombo.style.visibility = '' ;
-}
-
-function ChangeSkin( skinName )
-{
-	window.location.href = window.location.pathname + "?Skin=" + skinName ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - PHP - Sample 4</h1>
-		This sample shows how to change the editor skin.
-		<hr>
-		<table cellpadding="0" cellspacing="0" border="0">
-			<tr>
-				<td>
-					Select the skin to load:&nbsp;
-				</td>
-				<td>
-					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="VISIBILITY: hidden">
-						<option value="default" selected>Default</option>
-						<option value="office2003">Office 2003</option>
-						<option value="silver">Silver</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		<br>
-		<form action="sampleposteddata.php" method="post" target="_blank">
-<?php
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// $oFCKeditor->BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-$sBasePath = $_SERVER['PHP_SELF'] ;
-$sBasePath = substr( $sBasePath, 0, strpos( $sBasePath, "_samples" ) ) ;
-
-$oFCKeditor = new FCKeditor('FCKeditor1') ;
-$oFCKeditor->BasePath = $sBasePath ;
-
-if ( isset($_GET['Skin']) )
-	$oFCKeditor->Config['SkinPath'] = $sBasePath . 'editor/skins/' . htmlspecialchars($_GET['Skin']) . '/' ;
-
-$oFCKeditor->Value = '<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>' ;
-$oFCKeditor->Create() ;
-?>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/php/sampleposteddata.php b/phpgwapi/js/fckeditor/_samples/php/sampleposteddata.php
deleted file mode 100644
index 22335e3d2d..0000000000
--- a/phpgwapi/js/fckeditor/_samples/php/sampleposteddata.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form.
- */
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" >
-	</head>
-	<body>
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-		<table border="1" cellspacing="0" id="outputSample">
-			<colgroup><col width="80"><col></colgroup>
-			<thead>
-				<tr>
-					<th>Field Name</th>
-					<th>Value</th>
-				</tr>
-			</thead>
-<?php
-
-if ( isset( $_POST ) )
-   $postArray = &$_POST ;			// 4.1.0 or later, use $_POST
-else
-   $postArray = &$HTTP_POST_VARS ;	// prior to 4.1.0, use HTTP_POST_VARS
-
-foreach ( $postArray as $sForm => $value )
-{
-	if ( get_magic_quotes_gpc() )
-		$postedValue = htmlspecialchars( stripslashes( $value ) ) ;
-	else
-		$postedValue = htmlspecialchars( $value ) ;
-
-?>
-			<tr>
-				<th><?php echo $sForm?></th>
-				<td><pre><?php echo $postedValue?></pre></td>
-			</tr>
-<?php
-}
-?>
-		</table>
-	</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_samples/py/sample01.py b/phpgwapi/js/fckeditor/_samples/py/sample01.py
deleted file mode 100644
index c56f16e582..0000000000
--- a/phpgwapi/js/fckeditor/_samples/py/sample01.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Sample page.
-"""
-
-import cgi
-import os
-
-# Ensure that the fckeditor.py is included in your classpath
-import fckeditor
-
-# Tell the browser to render html
-print "Content-Type: text/html"
-print ""
-
-# Document header
-print """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-		<h1>FCKeditor - Python - Sample 1</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features
-		enabled.
-		<hr>
-		<form action="sampleposteddata.py" method="post" target="_blank">
-"""
-
-# This is the real work
-try:
-	sBasePath = os.environ.get("SCRIPT_NAME")
-	sBasePath = sBasePath[0:sBasePath.find("_samples")]
-
-	oFCKeditor = fckeditor.FCKeditor('FCKeditor1')
-	oFCKeditor.BasePath = sBasePath
-	oFCKeditor.Value = """<p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p>"""
-	print oFCKeditor.Create()
-except Exception, e:
-	print e
-print """
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-"""
-
-# For testing your environments
-print "<hr>"
-for key in os.environ.keys():
-	print "%s: %s<br>" % (key, os.environ.get(key, ""))
-print "<hr>"
-
-# Document footer
-print """
-	</body>
-</html>
-"""
diff --git a/phpgwapi/js/fckeditor/_samples/py/sampleposteddata.py b/phpgwapi/js/fckeditor/_samples/py/sampleposteddata.py
deleted file mode 100644
index bc759d56cb..0000000000
--- a/phpgwapi/js/fckeditor/_samples/py/sampleposteddata.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-This page lists the data posted by a form.
-"""
-
-import cgi
-import os
-
-# Tell the browser to render html
-print "Content-Type: text/html"
-print ""
-
-try:
-	# Create a cgi object
-	form = cgi.FieldStorage()
-except Exception, e:
-	print e
-
-# Document header
-print """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-		<title>FCKeditor - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-"""
-
-# This is the real work
-print """
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-		<table border="1" cellspacing="0" id="outputSample">
-			<colgroup><col width="80"><col></colgroup>
-			<thead>
-				<tr>
-					<th>Field Name</th>
-					<th>Value</th>
-				</tr>
-			</thead>
-"""
-for key in form.keys():
-	try:
-		value = form[key].value
-		print """
-				<tr>
-					<th>%s</th>
-					<td><pre>%s</pre></td>
-				</tr>
-			""" % (key, value)
-	except Exception, e:
-		print e
-print "</table>"
-
-# For testing your environments
-print "<hr>"
-for key in os.environ.keys():
-	print "%s: %s<br>" % (key, os.environ.get(key, ""))
-print "<hr>"
-
-# Document footer
-print """
-	</body>
-</html>
-"""
diff --git a/phpgwapi/js/fckeditor/_samples/sample.css b/phpgwapi/js/fckeditor/_samples/sample.css
deleted file mode 100644
index f23fe05f9c..0000000000
--- a/phpgwapi/js/fckeditor/_samples/sample.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used in the samples pages.
- */
-
-body, td, th, input, select, textarea
-{
-	font-size: 12px;
-	font-family: Arial, Verdana, Sans-Serif;
-}
-
-h1
-{
-	font-weight: bold;
-	font-size: 180%;
-	margin-bottom: 10px;
-}
-
-form
-{
-	margin: 0;
-	padding: 0;
-}
-
-#outputSample
-{
-	table-layout: fixed;
-	width: 100%;
-}
-
-pre
-{
-	margin: 0;
-	padding: 0;
-
-	white-space: pre; /* CSS2 */
-	white-space: -moz-pre-wrap; /* Mozilla*/
-	white-space: -o-pre-wrap; /* Opera 7 */
-	white-space: pre-wrap; /* CSS 2.1 */
-	white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
-	word-wrap: break-word; /* IE */
-}
-
-#outputSample thead th
-{
-	color: #dddddd;
-	background-color: #999999;
-	padding: 4px;
-	white-space: nowrap;
-}
-
-#outputSample tbody th
-{
-	vertical-align: top;
-	text-align: left;
-}
diff --git a/phpgwapi/js/fckeditor/_samples/sampleslist.html b/phpgwapi/js/fckeditor/_samples/sampleslist.html
deleted file mode 100644
index 65ec5ec01a..0000000000
--- a/phpgwapi/js/fckeditor/_samples/sampleslist.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Page used to select the sample to view.
--->
-<html>
-<head>
-	<title>FCKeditor - Sample Selection</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta name="robots" content="noindex, nofollow">
-	<link href="sample.css" rel="stylesheet" type="text/css">
-	<script type="text/javascript">
-
-if ( window.top == window )
-	document.location = 'default.html' ;
-
-function OpenSample( sample )
-{
-	if ( sample.length > 0 )
-		window.open( sample, 'Sample' ) ;
-}
-
-	</script>
-</head>
-<body style="margin:1em;">
-	<table border="0" cellpadding="0" cellspacing="0" style="height: 100%">
-		<tr>
-			<td>
-				Please select the sample you want to view:
-				<br />
-				<select onchange="OpenSample(this.value);">
-					<optgroup label="JavaScript">
-						<option value="html/sample01.html" selected="selected">JavaScript : Sample 01 : Editor
-							with all features</option>
-						<option value="html/sample02.html">JavaScript : Sample 02 : Replacement of a TEXTAREA</option>
-						<option value="html/sample03.html">JavaScript : Sample 03 : Multi-language support</option>
-						<option value="html/sample04.html">JavaScript : Sample 04 : Toolbar selection</option>
-						<option value="html/sample05.html">JavaScript : Sample 05 : Skins support</option>
-						<option value="html/sample06.html">JavaScript : Sample 06 : Plugins support</option>
-						<option value="html/sample07.html">JavaScript : Sample 07 : Full Page editing</option>
-						<option value="html/sample08.html">JavaScript : Sample 08 : Editor API usage</option>
-						<option value="html/sample09.html">JavaScript : Sample 09 : Complex form (multiple editors)</option>
-						<option value="html/sample10.html">JavaScript : Sample 10 : Shared toolbar on same page</option>
-						<option value="html/sample11.html">JavaScript : Sample 11 : Shared toolbar from IFRAME</option>
-						<option value="html/sample12.html">JavaScript : Sample 12 : Enter key behavior</option>
-						<option value="html/sample13.html">JavaScript : Sample 13 : Dinamically switching with a Textarea</option>
-						<option value="html/sample14.html">JavaScript : Sample 14 : XHTML 1.1</option>
-						<option value="html/sample15.html">JavaScript : Sample 15 : Legacy HTML 4 tags</option>
-						<option value="html/sample16.html">JavaScript : Sample 16 : Flash content editor</option>
-						<option value=""></option>
-					</optgroup>
-					<optgroup label="Active Fox Pro">
-						<option value="afp/sample01.afp">AFP : Sample 01 : Editor with all features</option>
-						<option value="afp/sample02.afp">AFP : Sample 02 : Multi-language support</option>
-						<option value="afp/sample03.afp">AFP : Sample 03 : Toolbar selection</option>
-						<option value="afp/sample04.afp">AFP : Sample 04 : Skins support</option>
-						<option value=""></option>
-					</optgroup>
-					<optgroup label="ASP">
-						<option value="asp/sample01.asp">ASP : Sample 01 : Editor with all features</option>
-						<option value="asp/sample02.asp">ASP : Sample 02 : Multi-language support</option>
-						<option value="asp/sample03.asp">ASP : Sample 03 : Toolbar selection</option>
-						<option value="asp/sample04.asp">ASP : Sample 04 : Skins support</option>
-						<option value=""></option>
-					</optgroup>
-					<optgroup label="ColdFusion">
-						<option value="cfm/sample01.cfm">ColdFusion : Sample 01 : Editor with all features</option>
-						<option value="cfm/sample02_mx.cfm">ColdFusion : Sample 02 : Advanced version for ColdFusion
-							MX</option>
-						<option value=""></option>
-					</optgroup>
-					<optgroup label="Lasso">
-						<option value="lasso/sample01.lasso">Lasso : Sample 01 : Editor with all features</option>
-						<option value="lasso/sample02.lasso">Lasso : Sample 02 : Multi-language support</option>
-						<option value="lasso/sample03.lasso">Lasso : Sample 03 : Toolbar selection</option>
-						<option value="lasso/sample04.lasso">Lasso : Sample 04 : Skins support</option>
-						<option value=""></option>
-					</optgroup>
-					<optgroup label="Perl">
-						<option value="perl/sample01.cgi">Perl : Sample 01 : Editor with all features</option>
-						<option value="perl/sample02.cgi">Perl : Sample 02 : Multi-language support</option>
-						<option value="perl/sample03.cgi">Perl : Sample 03 : Toolbar selection</option>
-						<option value="perl/sample04.cgi">Perl : Sample 04 : Skins support</option>
-						<option value=""></option>
-					</optgroup>
-					<optgroup label="PHP">
-						<option value="php/sample01.php">PHP : Sample 01 : Editor with all features</option>
-						<option value="php/sample02.php">PHP : Sample 02 : Multi-language support</option>
-						<option value="php/sample03.php">PHP : Sample 03 : Toolbar selection</option>
-						<option value="php/sample04.php">PHP : Sample 04 : Skins support</option>
-						<option value=""></option>
-					</optgroup>
-					<optgroup label="Python">
-						<option value="py/sample01.py">Python : Sample 01 : Editor with all features</option>
-					</optgroup>
-				</select>
-			</td>
-		</tr>
-	</table>
-</body>
-</html>
diff --git a/phpgwapi/js/fckeditor/_upgrade.html b/phpgwapi/js/fckeditor/_upgrade.html
index d38e3a9d65..54f7ccedc4 100644
--- a/phpgwapi/js/fckeditor/_upgrade.html
+++ b/phpgwapi/js/fckeditor/_upgrade.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/_whatsnew.html b/phpgwapi/js/fckeditor/_whatsnew.html
index a34e704b1f..dea581a4e9 100644
--- a/phpgwapi/js/fckeditor/_whatsnew.html
+++ b/phpgwapi/js/fckeditor/_whatsnew.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -33,133 +33,143 @@
 	<h1>
 		FCKeditor ChangeLog - What's New?</h1>
 	<h3>
-		Version 2.6.3</h3>
+		Version 2.6.4.1</h3>
 	<p>
 		Fixed Bugs:</p>
 	<ul>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2412">#2412</a>] FCK.InsertHtml()
-			is now properly removing selected contents after content insertion in Firefox.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2420">#2420</a>] Spelling
-			mistake corrections made by the spell checking dialog are now undoable. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2411">#2411</a>] Insert
-			anchor was not working for non-empty selections.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2426">#2426</a>] It was
-			impossible to switch between editor areas with a single click.</li>
+		<li><strong>Security release, upgrade is highly recommended.</strong></li>
+	</ul>
+	<h3>
+		Version 2.6.4</h3>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2777">#2777</a>] Merging
+			cells between table header and body is no longer possible.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2815">#2815</a>] Fixed
+			WSC issues at slow connection speed. Added SSL support.</li>
 		<li>Language file updates for the following languages:
 			<ul>
-				<li>Canadian French</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2402">#2402</a>] Catalan
-				</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2400">#2400</a>] Chinese
-					(Simplified and Traditional)</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2401">#2401</a>] Croatian</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2422">#2422</a>] Czech</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2417">#2417</a>] Dutch</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2428">#2428</a>] French</li>
-				<li>German</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2427">#2427</a>] Hebrew</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2410">#2410</a>] Hindi</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2405">#2405</a>] Japanese</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2409">#2409</a>] Norwegian
-					and Norwegian Bokmål</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2429">#2429</a>] Spanish</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2406">#2406</a>] Vietnamese</li>
+				<li>Chinese (Traditional)</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2846">#2846</a>] French</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2801">#2801</a>] Hebrew</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2824">#2824</a>] Russian</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2811">#2811</a>] Turkish</li>
 			</ul>
 		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2757">#2757</a>] Fixed
+			a minor bug which causes selection positions to be improperly restored during undos
+			and redos.</li>
 	</ul>
-	<p>
-		This version has been sponsored by <a href="http://www.dataillusion.com/fs/">Data Illusion
-			survey software solutions</a>.</p>
 	<h3>
-		Version 2.6.3 Beta</h3>
+		Version 2.6.4 Beta</h3>
 	<p>
 		New Features and Improvements:</p>
 	<ul>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/439">#439</a>] Added a
-			new <strong>context menu option for opening links</strong> in the editor.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2220">#2220</a>] <strong>
-			Email links</strong> from the Link dialog <strong>are now encoded</strong> by default
-			to prevent being harvested by spammers. (Kudos to asuter for proposing the patch)
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2685">#2685</a>] Integration
+			with "WebSpellChecker", a <strong>zero installation and free spell checker</strong>
+			provided by SpellChecker.net. This is now the default spell checker in the editor
+			(requires internet connection). All previous spell checking solutions are still
+			available.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2430">#2430</a>] In the
+			table dialog it's possible to create header cells in the first row (included in
+			a thead element) or the first column of the table. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/822">#822</a>] The table
+			cell dialog allows switching between normal data cells or header cells (TD vs. TH).
 		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2234">#2234</a>] Added
-			the ability to create, modify and remove <strong>DIV containers</strong>. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2247">#2247</a>] The <strong>
-			SHIFT+SPACE</strong> keystroke will now <strong>produce a &amp;nbsp;</strong> character.
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2252">#2252</a>] It's
-			now possible to enable the browsers default menu using the configuration file (FCKConfig.BrowserContextMenu
-			option). </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2032">#2032</a>] Added
-			HTML samples for legacy HTML and Flash HTML. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/234">#234</a>] Introduced
-			the "PreventSubmitHandler" setting, which makes it possible to instruct the editor
-			to not handle the hidden field update on form submit events.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2515">#2515</a>] New language
+			file for Icelandic.</li>
 	</ul>
 	<p>
 		Fixed Bugs:</p>
 	<ul>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2319">#2319</a>] On Opera
-			and Firefox 3, the entire page was scrolling on SHIFT+ENTER, or when EnterMode='br'.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2321">#2321</a>] On Firefox
-			3, the entire page was scrolling when inserting block elements with the FCK.InsertElement
-			function, used by the Table and Horizontal Rule buttons.. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/692">#692</a>] Added some
-			hints in editor/css/fck_editorarea.css on how to handle style items that would break
-			the style combo. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2263">#2263</a>] Fixed
-			a JavaScript error in IE which occurs when there are placeholder elements in the
-			document and the user has pressed the Source button.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2314">#2314</a>] Corrected
-			mixed up Chinese translations for the blockquote command.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2323">#2323</a>] Fixed
-			the issue where the show blocks command loses the current selection from the view
-			area when editing a long document.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2322">#2322</a>] Fixed
-			the issue where the fit window command loses the current selection and scroll position
-			in the editing area.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1917">#1917</a>] Fixed
-			the issue where the merge down command for tables cells does not work in IE for
-			more than two cells.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2320">#2320</a>] Fixed
-			the issue where the Find/Replace dialog scrolls the entire page.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1645">#1645</a>] Added
-			warning message about Firefox 3's strict origin policy.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2272">#2272</a>] Improved
-			the garbage filter in Paste from Word dialog.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2327">#2327</a>] Fixed
-			invalid HTML in the Paste dialog.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1907">#1907</a>] Fixed
-			sporadic "FCKeditorAPI is not defined" errors in Firefox 3.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2356">#2356</a>] Fixed
-			access denied error in IE7 when FCKeditor is launched from local filesystem.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1150">#1150</a>] Fixed
-			the type="_moz" attribute that sometimes appear in &lt;br&gt; tags in non-IE browsers.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1229">#1229</a>] Converting
-			multiple contiguous paragraphs to Formatted will now be merged into a single &lt;PRE&gt;
-			block.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2363">#2363</a>] There
-			were some sporadic "Permission Denied" errors with IE on some situations.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2135">#2135</a>] Fixed
-			a data loss bug in IE when there are @import statements in the editor's CSS files,
-			and IE's cache is set to "Check for newer versions on every visit".</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2376">#2376</a>] FCK.InsertHtml()
-			will now insert to the last selected position after the user has selected things
-			outside of FCKeditor, in IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2368">#2368</a>] Fixed
-			broken protect source logic for comments in IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2387">#2387</a>] Fixed
-			JavaScript error with list commands when the editable document is selected with
-			Ctrl-A.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2390">#2390</a>] Fixed
-			the issue where indent styles in JavaScript-generated &lt;p&gt; blocks are erased
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2381">#2381</a>] Protected
+			the editor from duplicate iframes</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1752">#1752</a>] Fixed
+			the issue with tablecommands plugin and undefined tagName.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The &amp;gt;
+			character inside text wasn't encoded in Opera and Safari.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2467">#2467</a>] Fixed
+			JavaScript error with the fit window command in source mode.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2472">#2472</a>] Splitting
+			a TH will create a two TH, not a TH and a TD.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1891">#1891</a>] Removed
+			unnecessary name attributes in dialogs. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/798">#798</a>, <a target="_blank"
+			href="http://dev.fckeditor.net/ticket/2495">#2495</a>] If an image was placed inside
+			a container with dimensions or floating it wasn't possible to edit its properties
+			from the toolbar or context menu.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1982">#1982</a>] Submenus
+			in IE7 now are shown properly.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using
+			the Paste dialogs in IE might insert the content at the start of the editor.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2349">#2496</a>] Fixed
+			RTL dialog layout in Internet Explorer.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2488">#2488</a>] Fixed
+			the issue where email links in IE would take the browser to a new page in addition
+			to calling up the email client.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2519">#2519</a>] Fixed
+			race condition at registering the FCKeditorAPI object in multiple editor scenarios.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2525">#2525</a>] Fixed
+			JavaScript error in Google Chrome when StartupShowBlocks is set to true.</li>
+		<li>Language file updates for the following languages:
+			<ul>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2440">#2440</a>] Dutch</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2451</a>] Basque</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2650</a>] Danish</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2208">#2535</a>] German
+				</li>
+			</ul>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2531">#2531</a>] The ENTER
+			key will properly scroll to the cursor position when breaking long paragraphs.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2573">#2573</a>] The type
+			name in configurations for the ASP connector are now case sensitive.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2503">#2503</a>] DL, DT
+			and DD where missing the formatting in the generated HTML.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2516">#2516</a>] Replaced
+			the extension AddItem of Array with the standard "push" method.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2486">#2486</a>] Vertically
+			splitting cell with colspan &gt; 1 breaks table layout.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2597">#2597</a>] Fixed
+			the issue where dropping contents from outside of the editor doesn't work in Safari.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2412">#2412</a>] Fixed
+			the issue where FCK.InsertHtml() is no longer removing selected contents after content
+			insertion in Firefox.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2407">#2407</a>] Fixed
+			the issue where the Div container command and the blockquote command would break
+			lists.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2469">#2469</a>] Fixed
+			a minor issue where FCK.SetData() may cause the editor to become unresponsive to
+			the first click after being defocused.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2611">#2611</a>] Fixed
+			an extra slash on quickupload of the asp connector.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2616">#2616</a>] Fixed
+			another situation where new elements were inserted at the beginning of the content
 			in IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2394">#2394</a>] Fixed
-			JavaScript error with the "split vertically" command in IE when attempting to split
-			cells in the last row of a table.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2316">#2316</a>] The sample
-			posted data page has now the table fixed at 100% width. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2396">#2396</a>] SpellerPages
-			was causing a "Permission Denied" error in some situations. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2634">#2634</a>] Fixed
+			two obsolete references to Array::AddItem() instances still in the code.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2679">#2679</a>] Fixed
+			infinite loop problems with FCKDomRangeIterator class which causes some commands
+			to hang when applied to certain document structures.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2649">#2649</a>] Fixed
+			a JavaScript error in IE when user tries to search with the "Match whole word" option
+			enabled and the matched word is at exactly the end of document.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2603">#2603</a>] Changed
+			the <a href="http://docs.fckeditor.net/EMailProtection">EMailProtection</a> to "none"
+			for better compatibility.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2612">#2612</a>] The 'ForcePasteAsPlainText'
+			configuration option didn't work correctly in Safari and Chrome.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2696">#2696</a>] Fixed
+			non-working autogrow plugin.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2753">#2753</a>] Fixed
+			occasional exceptions in the dragersizetable plugin with IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2653">#2653</a>] and [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/2733">#2733</a>] Enable undo
+			of changes to tables and table cells.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1865">#1865</a>] The context
+			menu is now working properly over the last row in a table with thead. Thanks to
+			Koen Willems.</li>
 	</ul>
 	<p>
 		<a href="_whatsnew_history.html">See previous versions history</a></p>
diff --git a/phpgwapi/js/fckeditor/_whatsnew_history.html b/phpgwapi/js/fckeditor/_whatsnew_history.html
index 30e1ada160..1718d872bb 100644
--- a/phpgwapi/js/fckeditor/_whatsnew_history.html
+++ b/phpgwapi/js/fckeditor/_whatsnew_history.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -32,6 +32,135 @@
 <body>
 	<h1>
 		FCKeditor ChangeLog - What's New?</h1>
+	<h3>
+		Version 2.6.3</h3>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2412">#2412</a>] FCK.InsertHtml()
+			is now properly removing selected contents after content insertion in Firefox.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2420">#2420</a>] Spelling
+			mistake corrections made by the spell checking dialog are now undoable. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2411">#2411</a>] Insert
+			anchor was not working for non-empty selections.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2426">#2426</a>] It was
+			impossible to switch between editor areas with a single click.</li>
+		<li>Language file updates for the following languages:
+			<ul>
+				<li>Canadian French</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2402">#2402</a>] Catalan
+				</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2400">#2400</a>] Chinese
+					(Simplified and Traditional)</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2401">#2401</a>] Croatian</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2422">#2422</a>] Czech</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2417">#2417</a>] Dutch</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2428">#2428</a>] French</li>
+				<li>German</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2427">#2427</a>] Hebrew</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2410">#2410</a>] Hindi</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2405">#2405</a>] Japanese</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2409">#2409</a>] Norwegian
+					and Norwegian Bokmål</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2429">#2429</a>] Spanish</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2406">#2406</a>] Vietnamese</li>
+			</ul>
+		</li>
+	</ul>
+	<p>
+		This version has been sponsored by <a href="http://www.dataillusion.com/fs/">Data Illusion
+			survey software solutions</a>.</p>
+	<h3>
+		Version 2.6.3 Beta</h3>
+	<p>
+		New Features and Improvements:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/439">#439</a>] Added a
+			new <strong>context menu option for opening links</strong> in the editor.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2220">#2220</a>] <strong>
+			Email links</strong> from the Link dialog <strong>are now encoded</strong> by default
+			to prevent being harvested by spammers. (Kudos to asuter for proposing the patch)
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2234">#2234</a>] Added
+			the ability to create, modify and remove <strong>DIV containers</strong>. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2247">#2247</a>] The <strong>
+			SHIFT+SPACE</strong> keystroke will now <strong>produce a &amp;nbsp;</strong> character.
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2252">#2252</a>] It's
+			now possible to enable the browsers default menu using the configuration file (FCKConfig.BrowserContextMenu
+			option). </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2032">#2032</a>] Added
+			HTML samples for legacy HTML and Flash HTML. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/234">#234</a>] Introduced
+			the "PreventSubmitHandler" setting, which makes it possible to instruct the editor
+			to not handle the hidden field update on form submit events.</li>
+	</ul>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2319">#2319</a>] On Opera
+			and Firefox 3, the entire page was scrolling on SHIFT+ENTER, or when EnterMode='br'.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2321">#2321</a>] On Firefox
+			3, the entire page was scrolling when inserting block elements with the FCK.InsertElement
+			function, used by the Table and Horizontal Rule buttons.. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/692">#692</a>] Added some
+			hints in editor/css/fck_editorarea.css on how to handle style items that would break
+			the style combo. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2263">#2263</a>] Fixed
+			a JavaScript error in IE which occurs when there are placeholder elements in the
+			document and the user has pressed the Source button.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2314">#2314</a>] Corrected
+			mixed up Chinese translations for the blockquote command.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2323">#2323</a>] Fixed
+			the issue where the show blocks command loses the current selection from the view
+			area when editing a long document.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2322">#2322</a>] Fixed
+			the issue where the fit window command loses the current selection and scroll position
+			in the editing area.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1917">#1917</a>] Fixed
+			the issue where the merge down command for tables cells does not work in IE for
+			more than two cells.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2320">#2320</a>] Fixed
+			the issue where the Find/Replace dialog scrolls the entire page.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1645">#1645</a>] Added
+			warning message about Firefox 3's strict origin policy.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2272">#2272</a>] Improved
+			the garbage filter in Paste from Word dialog.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2327">#2327</a>] Fixed
+			invalid HTML in the Paste dialog.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1907">#1907</a>] Fixed
+			sporadic "FCKeditorAPI is not defined" errors in Firefox 3.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2356">#2356</a>] Fixed
+			access denied error in IE7 when FCKeditor is launched from local filesystem.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1150">#1150</a>] Fixed
+			the type="_moz" attribute that sometimes appear in &lt;br&gt; tags in non-IE browsers.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1229">#1229</a>] Converting
+			multiple contiguous paragraphs to Formatted will now be merged into a single &lt;PRE&gt;
+			block.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2363">#2363</a>] There
+			were some sporadic "Permission Denied" errors with IE on some situations.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2135">#2135</a>] Fixed
+			a data loss bug in IE when there are @import statements in the editor's CSS files,
+			and IE's cache is set to "Check for newer versions on every visit".</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2376">#2376</a>] FCK.InsertHtml()
+			will now insert to the last selected position after the user has selected things
+			outside of FCKeditor, in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2368">#2368</a>] Fixed
+			broken protect source logic for comments in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2387">#2387</a>] Fixed
+			JavaScript error with list commands when the editable document is selected with
+			Ctrl-A.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2390">#2390</a>] Fixed
+			the issue where indent styles in JavaScript-generated &lt;p&gt; blocks are erased
+			in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2394">#2394</a>] Fixed
+			JavaScript error with the "split vertically" command in IE when attempting to split
+			cells in the last row of a table.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2316">#2316</a>] The sample
+			posted data page has now the table fixed at 100% width. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2396">#2396</a>] SpellerPages
+			was causing a "Permission Denied" error in some situations. </li>
+	</ul>
 	<h3>
 		Version 2.6.2</h3>
 	<p>
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckcontextmenu.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckcontextmenu.js
index 30c9d50261..916705537a 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckcontextmenu.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckcontextmenu.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckdataprocessor.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckdataprocessor.js
index 596d367775..7dcf5e8e40 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckdataprocessor.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckdataprocessor.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
index cf55b77d3c..fff2eeebfa 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
index 4d30ae7550..21b7b9e93e 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange.js
index 42e2591753..ed5bf6b382 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -469,13 +469,13 @@ FCKDomRange.prototype =
 		// Also note that the node that we use for "address base" would change during backtracking.
 		var addrStart = this._Range.startContainer ;
 		var addrEnd = this._Range.endContainer ;
-		while ( curStart && addrStart.nodeType == 3 )
+		while ( curStart && curStart.nodeType == 3 && addrStart.nodeType == 3 )
 		{
 			bookmark.Start[0] += curStart.length ;
 			addrStart = curStart ;
 			curStart = curStart.previousSibling ;
 		}
-		while ( curEnd && addrEnd.nodeType == 3 )
+		while ( curEnd && curEnd.nodeType == 3 && addrEnd.nodeType == 3 )
 		{
 			bookmark.End[0] += curEnd.length ;
 			addrEnd = curEnd ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_gecko.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_gecko.js
index 9a471128fa..defc29ed42 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_ie.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_ie.js
index e3b200d03c..1d53fd17af 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrange_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrangeiterator.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrangeiterator.js
index 612dcf5972..cfebd5a9ba 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrangeiterator.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckdomrangeiterator.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -136,7 +136,7 @@ FCKDomRangeIterator.prototype =
 						// The found boundary must be set as the next one at this
 						// point. (#1717)
 						if ( nodeName != 'br' )
-							this._NextNode = FCKDomTools.GetNextSourceNode( currentNode, true, null, lastNode ) ;
+							this._NextNode = FCKDomTools.GetNextSourceNode( currentNode, true, null, lastNode ) || currentNode ;
 					}
 
 					closeRange = true ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckeditingarea.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckeditingarea.js
index b5abcb4cb4..1904125ca4 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckeditingarea.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckeditingarea.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckelementpath.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckelementpath.js
index 1e7a683009..7c3a8172c1 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckelementpath.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckelementpath.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckenterkey.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckenterkey.js
index 882180ac46..4c7a620b2e 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckenterkey.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckenterkey.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -531,7 +531,27 @@ FCKEnterKey.prototype._ExecuteEnterBlock = function( blockTag, range )
 		}
 
 		if ( FCKBrowserInfo.IsGeckoLike )
-			FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ;
+		{
+			if ( eNextBlock )
+			{
+				// If we have split the block, adds a temporary span at the
+				// range position and scroll relatively to it.
+				var tmpNode = this.Window.document.createElement( 'span' ) ;
+
+				// We need some content for Safari.
+				tmpNode.innerHTML = '&nbsp;';
+
+				oRange.InsertNode( tmpNode ) ;
+				FCKDomTools.ScrollIntoView( tmpNode, false ) ;
+				oRange.DeleteContents() ;
+			}
+			else
+			{
+				// We may use the above scroll logic for the new block case
+				// too, but it gives some weird result with Opera.
+				FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ;
+			}
+		}
 
 		oRange.Select() ;
 	}
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckevents.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckevents.js
index 8248187f62..7369775ad9 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckevents.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckevents.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckhtmliterator.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckhtmliterator.js
index bfe3c2c46a..d0720ae71d 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckhtmliterator.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckhtmliterator.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -71,7 +71,7 @@ FCKHtmlIterator.prototype =
 } ;
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckicon.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckicon.js
index af2015c25d..57216935e4 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckicon.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckicon.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckiecleanup.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckiecleanup.js
index 6a6a0b44e3..c1ad453159 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckiecleanup.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckiecleanup.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckimagepreloader.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckimagepreloader.js
index a8030451c4..b733b2f6c1 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckimagepreloader.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckimagepreloader.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckkeystrokehandler.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckkeystrokehandler.js
index 3eb93d1eb1..a464940867 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckkeystrokehandler.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckkeystrokehandler.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublock.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublock.js
index c55b84fd51..83524e2ecc 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublock.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublock.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublockpanel.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublockpanel.js
index 84cce03390..659b5864c2 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublockpanel.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckmenublockpanel.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckmenuitem.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckmenuitem.js
index 6f659f4153..c1c6b75c03 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckmenuitem.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckmenuitem.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckpanel.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckpanel.js
index a58b23a547..5a20159330 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckpanel.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckpanel.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -128,6 +128,60 @@ FCKPanel.prototype.Preload = function( x, y, relElement )
 		this._Popup.show( x, y, 0, 0, relElement ) ;
 }
 
+// Workaround for IE7 problem. See #1982
+// Submenus are restricted to the size of its parent, so we increase it as needed.
+// Returns true if the panel has been repositioned
+FCKPanel.prototype.ResizeForSubpanel = function( panel, width, height )
+{
+	if ( !FCKBrowserInfo.IsIE7 )
+		return false ;
+
+	if ( !this._Popup.isOpen )
+	{
+		this.Subpanel = null ;
+		return false ;
+	}
+
+	// If we are resetting the extra space
+	if ( width == 0 && height == 0 )
+	{
+		// Another subpanel is being shown, so we must not shrink back
+		if (this.Subpanel !== panel)
+			return false ;
+
+		// Reset values.
+		// We leave the IncreasedY untouched to avoid vertical movement of the
+		// menu if the submenu is higher than the main menu.
+		this.Subpanel = null ;
+		this.IncreasedX = 0 ;
+	}
+	else
+	{
+		this.Subpanel = panel ;
+		// If the panel has already been increased enough, get out
+		if ( ( this.IncreasedX >= width ) && ( this.IncreasedY >= height ) )
+			return false ;
+
+		this.IncreasedX = Math.max( this.IncreasedX, width ) ;
+		this.IncreasedY = Math.max( this.IncreasedY, height ) ;
+	}
+
+	var x = this.ShowRect.x ;
+	var w = this.IncreasedX ;
+	if ( this.IsRTL )
+		x  = x - w ;
+
+	// Horizontally increase as needed (sum of widths).
+	// Vertically, use only the maximum of this menu or the submenu
+	var finalWidth = this.ShowRect.w + w ;
+	var finalHeight = Math.max( this.ShowRect.h, this.IncreasedY ) ;
+	if ( this.ParentPanel )
+		this.ParentPanel.ResizeForSubpanel( this, finalWidth, finalHeight ) ;
+	this._Popup.show( x, this.ShowRect.y, finalWidth, finalHeight, this.RelativeElement ) ;
+
+	return this.IsRTL ;
+}
+
 FCKPanel.prototype.Show = function( x, y, relElement, width, height )
 {
 	var iMainWidth ;
@@ -150,6 +204,16 @@ FCKPanel.prototype.Show = function( x, y, relElement, width, height )
 
 		iMainWidth = eMainNode.offsetWidth ;
 
+		if ( FCKBrowserInfo.IsIE7 )
+		{
+			if (this.ParentPanel && this.ParentPanel.ResizeForSubpanel(this, iMainWidth, eMainNode.offsetHeight) )
+			{
+				// As the parent has moved, allow the browser to update its internal data, so the new position is correct.
+				FCKTools.RunFunction( this.Show, this, [x, y, relElement] ) ;
+				return ;
+			}
+		}
+
 		if ( this.IsRTL )
 		{
 			if ( this.IsContextMenu )
@@ -158,6 +222,15 @@ FCKPanel.prototype.Show = function( x, y, relElement, width, height )
 				x  = ( x * -1 ) + relElement.offsetWidth - iMainWidth ;
 		}
 
+		if ( FCKBrowserInfo.IsIE7 )
+		{
+			// Store the values that will be used by the ResizeForSubpanel function
+			this.ShowRect = {x:x, y:y, w:iMainWidth, h:eMainNode.offsetHeight} ;
+			this.IncreasedX = 0 ;
+			this.IncreasedY = 0 ;
+			this.RelativeElement = relElement ;
+		}
+
 		// Second call: Show the Popup at the specified location, with the correct size.
 		this._Popup.show( x, y, iMainWidth, eMainNode.offsetHeight, relElement ) ;
 
@@ -373,6 +446,9 @@ function CheckPopupOnHide( forceHide )
 		window.clearInterval( this._Timer ) ;
 		this._Timer = null ;
 
+		if (this._Popup && this.ParentPanel && !forceHide)
+			this.ParentPanel.ResizeForSubpanel(this, 0, 0) ;
+
 		FCKTools.RunFunction( this.OnHide, this ) ;
 	}
 }
@@ -383,4 +459,5 @@ function FCKPanel_Cleanup()
 	this._Window = null ;
 	this.Document = null ;
 	this.MainNode = null ;
+	this.RelativeElement = null ;
 }
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckplugin.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckplugin.js
index ded306da62..8e6a616d11 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckplugin.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckplugin.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckspecialcombo.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckspecialcombo.js
index e8548612a0..a9b45c889d 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckspecialcombo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckspecialcombo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckstyle.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckstyle.js
index 12d3b9e7bc..f66dbac812 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckstyle.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckstyle.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbar.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbar.js
index 86054e7785..0ff9583236 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbar.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbar.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
index 114217ef0f..21bc5c4848 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
index 1f912094a6..f98ed414fd 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbutton.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbutton.js
index c2516a7748..7b4944ffd3 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbutton.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbutton.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
index b95a8b2217..66a3d1b607 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
index 901add40f8..1cc85e7a04 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
index 02f47bfba7..ab22654d1c 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
index 4c28c9b800..b755fb3d52 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
index 56ecc6e48c..1b95b904b9 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
index 14b8834d88..693386472d 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
index 011265e64f..384175a9f4 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckw3crange.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckw3crange.js
index bb6d0487c5..e3888bdeb4 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckw3crange.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckw3crange.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckxml.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckxml.js
index aa15659eb6..b83bd9daee 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckxml.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckxml.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_gecko.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_gecko.js
index 9633aa9a94..7cec7443ef 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_ie.js b/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_ie.js
index a14e072623..42535d44d8 100644
--- a/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/classes/fckxml_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fck_othercommands.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fck_othercommands.js
index 84f96ba532..8970247bc0 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fck_othercommands.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fck_othercommands.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -311,7 +311,7 @@ FCKUnlinkCommand.prototype.GetState = function()
 	return state ;
 }
 
-FCKVisitLinkCommand = function()
+var FCKVisitLinkCommand = function()
 {
 	this.Name = 'VisitLink';
 }
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js
index 8ec3b5140b..ef561d2118 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -83,7 +83,6 @@ FCKBlockQuoteCommand.prototype =
 
 		if ( state == FCK_TRISTATE_OFF )
 		{
-			iterator.EnforceRealBlocks = true ;
 			var paragraphs = [] ;
 			while ( ( block = iterator.GetNextParagraph() ) )
 				paragraphs.push( block ) ;
@@ -109,6 +108,13 @@ FCKBlockQuoteCommand.prototype =
 				block = paragraphs[i] ;
 				commonParent = FCKDomTools.GetCommonParents( block.parentNode, commonParent ).pop() ;
 			}
+
+			// The common parent must not be the following tags: table, tbody, tr, ol, ul.
+			while ( commonParent.nodeName.IEquals( 'table', 'tbody', 'tr', 'ol', 'ul' ) )
+				commonParent = commonParent.parentNode ;
+
+			// Reconstruct the block list to be processed such that all resulting blocks
+			// satisfy parentNode == commonParent.
 			var lastBlock = null ;
 			while ( paragraphs.length > 0 )
 			{
@@ -150,6 +156,7 @@ FCKBlockQuoteCommand.prototype =
 		else if ( state == FCK_TRISTATE_ON )
 		{
 			var moveOutNodes = [] ;
+			var elementMarkers = {} ;
 			while ( ( block = iterator.GetNextParagraph() ) )
 			{
 				var bqParent = null ;
@@ -165,11 +172,27 @@ FCKBlockQuoteCommand.prototype =
 					block = block.parentNode ;
 				}
 
-				if ( bqParent && bqChild )
+				// Remember the blocks that were recorded down in the moveOutNodes array
+				// to prevent duplicates.
+				if ( bqParent && bqChild && !bqChild._fckblockquotemoveout )
+				{
 					moveOutNodes.push( bqChild ) ;
+					FCKDomTools.SetElementMarker( elementMarkers, bqChild, '_fckblockquotemoveout', true ) ;
+				}
 			}
+			FCKDomTools.ClearAllMarkers( elementMarkers ) ;
 
 			var movedNodes = [] ;
+			var processedBlockquoteBlocks = [], elementMarkers = {} ;
+			var noBlockLeft = function( bqBlock )
+			{
+				for ( var i = 0 ; i < bqBlock.childNodes.length ; i++ )
+				{
+					if ( FCKListsLib.BlockElements[ bqBlock.childNodes[i].nodeName.toLowerCase() ] )
+						return false ;
+				}
+				return true ;
+			} ;
 			while ( moveOutNodes.length > 0 )
 			{
 				var node = moveOutNodes.shift() ;
@@ -178,23 +201,31 @@ FCKBlockQuoteCommand.prototype =
 				// If the node is located at the beginning or the end, just take it out without splitting.
 				// Otherwise, split the blockquote node and move the paragraph in between the two blockquote nodes.
 				if ( node == node.parentNode.firstChild )
-				{
 					bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock ) ;
-					if ( ! bqBlock.firstChild )
-						bqBlock.parentNode.removeChild( bqBlock ) ;
-				}
 				else if ( node == node.parentNode.lastChild )
-				{
 					bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock.nextSibling ) ;
-					if ( ! bqBlock.firstChild )
-						bqBlock.parentNode.removeChild( bqBlock ) ;
-				}
 				else
 					FCKDomTools.BreakParent( node, node.parentNode, range ) ;
 
+				// Remember the blockquote node so we can clear it later (if it becomes empty).
+				if ( !bqBlock._fckbqprocessed )
+				{
+					processedBlockquoteBlocks.push( bqBlock ) ;
+					FCKDomTools.SetElementMarker( elementMarkers, bqBlock, '_fckbqprocessed', true );
+				}
+
 				movedNodes.push( node ) ;
 			}
 
+			// Clear blockquote nodes that have become empty.
+			for ( var i = processedBlockquoteBlocks.length - 1 ; i >= 0 ; i-- )
+			{
+				var bqBlock = processedBlockquoteBlocks[i] ;
+				if ( noBlockLeft( bqBlock ) )
+					FCKDomTools.RemoveNode( bqBlock ) ;
+			}
+			FCKDomTools.ClearAllMarkers( elementMarkers ) ;
+
 			if ( FCKConfig.EnterMode.IEquals( 'br' ) )
 			{
 				while ( movedNodes.length )
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js
index 9284177e07..726b5cc6a3 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckfitwindow.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckfitwindow.js
index 812beb5297..1047e44b4e 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckfitwindow.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckfitwindow.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -38,9 +38,19 @@ FCKFitWindow.prototype.Execute = function()
 	var eParent ;
 
 	// Save the current selection and scroll position.
-	var oRange = new FCKDomRange( FCK.EditorWindow ) ;
-	oRange.MoveToSelection() ;
-	var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
+	var oRange, oEditorScrollPos ;
+	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+	{
+		oRange = new FCKDomRange( FCK.EditorWindow ) ;
+		oRange.MoveToSelection() ;
+		oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
+	}
+	else
+	{
+		var eTextarea = FCK.EditingArea.Textarea ;
+		oRange = !FCKBrowserInfo.IsIE && [ eTextarea.selectionStart, eTextarea.selectionEnd ] ;
+		oEditorScrollPos = [ eTextarea.scrollLeft, eTextarea.scrollTop ] ;
+	}
 
 	// No original style properties known? Go fullscreen.
 	if ( !this.IsMaximized )
@@ -167,8 +177,21 @@ FCKFitWindow.prototype.Execute = function()
 	FCK.Focus() ;
 
 	// Restore the selection and scroll position of inside the document.
-	oRange.Select() ;
-	FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
+	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+	{
+		oRange.Select() ;
+		FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
+	}
+	else
+	{
+		if ( !FCKBrowserInfo.IsIE )
+		{
+			eTextarea.selectionStart = oRange[0] ;
+			eTextarea.selectionEnd = oRange[1] ;
+		}
+		eTextarea.scrollLeft = oEditorScrollPos[0] ;
+		eTextarea.scrollTop = oEditorScrollPos[1] ;
+	}
 }
 
 FCKFitWindow.prototype.GetState = function()
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckindentcommands.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckindentcommands.js
index ffc95233dd..8bc6d80fa0 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckindentcommands.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckindentcommands.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckjustifycommands.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckjustifycommands.js
index d62b434a44..48608c5dfb 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckjustifycommands.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckjustifycommands.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcklistcommands.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcklistcommands.js
index e85cffcb45..518001d5e3 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcklistcommands.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcklistcommands.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcknamedcommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
index b82d3faafc..aa82a4b004 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
index f2aec98139..3465e1bdcd 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
index 3aaa93ae3b..ee715ca496 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js
index 18f858278f..6d1adbbfe0 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckshowblocks.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckshowblocks.js
index 6a2f3a479a..71adbada31 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckshowblocks.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckshowblocks.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -56,9 +56,12 @@ FCKShowBlockCommand.prototype.Execute = function()
 	else
 	{
 		var focus = FCK.EditorWindow.getSelection().focusNode ;
-		if ( focus.nodeType != 1 )
-			focus = focus.parentNode ;
-		FCKDomTools.ScrollIntoView( focus, false ) ;
+		if ( focus )
+		{
+			if ( focus.nodeType != 1 )
+				focus = focus.parentNode ;
+			FCKDomTools.ScrollIntoView( focus, false ) ;
+		}
 	}
 
 	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
index e0a554ee5f..0155710f6b 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -25,12 +25,20 @@
 var FCKSpellCheckCommand = function()
 {
 	this.Name = 'SpellCheck' ;
-	this.IsEnabled = ( FCKConfig.SpellChecker == 'SpellerPages' ) ;
+	this.IsEnabled = ( FCKConfig.SpellChecker != 'ieSpell' ) ;
 }
 
 FCKSpellCheckCommand.prototype.Execute = function()
 {
-	FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ;
+	switch ( FCKConfig.SpellChecker )
+	{
+		case 'SpellerPages' :
+			FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ;
+			break;
+
+		case 'WSC' :
+			FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'wsc/w.html', 530, 480 ) ;
+	}
 }
 
 FCKSpellCheckCommand.prototype.GetState = function()
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
index 67289b92ca..075a54362c 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -25,7 +25,7 @@
 var FCKSpellCheckCommand = function()
 {
 	this.Name = 'SpellCheck' ;
-	this.IsEnabled = ( FCKConfig.SpellChecker == 'ieSpell' || FCKConfig.SpellChecker == 'SpellerPages' ) ;
+	this.IsEnabled = true ;
 }
 
 FCKSpellCheckCommand.prototype.Execute = function()
@@ -39,6 +39,9 @@ FCKSpellCheckCommand.prototype.Execute = function()
 		case 'SpellerPages' :
 			FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ;
 			break ;
+
+		case 'WSC' :
+			FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'wsc/w.html', 530, 480 ) ;
 	}
 }
 
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckstylecommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckstylecommand.js
index bf272fa1dd..36a3463f99 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckstylecommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fckstylecommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktablecommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktablecommand.js
index 38f94b20c5..6bf956e6b5 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktablecommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktablecommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
index c3217ec4c8..dcfefde770 100644
--- a/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
+++ b/phpgwapi/js/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/fckconstants.js b/phpgwapi/js/fckeditor/editor/_source/fckconstants.js
index cb4411214d..3bd38e5657 100644
--- a/phpgwapi/js/fckeditor/editor/_source/fckconstants.js
+++ b/phpgwapi/js/fckeditor/editor/_source/fckconstants.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/fckeditorapi.js b/phpgwapi/js/fckeditor/editor/_source/fckeditorapi.js
index 480e702508..fe267de9bd 100644
--- a/phpgwapi/js/fckeditor/editor/_source/fckeditorapi.js
+++ b/phpgwapi/js/fckeditor/editor/_source/fckeditorapi.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -40,9 +40,9 @@ function InitializeAPI()
 		// objects that aren't really FCKeditor instances.
 		var sScript =
 			'window.FCKeditorAPI = {' +
-				'Version : "2.6.3",' +
-				'VersionBuild : "19836",' +
-				'Instances : new Object(),' +
+				'Version : "2.6.4.1",' +
+				'VersionBuild : "23187",' +
+				'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
 
 				'GetInstance : function( name )' +
 				'{' +
@@ -60,7 +60,7 @@ function InitializeAPI()
 					'this._FCKOriginalSubmit() ;' +
 				'},' +
 
-				'_FunctionQueue	: {' +
+				'_FunctionQueue	: window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {' +
 					'Functions : new Array(),' +
 					'IsRunning : false,' +
 
@@ -117,8 +117,9 @@ function InitializeAPI()
 			}
 			else if ( FCKBrowserInfo.IsSafari )
 			{
-				// oParentWindow.eval in Safari and Gran Paradiso executes in the calling window
-				// environment, instead of the parent one. The following should make it work.
+				// oParentWindow.eval in Safari executes in the calling window
+				// environment, instead of the parent one. The following should
+				// make it work.
 				var oParentDocument = oParentWindow.document ;
 				var eScript = oParentDocument.createElement('script') ;
 				eScript.appendChild( oParentDocument.createTextNode( sScript ) ) ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/fckjscoreextensions.js b/phpgwapi/js/fckeditor/editor/_source/fckjscoreextensions.js
index 01dda49c94..b790ff2488 100644
--- a/phpgwapi/js/fckeditor/editor/_source/fckjscoreextensions.js
+++ b/phpgwapi/js/fckeditor/editor/_source/fckjscoreextensions.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -148,13 +148,6 @@ String.prototype.Replace = function( regExp, replacement, thisObj )
 		return this.replace( regExp, replacement ) ;
 }
 
-Array.prototype.AddItem = function( item )
-{
-	var i = this.length ;
-	this[ i ] = item ;
-	return i ;
-}
-
 Array.prototype.IndexOf = function( value )
 {
 	for ( var i = 0 ; i < this.length ; i++ )
diff --git a/phpgwapi/js/fckeditor/editor/_source/fckscriptloader.js b/phpgwapi/js/fckeditor/editor/_source/fckscriptloader.js
index 17f4085812..1adae159bd 100644
--- a/phpgwapi/js/fckeditor/editor/_source/fckscriptloader.js
+++ b/phpgwapi/js/fckeditor/editor/_source/fckscriptloader.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck.js
index 488bb41bc8..1b4b24b7d6 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fck.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -409,7 +409,11 @@ var FCK =
 			FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ;
 		}
 
-		FCKTempBin.Reset();
+		FCKTempBin.Reset() ;
+
+		// Bug #2469: SelectionData.createRange becomes undefined after the editor
+		// iframe is changed by FCK.SetData().
+		FCK.Selection.Release() ;
 
 		if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
 		{
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck_contextmenu.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck_contextmenu.js
index a155382cfa..166d4327ac 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fck_contextmenu.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck_contextmenu.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -337,6 +337,9 @@ function FCK_ContextMenu_OnBeforeOpen()
 
 function FCK_ContextMenu_OnItemClick( item )
 {
-	FCK.Focus() ;
+	// IE might work incorrectly if we refocus the editor #798
+	if ( !FCKBrowserInfo.IsIE )
+		FCK.Focus() ;
+
 	FCKCommands.GetCommand( item.Name ).Execute( item.CustomData ) ;
 }
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js
index 7ae5720333..883be26fab 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -229,9 +229,8 @@ FCK.InitializeBehaviors = function()
 	}
 	else if ( FCKBrowserInfo.IsSafari )
 	{
-		var cancelHandler = function( evt ){ if ( ! FCK.MouseDownFlag ) evt.returnValue = false ; }
-		this.EditorDocument.addEventListener( 'dragenter', cancelHandler, true ) ;
-		this.EditorDocument.addEventListener( 'dragover', cancelHandler, true ) ;
+		this.EditorDocument.addEventListener( 'dragover', function ( evt )
+				{ if ( !FCK.MouseDownFlag && FCK.Config.ForcePasteAsPlainText ) evt.returnValue = false ; }, true ) ;
 		this.EditorDocument.addEventListener( 'drop', this._ExecDrop, true ) ;
 		this.EditorDocument.addEventListener( 'mousedown',
 			function( ev )
@@ -322,7 +321,12 @@ FCK.ExecuteRedirectedNamedCommand = function( commandName, commandParameter )
 				if ( FCK.Paste() )
 					FCK.ExecuteNamedCommand( 'Paste', null, true ) ;
 			}
-			catch (e)	{ FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ; }
+			catch (e)	{
+				if ( FCKConfig.ForcePasteAsPlainText )
+					FCK.PasteAsPlainText() ;
+				else
+					FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ;
+			}
 			break ;
 		default :
 			FCK.ExecuteNamedCommand( commandName, commandParameter ) ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js
index 7e51f76b08..b52ab92fd5 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -136,7 +136,7 @@ FCK.InitializeBehaviors = function( dontReturn )
 
 	this.EditorDocument.attachEvent("ondblclick", Doc_OnDblClick ) ;
 
-	this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save( true ) ; } ) ;
+	this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save() ; } ) ;
 
 	// Catch cursor selection changes.
 	this.EditorDocument.attachEvent("onselectionchange", Doc_OnSelectionChange ) ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckbrowserinfo.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckbrowserinfo.js
index e97d4f579a..6c29387b3f 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckbrowserinfo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckbrowserinfo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckcodeformatter.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckcodeformatter.js
index 5850020794..0a3a1d2a39 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckcodeformatter.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckcodeformatter.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -28,8 +28,8 @@ FCKCodeFormatter.Init = function()
 	var oRegex = this.Regex = new Object() ;
 
 	// Regex for line breaks.
-	oRegex.BlocksOpener = /\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ;
-	oRegex.BlocksCloser = /\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ;
+	oRegex.BlocksOpener = /\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ;
+	oRegex.BlocksCloser = /\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ;
 
 	oRegex.NewLineTags	= /\<(BR|HR)[^\>]*\>/gi ;
 
@@ -38,8 +38,8 @@ FCKCodeFormatter.Init = function()
 	oRegex.LineSplitter = /\s*\n+\s*/g ;
 
 	// Regex for indentation.
-	oRegex.IncreaseIndent = /^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i ;
-	oRegex.DecreaseIndent = /^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i ;
+	oRegex.IncreaseIndent = /^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \/\>]/i ;
+	oRegex.DecreaseIndent = /^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \>]/i ;
 	oRegex.FormatIndentatorRemove = new RegExp( '^' + FCKConfig.FormatIndentator ) ;
 
 	oRegex.ProtectedTags = /(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi ;
@@ -47,7 +47,7 @@ FCKCodeFormatter.Init = function()
 
 FCKCodeFormatter._ProtectData = function( outer, opener, data, closer )
 {
-	return opener + '___FCKpd___' + FCKCodeFormatter.ProtectedData.AddItem( data ) + closer ;
+	return opener + '___FCKpd___' + ( FCKCodeFormatter.ProtectedData.push( data ) - 1 ) + closer ;
 }
 
 FCKCodeFormatter.Format = function( html )
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckcommands.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckcommands.js
index bb9c2088c1..6b801f92ba 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckcommands.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckcommands.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckconfig.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckconfig.js
index 8a30047a07..36f2f612be 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckconfig.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckconfig.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -154,7 +154,7 @@ FCKConfig.Plugins.Items = new Array() ;
 
 FCKConfig.Plugins.Add = function( name, langs, path )
 {
-	FCKConfig.Plugins.Items.AddItem( [name, langs, path] ) ;
+	FCKConfig.Plugins.Items.push( [name, langs, path] ) ;
 }
 
 // FCKConfig.ProtectedSource: object that holds a collection of Regular
@@ -180,7 +180,7 @@ FCKConfig.ProtectedSource.RegexEntries = [
 
 FCKConfig.ProtectedSource.Add = function( regexPattern )
 {
-	this.RegexEntries.AddItem( regexPattern ) ;
+	this.RegexEntries.push( regexPattern ) ;
 }
 
 FCKConfig.ProtectedSource.Protect = function( html )
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckdebug.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckdebug.js
index d554e4da6a..5d6ed8d6d4 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckdebug.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckdebug.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -32,7 +32,7 @@ var FCKDebug =
 
 		try
 		{
-			this._GetWindow().Output( message, color ) ;
+			this._GetWindow().Output( message, color, noParse ) ;
 		}
 		catch ( e ) {}	 // Ignore errors
 	},
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckdialog.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckdialog.js
index e60992df3a..b0558871eb 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckdialog.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckdialog.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -94,7 +94,7 @@ var FCKDialog = ( function()
 				TopWindow : topWindow
 			}
 
-			FCK.ToolbarSet.CurrentInstance.Selection.Save() ;
+			FCK.ToolbarSet.CurrentInstance.Selection.Save( true ) ;
 
 			// Calculate the dialog position, centering it on the screen.
 			var viewSize = FCKTools.GetViewPaneSize( topWindow ) ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckdocumentprocessor.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckdocumentprocessor.js
index 5921f55867..c7dadac4c3 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckdocumentprocessor.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckdocumentprocessor.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -27,7 +27,7 @@ FCKDocumentProcessor._Items = new Array() ;
 FCKDocumentProcessor.AppendNew = function()
 {
 	var oNewItem = new Object() ;
-	this._Items.AddItem( oNewItem ) ;
+	this._Items.push( oNewItem ) ;
 	return oNewItem ;
 }
 
@@ -122,7 +122,7 @@ FCKPageBreaksProcessor.ProcessDocument = function( document )
 }
 
 // EMBED and OBJECT tags.
-FCKEmbedAndObjectProcessor = (function()
+var FCKEmbedAndObjectProcessor = (function()
 {
 	var customProcessors = [] ;
 
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckdomtools.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckdomtools.js
index 48768af080..e4930b403d 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckdomtools.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckdomtools.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcklanguagemanager.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcklanguagemanager.js
index ec10fc11b5..f269f67385 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcklanguagemanager.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcklanguagemanager.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -55,6 +55,7 @@ var FCKLanguageManager = FCK.Language =
 		hi		: 'Hindi',
 		hr		: 'Croatian',
 		hu		: 'Hungarian',
+		is		: 'Icelandic',
 		it		: 'Italian',
 		ja		: 'Japanese',
 		km		: 'Khmer',
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcklisthandler.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcklisthandler.js
index 91051356b4..14fa030071 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcklisthandler.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcklisthandler.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcklistslib.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcklistslib.js
index 1bcd83cb54..d38fba5687 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcklistslib.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcklistslib.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckplugins.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckplugins.js
index 2e8cd2679d..e94990eaad 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckplugins.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckplugins.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckregexlib.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckregexlib.js
index 8b35245f5e..b99743ba94 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckregexlib.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckregexlib.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckselection.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckselection.js
index 82beb52049..dd815d37b7 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckselection.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckselection.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_gecko.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_gecko.js
index b01cd3b87d..e1e9d1567d 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_ie.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_ie.js
index 0c665716bf..d2e145ce37 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckselection_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -155,6 +155,7 @@ FCKSelection.HasAncestorNode = function( nodeTagName )
 } ;
 
 // The "nodeTagName" parameter must be UPPER CASE.
+// It can be also an array of names
 FCKSelection.MoveToAncestorNode = function( nodeTagName )
 {
 	var oNode, oRange ;
@@ -180,7 +181,7 @@ FCKSelection.MoveToAncestorNode = function( nodeTagName )
 		oNode = oRange.parentElement() ;
 	}
 
-	while ( oNode && oNode.nodeName != nodeTagName )
+	while ( oNode && !oNode.nodeName.Equals( nodeTagName ) )
 		oNode = oNode.parentNode ;
 
 	return oNode ;
@@ -209,23 +210,29 @@ FCKSelection.GetSelection = function()
 	return FCK.EditorDocument.selection ;
 }
 
-FCKSelection.Save = function( noFocus )
+FCKSelection.Save = function( lock )
 {
-	// Ensures the editor has the selection focus. (#1801)
-	if ( !noFocus )
-		FCK.Focus() ;
-
 	var editorDocument = FCK.EditorDocument ;
 
 	if ( !editorDocument )
 		return ;
 
+	// Avoid saving again a selection while a dialog is open #2616
+	if ( this.locked )
+		return ;
+	this.locked = !!lock ;
+
 	var selection = editorDocument.selection ;
 	var range ;
 
 	if ( selection )
 	{
-		range = selection.createRange() ;
+		// The call might fail if the document doesn't have the focus (#1801),
+		// but we don't want to modify the current selection (#2495) with a call to FCK.Focus() ;
+		try {
+			range = selection.createRange() ;
+		}
+		catch(e) {}
 
 		// Ensure that the range comes from the editor document.
 		if ( range )
@@ -275,5 +282,6 @@ FCKSelection.Restore = function()
 
 FCKSelection.Release = function()
 {
+	this.locked = false ;
 	delete this.SelectionData ;
 }
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckstyles.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckstyles.js
index 6a4dc5eb87..1beca4f7c2 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckstyles.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckstyles.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler.js
index dc8981b862..93b12f0475 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -52,7 +52,7 @@ FCKTableHandler.DeleteRows = function( row )
 		//queue up the rows -- it's possible ( and likely ) that we may get duplicates
 		for ( var i = 0; i < aCells.length; i++ )
 		{
-			var oRow = FCKTools.GetElementAscensor( aCells[i],'TR' ) ;
+			var oRow = aCells[i].parentNode ;
 			aRowsToDelete[oRow.rowIndex] = oRow ;
 		}
 		for ( var i = aRowsToDelete.length; i >= 0; i-- )
@@ -118,13 +118,13 @@ FCKTableHandler.InsertColumn = function( insertBefore )
 
 	var iIndex = oCell.cellIndex ;
 
-	// Loop throw all rows available in the table.
+	// Loop through all rows available in the table.
 	for ( var i = 0 ; i < oTable.rows.length ; i++ )
 	{
 		// Get the row.
 		var oRow = oTable.rows[i] ;
 
-		// If the row doens't have enough cells, ignore it.
+		// If the row doesn't have enough cells, ignore it.
 		if ( oRow.cells.length < ( iIndex + 1 ) )
 			continue ;
 
@@ -136,12 +136,7 @@ FCKTableHandler.InsertColumn = function( insertBefore )
 		// Get back the currently selected cell.
 		var oBaseCell = oRow.cells[iIndex] ;
 
-		if ( insertBefore )
-			oRow.insertBefore( oCell, oBaseCell ) ;
-		else if ( oBaseCell.nextSibling )
-			oRow.insertBefore( oCell, oBaseCell.nextSibling ) ;
-		else
-			oRow.appendChild( oCell ) ;
+		oRow.insertBefore( oCell, ( insertBefore ? oBaseCell : oBaseCell.nextSibling ) ) ;
 	}
 }
 
@@ -218,7 +213,7 @@ FCKTableHandler.DeleteCell = function( cell )
 	if ( cell.parentNode.cells.length == 1 )
 	{
 		// Delete the entire row.
-		FCKTableHandler.DeleteRows( FCKTools.GetElementAscensor( cell, 'TR' ) ) ;
+		FCKTableHandler.DeleteRows( cell.parentNode ) ;
 		return ;
 	}
 
@@ -246,10 +241,7 @@ FCKTableHandler._UnmarkCells = function( cells, label )
 {
 	for ( var i = 0 ; i < cells.length ; i++ )
 	{
-		if ( FCKBrowserInfo.IsIE )
-			cells[i].removeAttribute( label ) ;
-		else
-			delete cells[i][label] ;
+		FCKDomTools.ClearElementJSProperty(cells[i], label ) ;
 	}
 }
 
@@ -296,9 +288,16 @@ FCKTableHandler.CheckIsSelectionRectangular = function()
 	if ( cells.length < 1 )
 		return false ;
 
+	// Check if the selected cells are all in the same table section (thead, tfoot or tbody)
+	for (var i = 0; i < cells.length; i++)
+	{
+		if ( cells[i].parentNode.parentNode != cells[0].parentNode.parentNode )
+			return false ;
+	}
+
 	this._MarkCells( cells, '_CellSelected' ) ;
 
-	var tableMap = this._CreateTableMap( cells[0].parentNode.parentNode ) ;
+	var tableMap = this._CreateTableMap( cells[0] ) ;
 	var rowIdx = cells[0].parentNode.rowIndex ;
 	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, cells[0] ) ;
 
@@ -357,7 +356,7 @@ FCKTableHandler.MergeCells = function()
 	// Assume the selected cells are already in a rectangular geometry.
 	// Because the checking is already done by FCKTableCommand.
 	var refCell = cells[0] ;
-	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var tableMap = this._CreateTableMap( refCell ) ;
 	var rowIdx = refCell.parentNode.rowIndex ;
 	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
 
@@ -385,12 +384,12 @@ FCKTableHandler.MergeCells = function()
 			}
 		}
 		if ( rowChildNodesCount > 0 )
-			cellContents.appendChild( FCKTools.GetElementDocument( refCell ).createElement( 'br' ) ) ;
+			cellContents.appendChild( FCK.EditorDocument.createElement( 'br' ) ) ;
 	}
 
 	this._ReplaceCellsByMarker( tableMap, '_SelectedCells', refCell ) ;
 	this._UnmarkCells( cells, '_SelectedCells' ) ;
-	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
 	refCell.appendChild( cellContents ) ;
 
 	if ( FCKBrowserInfo.IsGeckoLike && ( ! refCell.firstChild ) )
@@ -416,7 +415,7 @@ FCKTableHandler.MergeRight = function()
 	refCell.appendChild( cellContents ) ;
 	this._MarkCells( [nextCell], '_Replace' ) ;
 	this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
-	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
 
 	this._MoveCaretToCell( refCell, false ) ;
 }
@@ -434,11 +433,11 @@ FCKTableHandler.MergeDown = function()
 	while ( nextCell && nextCell.childNodes && nextCell.childNodes.length > 0 )
 		cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ;
 	if ( cellContents.firstChild )
-		cellContents.insertBefore( FCKTools.GetElementDocument( nextCell ).createElement( 'br' ), cellContents.firstChild ) ;
+		cellContents.insertBefore( FCK.EditorDocument.createElement( 'br' ), cellContents.firstChild ) ;
 	refCell.appendChild( cellContents ) ;
 	this._MarkCells( [nextCell], '_Replace' ) ;
 	this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
-	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
 
 	this._MoveCaretToCell( refCell, false ) ;
 }
@@ -450,17 +449,17 @@ FCKTableHandler.HorizontalSplitCell = function()
 		return ;
 
 	var refCell = cells[0] ;
-	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var tableMap = this._CreateTableMap( refCell ) ;
 	var rowIdx = refCell.parentNode.rowIndex ;
 	var colIdx = FCKTableHandler._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
 	var cellSpan = isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ;
 
 	if ( cellSpan > 1 )
 	{
-		// Splittng a multi-column cell - original cell gets ceil(colSpan/2) columns,
+		// Splitting a multi-column cell - original cell gets ceil(colSpan/2) columns,
 		// new cell gets floor(colSpan/2).
 		var newCellSpan = Math.ceil( cellSpan / 2 ) ;
-		var newCell = FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ;
+		var newCell = FCK.EditorDocument.createElement( refCell.nodeName ) ;
 		if ( FCKBrowserInfo.IsGeckoLike )
 			FCKTools.AppendBogusBr( newCell ) ;
 		var startIdx = colIdx + newCellSpan ;
@@ -488,7 +487,7 @@ FCKTableHandler.HorizontalSplitCell = function()
 			if ( tableMap[i][colIdx] == refCell )
 			{
 				newRow.push( refCell ) ;
-				newRow.push( FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ) ;
+				newRow.push( FCK.EditorDocument.createElement( refCell.nodeName ) ) ;
 				if ( FCKBrowserInfo.IsGeckoLike )
 					FCKTools.AppendBogusBr( newRow[newRow.length - 1] ) ;
 			}
@@ -504,7 +503,7 @@ FCKTableHandler.HorizontalSplitCell = function()
 		tableMap = newTableMap ;
 	}
 
-	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ;
 }
 
 FCKTableHandler.VerticalSplitCell = function()
@@ -514,10 +513,12 @@ FCKTableHandler.VerticalSplitCell = function()
 		return ;
 
 	var currentCell = cells[0] ;
-	var tableMap = this._CreateTableMap( currentCell.parentNode.parentNode ) ;
-	var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentCell.parentNode.rowIndex, currentCell ) ;
-	var currentRowSpan = currentCell.rowSpan ;
+	var tableMap = this._CreateTableMap( currentCell ) ;
 	var currentRowIndex = currentCell.parentNode.rowIndex ;
+	var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentRowIndex, currentCell ) ;
+	// Save current cell colSpan
+	var currentColSpan = isNaN( currentCell.colSpan ) ? 1 : currentCell.colSpan ;
+	var currentRowSpan = currentCell.rowSpan ;
 	if ( isNaN( currentRowSpan ) )
 		currentRowSpan = 1 ;
 
@@ -528,33 +529,36 @@ FCKTableHandler.VerticalSplitCell = function()
 
 		// 2. Find the appropriate place to insert a new cell at the next row.
 		var newCellRowIndex = currentRowIndex + Math.ceil( currentRowSpan / 2 ) ;
+		var oRow = tableMap[newCellRowIndex] ;
 		var insertMarker = null ;
-		for ( var i = cellIndex+1 ; i < tableMap[newCellRowIndex].length ; i++ )
+		for ( var i = cellIndex+1 ; i < oRow.length ; i++ )
 		{
-			if ( tableMap[newCellRowIndex][i].parentNode.rowIndex == newCellRowIndex )
+			if ( oRow[i].parentNode.rowIndex == newCellRowIndex )
 			{
-				insertMarker = tableMap[newCellRowIndex][i] ;
+				insertMarker = oRow[i] ;
 				break ;
 			}
 		}
 
-		// 3. Insert the new cell to the indicated place, with the appropriate rowSpan, next row.
-		var newCell = FCK.EditorDocument.createElement( 'td' ) ;
+		// 3. Insert the new cell to the indicated place, with the appropriate rowSpan and colSpan, next row.
+		var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ;
 		newCell.rowSpan = Math.floor( currentRowSpan / 2 ) ;
+		if ( currentColSpan > 1 )
+			newCell.colSpan = currentColSpan ;
 		if ( FCKBrowserInfo.IsGeckoLike )
 			FCKTools.AppendBogusBr( newCell ) ;
-		currentCell.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ;
+		currentCell.parentNode.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ;
 	}
 	else
 	{
 		// 1. Insert a new row.
-		var newCellRowIndex = currentRowIndex + 1 ;
+		var newSectionRowIdx = currentCell.parentNode.sectionRowIndex + 1 ;
 		var newRow = FCK.EditorDocument.createElement( 'tr' ) ;
-		var tBody = currentCell.parentNode.parentNode ;
-		if ( tBody.rows.length > newCellRowIndex )
-			tBody.insertBefore( newRow, tBody.rows[newCellRowIndex] ) ;
+		var tSection = currentCell.parentNode.parentNode ;
+		if ( tSection.rows.length > newSectionRowIdx )
+			tSection.insertBefore( newRow, tSection.rows[newSectionRowIdx] ) ;
 		else
-			tBody.appendChild( newRow ) ;
+			tSection.appendChild( newRow ) ;
 
 		// 2. +1 to rowSpan for all cells crossing currentCell's row.
 		for ( var i = 0 ; i < tableMap[currentRowIndex].length ; )
@@ -574,8 +578,10 @@ FCKTableHandler.VerticalSplitCell = function()
 			i += colSpan ;
 		}
 
-		// 3. Insert a new cell to new row.
-		var newCell = FCK.EditorDocument.createElement( 'td' ) ;
+		// 3. Insert a new cell to new row. Set colSpan on the new cell.
+		var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ;
+		if ( currentColSpan > 1 )
+			newCell.colSpan = currentColSpan ;
 		if ( FCKBrowserInfo.IsGeckoLike )
 			FCKTools.AppendBogusBr( newCell	) ;
 		newRow.appendChild( newCell ) ;
@@ -612,29 +618,17 @@ FCKTableHandler._GetCellLocation = function( tableMap, cell  )
 	return null ;
 }
 
-// Get the cells available in a column of a TableMap.
-FCKTableHandler._GetColumnCells = function( tableMap, columnIndex )
-{
-	var aCollCells = new Array() ;
-
-	for ( var r = 0 ; r < tableMap.length ; r++ )
-	{
-		var oCell = tableMap[r][columnIndex] ;
-		if ( oCell && ( aCollCells.length == 0 || aCollCells[ aCollCells.length - 1 ] != oCell ) )
-			aCollCells[ aCollCells.length ] = oCell ;
-	}
-
-	return aCollCells ;
-}
-
 // This function is quite hard to explain. It creates a matrix representing all cells in a table.
 // The difference here is that the "spanned" cells (colSpan and rowSpan) are duplicated on the matrix
 // cells that are "spanned". For example, a row with 3 cells where the second cell has colSpan=2 and rowSpan=3
 // will produce a bi-dimensional matrix with the following values (representing the cells):
-//		Cell1, Cell2, Cell2, Cell 3
-//		Cell4, Cell2, Cell2, Cell 5
-FCKTableHandler._CreateTableMap = function( table )
+//		Cell1, Cell2, Cell2, Cell3
+//		Cell4, Cell2, Cell2, Cell5
+//		Cell6, Cell2, Cell2, Cell7
+FCKTableHandler._CreateTableMap = function( refCell )
 {
+	var table = (refCell.nodeName == 'TABLE' ? refCell : refCell.parentNode.parentNode.parentNode ) ;
+
 	var aRows = table.rows ;
 
 	// Row and Column counters.
@@ -686,13 +680,6 @@ FCKTableHandler._InstallTableMap = function( tableMap, table )
 	// for storing the calculated rowSpan in IE.
 	var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
 
-	// Clear the table of all rows first.
-	while ( table.rows.length > 0 )
-	{
-		var row = table.rows[0] ;
-		row.parentNode.removeChild( row ) ;
-	}
-
 	// Disconnect all the cells in tableMap from their parents, set all colSpan and rowSpan attributes to 1.
 	for ( var i = 0 ; i < tableMap.length ; i++ )
 	{
@@ -748,23 +735,15 @@ FCKTableHandler._InstallTableMap = function( tableMap, table )
 		for ( var j = 0 ; j < tableMap[i].length ; j++)
 		{
 			var cell = tableMap[i][j] ;
-			if ( FCKBrowserInfo.IsIE )
-			{
-				cell.removeAttribute( '_colScanned' ) ;
-				cell.removeAttribute( '_rowScanned' ) ;
-			}
-			else
-			{
-				delete cell._colScanned ;
-				delete cell._rowScanned ;
-			}
+			FCKDomTools.ClearElementJSProperty(cell, '_colScanned' ) ;
+			FCKDomTools.ClearElementJSProperty(cell, '_rowScanned' ) ;
 		}
 	}
 
 	// Insert physical rows and columns to the table.
 	for ( var i = 0 ; i < tableMap.length ; i++ )
 	{
-		var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ;
+		var rowObj = FCK.EditorDocument.createElement( 'tr' ) ;
 		for ( var j = 0 ; j < tableMap[i].length ; )
 		{
 			var cell = tableMap[i][j] ;
@@ -785,7 +764,15 @@ FCKTableHandler._InstallTableMap = function( tableMap, table )
 			if ( cell.rowSpan == 1 )
 				cell.removeAttribute( 'rowspan' ) ;
 		}
-		table.appendChild( rowObj ) ;
+		if ( FCKBrowserInfo.IsIE )
+		{
+			table.rows[i].replaceNode( rowObj ) ;
+		}
+		else
+		{
+			table.rows[i].innerHTML = '' ;
+			FCKDomTools.MoveChildren( rowObj, table.rows[i] ) ;
+		}
 	}
 }
 
@@ -819,7 +806,7 @@ FCKTableHandler.GetMergeRightTarget = function()
 		return null ;
 
 	var refCell = cells[0] ;
-	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var tableMap = this._CreateTableMap( refCell ) ;
 	var rowIdx = refCell.parentNode.rowIndex ;
 	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
 	var nextColIdx = colIdx + ( isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ) ;
@@ -847,7 +834,7 @@ FCKTableHandler.GetMergeDownTarget = function()
 		return null ;
 
 	var refCell = cells[0] ;
-	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var tableMap = this._CreateTableMap( refCell ) ;
 	var rowIdx = refCell.parentNode.rowIndex ;
 	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
 	var newRowIdx = rowIdx + ( isNaN( refCell.rowSpan ) ? 1 : refCell.rowSpan ) ;
@@ -859,6 +846,10 @@ FCKTableHandler.GetMergeDownTarget = function()
 	if ( ! nextCell )
 		return null ;
 
+	// Check if the selected cells are both in the same table section (thead, tfoot or tbody).
+	if ( refCell.parentNode.parentNode != nextCell.parentNode.parentNode )
+		return null ;
+
 	// The two cells must have the same horizontal geometry, otherwise merging does not makes sense.
 	this._MarkCells( [refCell, nextCell], '_SizeTest' ) ;
 	var refGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SizeTest' ) ;
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_gecko.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
index 84d2d44ea8..f32622ae94 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -48,7 +48,7 @@ FCKTableHandler.GetSelectedCells = function()
 		else
 			oCell = oRange.startContainer.childNodes[ oRange.startOffset ] ;
 
-		if ( oCell.tagName.Equals( 'TD', 'TH' ) )
+		if ( oCell.nodeName.Equals( 'TD', 'TH' ) )
 			aCells[aCells.length] = oCell ;
 	}
 
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_ie.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_ie.js
index 9e6bd9884a..6c2a44eb89 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktablehandler_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -25,7 +25,7 @@ FCKTableHandler.GetSelectedCells = function()
 {
 	if ( FCKSelection.GetType() == 'Control' )
 	{
-		var td = FCKSelection.MoveToAncestorNode( 'TD' ) ;
+		var td = FCKSelection.MoveToAncestorNode( ['TD', 'TH'] ) ;
 		return td ? [ td ] : [] ;
 	}
 
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbaritems.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbaritems.js
index 2cabcd4c1a..d44964e233 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbaritems.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbaritems.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbarset.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbarset.js
index 0f0541e54d..e690107ee7 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbarset.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktoolbarset.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktools.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktools.js
index 78606bf659..5b4888fdfa 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktools.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktools.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_gecko.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_gecko.js
index b403428194..98f6839c1d 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_ie.js b/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_ie.js
index f7a08057d6..dce37d77a1 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fcktools_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckundo.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckundo.js
index 72b629e34c..eb9e10507e 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckundo.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckundo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckurlparams.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckurlparams.js
index 90efa16c7d..79b4c87a29 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckurlparams.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckurlparams.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml.js
index ffaf5d7689..426228a9da 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -296,7 +296,7 @@ FCKXHtml._AppendNode = function( xmlNode, htmlNode )
 // Append an item to the SpecialBlocks array and returns the tag to be used.
 FCKXHtml._AppendSpecialItem = function( item )
 {
-	return '___FCKsi___' + FCKXHtml.SpecialBlocks.AddItem( item ) ;
+	return '___FCKsi___' + ( FCKXHtml.SpecialBlocks.push( item ) - 1 ) ;
 }
 
 FCKXHtml._AppendEntity = function( xmlNode, entity )
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_gecko.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_gecko.js
index f9c9a7f799..2a38b468eb 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_ie.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_ie.js
index a241fda2d0..8f70e1eaab 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtml_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtmlentities.js b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtmlentities.js
index ae6f38df33..de2d99b93b 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtmlentities.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fckxhtmlentities.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -150,7 +150,7 @@ FCKXHtmlEntities.Initialize = function()
 			'"':'quot',
 		//	'&':'amp',		// This entity is automatically handled by the XHTML parser.
 		//	'<':'lt',		// This entity is automatically handled by the XHTML parser.
-		//	'>':'gt',		// This entity is automatically handled by the XHTML parser.
+			'>':'gt',			// Opera and Safari don't encode it in their implementation
 			'ˆ':'circ',
 			'˜':'tilde',
 			' ':'ensp',
@@ -331,12 +331,15 @@ FCKXHtmlEntities.Initialize = function()
 	}
 	else
 	{
-		FCKXHtmlEntities.Entities = {} ;
+		FCKXHtmlEntities.Entities = {
+			'>':'gt' // Opera and Safari don't encode it in their implementation
+		} ;
+		sChars = '>';
 
 		// Even if we are not processing the entities, we must render the &nbsp;
 		// correctly. As we don't want HTML entities, let's use its numeric
 		// representation (&#160).
-		sChars = ' ' ;
+		sChars += ' ' ;
 	}
 
 	// Create the Regex used to find entities in the text.
diff --git a/phpgwapi/js/fckeditor/editor/css/fck_editorarea.css b/phpgwapi/js/fckeditor/editor/css/fck_editorarea.css
index b1f5cad0c2..8a328bb7fc 100644
--- a/phpgwapi/js/fckeditor/editor/css/fck_editorarea.css
+++ b/phpgwapi/js/fckeditor/editor/css/fck_editorarea.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/css/fck_internal.css b/phpgwapi/js/fckeditor/editor/css/fck_internal.css
index 210e7cb4d5..725272f771 100644
--- a/phpgwapi/js/fckeditor/editor/css/fck_internal.css
+++ b/phpgwapi/js/fckeditor/editor/css/fck_internal.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/css/fck_showtableborders_gecko.css b/phpgwapi/js/fckeditor/editor/css/fck_showtableborders_gecko.css
index 3166ed43d7..87ab979fa0 100644
--- a/phpgwapi/js/fckeditor/editor/css/fck_showtableborders_gecko.css
+++ b/phpgwapi/js/fckeditor/editor/css/fck_showtableborders_gecko.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.css b/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.css
index 528a32c25b..4e06834ef1 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.css
+++ b/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.js b/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.js
index cf78b1c88d..dbe9c979b7 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.js
+++ b/phpgwapi/js/fckeditor/editor/dialog/common/fck_dialog_common.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -307,5 +307,41 @@ function CopyAttributes( oSource, oDest, oSkipAttributes )
 		}
 	}
 	// The style:
-	oDest.style.cssText = oSource.style.cssText ;
+	if ( oSource.style.cssText !== '' )
+		oDest.style.cssText = oSource.style.cssText ;
+}
+
+/**
+* Replaces a tag with another one, keeping its contents:
+* for example TD --> TH, and TH --> TD.
+* input: the original node, and the new tag name
+* http://www.w3.org/TR/DOM-Level-3-Core/core.html#Document3-renameNode
+*/
+function RenameNode( oNode , newTag )
+{
+	// TODO: if the browser natively supports document.renameNode call it.
+	// does any browser currently support it in order to test?
+
+	// Only rename element nodes.
+	if ( oNode.nodeType != 1 )
+		return null ;
+
+	// If it's already correct exit here.
+	if ( oNode.nodeName == newTag )
+		return oNode ;
+
+	var oDoc = oNode.ownerDocument ;
+	// Create the new node
+	var newNode = oDoc.createElement( newTag ) ;
+
+	// Copy all attributes
+	CopyAttributes( oNode, newNode, {} ) ;
+
+	// Move children to the new node
+	FCKDomTools.MoveChildren( oNode, newNode ) ;
+
+	// Finally replace the node and return the new one
+	oNode.parentNode.replaceChild( newNode, oNode ) ;
+
+	return newNode ;
 }
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_about.html b/phpgwapi/js/fckeditor/editor/dialog/fck_about.html
index 7faf2280bb..9f2c5635b9 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_about.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_about.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -78,8 +78,8 @@ window.onload = function()
 								border-left: #000000 1px solid; border-bottom: #000000 1px solid">
 								<span fcklang="DlgAboutVersion">version</span>
 								<br />
-								<b>2.6.3</b><br />
-								Build 19836</td>
+								<b>2.6.4.1</b><br />
+								Build 23187</td>
 						</tr>
 					</table>
 				</td>
@@ -105,7 +105,7 @@ window.onload = function()
 					<span fcklang="DlgAboutInfo">For further information go to</span> <a href="http://www.fckeditor.net/?About"
 						target="_blank">http://www.fckeditor.net/</a>.
 					<br />
-					Copyright &copy; 2003-2008 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
+					Copyright &copy; 2003-2009 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
 				</td>
 				<td align="center">
 					<a href="http://www.fckeditor.net/sponsors/apply" target="_blank">Become a Sponsor</a>
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_anchor.html b/phpgwapi/js/fckeditor/editor/dialog/fck_anchor.html
index 602a6c8d05..235535b4ad 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_anchor.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_anchor.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_button.html b/phpgwapi/js/fckeditor/editor/dialog/fck_button.html
index cc117a9e7d..6dc21b448a 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_button.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_button.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_checkbox.html b/phpgwapi/js/fckeditor/editor/dialog/fck_checkbox.html
index 06d45496fc..9a5d43c736 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_checkbox.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_checkbox.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_colorselector.html b/phpgwapi/js/fckeditor/editor/dialog/fck_colorselector.html
index 30d100b64a..a6eac5ca95 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_colorselector.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_colorselector.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_docprops.html b/phpgwapi/js/fckeditor/editor/dialog/fck_docprops.html
index d943dd9adb..e1875d74c4 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_docprops.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_docprops.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -456,7 +456,7 @@ function SetUrl( url )
 						<tr>
 							<td nowrap="nowrap">
 								<span fcklang="DlgDocDocType">Document Type Heading</span><br />
-								<select id="selDocType" name="selDocType" onchange="CheckOther( this, 'txtDocType' );">
+								<select id="selDocType" onchange="CheckOther( this, 'txtDocType' );">
 									<option value="" selected="selected"></option>
 									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'>HTML
 										4.01 Transitional</option>
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html b/phpgwapi/js/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
index 0ac5acc1ee..368c839d8b 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_flash.html b/phpgwapi/js/fckeditor/editor/dialog/fck_flash.html
index 1569175a65..2db48461d5 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_flash.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_flash.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash.js b/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash.js
index fc700049a4..fe2c24724b 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash.js
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html b/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
index 4817c1d1f5..a5905216cd 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_form.html b/phpgwapi/js/fckeditor/editor/dialog/fck_form.html
index 71edf49440..c724282ed8 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_form.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_form.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_hiddenfield.html b/phpgwapi/js/fckeditor/editor/dialog/fck_hiddenfield.html
index 3ee162f65f..2d0e0b55b5 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_hiddenfield.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_hiddenfield.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_image.html b/phpgwapi/js/fckeditor/editor/dialog/fck_image.html
index 5ce5ecb619..75681bf2c0 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_image.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_image.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image.js b/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image.js
index 265c21edcb..c00603ef04 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image.js
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image_preview.html b/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image_preview.html
index 81f44e8d0d..1c6fe52879 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image_preview.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_image/fck_image_preview.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_link.html b/phpgwapi/js/fckeditor/editor/dialog/fck_link.html
index 6d69e6e2c5..061c84e14b 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_link.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_link.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_link/fck_link.js b/phpgwapi/js/fckeditor/editor/dialog/fck_link/fck_link.js
index c595f1b1f7..ee806206d1 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_link/fck_link.js
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_link/fck_link.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -194,7 +194,7 @@ oParser.ParseEMailUri = function( sUrl )
 		}
 
 		// Try to match the email against the encode protection.
-		var aMatch = aLinkInfo[2].match( /^location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'$/ ) ;
+		var aMatch = aLinkInfo[2].match( /^(?:void\()?location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'\)?$/ ) ;
 		if ( aMatch )
 		{
 			// The link is encoded
@@ -253,7 +253,7 @@ oParser.CreateEMailUri = function( address, subject, body )
 			for ( var i = 0 ; i < address.length ; i++ )
 				aAddressCode.push( address.charCodeAt( i ) ) ;
 
-			return 'javascript:location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\'' ;
+			return 'javascript:void(location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\')' ;
 	}
 
 	// EMailProtection 'none'
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_listprop.html b/phpgwapi/js/fckeditor/editor/dialog/fck_listprop.html
index ef30a94b33..55b337ae94 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_listprop.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_listprop.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_paste.html b/phpgwapi/js/fckeditor/editor/dialog/fck_paste.html
index 40cc6f56c9..e20a73863d 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_paste.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_paste.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -87,6 +87,7 @@ window.onload = function ()
 	else
 	{
 		document.getElementById('txtData').style.display = '' ;
+		SelectField( 'txtData' ) ;
 	}
 
 	if ( sPastingType != 'Word' )
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_radiobutton.html b/phpgwapi/js/fckeditor/editor/dialog/fck_radiobutton.html
index eb9aa5d103..80516e042f 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_radiobutton.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_radiobutton.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_replace.html b/phpgwapi/js/fckeditor/editor/dialog/fck_replace.html
index f334d7f06b..bf983353ae 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_replace.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_replace.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -142,7 +142,7 @@ CharacterCursor.prototype =
 		}
 
 		this._textNode = curNode ;
-		this._offset = curNode.length - 1 ;
+		this._offset = curNode && curNode.length - 1 ;
 		return crossed ;
 	},
 
@@ -420,6 +420,8 @@ function GetMatchWord()
  */
 function CheckIsWordSeparator( c )
 {
+	if ( !c )
+		return true;
 	var code = c.charCodeAt( 0 );
 	if ( code >= 9 && code <= 0xd )
 		return true;
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_select.html b/phpgwapi/js/fckeditor/editor/dialog/fck_select.html
index a1735a127a..633633ae43 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_select.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_select.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -132,7 +132,7 @@ function Ok()
 						<tr>
 							<td nowrap><span fckLang="DlgSelectSize">Size</span>&nbsp;</td>
 							<td nowrap><input id="txtLines" type="text" size="2" value="">&nbsp;<span fckLang="DlgSelectLines">lines</span></td>
-							<td nowrap align="right"><input id="chkMultiple" name="chkMultiple" type="checkbox"><label for="chkMultiple" fckLang="DlgSelectChkMulti">Allow
+							<td nowrap align="right"><input id="chkMultiple" type="checkbox"><label for="chkMultiple" fckLang="DlgSelectChkMulti">Allow
 									multiple selections</label></td>
 						</tr>
 					</table>
@@ -143,20 +143,20 @@ function Ok()
 					<table width="100%">
 						<tr>
 							<td width="50%"><span fckLang="DlgSelectOpText">Text</span><br>
-								<input id="txtText" style="WIDTH: 100%" type="text" name="txtText">
+								<input id="txtText" style="WIDTH: 100%" type="text">
 							</td>
 							<td width="50%"><span fckLang="DlgSelectOpValue">Value</span><br>
-								<input id="txtValue" style="WIDTH: 100%" type="text" name="txtValue">
+								<input id="txtValue" style="WIDTH: 100%" type="text">
 							</td>
 							<td vAlign="bottom"><input onclick="Add();" type="button" fckLang="DlgSelectBtnAdd" value="Add"></td>
 							<td vAlign="bottom"><input onclick="Modify();" type="button" fckLang="DlgSelectBtnModify" value="Modify"></td>
 						</tr>
 						<tr>
 							<td rowSpan="2"><select id="cmbText" style="WIDTH: 100%" onchange="GetE('cmbValue').selectedIndex = this.selectedIndex;Select(this);"
-									size="5" name="cmbText"></select>
+									size="5"></select>
 							</td>
 							<td rowSpan="2"><select id="cmbValue" style="WIDTH: 100%" onchange="GetE('cmbText').selectedIndex = this.selectedIndex;Select(this);"
-									size="5" name="cmbValue"></select>
+									size="5"></select>
 							</td>
 							<td vAlign="top" colSpan="2">
 							</td>
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_select/fck_select.js b/phpgwapi/js/fckeditor/editor/dialog/fck_select/fck_select.js
index 52adecf74f..0b21f10fc6 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_select/fck_select.js
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_select/fck_select.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_smiley.html b/phpgwapi/js/fckeditor/editor/dialog/fck_smiley.html
index 0d6f63fd83..bd2eaeab91 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_smiley.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_smiley.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_source.html b/phpgwapi/js/fckeditor/editor/dialog/fck_source.html
index d66c281181..d61e710ca2 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_source.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_source.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_specialchar.html b/phpgwapi/js/fckeditor/editor/dialog/fck_specialchar.html
index d7fda32def..eb0238c632 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_specialchar.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_specialchar.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages.html b/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages.html
index 87cf2c47e4..cd2355dee6 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl b/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
index fae010d9ba..443fa8001a 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
@@ -1,181 +1,181 @@
-#!/usr/bin/perl
-
-use CGI qw/ :standard /;
-use File::Temp qw/ tempfile tempdir /;
-
-# my $spellercss = '/speller/spellerStyle.css';					# by FredCK
-my $spellercss = '../spellerStyle.css';							# by FredCK
-# my $wordWindowSrc = '/speller/wordWindow.js';					# by FredCK
-my $wordWindowSrc = '../wordWindow.js';							# by FredCK
-my @textinputs = param( 'textinputs[]' ); # array
-# my $aspell_cmd = 'aspell';									# by FredCK (for Linux)
-my $aspell_cmd = '"C:\Program Files\Aspell\bin\aspell.exe"';	# by FredCK (for Windows)
-my $lang = 'en_US';
-# my $aspell_opts = "-a --lang=$lang --encoding=utf-8";			# by FredCK
-my $aspell_opts = "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt";		# by FredCK
-my $input_separator = "A";
-
-# set the 'wordtext' JavaScript variable to the submitted text.
-sub printTextVar {
-	for( my $i = 0; $i <= $#textinputs; $i++ ) {
-	        print "textinputs[$i] = decodeURIComponent('" . escapeQuote( $textinputs[$i] ) . "')\n";
-	}
-}
-
-sub printTextIdxDecl {
-	my $idx = shift;
-	print "words[$idx] = [];\n";
-	print "suggs[$idx] = [];\n";
-}
-
-sub printWordsElem {
-	my( $textIdx, $wordIdx, $word ) = @_;
-	print "words[$textIdx][$wordIdx] = '" . escapeQuote( $word ) . "';\n";
-}
-
-sub printSuggsElem {
-	my( $textIdx, $wordIdx, @suggs ) = @_;
-	print "suggs[$textIdx][$wordIdx] = [";
-	for my $i ( 0..$#suggs ) {
-		print "'" . escapeQuote( $suggs[$i] ) . "'";
-		if( $i < $#suggs ) {
-			print ", ";
-		}
-	}
-	print "];\n";
-}
-
-sub printCheckerResults {
-	my $textInputIdx = -1;
-	my $wordIdx = 0;
-	my $unhandledText;
-	# create temp file
-	my $dir = tempdir( CLEANUP => 1 );
-	my( $fh, $tmpfilename ) = tempfile( DIR => $dir );
-
-	# temp file was created properly?
-
-	# open temp file, add the submitted text.
-	for( my $i = 0; $i <= $#textinputs; $i++ ) {
-		$text = url_decode( $textinputs[$i] );
-		# Strip all tags for the text. (by FredCK - #339 / #681)
-		$text =~ s/<[^>]+>/ /g;
-		@lines = split( /\n/, $text );
-		print $fh "\%\n"; # exit terse mode
-		print $fh "^$input_separator\n";
-		print $fh "!\n";  # enter terse mode
-		for my $line ( @lines ) {
-			# use carat on each line to escape possible aspell commands
-			print $fh "^$line\n";
-		}
-
-	}
-	# exec aspell command
-	my $cmd = "$aspell_cmd $aspell_opts < $tmpfilename 2>&1";
-	open ASPELL, "$cmd |" or handleError( "Could not execute `$cmd`\\n$!" ) and return;
-	# parse each line of aspell return
-	for my $ret ( <ASPELL> ) {
-		chomp( $ret );
-		# if '&', then not in dictionary but has suggestions
-		# if '#', then not in dictionary and no suggestions
-		# if '*', then it is a delimiter between text inputs
-		if( $ret =~ /^\*/ ) {
-			$textInputIdx++;
-			printTextIdxDecl( $textInputIdx );
-			$wordIdx = 0;
-
-		} elsif( $ret =~ /^(&|#)/ ) {
-			my @tokens = split( " ", $ret, 5 );
-			printWordsElem( $textInputIdx, $wordIdx, $tokens[1] );
-			my @suggs = ();
-			if( $tokens[4] ) {
-				@suggs = split( ", ", $tokens[4] );
-			}
-			printSuggsElem( $textInputIdx, $wordIdx, @suggs );
-			$wordIdx++;
-		} else {
-			$unhandledText .= $ret;
-		}
-	}
-	close ASPELL or handleError( "Error executing `$cmd`\\n$unhandledText" ) and return;
-}
-
-sub escapeQuote {
-	my $str = shift;
-	$str =~ s/'/\\'/g;
-	return $str;
-}
-
-sub handleError {
-	my $err = shift;
-	print "error = '" . escapeQuote( $err ) . "';\n";
-}
-
-sub url_decode {
-	local $_ = @_ ? shift : $_;
-	defined or return;
-	# change + signs to spaces
-	tr/+/ /;
-	# change hex escapes to the proper characters
-	s/%([a-fA-F0-9]{2})/pack "H2", $1/eg;
-	return $_;
-}
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Display HTML
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-print <<EOF;
-Content-type: text/html; charset=utf-8
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" type="text/css" href="$spellercss"/>
-<script src="$wordWindowSrc"></script>
-<script type="text/javascript">
-var suggs = new Array();
-var words = new Array();
-var textinputs = new Array();
-var error;
-EOF
-
-printTextVar();
-
-printCheckerResults();
-
-print <<EOF;
-var wordWindowObj = new wordWindow();
-wordWindowObj.originalSpellings = words;
-wordWindowObj.suggestions = suggs;
-wordWindowObj.textInputs = textinputs;
-
-
-function init_spell() {
-	// check if any error occured during server-side processing
-	if( error ) {
-		alert( error );
-	} else {
-		// call the init_spell() function in the parent frameset
-		if (parent.frames.length) {
-			parent.init_spell( wordWindowObj );
-		} else {
-			error = "This page was loaded outside of a frameset. ";
-			error += "It might not display properly";
-			alert( error );
-		}
-	}
-}
-
-</script>
-
-</head>
-<body onLoad="init_spell();">
-
-<script type="text/javascript">
-wordWindowObj.writeBody();
-</script>
-
-</body>
-</html>
-EOF
+#!/usr/bin/perl
+
+use CGI qw/ :standard /;
+use File::Temp qw/ tempfile tempdir /;
+
+# my $spellercss = '/speller/spellerStyle.css';					# by FredCK
+my $spellercss = '../spellerStyle.css';							# by FredCK
+# my $wordWindowSrc = '/speller/wordWindow.js';					# by FredCK
+my $wordWindowSrc = '../wordWindow.js';							# by FredCK
+my @textinputs = param( 'textinputs[]' ); # array
+# my $aspell_cmd = 'aspell';									# by FredCK (for Linux)
+my $aspell_cmd = '"C:\Program Files\Aspell\bin\aspell.exe"';	# by FredCK (for Windows)
+my $lang = 'en_US';
+# my $aspell_opts = "-a --lang=$lang --encoding=utf-8";			# by FredCK
+my $aspell_opts = "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt";		# by FredCK
+my $input_separator = "A";
+
+# set the 'wordtext' JavaScript variable to the submitted text.
+sub printTextVar {
+	for( my $i = 0; $i <= $#textinputs; $i++ ) {
+	        print "textinputs[$i] = decodeURIComponent('" . escapeQuote( $textinputs[$i] ) . "')\n";
+	}
+}
+
+sub printTextIdxDecl {
+	my $idx = shift;
+	print "words[$idx] = [];\n";
+	print "suggs[$idx] = [];\n";
+}
+
+sub printWordsElem {
+	my( $textIdx, $wordIdx, $word ) = @_;
+	print "words[$textIdx][$wordIdx] = '" . escapeQuote( $word ) . "';\n";
+}
+
+sub printSuggsElem {
+	my( $textIdx, $wordIdx, @suggs ) = @_;
+	print "suggs[$textIdx][$wordIdx] = [";
+	for my $i ( 0..$#suggs ) {
+		print "'" . escapeQuote( $suggs[$i] ) . "'";
+		if( $i < $#suggs ) {
+			print ", ";
+		}
+	}
+	print "];\n";
+}
+
+sub printCheckerResults {
+	my $textInputIdx = -1;
+	my $wordIdx = 0;
+	my $unhandledText;
+	# create temp file
+	my $dir = tempdir( CLEANUP => 1 );
+	my( $fh, $tmpfilename ) = tempfile( DIR => $dir );
+
+	# temp file was created properly?
+
+	# open temp file, add the submitted text.
+	for( my $i = 0; $i <= $#textinputs; $i++ ) {
+		$text = url_decode( $textinputs[$i] );
+		# Strip all tags for the text. (by FredCK - #339 / #681)
+		$text =~ s/<[^>]+>/ /g;
+		@lines = split( /\n/, $text );
+		print $fh "\%\n"; # exit terse mode
+		print $fh "^$input_separator\n";
+		print $fh "!\n";  # enter terse mode
+		for my $line ( @lines ) {
+			# use carat on each line to escape possible aspell commands
+			print $fh "^$line\n";
+		}
+
+	}
+	# exec aspell command
+	my $cmd = "$aspell_cmd $aspell_opts < $tmpfilename 2>&1";
+	open ASPELL, "$cmd |" or handleError( "Could not execute `$cmd`\\n$!" ) and return;
+	# parse each line of aspell return
+	for my $ret ( <ASPELL> ) {
+		chomp( $ret );
+		# if '&', then not in dictionary but has suggestions
+		# if '#', then not in dictionary and no suggestions
+		# if '*', then it is a delimiter between text inputs
+		if( $ret =~ /^\*/ ) {
+			$textInputIdx++;
+			printTextIdxDecl( $textInputIdx );
+			$wordIdx = 0;
+
+		} elsif( $ret =~ /^(&|#)/ ) {
+			my @tokens = split( " ", $ret, 5 );
+			printWordsElem( $textInputIdx, $wordIdx, $tokens[1] );
+			my @suggs = ();
+			if( $tokens[4] ) {
+				@suggs = split( ", ", $tokens[4] );
+			}
+			printSuggsElem( $textInputIdx, $wordIdx, @suggs );
+			$wordIdx++;
+		} else {
+			$unhandledText .= $ret;
+		}
+	}
+	close ASPELL or handleError( "Error executing `$cmd`\\n$unhandledText" ) and return;
+}
+
+sub escapeQuote {
+	my $str = shift;
+	$str =~ s/'/\\'/g;
+	return $str;
+}
+
+sub handleError {
+	my $err = shift;
+	print "error = '" . escapeQuote( $err ) . "';\n";
+}
+
+sub url_decode {
+	local $_ = @_ ? shift : $_;
+	defined or return;
+	# change + signs to spaces
+	tr/+/ /;
+	# change hex escapes to the proper characters
+	s/%([a-fA-F0-9]{2})/pack "H2", $1/eg;
+	return $_;
+}
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Display HTML
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+print <<EOF;
+Content-type: text/html; charset=utf-8
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="$spellercss"/>
+<script src="$wordWindowSrc"></script>
+<script type="text/javascript">
+var suggs = new Array();
+var words = new Array();
+var textinputs = new Array();
+var error;
+EOF
+
+printTextVar();
+
+printCheckerResults();
+
+print <<EOF;
+var wordWindowObj = new wordWindow();
+wordWindowObj.originalSpellings = words;
+wordWindowObj.suggestions = suggs;
+wordWindowObj.textInputs = textinputs;
+
+
+function init_spell() {
+	// check if any error occured during server-side processing
+	if( error ) {
+		alert( error );
+	} else {
+		// call the init_spell() function in the parent frameset
+		if (parent.frames.length) {
+			parent.init_spell( wordWindowObj );
+		} else {
+			error = "This page was loaded outside of a frameset. ";
+			error += "It might not display properly";
+			alert( error );
+		}
+	}
+}
+
+</script>
+
+</head>
+<body onLoad="init_spell();">
+
+<script type="text/javascript">
+wordWindowObj.writeBody();
+</script>
+
+</body>
+</html>
+EOF
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_table.html b/phpgwapi/js/fckeditor/editor/dialog/fck_table.html
index e3792d7468..06b91a5483 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_table.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_table.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -31,14 +31,13 @@
 
 var dialog	= window.parent ;
 var oEditor = dialog.InnerDialogLoaded() ;
-var dialogArguments = dialog.Args() ;
 
-// Gets the document DOM
-var oDOM = oEditor.FCK.EditorDocument ;
+var FCKDomTools = oEditor.FCKDomTools ;
 
 // Gets the table if there is one selected.
 var table ;
 var e = dialog.Selection.GetSelectedElement() ;
+var hasColumnHeaders ;
 
 if ( ( !e && document.location.search.substr(1) == 'Parent' ) || ( e && e.tagName != 'TABLE' ) )
 	e = oEditor.FCKSelection.MoveToAncestorNode( 'TABLE' ) ;
@@ -88,6 +87,36 @@ window.onload = function()
 		var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;
 		if ( eCaption ) document.getElementById('txtCaption').value = eCaption.innerHTML ;
 
+		hasColumnHeaders = true ;
+		// Check if all the first cells in every row are TH
+		for (var row=0; row<table.rows.length; row++)
+		{
+			// If just one cell isn't a TH then it isn't a header column
+			if ( table.rows[row].cells[0].nodeName != 'TH' )
+			{
+				hasColumnHeaders = false ;
+
+				break;
+			}
+		}
+
+		// Check if the table contains <thead>
+		if ((table.tHead !== null) )
+		{
+			if (hasColumnHeaders)
+				GetE('selHeaders').value = 'both' ;
+			else
+				GetE('selHeaders').value = 'row' ;
+		}
+		else
+		{
+			if (hasColumnHeaders)
+				GetE('selHeaders').value = 'col' ;
+			else
+				GetE('selHeaders').value = '' ;
+		}
+
+
 		document.getElementById('txtRows').disabled    = true ;
 		document.getElementById('txtColumns').disabled = true ;
 		SelectField( 'txtWidth' ) ;
@@ -104,8 +133,11 @@ function Ok()
 {
 	var bExists = ( table != null ) ;
 
+	var oDoc = oEditor.FCK.EditorDocument ;
+	oEditor.FCKUndo.SaveUndoStep() ;
+
 	if ( ! bExists )
-		table = oEditor.FCK.EditorDocument.createElement( "TABLE" ) ;
+		table = oDoc.createElement( "TABLE" ) ;
 
 	// Removes the Width and Height styles
 	if ( bExists && table.style.width )		table.style.width = null ; //.removeAttribute("width") ;
@@ -129,7 +161,7 @@ function Ok()
 	{
 		if ( !eCaption )
 		{
-			eCaption = oEditor.FCK.EditorDocument.createElement( 'CAPTION' ) ;
+			eCaption = oDoc.createElement( 'CAPTION' ) ;
 			table.insertBefore( eCaption, table.firstChild ) ;
 		}
 
@@ -145,24 +177,133 @@ function Ok()
 			eCaption.parentNode.removeChild( eCaption ) ;
 	}
 
+	var headers = GetE('selHeaders').value ;
+	if ( bExists )
+	{
+		// Should we make a <thead>?
+		if ( table.tHead==null && (headers=='row' || headers=='both') )
+		{
+			var oThead = table.createTHead() ;
+			var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;
+			var theRow= FCKDomTools.GetFirstChild( tbody, 'TR' ) ;
+
+			//now change TD to TH:
+			for (var i = 0; i<theRow.childNodes.length ; i++)
+			{
+				var th = RenameNode(theRow.childNodes[i], 'TH') ;
+				if (th != null)
+					th.scope='col' ;
+			}
+			oThead.appendChild( theRow ) ;
+		}
+
+		if ( table.tHead!==null && !(headers=='row' || headers=='both') )
+		{
+			// Move the row out of the THead and put it in the TBody:
+			var tHead = table.tHead ;
+			var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;
+
+			var previousFirstRow = tbody.firstChild ;
+			while ( tHead.firstChild )
+			{
+				var theRow = tHead.firstChild ;
+				for (var i = 0; i < theRow.childNodes.length ; i++ )
+				{
+					var newCell = RenameNode( theRow.childNodes[i], 'TD' ) ;
+					if ( newCell != null )
+						newCell.removeAttribute( 'scope' ) ;
+				}
+				tbody.insertBefore( theRow, previousFirstRow ) ;
+			}
+			table.removeChild( tHead ) ;
+		}
+
+		// Should we make all first cells in a row TH?
+		if ( (!hasColumnHeaders)  && (headers=='col' || headers=='both') )
+		{
+			for( var row=0 ; row < table.rows.length ; row++ )
+			{
+				var newCell = RenameNode(table.rows[row].cells[0], 'TH') ;
+				if ( newCell != null )
+					newCell.scope = 'row' ;
+			}
+		}
+
+		// Should we make all first TH-cells in a row make TD? If 'yes' we do it the other way round :-)
+		if ( (hasColumnHeaders)  && !(headers=='col' || headers=='both') )
+		{
+			for( var row=0 ; row < table.rows.length ; row++ )
+			{
+				var oRow = table.rows[row] ;
+				if ( oRow.parentNode.nodeName == 'TBODY' )
+				{
+					var newCell = RenameNode(oRow.cells[0], 'TD') ;
+					if (newCell != null)
+						newCell.removeAttribute( 'scope' ) ;
+				}
+			}
+		}
+	}
+
 	if (! bExists)
 	{
-		var iRows = document.getElementById('txtRows').value ;
-		var iCols = document.getElementById('txtColumns').value ;
+		var iRows = GetE('txtRows').value ;
+		var iCols = GetE('txtColumns').value ;
 
-		for ( var r = 0 ; r < iRows ; r++ )
+		var startRow = 0 ;
+		// Should we make a <thead> ?
+		if (headers=='row' || headers=='both')
 		{
+			startRow++ ;
+			var oThead = table.createTHead() ;
 			var oRow = table.insertRow(-1) ;
+			oThead.appendChild(oRow);
+
 			for ( var c = 0 ; c < iCols ; c++ )
 			{
-				var oCell = oRow.insertCell(-1) ;
+				var oThcell = oDoc.createElement( 'TH' ) ;
+				oThcell.scope = 'col' ;
+				oRow.appendChild( oThcell ) ;
+				if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+					oEditor.FCKTools.AppendBogusBr( oThcell ) ;
+			}
+		}
+
+		// Opera automatically creates a tbody when a thead has been added
+		var oTbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;
+		if ( !oTbody )
+		{
+			// make TBODY if it doesn't exist
+			oTbody = oDoc.createElement( 'TBODY' ) ;
+			table.appendChild( oTbody ) ;
+		}
+		for ( var r = startRow ; r < iRows; r++ )
+		{
+			var oRow = oDoc.createElement( 'TR' ) ;
+			oTbody.appendChild(oRow) ;
+
+			var startCol = 0 ;
+			// Is the first column a header?
+			if (headers=='col' || headers=='both')
+			{
+				var oThcell = oDoc.createElement( 'TH' ) ;
+				oThcell.scope = 'row' ;
+				oRow.appendChild( oThcell ) ;
+				if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+					oEditor.FCKTools.AppendBogusBr( oThcell ) ;
+
+				startCol++ ;
+			}
+			for ( var c = startCol ; c < iCols ; c++ )
+			{
+				// IE will leave the TH at the end of the row if we use now oRow.insertCell(-1)
+				var oCell = oDoc.createElement( 'TD' ) ;
+				oRow.appendChild( oCell ) ;
 				if ( oEditor.FCKBrowserInfo.IsGeckoLike )
 					oEditor.FCKTools.AppendBogusBr( oCell ) ;
 			}
 		}
 
-		oEditor.FCKUndo.SaveUndoStep() ;
-
 		oEditor.FCK.InsertElement( table ) ;
 	}
 
@@ -178,39 +319,44 @@ function Ok()
 				<table cellspacing="1" cellpadding="1" width="100%" border="0">
 					<tr>
 						<td valign="top">
-							<table cellspacing="0" cellpadding="0" border="0">
+							<table cellspacing="1" cellpadding="0" border="0">
 								<tr>
 									<td>
 										<span fcklang="DlgTableRows">Rows</span>:</td>
 									<td>
-										&nbsp;<input id="txtRows" type="text" maxlength="3" size="2" value="3" name="txtRows"
+										&nbsp;<input id="txtRows" type="text" maxlength="3" size="2" value="3"
 											onkeypress="return IsDigit(event);" /></td>
 								</tr>
 								<tr>
 									<td>
 										<span fcklang="DlgTableColumns">Columns</span>:</td>
 									<td>
-										&nbsp;<input id="txtColumns" type="text" maxlength="2" size="2" value="2" name="txtColumns"
+										&nbsp;<input id="txtColumns" type="text" maxlength="2" size="2" value="2"
 											onkeypress="return IsDigit(event);" /></td>
 								</tr>
 								<tr>
+									<td><span fcklang="DlgTableHeaders">Headers</span>:</td>
 									<td>
-										&nbsp;</td>
-									<td>
-										&nbsp;</td>
+										&nbsp;<select id="selHeaders">
+											<option fcklang="DlgTableHeadersNone" value="">None</option>
+											<option fcklang="DlgTableHeadersRow" value="row">First row</option>
+											<option fcklang="DlgTableHeadersColumn" value="col">First column</option>
+											<option fcklang="DlgTableHeadersBoth" value="both">Both</option>
+										</select>
+									</td>
 								</tr>
 								<tr>
 									<td>
 										<span fcklang="DlgTableBorder">Border size</span>:</td>
 									<td>
-										&nbsp;<input id="txtBorder" type="text" maxlength="2" size="2" value="1" name="txtBorder"
+										&nbsp;<input id="txtBorder" type="text" maxlength="2" size="2" value="1"
 											onkeypress="return IsDigit(event);" /></td>
 								</tr>
 								<tr>
 									<td>
 										<span fcklang="DlgTableAlign">Alignment</span>:</td>
 									<td>
-										&nbsp;<select id="selAlignment" name="selAlignment">
+										&nbsp;<select id="selAlignment">
 											<option fcklang="DlgTableAlignNotSet" value="" selected="selected">&lt;Not set&gt;</option>
 											<option fcklang="DlgTableAlignLeft" value="left">Left</option>
 											<option fcklang="DlgTableAlignCenter" value="center">Center</option>
@@ -227,10 +373,10 @@ function Ok()
 									<td>
 										<span fcklang="DlgTableWidth">Width</span>:</td>
 									<td>
-										&nbsp;<input id="txtWidth" type="text" maxlength="4" size="3" value="200" name="txtWidth"
+										&nbsp;<input id="txtWidth" type="text" maxlength="4" size="3" value="200"
 											onkeypress="return IsDigit(event);" /></td>
 									<td>
-										&nbsp;<select id="selWidthType" name="selWidthType">
+										&nbsp;<select id="selWidthType">
 											<option fcklang="DlgTableWidthPx" value="pixels" selected="selected">pixels</option>
 											<option fcklang="DlgTableWidthPc" value="percent">percent</option>
 										</select></td>
@@ -239,23 +385,18 @@ function Ok()
 									<td>
 										<span fcklang="DlgTableHeight">Height</span>:</td>
 									<td>
-										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" name="txtHeight" onkeypress="return IsDigit(event);" /></td>
+										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" onkeypress="return IsDigit(event);" /></td>
 									<td>
 										&nbsp;<span fcklang="DlgTableWidthPx">pixels</span></td>
 								</tr>
 								<tr>
-									<td>
-										&nbsp;</td>
-									<td>
-										&nbsp;</td>
-									<td>
-										&nbsp;</td>
+									<td colspan="3">&nbsp;</td>
 								</tr>
 								<tr>
 									<td nowrap="nowrap">
 										<span fcklang="DlgTableCellSpace">Cell spacing</span>:</td>
 									<td>
-										&nbsp;<input id="txtCellSpacing" type="text" maxlength="2" size="2" value="1" name="txtCellSpacing"
+										&nbsp;<input id="txtCellSpacing" type="text" maxlength="2" size="2" value="1"
 											onkeypress="return IsDigit(event);" /></td>
 									<td>
 										&nbsp;</td>
@@ -264,7 +405,7 @@ function Ok()
 									<td nowrap="nowrap">
 										<span fcklang="DlgTableCellPad">Cell padding</span>:</td>
 									<td>
-										&nbsp;<input id="txtCellPadding" type="text" maxlength="2" size="2" value="1" name="txtCellPadding"
+										&nbsp;<input id="txtCellPadding" type="text" maxlength="2" size="2" value="1"
 											onkeypress="return IsDigit(event);" /></td>
 									<td>
 										&nbsp;</td>
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_tablecell.html b/phpgwapi/js/fckeditor/editor/dialog/fck_tablecell.html
index 3d74296276..ce882d3b9b 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_tablecell.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_tablecell.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -32,8 +32,7 @@
 var dialog	= window.parent ;
 var oEditor = dialog.InnerDialogLoaded() ;
 
-// Gets the document DOM
-var oDOM = oEditor.FCK.EditorDocument ;
+var FCKDomTools = oEditor.FCKDomTools ;
 
 // Array of selected Cells
 var aCells = oEditor.FCKTableHandler.GetSelectedCells() ;
@@ -74,13 +73,15 @@ function SetStartupValue()
 		GetE('txtCollSpan').value		= GetAttribute( oCell, 'colSpan' ) ;
 		GetE('txtBackColor').value		= GetAttribute( oCell, 'bgColor' ) ;
 		GetE('txtBorderColor').value	= GetAttribute( oCell, 'borderColor' ) ;
-//		GetE('cmbFontStyle').value		= oCell.className ;
+		GetE('selCellType').value     = oCell.nodeName.toLowerCase() ;
 	}
 }
 
 // Fired when the user press the OK button
 function Ok()
 {
+	oEditor.FCKUndo.SaveUndoStep() ;
+
 	for( i = 0 ; i < aCells.length ; i++ )
 	{
 		if ( GetE('txtWidth').value.length > 0 )
@@ -100,7 +101,25 @@ function Ok()
 		SetAttribute( aCells[i], 'colSpan'		, GetE('txtCollSpan').value ) ;
 		SetAttribute( aCells[i], 'bgColor'		, GetE('txtBackColor').value ) ;
 		SetAttribute( aCells[i], 'borderColor'	, GetE('txtBorderColor').value ) ;
-//		SetAttribute( aCells[i], 'className'	, GetE('cmbFontStyle').value ) ;
+
+		var cellType = GetE('selCellType').value ;
+		if ( aCells[i].nodeName.toLowerCase() != cellType )
+			aCells[i] = RenameNode( aCells[i], cellType ) ;
+	}
+
+	// The cells need to be reselected, otherwise the caret will appear inside the table borders (Gecko)
+	// or sent back to the beginning of the document (Opera and Safari).
+	// Strangely, IE works ok so no change is needed for IE.
+	if ( !oEditor.FCKBrowserInfo.IsIE )
+	{
+		var selection = oEditor.FCK.EditorWindow.getSelection() ;
+		selection.removeAllRanges() ;
+		for ( var i = 0 ; i < aCells.length ; i++ )
+		{
+			var range = oEditor.FCK.EditorDocument.createRange() ;
+			range.selectNode( aCells[i] ) ;
+			selection.addRange( range ) ;
+		}
 	}
 
 	return true ;
@@ -138,7 +157,7 @@ function SelectColor( wich )
 										<span fcklang="DlgCellWidth">Width</span>:</td>
 									<td>
 										&nbsp;<input onkeypress="return IsDigit(event);" id="txtWidth" type="text" maxlength="4"
-											size="3" name="txtWidth" />&nbsp;<select id="selWidthType" name="selWidthType">
+											size="3" />&nbsp;<select id="selWidthType">
 												<option fcklang="DlgCellWidthPx" value="pixels" selected="selected">pixels</option>
 												<option fcklang="DlgCellWidthPc" value="percent">percent</option>
 											</select></td>
@@ -147,7 +166,7 @@ function SelectColor( wich )
 									<td nowrap="nowrap">
 										<span fcklang="DlgCellHeight">Height</span>:</td>
 									<td>
-										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" name="txtHeight" onkeypress="return IsDigit(event);" />&nbsp;<span
+										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" onkeypress="return IsDigit(event);" />&nbsp;<span
 											fcklang="DlgCellWidthPx">pixels</span></td>
 								</tr>
 								<tr>
@@ -160,7 +179,7 @@ function SelectColor( wich )
 									<td nowrap="nowrap">
 										<span fcklang="DlgCellWordWrap">Word Wrap</span>:</td>
 									<td>
-										&nbsp;<select id="selWordWrap" name="selAlignment">
+										&nbsp;<select id="selWordWrap">
 											<option fcklang="DlgCellWordWrapYes" value="true" selected="selected">Yes</option>
 											<option fcklang="DlgCellWordWrapNo" value="false">No</option>
 										</select></td>
@@ -175,7 +194,7 @@ function SelectColor( wich )
 									<td nowrap="nowrap">
 										<span fcklang="DlgCellHorAlign">Horizontal Alignment</span>:</td>
 									<td>
-										&nbsp;<select id="selHAlign" name="selAlignment">
+										&nbsp;<select id="selHAlign">
 											<option fcklang="DlgCellHorAlignNotSet" value="" selected>&lt;Not set&gt;</option>
 											<option fcklang="DlgCellHorAlignLeft" value="left">Left</option>
 											<option fcklang="DlgCellHorAlignCenter" value="center">Center</option>
@@ -186,7 +205,7 @@ function SelectColor( wich )
 									<td nowrap="nowrap">
 										<span fcklang="DlgCellVerAlign">Vertical Alignment</span>:</td>
 									<td>
-										&nbsp;<select id="selVAlign" name="selAlignment">
+										&nbsp;<select id="selVAlign">
 											<option fcklang="DlgCellVerAlignNotSet" value="" selected>&lt;Not set&gt;</option>
 											<option fcklang="DlgCellVerAlignTop" value="top">Top</option>
 											<option fcklang="DlgCellVerAlignMiddle" value="middle">Middle</option>
@@ -200,13 +219,30 @@ function SelectColor( wich )
 							&nbsp;&nbsp;&nbsp;</td>
 						<td align="right">
 							<table cellspacing="0" cellpadding="0" border="0">
+								<tr>
+									<td nowrap="nowrap">
+									 <span fcklang="DlgCellType">Cell Type</span>:</td>
+									<td colspan="2">
+										&nbsp; <select id="selCellType">
+											<option fcklang="DlgCellTypeData" value="td" />Data
+											<option fcklang="DlgCellTypeHeader" value="th" />Header
+										</select>
+								</tr>
+								<tr>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+								</tr>
 								<tr>
 									<td nowrap="nowrap">
 										<span fcklang="DlgCellRowSpan">Rows Span</span>:</td>
 									<td>
 										&nbsp;
 										<input onkeypress="return IsDigit(event);" id="txtRowSpan" type="text" maxlength="3" size="2"
-											name="txtRows"></td>
+											></td>
 									<td>
 									</td>
 								</tr>
@@ -216,7 +252,7 @@ function SelectColor( wich )
 									<td>
 										&nbsp;
 										<input onkeypress="return IsDigit(event);" id="txtCollSpan" type="text" maxlength="2"
-											size="2" name="txtColumns"></td>
+											size="2"></td>
 									<td>
 									</td>
 								</tr>
@@ -232,7 +268,7 @@ function SelectColor( wich )
 									<td nowrap="nowrap">
 										<span fcklang="DlgCellBackColor">Background Color</span>:</td>
 									<td>
-										&nbsp;<input id="txtBackColor" type="text" size="8" name="txtCellSpacing"></td>
+										&nbsp;<input id="txtBackColor" type="text" size="8" /></td>
 									<td>
 										&nbsp;
 										<input type="button" fcklang="DlgCellBtnSelect" value="Select..." onclick="SelectColor( 'Back' )"></td>
@@ -241,7 +277,7 @@ function SelectColor( wich )
 									<td nowrap="nowrap">
 										<span fcklang="DlgCellBorderColor">Border Color</span>:</td>
 									<td>
-										&nbsp;<input id="txtBorderColor" type="text" size="8" name="txtCellPadding" /></td>
+										&nbsp;<input id="txtBorderColor" type="text" size="8" /></td>
 									<td>
 										&nbsp;
 										<input type="button" fcklang="DlgCellBtnSelect" value="Select..." onclick="SelectColor( 'Border' )" /></td>
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_template.html b/phpgwapi/js/fckeditor/editor/dialog/fck_template.html
index 4f3629ba09..084dc6d17d 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_template.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_template.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_textarea.html b/phpgwapi/js/fckeditor/editor/dialog/fck_textarea.html
index 3a1c56dcd7..e4edae9664 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_textarea.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_textarea.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dialog/fck_textfield.html b/phpgwapi/js/fckeditor/editor/dialog/fck_textfield.html
index cf3ce03d3c..efde66daee 100644
--- a/phpgwapi/js/fckeditor/editor/dialog/fck_textfield.html
+++ b/phpgwapi/js/fckeditor/editor/dialog/fck_textfield.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10strict.js b/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10strict.js
index 5fbd522547..844472e61e 100644
--- a/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10strict.js
+++ b/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10strict.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10transitional.js b/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10transitional.js
index cfe1095a77..4356e7c3eb 100644
--- a/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10transitional.js
+++ b/phpgwapi/js/fckeditor/editor/dtd/fck_xhtml10transitional.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/fckdebug.html b/phpgwapi/js/fckeditor/editor/fckdebug.html
index ddb6224063..35dd66339e 100644
--- a/phpgwapi/js/fckeditor/editor/fckdebug.html
+++ b/phpgwapi/js/fckeditor/editor/fckdebug.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/fckdialog.html b/phpgwapi/js/fckeditor/editor/fckdialog.html
index 4bbc36985b..706e4b1202 100644
--- a/phpgwapi/js/fckeditor/editor/fckdialog.html
+++ b/phpgwapi/js/fckeditor/editor/fckdialog.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -86,7 +86,7 @@ window.focus() ;
 document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ;
 
 // Sets the language direction.
-var langDir = document.documentElement.dir = E.FCKLang.Dir ;
+var langDir = E.FCKLang.Dir ;
 
 // For IE6-, the fck_dialog_ie6.js is loaded, used to fix limitations in the browser.
 if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
@@ -409,6 +409,11 @@ var Selection =
 	 */
 	EnsureSelection : function()
 	{
+		// Move the focus to the Cancel button so even if the dialog contains a
+		// contentEditable element the selection is properly restored in the editor #2496
+		window.focus() ;
+		$( 'btnCancel' ).focus() ;
+
 		FCK.Selection.Restore() ;
 	},
 
@@ -573,6 +578,8 @@ var onReadyRegister = function()
 	// Program entry point.
 	window.Init = function()
 	{
+		$( 'contents' ).dir = langDir;
+
 		// Start the throbber timer.
 		Throbber.Show( 1000 ) ;
 
diff --git a/phpgwapi/js/fckeditor/editor/fckeditor.html b/phpgwapi/js/fckeditor/editor/fckeditor.html
index aba4c483bc..b6ada3e74e 100644
--- a/phpgwapi/js/fckeditor/editor/fckeditor.html
+++ b/phpgwapi/js/fckeditor/editor/fckeditor.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/fckeditor.original.html b/phpgwapi/js/fckeditor/editor/fckeditor.original.html
index 5291486186..1e004316fb 100644
--- a/phpgwapi/js/fckeditor/editor/fckeditor.original.html
+++ b/phpgwapi/js/fckeditor/editor/fckeditor.original.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.css b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.css
index 9483308890..e123763f7b 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.css
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.html b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.html
index 7a7e920429..b95bc4a285 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/browser.html
@@ -2,7 +2,7 @@
    "http://www.w3.org/TR/html4/frameset.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
index 1b70fa9c67..1524a07da2 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
index 01ca1357a3..1866b87748 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmfolders.html b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmfolders.html
index 58a3c61665..55679e9e3c 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmfolders.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmfolders.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
index e7d0e8e3d6..dac883e5d3 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
index 4e87312225..60c2e5b6f4 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmupload.html b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmupload.html
index e806832065..302d037023 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmupload.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/frmupload.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/common.js b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/common.js
index eee21f9024..91cb5e5c74 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/common.js
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/common.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/fckxml.js b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/fckxml.js
index 543c21c621..7a4273bf69 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/fckxml.js
+++ b/phpgwapi/js/fckeditor/editor/filemanager/browser/default/js/fckxml.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/basexml.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/basexml.asp
deleted file mode 100644
index a015204660..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/basexml.asp
+++ /dev/null
@@ -1,63 +0,0 @@
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' This file include the functions that create the base XML output.
-%>
-<%
-
-Sub SetXmlHeaders()
-	' Cleans the response buffer.
-	Response.Clear()
-
-	' Prevent the browser from caching the result.
-	Response.CacheControl = "no-cache"
-
-	' Set the response format.
-	Response.CodePage 		= 65001
-	Response.CharSet		= "UTF-8"
-	Response.ContentType	= "text/xml"
-End Sub
-
-Sub CreateXmlHeader( command, resourceType, currentFolder, url )
-	' Create the XML document header.
-	Response.Write "<?xml version=""1.0"" encoding=""utf-8"" ?>"
-
-	' Create the main "Connector" node.
-	Response.Write "<Connector command=""" & command & """ resourceType=""" & resourceType & """>"
-
-	' Add the current folder node.
-	Response.Write "<CurrentFolder path=""" & ConvertToXmlAttribute( currentFolder ) & """ url=""" & ConvertToXmlAttribute( url ) & """ />"
-End Sub
-
-Sub CreateXmlFooter()
-	Response.Write "</Connector>"
-End Sub
-
-Sub SendError( number, text )
-	SetXmlHeaders
-
-	' Create the XML document header.
-	Response.Write "<?xml version=""1.0"" encoding=""utf-8"" ?>"
-
-	Response.Write "<Connector><Error number=""" & number & """ text=""" & Server.HTMLEncode( text ) & """ /></Connector>"
-
-	Response.End
-End Sub
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/class_upload.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/class_upload.asp
deleted file mode 100644
index 91c0088603..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/class_upload.asp
+++ /dev/null
@@ -1,353 +0,0 @@
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' These are the classes used to handle ASP upload without using third
- ' part components (OCX/DLL).
-%>
-<%
-'**********************************************
-' File:		NetRube_Upload.asp
-' Version:	NetRube Upload Class Version 2.3 Build 20070528
-' Author:	NetRube
-' Email:	NetRube@126.com
-' Date:		05/28/2007
-' Comments:	The code for the Upload.
-'			This can free usage, but please
-'			not to delete this copyright information.
-'			If you have a modification version,
-'			Please send out a duplicate to me.
-'**********************************************
-' 文件�:	NetRube_Upload.asp
-' 版本:		NetRube Upload Class Version 2.3 Build 20070528
-' 作者:		NetRube(网络乡巴佬)
-' 电�邮件:	NetRube@126.com
-' 日期:		2007年05月28日
-' 声明:		文件上传类
-'			本上传类�以自由使用，但请�留此版�声明信�
-'			如果您对本上传类进行修改增强，
-'			请��一份给俺。
-'**********************************************
-
-Class NetRube_Upload
-
-	Public	File, Form
-	Private oSourceData
-	Private nMaxSize, nErr, sAllowed, sDenied, sHtmlExtensions
-
-	Private Sub Class_Initialize
-		nErr		= 0
-		nMaxSize	= 1048576
-
-		Set File			= Server.CreateObject("Scripting.Dictionary")
-		File.CompareMode	= 1
-		Set Form			= Server.CreateObject("Scripting.Dictionary")
-		Form.CompareMode	= 1
-
-		Set oSourceData		= Server.CreateObject("ADODB.Stream")
-		oSourceData.Type	= 1
-		oSourceData.Mode	= 3
-		oSourceData.Open
-	End Sub
-
-	Private Sub Class_Terminate
-		Form.RemoveAll
-		Set Form = Nothing
-		File.RemoveAll
-		Set File = Nothing
-
-		oSourceData.Close
-		Set oSourceData = Nothing
-	End Sub
-
-	Public Property Get Version
-		Version = "NetRube Upload Class Version 2.3 Build 20070528"
-	End Property
-
-	Public Property Get ErrNum
-		ErrNum	= nErr
-	End Property
-
-	Public Property Let MaxSize(nSize)
-		nMaxSize	= nSize
-	End Property
-
-	Public Property Let Allowed(sExt)
-		sAllowed	= sExt
-	End Property
-
-	Public Property Let Denied(sExt)
-		sDenied	= sExt
-	End Property
-
-	Public Property Let HtmlExtensions(sExt)
-		sHtmlExtensions	= sExt
-	End Property
-
-	Public Sub GetData
-		Dim aCType
-		aCType = Split(Request.ServerVariables("HTTP_CONTENT_TYPE"), ";")
-		if ( uBound(aCType) < 0 ) then
-			nErr = 1
-			Exit Sub
-		end if
-		If aCType(0) <> "multipart/form-data" Then
-			nErr = 1
-			Exit Sub
-		End If
-
-		Dim nTotalSize
-		nTotalSize	= Request.TotalBytes
-		If nTotalSize < 1 Then
-			nErr = 2
-			Exit Sub
-		End If
-		If nMaxSize > 0 And nTotalSize > nMaxSize Then
-			nErr = 3
-			Exit Sub
-		End If
-
-		'Thankful long(yrl031715@163.com)
-		'Fix upload large file.
-		'**********************************************
-		' 修正作者：long
-		' �系邮件: yrl031715@163.com
-		' 修正时间：2007年5月6日
-		' 修正说明：由于iis6的Content-Length 头信�中包�的请求长度超过了 AspMaxRequestEntityAllowed 的值（默认200K）, IIS 将返回一个 403 错误信�.
-		'          直接导致在iis6下调试FCKeditor上传功能时，一旦文件超过200K,上传文件时文件管�器失去�应，�此影�，文件的快速上传功能也存在在缺陷。
-		'          在�考 �玉 的 Asp无组件上传带进度� 演示程��作出如下修改，以修正在iis6下的错误。
-
-		Dim nTotalBytes, nPartBytes, ReadBytes
-		ReadBytes = 0
-		nTotalBytes = Request.TotalBytes
-		'循环分�读�
-		Do While ReadBytes < nTotalBytes
-			'分�读�
-			nPartBytes = 64 * 1024 '分���64k
-			If nPartBytes + ReadBytes > nTotalBytes Then
-				nPartBytes = nTotalBytes - ReadBytes
-			End If
-			oSourceData.Write Request.BinaryRead(nPartBytes)
-			ReadBytes = ReadBytes + nPartBytes
-		Loop
-		'**********************************************
-		oSourceData.Position = 0
-
-		Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary
-
-		oTotalData	= oSourceData.Read
-		bCrLf		= ChrB(13) & ChrB(10)
-		sBoundary	= MidB(oTotalData, 1, InStrB(1, oTotalData, bCrLf) - 1)
-		nBoundLen	= LenB(sBoundary) + 2
-		nFormStart	= nBoundLen
-
-		Set oFormStream = Server.CreateObject("ADODB.Stream")
-
-		Do While (nFormStart + 2) < nTotalSize
-			nFormEnd	= InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3
-
-			With oFormStream
-				.Type	= 1
-				.Mode	= 3
-				.Open
-				oSourceData.Position = nFormStart
-				oSourceData.CopyTo oFormStream, nFormEnd - nFormStart
-				.Position	= 0
-				.Type		= 2
-				.CharSet	= "UTF-8"
-				sFormHeader	= .ReadText
-				.Close
-			End With
-
-			nFormStart	= InStrB(nFormEnd, oTotalData, sBoundary) - 1
-			nPosStart	= InStr(22, sFormHeader, " name=", 1) + 7
-			nPosEnd		= InStr(nPosStart, sFormHeader, """")
-			sFormName	= Mid(sFormHeader, nPosStart, nPosEnd - nPosStart)
-
-			If InStr(45, sFormHeader, " filename=", 1) > 0 Then
-				Set File(sFormName)			= New NetRube_FileInfo
-				File(sFormName).FormName	= sFormName
-				File(sFormName).Start		= nFormEnd
-				File(sFormName).Size		= nFormStart - nFormEnd - 2
-				nPosStart					= InStr(nPosEnd, sFormHeader, " filename=", 1) + 11
-				nPosEnd						= InStr(nPosStart, sFormHeader, """")
-				File(sFormName).ClientPath	= Mid(sFormHeader, nPosStart, nPosEnd - nPosStart)
-				File(sFormName).Name		= Mid(File(sFormName).ClientPath, InStrRev(File(sFormName).ClientPath, "\") + 1)
-				File(sFormName).Ext			= LCase(Mid(File(sFormName).Name, InStrRev(File(sFormName).Name, ".") + 1))
-				nPosStart					= InStr(nPosEnd, sFormHeader, "Content-Type: ", 1) + 14
-				nPosEnd						= InStr(nPosStart, sFormHeader, vbCr)
-				File(sFormName).MIME		= Mid(sFormHeader, nPosStart, nPosEnd - nPosStart)
-			Else
-				With oFormStream
-					.Type	= 1
-					.Mode	= 3
-					.Open
-					oSourceData.Position = nFormEnd
-					oSourceData.CopyTo oFormStream, nFormStart - nFormEnd - 2
-					.Position	= 0
-					.Type		= 2
-					.CharSet	= "UTF-8"
-					Form(sFormName)	= .ReadText
-					.Close
-				End With
-			End If
-
-			nFormStart	= nFormStart + nBoundLen
-		Loop
-
-		oTotalData = ""
-		Set oFormStream = Nothing
-	End Sub
-
-	Public Sub SaveAs(sItem, sFileName)
-		If File(sItem).Size < 1 Then
-			nErr = 2
-			Exit Sub
-		End If
-
-		If Not IsAllowed(File(sItem).Ext) Then
-			nErr = 4
-			Exit Sub
-		End If
-
-		If InStr( LCase( sFileName ), "::$data" ) > 0 Then
-			nErr = 4
-			Exit Sub
-		End If
-
-		Dim sFileExt, iFileSize
-		sFileExt	= File(sItem).Ext
-		iFileSize	= File(sItem).Size
-
-		' Check XSS.
-		If Not IsHtmlExtension( sFileExt ) Then
-			' Calculate the size of data to load (max 1Kb).
-			Dim iXSSSize
-			iXSSSize = iFileSize
-
-			If iXSSSize > 1024 Then
-				iXSSSize = 1024
-			End If
-
-			' Read the data.
-			Dim sData
-			oSourceData.Position = File(sItem).Start
-			sData = oSourceData.Read( iXSSSize )	' Byte Array
-			sData = ByteArray2Text( sData )			' String
-
-			' Sniff HTML data.
-			If SniffHtml( sData ) Then
-				nErr = 4
-				Exit Sub
-			End If
-		End If
-
-		Dim oFileStream
-		Set oFileStream = Server.CreateObject("ADODB.Stream")
-		With oFileStream
-			.Type		= 1
-			.Mode		= 3
-			.Open
-			oSourceData.Position = File(sItem).Start
-			oSourceData.CopyTo oFileStream, File(sItem).Size
-			.Position	= 0
-			.SaveToFile sFileName, 2
-			.Close
-		End With
-		Set oFileStream = Nothing
-	End Sub
-
-	Private Function IsAllowed(sExt)
-		Dim oRE
-		Set oRE	= New RegExp
-		oRE.IgnoreCase	= True
-		oRE.Global		= True
-
-		If sDenied = "" Then
-			oRE.Pattern	= sAllowed
-			IsAllowed	= (sAllowed = "") Or oRE.Test(sExt)
-		Else
-			oRE.Pattern	= sDenied
-			IsAllowed	= Not oRE.Test(sExt)
-		End If
-
-		Set oRE	= Nothing
-	End Function
-
-	Private Function IsHtmlExtension( sExt )
-		If sHtmlExtensions = "" Then
-			Exit Function
-		End If
-
-		Dim oRE
-		Set oRE = New RegExp
-		oRE.IgnoreCase	= True
-		oRE.Global		= True
-		oRE.Pattern		= sHtmlExtensions
-
-		IsHtmlExtension = oRE.Test(sExt)
-
-		Set oRE	= Nothing
-	End Function
-
-	Private Function SniffHtml( sData )
-
-		Dim oRE
-		Set oRE = New RegExp
-		oRE.IgnoreCase	= True
-		oRE.Global		= True
-
-		Dim aPatterns
-		aPatterns = Array( "<!DOCTYPE\W*X?HTML", "<(body|head|html|img|pre|script|table|title)", "type\s*=\s*[\'""]?\s*(?:\w*/)?(?:ecma|java)", "(?:href|src|data)\s*=\s*[\'""]?\s*(?:ecma|java)script:", "url\s*\(\s*[\'""]?\s*(?:ecma|java)script:" )
-
-		Dim i
-		For i = 0 to UBound( aPatterns )
-			oRE.Pattern = aPatterns( i )
-			If oRE.Test( sData ) Then
-				SniffHtml = True
-				Exit Function
-			End If
-		Next
-
-		SniffHtml = False
-
-	End Function
-
-	' Thanks to http://www.ericphelps.com/q193998/index.htm
-	Private Function ByteArray2Text(varByteArray)
-		Dim strData, strBuffer, lngCounter
-		strData = ""
-		strBuffer = ""
-		For lngCounter = 0 to UBound(varByteArray)
-			strBuffer = strBuffer & Chr(255 And Ascb(Midb(varByteArray,lngCounter + 1, 1)))
-			'Keep strBuffer at 1k bytes maximum
-			If lngCounter Mod 1024 = 0 Then
-				strData = strData & strBuffer
-				strBuffer = ""
-			End If
-		Next
-		ByteArray2Text = strData & strBuffer
-	End Function
-
-End Class
-
-Class NetRube_FileInfo
-	Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
-End Class
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/commands.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/commands.asp
deleted file mode 100644
index 25767cc2d1..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/commands.asp
+++ /dev/null
@@ -1,198 +0,0 @@
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' This file include the functions that handle the Command requests
- ' in the ASP Connector.
-%>
-<%
-Sub GetFolders( resourceType, currentFolder )
-	' Map the virtual path to the local server path.
-	Dim sServerDir
-	sServerDir = ServerMapFolder( resourceType, currentFolder, "GetFolders" )
-
-	' Open the "Folders" node.
-	Response.Write "<Folders>"
-
-	Dim oFSO, oCurrentFolder, oFolders, oFolder
-	Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
-	if not (oFSO.FolderExists( sServerDir ) ) then
-		Set oFSO = Nothing
-		SendError 102, currentFolder
-	end if
-
-	Set oCurrentFolder = oFSO.GetFolder( sServerDir )
-	Set oFolders = oCurrentFolder.SubFolders
-
-	For Each oFolder in oFolders
-		Response.Write "<Folder name=""" & ConvertToXmlAttribute( oFolder.name ) & """ />"
-	Next
-
-	Set oFSO = Nothing
-
-	' Close the "Folders" node.
-	Response.Write "</Folders>"
-End Sub
-
-Sub GetFoldersAndFiles( resourceType, currentFolder )
-	' Map the virtual path to the local server path.
-	Dim sServerDir
-	sServerDir = ServerMapFolder( resourceType, currentFolder, "GetFoldersAndFiles" )
-
-	Dim oFSO, oCurrentFolder, oFolders, oFolder, oFiles, oFile
-	Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
-	if not (oFSO.FolderExists( sServerDir ) ) then
-		Set oFSO = Nothing
-		SendError 102, currentFolder
-	end if
-
-	Set oCurrentFolder = oFSO.GetFolder( sServerDir )
-	Set oFolders	= oCurrentFolder.SubFolders
-	Set oFiles		= oCurrentFolder.Files
-
-	' Open the "Folders" node.
-	Response.Write "<Folders>"
-
-	For Each oFolder in oFolders
-		Response.Write "<Folder name=""" & ConvertToXmlAttribute( oFolder.name ) & """ />"
-	Next
-
-	' Close the "Folders" node.
-	Response.Write "</Folders>"
-
-	' Open the "Files" node.
-	Response.Write "<Files>"
-
-	For Each oFile in oFiles
-		Dim iFileSize
-		iFileSize = Round( oFile.size / 1024 )
-		If ( iFileSize < 1 AND oFile.size <> 0 ) Then iFileSize = 1
-
-		Response.Write "<File name=""" & ConvertToXmlAttribute( oFile.name ) & """ size=""" & iFileSize & """ />"
-	Next
-
-	' Close the "Files" node.
-	Response.Write "</Files>"
-End Sub
-
-Sub CreateFolder( resourceType, currentFolder )
-	Dim sErrorNumber
-
-	Dim sNewFolderName
-	sNewFolderName = Request.QueryString( "NewFolderName" )
-	sNewFolderName = SanitizeFolderName( sNewFolderName )
-
-	If ( sNewFolderName = "" OR InStr( 1, sNewFolderName, ".." ) > 0  ) Then
-		sErrorNumber = "102"
-	Else
-		' Map the virtual path to the local server path of the current folder.
-		Dim sServerDir
-		sServerDir = ServerMapFolder( resourceType, CombineLocalPaths(currentFolder, sNewFolderName), "CreateFolder" )
-
-		On Error Resume Next
-
-		CreateServerFolder sServerDir
-
-		Dim iErrNumber, sErrDescription
-		iErrNumber		= err.number
-		sErrDescription	= err.Description
-
-		On Error Goto 0
-
-		Select Case iErrNumber
-			Case 0
-				sErrorNumber = "0"
-			Case 52
-				sErrorNumber = "102"	' Invalid Folder Name.
-			Case 70
-				sErrorNumber = "103"	' Security Error.
-			Case 76
-				sErrorNumber = "102"	' Path too long.
-			Case Else
-				sErrorNumber = "110"
-		End Select
-	End If
-
-	' Create the "Error" node.
-	Response.Write "<Error number=""" & sErrorNumber & """ originalNumber=""" & iErrNumber & """ originalDescription=""" & ConvertToXmlAttribute( sErrDescription ) & """ />"
-End Sub
-
-Sub FileUpload( resourceType, currentFolder, sCommand )
-	Dim oUploader
-	Set oUploader = New NetRube_Upload
-	oUploader.MaxSize	= 0
-	oUploader.Allowed	= ConfigAllowedExtensions.Item( resourceType )
-	oUploader.Denied	= ConfigDeniedExtensions.Item( resourceType )
-	oUploader.HtmlExtensions = ConfigHtmlExtensions
-	oUploader.GetData
-
-	Dim sErrorNumber
-	sErrorNumber = "0"
-
-	Dim sFileName, sOriginalFileName, sExtension
-	sFileName = ""
-
-	If oUploader.ErrNum > 0 Then
-		sErrorNumber = "202"
-	Else
-		' Map the virtual path to the local server path.
-		Dim sServerDir
-		sServerDir = ServerMapFolder( resourceType, currentFolder, sCommand )
-
-		Dim oFSO
-		Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
-		if not (oFSO.FolderExists( sServerDir ) ) then
-			sErrorNumber = "102"
-		else
-			' Get the uploaded file name.
-			sFileName	= oUploader.File( "NewFile" ).Name
-			sExtension	= oUploader.File( "NewFile" ).Ext
-			sFileName = SanitizeFileName( sFileName )
-			sOriginalFileName = sFileName
-
-			Dim iCounter
-			iCounter = 0
-
-			Do While ( True )
-				Dim sFilePath
-				sFilePath = CombineLocalPaths(sServerDir, sFileName)
-
-				If ( oFSO.FileExists( sFilePath ) ) Then
-					iCounter = iCounter + 1
-					sFileName = RemoveExtension( sOriginalFileName ) & "(" & iCounter & ")." & sExtension
-					sErrorNumber = "201"
-				Else
-					oUploader.SaveAs "NewFile", sFilePath
-					If oUploader.ErrNum > 0 Then sErrorNumber = "202"
-					Exit Do
-				End If
-			Loop
-		end if
-	End If
-
-	Set oUploader	= Nothing
-
-	dim sFileUrl
-	sFileUrl = CombinePaths( GetResourceTypePath( resourceType, sCommand ) , currentFolder )
-	sFileUrl = CombinePaths( sFileUrl, sFileName )
-
-	SendUploadResults sErrorNumber, sFileUrl, sFileName, ""
-End Sub
-
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/config.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/config.asp
deleted file mode 100644
index abc574a58b..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/config.asp
+++ /dev/null
@@ -1,128 +0,0 @@
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' Configuration file for the File Manager Connector for ASP.
-%>
-<%
-
-' SECURITY: You must explicitly enable this "connector" (set it to "True").
-' WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only
-'		authenticated users can access this file or use some kind of session checking.
-Dim ConfigIsEnabled
-ConfigIsEnabled = False
-
-' Path to user files relative to the document root.
-' This setting is preserved only for backward compatibility.
-' You should look at the settings for each resource type to get the full potential
-Dim ConfigUserFilesPath
-ConfigUserFilesPath = "/userfiles/"
-
-' Due to security issues with Apache modules, it is recommended to leave the
-' following setting enabled.
-Dim ConfigForceSingleExtension
-ConfigForceSingleExtension = true
-
-' What the user can do with this connector
-Dim ConfigAllowedCommands
-ConfigAllowedCommands = "QuickUpload|FileUpload|GetFolders|GetFoldersAndFiles|CreateFolder"
-
-' Allowed Resource Types
-Dim ConfigAllowedTypes
-ConfigAllowedTypes = "File|Image|Flash|Media"
-
-' For security, HTML is allowed in the first Kb of data for files having the
-' following extensions only.
-Dim ConfigHtmlExtensions
-ConfigHtmlExtensions = "html|htm|xml|xsd|txt|js"
-'
-'	Configuration settings for each Resource Type
-'
-'	- AllowedExtensions: the possible extensions that can be allowed.
-'		If it is empty then any file type can be uploaded.
-'
-'	- DeniedExtensions: The extensions that won't be allowed.
-'		If it is empty then no restrictions are done here.
-'
-'	For a file to be uploaded it has to fulfill both the AllowedExtensions
-'	and DeniedExtensions (that's it: not being denied) conditions.
-'
-'	- FileTypesPath: the virtual folder relative to the document root where
-'		these resources will be located.
-'		Attention: It must start and end with a slash: '/'
-'
-'	- FileTypesAbsolutePath: the physical path to the above folder. It must be
-'		an absolute path.
-'		If it's an empty string then it will be autocalculated.
-'		Useful if you are using a virtual directory, symbolic link or alias.
-'		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-'		Attention: The above 'FileTypesPath' must point to the same directory.
-'		Attention: It must end with a slash: '/'
-'
-' - QuickUploadPath: the virtual folder relative to the document root where
-'		these resources will be uploaded using the Upload tab in the resources
-'		dialogs.
-'		Attention: It must start and end with a slash: '/'
-'
-'	 - QuickUploadAbsolutePath: the physical path to the above folder. It must be
-'		an absolute path.
-'		If it's an empty string then it will be autocalculated.
-'		Useful if you are using a virtual directory, symbolic link or alias.
-'		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-'		Attention: The above 'QuickUploadPath' must point to the same directory.
-'		Attention: It must end with a slash: '/'
-'
-
-Dim ConfigAllowedExtensions, ConfigDeniedExtensions, ConfigFileTypesPath, ConfigFileTypesAbsolutePath, ConfigQuickUploadPath, ConfigQuickUploadAbsolutePath
-Set ConfigAllowedExtensions	= CreateObject( "Scripting.Dictionary" )
-Set ConfigDeniedExtensions	= CreateObject( "Scripting.Dictionary" )
-Set ConfigFileTypesPath	= CreateObject( "Scripting.Dictionary" )
-Set ConfigFileTypesAbsolutePath	= CreateObject( "Scripting.Dictionary" )
-Set ConfigQuickUploadPath	= CreateObject( "Scripting.Dictionary" )
-Set ConfigQuickUploadAbsolutePath	= CreateObject( "Scripting.Dictionary" )
-
-ConfigAllowedExtensions.Add	"File", "7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip"
-ConfigDeniedExtensions.Add	"File", ""
-ConfigFileTypesPath.Add "File", ConfigUserFilesPath & "file/"
-ConfigFileTypesAbsolutePath.Add "File", ""
-ConfigQuickUploadPath.Add "File", ConfigUserFilesPath
-ConfigQuickUploadAbsolutePath.Add "File", ""
-
-ConfigAllowedExtensions.Add	"Image", "bmp|gif|jpeg|jpg|png"
-ConfigDeniedExtensions.Add	"Image", ""
-ConfigFileTypesPath.Add "Image", ConfigUserFilesPath & "image/"
-ConfigFileTypesAbsolutePath.Add "Image", ""
-ConfigQuickUploadPath.Add "Image", ConfigUserFilesPath
-ConfigQuickUploadAbsolutePath.Add "Image", ""
-
-ConfigAllowedExtensions.Add	"Flash", "swf|flv"
-ConfigDeniedExtensions.Add	"Flash", ""
-ConfigFileTypesPath.Add "Flash", ConfigUserFilesPath & "flash/"
-ConfigFileTypesAbsolutePath.Add "Flash", ""
-ConfigQuickUploadPath.Add "Flash", ConfigUserFilesPath
-ConfigQuickUploadAbsolutePath.Add "Flash", ""
-
-ConfigAllowedExtensions.Add	"Media", "aiff|asf|avi|bmp|fla|flv|gif|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|png|qt|ram|rm|rmi|rmvb|swf|tif|tiff|wav|wma|wmv"
-ConfigDeniedExtensions.Add	"Media", ""
-ConfigFileTypesPath.Add "Media", ConfigUserFilesPath & "media/"
-ConfigFileTypesAbsolutePath.Add "Media", ""
-ConfigQuickUploadPath.Add "Media", ConfigUserFilesPath
-ConfigQuickUploadAbsolutePath.Add "Media", ""
-
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/connector.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/connector.asp
deleted file mode 100644
index dc113a90bd..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/connector.asp
+++ /dev/null
@@ -1,88 +0,0 @@
-<%@ CodePage=65001 Language="VBScript"%>
-<%
-Option Explicit
-Response.Buffer = True
-%>
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' This is the File Manager Connector for ASP.
-%>
-<!--#include file="config.asp"-->
-<!--#include file="util.asp"-->
-<!--#include file="io.asp"-->
-<!--#include file="basexml.asp"-->
-<!--#include file="commands.asp"-->
-<!--#include file="class_upload.asp"-->
-<%
-
-If ( ConfigIsEnabled = False ) Then
-	SendError 1, "This connector is disabled. Please check the ""editor/filemanager/connectors/asp/config.asp"" file"
-End If
-
-DoResponse
-
-Sub DoResponse()
-	Dim sCommand, sResourceType, sCurrentFolder
-
-	' Get the main request information.
-	sCommand = Request.QueryString("Command")
-
-	sResourceType = Request.QueryString("Type")
-	If ( sResourceType = "" ) Then sResourceType = "File"
-
-	sCurrentFolder = GetCurrentFolder()
-
-	' Check if it is an allowed command
-	if ( Not IsAllowedCommand( sCommand ) ) then
-		SendError 1, "The """ & sCommand & """ command isn't allowed"
-	end if
-
-	' Check if it is an allowed resource type.
-	if ( Not IsAllowedType( sResourceType ) ) Then
-		SendError 1, "The """ & sResourceType & """ resource type isn't allowed"
-	end if
-
-	' File Upload doesn't have to Return XML, so it must be intercepted before anything.
-	If ( sCommand = "FileUpload" ) Then
-		FileUpload sResourceType, sCurrentFolder, sCommand
-		Exit Sub
-	End If
-
-	SetXmlHeaders
-
-	CreateXmlHeader sCommand, sResourceType, sCurrentFolder, GetUrlFromPath( sResourceType, sCurrentFolder, sCommand)
-
-	' Execute the required command.
-	Select Case sCommand
-		Case "GetFolders"
-			GetFolders sResourceType, sCurrentFolder
-		Case "GetFoldersAndFiles"
-			GetFoldersAndFiles sResourceType, sCurrentFolder
-		Case "CreateFolder"
-			CreateFolder sResourceType, sCurrentFolder
-	End Select
-
-	CreateXmlFooter
-
-	Response.End
-End Sub
-
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/io.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/io.asp
deleted file mode 100644
index ba6315fea9..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/io.asp
+++ /dev/null
@@ -1,236 +0,0 @@
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' This file include IO specific functions used by the ASP Connector.
-%>
-<%
-function CombinePaths( sBasePath, sFolder)
-	CombinePaths =  RemoveFromEnd( sBasePath, "/" ) & "/" & RemoveFromStart( sFolder, "/" )
-end function
-
-function CombineLocalPaths( sBasePath, sFolder)
-	sFolder = replace(sFolder, "/", "\")
-	' The RemoveFrom* functions use RegExp, so we must escape the \
-	CombineLocalPaths =  RemoveFromEnd( sBasePath, "\\" ) & "\" & RemoveFromStart( sFolder, "\\" )
-end function
-
-Function GetResourceTypePath( resourceType, sCommand )
-	if ( sCommand = "QuickUpload") then
-		GetResourceTypePath = ConfigQuickUploadPath.Item( resourceType )
-	else
-		GetResourceTypePath = ConfigFileTypesPath.Item( resourceType )
-	end if
-end Function
-
-Function GetResourceTypeDirectory( resourceType, sCommand )
-	if ( sCommand = "QuickUpload") then
-
-		if ( ConfigQuickUploadAbsolutePath.Item( resourceType ) <> "" ) then
-			GetResourceTypeDirectory = ConfigQuickUploadAbsolutePath.Item( resourceType )
-		else
-			' Map the "UserFiles" path to a local directory.
-			GetResourceTypeDirectory = Server.MapPath( ConfigQuickUploadPath.Item( resourceType ) )
-		end if
-	else
-		if ( ConfigFileTypesAbsolutePath.Item( resourceType ) <> "" ) then
-			GetResourceTypeDirectory = ConfigFileTypesAbsolutePath.Item( resourceType )
-		else
-			' Map the "UserFiles" path to a local directory.
-			GetResourceTypeDirectory = Server.MapPath( ConfigFileTypesPath.Item( resourceType ) )
-		end if
-	end if
-end Function
-
-Function GetUrlFromPath( resourceType, folderPath, sCommand )
-	GetUrlFromPath = CombinePaths( GetResourceTypePath( resourceType, sCommand ), folderPath )
-End Function
-
-Function RemoveExtension( fileName )
-	RemoveExtension = Left( fileName, InStrRev( fileName, "." ) - 1 )
-End Function
-
-Function ServerMapFolder( resourceType, folderPath, sCommand )
-	Dim sResourceTypePath
-	' Get the resource type directory.
-	sResourceTypePath = GetResourceTypeDirectory( resourceType, sCommand )
-
-	' Ensure that the directory exists.
-	CreateServerFolder sResourceTypePath
-
-	' Return the resource type directory combined with the required path.
-	ServerMapFolder = CombineLocalPaths( sResourceTypePath, folderPath )
-End Function
-
-Sub CreateServerFolder( folderPath )
-	Dim oFSO
-	Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
-
-	Dim sParent
-	sParent = oFSO.GetParentFolderName( folderPath )
-
-	' If folderPath is a network path (\\server\folder\) then sParent is an empty string.
-	' Get out.
-	if (sParent = "") then exit sub
-
-	' Check if the parent exists, or create it.
-	If ( NOT oFSO.FolderExists( sParent ) ) Then CreateServerFolder( sParent )
-
-	If ( oFSO.FolderExists( folderPath ) = False ) Then
-		On Error resume next
-		oFSO.CreateFolder( folderPath )
-
-		if err.number<>0 then
-		dim sErrorNumber
-		Dim iErrNumber, sErrDescription
-		iErrNumber		= err.number
-		sErrDescription	= err.Description
-
-		On Error Goto 0
-
-		Select Case iErrNumber
-			Case 52
-				sErrorNumber = "102"	' Invalid Folder Name.
-			Case 70
-				sErrorNumber = "103"	' Security Error.
-			Case 76
-				sErrorNumber = "102"	' Path too long.
-			Case Else
-				sErrorNumber = "110"
-			End Select
-
-			SendError sErrorNumber, "CreateServerFolder(" & folderPath & ") : " & sErrDescription
-		end if
-
-	End If
-
-	Set oFSO = Nothing
-End Sub
-
-Function IsAllowedExt( extension, resourceType )
-	Dim oRE
-	Set oRE	= New RegExp
-	oRE.IgnoreCase	= True
-	oRE.Global		= True
-
-	Dim sAllowed, sDenied
-	sAllowed	= ConfigAllowedExtensions.Item( resourceType )
-	sDenied		= ConfigDeniedExtensions.Item( resourceType )
-
-	IsAllowedExt = True
-
-	If sDenied <> "" Then
-		oRE.Pattern	= sDenied
-		IsAllowedExt	= Not oRE.Test( extension )
-	End If
-
-	If IsAllowedExt And sAllowed <> "" Then
-		oRE.Pattern		= sAllowed
-		IsAllowedExt	= oRE.Test( extension )
-	End If
-
-	Set oRE	= Nothing
-End Function
-
-Function IsAllowedType( resourceType )
-	Dim oRE
-	Set oRE	= New RegExp
-	oRE.IgnoreCase	= True
-	oRE.Global		= True
-	oRE.Pattern		= "^(" & ConfigAllowedTypes & ")$"
-
-	IsAllowedType = oRE.Test( resourceType )
-
-	Set oRE	= Nothing
-End Function
-
-Function IsAllowedCommand( sCommand )
-	Dim oRE
-	Set oRE	= New RegExp
-	oRE.IgnoreCase	= True
-	oRE.Global		= True
-	oRE.Pattern		= "^(" & ConfigAllowedCommands & ")$"
-
-	IsAllowedCommand = oRE.Test( sCommand )
-
-	Set oRE	= Nothing
-End Function
-
-function GetCurrentFolder()
-	dim sCurrentFolder
-	sCurrentFolder = Request.QueryString("CurrentFolder")
-	If ( sCurrentFolder = "" ) Then sCurrentFolder = "/"
-
-	' Check the current folder syntax (must begin and start with a slash).
-	If ( Right( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = sCurrentFolder & "/"
-	If ( Left( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = "/" & sCurrentFolder
-
-	' Check for invalid folder paths (..)
-	If ( InStr( 1, sCurrentFolder, ".." ) <> 0 OR InStr( 1, sCurrentFolder, "\" ) <> 0) Then
-		SendError 102, ""
-	End If
-
-	GetCurrentFolder = sCurrentFolder
-end function
-
-' Do a cleanup of the folder name to avoid possible problems
-function SanitizeFolderName( sNewFolderName )
-	Dim oRegex
-	Set oRegex = New RegExp
-	oRegex.Global		= True
-
-' remove . \ / | : ? *  " < > and control characters
-	oRegex.Pattern = "(\.|\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)"
-	SanitizeFolderName = oRegex.Replace( sNewFolderName, "_" )
-
-	Set oRegex = Nothing
-end function
-
-' Do a cleanup of the file name to avoid possible problems
-function SanitizeFileName( sNewFileName )
-	Dim oRegex
-	Set oRegex = New RegExp
-	oRegex.Global		= True
-
-	if ( ConfigForceSingleExtension = True ) then
-		oRegex.Pattern = "\.(?![^.]*$)"
-		sNewFileName = oRegex.Replace( sNewFileName, "_" )
-	end if
-
-' remove \ / | : ? *  " < > and control characters
-	oRegex.Pattern = "(\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)"
-	SanitizeFileName = oRegex.Replace( sNewFileName, "_" )
-
-	Set oRegex = Nothing
-end function
-
-' This is the function that sends the results of the uploading process.
-Sub SendUploadResults( errorNumber, fileUrl, fileName, customMsg )
-	Response.Clear
-	Response.Write "<script type=""text/javascript"">"
-	' Minified version of the document.domain automatic fix script (#1919).
-	' The original script can be found at _dev/domain_fix_template.js
-	Response.Write "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();"
-
-	Response.Write "window.parent.OnUploadCompleted(" & errorNumber & ",""" & Replace( fileUrl, """", "\""" ) & """,""" & Replace( fileName, """", "\""" ) & """,""" & Replace( customMsg , """", "\""" ) & """) ;"
-	Response.Write "</script>"
-	Response.End
-End Sub
-
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/upload.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/upload.asp
deleted file mode 100644
index 8fa11c2cee..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/upload.asp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%@ CodePage=65001 Language="VBScript"%>
-<%
-Option Explicit
-Response.Buffer = True
-%>
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' This is the "File Uploader" for ASP.
-%>
-<!--#include file="config.asp"-->
-<!--#include file="util.asp"-->
-<!--#include file="io.asp"-->
-<!--#include file="commands.asp"-->
-<!--#include file="class_upload.asp"-->
-<%
-
-Sub SendError( number, text )
-	SendUploadResults number, "", "", text
-End Sub
-
-' Check if this uploader has been enabled.
-If ( ConfigIsEnabled = False ) Then
-	SendUploadResults "1", "", "", "This file uploader is disabled. Please check the ""editor/filemanager/connectors/asp/config.asp"" file"
-End If
-
-	Dim sCommand, sResourceType, sCurrentFolder
-
-	sCommand = "QuickUpload"
-
-	sResourceType = Request.QueryString("Type")
-	If ( sResourceType = "" ) Then sResourceType = "File"
-
-	sCurrentFolder = GetCurrentFolder()
-
-	' Is Upload enabled?
-	if ( Not IsAllowedCommand( sCommand ) ) then
-		SendUploadResults "1", "", "", "The """ & sCommand & """ command isn't allowed"
-	end if
-
-	' Check if it is an allowed resource type.
-	if ( Not IsAllowedType( sResourceType ) ) Then
-		SendUploadResults "1", "", "", "The " & sResourceType & " resource type isn't allowed"
-	end if
-
-	FileUpload sResourceType, sCurrentFolder, sCommand
-
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/util.asp b/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/util.asp
deleted file mode 100644
index ba414f5914..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/asp/util.asp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
- ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
- ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
- '
- ' == BEGIN LICENSE ==
- '
- ' Licensed under the terms of any of the following licenses at your
- ' choice:
- '
- '  - GNU General Public License Version 2 or later (the "GPL")
- '    http://www.gnu.org/licenses/gpl.html
- '
- '  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- '    http://www.gnu.org/licenses/lgpl.html
- '
- '  - Mozilla Public License Version 1.1 or later (the "MPL")
- '    http://www.mozilla.org/MPL/MPL-1.1.html
- '
- ' == END LICENSE ==
- '
- ' This file include generic functions used by the ASP Connector.
-%>
-<%
-Function RemoveFromStart( sourceString, charToRemove )
-	Dim oRegex
-	Set oRegex = New RegExp
-	oRegex.Pattern = "^" & charToRemove & "+"
-
-	RemoveFromStart = oRegex.Replace( sourceString, "" )
-End Function
-
-Function RemoveFromEnd( sourceString, charToRemove )
-	Dim oRegex
-	Set oRegex = New RegExp
-	oRegex.Pattern = charToRemove & "+$"
-
-	RemoveFromEnd = oRegex.Replace( sourceString, "" )
-End Function
-
-Function ConvertToXmlAttribute( value )
-	ConvertToXmlAttribute = Replace( value, "&", "&amp;" )
-End Function
-
-Function InArray( value, sourceArray )
-	Dim i
-	For i = 0 to UBound( sourceArray )
-		If sourceArray(i) = value Then
-			InArray = True
-			Exit Function
-		End If
-	Next
-	InArray = False
-End Function
-
-%>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/config.ascx b/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/config.ascx
deleted file mode 100644
index fafd7d70ab..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/config.ascx
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ Control Language="C#" EnableViewState="false" AutoEventWireup="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Config" %>
-<%--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Configuration file for the File Browser Connector for ASP.NET.
---%>
-<script runat="server">
-
-	/**
-	 * This function must check the user session to be sure that he/she is
-	 * authorized to upload and access files in the File Browser.
-	 */
-	private bool CheckAuthentication()
-	{
-		// WARNING : DO NOT simply return "true". By doing so, you are allowing
-		// "anyone" to upload and list the files in your server. You must implement
-		// some kind of session validation here. Even something very simple as...
-		//
-		//		return ( Session[ "IsAuthorized" ] != null && (bool)Session[ "IsAuthorized" ] == true );
-		//
-		// ... where Session[ "IsAuthorized" ] is set to "true" as soon as the
-		// user logs in your system.
-
-		return false;
-	}
-
-	public override void SetConfig()
-	{
-		// SECURITY: You must explicitly enable this "connector". (Set it to "true").
-		Enabled = CheckAuthentication();
-
-		// URL path to user files.
-		UserFilesPath = "/userfiles/";
-
-		// The connector tries to resolve the above UserFilesPath automatically.
-		// Use the following setting it you prefer to explicitely specify the
-		// absolute path. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-		// Attention: The above 'UserFilesPath' URL must point to the same directory.
-		UserFilesAbsolutePath = "";
-
-		// Due to security issues with Apache modules, it is recommended to leave the
-		// following setting enabled.
-		ForceSingleExtension = true;
-
-		// Allowed Resource Types
-		AllowedTypes = new string[] { "File", "Image", "Flash", "Media" };
-
-		// For security, HTML is allowed in the first Kb of data for files having the
-		// following extensions only.
-		HtmlExtensions = new string[] { "html", "htm", "xml", "xsd", "txt", "js" };
-
-		TypeConfig[ "File" ].AllowedExtensions			= new string[] { "7z", "aiff", "asf", "avi", "bmp", "csv", "doc", "fla", "flv", "gif", "gz", "gzip", "jpeg", "jpg", "mid", "mov", "mp3", "mp4", "mpc", "mpeg", "mpg", "ods", "odt", "pdf", "png", "ppt", "pxd", "qt", "ram", "rar", "rm", "rmi", "rmvb", "rtf", "sdc", "sitd", "swf", "sxc", "sxw", "tar", "tgz", "tif", "tiff", "txt", "vsd", "wav", "wma", "wmv", "xls", "xml", "zip" };
-		TypeConfig[ "File" ].DeniedExtensions			= new string[] { };
-		TypeConfig[ "File" ].FilesPath					= "%UserFilesPath%file/";
-		TypeConfig[ "File" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%file/" );
-		TypeConfig[ "File" ].QuickUploadPath			= "%UserFilesPath%";
-		TypeConfig[ "File" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );
-
-		TypeConfig[ "Image" ].AllowedExtensions			= new string[] { "bmp", "gif", "jpeg", "jpg", "png" };
-		TypeConfig[ "Image" ].DeniedExtensions			= new string[] { };
-		TypeConfig[ "Image" ].FilesPath					= "%UserFilesPath%image/";
-		TypeConfig[ "Image" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%image/" );
-		TypeConfig[ "Image" ].QuickUploadPath			= "%UserFilesPath%";
-		TypeConfig[ "Image" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );
-
-		TypeConfig[ "Flash" ].AllowedExtensions			= new string[] { "swf", "flv" };
-		TypeConfig[ "Flash" ].DeniedExtensions			= new string[] { };
-		TypeConfig[ "Flash" ].FilesPath					= "%UserFilesPath%flash/";
-		TypeConfig[ "Flash" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%flash/" );
-		TypeConfig[ "Flash" ].QuickUploadPath			= "%UserFilesPath%";
-		TypeConfig[ "Flash" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );
-
-		TypeConfig[ "Media" ].AllowedExtensions			= new string[] { "aiff", "asf", "avi", "bmp", "fla", "flv", "gif", "jpeg", "jpg", "mid", "mov", "mp3", "mp4", "mpc", "mpeg", "mpg", "png", "qt", "ram", "rm", "rmi", "rmvb", "swf", "tif", "tiff", "wav", "wma", "wmv" };
-		TypeConfig[ "Media" ].DeniedExtensions			= new string[] { };
-		TypeConfig[ "Media" ].FilesPath					= "%UserFilesPath%media/";
-		TypeConfig[ "Media" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%media/" );
-		TypeConfig[ "Media" ].QuickUploadPath			= "%UserFilesPath%";
-		TypeConfig[ "Media" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );
-	}
-
-</script>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/connector.aspx b/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/connector.aspx
deleted file mode 100644
index 8f27ade790..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/connector.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Connector" AutoEventWireup="false" %>
-<%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %>
-<%--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the File Browser Connector for ASP.NET.
- *
- * The code of this page if included in the FCKeditor.Net package,
- * in the FredCK.FCKeditorV2.dll assembly file. So to use it you must
- * include that DLL in your "bin" directory.
- *
- * To download the FCKeditor.Net package, go to our official web site:
- * http://www.fckeditor.net
---%>
-<FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/upload.aspx b/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/upload.aspx
deleted file mode 100644
index 4c295cdc15..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/aspx/upload.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Uploader" AutoEventWireup="false" %>
-<%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %>
-<%--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the Uploader for ASP.NET.
- *
- * The code of this page if included in the FCKeditor.Net package,
- * in the FredCK.FCKeditorV2.dll assemblyfile. So to use it you must
- * include that DLL in your "bin" directory.
- *
- * To download the FCKeditor.Net package, go to our official web site:
- * http://www.fckeditor.net
---%>
-<FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc
deleted file mode 100644
index b9b919c770..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc
+++ /dev/null
@@ -1,273 +0,0 @@
-<cfcomponent name="ImageObject">
-<!---
-	ImageObject.cfc written by Rick Root (rick@webworksllc.com)
-
-	Related Web Sites:
-	- http://www.opensourcecf.com/imagecfc (home page)
-
-
-	This is an object oriented interface to the original
-	ImageCFC.
-
-	Example Code:
-
-	io = createObject("component","ImageObject");
-	io.setOption("defaultJpegCompression",95);
-	io.init("#ExpandPath(".")#/emily.jpg");
-	io.scaleWidth(500);
-	io.save("#ExpandPath(".")#/imagex1.jpg");
-
-	io.flipHorizontal();
-	io.save("#ExpandPath(".")#/imagex2.jpg");
-	io.revert();
-	io.filterFastBlur(2,5);
-	io.save("#ExpandPath(".")#/imagex3.jpg");
-	io.revert();
-	io.filterPosterize(32);
-	io.save("#ExpandPath(".")#/imagex4.jpg");
-
-
-	LICENSE
-	-------
-	Copyright (c) 2006, Rick Root <rick@webworksllc.com>
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or
-	without modification, are permitted provided that the
-	following conditions are met:
-
-	- Redistributions of source code must retain the above
-	  copyright notice, this list of conditions and the
-	  following disclaimer.
-	- Redistributions in binary form must reproduce the above
-	  copyright notice, this list of conditions and the
-	  following disclaimer in the documentation and/or other
-	  materials provided with the distribution.
-	- Neither the name of the Webworks, LLC. nor the names of
-	  its contributors may be used to endorse or promote products
-	  derived from this software without specific prior written
-	  permission.
-
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-	CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-	OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---->
-
-<cfset variables.img = "">
-<cfset variables.revertimg = "">
-<cfset variables.imageCFC = createObject("component","image")>
-<cfset variables.imageInfo = structNew()>
-	<cfset variables.imageInfo.width = 0>
-	<cfset variables.imageInfo.height = 0>
-	<cfset variables.imageInfo.colorModel = "">
-	<cfset variables.imageInfo.colorspace = "">
-	<cfset variables.imageInfo.objColorModel = "">
-	<cfset variables.imageInfo.objColorspace = "">
-	<cfset variables.imageInfo.sampleModel = "">
-	<cfset variables.imageInfo.imageType = 0>
-	<cfset variables.imageInfo.misc = "">
-	<cfset variables.imageInfo.canModify = false>
-<cfset variables.imageCFC.setOption("throwonerror",true)>
-
-<!---
-
-	init(filename)        Initialize object from a file.
-	init(width, height)   Initialize with a blank image
-	init(bufferedImage)   Initiailize with an existing object
---->
-<cffunction name="init" access="public" output="false" returnType="void">
-	<cfargument name="arg1" type="any" required="yes">
-	<cfargument name="arg2" type="any" required="no">
-
-	<cfif isDefined("arg2") and isNumeric(arg1) and isNumeric(arg2)>
-		<cfset arg1 = javacast("int",int(arg1))>
-		<cfset arg2 = javacast("int",int(arg2))>
-		<cfset variables.img = createObject("java","java.awt.image.BufferedImage")>
-		<cfset variables.img.init(arg1,arg2,variables.img.TYPE_INT_RGB)>
-	<cfelseif arg1.getClass().getName() eq "java.awt.image.BufferedImage">
-		<cfset variables.img = arg1>
-	<cfelseif isSimpleValue(arg1) and len(arg1) gt 0>
-		<cfset imageResults = variables.imageCFC.readImage(arg1, "no")>
-		<cfset variables.img = imageResults.img>
-	<cfelse>
-		<cfthrow message="Object Instantiation Error" detail="You have attempted to initialize ooimage.cfc with invalid arguments.  Please consult the documentation for correct initialization arguments.">
-	</cfif>
-	<cfif variables.revertimg eq "">
-		<cfset variables.revertimg = variables.img>
-	</cfif>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-	<cfreturn>
-</cffunction>
-
-<cffunction name="flipHorizontal" access="public" output="true" returnType="void" hint="Flip an image horizontally.">
-	<cfset var imageResults = imageCFC.flipHorizontal(variables.img,"","")>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-</cffunction>
-
-<cffunction name="getImageInfo" access="public" output="true" returntype="struct" hint="Returns image information.">
-	<cfreturn variables.imageInfo>
-</cffunction>
-<cffunction name="getImageObject" access="public" output="true" returntype="struct" hint="Returns a java Buffered Image Object.">
-	<cfreturn variables.img>
-</cffunction>
-
-<cffunction name="flipVertical" access="public" output="true" returntype="void" hint="Flop an image vertically.">
-	<cfset var imageResults = imageCFC.flipVertical(variables.img,"","")>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-</cffunction>
-
-<cffunction name="scaleWidth" access="public" output="true" returntype="void" hint="Scale an image to a specific width.">
-	<cfargument name="newWidth" required="yes" type="numeric">
-	<cfset var imageResults = imageCFC.scaleWidth(variables.img,"","", newWidth)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-
-</cffunction>
-
-<cffunction name="scaleHeight" access="public" output="true" returntype="void" hint="Scale an image to a specific height.">
-	<cfargument name="newHeight" required="yes" type="numeric">
-	<cfset var imageResults = imageCFC.scaleHeight(variables.img,"","", newHeight)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-</cffunction>
-
-<cffunction name="resize" access="public" output="true" returntype="void" hint="Resize an image to a specific width and height.">
-	<cfargument name="newWidth" required="yes" type="numeric">
-	<cfargument name="newHeight" required="yes" type="numeric">
-	<cfargument name="preserveAspect" required="no" type="boolean" default="FALSE">
-	<cfargument name="cropToExact" required="no" type="boolean" default="FALSE">
-
-	<cfset var imageResults = imageCFC.resize(variables.img,"","",newWidth,newHeight,preserveAspect,cropToExact)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-</cffunction>
-
-<cffunction name="crop" access="public" output="true" returntype="void" hint="Crop an image.">
-	<cfargument name="fromX" required="yes" type="numeric">
-	<cfargument name="fromY" required="yes" type="numeric">
-	<cfargument name="newWidth" required="yes" type="numeric">
-	<cfargument name="newHeight" required="yes" type="numeric">
-	<cfset var imageResults = imageCFC.crop(variables.img,"","",fromX,fromY,newWidth,newHeight)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-
-</cffunction>
-
-<cffunction name="rotate" access="public" output="true" returntype="void" hint="Rotate an image (+/-)90, (+/-)180, or (+/-)270 degrees.">
-	<cfargument name="degrees" required="yes" type="numeric">
-	<cfset var imageResults = imageCFC.rotate(variables.img,"","",degrees)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-
-</cffunction>
-
-<cffunction name="setOption" access="public" output="true" returnType="void" hint="Sets values for allowed CFC options.">
-	<cfargument name="key" type="string" required="yes">
-	<cfargument name="val" type="string" required="yes">
-	<cfif lcase(trim(key)) eq "throwonerror">
-		<cfthrow message="Option Configuration Error" detail="You cannot set the throwOnError option when using ImageObject.cfc">
-	</cfif>
-	<cfset imageCFC.setOption(key, val)>
-
-</cffunction>
-
-<cffunction name="getOption" access="public" output="true" returnType="any" hint="Returns the current value for the specified CFC option.">
-	<cfargument name="key" type="string" required="yes">
-	<cfreturn imageCFC.getOption(key)>
-</cffunction>
-
-<cffunction name="filterFastBlur" access="public" output="true" returntype="void" hint="Internal method used for flipping and flopping images.">
-	<cfargument name="blurAmount" required="yes" type="numeric">
-	<cfargument name="iterations" required="yes" type="numeric">
-	<cfset var imageResults = imageCFC.filterFastBlur(variables.img,"","",blurAmount,iterations)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-
-</cffunction>
-
-<cffunction name="filterSharpen" access="public" output="true" returntype="void" hint="Internal method used for flipping and flopping images.">
-	<cfset var imageResults = imageCFC.filterSharpen(variables.img,"","")>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-
-</cffunction>
-
-
-<cffunction name="filterPosterize" access="public" output="true" returntype="void" hint="Internal method used for flipping and flopping images.">
-	<cfargument name="amount" required="yes" type="string">
-	<cfset var imageResults = imageCFC.filterPosterize(variables.img,"","",amount)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-</cffunction>
-
-
-<cffunction name="addText" access="public" output="true" returntype="void" hint="Add text to an image.">
-	<cfargument name="x" required="yes" type="numeric">
-	<cfargument name="y" required="yes" type="numeric">
-	<cfargument name="fontDetails" required="yes" type="struct">
-	<cfargument name="content" required="yes" type="String">
-	<cfset var imageResults = imageCFC.addText(variables.img,"","",x,y,fontDetails,content)>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-
-</cffunction>
-
-<cffunction name="watermark" access="public" output="false" returnType="void">
-	<cfargument name="wmImage" required="yes" type="Any">
-	<cfargument name="alpha" required="yes" type="numeric">
-	<cfargument name="placeAtX" required="yes" type="numeric">
-	<cfargument name="placeAtY" required="yes" type="numeric">
-
-	<cfset var imageResults = "">
-	<cfif isSimpleValue(wmImage)>
-		<!--- filename or URL --->
-		<cfset imageResults = imageCFC.watermark(variables.img,"","",wmImage,alpha,placeAtX,placeAtY)>
-	<cfelse>
-		<!--- must be a java object --->
-		<cfset imageResults = imageCFC.watermark(variables.img,wmImage,"","",alpha,placeAtX,placeAtY)>
-	</cfif>
-	<cfset variables.revertimg = variables.img>
-	<cfset variables.img = imageResults.img>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-
-</cffunction>
-
-<cffunction name="save" access="public" output="false" returnType="void">
-	<cfargument name="filename" type="string" required="no">
-	<cfargument name="jpegCompression" type="numeric" required="no">
-	<cfif isDefined("arguments.jpegCompression") and isNumeric(arguments.jpegCompression)>
-		<cfset imageCFC.writeImage(filename,variables.img,jpegCompression)>
-	<cfelse>
-		<cfset imageCFC.writeImage(filename,variables.img)>
-	</cfif>
-</cffunction>
-
-<cffunction name="revert" access="public" output="true" returntype="void" hint="Undo the previous manipulation.">
-	<cfset variables.img = variables.revertimg>
-	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
-</cffunction>
-
-</cfcomponent>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm
deleted file mode 100644
index ce21a3adc9..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm
+++ /dev/null
@@ -1,315 +0,0 @@
-<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * File Browser connector for ColdFusion 5.
- * (based on the original CF connector by Hendrik Kramer - hk@lwd.de)
- *
- * Note:
- * FCKeditor requires that the connector responds with UTF-8 encoded XML.
- * As ColdFusion 5 does not fully support UTF-8 encoding, we force ASCII
- * file and folder names in this connector to allow CF5 send a UTF-8
- * encoded response - code points under 127 in UTF-8 are stored using a
- * single byte, using the same encoding as ASCII, which is damn handy.
- * This is all grand for the English speakers, like meself, but I dunno
- * how others are gonna take to it. Well, the previous version of this
- * connector already did this with file names and nobody seemed to mind,
- * so fingers-crossed nobody will mind their folder names being munged too.
- *
---->
-
-<cfparam name="url.command">
-<cfparam name="url.type">
-<cfparam name="url.currentFolder">
-<!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->
-
-<cfinclude template="config.cfm">
-
-<cfscript>
-	userFilesPath = config.userFilesPath;
-
-	if ( userFilesPath eq "" )
-	{
-		userFilesPath = "/userfiles/";
-	}
-
-	// make sure the user files path is correctly formatted
-	userFilesPath = replace(userFilesPath, "\", "/", "ALL");
-	userFilesPath = replace(userFilesPath, '//', '/', 'ALL');
-	if ( right(userFilesPath,1) NEQ "/" )
-	{
-		userFilesPath = userFilesPath & "/";
-	}
-	if ( left(userFilesPath,1) NEQ "/" )
-	{
-		userFilesPath = "/" & userFilesPath;
-	}
-
-	// make sure the current folder is correctly formatted
-	url.currentFolder = replace(url.currentFolder, "\", "/", "ALL");
-	url.currentFolder = replace(url.currentFolder, '//', '/', 'ALL');
-	if ( right(url.currentFolder,1) neq "/" )
-	{
-		url.currentFolder = url.currentFolder & "/";
-	}
-	if ( left(url.currentFolder,1) neq "/" )
-	{
-		url.currentFolder = "/" & url.currentFolder;
-	}
-
-	if ( find("/",getBaseTemplatePath()) neq 0 )
-	{
-		fs = "/";
-	}
-	else
-	{
-		fs = "\";
-	}
-
-	// Get the base physical path to the web root for this application. The code to determine the path automatically assumes that
-	// the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a
-	// virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary.
-	if ( len(config.serverPath) )
-	{
-		serverPath = config.serverPath;
-
-		if ( right(serverPath,1) neq fs )
-		{
-			serverPath = serverPath & fs;
-		}
-	}
-	else
-	{
-		serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
-	}
-
-	rootPath = left( serverPath, Len(serverPath) - Len(userFilesPath) ) ;
-	xmlContent = ""; // append to this string to build content
-</cfscript>
-
-<cfset resourceTypeUrl = rereplace( replace( Config.FileTypesPath[url.type], fs, "/", "all"), "/$", "") >
-
-<cfif isDefined( "Config.FileTypesAbsolutePath" )
-		and structkeyexists( Config.FileTypesAbsolutePath, url.type )
-		and Len( Config.FileTypesAbsolutePath[url.type] )>
-
-			<cfset userFilesServerPath = Config.FileTypesAbsolutePath[url.type] & url.currentFolder>
-<cfelse>
-	<cftry>
-	<cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
-	<!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
-	<cfcatch type="any">
-		<cfset userFilesServerPath = rootPath & Config.FileTypesPath[url.type] & url.currentFolder>
-	</cfcatch>
-	</cftry>
-</cfif>
-
-<cfset userFilesServerPath = replace( userFilesServerPath, "/", fs, "all" ) >
-<!--- get rid of double directory separators --->
-<cfset userFilesServerPath = replace( userFilesServerPath, fs & fs, fs, "all") >
-
-<cfif not config.enabled>
-
-	<cfset xmlContent = "<Error number=""1"" text=""This connector is disabled. Please check the 'editor/filemanager/connectors/cfm/config.cfm' file"" />">
-
-<cfelseif find("..",url.currentFolder) or find("\",url.currentFolder)>
-
-	<cfset xmlContent = "<Error number=""102"" />">
-
-<cfelseif isDefined("Config.ConfigAllowedCommands") and not ListFind(Config.ConfigAllowedCommands, url.command)>
-
-	<cfset xmlContent = '<Error number="1" text="The &quot;' & url.command & '&quot; command isn''t allowed" />'>
-
-<cfelseif isDefined("Config.ConfigAllowedTypes") and not ListFind(Config.ConfigAllowedTypes, url.type)>
-
-	<cfset xmlContent = '<Error number="1" text="The &quot;' & url.type & '&quot; type isn''t allowed" />'>
-
-</cfif>
-
-<cfset resourceTypeDirectory = left( userFilesServerPath, Len(userFilesServerPath) - Len(url.currentFolder) )>
-
-<cfif not len(xmlContent) and not directoryexists(resourceTypeDirectory)>
-	<!--- create directories in physical path if they don't already exist --->
-	<cfset currentPath = "">
-	<cftry>
-		<cfloop list="#resourceTypeDirectory#" index="name" delimiters="#fs#">
-			<cfif currentPath eq "" and fs eq "\">
-				<!--- Without checking this, we would have in Windows \C:\ --->
-				<cfif not directoryExists(name)>
-					<cfdirectory action="create" directory="#name#" mode="755">
-				</cfif>
-			<cfelse>
-				<cfif not directoryExists(currentPath & fs & name)>
-					<cfdirectory action="create" directory="#currentPath##fs##name#" mode="755">
-				</cfif>
-			</cfif>
-
-			<cfif fs eq "\" and currentPath eq "">
-				<cfset currentPath = name>
-			<cfelse>
-				<cfset currentPath = currentPath & fs & name>
-			</cfif>
-		</cfloop>
-
-	<cfcatch type="any">
-
-		<!--- this should only occur as a result of a permissions problem --->
-		<cfset xmlContent = "<Error number=""103"" />">
-
-	</cfcatch>
-
-	</cftry>
-</cfif>
-
-<cfif not len(xmlContent)>
-
-	<!--- no errors thus far - run command --->
-
-	<!--- we need to know the physical path to the current folder for all commands --->
-	<cfset currentFolderPath = userFilesServerPath>
-
-	<cfswitch expression="#url.command#">
-
-		<cfcase value="FileUpload">
-			<cfset config_included = true >
-			<cfinclude template="cf5_upload.cfm">
-			<cfabort>
-		</cfcase>
-
-
-		<cfcase value="GetFolders">
-
-			<!--- Sort directories first, name ascending --->
-			<cfdirectory
-				action="list"
-				directory="#currentFolderPath#"
-				name="qDir"
-				sort="type,name">
-
-			<cfscript>
-				i=1;
-				folders = "";
-				while( i lte qDir.recordCount ) {
-					if( not compareNoCase( qDir.type[i], "FILE" ))
-						break;
-					if( not listFind(".,..", qDir.name[i]) )
-						folders = folders & '<Folder name="#HTMLEditFormat( qDir.name[i] )#" />';
-					i=i+1;
-				}
-
-				xmlContent = xmlContent & '<Folders>' & folders & '</Folders>';
-			</cfscript>
-
-		</cfcase>
-
-
-		<cfcase value="GetFoldersAndFiles">
-
-			<!--- Sort directories first, name ascending --->
-			<cfdirectory
-				action="list"
-				directory="#currentFolderPath#"
-				name="qDir"
-				sort="type,name">
-
-			<cfscript>
-				i=1;
-				folders = "";
-				files = "";
-				while( i lte qDir.recordCount ) {
-					if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind(".,..", qDir.name[i]) ) {
-						folders = folders & '<Folder name="#HTMLEditFormat(qDir.name[i])#" />';
-					} else if( not compareNoCase( qDir.type[i], "FILE" ) ) {
-						fileSizeKB = round(qDir.size[i] / 1024);
-						files = files & '<File name="#HTMLEditFormat(qDir.name[i])#" size="#IIf( fileSizeKB GT 0, DE( fileSizeKB ), 1)#" />';
-					}
-					i=i+1;
-				}
-
-				xmlContent = xmlContent & '<Folders>' & folders & '</Folders>';
-				xmlContent = xmlContent & '<Files>' & files & '</Files>';
-			</cfscript>
-
-		</cfcase>
-
-
-		<cfcase value="CreateFolder">
-
-			<cfparam name="url.newFolderName" default="">
-
-			<cfscript>
-				newFolderName = url.newFolderName;
-				if( reFind("[^A-Za-z0-9_\-\.]", newFolderName) ) {
-					// Munge folder name same way as we do the filename
-					// This means folder names are always US-ASCII so we don't have to worry about CF5 and UTF-8
-					newFolderName = reReplace(newFolderName, "[^A-Za-z0-9\-\.]", "_", "all");
-					newFolderName = reReplace(newFolderName, "_{2,}", "_", "all");
-					newFolderName = reReplace(newFolderName, "([^_]+)_+$", "\1", "all");
-					newFolderName = reReplace(newFolderName, "$_([^_]+)$", "\1", "all");
-				}
-			</cfscript>
-
-			<cfif not len(newFolderName) or len(newFolderName) gt 255>
-				<cfset errorNumber = 102>
-			<cfelseif directoryExists(currentFolderPath & newFolderName)>
-				<cfset errorNumber = 101>
-			<cfelseif reFind("^\.\.",newFolderName)>
-				<cfset errorNumber = 103>
-			<cfelse>
-				<cfset errorNumber = 0>
-
-				<cftry>
-					<cfdirectory
-						action="create"
-						directory="#currentFolderPath##newFolderName#"
-						mode="755">
-					<cfcatch>
-						<!---
-						un-resolvable error numbers in ColdFusion:
-						* 102 : Invalid folder name.
-						* 103 : You have no permissions to create the folder.
-						--->
-						<cfset errorNumber = 110>
-					</cfcatch>
-				</cftry>
-			</cfif>
-
-			<cfset xmlContent = xmlContent & '<Error number="#errorNumber#" />'>
-
-		</cfcase>
-
-		<cfdefaultcase>
-			<cfthrow type="fckeditor.connector" message="Illegal command: #url.command#">
-		</cfdefaultcase>
-
-	</cfswitch>
-</cfif>
-
-<cfscript>
-	xmlHeader = '<?xml version="1.0" encoding="utf-8" ?><Connector command="#url.command#" resourceType="#url.type#">';
-	xmlHeader = xmlHeader & '<CurrentFolder path="#url.currentFolder#" url="#resourceTypeUrl##url.currentFolder#" />';
-	xmlFooter = '</Connector>';
-</cfscript>
-
-<cfheader name="Expires" value="#GetHttpTimeString(Now())#">
-<cfheader name="Pragma" value="no-cache">
-<cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
-<cfcontent reset="true" type="text/xml; charset=UTF-8">
-<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm
deleted file mode 100644
index daebaf0d2c..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm
+++ /dev/null
@@ -1,299 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the "File Uploader" for ColdFusion 5.
- * Based on connector.cfm by Mark Woods (mark@thickpaddy.com)
- *
- * Note:
- * FCKeditor requires that the connector responds with UTF-8 encoded XML.
- * As ColdFusion 5 does not fully support UTF-8 encoding, we force ASCII
- * file and folder names in this connector to allow CF5 send a UTF-8
- * encoded response - code points under 127 in UTF-8 are stored using a
- * single byte, using the same encoding as ASCII, which is damn handy.
- * This is all grand for the English speakers, like meself, but I dunno
- * how others are gonna take to it. Well, the previous version of this
- * connector already did this with file names and nobody seemed to mind,
- * so fingers-crossed nobody will mind their folder names being munged too.
- *
---->
-
-<cfparam name="url.command" default="QuickUpload">
-<cfparam name="url.type" default="File">
-<cfparam name="url.currentFolder" default="/">
-
-<cfif not isDefined("config_included")>
-	<cfinclude template="config.cfm">
-</cfif>
-
-<cfscript>
-	function SendUploadResults(errorNumber, fileUrl, fileName, customMsg)
-	{
-		WriteOutput('<script type="text/javascript">');
-		// Minified version of the document.domain automatic fix script (#1919).
-		// The original script can be found at _dev/domain_fix_template.js
-		WriteOutput("(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();");
-		WriteOutput('window.parent.OnUploadCompleted(' & errorNumber & ', "' & JSStringFormat(fileUrl) & '", "' & JSStringFormat(fileName) & '", "' & JSStringFormat(customMsg) & '");' );
-		WriteOutput('</script>');
-	}
-</cfscript>
-
-<cfif NOT config.enabled>
-	<cfset SendUploadResults(1, "", "", "This file uploader is disabled. Please check the ""editor/filemanager/connectors/cfm/config.cfm"" file")>
-	<cfabort>
-</cfif>
-
-<cfif isDefined("Config.ConfigAllowedCommands") and not ListFind(Config.ConfigAllowedCommands, url.command)>
-	<cfset SendUploadResults(1, "", "", "The """ & url.command & """ command isn't allowed")>
-	<cfabort>
-</cfif>
-
-<cfif isDefined("Config.ConfigAllowedTypes") and not ListFind(Config.ConfigAllowedTypes, url.type)>
-	<cfset SendUploadResults(1, "", "", "The """ & url.type &  """ type isn't allowed")>
-	<cfabort>
-</cfif>
-
-<cfif find( "..", url.currentFolder) or find( "\", url.currentFolder)>
-	<cfset SendUploadResults(102)>
-	<cfabort>
-</cfif>
-
-<cfscript>
-	userFilesPath = config.userFilesPath;
-
-	if ( userFilesPath eq "" ) {
-		userFilesPath = "/userfiles/";
-	}
-
-	// make sure the user files path is correctly formatted
-	userFilesPath = replace(userFilesPath, "\", "/", "ALL");
-	userFilesPath = replace(userFilesPath, '//', '/', 'ALL');
-	if ( right(userFilesPath,1) NEQ "/" ) {
-		userFilesPath = userFilesPath & "/";
-	}
-	if ( left(userFilesPath,1) NEQ "/" ) {
-		userFilesPath = "/" & userFilesPath;
-	}
-
-	// make sure the current folder is correctly formatted
-	url.currentFolder = replace(url.currentFolder, "\", "/", "ALL");
-	url.currentFolder = replace(url.currentFolder, '//', '/', 'ALL');
-	if ( right(url.currentFolder,1) neq "/" ) {
-		url.currentFolder = url.currentFolder & "/";
-	}
-	if ( left(url.currentFolder,1) neq "/" ) {
-		url.currentFolder = "/" & url.currentFolder;
-	}
-
-	if (find("/",getBaseTemplatePath())) {
-		fs = "/";
-	} else {
-		fs = "\";
-	}
-
-	// Get the base physical path to the web root for this application. The code to determine the path automatically assumes that
-	// the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a
-	// virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary.
-	if ( len(config.serverPath) ) {
-		serverPath = config.serverPath;
-
-		if ( right(serverPath,1) neq fs ) {
-			serverPath = serverPath & fs;
-		}
-	} else {
-		serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
-	}
-
-	rootPath = left( serverPath, Len(serverPath) - Len(userFilesPath) ) ;
-</cfscript>
-<cfif url.command eq "QuickUpload">
-	<cfset resourceTypeUrl = rereplace( replace( Config.QuickUploadPath[url.type], fs, "/", "all"), "/$", "") >
-	<cfif isDefined( "Config.QuickUploadAbsolutePath" )
-			and structkeyexists( Config.QuickUploadAbsolutePath, url.type )
-			and Len( Config.QuickUploadAbsolutePath[url.type] )>
-				<cfset userFilesServerPath = Config.QuickUploadAbsolutePath[url.type] & url.currentFolder>
-	<cfelse>
-		<cftry>
-		<cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
-		<!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
-		<cfcatch type="any">
-			<cfset userFilesServerPath = rootPath & Config.QuickUploadPath[url.type] & url.currentFolder>
-		</cfcatch>
-		</cftry>
-	</cfif>
-<cfelse>
-	<cfset resourceTypeUrl = rereplace( replace( Config.FileTypesPath[url.type], fs, "/", "all"), "/$", "") >
-	<cfif isDefined( "Config.FileTypesAbsolutePath" )
-			and structkeyexists( Config.FileTypesAbsolutePath, url.type )
-			and Len( Config.FileTypesAbsolutePath[url.type] )>
-				<cfset userFilesServerPath = Config.FileTypesAbsolutePath[url.type] & url.currentFolder>
-	<cfelse>
-		<cftry>
-		<cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
-		<!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
-		<cfcatch type="any">
-			<cfset userFilesServerPath = rootPath & Config.FileTypesPath[url.type] & url.currentFolder>
-		</cfcatch>
-		</cftry>
-	</cfif>
-</cfif>
-
-<cfset userFilesServerPath = replace( userFilesServerPath, "/", fs, "all" ) >
-<!--- get rid of double directory separators --->
-<cfset userFilesServerPath = replace( userFilesServerPath, fs & fs, fs, "all") >
-
-<!--- create resource type directory if not exists --->
-<cfset resourceTypeDirectory = left( userFilesServerPath, Len(userFilesServerPath) - Len(url.currentFolder) )>
-
-<cfif not directoryexists( resourceTypeDirectory )>
-
-	<cfset currentPath = "">
-	<cftry>
-		<cfloop list="#resourceTypeDirectory#" index="name" delimiters="#fs#">
-			<cfif currentPath eq "" and fs eq "\">
-				<!--- Without checking this, we would have in Windows \C:\ --->
-				<cfif not directoryExists(name)>
-					<cfdirectory action="create" directory="#name#" mode="755">
-				</cfif>
-			<cfelse>
-				<cfif not directoryExists(currentPath & fs & name)>
-					<cfdirectory action="create" directory="#currentPath##fs##name#" mode="755">
-				</cfif>
-			</cfif>
-
-			<cfif fs eq "\" and currentPath eq "">
-				<cfset currentPath = name>
-			<cfelse>
-				<cfset currentPath = currentPath & fs & name>
-			</cfif>
-		</cfloop>
-
-	<cfcatch type="any">
-
-		<!--- this should only occur as a result of a permissions problem --->
-		<cfset SendUploadResults(103)>
-		<cfabort>
-
-	</cfcatch>
-
-	</cftry>
-</cfif>
-
-<cfset currentFolderPath = userFilesServerPath>
-<cfset resourceType = url.type>
-
-<cfset fileName = "">
-<cfset fileExt = "">
-
-<!--- Can be overwritten. The last value will be sent with the result --->
-<cfset customMsg = "">
-
-<cftry>
-	<!--- first upload the file with an unique filename --->
-	<cffile action="upload"
-		fileField="NewFile"
-		destination="#currentFolderPath#"
-		nameConflict="makeunique"
-		mode="644"
-		attributes="normal">
-
-	<cfif cffile.fileSize EQ 0>
-		<cfthrow>
-	</cfif>
-
-	<cfset lAllowedExtensions = config.allowedExtensions[#resourceType#]>
-	<cfset lDeniedExtensions = config.deniedExtensions[#resourceType#]>
-
-	<cfif ( len(lAllowedExtensions) and not listFindNoCase(lAllowedExtensions,cffile.ServerFileExt) )
-		or ( len(lDeniedExtensions) and listFindNoCase(lDeniedExtensions,cffile.ServerFileExt) )>
-
-		<cfset errorNumber = "202">
-		<cffile action="delete" file="#cffile.ServerDirectory##fs##cffile.ServerFile#">
-
-	<cfelse>
-
-		<cfscript>
-		errorNumber = 0;
-		fileName = cffile.ClientFileName ;
-		fileExt = cffile.ServerFileExt ;
-		fileExisted = false ;
-
-		// munge filename for html download. Only a-z, 0-9, _, - and . are allowed
-		if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) {
-			fileName = reReplace(fileName, "[^A-Za-z0-9\-\.]", "_", "ALL");
-			fileName = reReplace(fileName, "_{2,}", "_", "ALL");
-			fileName = reReplace(fileName, "([^_]+)_+$", "\1", "ALL");
-			fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL");
-		}
-
-		// remove additional dots from file name
-		if( isDefined("Config.ForceSingleExtension") and Config.ForceSingleExtension )
-			fileName = replace( fileName, '.', "_", "all" ) ;
-
-		// When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename.
-		if( compare( cffile.ServerFileName, fileName ) ) {
-			counter = 0;
-			tmpFileName = fileName;
-			while( fileExists("#currentFolderPath##fileName#.#fileExt#") ) {
-				fileExisted = true ;
-				counter = counter + 1 ;
-				fileName = tmpFileName & '(#counter#)' ;
-			}
-		}
-		</cfscript>
-
-		<!--- Rename the uploaded file, if neccessary --->
-		<cfif compare(cffile.ServerFileName,fileName)>
-
-			<cfif fileExisted>
-				<cfset errorNumber = "201">
-			</cfif>
-			<cffile
-				action="rename"
-				source="#currentFolderPath##cffile.ServerFileName#.#cffile.ServerFileExt#"
-				destination="#currentFolderPath##fileName#.#fileExt#"
-				mode="644"
-				attributes="normal">
-
-		</cfif>
-
-	</cfif>
-
-	<cfcatch type="any">
-
-		<cfset errorNumber = "1">
-		<cfset customMsg = cfcatch.message >
-
-	</cfcatch>
-</cftry>
-
-<cfif errorNumber EQ 0>
-	<!--- file was uploaded succesfully --->
-	<cfset SendUploadResults(errorNumber, '#resourceTypeUrl##url.currentFolder##fileName#.#fileExt#', "", "")>
-	<cfabort>
-<cfelseif errorNumber EQ 201>
-	<!--- file was changed (201), submit the new filename --->
-	<cfset SendUploadResults(errorNumber, '#resourceTypeUrl##url.currentFolder##fileName#.#fileExt#', replace( fileName & "." & fileExt, "'", "\'", "ALL"), customMsg)>
-	<cfabort>
-<cfelse>
-	<!--- An error occured(202). Submit only the error code and a message (if available). --->
-	<cfset SendUploadResults(errorNumber, '', '', customMsg)>
-	<cfabort>
-</cfif>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm
deleted file mode 100644
index 61a784cc95..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm
+++ /dev/null
@@ -1,68 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This file include the functions that create the base XML output by the ColdFusion Connector (MX 6.0 and above).
---->
-
-<cffunction name="SetXmlHeaders" returntype="void">
-	<cfheader name="Expires" value="#GetHttpTimeString(Now())#">
-	<cfheader name="Pragma" value="no-cache">
-	<cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
-	<cfcontent reset="true" type="text/xml; charset=UTF-8">
-</cffunction>
-
-<cffunction name="CreateXmlHeader" returntype="void" output="true">
-	<cfargument name="command" required="true">
-	<cfargument name="resourceType" required="true">
-	<cfargument name="currentFolder" required="true">
-
-	<cfset SetXmlHeaders()>
-	<cfoutput><?xml version="1.0" encoding="utf-8" ?></cfoutput>
-	<cfoutput><Connector command="#ARGUMENTS.command#" resourceType="#ARGUMENTS.resourceType#"></cfoutput>
-	<cfoutput><CurrentFolder path="#HTMLEditFormat(ARGUMENTS.currentFolder)#" url="#HTMLEditFormat( GetUrlFromPath( resourceType, currentFolder, command ) )#" /></cfoutput>
-	<cfset REQUEST.HeaderSent = true>
-</cffunction>
-
-<cffunction name="CreateXmlFooter" returntype="void" output="true">
-	<cfoutput></Connector></cfoutput>
-</cffunction>
-
-<cffunction name="SendError" returntype="void" output="true">
-	<cfargument name="number" required="true" type="Numeric">
-	<cfargument name="text" required="true">
-	<cfif isDefined("REQUEST.HeaderSent") and REQUEST.HeaderSent>
-		<cfset SendErrorNode( ARGUMENTS.number, ARGUMENTS.text )>
-		<cfset CreateXmlFooter() >
-	<cfelse>
-		<cfset SetXmlHeaders()>
-		<cfoutput><?xml version="1.0" encoding="utf-8" ?></cfoutput>
-		<cfoutput><Connector></cfoutput>
-		<cfset SendErrorNode( ARGUMENTS.number, ARGUMENTS.text )>
-		<cfset CreateXmlFooter() >
-	</cfif>
-	<cfabort>
-</cffunction>
-
-<cffunction name="SendErrorNode" returntype="void" output="true">
-	<cfargument name="number" required="true" type="Numeric">
-	<cfargument name="text" required="true">
-	<cfoutput><Error number="#ARGUMENTS.number#" text="#htmleditformat(ARGUMENTS.text)#" /></cfoutput>
-</cffunction>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm
deleted file mode 100644
index 2a900ce1a3..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm
+++ /dev/null
@@ -1,230 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This file include the functions that handle the Command requests
- * in the ColdFusion Connector (MX 6.0 and above).
---->
-
-<cffunction name="FileUpload" returntype="void" output="true">
-	<cfargument name="resourceType" type="string" required="yes" default="">
-	<cfargument name="currentFolder" type="string" required="yes" default="">
-	<cfargument name="sCommand" type="string" required="yes" default="">
-
-	<cfset var sFileName = "">
-	<cfset var sFilePart = "">
-	<cfset var sFileExt = "">
-	<cfset var sFileUrl = "">
-	<cfset var sTempDir = "">
-	<cfset var sTempFilePath = "">
-	<cfset var errorNumber = 0>
-	<cfset var customMsg = 0>
-	<cfset var counter = 0>
-	<cfset var destination = "">
-
-	<cftry>
-		<cfif isDefined( "REQUEST.Config.TempDirectory" )>
-			<cfset sTempDir = REQUEST.Config.TempDirectory>
-		<cfelse>
-			<cfset sTempDir = GetTempDirectory()>
-		</cfif>
-		<cfif NOT DirectoryExists (sTempDir)>
-			<cfthrow message="Invalid temporary directory: #sTempDir#">
-		</cfif>
-
-		<cffile action="UPLOAD" filefield="NewFile" destination="#sTempDir#" nameconflict="makeunique" mode="0755" />
-		<cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
-
-		<!--- Map the virtual path to the local server path. --->
-		<cfset sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, ARGUMENTS.sCommand) >
-		<!--- Get the uploaded file name. --->
-		<cfset sFileName = SanitizeFileName( CFFILE.ClientFile ) >
-		<cfset sOriginalFileName = sFileName >
-
-		<cfif isDefined( "REQUEST.Config.SecureImageUploads" ) and REQUEST.Config.SecureImageUploads>
-			<cfif not IsImageValid( sTempFilePath, CFFILE.ClientFileExt )>
-				<cftry>
-				<cffile action="delete" file="#sTempFilePath#">
-				<cfcatch type="any">
-				</cfcatch>
-				</cftry>
-				<cfthrow errorcode="202" type="fckeditor">
-			</cfif>
-		</cfif>
-
-		<cfif isDefined( "REQUEST.Config.HtmlExtensions" ) and not listFindNoCase( REQUEST.Config.HtmlExtensions, CFFILE.ClientFileExt )>
-			<cfif DetectHtml( sTempFilePath )>
-				<cftry>
-				<cffile action="delete" file="#sTempFilePath#">
-				<cfcatch type="any">
-				</cfcatch>
-				</cftry>
-				<cfthrow errorcode="202" type="fckeditor">
-			</cfif>
-		</cfif>
-
-		<cfif not IsAllowedExt( CFFILE.ClientFileExt, ARGUMENTS.resourceType )>
-			<cftry>
-			<cffile action="delete" file="#sTempFilePath#">
-			<cfcatch type="any">
-			</cfcatch>
-			</cftry>
-			<cfthrow errorcode="202" type="fckeditor">
-		</cfif>
-
-		<!--- When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. --->
-		<cfscript>
-			sFileExt = GetExtension( sFileName ) ;
-			sFilePart = RemoveExtension( sFileName );
-			while( fileExists( sServerDir & sFileName ) )
-			{
-				counter = counter + 1;
-				sFileName = sFilePart & '(#counter#).' & CFFILE.ClientFileExt;
-				errorNumber = 201;
-			}
-		</cfscript>
-
- 		<cfset destination = sServerDir & sFileName>
-
-		<cflock name="#destination#" timeout="30" type="Exclusive">
-		<cftry>
-			<cffile action="move" source="#sTempFilePath#" destination="#destination#" mode="755">
-			<!--- omit CF 6.1 error during moving uploaded file, just copy that file instead of moving --->
-			<cfcatch type="any">
-				<cffile action="copy" source="#sTempFilePath#" destination="#destination#" mode="755">
-			</cfcatch>
-		</cftry>
-		</cflock>
-
-		<cfset sFileUrl = CombinePaths( GetResourceTypePath( ARGUMENTS.resourceType, sCommand ) , ARGUMENTS.currentFolder ) >
-		<cfset sFileUrl = CombinePaths( sFileUrl , sFileName ) >
-
-		<cfcatch type="fckeditor">
-			<cfset errorNumber = CFCATCH.ErrorCode>
-		</cfcatch>
-
-		<cfcatch type="any">
-			<cfset errorNumber = "1">
-			<cfset customMsg = CFCATCH.Message >
-		</cfcatch>
-
-	</cftry>
-
-	<cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
-</cffunction>
-
-<cffunction name="GetFolders" returntype="void" output="true">
-	<cfargument name="resourceType" type="String" required="true">
-	<cfargument name="currentFolder" type="String" required="true">
-
-	<cfset var i = 1>
-	<cfset var folders = "">
-	<!--- Map the virtual path to the local server path --->
-	<cfset var sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, "GetFolders" ) >
-
-	<!--- Sort directories first, name ascending --->
-	<cfdirectory action="list" directory="#sServerDir#" name="qDir" sort="type,name">
-	<cfscript>
-		while( i lte qDir.recordCount )
-		{
-			if( compareNoCase( qDir.type[i], "FILE" ) and not listFind( ".,..", qDir.name[i] ) )
-			{
-				folders = folders & '<Folder name="#HTMLEditFormat( qDir.name[i] )#" />' ;
-			}
-			i = i + 1;
-		}
-	</cfscript>
-	<cfoutput><Folders>#folders#</Folders></cfoutput>
-</cffunction>
-
-<cffunction name="GetFoldersAndfiles" returntype="void" output="true">
-	<cfargument name="resourceType" type="String" required="true">
-	<cfargument name="currentFolder" type="String" required="true">
-
-	<cfset var i = 1>
-	<cfset var folders = "">
-	<cfset var files = "">
-	<!--- Map the virtual path to the local server path --->
-	<cfset var sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, "GetFolders" ) >
-
-	<!--- Sort directories first, name ascending --->
-	<cfdirectory action="list" directory="#sServerDir#" name="qDir" sort="type,name">
-	<cfscript>
-		while( i lte qDir.recordCount )
-		{
-			if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind( ".,..", qDir.name[i] ) )
-			{
-				folders = folders & '<Folder name="#HTMLEditFormat(qDir.name[i])#" />' ;
-			}
-			else if( not compareNoCase( qDir.type[i], "FILE" ) )
-			{
-				fileSizeKB = round(qDir.size[i] / 1024) ;
-				files = files & '<File name="#HTMLEditFormat(qDir.name[i])#" size="#IIf( fileSizeKB GT 0, DE( fileSizeKB ), 1)#" />' ;
-			}
-			i = i + 1 ;
-		}
-	</cfscript>
-	<cfoutput><Folders>#folders#</Folders></cfoutput>
-	<cfoutput><Files>#files#</Files></cfoutput>
-</cffunction>
-
-<cffunction name="CreateFolder" returntype="void" output="true">
-	<cfargument name="resourceType" required="true" type="string">
-	<cfargument name="currentFolder" required="true" type="string">
-
-	<cfset var sNewFolderName = url.newFolderName >
-	<cfset var sServerDir = "" >
-	<cfset var errorNumber = 0>
-	<cfset var sErrorMsg = "">
-	<cfset var currentFolderPath = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, 'CreateFolder' )>
-
-	<cfparam name="url.newFolderName" default="">
-
-	<cfscript>
-		sNewFolderName = SanitizeFolderName( sNewFolderName ) ;
-	</cfscript>
-
-	<cfif not len( sNewFolderName ) or len( sNewFolderName ) gt 255>
-		<cfset errorNumber = 102>
-	<cfelseif directoryExists( currentFolderPath & sNewFolderName )>
-		<cfset errorNumber = 101>
-	<cfelseif find( "..", sNewFolderName )>
-		<cfset errorNumber = 103>
-	<cfelse>
-		<cfset errorNumber = 0>
-
-		<!--- Map the virtual path to the local server path of the current folder. --->
-		<cfset sServerDir = currentFolderPath & sNewFolderName >
-
-		<cftry>
-			<cfdirectory action="create" directory="#currentFolderPath##sNewFolderName#" mode="755">
-			<cfcatch type="any">
-			<!---
-				un-resolvable error numbers in ColdFusion:
-				* 102 : Invalid folder name.
-				* 103 : You have no permissions to create the folder.
-			--->
-			<cfset errorNumber = 110>
-			</cfcatch>
-		</cftry>
-	</cfif>
-
-	<cfoutput><Error number="#errorNumber#" originalDescription="#HTMLEditFormat(sErrorMsg)#" /></cfoutput>
-</cffunction>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm
deleted file mode 100644
index 8bd1e75582..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm
+++ /dev/null
@@ -1,89 +0,0 @@
-<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * File Browser connector for ColdFusion (MX 6.0 and above).
- * (based on the original CF connector by Hendrik Kramer - hk@lwd.de)
- *
---->
-
-<cfparam name="url.command">
-<cfparam name="url.type">
-<cfparam name="url.currentFolder">
-
-<!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->
-
-<cfinclude template="config.cfm">
-<cfinclude template="cf_util.cfm">
-<cfinclude template="cf_io.cfm">
-<cfinclude template="cf_basexml.cfm">
-<cfinclude template="cf_commands.cfm">
-
-<cfif not Config.Enabled>
-	<cfset SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/connectors/cfm/config.cfm" file' )>
-</cfif>
-
-<cfset REQUEST.Config = Config>
-<cfif find( "/", getBaseTemplatePath() ) >
-	<cfset REQUEST.Fs = "/">
-<cfelse>
-	<cfset REQUEST.Fs = "\">
-</cfif>
-
-<cfset DoResponse() >
-
-<cffunction name="DoResponse" output="true" returntype="void">
-
-	<!--- Get the main request informaiton. --->
-	<cfset var sCommand	= "#URL.Command#" >
-	<cfset var sResourceType	= URL.Type >
-	<cfset var sCurrentFolder	= GetCurrentFolder() >
-
-	<!--- Check if it is an allowed command --->
-	<cfif not IsAllowedCommand( sCommand ) >
-		<cfset SendError( 1, "The """ & sCommand & """ command isn't allowed" ) >
-	</cfif>
-
-	<!--- Check if it is an allowed type. --->
-	<cfif not IsAllowedType( sResourceType ) >
-		<cfset SendError( 1, 'Invalid type specified' ) >
-	</cfif>
-
-	<!--- File Upload doesn't have to Return XML, so it must be intercepted before anything. --->
-	<cfif sCommand eq "FileUpload">
-		<cfset FileUpload( sResourceType, sCurrentFolder, sCommand )>
-		<cfabort>
-	</cfif>
-
-	<cfset CreateXmlHeader( sCommand, sResourceType, sCurrentFolder )>
-
-	<!--- Execute the required command. --->
-	<cfif sCommand eq "GetFolders">
-		<cfset GetFolders( sResourceType, sCurrentFolder ) >
-	<cfelseif sCommand eq "GetFoldersAndFiles">
-		<cfset GetFoldersAndFiles( sResourceType, sCurrentFolder ) >
-	<cfelseif sCommand eq "CreateFolder">
-		<cfset CreateFolder( sResourceType, sCurrentFolder ) >
-	</cfif>
-
-	<cfset CreateXmlFooter()>
-
-	<cfexit>
-</cffunction>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm
deleted file mode 100644
index e07e4dfb91..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm
+++ /dev/null
@@ -1,291 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This file include IO specific functions used by the ColdFusion Connector (MX 6.0 and above).
- *
---->
-
-<cffunction name="CombinePaths" returntype="String" output="true">
-	<cfargument name="sBasePath" required="true">
-	<cfargument name="sFolder" required="true">
-	<cfset sBasePath = RemoveFromEnd( sBasePath, "/" )>
-	<cfset sBasePath = RemoveFromEnd( sBasePath, "\" )>
-	<cfreturn sBasePath & "/" & RemoveFromStart( ARGUMENTS.sFolder, '/' )>
-</cffunction>
-
-<cffunction name="GetResourceTypePath" returntype="String" output="false">
-	<cfargument name="resourceType" required="true">
-	<cfargument name="sCommand" required="true">
-
-	<cfif ARGUMENTS.sCommand eq "QuickUpload">
-		<cfreturn REQUEST.Config['QuickUploadPath'][ARGUMENTS.resourceType]>
-	<cfelse>
-		<cfreturn REQUEST.Config['FileTypesPath'][ARGUMENTS.resourceType]>
-	</cfif>
-</cffunction>
-
-<cffunction name="GetResourceTypeDirectory" returntype="String" output="false">
-	<cfargument name="resourceType" required="true">
-	<cfargument name="sCommand" required="true">
-
-	<cfif ARGUMENTS.sCommand eq "QuickUpload">
-		<cfif isDefined( "REQUEST.Config.QuickUploadAbsolutePath" )
-			and structkeyexists( REQUEST.Config.QuickUploadAbsolutePath, ARGUMENTS.resourceType )
-			and Len( REQUEST.Config.QuickUploadAbsolutePath[ARGUMENTS.resourceType] )>
-				<cfreturn REQUEST.Config.QuickUploadAbsolutePath[ARGUMENTS.resourceType]>
-		</cfif>
-
-		<cfreturn expandpath( REQUEST.Config.QuickUploadPath[ARGUMENTS.resourceType] )>
-	<cfelse>
-		<cfif isDefined( "REQUEST.Config.FileTypesAbsolutePath" )
-			and structkeyexists( REQUEST.Config.FileTypesAbsolutePath, ARGUMENTS.resourceType )
-			and Len( REQUEST.Config.FileTypesAbsolutePath[ARGUMENTS.resourceType] )>
-				<cfreturn REQUEST.Config.FileTypesAbsolutePath[ARGUMENTS.resourceType]>
-		</cfif>
-
-		<cfreturn expandpath( REQUEST.Config.FileTypesPath[ARGUMENTS.resourceType] )>
-	</cfif>
-</cffunction>
-
-<cffunction name="GetUrlFromPath" returntype="String" output="false">
-	<cfargument name="resourceType" required="true">
-	<cfargument name="folderPath" required="true">
-	<cfargument name="sCommand" required="true">
-
-	<cfreturn CombinePaths( GetResourceTypePath( ARGUMENTS.resourceType, ARGUMENTS.sCommand ), ARGUMENTS.folderPath )>
-</cffunction>
-
-<cffunction name="RemoveExtension" output="false" returntype="String">
-	<cfargument name="fileName" required="true">
-	<cfset var pos = find( ".", reverse ( ARGUMENTS.fileName ) )>
-
-	<cfreturn mid( ARGUMENTS.fileName, 1, Len( ARGUMENTS.fileName ) - pos ) >
-</cffunction>
-
-<cffunction name="GetExtension" output="false" returntype="String">
-	<cfargument name="fileName" required="true">
-	<cfset var pos = find( ".", reverse ( ARGUMENTS.fileName ) )>
-
-	<cfif not pos>
-		<cfreturn "">
-	</cfif>
-
-	<cfreturn mid( ARGUMENTS.fileName, pos, Len( ARGUMENTS.fileName ) - pos ) >
-</cffunction>
-
-<cffunction name="ServerMapFolder" returntype="String" output="false">
-	<cfargument name="resourceType" required="true">
-	<cfargument name="folderPath" required="true">
-	<cfargument name="sCommand" required="true">
-
-	<!--- Get the resource type directory. --->
-	<cfset var sResourceTypePath = GetResourceTypeDirectory( ARGUMENTS.resourceType, ARGUMENTS.sCommand ) >
-	<!--- Ensure that the directory exists. --->
-	<cfset var sErrorMsg = CreateServerFolder( sResourceTypePath ) >
-
-	<cfif sErrorMsg neq ''>
-		<cfset SendError( 1, 'Error creating folder "' & sResourceTypePath & '" (' & sErrorMsg & ')' )>
-	</cfif>
-
-	<!--- Return the resource type directory combined with the required path. --->
-	<cfreturn CombinePaths( sResourceTypePath , ARGUMENTS.folderPath )>
-</cffunction>
-
-<cffunction name="GetParentFolder" returntype="string" output="false">
-	<cfargument name="folderPath" required="true">
-
-	<cfreturn rereplace(ARGUMENTS.folderPath, "[/\\\\][^/\\\\]+[/\\\\]?$", "")>
-</cffunction>
-
-<cffunction name="CreateServerFolder" returntype="String" output="false">
-	<cfargument name="folderPath">
-
-	<!--- Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms --->
-	<cfset folderPath = rereplace(ARGUMENTS.folderPath, "//+", "/", "all")>
-
-	<cfif directoryexists(ARGUMENTS.folderPath) or fileexists(ARGUMENTS.folderPath)>
-		<cfreturn "">
-	<cfelse>
-		<cftry>
-			<cfdirectory action="create" mode="0755" directory="#ARGUMENTS.folderPath#">
-		<cfcatch type="any">
-			<cfreturn CFCATCH.Message>
-		</cfcatch>
-		</cftry>
-	</cfif>
-
-	<cfreturn "">
-</cffunction>
-
-<cffunction name="IsAllowedExt" returntype="boolean" output="false">
-	<cfargument name="sExtension" required="true">
-	<cfargument name="resourceType" required="true">
-
-	<cfif isDefined( "REQUEST.Config.AllowedExtensions." & ARGUMENTS.resourceType )
-			and listLen( REQUEST.Config.AllowedExtensions[ARGUMENTS.resourceType] )
-			and not listFindNoCase( REQUEST.Config.AllowedExtensions[ARGUMENTS.resourceType], ARGUMENTS.sExtension )>
-			<cfreturn false>
-	</cfif>
-
-	<cfif isDefined( "REQUEST.Config.DeniedExtensions." & ARGUMENTS.resourceType )
-			and listLen( REQUEST.Config.DeniedExtensions[ARGUMENTS.resourceType] )
-			and listFindNoCase( REQUEST.Config.DeniedExtensions[ARGUMENTS.resourceType], ARGUMENTS.sExtension )>
-			<cfreturn false>
-	</cfif>
-
-	<cfreturn true>
-</cffunction>
-
-<cffunction name="IsAllowedType" returntype="boolean" output="false">
-	<cfargument name="resourceType">
-
-	<cfif not listFindNoCase( REQUEST.Config.ConfigAllowedTypes, ARGUMENTS.resourceType )>
-		<cfreturn false>
-	</cfif>
-
-	<cfreturn true>
-</cffunction>
-
-<cffunction name="IsAllowedCommand" returntype="boolean" output="true">
-	<cfargument name="sCommand" required="true" type="String">
-
-	<cfif not listFindNoCase( REQUEST.Config.ConfigAllowedCommands, ARGUMENTS.sCommand )>
-		<cfreturn false>
-	</cfif>
-
-	<cfreturn true>
-</cffunction>
-
-<cffunction name="GetCurrentFolder" returntype="String" output="true">
-	<cfset var sCurrentFolder = "/">
-
-	<cfif isDefined( "URL.CurrentFolder" )>
-		<cfset sCurrentFolder = URL.CurrentFolder>
-	</cfif>
-
-	<!--- Check the current folder syntax (must begin and start with a slash). --->
-	<cfif not refind( "/$", sCurrentFolder)>
-		<cfset sCurrentFolder = sCurrentFolder & "/">
-	</cfif>
-
-	<cfif not refind( "^/", sCurrentFolder )>
-		<cfset sCurrentFolder = "/" & sCurrentFolder>
-	</cfif>
-
-	<!--- Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms --->
-	<cfset sCurrentFolder = rereplace( sCurrentFolder, "//+", "/", "all" )>
-
-	<cfif find( "..", sCurrentFolder) or find( "\", sCurrentFolder) >
-		<cfset SendError( 102, "" )>
-	</cfif>
-
-	<cfreturn sCurrentFolder>
-</cffunction>
-
-<cffunction name="SanitizeFolderName" returntype="String" output="false">
-	<cfargument name="sNewFolderName" required="true">
-
-	<!--- Do a cleanup of the folder name to avoid possible problems --->
-	<!--- Remove . \ / | : ? * " < > and control characters --->
-	<cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
-
-	<cfreturn sNewFolderName>
-</cffunction>
-
-<cffunction name="BinaryFileRead" returntype="String" output="true">
-	<cfargument name="fileName" required="true" type="string">
-	<cfargument name="bytes" required="true" type="Numeric">
-
-	<cfscript>
-	var chunk = "";
-	var fileReaderClass = "";
-	var fileReader = "";
-	var file = "";
-	var done = false;
-	var counter = 0;
-	var byteArray = "";
-
-	if( not fileExists( ARGUMENTS.fileName ) )
-	{
-		return "" ;
-	}
-
-	if (REQUEST.CFVersion gte 8)
-	{
-		 file  = FileOpen( ARGUMENTS.fileName, "readbinary" ) ;
-		 byteArray = FileRead( file, 1024 ) ;
-		 chunk = toString( toBinary( toBase64( byteArray ) ) ) ;
-		 FileClose( file ) ;
-	}
-	else
-	{
-		fileReaderClass = createObject("java", "java.io.FileInputStream");
-		fileReader = fileReaderClass.init(fileName);
-
-		while(not done)
-		{
-			char = fileReader.read();
-			counter = counter + 1;
-			if ( char eq -1 or counter eq ARGUMENTS.bytes)
-			{
-				done = true;
-			}
-			else
-			{
-				chunk = chunk & chr(char) ;
-			}
-		}
-	}
-	</cfscript>
-
-	<cfreturn chunk>
-</cffunction>
-
-<cffunction name="SendUploadResults" returntype="String" output="true">
-	<cfargument name="errorNumber" required="true" type="Numeric">
-	<cfargument name="fileUrl" required="false" type="String" default="">
-	<cfargument name="fileName" required="false" type="String" default="">
-	<cfargument name="customMsg" required="false" type="String" default="">
-
-	<!--- Minified version of the document.domain automatic fix script (#1919).
-	The original script can be found at _dev/domain_fix_template.js --->
-	<cfoutput>
-<script type="text/javascript">
-(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
-window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
-</script>
-	</cfoutput>
-	<cfabort>
-</cffunction>
-
-<cffunction name="SanitizeFileName" returntype="String" output="false">
-	<cfargument name="sNewFileName" required="true">
-
-	<cfif isDefined("REQUEST.Config.ForceSingleExtension") and REQUEST.Config.ForceSingleExtension>
-		<cfset sNewFileName = rereplace( sNewFileName, '\.(?![^.]*$)', "_", "all" )>
-	</cfif>
-
-	<!--- Do a cleanup of the file name to avoid possible problems --->
-	<!--- Remove \ / | : ? * " < > and control characters --->
-	<cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
-
-	<cfreturn sNewFileName>
-</cffunction>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm
deleted file mode 100644
index 9bef3c40a1..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm
+++ /dev/null
@@ -1,72 +0,0 @@
-<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * File Browser connector for ColdFusion (MX 6.0 and above).
- * (based on the original CF connector by Hendrik Kramer - hk@lwd.de)
---->
-
-<cfparam name="url.type" default="File">
-<cfparam name="url.currentFolder" default="/">
-
-<!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->
-
-<cfinclude template="config.cfm">
-<cfinclude template="cf_util.cfm">
-<cfinclude template="cf_io.cfm">
-<cfinclude template="cf_commands.cfm">
-
-<cffunction name="SendError" returntype="void" output="true">
-	<cfargument name="number" required="true" type="Numeric">
-	<cfargument name="text" required="true">
-	<cfreturn SendUploadResults( "#ARGUMENTS.number#", "", "", "ARGUMENTS.text" )>
-</cffunction>
-
-<cfset REQUEST.Config = Config>
-<cfif find( "/", getBaseTemplatePath() ) >
-	<cfset REQUEST.Fs = "/">
-<cfelse>
-	<cfset REQUEST.Fs = "\">
-</cfif>
-
-<cfif not Config.Enabled>
-	<cfset SendUploadResults( '1', '', '', 'This file uploader is disabled. Please check the "editor/filemanager/connectors/cfm/config.cfm" file' )>
-</cfif>
-
-<cfset sCommand = 'QuickUpload'>
-<cfset sType = "File">
-
-<cfif isDefined( "URL.Type" )>
-	<cfset sType = URL.Type>
-</cfif>
-
-<cfset sCurrentFolder = GetCurrentFolder()>
-
-<!--- Is enabled the upload? --->
-<cfif not IsAllowedCommand( sCommand )>
-	<cfset SendUploadResults( "1", "", "", "The """ & sCommand & """ command isn't allowed" )>
-</cfif>
-
-<!--- Check if it is an allowed type. --->
-<cfif not IsAllowedType( sType )>
-	<cfset SendUploadResults( "1", "", "", "Invalid type specified" ) >
-</cfif>
-
-<cfset FileUpload( sType, sCurrentFolder, sCommand )>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm
deleted file mode 100644
index 3b8b9b1178..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm
+++ /dev/null
@@ -1,131 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This file include generic functions used by the ColdFusion Connector (MX 6.0 and above).
---->
-
-<cffunction name="RemoveFromStart" output="false" returntype="String">
-	<cfargument name="sourceString" type="String">
-	<cfargument name="charToRemove" type="String">
-
-	<cfif left(ARGUMENTS.sourceString, 1) eq ARGUMENTS.charToRemove>
-		<cfreturn mid( ARGUMENTS.sourceString, 2, len(ARGUMENTS.sourceString) -1 )>
-	</cfif>
-
-	<cfreturn ARGUMENTS.sourceString>
-</cffunction>
-
-<cffunction name="RemoveFromEnd" output="false" returntype="String">
-	<cfargument name="sourceString" type="String">
-	<cfargument name="charToRemove" type="String">
-
-	<cfif right(ARGUMENTS.sourceString, 1) eq ARGUMENTS.charToRemove>
-		<cfreturn mid( ARGUMENTS.sourceString, 1, len(ARGUMENTS.sourceString) -1 )>
-	</cfif>
-
-	<cfreturn ARGUMENTS.sourceString>
-</cffunction>
-
-<!---
-Check file content.
-Currently this function validates only image files.
-Returns false if file is invalid.
-detectionLevel:
-	0 = none
-	1 = check image size for images,
-	2 = use DetectHtml for images
----->
-<cffunction name="IsImageValid" returntype="boolean" output="true">
-	<cfargument name="filePath" required="true" type="String">
-	<cfargument name="extension" required="true" type="String">
-
-	<cfset var imageCFC = "">
-	<cfset var imageInfo = "">
-
-	<cfif not ListFindNoCase("gif,jpeg,jpg,png,swf,psd,bmp,iff,tiff,tif,swc,jpc,jp2,jpx,jb2,xmb,wbmp", ARGUMENTS.extension)>
-		<cfreturn true>
-	</cfif>
-
-	<cftry>
-		<cfif REQUEST.CFVersion gte 8>
-			<cfset objImage = ImageRead(ARGUMENTS.filePath) >
-			<cfset imageInfo = ImageInfo(objImage)>
-			<!--- <cfimage action="info" source="#ARGUMENTS.filePath#" structName="imageInfo" /> --->
-		<cfelse>
-			<cfset imageCFC = createObject("component", "image")>
-			<cfset imageInfo = imageCFC.getImageInfo("", ARGUMENTS.filePath)>
-		</cfif>
-
-		<cfif imageInfo.height lte 0 or imageInfo.width lte 0>
-			<cfreturn false>
-		</cfif>
-	<cfcatch type="any">
-		<cfreturn false>
-	</cfcatch>
-	</cftry>
-
-	<cfreturn true>
-</cffunction>
-
-<!---
- Detect HTML in the first KB to prevent against potential security issue with
- IE/Safari/Opera file type auto detection bug.
- Returns true if file contain insecure HTML code at the beginning.
---->
-<cffunction name="DetectHtml" output="false" returntype="boolean">
-	<cfargument name="filePath" required="true" type="String">
-
-	<cfset var tags = "<body,<head,<html,<img,<pre,<script,<table,<title">
-	<cfset var chunk = lcase( Trim( BinaryFileRead( ARGUMENTS.filePath, 1024 ) ) )>
-
-	<cfif not Len(chunk)>
-		<cfreturn false>
-	</cfif>
-
-	<cfif refind('<!doctype\W*x?html', chunk)>
-		<cfreturn true>
-	</cfif>
-
-	<cfloop index = "tag" list = "#tags#">
-     	<cfif find( tag, chunk )>
-			<cfreturn true>
-		</cfif>
-	</cfloop>
-
-	<!--- type = javascript --->
-	<cfif refind('type\s*=\s*[''"]?\s*(?:\w*/)?(?:ecma|java)', chunk)>
-		<cfreturn true>
-	</cfif> >
-
-	<!--- href = javascript --->
-	<!--- src = javascript --->
-	<!--- data = javascript --->
-	<cfif refind('(?:href|src|data)\s*=\s*[\''"]?\s*(?:ecma|java)script:', chunk)>
-		<cfreturn true>
-	</cfif>
-
-	<!--- url(javascript --->
-	<cfif refind('url\s*\(\s*[\''"]?\s*(?:ecma|java)script:', chunk)>
-		<cfreturn true>
-	</cfif>
-
-	<cfreturn false>
-</cffunction>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/config.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/config.cfm
deleted file mode 100644
index f4b9086166..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/config.cfm
+++ /dev/null
@@ -1,189 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Configuration file for the ColdFusion Connector (all versions).
---->
-
-<cfscript>
-	Config = StructNew() ;
-
-	// SECURITY: You must explicitly enable this "connector". (Set enabled to "true")
-	Config.Enabled = false ;
-
-
-	// Path to uploaded files relative to the document root.
-	Config.UserFilesPath = "/userfiles/" ;
-
-	// Use this to force the server path if FCKeditor is not running directly off
-	// the root of the application or the FCKeditor directory in the URL is a virtual directory
-	// or a symbolic link / junction
-	// Example: C:\inetpub\wwwroot\myDocs\
-	Config.ServerPath = "" ;
-
-	// Due to security issues with Apache modules, it is recommended to leave the
-	// following setting enabled.
-	Config.ForceSingleExtension = true ;
-
-	// Perform additional checks for image files - if set to true, validate image size
-	// (This feature works in MX 6.0 and above)
-	Config.SecureImageUploads = true;
-
-	// What the user can do with this connector
-	Config.ConfigAllowedCommands 			= "QuickUpload,FileUpload,GetFolders,GetFoldersAndFiles,CreateFolder" ;
-
-	//Allowed Resource Types
-	Config.ConfigAllowedTypes 				= "File,Image,Flash,Media" ;
-
-	// For security, HTML is allowed in the first Kb of data for files having the
-	// following extensions only.
-	// (This feature works in MX 6.0 and above))
-	Config.HtmlExtensions					= "html,htm,xml,xsd,txt,js" ;
-
-	//Due to known issues with GetTempDirectory function, it is
-	//recommended to set this vairiable to a valid directory
-	//instead of using the GetTempDirectory function
-	//(used by MX 6.0 and above)
-	Config.TempDirectory = GetTempDirectory();
-
-//	Configuration settings for each Resource Type
-//
-//	- AllowedExtensions: the possible extensions that can be allowed.
-//		If it is empty then any file type can be uploaded.
-//	- DeniedExtensions: The extensions that won't be allowed.
-//		If it is empty then no restrictions are done here.
-//
-//	For a file to be uploaded it has to fulfill both the AllowedExtensions
-//	and DeniedExtensions (that's it: not being denied) conditions.
-//
-//	- FileTypesPath: the virtual folder relative to the document root where
-//		these resources will be located.
-//		Attention: It must start and end with a slash: '/'
-//
-//	- FileTypesAbsolutePath: the physical path to the above folder. It must be
-//		an absolute path.
-//		If it's an empty string then it will be autocalculated.
-//		Usefull if you are using a virtual directory, symbolic link or alias.
-//		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-//		Attention: The above 'FileTypesPath' must point to the same directory.
-//		Attention: It must end with a slash: '/'
-//
-//
-//	 - QuickUploadPath: the virtual folder relative to the document root where
-//		these resources will be uploaded using the Upload tab in the resources
-//		dialogs.
-//		Attention: It must start and end with a slash: '/'
-//
-//	 - QuickUploadAbsolutePath: the physical path to the above folder. It must be
-//		an absolute path.
-//		If it's an empty string then it will be autocalculated.
-//		Usefull if you are using a virtual directory, symbolic link or alias.
-//		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-//		Attention: The above 'QuickUploadPath' must point to the same directory.
-//		Attention: It must end with a slash: '/'
-
-	Config.AllowedExtensions 				= StructNew() ;
-	Config.DeniedExtensions 				= StructNew() ;
-	Config.FileTypesPath 					= StructNew() ;
-	Config.FileTypesAbsolutePath 			= StructNew() ;
-	Config.QuickUploadPath 					= StructNew() ;
-	Config.QuickUploadAbsolutePath 			= StructNew() ;
-
-	Config.AllowedExtensions["File"]	 	= "7z,aiff,asf,avi,bmp,csv,doc,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xml,zip" ;
-	Config.DeniedExtensions["File"] 		= "" ;
-	Config.FileTypesPath["File"] 			= Config.UserFilesPath & 'file/' ;
-	Config.FileTypesAbsolutePath["File"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'file/') ) ;
-	Config.QuickUploadPath["File"] 			= Config.FileTypesPath["File"] ;
-	Config.QuickUploadAbsolutePath["File"] 	= Config.FileTypesAbsolutePath["File"] ;
-
-	Config.AllowedExtensions["Image"] 		= "bmp,gif,jpeg,jpg,png" ;
-	Config.DeniedExtensions["Image"] 		= "" ;
-	Config.FileTypesPath["Image"] 			= Config.UserFilesPath & 'image/' ;
-	Config.FileTypesAbsolutePath["Image"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'image/') ) ;
-	Config.QuickUploadPath["Image"] 		= Config.FileTypesPath["Image"] ;
-	Config.QuickUploadAbsolutePath["Image"] = Config.FileTypesAbsolutePath["Image"] ;
-
-	Config.AllowedExtensions["Flash"] 		= "swf,flv" ;
-	Config.DeniedExtensions["Flash"] 		= "" ;
-	Config.FileTypesPath["Flash"] 			= Config.UserFilesPath & 'flash/' ;
-	Config.FileTypesAbsolutePath["Flash"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'flash/') ) ;
-	Config.QuickUploadPath["Flash"] 		= Config.FileTypesPath["Flash"] ;
-	Config.QuickUploadAbsolutePath["Flash"] = Config.FileTypesAbsolutePath["Flash"] ;
-
-	Config.AllowedExtensions["Media"] 		= "aiff,asf,avi,bmp,fla,flv,gif,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,png,qt,ram,rm,rmi,rmvb,swf,tif,tiff,wav,wma,wmv" ;
-	Config.DeniedExtensions["Media"] 		= "" ;
-	Config.FileTypesPath["Media"] 			= Config.UserFilesPath & 'media/' ;
-	Config.FileTypesAbsolutePath["Media"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'media/') ) ;
-	Config.QuickUploadPath["Media"] 		= Config.FileTypesPath["Media"] ;
-	Config.QuickUploadAbsolutePath["Media"] = Config.FileTypesAbsolutePath["Media"] ;
-</cfscript>
-
-<cftry>
-<!--- code to maintain backwards compatibility with previous version of cfm connector --->
-<cfif isDefined("application.userFilesPath")>
-
-	<cflock scope="application" type="readonly" timeout="5">
-		<cfset config.userFilesPath = application.userFilesPath>
-	</cflock>
-
-<cfelseif isDefined("server.userFilesPath")>
-
-	<cflock scope="server" type="readonly" timeout="5">
-		<cfset config.userFilesPath = server.userFilesPath>
-	</cflock>
-
-</cfif>
-
-<!--- look for config struct in application and server scopes --->
-<cfif isDefined("application.FCKeditor") and isStruct(application.FCKeditor)>
-
-	<cflock scope="application" type="readonly" timeout="5">
-	<cfset variables.FCKeditor = duplicate(application.FCKeditor)>
-	</cflock>
-
-<cfelseif isDefined("server.FCKeditor") and isStruct(server.FCKeditor)>
-
-	<cflock scope="server" type="readonly" timeout="5">
-	<cfset variables.FCKeditor = duplicate(server.FCKeditor)>
-	</cflock>
-
-</cfif>
-	<!--- catch potential "The requested scope application has not been enabled" exception --->
-	<cfcatch type="any">
-	</cfcatch>
-</cftry>
-
-<cfif isDefined("FCKeditor")>
-
-	<!--- copy key values from external to local config (i.e. override default config as required) --->
-	<cfscript>
-		function structCopyKeys(stFrom, stTo) {
-			for ( key in stFrom ) {
-				if ( isStruct(stFrom[key]) ) {
-					structCopyKeys(stFrom[key],stTo[key]);
-				} else {
-					stTo[key] = stFrom[key];
-				}
-			}
-		}
-		structCopyKeys(FCKeditor, config);
-	</cfscript>
-
-</cfif>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/connector.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/connector.cfm
deleted file mode 100644
index 342e449c6b..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/connector.cfm
+++ /dev/null
@@ -1,32 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * File Browser connector for ColdFusion (all versions).
- *
---->
-
-<cfset REQUEST.CFVersion = Left( SERVER.COLDFUSION.PRODUCTVERSION, Find( ",", SERVER.COLDFUSION.PRODUCTVERSION ) - 1 )>
-<cfif REQUEST.CFVersion lte 5>
-	<cfinclude template="cf5_connector.cfm">
-<cfelse>
-	<cfinclude template="cf_connector.cfm">
-</cfif>
-<cfabort>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/image.cfc b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/image.cfc
deleted file mode 100644
index 378c4b4b95..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/image.cfc
+++ /dev/null
@@ -1,1324 +0,0 @@
-<!---
-	image.cfc v2.19, written by Rick Root (rick@webworksllc.com)
-	Derivative of work originally done originally by James Dew.
-
-	Related Web Sites:
-	- http://www.opensourcecf.com/imagecfc (home page)
-	- http://www.cfopen.org/projects/imagecfc (project page)
-
-	LICENSE
-	-------
-	Copyright (c) 2007, Rick Root <rick@webworksllc.com>
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or
-	without modification, are permitted provided that the
-	following conditions are met:
-
-	- Redistributions of source code must retain the above
-	  copyright notice, this list of conditions and the
-	  following disclaimer.
-	- Redistributions in binary form must reproduce the above
-	  copyright notice, this list of conditions and the
-	  following disclaimer in the documentation and/or other
-	  materials provided with the distribution.
-	- Neither the name of the Webworks, LLC. nor the names of
-	  its contributors may be used to endorse or promote products
-	  derived from this software without specific prior written
-	  permission.
-
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-	CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-	OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-	============================================================
-	This is a derivative work.  Following is the original
-	Copyright notice.
-	============================================================
-
-	Copyright (c) 2004 James F. Dew <jdew@yggdrasil.ca>
-
-	Permission to use, copy, modify, and distribute this software for any
-	purpose with or without fee is hereby granted, provided that the above
-	copyright notice and this permission notice appear in all copies.
-
-	THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-	WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-	MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-	ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-	WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-	ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-	OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---->
-<!---
-	SPECIAL NOTE FOR HEADLESS SYSTEMS
-	---------------------------------
-	If you get a "cannot connect to X11 server" when running certain
-	parts of this component under Bluedragon (Linux), you must
-	add "-Djava.awt.headless=true" to the java startup line in
-	<bluedragon>/bin/StartBluedragon.sh.  This isssue is discussed
-	in the Bluedragon Installation Guide section 3.8.1 for
-	Bluedragon 6.2.1.
-
-	Bluedragon may also report a ClassNotFound exception when trying
-	to instantiate the java.awt.image.BufferedImage class.  This is
-	most likely the same issue.
-
-	If you get "This graphics environment can be used only in the
-	software emulation mode" when calling certain parts of this
-	component under Coldfusion MX, you should refer to Technote
-	ID #18747:  http://www.macromedia.com/go/tn_18747
---->
-
-<cfcomponent displayname="Image">
-
-<cfset variables.throwOnError = "Yes">
-<cfset variables.defaultJpegCompression = "90">
-<cfset variables.interpolation = "bicubic">
-<cfset variables.textAntiAliasing = "Yes">
-<cfset variables.tempDirectory = "#expandPath(".")#">
-
-<cfset variables.javanulls = "no">
-<cftry>
-	<cfset nullvalue = javacast("null","")>
-	<cfset variables.javanulls = "yes">
-	<cfcatch type="any">
-		<cfset variables.javanulls = "no">
-		<!--- javacast null not supported, so filters won't work --->
-	</cfcatch>
-</cftry>
-<!---
-<cfif javanulls>
-	<cfset variables.blurFilter = createObject("component","blurFilter")>
-	<cfset variables.sharpenFilter = createObject("component","sharpenFilter")>
-	<cfset variables.posterizeFilter = createObject("component","posterizeFilter")>
-</cfif>
---->
-
-<cfset variables.Math = createobject("java", "java.lang.Math")>
-<cfset variables.arrObj = createobject("java", "java.lang.reflect.Array")>
-<cfset variables.floatClass = createobject("java", "java.lang.Float").TYPE>
-<cfset variables.intClass = createobject("java", "java.lang.Integer").TYPE>
-<cfset variables.shortClass = createobject("java", "java.lang.Short").TYPE>
-
-<cffunction name="getImageInfo" access="public" output="true" returntype="struct" hint="Rotate an image (+/-)90, (+/-)180, or (+/-)270 degrees.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var img = "">
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset img = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-		<cfset retVal.metaData = getImageMetadata(loadImage.inFile)>
-	<cfelse>
-		<cfset img = objImage>
-		<cfset retVal.metadata = getImageMetadata("")>
-	</cfif>
-	<cftry>
-		<cfset retVal.width = img.getWidth()>
-		<cfset retVal.height = img.getHeight()>
-		<cfset retVal.colorModel = img.getColorModel().toString()>
-		<cfset retVal.colorspace = img.getColorModel().getColorSpace().toString()>
-		<cfset retVal.objColorModel = img.getColorModel()>
-		<cfset retVal.objColorspace = img.getColorModel().getColorSpace()>
-		<cfset retVal.sampleModel = img.getSampleModel().toString()>
-		<cfset retVal.imageType = img.getType()>
-		<cfset retVal.misc = img.toString()>
-		<cfset retVal.canModify = true>
-		<cfreturn retVal>
-		<cfcatch type="any">
-			<cfset retVal = throw( "#cfcatch.message#: #cfcatch.detail#")>
-			<cfreturn retVal>
-		</cfcatch>
-	</cftry>
-</cffunction>
-
-<cffunction name="getImageMetadata" access="private" output="false" returntype="query">
-	<cfargument name="inFile" required="yes" type="Any"><!--- java.io.File --->
-
-	<cfset var retQry = queryNew("dirName,tagName,tagValue")>
-	<cfset var paths = arrayNew(1)>
-	<cfset var loader = "">
-	<cfset var JpegMetadatareader = "">
-	<cfset var myMetadata = "">
-	<cfset var directories = "">
-	<cfset var currentDirectory = "">
-	<cfset var tags = "">
-	<cfset var currentTag = "">
-	<cfset var tagName = "">
-
-	<cftry>
-	<cfscript>
-		paths = arrayNew(1);
-		paths[1] = expandPath("metadata-extractor-2.3.1.jar");
-		loader = createObject("component", "javaloader.JavaLoader").init(paths);
-
-		//at this stage we only have access to the class, but we don't have an instance
-		JpegMetadataReader = loader.create("com.drew.imaging.jpeg.JpegMetadataReader");
-
-		myMetaData = JpegMetadataReader.readMetadata(inFile);
-		directories = myMetaData.getDirectoryIterator();
-		while (directories.hasNext()) {
-			currentDirectory = directories.next();
-			tags = currentDirectory.getTagIterator();
-			while (tags.hasNext()) {
-				currentTag = tags.next();
-				if (currentTag.getTagName() DOES NOT CONTAIN "Unknown") { //leave out the junk data
-					queryAddRow(retQry);
-					querySetCell(retQry,"dirName",replace(currentTag.getDirectoryName(),' ','_','ALL'));
-					tagName = replace(currentTag.getTagName(),' ','','ALL');
-					tagName = replace(tagName,'/','','ALL');
-					querySetCell(retQry,"tagName",tagName);
-					querySetCell(retQry,"tagValue",currentTag.getDescription());
-				}
-			}
-		}
-		return retQry;
-		</cfscript>
-		<cfcatch type="any">
-			<cfreturn retQry />
-		</cfcatch>
-	</cftry>
-</cffunction>
-
-<cffunction name="flipHorizontal" access="public" output="true" returntype="struct" hint="Flip an image horizontally.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfreturn flipflop(objImage, inputFile, outputFile, "horizontal", jpegCompression)>
-</cffunction>
-
-<cffunction name="flipVertical" access="public" output="true" returntype="struct" hint="Flop an image vertically.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfreturn flipflop(objImage, inputFile, outputFile, "vertical", jpegCompression)>
-</cffunction>
-
-<cffunction name="scaleWidth" access="public" output="true" returntype="struct" hint="Scale an image to a specific width.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="newWidth" required="yes" type="numeric">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfreturn resize(objImage, inputFile, outputFile, newWidth, 0, "false", "false", jpegCompression)>
-</cffunction>
-
-<cffunction name="scaleHeight" access="public" output="true" returntype="struct" hint="Scale an image to a specific height.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="newHeight" required="yes" type="numeric">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfreturn resize(objImage, inputFile, outputFile, 0, newHeight, "false", "false", jpegCompression)>
-</cffunction>
-
-<cffunction name="resize" access="public" output="true" returntype="struct" hint="Resize an image to a specific width and height.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="newWidth" required="yes" type="numeric">
-	<cfargument name="newHeight" required="yes" type="numeric">
-	<cfargument name="preserveAspect" required="no" type="boolean" default="FALSE">
-	<cfargument name="cropToExact" required="no" type="boolean" default="FALSE">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var at = "">
-	<cfset var op = "">
-	<cfset var w = "">
-	<cfset var h = "">
-	<cfset var scale = 1>
-	<cfset var scaleX = 1>
-	<cfset var scaleY = 1>
-	<cfset var resizedImage = "">
-	<cfset var rh = getRenderingHints()>
-	<cfset var specifiedWidth = arguments.newWidth>
-	<cfset var specifiedHeight = arguments.newHeight>
-	<cfset var imgInfo = "">
-	<cfset var img = "">
-	<cfset var cropImageResult = "">
-	<cfset var cropOffsetX = "">
-	<cfset var cropOffsetY = "">
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset img = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset img = objImage>
-	</cfif>
-	<cfif img.getType() eq 0>
-		<cfset img = convertImageObject(img,img.TYPE_3BYTE_BGR)>
-	</cfif>
-	<cfscript>
-		resizedImage = CreateObject("java", "java.awt.image.BufferedImage");
-		at = CreateObject("java", "java.awt.geom.AffineTransform");
-		op = CreateObject("java", "java.awt.image.AffineTransformOp");
-
-		w = img.getWidth();
-		h = img.getHeight();
-
-		if (preserveAspect and cropToExact and newHeight gt 0 and newWidth gt 0)
-		{
-			if (w / h gt newWidth / newHeight){
-				newWidth = 0;
-			} else if (w / h lt newWidth / newHeight){
-				newHeight = 0;
-		    }
-		} else if (preserveAspect and newHeight gt 0 and newWidth gt 0) {
-			if (w / h gt newWidth / newHeight){
-				newHeight = 0;
-			} else if (w / h lt newWidth / newHeight){
-				newWidth = 0;
-		    }
-		}
-		if (newWidth gt 0 and newHeight eq 0) {
-			scale = newWidth / w;
-			w = newWidth;
-			h = round(h*scale);
-		} else if (newHeight gt 0 and newWidth eq 0) {
-			scale = newHeight / h;
-			h = newHeight;
-			w = round(w*scale);
-		} else if (newHeight gt 0 and newWidth gt 0) {
-			w = newWidth;
-			h = newHeight;
-		} else {
-			retVal = throw( retVal.errorMessage);
-			return retVal;
-		}
-		resizedImage.init(javacast("int",w),javacast("int",h),img.getType());
-
-		w = w / img.getWidth();
-		h = h / img.getHeight();
-
-
-
-		op.init(at.getScaleInstance(javacast("double",w),javacast("double",h)), rh);
-		// resizedImage = op.createCompatibleDestImage(img, img.getColorModel());
-		op.filter(img, resizedImage);
-
-		imgInfo = getimageinfo(resizedImage, "");
-		if (imgInfo.errorCode gt 0)
-		{
-			return imgInfo;
-		}
-
-		cropOffsetX = max( Int( (imgInfo.width/2) - (newWidth/2) ), 0 );
-		cropOffsetY = max( Int( (imgInfo.height/2) - (newHeight/2) ), 0 );
-		// There is a chance that the image is exactly the correct
-		// width and height and don't need to be cropped
-		if
-			(
-			preserveAspect and cropToExact
-			and
-			(imgInfo.width IS NOT specifiedWidth OR imgInfo.height IS NOT specifiedHeight)
-			)
-		{
-			// Get the correct offset to get the center of the image
-			cropOffsetX = max( Int( (imgInfo.width/2) - (specifiedWidth/2) ), 0 );
-			cropOffsetY = max( Int( (imgInfo.height/2) - (specifiedHeight/2) ), 0 );
-
-			cropImageResult = crop( resizedImage, "", "", cropOffsetX, cropOffsetY, specifiedWidth, specifiedHeight );
-			if ( cropImageResult.errorCode GT 0)
-			{
-				return cropImageResult;
-			} else {
-				resizedImage = cropImageResult.img;
-			}
-		}
-		if (outputFile eq "")
-		{
-			retVal.img = resizedImage;
-			return retVal;
-		} else {
-			saveImage = writeImage(outputFile, resizedImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="crop" access="public" output="true" returntype="struct" hint="Crop an image.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="fromX" required="yes" type="numeric">
-	<cfargument name="fromY" required="yes" type="numeric">
-	<cfargument name="newWidth" required="yes" type="numeric">
-	<cfargument name="newHeight" required="yes" type="numeric">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var croppedImage = "">
-	<cfset var rh = getRenderingHints()>
-	<cfset var img = "">
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset img = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset img = objImage>
-	</cfif>
-	<cfif img.getType() eq 0>
-		<cfset img = convertImageObject(img,img.TYPE_3BYTE_BGR)>
-	</cfif>
-	<cfscript>
-		if (fromX + newWidth gt img.getWidth()
-			OR
-			fromY + newHeight gt img.getHeight()
-			)
-		{
-			retval = throw( "The cropped image dimensions go beyond the original image dimensions.");
-			return retVal;
-		}
-		croppedImage = img.getSubimage(javaCast("int", fromX), javaCast("int", fromY), javaCast("int", newWidth), javaCast("int", newHeight) );
-		if (outputFile eq "")
-		{
-			retVal.img = croppedImage;
-			return retVal;
-		} else {
-			saveImage = writeImage(outputFile, croppedImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="rotate" access="public" output="true" returntype="struct" hint="Rotate an image (+/-)90, (+/-)180, or (+/-)270 degrees.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="degrees" required="yes" type="numeric">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var img = "">
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var at = "">
-	<cfset var op = "">
-	<cfset var w = 0>
-	<cfset var h = 0>
-	<cfset var iw = 0>
-	<cfset var ih = 0>
-	<cfset var x = 0>
-	<cfset var y = 0>
-	<cfset var rotatedImage = "">
-	<cfset var rh = getRenderingHints()>
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset img = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset img = objImage>
-	</cfif>
-	<cfif img.getType() eq 0>
-		<cfset img = convertImageObject(img,img.TYPE_3BYTE_BGR)>
-	</cfif>
-	<cfif ListFind("-270,-180,-90,90,180,270",degrees) is 0>
-		<cfset retVal = throw( "At this time, image.cfc only supports rotating images in 90 degree increments.")>
-		<cfreturn retVal>
-	</cfif>
-
-	<cfscript>
-		rotatedImage = CreateObject("java", "java.awt.image.BufferedImage");
-		at = CreateObject("java", "java.awt.geom.AffineTransform");
-		op = CreateObject("java", "java.awt.image.AffineTransformOp");
-
-		iw = img.getWidth(); h = iw;
-		ih = img.getHeight(); w = ih;
-
-		if(arguments.degrees eq 180) { w = iw; h = ih; }
-
-		x = (w/2)-(iw/2);
-		y = (h/2)-(ih/2);
-
-		rotatedImage.init(javacast("int",w),javacast("int",h),img.getType());
-
-		at.rotate(arguments.degrees * 0.0174532925,w/2,h/2);
-		at.translate(x,y);
-		op.init(at, rh);
-
-		op.filter(img, rotatedImage);
-
-		if (outputFile eq "")
-		{
-			retVal.img = rotatedImage;
-			return retVal;
-		} else {
-			saveImage = writeImage(outputFile, rotatedImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="convert" access="public" output="true" returntype="struct" hint="Convert an image from one format to another.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var img = "">
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset img = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset img = objImage>
-	</cfif>
-
-	<cfscript>
-		if (outputFile eq "")
-		{
-			retVal = throw( "The convert method requires a valid output filename.");
-			return retVal;
-		} else {
-			saveImage = writeImage(outputFile, img, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="setOption" access="public" output="true" returnType="void" hint="Sets values for allowed CFC options.">
-	<cfargument name="key" type="string" required="yes">
-	<cfargument name="val" type="string" required="yes">
-
-	<cfset var validKeys = "interpolation,textantialiasing,throwonerror,defaultJpegCompression">
-	<cfset arguments.key = lcase(trim(arguments.key))>
-	<cfset arguments.val = lcase(trim(arguments.val))>
-	<cfif listFind(validKeys, arguments.key) gt 0>
-		<cfset variables[arguments.key] = arguments.val>
-	</cfif>
-</cffunction>
-
-<cffunction name="getOption" access="public" output="true" returnType="any" hint="Returns the current value for the specified CFC option.">
-	<cfargument name="key" type="string" required="yes">
-
-	<cfset var validKeys = "interpolation,textantialiasing,throwonerror,defaultJpegCompression">
-	<cfset arguments.key = lcase(trim(arguments.key))>
-	<cfif listFindNoCase(validKeys, arguments.key) gt 0>
-		<cfreturn variables[arguments.key]>
-	<cfelse>
-		<cfreturn "">
-	</cfif>
-</cffunction>
-
-<cffunction name="getRenderingHints" access="private" output="true" returnType="any" hint="Internal method controls various aspects of rendering quality.">
-	<cfset var rh = CreateObject("java","java.awt.RenderingHints")>
-	<cfset var initMap = CreateObject("java","java.util.HashMap")>
-	<cfset initMap.init()>
-	<cfset rh.init(initMap)>
-	<cfset rh.put(rh.KEY_ALPHA_INTERPOLATION, rh.VALUE_ALPHA_INTERPOLATION_QUALITY)> <!--- QUALITY, SPEED, DEFAULT --->
-	<cfset rh.put(rh.KEY_ANTIALIASING, rh.VALUE_ANTIALIAS_ON)> <!--- ON, OFF, DEFAULT --->
-	<cfset rh.put(rh.KEY_COLOR_RENDERING, rh.VALUE_COLOR_RENDER_QUALITY)>  <!--- QUALITY, SPEED, DEFAULT --->
-	<cfset rh.put(rh.KEY_DITHERING, rh.VALUE_DITHER_DEFAULT)> <!--- DISABLE, ENABLE, DEFAULT --->
-	<cfset rh.put(rh.KEY_RENDERING, rh.VALUE_RENDER_QUALITY)> <!--- QUALITY, SPEED, DEFAULT --->
-	<cfset rh.put(rh.KEY_FRACTIONALMETRICS, rh.VALUE_FRACTIONALMETRICS_DEFAULT)> <!--- DISABLE, ENABLE, DEFAULT --->
-	<cfset rh.put(rh.KEY_STROKE_CONTROL, rh.VALUE_STROKE_DEFAULT)>
-
-	<cfif variables.textAntiAliasing>
-		<cfset rh.put(rh.KEY_TEXT_ANTIALIASING, rh.VALUE_TEXT_ANTIALIAS_ON)>
-	<cfelse>
-		<cfset rh.put(rh.KEY_TEXT_ANTIALIASING, rh.VALUE_TEXT_ANTIALIAS_OFF)>
-	</cfif>
-
-	<cfif variables.interpolation eq "nearest_neighbor">
-		<cfset rh.put(rh.KEY_INTERPOLATION, rh.VALUE_INTERPOLATION_NEAREST_NEIGHBOR)>
-	<cfelseif variables.interpolation eq "bilinear">
-		<cfset rh.put(rh.KEY_INTERPOLATION, rh.VALUE_INTERPOLATION_BILINEAR)>
-	<cfelse>
-		<cfset rh.put(rh.KEY_INTERPOLATION, rh.VALUE_INTERPOLATION_BICUBIC)>
-	</cfif>
-
-	<cfreturn rh>
-</cffunction>
-
-<cffunction name="readImage" access="public" output="true" returntype="struct" hint="Reads an image from a local file.  Requires an absolute path.">
-	<cfargument name="source" required="yes" type="string">
-	<cfargument name="forModification" required="no" type="boolean" default="yes">
-
-	<cfif isURL(source)>
-		<cfreturn readImageFromURL(source, forModification)>
-	<cfelse>
-		<cfreturn readImageFromFile(source, forModification)>
-	</cfif>
-</cffunction>
-
-<cffunction name="readImageFromFile" access="private" output="true" returntype="struct" hint="Reads an image from a local file.  Requires an absolute path.">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="forModification" required="no" type="boolean" default="yes">
-
-	<cfset var retVal = StructNew()>
-	<cfset var img = "">
-	<cfset var inFile = "">
-	<cfset var filename = getFileFromPath(inputFile)>
-	<cfset var extension = lcase(listLast(inputFile,"."))>
-	<cfset var imageIO = CreateObject("java", "javax.imageio.ImageIO")>
-	<cfset var validExtensionsToRead = ArrayToList(imageIO.getReaderFormatNames())>
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif not fileExists(arguments.inputFile)>
-		<cfset retVal = throw("The specified file #Chr(34)##arguments.inputFile##Chr(34)# could not be found.")>
-		<cfreturn retVal>
-	<cfelseif listLen(filename,".") lt 2>
-		<cfset retVal = throw("Sorry, image files without extensions cannot be manipulated.")>
-		<cfreturn retVal>
-	<cfelseif listFindNoCase(validExtensionsToRead, extension) is 0>
-		<cfset retVal = throw("Java is unable to read #extension# files.")>
-		<cfreturn retVal>
-	<cfelseif NOT fileExists(arguments.inputFile)>
-		<cfset retVal = throw("The specified input file does not exist.")>
-		<cfreturn retVal>
-	<cfelse>
-		<cfset img = CreateObject("java", "java.awt.image.BufferedImage")>
-		<cfset inFile = CreateObject("java", "java.io.File")>
-		<cfset inFile.init(arguments.inputFile)>
-		<cfif NOT inFile.canRead()>
-			<cfset retVal = throw("Unable to open source file #Chr(34)##arguments.inputFile##Chr(34)#.")>
-			<cfreturn retVal>
-		<cfelse>
-			<cftry>
-				<cfset img = imageIO.read(inFile)>
-				<cfcatch type="any">
-					<cfset retval = throw("An error occurred attempting to read the specified image.  #cfcatch.message# - #cfcatch.detail#")>
-					<cfreturn retVal>
-				</cfcatch>
-			</cftry>
-			<cfset retVal.img = img>
-			<cfset retVal.inFile = inFile>
-			<cfreturn retVal>
-		</cfif>
-	</cfif>
-</cffunction>
-
-<cffunction name="readImageFromURL" access="private" output="true" returntype="struct" hint="Read an image from a URL.  Requires an absolute URL.">
-	<cfargument name="inputURL" required="yes" type="string">
-	<cfargument name="forModification" required="no" type="boolean" default="yes">
-
-	<cfset var retVal = StructNew()>
-	<cfset var img = CreateObject("java", "java.awt.image.BufferedImage")>
-	<cfset var inURL	= CreateObject("java", "java.net.URL")>
-	<cfset var imageIO = CreateObject("java", "javax.imageio.ImageIO")>
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-
-	<cfset inURL.init(arguments.inputURL)>
-	<cftry>
-		<cfset img = imageIO.read(inURL)>
-		<cfcatch type="any">
-			<cfset retval = throw("An error occurred attempting to read the specified image.  #cfcatch.message# - #cfcatch.detail#")>
-			<cfreturn retVal>
-		</cfcatch>
-	</cftry>
-	<cfset retVal.img = img>
-	<cfreturn retVal>
-</cffunction>
-
-<cffunction name="writeImage" access="public" output="true" returntype="struct" hint="Write an image to disk.">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="img" required="yes" type="any">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var outFile = "">
-	<cfset var filename = getFileFromPath(outputFile)>
-	<cfset var extension = lcase(listLast(filename,"."))>
-	<cfset var imageIO = CreateObject("java", "javax.imageio.ImageIO")>
-	<cfset var validExtensionsToWrite = ArrayToList(imageIO.getWriterFormatNames())>
-	<!--- used for jpeg output method --->
-	<cfset var out = "">
-	<cfset var fos = "">
-	<cfset var JPEGCodec = "">
-	<cfset var encoder = "">
-	<cfset var param = "">
-	<cfset var quality = javacast("float", jpegCompression/100)>
-	<cfset var tempOutputFile = "#variables.tempDirectory#\#createUUID()#.#extension#">
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif listFindNoCase(validExtensionsToWrite, extension) eq 0>
-		<cfset throw("Java is unable to write #extension# files.  Valid formats include: #validExtensionsToWrite#")>
-	</cfif>
-
-	<cfif extension neq "jpg" and extension neq "jpeg">
-		<!---
-			Simple output method for non jpeg images
-		--->
-		<cfset outFile = CreateObject("java", "java.io.File")>
-		<cfset outFile.init(tempOutputFile)>
-		<cfset imageIO.write(img, extension, outFile)>
-	<cfelse>
-		<cfscript>
-			/*
-				JPEG output method handles compression
-			*/
-			out = createObject("java", "java.io.BufferedOutputStream");
-			fos = createObject("java", "java.io.FileOutputStream");
-			fos.init(tempOutputFile);
-			out.init(fos);
-			JPEGCodec = createObject("java", "com.sun.image.codec.jpeg.JPEGCodec");
-			encoder = JPEGCodec.createJPEGEncoder(out);
-		    param = encoder.getDefaultJPEGEncodeParam(img);
-		    param.setQuality(quality, false);
-		    encoder.setJPEGEncodeParam(param);
-		    encoder.encode(img);
-		    out.close();
-		</cfscript>
-	</cfif>
-	<!--- move file to its final destination --->
-	<cffile action="MOVE" source="#tempOutputFile#" destination="#arguments.outputFile#">
-	<cfreturn retVal>
-</cffunction>
-
-<cffunction name="flipflop" access="private" output="true" returntype="struct" hint="Internal method used for flipping and flopping images.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="direction" required="yes" type="string"><!--- horizontal or vertical --->
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var flippedImage = "">
-	<cfset var rh = getRenderingHints()>
-	<cfset var img = "">
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset img = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset img = objImage>
-	</cfif>
-	<cfif img.getType() eq 0>
-		<cfset img = convertImageObject(img,img.TYPE_3BYTE_BGR)>
-	</cfif>
-	<cfscript>
-		flippedImage = CreateObject("java", "java.awt.image.BufferedImage");
-		at = CreateObject("java", "java.awt.geom.AffineTransform");
-		op = CreateObject("java", "java.awt.image.AffineTransformOp");
-
-		flippedImage.init(img.getWidth(), img.getHeight(), img.getType());
-
-		if (direction eq "horizontal") {
-			at = at.getScaleInstance(-1, 1);
-			at.translate(-img.getWidth(), 0);
-		} else {
-			at = at.getScaleInstance(1,-1);
-			at.translate(0, -img.getHeight());
-		}
-		op.init(at, rh);
-		op.filter(img, flippedImage);
-
-		if (outputFile eq "")
-		{
-			retVal.img = flippedImage;
-			return retVal;
-		} else {
-			saveImage = writeImage(outputFile, flippedImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-
-
-<cffunction name="filterFastBlur" access="public" output="true" returntype="struct" hint="Internal method used for flipping and flopping images.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="blurAmount" required="yes" type="numeric">
-	<cfargument name="iterations" required="yes" type="numeric">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var srcImage = "">
-	<cfset var destImage = "">
-	<cfset var rh = getRenderingHints()>
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif NOT variables.javanulls>
-		<cfset throw("Sorry, but the blur filter is not supported on this platform.")>
-	</cfif>
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset srcImage = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset srcImage = objImage>
-	</cfif>
-	<cfif srcImage.getType() eq 0>
-		<cfset srcImage = convertImageObject(srcImage,srcImage.TYPE_3BYTE_BGR)>
-	</cfif>
-
-	<cfscript>
-
-		// initialize the blur filter
-		variables.blurFilter.init(arguments.blurAmount);
-		// move the source image into the destination image
-		// so we can repeatedly blur it.
-		destImage = srcImage;
-
-		for (i=1; i lte iterations; i=i+1)
-		{
-			// do the blur i times
-			destImage = variables.blurFilter.filter(destImage);
-		}
-
-
-		if (outputFile eq "")
-		{
-			// return the image object
-			retVal.img = destImage;
-			return retVal;
-		} else {
-			// write the image object to the specified file.
-			saveImage = writeImage(outputFile, destImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="filterSharpen" access="public" output="true" returntype="struct" hint="Internal method used for flipping and flopping images.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var srcImage = "">
-	<cfset var destImage = "">
-	<cfset var rh = getRenderingHints()>
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif NOT variables.javanulls>
-		<cfset throw("Sorry, but the blur filter is not supported on this platform.")>
-	</cfif>
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset srcImage = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset srcImage = objImage>
-	</cfif>
-	<cfif srcImage.getType() eq 0>
-		<cfset srcImage = convertImageObject(srcImage,srcImage.TYPE_3BYTE_BGR)>
-	</cfif>
-
-	<cfscript>
-		// initialize the sharpen filter
-		variables.sharpenFilter.init();
-
-		destImage = variables.sharpenFilter.filter(srcImage);
-
-
-		if (outputFile eq "")
-		{
-			// return the image object
-			retVal.img = destImage;
-			return retVal;
-		} else {
-			// write the image object to the specified file.
-			saveImage = writeImage(outputFile, destImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-
-<cffunction name="filterPosterize" access="public" output="true" returntype="struct" hint="Internal method used for flipping and flopping images.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="amount" required="yes" type="string">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var saveImage = StructNew()>
-	<cfset var srcImage = "">
-	<cfset var destImage = "">
-	<cfset var rh = getRenderingHints()>
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif NOT variables.javanulls>
-		<cfset throw("Sorry, but the blur filter is not supported on this platform.")>
-	</cfif>
-
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset srcImage = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset srcImage = objImage>
-	</cfif>
-	<cfif srcImage.getType() eq 0>
-		<cfset srcImage = convertImageObject(srcImage,srcImage.TYPE_3BYTE_BGR)>
-	</cfif>
-	<cfif srcImage.getType() neq 5>
-		<cfset throw("ImageCFC cannot posterize this image type (#srcImage.getType()#)")>
-	</cfif>
-	<cfscript>
-		// initialize the posterize filter
-		variables.posterizeFilter.init(arguments.amount);
-
-		destImage = variables.posterizeFilter.filter(srcImage);
-
-
-		if (outputFile eq "")
-		{
-			// return the image object
-			retVal.img = destImage;
-			return retVal;
-		} else {
-			// write the image object to the specified file.
-			saveImage = writeImage(outputFile, destImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-
-<cffunction name="addText" access="public" output="true" returntype="struct" hint="Add text to an image.">
-	<cfargument name="objImage" required="yes" type="Any">
-	<cfargument name="inputFile" required="yes" type="string">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="x" required="yes" type="numeric">
-	<cfargument name="y" required="yes" type="numeric">
-	<cfargument name="fontDetails" required="yes" type="struct">
-	<cfargument name="content" required="yes" type="String">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var img = "">
-	<cfset var saveImage = StructNew()>
-	<cfset var g2d = "">
-	<cfset var bgImage = "">
-	<cfset var fontImage = "">
-	<cfset var overlayImage = "">
-	<cfset var Color = "">
-	<cfset var font = "">
-	<cfset var font_stream = "">
-	<cfset var ac = "">
-	<cfset var rgb = "">
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfparam name="arguments.fontDetails.size" default="12">
-	<cfparam name="arguments.fontDetails.color" default="black">
-	<cfparam name="arguments.fontDetails.fontFile" default="">
-	<cfparam name="arguments.fontDetails.fontName" default="serif">
-
-	<cfif arguments.fontDetails.fontFile neq "" and not fileExists(arguments.fontDetails.fontFile)>
-		<cfset retVal = throw("The specified font file #Chr(34)##arguments.inputFile##Chr(34)# could not be found on the server.")>
-		<cfreturn retVal>
-	</cfif>
-	<cftry>
-		<cfset rgb = getRGB(arguments.fontDetails.color)>
-		<cfcatch type="any">
-			<cfset retVal = throw("Invalid color #Chr(34)##arguments.fontDetails.color##Chr(34)#")>
-			<cfreturn retVal>
-		</cfcatch>
-	</cftry>
-	<cfif inputFile neq "">
-		<cfset loadImage = readImage(inputFile, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset img = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset img = objImage>
-	</cfif>
-	<cfif img.getType() eq 0>
-		<cfset img = convertImageObject(img,img.TYPE_3BYTE_BGR)>
-	</cfif>
-	<cfscript>
-		// load objects
-		bgImage = CreateObject("java", "java.awt.image.BufferedImage");
-		fontImage = CreateObject("java", "java.awt.image.BufferedImage");
-		overlayImage = CreateObject("java", "java.awt.image.BufferedImage");
-		Color = CreateObject("java","java.awt.Color");
-		font = createObject("java","java.awt.Font");
-		font_stream = createObject("java","java.io.FileInputStream");
-		ac = CreateObject("Java", "java.awt.AlphaComposite");
-
-		// set up basic needs
-		fontColor = Color.init(javacast("int", rgb.red), javacast("int", rgb.green), javacast("int", rgb.blue));
-
-		if (fontDetails.fontFile neq "")
-		{
-			font_stream.init(arguments.fontDetails.fontFile);
-			font = font.createFont(font.TRUETYPE_FONT, font_stream);
-			font = font.deriveFont(javacast("float",arguments.fontDetails.size));
-		} else {
-			font.init(fontDetails.fontName, evaluate(fontDetails.style), fontDetails.size);
-		}
-		// get font metrics using a 1x1 bufferedImage
-		fontImage.init(1,1,img.getType());
-		g2 = fontImage.createGraphics();
-		g2.setRenderingHints(getRenderingHints());
-		fc = g2.getFontRenderContext();
-		bounds = font.getStringBounds(content,fc);
-
-		g2 = img.createGraphics();
-		g2.setRenderingHints(getRenderingHints());
-		g2.setFont(font);
-		g2.setColor(fontColor);
-		// in case you want to change the alpha
-		// g2.setComposite(ac.getInstance(ac.SRC_OVER, 0.50));
-
-		// the location (arguments.fontDetails.size+y) doesn't really work
-		// the way I want it to.
-		g2.drawString(content,javacast("int",x),javacast("int",arguments.fontDetails.size+y));
-
-		if (outputFile eq "")
-		{
-			retVal.img = img;
-			return retVal;
-		} else {
-			saveImage = writeImage(outputFile, img, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="watermark" access="public" output="false">
-	<cfargument name="objImage1" required="yes" type="Any">
-	<cfargument name="objImage2" required="yes" type="Any">
-	<cfargument name="inputFile1" required="yes" type="string">
-	<cfargument name="inputFile2" required="yes" type="string">
-	<cfargument name="alpha" required="yes" type="numeric">
-	<cfargument name="placeAtX" required="yes" type="numeric">
-	<cfargument name="placeAtY" required="yes" type="numeric">
-	<cfargument name="outputFile" required="yes" type="string">
-	<cfargument name="jpegCompression" required="no" type="numeric" default="#variables.defaultJpegCompression#">
-
-	<cfset var retVal = StructNew()>
-	<cfset var loadImage = StructNew()>
-	<cfset var originalImage = "">
-	<cfset var wmImage = "">
-	<cfset var saveImage = StructNew()>
-	<cfset var ac = "">
-	<cfset var rh = getRenderingHints()>
-
-	<cfset retVal.errorCode = 0>
-	<cfset retVal.errorMessage = "">
-
-	<cfif inputFile1 neq "">
-		<cfset loadImage = readImage(inputFile1, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset originalImage = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset originalImage = objImage1>
-	</cfif>
-	<cfif originalImage.getType() eq 0>
-		<cfset originalImage = convertImageObject(originalImage,originalImage.TYPE_3BYTE_BGR)>
-	</cfif>
-
-	<cfif inputFile2 neq "">
-		<cfset loadImage = readImage(inputFile2, "NO")>
-		<cfif loadImage.errorCode is 0>
-			<cfset wmImage = loadImage.img>
-		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
-			<cfreturn retVal>
-		</cfif>
-	<cfelse>
-		<cfset wmImage = objImage2>
-	</cfif>
-	<cfif wmImage.getType() eq 0>
-		<cfset wmImage = convertImageObject(wmImage,wmImage.TYPE_3BYTE_BGR)>
-	</cfif>
-
-
-	<cfscript>
-		at = CreateObject("java", "java.awt.geom.AffineTransform");
-		op = CreateObject("java", "java.awt.image.AffineTransformOp");
-		ac = CreateObject("Java", "java.awt.AlphaComposite");
-		gfx = originalImage.getGraphics();
-		gfx.setComposite(ac.getInstance(ac.SRC_OVER, alpha));
-
-		at.init();
-		// op.init(at,op.TYPE_BILINEAR);
-		op.init(at, rh);
-
-		gfx.drawImage(wmImage, op, javaCast("int",arguments.placeAtX), javacast("int", arguments.placeAtY));
-
-		gfx.dispose();
-
-		if (outputFile eq "")
-		{
-			retVal.img = originalImage;
-			return retVal;
-		} else {
-			saveImage = writeImage(outputFile, originalImage, jpegCompression);
-			if (saveImage.errorCode gt 0)
-			{
-				return saveImage;
-			} else {
-				return retVal;
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="isURL" access="private" output="false" returnType="boolean">
-	<cfargument name="stringToCheck" required="yes" type="string">
-	<cfif REFindNoCase("^(((https?:)\/\/))[-[:alnum:]\?%,\.\/&##!@:=\+~_]+[A-Za-z0-9\/]$",stringToCheck) NEQ 0>
-		<cfreturn true>
-	<cfelse>
-		<cfreturn false>
-	</cfif>
-</cffunction>
-
-<!--- function returns RGB values in a structure for hex or the 16
-	HTML named colors --->
-<cffunction name="getRGB" access="private" output="true" returnType="struct">
-	<cfargument name="color" type="string" required="yes">
-
-	<cfset var retVal = structNew()>
-	<cfset var cnt = 0>
-	<cfset var namedColors = "aqua,black,blue,fuchsia,gray,green,lime,maroon,navy,olive,purple,red,silver,teal,white,yellow">
-	<cfset var namedColorsHexValues = "00ffff,000000,0000ff,ff00ff,808080,008000,00ff00,800000,000080,808080,ff0000,c0c0c0,008080,ffffff,ffff00">
-
-	<cfset retVal.red = 0>
-	<cfset retVal.green = 0>
-	<cfset retVal.blue = 0>
-
-	<cfset arguments.color = trim(arguments.color)>
-	<cfif len(arguments.color) is 0>
-		<cfreturn retVal>
-	<cfelseif listFind(namedColors, arguments.color) gt 0>
-		<cfset arguments.color = listGetAt(namedColorsHexValues, listFind(namedColors, arguments.color))>
-	</cfif>
-	<cfif left(arguments.color,1) eq "##">
-		<cfset arguments.color = right(arguments.color,len(arguments.color)-1)>
-	</cfif>
-	<cfif len(arguments.color) neq 6>
-		<cfreturn retVal>
-	<cfelse>
-		<cftry>
-			<cfset retVal.red = InputBaseN(mid(arguments.color,1,2),16)>
-			<cfset retVal.green = InputBaseN(mid(arguments.color,3,2),16)>
-			<cfset retVal.blue = InputBaseN(mid(arguments.color,5,2),16)>
-			<cfcatch type="any">
-				<cfset retVal.red = 0>
-				<cfset retVal.green = 0>
-				<cfset retVal.blue = 0>
-				<cfreturn retVal>
-			</cfcatch>
-		</cftry>
-	</cfif>
-	<cfreturn retVal>
-</cffunction>
-
-<cffunction name="throw" access="private" output="false" returnType="struct">
-	<cfargument name="detail" type="string" required="yes">
-	<cfargument name="force" type="boolean" required="no" default="no">
-
-	<cfset var retVal = StructNew()>
-
-	<cfif variables.throwOnError or arguments.force>
-		<cfthrow detail="#arguments.detail#" message="#arguments.detail#">
-	<cfelse>
-		<cfset retVal.errorCode = 1>
-		<cfset retVal.errorMessage = arguments.detail>
-		<cfreturn retVal>
-	</cfif>
-</cffunction>
-
-<cffunction name="debugDump" access="private">
-	<cfdump var="#arguments#"><cfabort>
-</cffunction>
-
-<cffunction name="convertImageObject" access="private" output="false" returnType="any">
-	<cfargument name="bImage" type="Any" required="yes">
-	<cfargument name="type" type="numeric" required="yes">
-
-	<cfscript>
-	// convert the image to a specified BufferedImage type and return it
-
-	var width = bImage.getWidth();
-	var height = bImage.getHeight();
-	var newImage = createObject("java","java.awt.image.BufferedImage").init(javacast("int",width), javacast("int",height), javacast("int",type));
-	// int[] rgbArray = new int[width*height];
-	var rgbArray = variables.arrObj.newInstance(variables.intClass, javacast("int",width*height));
-
-	bImage.getRGB(
-		javacast("int",0),
-		javacast("int",0),
-		javacast("int",width),
-		javacast("int",height),
-		rgbArray,
-		javacast("int",0),
-		javacast("int",width)
-		);
-	newImage.setRGB(
-		javacast("int",0),
-		javacast("int",0),
-		javacast("int",width),
-		javacast("int",height),
-		rgbArray,
-		javacast("int",0),
-		javacast("int",width)
-		);
-	return newImage;
-	</cfscript>
-
-</cffunction>
-
-</cfcomponent>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/upload.cfm b/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/upload.cfm
deleted file mode 100644
index 0da40ae70e..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/cfm/upload.cfm
+++ /dev/null
@@ -1,31 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the "File Uploader" for ColdFusion (all versions).
- *
---->
-
-<cfset REQUEST.CFVersion = Left( SERVER.COLDFUSION.PRODUCTVERSION, Find( ",", SERVER.COLDFUSION.PRODUCTVERSION ) - 1 )>
-<cfif REQUEST.CFVersion lte 5>
-	<cfinclude template="cf5_upload.cfm">
-<cfelse>
-	<cfinclude template="cf_upload.cfm">
-</cfif>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/config.lasso b/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/config.lasso
deleted file mode 100644
index da683cbe62..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/config.lasso
+++ /dev/null
@@ -1,65 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Configuration file for the File Manager Connector for Lasso.
- */
-
-    /*.....................................................................
-    The connector uses the file tags, which require authentication. Enter a
-    valid username and password from Lasso admin for a group with file tags
-    permissions for uploads and the path you define in UserFilesPath below.
-    */
-
-	var('connection') = array(
-		-username='xxxxxxxx',
-		-password='xxxxxxxx'
-	);
-
-
-    /*.....................................................................
-    Set the base path for files that users can upload and browse (relative
-    to server root).
-
-    Set which file extensions are allowed and/or denied for each file type.
-    */
-	var('config') = map(
-		'Enabled' = false,
-		'UserFilesPath' = '/userfiles/',
-		'Subdirectories' = map(
-			'File' = 'File/',
-			'Image' = 'Image/',
-			'Flash' = 'Flash/',
-			'Media' = 'Media/'
-		),
-		'AllowedExtensions' = map(
-			'File' = array('7z','aiff','asf','avi','bmp','csv','doc','fla','flv','gif','gz','gzip','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','ods','odt','pdf','png','ppt','pxd','qt','ram','rar','rm','rmi','rmvb','rtf','sdc','sitd','swf','sxc','sxw','tar','tgz','tif','tiff','txt','vsd','wav','wma','wmv','xls','xml','zip'),
-			'Image' = array('bmp','gif','jpeg','jpg','png'),
-			'Flash' = array('swf','flv'),
-			'Media' = array('aiff','asf','avi','bmp','fla','flv','gif','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','png','qt','ram','rm','rmi','rmvb','swf','tif','tiff','wav','wma','wmv')
-		),
-		'DeniedExtensions' = map(
-			'File' = array(),
-			'Image' = array(),
-			'Flash' = array(),
-			'Media' = array()
-		)
-	);
-]
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/connector.lasso b/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/connector.lasso
deleted file mode 100644
index 96d0db0bcb..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/connector.lasso
+++ /dev/null
@@ -1,322 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the File Manager Connector for Lasso.
- */
-
-    /*.....................................................................
-    Include global configuration. See config.lasso for details.
-    */
-	include('config.lasso');
-
-
-    /*.....................................................................
-    Translate current date/time to GMT for custom header.
-    */
-	var('headerDate') = date_localtogmt(date)->format('%a, %d %b %Y %T GMT');
-
-
-    /*.....................................................................
-    Convert query string parameters to variables and initialize output.
-    */
-	var(
-		'Command'		=	action_param('Command'),
-		'Type'			=	action_param('Type'),
-		'CurrentFolder'	=	action_param('CurrentFolder'),
-		'ServerPath'	=	action_param('ServerPath'),
-		'NewFolderName'	=	action_param('NewFolderName'),
-		'NewFile'		=	null,
-		'NewFileName'	=	string,
-		'OrigFilePath'	=	string,
-		'NewFilePath'	=	string,
-		'commandData'	=	string,
-		'folders'		=	'\t<Folders>\n',
-		'files'			=	'\t<Files>\n',
-		'errorNumber'	=	integer,
-		'responseType'	=	'xml',
-		'uploadResult'	=	'0'
-	);
-
-	/*.....................................................................
-	Custom tag sets the HTML response.
-	*/
-
-	define_tag(
-		'htmlreply',
-		-namespace='fck_',
-		-priority='replace',
-		-required='uploadResult',
-		-optional='NewFilePath',
-		-type='string',
-		-description='Sets the HTML response for the FCKEditor File Upload feature.'
-	);
-		$__html_reply__ = '\
-<script type="text/javascript">
-(function()
-{
-	var d = document.domain ;
-
-	while ( true )
-	{
-		// Test if we can access a parent property.
-		try
-		{
-			var test = window.top.opener.document.domain ;
-			break ;
-		}
-		catch( e ) {}
-
-		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-		d = d.replace( /.*?(?:\\.|$)/, "" ) ;
-
-		if ( d.length == 0 )
-			break ;		// It was not able to detect the domain.
-
-		try
-		{
-			document.domain = d ;
-		}
-		catch (e)
-		{
-			break ;
-		}
-	}
-})() ;
-';
-			if($uploadResult == '0' || $uploadResult == '201');
-			$__html_reply__ = $__html_reply__ + '\
-	window.parent.OnUploadCompleted(' + $uploadResult + ',\'' + $NewFilePath + '\',\'' + $NewFilePath->split('/')->last + '\');
-</script>
-			';
-			else;
-			$__html_reply__ = $__html_reply__ + '\
-	window.parent.OnUploadCompleted(' + $uploadResult + ');
-</script>
-			';
-			/if;
-	/define_tag;
-
-
-    /*.....................................................................
-    Calculate the path to the current folder.
-    */
-	$ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');
-
-	var('currentFolderURL' = $ServerPath
-		+ $config->find('Subdirectories')->find(action_param('Type'))
-		+ $CurrentFolder
-	);
-
-	if($CurrentFolder->(Find: '..') || $CurrentFolder->(Find: '\\'));
-		if($Command == 'FileUpload');
-			$responseType = 'html';
-			$uploadResult = '102';
-			fck_htmlreply(
-				-uploadResult=$uploadResult
-			);
-		else;
-			$errorNumber = 102;
-			$commandData += '<Error number="' + $errorNumber + '" />\n';
-		/if;
-	else;
-
-    /*.....................................................................
-    Build the appropriate response per the 'Command' parameter. Wrap the
-    entire process in an inline for file tag permissions.
-    */
-	inline($connection);
-		select($Command);
-            /*.............................................................
-            List all subdirectories in the 'Current Folder' directory.
-            */
-			case('GetFolders');
-				$commandData += '\t<Folders>\n';
-
-				iterate(file_listdirectory($currentFolderURL), local('this'));
-					#this->endswith('/') ? $commandData += '\t\t<Folder name="' + #this->removetrailing('/')& + '" />\n';
-				/iterate;
-
-				$commandData += '\t</Folders>\n';
-
-
-            /*.............................................................
-            List both files and folders in the 'Current Folder' directory.
-            Include the file sizes in kilobytes.
-            */
-			case('GetFoldersAndFiles');
-				iterate(file_listdirectory($currentFolderURL), local('this'));
-					if(#this->endswith('/'));
-						$folders += '\t\t<Folder name="' + #this->removetrailing('/')& + '" />\n';
-					else;
-						local('size') = file_getsize($currentFolderURL + #this) / 1024;
-						$files += '\t\t<File name="' + #this + '" size="' + #size + '" />\n';
-					/if;
-				/iterate;
-
-				$folders += '\t</Folders>\n';
-				$files += '\t</Files>\n';
-
-				$commandData += $folders + $files;
-
-
-            /*.............................................................
-            Create a directory 'NewFolderName' within the 'Current Folder.'
-            */
-			case('CreateFolder');
-				$NewFolderName = (String_ReplaceRegExp: $NewFolderName, -find='\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>', -replace='_');
-				var('newFolder' = $currentFolderURL + $NewFolderName + '/');
-				file_create($newFolder);
-
-
-                /*.........................................................
-                Map Lasso's file error codes to FCKEditor's error codes.
-                */
-				select(file_currenterror( -errorcode));
-					case(0);
-						$errorNumber = 0;
-					case( -9983);
-						$errorNumber = 101;
-					case( -9976);
-						$errorNumber = 102;
-					case( -9977);
-						$errorNumber = 102;
-					case( -9961);
-						$errorNumber = 103;
-					case;
-						$errorNumber = 110;
-				/select;
-
-				$commandData += '<Error number="' + $errorNumber + '" />\n';
-
-
-            /*.............................................................
-            Process an uploaded file.
-            */
-			case('FileUpload');
-                /*.........................................................
-                This is the only command that returns an HTML response.
-                */
-				$responseType = 'html';
-
-
-                /*.........................................................
-                Was a file actually uploaded?
-                */
-                if(file_uploads->size);
-                	$NewFile = file_uploads->get(1);
-                else;
-                	$uploadResult = '202';
-                /if;
-
-				if($uploadResult == '0');
-                    /*.....................................................
-                    Split the file's extension from the filename in order
-                    to follow the API's naming convention for duplicate
-                    files. (Test.txt, Test(1).txt, Test(2).txt, etc.)
-                    */
-					$NewFileName = $NewFile->find('OrigName');
-					$NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\\\|\\/|\\||\\:|\\?|\\*|"|<|>', -replace='_');
-					$OrigFilePath = $currentFolderURL + $NewFileName;
-					$NewFilePath = $OrigFilePath;
-					local('fileExtension') = '.' + $NewFile->find('OrigExtension');
-					#fileExtension = (String_ReplaceRegExp: #fileExtension, -find='\\\\|\\/|\\||\\:|\\?|\\*|"|<|>', -replace='_');
-					local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;
-
-
-                    /*.....................................................
-                    Make sure the file extension is allowed.
-                    */
-					if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension'));
-						$uploadResult = '202';
-					else;
-                        /*.................................................
-                        Rename the target path until it is unique.
-                        */
-						while(file_exists($NewFilePath));
-							$NewFilePath = $currentFolderURL + #shortFileName + '(' + loop_count + ')' + #fileExtension;
-						/while;
-
-
-                        /*.................................................
-                        Copy the uploaded file to its final location.
-                        */
-						file_copy($NewFile->find('path'), $NewFilePath);
-
-
-                        /*.................................................
-                        Set the error code for the response. Note whether
-                        the file had to be renamed.
-                        */
-						select(file_currenterror( -errorcode));
-							case(0);
-								$OrigFilePath != $NewFilePath ? $uploadResult = 201;
-							case;
-								$uploadResult = file_currenterror( -errorcode);
-						/select;
-					/if;
-				/if;
-				fck_htmlreply(
-					-uploadResult=$uploadResult,
-					-NewFilePath=$NewFilePath
-				);
-		/select;
-	/inline;
-	/if;
-
-    /*.....................................................................
-    Send a custom header for xml responses.
-    */
-	if($responseType == 'xml');
-		header;
-]
-HTTP/1.0 200 OK
-Date: [$headerDate]
-Server: Lasso Professional [lasso_version( -lassoversion)]
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Last-Modified: [$headerDate]
-Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
-Pragma: no-cache
-Keep-Alive: timeout=15, max=98
-Connection: Keep-Alive
-Content-Type: text/xml; charset=utf-8
-[//lasso
-/header;
-
-		/*
-			Set the content type encoding for Lasso.
-		*/
-		content_type('text/xml; charset=utf-8');
-
-		/*
-			Wrap the response as XML and output.
-		*/
-		$__html_reply__ = '\
-<?xml version="1.0" encoding="utf-8" ?>
-<Connector command="' + $Command + '" resourceType="' + $Type + '">';
-
-		if($errorNumber != '102');
-			$__html_reply__ += '<CurrentFolder path="' + $CurrentFolder + '" url="' + $currentFolderURL + '" />';
-		/if;
-
-		$__html_reply__ += $commandData + '
-</Connector>';
-	/if;
-]
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/upload.lasso b/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/upload.lasso
deleted file mode 100644
index fbbe915b69..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/lasso/upload.lasso
+++ /dev/null
@@ -1,168 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the "File Uploader" for Lasso.
- */
-
-    /*.....................................................................
-    Include global configuration. See config.lasso for details.
-    */
-	include('config.lasso');
-
-
-    /*.....................................................................
-    Convert query string parameters to variables and initialize output.
-    */
-	var(
-		'Type'			=	action_param('Type'),
-		'CurrentFolder'	=	action_param('CurrentFolder'),
-		'ServerPath'	=	action_param('ServerPath'),
-		'NewFile'		=	null,
-		'NewFileName'	=	string,
-		'OrigFilePath'	=	string,
-		'NewFilePath'	=	string,
-		'errorNumber'	=	0,
-		'customMsg'		=	''
-	);
-
-	$Type == '' ? $Type = 'File';
-
-
-    /*.....................................................................
-    Calculate the path to the current folder.
-    */
-	$ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');
-
-	var('currentFolderURL' = $ServerPath
-		+ $config->find('Subdirectories')->find(action_param('Type'))
-		+ action_param('CurrentFolder')
-	);
-
-	/*.....................................................................
-	Custom tag sets the HTML response.
-	*/
-
-	define_tag(
-		'sendresults',
-		-namespace='fck_',
-		-priority='replace',
-		-required='errorNumber',
-		-type='integer',
-		-optional='fileUrl',
-		-type='string',
-		-optional='fileName',
-		-type='string',
-		-optional='customMsg',
-		-type='string',
-		-description='Sets the HTML response for the FCKEditor Quick Upload feature.'
-	);
-
-		$__html_reply__ = '<script type="text/javascript">';
-
-		// Minified version of the document.domain automatic fix script (#1919).
-		// The original script can be found at _dev/domain_fix_template.js
-		// Note: in Lasso replace \ with \\
-		$__html_reply__ = $__html_reply__ + "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();";
-
-		$__html_reply__ = $__html_reply__ + '\
-	window.parent.OnUploadCompleted(' + #errorNumber + ',"'
-		+ string_replace(#fileUrl, -find='"', -replace='\\"') + '","'
-		+ string_replace(#fileName, -find='"', -replace='\\"') + '","'
-		+ string_replace(#customMsg, -find='"', -replace='\\"') + '");
-</script>
-		';
-	/define_tag;
-
-	if($CurrentFolder->(Find: '..') || $CurrentFolder->(Find: '\\'));
-		$errorNumber = 102;
-	/if;
-
-	if($config->find('Enabled'));
-		/*.................................................................
-		Process an uploaded file.
-		*/
-		inline($connection);
-			/*.............................................................
-			Was a file actually uploaded?
-			*/
-			if($errorNumber != '102');
-				file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202;
-			/if;
-
-			if($errorNumber == 0);
-				/*.........................................................
-				Split the file's extension from the filename in order
-				to follow the API's naming convention for duplicate
-				files. (Test.txt, Test(1).txt, Test(2).txt, etc.)
-				*/
-				$NewFileName = $NewFile->find('OrigName');
-				$OrigFilePath = $currentFolderURL + $NewFileName;
-				$NewFilePath = $OrigFilePath;
-				local('fileExtension') = '.' + $NewFile->find('OrigExtension');
-				local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;
-
-
-				/*.........................................................
-				Make sure the file extension is allowed.
-				*/
-
-				if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension'));
-					$errorNumber = 202;
-				else;
-					/*.....................................................
-					Rename the target path until it is unique.
-					*/
-					while(file_exists($NewFilePath));
-						$NewFileName = #shortFileName + '(' + loop_count + ')' + #fileExtension;
-						$NewFilePath = $currentFolderURL + $NewFileName;
-					/while;
-
-
-					/*.....................................................
-					Copy the uploaded file to its final location.
-					*/
-					file_copy($NewFile->find('path'), $NewFilePath);
-
-
-					/*.....................................................
-					Set the error code for the response.
-					*/
-					select(file_currenterror( -errorcode));
-						case(0);
-							$OrigFilePath != $NewFilePath ? $errorNumber = 201;
-						case;
-							$errorNumber = 202;
-					/select;
-				/if;
-			/if;
-		/inline;
-	else;
-		$errorNumber = 1;
-		$customMsg = 'This file uploader is disabled. Please check the "editor/filemanager/upload/lasso/config.lasso" file.';
-	/if;
-
-	fck_sendresults(
-		-errorNumber=$errorNumber,
-		-fileUrl=$NewFilePath,
-		-fileName=$NewFileName,
-		-customMsg=$customMsg
-	);
-]
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/basexml.pl b/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/basexml.pl
deleted file mode 100644
index c3afa72fa4..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/basexml.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the File Manager Connector for Perl.
-#####
-
-sub CreateXmlHeader
-{
-	local($command,$resourceType,$currentFolder) = @_;
-
-	# Create the XML document header.
-	print '<?xml version="1.0" encoding="utf-8" ?>';
-
-	# Create the main "Connector" node.
-	print '<Connector command="' . $command . '" resourceType="' . $resourceType . '">';
-
-	# Add the current folder node.
-	print '<CurrentFolder path="' . ConvertToXmlAttribute($currentFolder) . '" url="' . ConvertToXmlAttribute(GetUrlFromPath($resourceType,$currentFolder)) . '" />';
-}
-
-sub CreateXmlFooter
-{
-	print '</Connector>';
-}
-
-sub SendError
-{
-	local( $number, $text ) = @_;
-
-	print << "_HTML_HEAD_";
-Content-Type:text/xml; charset=utf-8
-Pragma: no-cache
-Cache-Control: no-cache
-Expires: Thu, 01 Dec 1994 16:00:00 GMT
-
-_HTML_HEAD_
-
-	# Create the XML document header
-	print '<?xml version="1.0" encoding="utf-8" ?>' ;
-
-	print '<Connector><Error number="' . $number . '" text="' . &specialchar_cnv( $text ) . '" /></Connector>' ;
-
-	exit ;
-}
-
-1;
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/commands.pl b/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/commands.pl
deleted file mode 100644
index 683f64214c..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/commands.pl
+++ /dev/null
@@ -1,187 +0,0 @@
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the File Manager Connector for Perl.
-#####
-
-sub GetFolders
-{
-
-	local($resourceType, $currentFolder) = @_;
-
-	# Map the virtual path to the local server path.
-	$sServerDir = &ServerMapFolder($resourceType, $currentFolder);
-	print "<Folders>";			# Open the "Folders" node.
-
-	opendir(DIR,"$sServerDir");
-	@files = grep(!/^\.\.?$/,readdir(DIR));
-	closedir(DIR);
-
-	foreach $sFile (@files) {
-		if($sFile != '.' && $sFile != '..' && (-d "$sServerDir$sFile")) {
-			$cnv_filename = &ConvertToXmlAttribute($sFile);
-			print '<Folder name="' . $cnv_filename . '" />';
-		}
-	}
-	print "</Folders>";			# Close the "Folders" node.
-}
-
-sub GetFoldersAndFiles
-{
-
-	local($resourceType, $currentFolder) = @_;
-	# Map the virtual path to the local server path.
-	$sServerDir = &ServerMapFolder($resourceType,$currentFolder);
-
-	# Initialize the output buffers for "Folders" and "Files".
-	$sFolders	= '<Folders>';
-	$sFiles		= '<Files>';
-
-	opendir(DIR,"$sServerDir");
-	@files = grep(!/^\.\.?$/,readdir(DIR));
-	closedir(DIR);
-
-	foreach $sFile (@files) {
-		if($sFile ne '.' && $sFile ne '..') {
-			if(-d "$sServerDir$sFile") {
-				$cnv_filename = &ConvertToXmlAttribute($sFile);
-				$sFolders .= '<Folder name="' . $cnv_filename . '" />' ;
-			} else {
-				($iFileSize,$refdate,$filedate,$fileperm) = (stat("$sServerDir$sFile"))[7,8,9,2];
-				if($iFileSize > 0) {
-					$iFileSize = int($iFileSize / 1024);
-					if($iFileSize < 1) {
-						$iFileSize = 1;
-					}
-				}
-				$cnv_filename = &ConvertToXmlAttribute($sFile);
-				$sFiles	.= '<File name="' . $cnv_filename . '" size="' . $iFileSize . '" />' ;
-			}
-		}
-	}
-	print $sFolders ;
-	print '</Folders>';			# Close the "Folders" node.
-	print $sFiles ;
-	print '</Files>';			# Close the "Files" node.
-}
-
-sub CreateFolder
-{
-
-	local($resourceType, $currentFolder) = @_;
-	$sErrorNumber	= '0' ;
-	$sErrorMsg		= '' ;
-
-	if($FORM{'NewFolderName'} ne "") {
-		$sNewFolderName = $FORM{'NewFolderName'};
-		$sNewFolderName =~ s/\.|\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g;
-		# Map the virtual path to the local server path of the current folder.
-		$sServerDir = &ServerMapFolder($resourceType, $currentFolder);
-		if(-w $sServerDir) {
-			$sServerDir .= $sNewFolderName;
-			$sErrorMsg = &CreateServerFolder($sServerDir);
-			if($sErrorMsg == 0) {
-				$sErrorNumber = '0';
-			} elsif($sErrorMsg eq 'Invalid argument' || $sErrorMsg eq 'No such file or directory') {
-				$sErrorNumber = '102';		#// Path too long.
-			} else {
-				$sErrorNumber = '110';
-			}
-		} else {
-			$sErrorNumber = '103';
-		}
-	} else {
-		$sErrorNumber = '102' ;
-	}
-	# Create the "Error" node.
-	$cnv_errmsg = &ConvertToXmlAttribute($sErrorMsg);
-	print '<Error number="' . $sErrorNumber . '" originalDescription="' . $cnv_errmsg . '" />';
-}
-
-sub FileUpload
-{
-eval("use File::Copy;");
-
-	local($resourceType, $currentFolder) = @_;
-
-	$sErrorNumber = '0' ;
-	$sFileName = '' ;
-	if($new_fname) {
-		# Map the virtual path to the local server path.
-		$sServerDir = &ServerMapFolder($resourceType,$currentFolder);
-
-		# Get the uploaded file name.
-		$sFileName = $new_fname;
-		$sFileName =~ s/\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g;
-		$sOriginalFileName = $sFileName;
-
-		$iCounter = 0;
-		while(1) {
-			$sFilePath = $sServerDir . $sFileName;
-			if(-e $sFilePath) {
-				$iCounter++ ;
-				($path,$BaseName,$ext) = &RemoveExtension($sOriginalFileName);
-				$sFileName = $BaseName . '(' . $iCounter . ').' . $ext;
-				$sErrorNumber = '201';
-			} else {
-				copy("$img_dir/$new_fname","$sFilePath");
-				if (defined $CHMOD_ON_UPLOAD) {
-					if ($CHMOD_ON_UPLOAD) {
-						umask(000);
-						chmod($CHMOD_ON_UPLOAD,$sFilePath);
-					}
-				}
-				else {
-					umask(000);
-					chmod(0777,$sFilePath);
-				}
-				unlink("$img_dir/$new_fname");
-				last;
-			}
-		}
-	} else {
-		$sErrorNumber = '202' ;
-	}
-	$sFileName	=~ s/"/\\"/g;
-
-	SendUploadResults($sErrorNumber, $resourceType.$currentFolder.$sFileName, $sFileName, '');
-}
-
-sub SendUploadResults
-{
-
-	local($sErrorNumber, $sFileUrl, $sFileName, $customMsg) = @_;
-
-	# Minified version of the document.domain automatic fix script (#1919).
-	# The original script can be found at _dev/domain_fix_template.js
-	# Note: in Perl replace \ with \\ and $ with \$
-	print <<EOF;
-Content-type: text/html
-
-<script type="text/javascript">
-(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|\$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
-
-EOF
-	print 'window.parent.OnUploadCompleted(' . $sErrorNumber . ',"' . JS_cnv($sFileUrl) . '","' . JS_cnv($sFileName) . '","' . JS_cnv($customMsg) . '") ;';
-	print '</script>';
-	exit ;
-}
-
-1;
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/connector.cgi b/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/connector.cgi
deleted file mode 100644
index c4631573c7..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/connector.cgi
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env perl
-
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the File Manager Connector for Perl.
-#####
-
-##
-# ATTENTION: To enable this connector, look for the "SECURITY" comment in this file.
-##
-
-## START: Hack for Windows (Not important to understand the editor code... Perl specific).
-if(Windows_check()) {
-	chdir(GetScriptPath($0));
-}
-
-sub Windows_check
-{
-	# IIS,PWS(NT/95)
-	$www_server_os = $^O;
-	# Win98 & NT(SP4)
-	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
-	# AnHTTPd/Omni/IIS
-	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
-	# Win Apache
-	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
-	if($www_server_os=~ /win/i) { return(1); }
-	return(0);
-}
-
-sub GetScriptPath {
-	local($path) = @_;
-	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
-	$path;
-}
-## END: Hack for IIS
-
-require 'util.pl';
-require 'io.pl';
-require 'basexml.pl';
-require 'commands.pl';
-require 'upload_fck.pl';
-
-##
-# SECURITY: REMOVE/COMMENT THE FOLLOWING LINE TO ENABLE THIS CONNECTOR.
-##
-	&SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/connectors/perl/connector.cgi" file' ) ;
-
-	&read_input();
-
-	if($FORM{'ServerPath'} ne "") {
-		$GLOBALS{'UserFilesPath'} = $FORM{'ServerPath'};
-		if(!($GLOBALS{'UserFilesPath'} =~ /\/$/)) {
-			$GLOBALS{'UserFilesPath'} .= '/' ;
-		}
-	} else {
-		$GLOBALS{'UserFilesPath'} = '/userfiles/';
-	}
-
-	# Map the "UserFiles" path to a local directory.
-	$rootpath = &GetRootPath();
-	$GLOBALS{'UserFilesDirectory'} = $rootpath . $GLOBALS{'UserFilesPath'};
-
-	&DoResponse();
-
-sub DoResponse
-{
-
-	if($FORM{'Command'} eq "" || $FORM{'Type'} eq "" || $FORM{'CurrentFolder'} eq "") {
-		return ;
-	}
-	# Get the main request informaiton.
-	$sCommand		= $FORM{'Command'};
-	$sResourceType	= $FORM{'Type'};
-	$sCurrentFolder	= $FORM{'CurrentFolder'};
-
-	# Check the current folder syntax (must begin and start with a slash).
-	if(!($sCurrentFolder =~ /\/$/)) {
-		$sCurrentFolder .= '/';
-	}
-	if(!($sCurrentFolder =~ /^\//)) {
-		$sCurrentFolder = '/' . $sCurrentFolder;
-	}
-
-	# Check for invalid folder paths (..)
-	if ( $sCurrentFolder =~ /(?:\.\.|\\)/ ) {
-		SendError( 102, "" ) ;
-	}
-
-	# File Upload doesn't have to Return XML, so it must be intercepted before anything.
-	if($sCommand eq 'FileUpload') {
-		FileUpload($sResourceType,$sCurrentFolder);
-		return ;
-	}
-
-	print << "_HTML_HEAD_";
-Content-Type:text/xml; charset=utf-8
-Pragma: no-cache
-Cache-Control: no-cache
-Expires: Thu, 01 Dec 1994 16:00:00 GMT
-
-_HTML_HEAD_
-
-	&CreateXmlHeader($sCommand,$sResourceType,$sCurrentFolder);
-
-	# Execute the required command.
-	if($sCommand eq 'GetFolders') {
-		&GetFolders($sResourceType,$sCurrentFolder);
-	} elsif($sCommand eq 'GetFoldersAndFiles') {
-		&GetFoldersAndFiles($sResourceType,$sCurrentFolder);
-	} elsif($sCommand eq 'CreateFolder') {
-		&CreateFolder($sResourceType,$sCurrentFolder);
-	}
-
-	&CreateXmlFooter();
-
-	exit ;
-}
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/io.pl b/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/io.pl
deleted file mode 100644
index aa6cb367c4..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/io.pl
+++ /dev/null
@@ -1,141 +0,0 @@
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the File Manager Connector for Perl.
-#####
-
-sub GetUrlFromPath
-{
-	local($resourceType, $folderPath) = @_;
-
-	if($resourceType eq '') {
-		$rmpath = &RemoveFromEnd($GLOBALS{'UserFilesPath'},'/');
-		return("$rmpath$folderPath");
-	} else {
-		return("$GLOBALS{'UserFilesPath'}$resourceType$folderPath");
-	}
-}
-
-sub RemoveExtension
-{
-	local($fileName) = @_;
-	local($path, $base, $ext);
-	if($fileName !~ /\./) {
-		$fileName .= '.';
-	}
-	if($fileName =~ /([^\\\/]*)\.(.*)$/) {
-		$base = $1;
-		$ext  = $2;
-		if($fileName =~ /(.*)$base\.$ext$/) {
-			$path = $1;
-		}
-	}
-	return($path,$base,$ext);
-
-}
-
-sub ServerMapFolder
-{
-	local($resourceType,$folderPath) = @_;
-
-	# Get the resource type directory.
-	$sResourceTypePath = $GLOBALS{'UserFilesDirectory'} . $resourceType . '/';
-
-	# Ensure that the directory exists.
-	&CreateServerFolder($sResourceTypePath);
-
-	# Return the resource type directory combined with the required path.
-	$rmpath = &RemoveFromStart($folderPath,'/');
-	return("$sResourceTypePath$rmpath");
-}
-
-sub GetParentFolder
-{
-	local($folderPath) = @_;
-
-	$folderPath =~ s/[\/][^\/]+[\/]?$//g;
-	return $folderPath;
-}
-
-sub CreateServerFolder
-{
-	local($folderPath) = @_;
-
-	$sParent = &GetParentFolder($folderPath);
-	# Check if the parent exists, or create it.
-	if(!(-e $sParent)) {
-		$sErrorMsg = &CreateServerFolder($sParent);
-		if($sErrorMsg == 1) {
-			return(1);
-		}
-	}
-	if(!(-e $folderPath)) {
-		if (defined $CHMOD_ON_FOLDER_CREATE && !$CHMOD_ON_FOLDER_CREATE) {
-			mkdir("$folderPath");
-		}
-		else {
-			umask(000);
-			if (defined $CHMOD_ON_FOLDER_CREATE) {
-				mkdir("$folderPath",$CHMOD_ON_FOLDER_CREATE);
-			}
-			else {
-				mkdir("$folderPath",0777);
-			}
-		}
-
-		return(0);
-	} else {
-		return(1);
-	}
-}
-
-sub GetRootPath
-{
-#use Cwd;
-
-#	my $dir = getcwd;
-#	print $dir;
-#	$dir  =~ s/$ENV{'DOCUMENT_ROOT'}//g;
-#	print $dir;
-#	return($dir);
-
-#	$wk = $0;
-#	$wk =~ s/\/connector\.cgi//g;
-#	if($wk) {
-#		$current_dir = $wk;
-#	} else {
-#		$current_dir = `pwd`;
-#	}
-#	return($current_dir);
-use Cwd;
-
-	if($ENV{'DOCUMENT_ROOT'}) {
-		$dir = $ENV{'DOCUMENT_ROOT'};
-	} else {
-		my $dir = getcwd;
-		$workdir =~ s/\/connector\.cgi//g;
-		$dir  =~ s/$workdir//g;
-	}
-	return($dir);
-
-
-
-}
-1;
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload.cgi b/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload.cgi
deleted file mode 100644
index 1efca61394..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload.cgi
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env perl
-
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the File Manager Connector for Perl.
-#####
-
-##
-# ATTENTION: To enable this connector, look for the "SECURITY" comment in this file.
-##
-
-## START: Hack for Windows (Not important to understand the editor code... Perl specific).
-if(Windows_check()) {
-	chdir(GetScriptPath($0));
-}
-
-sub Windows_check
-{
-	# IIS,PWS(NT/95)
-	$www_server_os = $^O;
-	# Win98 & NT(SP4)
-	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
-	# AnHTTPd/Omni/IIS
-	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
-	# Win Apache
-	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
-	if($www_server_os=~ /win/i) { return(1); }
-	return(0);
-}
-
-sub GetScriptPath {
-	local($path) = @_;
-	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
-	$path;
-}
-## END: Hack for IIS
-
-require 'util.pl';
-require 'io.pl';
-require 'basexml.pl';
-require 'commands.pl';
-require 'upload_fck.pl';
-
-##
-# SECURITY: REMOVE/COMMENT THE FOLLOWING LINE TO ENABLE THIS CONNECTOR.
-##
-	&SendUploadResults(1, '', '', 'This connector is disabled. Please check the "editor/filemanager/connectors/perl/upload.cgi" file' ) ;
-
-	&read_input();
-
-	if($FORM{'ServerPath'} ne "") {
-		$GLOBALS{'UserFilesPath'} = $FORM{'ServerPath'};
-		if(!($GLOBALS{'UserFilesPath'} =~ /\/$/)) {
-			$GLOBALS{'UserFilesPath'} .= '/' ;
-		}
-	} else {
-		$GLOBALS{'UserFilesPath'} = '/userfiles/';
-	}
-
-	# Map the "UserFiles" path to a local directory.
-	$rootpath = &GetRootPath();
-	$GLOBALS{'UserFilesDirectory'} = $rootpath . $GLOBALS{'UserFilesPath'};
-
-	&DoResponse();
-
-sub DoResponse
-{
-	# Get the main request information.
-	$sCommand		= 'FileUpload'; #$FORM{'Command'};
-	$sResourceType	= $FORM{'Type'};
-	$sCurrentFolder	= $FORM{'CurrentFolder'};
-
-	if ($sResourceType eq '') {
-		$sResourceType = 'File' ;
-	}
-	if ($sCurrentFolder eq '') {
-		$sCurrentFolder = '/' ;
-	}
-
-	# Check the current folder syntax (must begin and start with a slash).
-	if(!($sCurrentFolder =~ /\/$/)) {
-		$sCurrentFolder .= '/';
-	}
-	if(!($sCurrentFolder =~ /^\//)) {
-		$sCurrentFolder = '/' . $sCurrentFolder;
-	}
-
-	# Check for invalid folder paths (..)
-	if ( $sCurrentFolder =~ /(?:\.\.|\\)/ ) {
-		SendError( 102, "" ) ;
-	}
-
-	# File Upload doesn't have to Return XML, so it must be intercepted before anything.
-	if($sCommand eq 'FileUpload') {
-		FileUpload($sResourceType,$sCurrentFolder);
-		return ;
-	}
-
-}
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl b/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl
deleted file mode 100644
index dad9bb8f83..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl
+++ /dev/null
@@ -1,686 +0,0 @@
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the File Manager Connector for Perl.
-#####
-
-# image data save dir
-$img_dir	= './temp/';
-
-
-# File size max(unit KB)
-$MAX_CONTENT_SIZE =  30000;
-
-# After file is uploaded, sometimes it is required to change its permissions
-# so that it was possible to access it at the later time.
-# If possible, it is recommended to set more restrictive permissions, like 0755.
-# Set to 0 to disable this feature.
-$CHMOD_ON_UPLOAD = 0777;
-
-# See comments above.
-# Used when creating folders that does not exist.
-$CHMOD_ON_FOLDER_CREATE = 0755;
-
-# Filelock (1=use,0=not use)
-$PM{'flock'}		= '1';
-
-
-# upload Content-Type list
-my %UPLOAD_CONTENT_TYPE_LIST = (
-	'image/(x-)?png'						=>	'png',	# PNG image
-	'image/p?jpe?g'							=>	'jpg',	# JPEG image
-	'image/gif'								=>	'gif',	# GIF image
-	'image/x-xbitmap'						=>	'xbm',	# XBM image
-
-	'image/(x-(MS-)?)?bmp'					=>	'bmp',	# Windows BMP image
-	'image/pict'							=>	'pict',	# Macintosh PICT image
-	'image/tiff'							=>	'tif',	# TIFF image
-	'application/pdf'						=>	'pdf',	# PDF image
-	'application/x-shockwave-flash'			=>	'swf',	# Shockwave Flash
-
-	'video/(x-)?msvideo'					=>	'avi',	# Microsoft Video
-	'video/quicktime'						=>	'mov',	# QuickTime Video
-	'video/mpeg'							=>	'mpeg',	# MPEG Video
-	'video/x-mpeg2'							=>	'mpv2', # MPEG2 Video
-
-	'audio/(x-)?midi?'						=>	'mid',	# MIDI Audio
-	'audio/(x-)?wav'						=>	'wav',	# WAV Audio
-	'audio/basic'							=>	'au',	# ULAW Audio
-	'audio/mpeg'							=>	'mpga',	# MPEG Audio
-
-	'application/(x-)?zip(-compressed)?'	=>	'zip',	# ZIP Compress
-
-	'text/html'								=>	'html', # HTML
-	'text/plain'							=>	'txt',	# TEXT
-	'(?:application|text)/(?:rtf|richtext)'	=>	'rtf',	# RichText
-
-	'application/msword'					=>	'doc',	# Microsoft Word
-	'application/vnd.ms-excel'				=>	'xls',	# Microsoft Excel
-
-	''
-);
-
-# Upload is permitted.
-# A regular expression is possible.
-my %UPLOAD_EXT_LIST = (
-	'png'					=>	'PNG image',
-	'p?jpe?g|jpe|jfif|pjp'	=>	'JPEG image',
-	'gif'					=>	'GIF image',
-	'xbm'					=>	'XBM image',
-
-	'bmp|dib|rle'			=>	'Windows BMP image',
-	'pi?ct'					=>	'Macintosh PICT image',
-	'tiff?'					=>	'TIFF image',
-	'pdf'					=>	'PDF image',
-	'swf'					=>	'Shockwave Flash',
-
-	'avi'					=>	'Microsoft Video',
-	'moo?v|qt'				=>	'QuickTime Video',
-	'm(p(e?gv?|e|v)|1v)'	=>	'MPEG Video',
-	'mp(v2|2v)'				=>	'MPEG2 Video',
-
-	'midi?|kar|smf|rmi|mff'	=>	'MIDI Audio',
-	'wav'					=>	'WAVE Audio',
-	'au|snd'				=>	'ULAW Audio',
-	'mp(e?ga|2|a|3)|abs'	=>	'MPEG Audio',
-
-	'zip'					=>	'ZIP Compress',
-	'lzh'					=>	'LZH Compress',
-	'cab'					=>	'CAB Compress',
-
-	'd?html?'				=>	'HTML',
-	'rtf|rtx'				=>	'RichText',
-	'txt|text'				=>	'Text',
-
-	''
-);
-
-
-# sjis or euc
-my $CHARCODE = 'sjis';
-
-$TRANS_2BYTE_CODE = 0;
-
-##############################################################################
-# Summary
-#
-# Form Read input
-#
-# Parameters
-# Returns
-# Memo
-##############################################################################
-sub read_input
-{
-eval("use File::Copy;");
-eval("use File::Path;");
-
-	my ($FORM) = @_;
-
-	if (defined $CHMOD_ON_FOLDER_CREATE && !$CHMOD_ON_FOLDER_CREATE) {
-		mkdir("$img_dir");
-	}
-	else {
-		umask(000);
-		if (defined $CHMOD_ON_FOLDER_CREATE) {
-			mkdir("$img_dir",$CHMOD_ON_FOLDER_CREATE);
-		}
-		else {
-			mkdir("$img_dir",0777);
-		}
-	}
-
-	undef $img_data_exists;
-	undef @NEWFNAMES;
-	undef @NEWFNAME_DATA;
-
-	if($ENV{'CONTENT_LENGTH'} > 10000000 || $ENV{'CONTENT_LENGTH'} > $MAX_CONTENT_SIZE * 1024) {
-		&upload_error(
-			'Size Error',
-			sprintf(
-				"Transmitting size is too large.MAX <strong>%d KB</strong> Now Size <strong>%d KB</strong>(<strong>%d bytes</strong> Over)",
-				$MAX_CONTENT_SIZE,
-				int($ENV{'CONTENT_LENGTH'} / 1024),
-				$ENV{'CONTENT_LENGTH'} - $MAX_CONTENT_SIZE * 1024
-			)
-		);
-	}
-
-	my $Buffer;
-	if($ENV{'CONTENT_TYPE'} =~ /multipart\/form-data/) {
-		# METHOD POST only
-		return	unless($ENV{'CONTENT_LENGTH'});
-
-		binmode(STDIN);
-		# STDIN A pause character is detected.'(MacIE3.0 boundary of $ENV{'CONTENT_TYPE'} cannot be trusted.)
-		my $Boundary = <STDIN>;
-		$Boundary =~ s/\x0D\x0A//;
-		$Boundary = quotemeta($Boundary);
-		while(<STDIN>) {
-			if(/^\s*Content-Disposition:/i) {
-				my($name,$ContentType,$FileName);
-				# form data get
-				if(/\bname="([^"]+)"/i || /\bname=([^\s:;]+)/i) {
-					$name = $1;
-					$name	=~ tr/+/ /;
-					$name	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-					&Encode(\$name);
-				}
-				if(/\bfilename="([^"]*)"/i || /\bfilename=([^\s:;]*)/i) {
-					$FileName = $1 || 'unknown';
-				}
-				# head read
-				while(<STDIN>) {
-					last	if(! /\w/);
-					if(/^\s*Content-Type:\s*"([^"]+)"/i || /^\s*Content-Type:\s*([^\s:;]+)/i) {
-						$ContentType = $1;
-					}
-				}
-				# body read
-				$value = "";
-				while(<STDIN>) {
-					last	if(/^$Boundary/o);
-					$value .= $_;
-				};
-				$lastline = $_;
-				$value =~s /\x0D\x0A$//;
-				if($value ne '') {
-					if($FileName || $ContentType) {
-						$img_data_exists = 1;
-						(
-							$FileName,		#
-							$Ext,			#
-							$Length,		#
-							$ImageWidth,	#
-							$ImageHeight,	#
-							$ContentName	#
-						) = &CheckContentType(\$value,$FileName,$ContentType);
-
-						$FORM{$name}	= $FileName;
-						$new_fname		= $FileName;
-						push(@NEWFNAME_DATA,"$FileName\t$Ext\t$Length\t$ImageWidth\t$ImageHeight\t$ContentName");
-
-						# Multi-upload correspondence
-						push(@NEWFNAMES,$new_fname);
-						open(OUT,">$img_dir/$new_fname");
-						binmode(OUT);
-						eval "flock(OUT,2);" if($PM{'flock'} == 1);
-						print OUT $value;
-						eval "flock(OUT,8);" if($PM{'flock'} == 1);
-						close(OUT);
-
-					} elsif($name) {
-						$value	=~ tr/+/ /;
-						$value	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-						&Encode(\$value,'trans');
-						$FORM{$name} .= "\0"			if(defined($FORM{$name}));
-						$FORM{$name} .= $value;
-					}
-				}
-			};
-			last if($lastline =~ /^$Boundary\-\-/o);
-		}
-	} elsif($ENV{'CONTENT_LENGTH'}) {
-		read(STDIN,$Buffer,$ENV{'CONTENT_LENGTH'});
-	}
-	foreach(split(/&/,$Buffer),split(/&/,$ENV{'QUERY_STRING'})) {
-		my($name, $value) = split(/=/);
-		$name	=~ tr/+/ /;
-		$name	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-		$value	=~ tr/+/ /;
-		$value	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-
-		&Encode(\$name);
-		&Encode(\$value,'trans');
-		$FORM{$name} .= "\0"			if(defined($FORM{$name}));
-		$FORM{$name} .= $value;
-
-	}
-
-}
-
-##############################################################################
-# Summary
-#
-#	CheckContentType
-#
-# Parameters
-# Returns
-# Memo
-##############################################################################
-sub CheckContentType
-{
-
-	my($DATA,$FileName,$ContentType) = @_;
-	my($Ext,$ImageWidth,$ImageHeight,$ContentName,$Infomation);
-	my $DataLength = length($$DATA);
-
-	# An unknown file type
-
-	$_ = $ContentType;
-	my $UnknownType = (
-		!$_
-		|| /^application\/(x-)?macbinary$/i
-		|| /^application\/applefile$/i
-		|| /^application\/octet-stream$/i
-		|| /^text\/plane$/i
-		|| /^x-unknown-content-type/i
-	);
-
-	# MacBinary(Mac Unnecessary data are deleted.)
-	if($UnknownType || $ENV{'HTTP_USER_AGENT'} =~ /Macintosh|Mac_/) {
-		if($DataLength > 128 && !unpack("C",substr($$DATA,0,1)) && !unpack("C",substr($$DATA,74,1)) && !unpack("C",substr($$DATA,82,1)) ) {
-			my $MacBinary_ForkLength = unpack("N", substr($$DATA, 83, 4));		# ForkLength Get
-			my $MacBinary_FileName = quotemeta(substr($$DATA, 2, unpack("C",substr($$DATA, 1, 1))));
-			if($MacBinary_FileName && $MacBinary_ForkLength && $DataLength >= $MacBinary_ForkLength + 128
-					&& ($FileName =~ /$MacBinary_FileName/i || substr($$DATA,102,4) eq 'mBIN')) {	# DATA TOP 128byte MacBinary!!
-				$$DATA				= substr($$DATA,128,$MacBinary_ForkLength);
-				my $ResourceLength	= $DataLength - $MacBinary_ForkLength - 128;
-				$DataLength			= $MacBinary_ForkLength;
-			}
-		}
-	}
-
-	# A file name is changed into EUC.
-#	&jcode::convert(\$FileName,'euc',$FormCodeDefault);
-#	&jcode::h2z_euc(\$FileName);
-	$FileName =~ s/^.*\\//;					# Windows, Mac
-	$FileName =~ s/^.*\///;					# UNIX
-	$FileName =~ s/&/&amp;/g;
-	$FileName =~ s/"/&quot;/g;
-	$FileName =~ s/</&lt;/g;
-	$FileName =~ s/>/&gt;/g;
-#
-#	if($CHARCODE ne 'euc') {
-#		&jcode::convert(\$FileName,$CHARCODE,'euc');
-#	}
-
-	# An extension is extracted and it changes into a small letter.
-	my $FileExt;
-	if($FileName =~ /\.(\w+)$/) {
-		$FileExt = $1;
-		$FileExt =~ tr/A-Z/a-z/;
-	}
-
-	# Executable file detection (ban on upload)
-	if($$DATA =~ /^MZ/) {
-		$Ext = 'exe';
-	}
-	# text
-	if(!$Ext && ($UnknownType || $ContentType =~ /^text\//i || $ContentType =~ /^application\/(?:rtf|richtext)$/i || $ContentType =~ /^image\/x-xbitmap$/i)
-				&& ! $$DATA =~ /[\000-\006\177\377]/) {
-#		$$DATA =~ s/\x0D\x0A/\n/g;
-#		$$DATA =~ tr/\x0D\x0A/\n\n/;
-#
-#		if(
-#			$$DATA =~ /<\s*SCRIPT(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*(?:.|\n)*?\bONLOAD\s*=(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*(?:.|\n)*?\bONCLICK\s*=(?:.|\n)*?>/i
-#				) {
-#			$Infomation = '(JavaScript contains)';
-#		}
-#		if($$DATA =~ /<\s*TABLE(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*BLINK(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*MARQUEE(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*OBJECT(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*EMBED(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*FRAME(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*APPLET(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*FORM(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*(?:.|\n)*?\bSRC\s*=(?:.|\n)*?>/i
-#				|| $$DATA =~ /<\s*(?:.|\n)*?\bDYNSRC\s*=(?:.|\n)*?>/i
-#				) {
-#			$Infomation = '(the HTML tag which is not safe is included)';
-#		}
-
-		if($FileExt =~ /^txt$/i || $FileExt =~ /^cgi$/i || $FileExt =~ /^pl$/i) {								# Text File
-			$Ext = 'txt';
-		} elsif($ContentType =~ /^text\/html$/i || $FileExt =~ /html?/i || $$DATA =~ /<\s*HTML(?:.|\n)*?>/i) {	# HTML File
-			$Ext = 'html';
-		} elsif($ContentType =~ /^image\/x-xbitmap$/i || $FileExt =~ /^xbm$/i) {								# XBM(x-BitMap) Image
-			my $XbmName = $1;
-			my ($XbmWidth, $XbmHeight);
-			if($$DATA =~ /\#define\s*$XbmName\_width\s*(\d+)/i) {
-				$XbmWidth = $1;
-			}
-			if($$DATA =~ /\#define\s*$XbmName\_height\s*(\d+)/i) {
-				$XbmHeight = $1;
-			}
-			if($XbmWidth && $XbmHeight) {
-				$Ext = 'xbm';
-				$ImageWidth		= $XbmWidth;
-				$ImageHeight	= $XbmHeight;
-			}
-		} else {		#
-			$Ext = 'txt';
-		}
-	}
-
-	# image
-	if(!$Ext && ($UnknownType || $ContentType =~ /^image\//i)) {
-		# PNG
-		if($$DATA =~ /^\x89PNG\x0D\x0A\x1A\x0A/) {
-			if(substr($$DATA, 12, 4) eq 'IHDR') {
-				$Ext = 'png';
-				($ImageWidth, $ImageHeight) = unpack("N2", substr($$DATA, 16, 8));
-			}
-		} elsif($$DATA =~ /^GIF8(?:9|7)a/) {															# GIF89a(modified), GIF89a, GIF87a
-			$Ext = 'gif';
-			($ImageWidth, $ImageHeight) = unpack("v2", substr($$DATA, 6, 4));
-		} elsif($$DATA =~ /^II\x2a\x00\x08\x00\x00\x00/ || $$DATA =~ /^MM\x00\x2a\x00\x00\x00\x08/) {	# TIFF
-			$Ext = 'tif';
-		} elsif($$DATA =~ /^BM/) {																		# BMP
-			$Ext = 'bmp';
-		} elsif($$DATA =~ /^\xFF\xD8\xFF/ || $$DATA =~ /JFIF/) {										# JPEG
-			my $HeaderPoint = index($$DATA, "\xFF\xD8\xFF", 0);
-			my $Point = $HeaderPoint + 2;
-			while($Point < $DataLength) {
-				my($Maker, $MakerType, $MakerLength) = unpack("C2n",substr($$DATA,$Point,4));
-				if($Maker != 0xFF || $MakerType == 0xd9 || $MakerType == 0xda) {
-					last;
-				} elsif($MakerType >= 0xC0 && $MakerType <= 0xC3) {
-					$Ext = 'jpg';
-					($ImageHeight, $ImageWidth) = unpack("n2", substr($$DATA, $Point + 5, 4));
-					if($HeaderPoint > 0) {
-						$$DATA = substr($$DATA, $HeaderPoint);
-						$DataLength = length($$DATA);
-					}
-					last;
-				} else {
-					$Point += $MakerLength + 2;
-				}
-			}
-		}
-	}
-
-	# audio
-	if(!$Ext && ($UnknownType || $ContentType =~ /^audio\//i)) {
-		# MIDI Audio
-		if($$DATA =~ /^MThd/) {
-			$Ext = 'mid';
-		} elsif($$DATA =~ /^\x2esnd/) {		# ULAW Audio
-			$Ext = 'au';
-		} elsif($$DATA =~ /^RIFF/ || $$DATA =~ /^ID3/ && $$DATA =~ /RIFF/) {
-			my $HeaderPoint = index($$DATA, "RIFF", 0);
-			$_ = substr($$DATA, $HeaderPoint + 8, 8);
-			if(/^WAVEfmt $/) {
-				# WAVE
-				if(unpack("V",substr($$DATA, $HeaderPoint + 16, 4)) == 16) {
-					$Ext = 'wav';
-				} else {					# RIFF WAVE MP3
-					$Ext = 'mp3';
-				}
-			} elsif(/^RMIDdata$/) {			# RIFF MIDI
-				$Ext = 'rmi';
-			} elsif(/^RMP3data$/) {			# RIFF MP3
-				$Ext = 'rmp';
-			}
-			if($ContentType =~ /^audio\//i) {
-				$Infomation .= '(RIFF '. substr($$DATA, $HeaderPoint + 8, 4). ')';
-			}
-		}
-	}
-
-	# a binary file
-	unless ($Ext) {
-		# PDF image
-		if($$DATA =~ /^\%PDF/) {
-			# Picture size is not measured.
-			$Ext = 'pdf';
-		} elsif($$DATA =~ /^FWS/) {		# Shockwave Flash
-			$Ext = 'swf';
-		} elsif($$DATA =~ /^RIFF/ || $$DATA =~ /^ID3/ && $$DATA =~ /RIFF/) {
-			my $HeaderPoint = index($$DATA, "RIFF", 0);
-			$_ = substr($$DATA,$HeaderPoint + 8, 8);
-			# AVI
-			if(/^AVI LIST$/) {
-				$Ext = 'avi';
-			}
-			if($ContentType =~ /^video\//i) {
-				$Infomation .= '(RIFF '. substr($$DATA, $HeaderPoint + 8, 4). ')';
-			}
-		} elsif($$DATA =~ /^PK/) {			# ZIP Compress File
-			$Ext = 'zip';
-		} elsif($$DATA =~ /^MSCF/) {		# CAB Compress File
-			$Ext = 'cab';
-		} elsif($$DATA =~ /^Rar\!/) {		# RAR Compress File
-			$Ext = 'rar';
-		} elsif(substr($$DATA, 2, 5) =~ /^\-lh(\d+|d)\-$/) {		# LHA Compress File
-			$Infomation .= "(lh$1)";
-			$Ext = 'lzh';
-		} elsif(substr($$DATA, 325, 25) eq "Apple Video Media Handler" || substr($$DATA, 325, 30) eq "Apple \x83\x72\x83\x66\x83\x49\x81\x45\x83\x81\x83\x66\x83\x42\x83\x41\x83\x6E\x83\x93\x83\x68\x83\x89") {
-			# QuickTime
-			$Ext = 'mov';
-		}
-	}
-
-	# Header analysis failure
-	unless ($Ext) {
-		# It will be followed if it applies for the MIME type from the browser.
-		foreach (keys %UPLOAD_CONTENT_TYPE_LIST) {
-			next unless ($_);
-			if($ContentType =~ /^$_$/i) {
-				$Ext = $UPLOAD_CONTENT_TYPE_LIST{$_};
-				$ContentName = &CheckContentExt($Ext);
-				if(
-					grep {$_ eq $Ext;} (
-						'png',
-						'gif',
-						'jpg',
-						'xbm',
-						'tif',
-						'bmp',
-						'pdf',
-						'swf',
-						'mov',
-						'zip',
-						'cab',
-						'lzh',
-						'rar',
-						'mid',
-						'rmi',
-						'au',
-						'wav',
-						'avi',
-						'exe'
-					)
-				) {
-					$Infomation .= ' / Header analysis failure';
-				}
-				if($Ext ne $FileExt && &CheckContentExt($FileExt) eq $ContentName) {
-					$Ext = $FileExt;
-				}
-				last;
-			}
-		}
-		# a MIME type is unknown--It judges from an extension.
-		unless ($Ext) {
-			$ContentName = &CheckContentExt($FileExt);
-			if($ContentName) {
-				$Ext = $FileExt;
-				$Infomation .= ' /	MIME type is unknown('. $ContentType. ')';
-				last;
-			}
-		}
-	}
-
-#	$ContentName = &CheckContentExt($Ext)	unless($ContentName);
-#	if($Ext && $ContentName) {
-#		$ContentName .=  $Infomation;
-#	} else {
-#		&upload_error(
-#			'Extension Error',
-#			"$FileName A not corresponding extension ($Ext)<BR>The extension which can be responded ". join(',', sort values(%UPLOAD_EXT_LIST))
-#		);
-#	}
-
-#	# SSI Tag Deletion
-#	if($Ext =~ /.?html?/ && $$DATA =~ /<\!/) {
-#		foreach (
-#			'config',
-#			'echo',
-#			'exec',
-#			'flastmod',
-#			'fsize',
-#			'include'
-#		) {
-#			$$DATA =~ s/\#\s*$_/\&\#35\;$_/ig
-#		}
-#	}
-
-	return (
-		$FileName,
-		$Ext,
-		int($DataLength / 1024 + 1),
-		$ImageWidth,
-		$ImageHeight,
-		$ContentName
-	);
-}
-
-##############################################################################
-# Summary
-#
-# Extension discernment
-#
-# Parameters
-# Returns
-# Memo
-##############################################################################
-
-sub CheckContentExt
-{
-
-	my($Ext) = @_;
-	my $ContentName;
-	foreach (keys %UPLOAD_EXT_LIST) {
-		next	unless ($_);
-		if($_ && $Ext =~ /^$_$/) {
-			$ContentName = $UPLOAD_EXT_LIST{$_};
-			last;
-		}
-	}
-	return $ContentName;
-
-}
-
-##############################################################################
-# Summary
-#
-# Form decode
-#
-# Parameters
-# Returns
-# Memo
-##############################################################################
-sub Encode
-{
-
-	my($value,$Trans) = @_;
-
-#	my $FormCode = &jcode::getcode($value) || $FormCodeDefault;
-#	$FormCodeDefault ||= $FormCode;
-#
-#	if($Trans && $TRANS_2BYTE_CODE) {
-#		if($FormCode ne 'euc') {
-#			&jcode::convert($value, 'euc', $FormCode);
-#		}
-#		&jcode::tr(
-#			$value,
-#			"\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA",
-#			'0-9A-Za-z'
-#		);
-#		if($CHARCODE ne 'euc') {
-#			&jcode::convert($value,$CHARCODE,'euc');
-#		}
-#	} else {
-#		if($CHARCODE ne $FormCode) {
-#			&jcode::convert($value,$CHARCODE,$FormCode);
-#		}
-#	}
-#	if($CHARCODE eq 'euc') {
-#		&jcode::h2z_euc($value);
-#	} elsif($CHARCODE eq 'sjis') {
-#		&jcode::h2z_sjis($value);
-#	}
-
-}
-
-##############################################################################
-# Summary
-#
-# Error Msg
-#
-# Parameters
-# Returns
-# Memo
-##############################################################################
-
-sub upload_error
-{
-
-	local($error_message)	= $_[0];
-	local($error_message2)	= $_[1];
-
-	print "Content-type: text/html\n\n";
-	print<<EOF;
-<HTML>
-<HEAD>
-<TITLE>Error Message</TITLE></HEAD>
-<BODY>
-<table border="1" cellspacing="10" cellpadding="10">
-	<TR bgcolor="#0000B0">
-	<TD bgcolor="#0000B0" NOWRAP><font size="-1" color="white"><B>Error Message</B></font></TD>
-	</TR>
-</table>
-<UL>
-<H4> $error_message </H4>
-$error_message2 <BR>
-</UL>
-</BODY>
-</HTML>
-EOF
-	&rm_tmp_uploaded_files; 		# Image Temporary deletion
-	exit;
-}
-
-##############################################################################
-# Summary
-#
-# Image Temporary deletion
-#
-# Parameters
-# Returns
-# Memo
-##############################################################################
-
-sub rm_tmp_uploaded_files
-{
-	if($img_data_exists == 1){
-		sleep 1;
-		foreach $fname_list(@NEWFNAMES) {
-			if(-e "$img_dir/$fname_list") {
-				unlink("$img_dir/$fname_list");
-			}
-		}
-	}
-
-}
-1;
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/util.pl b/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/util.pl
deleted file mode 100644
index 8d1220d6e2..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/perl/util.pl
+++ /dev/null
@@ -1,68 +0,0 @@
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the File Manager Connector for Perl.
-#####
-
-sub RemoveFromStart
-{
-	local($sourceString, $charToRemove) = @_;
-	$sPattern = '^' . $charToRemove . '+' ;
-	$sourceString =~ s/^$charToRemove+//g;
-	return $sourceString;
-}
-
-sub RemoveFromEnd
-{
-	local($sourceString, $charToRemove) = @_;
-	$sPattern = $charToRemove . '+$' ;
-	$sourceString =~ s/$charToRemove+$//g;
-	return $sourceString;
-}
-
-sub ConvertToXmlAttribute
-{
-	local($value) = @_;
-	return $value;
-#	return utf8_encode(htmlspecialchars($value));
-
-}
-
-sub specialchar_cnv
-{
-	local($ch) = @_;
-
-	$ch =~ s/&/&amp;/g;		# &
-	$ch =~ s/\"/&quot;/g;	#"
-	$ch =~ s/\'/&#39;/g;	# '
-	$ch =~ s/</&lt;/g;		# <
-	$ch =~ s/>/&gt;/g;		# >
-	return($ch);
-}
-
-sub JS_cnv
-{
-	local($ch) = @_;
-
-	$ch =~ s/\"/\\\"/g;	#"
-	return($ch);
-}
-
-1;
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/basexml.php b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/basexml.php
index d50f33264c..91f4ac288d 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/basexml.php
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/basexml.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -65,6 +65,9 @@ function CreateXmlFooter()
 
 function SendError( $number, $text )
 {
+	if ( $_GET['Command'] == 'FileUpload' )
+		SendUploadResults( $number, "", "", $text ) ;
+
 	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
 	{
 		SendErrorNode( $number, $text ) ;
@@ -88,6 +91,9 @@ function SendError( $number, $text )
 
 function SendErrorNode(  $number, $text )
 {
-	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
+	if ($text)
+		echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
+	else
+		echo '<Error number="' . $number . '" />' ;
 }
 ?>
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/commands.php b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/commands.php
index cfb132c720..7839c75fd9 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/commands.php
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/commands.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -30,16 +30,18 @@ function GetFolders( $resourceType, $currentFolder )
 	// Array that will hold the folders names.
 	$aFolders	= array() ;
 
-	$oCurrentFolder = opendir( $sServerDir ) ;
+	$oCurrentFolder = @opendir( $sServerDir ) ;
 
-	while ( $sFile = readdir( $oCurrentFolder ) )
+	if ($oCurrentFolder !== false)
 	{
-		if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
-			$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+		while ( $sFile = readdir( $oCurrentFolder ) )
+		{
+			if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
+				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+		}
+		closedir( $oCurrentFolder ) ;
 	}
 
-	closedir( $oCurrentFolder ) ;
-
 	// Open the "Folders" node.
 	echo "<Folders>" ;
 
@@ -60,29 +62,34 @@ function GetFoldersAndFiles( $resourceType, $currentFolder )
 	$aFolders	= array() ;
 	$aFiles		= array() ;
 
-	$oCurrentFolder = opendir( $sServerDir ) ;
+	$oCurrentFolder = @opendir( $sServerDir ) ;
 
-	while ( $sFile = readdir( $oCurrentFolder ) )
+	if ($oCurrentFolder !== false)
 	{
-		if ( $sFile != '.' && $sFile != '..' )
+		while ( $sFile = readdir( $oCurrentFolder ) )
 		{
-			if ( is_dir( $sServerDir . $sFile ) )
-				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
-			else
+			if ( $sFile != '.' && $sFile != '..' )
 			{
-				$iFileSize = @filesize( $sServerDir . $sFile ) ;
-				if ( !$iFileSize ) {
-					$iFileSize = 0 ;
-				}
-				if ( $iFileSize > 0 )
+				if ( is_dir( $sServerDir . $sFile ) )
+					$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+				else
 				{
-					$iFileSize = round( $iFileSize / 1024 ) ;
-					if ( $iFileSize < 1 ) $iFileSize = 1 ;
-				}
+					$iFileSize = @filesize( $sServerDir . $sFile ) ;
+					if ( !$iFileSize ) {
+						$iFileSize = 0 ;
+					}
+					if ( $iFileSize > 0 )
+					{
+						$iFileSize = round( $iFileSize / 1024 ) ;
+						if ( $iFileSize < 1 )
+							$iFileSize = 1 ;
+					}
 
-				$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
+					$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
+				}
 			}
 		}
+		closedir( $oCurrentFolder ) ;
 	}
 
 	// Send the folders
@@ -152,7 +159,7 @@ function CreateFolder( $resourceType, $currentFolder )
 		$sErrorNumber = '102' ;
 
 	// Create the "Error" node.
-	echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
+	echo '<Error number="' . $sErrorNumber . '" />' ;
 }
 
 function FileUpload( $resourceType, $currentFolder, $sCommand )
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/config.php b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/config.php
index 80aac365a0..066d689de3 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/config.php
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/config.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/connector.php b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/connector.php
index 7c7f454f70..3a3e4c538a 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/connector.php
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/connector.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/io.php b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/io.php
index 81a094595d..a018eaaa4e 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/io.php
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/io.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -246,6 +246,9 @@ function GetCurrentFolder()
 	if ( strpos( $sCurrentFolder, '..' ) || strpos( $sCurrentFolder, "\\" ))
 		SendError( 102, '' ) ;
 
+	if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
+		SendError( 102, '' ) ;
+
 	return $sCurrentFolder ;
 }
 
@@ -287,6 +290,11 @@ function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $custom
 (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
 EOF;
 
+	if ($errorNumber && $errorNumber != 201) {
+		$fileUrl = "";
+		$fileName = "";
+	}
+
 	$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
 	echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;
 	echo '</script>' ;
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/upload.php b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/upload.php
index 186a849e75..6e537e55a3 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/upload.php
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/upload.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -43,7 +43,7 @@ $sCommand = 'QuickUpload' ;
 // The file type (from the QueryString, by default 'File').
 $sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;
 
-$sCurrentFolder	= GetCurrentFolder() ;
+$sCurrentFolder	= "/" ;
 
 // Is enabled the upload?
 if ( ! IsAllowedCommand( $sCommand ) )
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/util.php b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/util.php
index bc6b084b83..21d60d59d8 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/util.php
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/php/util.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/config.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/config.py
deleted file mode 100644
index 094800dcb6..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/config.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-"""
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Configuration file for the File Manager Connector for Python
-"""
-
-# INSTALLATION NOTE: You must set up your server environment accordingly to run
-# python scripts. This connector requires Python 2.4 or greater.
-#
-# Supported operation modes:
-#  * WSGI (recommended): You'll need apache + mod_python + modpython_gateway
-#                        or any web server capable of the WSGI python standard
-#  * Plain Old CGI:      Any server capable of running standard python scripts
-#                        (although mod_python is recommended for performance)
-#                        This was the previous connector version operation mode
-#
-# If you're using Apache web server, replace the htaccess.txt to to .htaccess,
-# and set the proper options and paths.
-# For WSGI and mod_python, you may need to download modpython_gateway from:
-# http://projects.amor.org/misc/svn/modpython_gateway.py and copy it in this
-# directory.
-
-
-# SECURITY: You must explicitly enable this "connector". (Set it to "True").
-# WARNING: don't just set "ConfigIsEnabled = True", you must be sure that only
-#		authenticated users can access this file or use some kind of session checking.
-Enabled = False
-
-# Path to user files relative to the document root.
-UserFilesPath = '/userfiles/'
-
-# Fill the following value it you prefer to specify the absolute path for the
-# user files directory. Useful if you are using a virtual directory, symbolic
-# link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-# Attention: The above 'UserFilesPath' must point to the same directory.
-# WARNING: GetRootPath may not work in virtual or mod_python configurations, and
-# may not be thread safe. Use this configuration parameter instead.
-UserFilesAbsolutePath = ''
-
-# Due to security issues with Apache modules, it is recommended to leave the
-# following setting enabled.
-ForceSingleExtension = True
-
-# What the user can do with this connector
-ConfigAllowedCommands = [ 'QuickUpload', 'FileUpload', 'GetFolders', 'GetFoldersAndFiles', 'CreateFolder' ]
-
-# Allowed Resource Types
-ConfigAllowedTypes = ['File', 'Image', 'Flash', 'Media']
-
-# After file is uploaded, sometimes it is required to change its permissions
-# so that it was possible to access it at the later time.
-# If possible, it is recommended to set more restrictive permissions, like 0755.
-# Set to 0 to disable this feature.
-# Note: not needed on Windows-based servers.
-ChmodOnUpload = 0755
-
-# See comments above.
-# Used when creating folders that does not exist.
-ChmodOnFolderCreate = 0755
-
-# Do not touch this 3 lines, see "Configuration settings for each Resource Type"
-AllowedExtensions = {}; DeniedExtensions = {};
-FileTypesPath = {}; FileTypesAbsolutePath = {};
-QuickUploadPath = {}; QuickUploadAbsolutePath = {};
-
-#	Configuration settings for each Resource Type
-#
-#	- AllowedExtensions: the possible extensions that can be allowed.
-#		If it is empty then any file type can be uploaded.
-#	- DeniedExtensions: The extensions that won't be allowed.
-#		If it is empty then no restrictions are done here.
-#
-#	For a file to be uploaded it has to fulfill both the AllowedExtensions
-#	and DeniedExtensions (that's it: not being denied) conditions.
-#
-#	- FileTypesPath: the virtual folder relative to the document root where
-#		these resources will be located.
-#		Attention: It must start and end with a slash: '/'
-#
-#	- FileTypesAbsolutePath: the physical path to the above folder. It must be
-#		an absolute path.
-#		If it's an empty string then it will be autocalculated.
-#		Useful if you are using a virtual directory, symbolic link or alias.
-#		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-#		Attention: The above 'FileTypesPath' must point to the same directory.
-#		Attention: It must end with a slash: '/'
-#
-#
-#	- QuickUploadPath: the virtual folder relative to the document root where
-#		these resources will be uploaded using the Upload tab in the resources
-#		dialogs.
-#		Attention: It must start and end with a slash: '/'
-#
-#	- QuickUploadAbsolutePath: the physical path to the above folder. It must be
-#		an absolute path.
-#		If it's an empty string then it will be autocalculated.
-#		Useful if you are using a virtual directory, symbolic link or alias.
-#		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
-#		Attention: The above 'QuickUploadPath' must point to the same directory.
-#		Attention: It must end with a slash: '/'
-
-AllowedExtensions['File'] 		= ['7z','aiff','asf','avi','bmp','csv','doc','fla','flv','gif','gz','gzip','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','ods','odt','pdf','png','ppt','pxd','qt','ram','rar','rm','rmi','rmvb','rtf','sdc','sitd','swf','sxc','sxw','tar','tgz','tif','tiff','txt','vsd','wav','wma','wmv','xls','xml','zip']
-DeniedExtensions['File'] 		= []
-FileTypesPath['File'] 			= UserFilesPath + 'file/'
-FileTypesAbsolutePath['File'] 	= (not UserFilesAbsolutePath == '') and (UserFilesAbsolutePath + 'file/') or ''
-QuickUploadPath['File']			= FileTypesPath['File']
-QuickUploadAbsolutePath['File']	= FileTypesAbsolutePath['File']
-
-AllowedExtensions['Image']		= ['bmp','gif','jpeg','jpg','png']
-DeniedExtensions['Image']		= []
-FileTypesPath['Image']			= UserFilesPath + 'image/'
-FileTypesAbsolutePath['Image']	= (not UserFilesAbsolutePath == '') and UserFilesAbsolutePath + 'image/' or ''
-QuickUploadPath['Image']		= FileTypesPath['Image']
-QuickUploadAbsolutePath['Image']= FileTypesAbsolutePath['Image']
-
-AllowedExtensions['Flash']		= ['swf','flv']
-DeniedExtensions['Flash']		= []
-FileTypesPath['Flash']			= UserFilesPath + 'flash/'
-FileTypesAbsolutePath['Flash']	= ( not UserFilesAbsolutePath == '') and UserFilesAbsolutePath + 'flash/' or ''
-QuickUploadPath['Flash']		= FileTypesPath['Flash']
-QuickUploadAbsolutePath['Flash']= FileTypesAbsolutePath['Flash']
-
-AllowedExtensions['Media']		= ['aiff','asf','avi','bmp','fla', 'flv','gif','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','png','qt','ram','rm','rmi','rmvb','swf','tif','tiff','wav','wma','wmv']
-DeniedExtensions['Media']		= []
-FileTypesPath['Media']			= UserFilesPath + 'media/'
-FileTypesAbsolutePath['Media']	= ( not UserFilesAbsolutePath == '') and UserFilesAbsolutePath + 'media/' or ''
-QuickUploadPath['Media']		= FileTypesPath['Media']
-QuickUploadAbsolutePath['Media']= FileTypesAbsolutePath['Media']
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/connector.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/connector.py
deleted file mode 100644
index e3a4c20aa3..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/connector.py
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Connector for Python (CGI and WSGI).
-
-See config.py for configuration settings
-
-"""
-import os
-
-from fckutil import *
-from fckcommands import * 	# default command's implementation
-from fckoutput import * 	# base http, xml and html output mixins
-from fckconnector import FCKeditorConnectorBase # import base connector
-import config as Config
-
-class FCKeditorConnector(	FCKeditorConnectorBase,
-							GetFoldersCommandMixin,
-							GetFoldersAndFilesCommandMixin,
-							CreateFolderCommandMixin,
-							UploadFileCommandMixin,
-							BaseHttpMixin, BaseXmlMixin, BaseHtmlMixin  ):
-	"The Standard connector class."
-	def doResponse(self):
-		"Main function. Process the request, set headers and return a string as response."
-		s = ""
-		# Check if this connector is disabled
-		if not(Config.Enabled):
-			return self.sendError(1, "This connector is disabled.  Please check the connector configurations in \"editor/filemanager/connectors/py/config.py\" and try again.")
-		# Make sure we have valid inputs
-		for key in ("Command","Type","CurrentFolder"):
-			if not self.request.has_key (key):
-				return
-		# Get command, resource type and current folder
-		command = self.request.get("Command")
-		resourceType = self.request.get("Type")
-		currentFolder = getCurrentFolder(self.request.get("CurrentFolder"))
-		# Check for invalid paths
-		if currentFolder is None:
-			return self.sendError(102, "")
-
-		# Check if it is an allowed command
-		if ( not command in Config.ConfigAllowedCommands ):
-			return self.sendError( 1, 'The %s command isn\'t allowed' % command )
-
-		if ( not resourceType in Config.ConfigAllowedTypes  ):
-			return self.sendError( 1, 'Invalid type specified' )
-
-		# Setup paths
-		if command == "QuickUpload":
-			self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType]
-			self.webUserFilesFolder =  Config.QuickUploadPath[resourceType]
-		else:
-			self.userFilesFolder = Config.FileTypesAbsolutePath[resourceType]
-			self.webUserFilesFolder = Config.FileTypesPath[resourceType]
-
-		if not self.userFilesFolder: # no absolute path given (dangerous...)
-			self.userFilesFolder = mapServerPath(self.environ,
-									self.webUserFilesFolder)
-		# Ensure that the directory exists.
-		if not os.path.exists(self.userFilesFolder):
-			try:
-				self.createServerFoldercreateServerFolder( self.userFilesFolder )
-			except:
-				return self.sendError(1, "This connector couldn\'t access to local user\'s files directories.  Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ")
-
-		# File upload doesn't have to return XML, so intercept here
-		if (command == "FileUpload"):
-			return self.uploadFile(resourceType, currentFolder)
-
-		# Create Url
-		url = combinePaths( self.webUserFilesFolder, currentFolder )
-
-		# Begin XML
-		s += self.createXmlHeader(command, resourceType, currentFolder, url)
-		# Execute the command
-		selector = {"GetFolders": self.getFolders,
-					"GetFoldersAndFiles": self.getFoldersAndFiles,
-					"CreateFolder": self.createFolder,
-					}
-		s += selector[command](resourceType, currentFolder)
-		s += self.createXmlFooter()
-		return s
-
-# Running from command line (plain old CGI)
-if __name__ == '__main__':
-	try:
-		# Create a Connector Instance
-		conn = FCKeditorConnector()
-		data = conn.doResponse()
-		for header in conn.headers:
-			print '%s: %s' % header
-		print
-		print data
-	except:
-		print "Content-Type: text/plain"
-		print
-		import cgi
-		cgi.print_exception()
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckcommands.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckcommands.py
deleted file mode 100644
index 0f4f8eb33a..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckcommands.py
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
-- GNU General Public License Version 2 or later (the "GPL")
-http://www.gnu.org/licenses/gpl.html
-
-- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-http://www.gnu.org/licenses/lgpl.html
-
-- Mozilla Public License Version 1.1 or later (the "MPL")
-http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Connector for Python (CGI and WSGI).
-
-"""
-
-import os
-try: # Windows needs stdio set for binary mode for file upload to work.
-	import msvcrt
-	msvcrt.setmode (0, os.O_BINARY) # stdin  = 0
-	msvcrt.setmode (1, os.O_BINARY) # stdout = 1
-except ImportError:
-	pass
-
-from fckutil import *
-from fckoutput import *
-import config as Config
-
-class GetFoldersCommandMixin (object):
-	def getFolders(self, resourceType, currentFolder):
-		"""
-		Purpose: command to recieve a list of folders
-		"""
-		# Map the virtual path to our local server
-		serverPath = mapServerFolder(self.userFilesFolder,currentFolder)
-		s = """<Folders>"""	 # Open the folders node
-		for someObject in os.listdir(serverPath):
-			someObjectPath = mapServerFolder(serverPath, someObject)
-			if os.path.isdir(someObjectPath):
-				s += """<Folder name="%s" />""" % (
-						convertToXmlAttribute(someObject)
-						)
-		s += """</Folders>""" # Close the folders node
-		return s
-
-class GetFoldersAndFilesCommandMixin (object):
-	def getFoldersAndFiles(self, resourceType, currentFolder):
-		"""
-		Purpose: command to recieve a list of folders and files
-		"""
-		# Map the virtual path to our local server
-		serverPath = mapServerFolder(self.userFilesFolder,currentFolder)
-		# Open the folders / files node
-		folders = """<Folders>"""
-		files = """<Files>"""
-		for someObject in os.listdir(serverPath):
-			someObjectPath = mapServerFolder(serverPath, someObject)
-			if os.path.isdir(someObjectPath):
-				folders += """<Folder name="%s" />""" % (
-						convertToXmlAttribute(someObject)
-						)
-			elif os.path.isfile(someObjectPath):
-				size = os.path.getsize(someObjectPath)
-				files += """<File name="%s" size="%s" />""" % (
-						convertToXmlAttribute(someObject),
-						os.path.getsize(someObjectPath)
-						)
-		# Close the folders / files node
-		folders += """</Folders>"""
-		files += """</Files>"""
-		return folders + files
-
-class CreateFolderCommandMixin (object):
-	def createFolder(self, resourceType, currentFolder):
-		"""
-		Purpose: command to create a new folder
-		"""
-		errorNo = 0; errorMsg ='';
-		if self.request.has_key("NewFolderName"):
-			newFolder = self.request.get("NewFolderName", None)
-			newFolder = sanitizeFolderName (newFolder)
-			try:
-				newFolderPath = mapServerFolder(self.userFilesFolder, combinePaths(currentFolder, newFolder))
-				self.createServerFolder(newFolderPath)
-			except Exception, e:
-				errorMsg = str(e).decode('iso-8859-1').encode('utf-8') # warning with encodigns!!!
-				if hasattr(e,'errno'):
-					if e.errno==17: #file already exists
-						errorNo=0
-					elif e.errno==13: # permission denied
-						errorNo = 103
-					elif e.errno==36 or e.errno==2 or e.errno==22: # filename too long / no such file / invalid name
-						errorNo = 102
-				else:
-					errorNo = 110
-		else:
-			errorNo = 102
-		return self.sendErrorNode ( errorNo, errorMsg )
-
-	def createServerFolder(self, folderPath):
-		"Purpose: physically creates a folder on the server"
-		# No need to check if the parent exists, just create all hierachy
-
-		try:
-			permissions = Config.ChmodOnFolderCreate
-			if not permissions:
-				os.makedirs(folderPath)
-		except AttributeError: #ChmodOnFolderCreate undefined
-			permissions = 0755
-
-		if permissions:
-			oldumask = os.umask(0)
-			os.makedirs(folderPath,mode=0755)
-			os.umask( oldumask )
-
-class UploadFileCommandMixin (object):
-	def uploadFile(self, resourceType, currentFolder):
-		"""
-		Purpose: command to upload files to server (same as FileUpload)
-		"""
-		errorNo = 0
-		if self.request.has_key("NewFile"):
-			# newFile has all the contents we need
-			newFile = self.request.get("NewFile", "")
-			# Get the file name
-			newFileName = newFile.filename
-			newFileName = sanitizeFileName( newFileName )
-			newFileNameOnly = removeExtension(newFileName)
-			newFileExtension = getExtension(newFileName).lower()
-			allowedExtensions = Config.AllowedExtensions[resourceType]
-			deniedExtensions = Config.DeniedExtensions[resourceType]
-
-			if (allowedExtensions):
-				# Check for allowed
-				isAllowed = False
-				if (newFileExtension in allowedExtensions):
-					isAllowed = True
-			elif (deniedExtensions):
-				# Check for denied
-				isAllowed = True
-				if (newFileExtension in deniedExtensions):
-					isAllowed = False
-			else:
-				# No extension limitations
-				isAllowed = True
-
-			if (isAllowed):
-				# Upload to operating system
-				# Map the virtual path to the local server path
-				currentFolderPath = mapServerFolder(self.userFilesFolder, currentFolder)
-				i = 0
-				while (True):
-					newFilePath = os.path.join (currentFolderPath,newFileName)
-					if os.path.exists(newFilePath):
-						i += 1
-						newFileName = "%s(%04d).%s" % (
-								newFileNameOnly, i, newFileExtension
-								)
-						errorNo= 201 # file renamed
-					else:
-						# Read file contents and write to the desired path (similar to php's move_uploaded_file)
-						fout = file(newFilePath, 'wb')
-						while (True):
-							chunk = newFile.file.read(100000)
-							if not chunk: break
-							fout.write (chunk)
-						fout.close()
-
-						if os.path.exists ( newFilePath ):
-							doChmod = False
-							try:
-								doChmod = Config.ChmodOnUpload
-								permissions = Config.ChmodOnUpload
-							except AttributeError: #ChmodOnUpload undefined
-								doChmod = True
-								permissions = 0755
-							if ( doChmod ):
-								oldumask = os.umask(0)
-								os.chmod( newFilePath, permissions )
-								os.umask( oldumask )
-
-						newFileUrl = self.webUserFilesFolder + currentFolder + newFileName
-
-						return self.sendUploadResults( errorNo , newFileUrl, newFileName )
-			else:
-				return self.sendUploadResults( errorNo = 203, customMsg = "Extension not allowed" )
-		else:
-			return self.sendUploadResults( errorNo = 202, customMsg = "No File" )
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckconnector.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckconnector.py
deleted file mode 100644
index 329aec941f..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckconnector.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
-- GNU General Public License Version 2 or later (the "GPL")
-http://www.gnu.org/licenses/gpl.html
-
-- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-http://www.gnu.org/licenses/lgpl.html
-
-- Mozilla Public License Version 1.1 or later (the "MPL")
-http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Base Connector for Python (CGI and WSGI).
-
-See config.py for configuration settings
-
-"""
-import cgi, os
-
-from fckutil import *
-from fckcommands import * 	# default command's implementation
-from fckoutput import * 	# base http, xml and html output mixins
-import config as Config
-
-class FCKeditorConnectorBase( object ):
-	"The base connector class. Subclass it to extend functionality (see Zope example)"
-
-	def __init__(self, environ=None):
-		"Constructor: Here you should parse request fields, initialize variables, etc."
-		self.request = FCKeditorRequest(environ) # Parse request
-		self.headers = []						# Clean Headers
-		if environ:
-			self.environ = environ
-		else:
-			self.environ = os.environ
-
-	# local functions
-
-	def setHeader(self, key, value):
-		self.headers.append ((key, value))
-		return
-
-class FCKeditorRequest(object):
-	"A wrapper around the request object"
-	def __init__(self, environ):
-		if environ: # WSGI
-			self.request = cgi.FieldStorage(fp=environ['wsgi.input'],
-							environ=environ,
-							keep_blank_values=1)
-			self.environ = environ
-		else: # plain old cgi
-			self.environ = os.environ
-			self.request = cgi.FieldStorage()
-		if 'REQUEST_METHOD' in self.environ and 'QUERY_STRING' in self.environ:
-			if self.environ['REQUEST_METHOD'].upper()=='POST':
-				# we are in a POST, but GET query_string exists
-				# cgi parses by default POST data, so parse GET QUERY_STRING too
-				self.get_request = cgi.FieldStorage(fp=None,
-							environ={
-							'REQUEST_METHOD':'GET',
-							'QUERY_STRING':self.environ['QUERY_STRING'],
-							},
-							)
-		else:
-			self.get_request={}
-
-	def has_key(self, key):
-		return self.request.has_key(key) or self.get_request.has_key(key)
-
-	def get(self, key, default=None):
-		if key in self.request.keys():
-			field = self.request[key]
-		elif key in self.get_request.keys():
-			field = self.get_request[key]
-		else:
-			return default
-		if hasattr(field,"filename") and field.filename: #file upload, do not convert return value
-			return field
-		else:
-			return field.value
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckoutput.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckoutput.py
deleted file mode 100644
index 12bcc0463f..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckoutput.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
-- GNU General Public License Version 2 or later (the "GPL")
-http://www.gnu.org/licenses/gpl.html
-
-- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-http://www.gnu.org/licenses/lgpl.html
-
-- Mozilla Public License Version 1.1 or later (the "MPL")
-http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Connector for Python (CGI and WSGI).
-
-"""
-
-from time import gmtime, strftime
-import string
-
-def escape(text, replace=string.replace):
-	"""
-	Converts the special characters '<', '>', and '&'.
-
-	RFC 1866 specifies that these characters be represented
-	in HTML as &lt; &gt; and &amp; respectively. In Python
-	1.5 we use the new string.replace() function for speed.
-	"""
-	text = replace(text, '&', '&amp;') # must be done 1st
-	text = replace(text, '<', '&lt;')
-	text = replace(text, '>', '&gt;')
-	text = replace(text, '"', '&quot;')
-	return text
-
-def convertToXmlAttribute(value):
-	if (value is None):
-		value = ""
-	return escape(value)
-
-class BaseHttpMixin(object):
-	def setHttpHeaders(self, content_type='text/xml'):
-		"Purpose: to prepare the headers for the xml to return"
-		# Prevent the browser from caching the result.
-		# Date in the past
-		self.setHeader('Expires','Mon, 26 Jul 1997 05:00:00 GMT')
-		# always modified
-		self.setHeader('Last-Modified',strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime()))
-		# HTTP/1.1
-		self.setHeader('Cache-Control','no-store, no-cache, must-revalidate')
-		self.setHeader('Cache-Control','post-check=0, pre-check=0')
-		# HTTP/1.0
-		self.setHeader('Pragma','no-cache')
-
-		# Set the response format.
-		self.setHeader( 'Content-Type', content_type + '; charset=utf-8' )
-		return
-
-class BaseXmlMixin(object):
-	def createXmlHeader(self, command, resourceType, currentFolder, url):
-		"Purpose: returns the xml header"
-		self.setHttpHeaders()
-		# Create the XML document header
-		s =  """<?xml version="1.0" encoding="utf-8" ?>"""
-		# Create the main connector node
-		s += """<Connector command="%s" resourceType="%s">""" % (
-				command,
-				resourceType
-				)
-		# Add the current folder node
-		s += """<CurrentFolder path="%s" url="%s" />""" % (
-				convertToXmlAttribute(currentFolder),
-				convertToXmlAttribute(url),
-				)
-		return s
-
-	def createXmlFooter(self):
-		"Purpose: returns the xml footer"
-		return """</Connector>"""
-
-	def sendError(self, number, text):
-		"Purpose: in the event of an error, return an xml based error"
-		self.setHttpHeaders()
-		return ("""<?xml version="1.0" encoding="utf-8" ?>""" +
-				"""<Connector>""" +
-				self.sendErrorNode (number, text) +
-				"""</Connector>""" )
-
-	def sendErrorNode(self, number, text):
-		return """<Error number="%s" text="%s" />""" % (number, convertToXmlAttribute(text))
-
-class BaseHtmlMixin(object):
-	def sendUploadResults( self, errorNo = 0, fileUrl = '', fileName = '', customMsg = '' ):
-		self.setHttpHeaders("text/html")
-		"This is the function that sends the results of the uploading process"
-
-		"Minified version of the document.domain automatic fix script (#1919)."
-		"The original script can be found at _dev/domain_fix_template.js"
-		return """<script type="text/javascript">
-			(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
-
-			window.parent.OnUploadCompleted(%(errorNumber)s,"%(fileUrl)s","%(fileName)s","%(customMsg)s");
-			</script>""" % {
-			'errorNumber': errorNo,
-			'fileUrl': fileUrl.replace ('"', '\\"'),
-			'fileName': fileName.replace ( '"', '\\"' ) ,
-			'customMsg': customMsg.replace ( '"', '\\"' ),
-			}
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckutil.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckutil.py
deleted file mode 100644
index eac508d468..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/fckutil.py
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
-- GNU General Public License Version 2 or later (the "GPL")
-http://www.gnu.org/licenses/gpl.html
-
-- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-http://www.gnu.org/licenses/lgpl.html
-
-- Mozilla Public License Version 1.1 or later (the "MPL")
-http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Utility functions for the File Manager Connector for Python
-
-"""
-
-import string, re
-import os
-import config as Config
-
-# Generic manipulation functions
-
-def removeExtension(fileName):
-	index = fileName.rindex(".")
-	newFileName = fileName[0:index]
-	return newFileName
-
-def getExtension(fileName):
-	index = fileName.rindex(".") + 1
-	fileExtension = fileName[index:]
-	return fileExtension
-
-def removeFromStart(string, char):
-	return string.lstrip(char)
-
-def removeFromEnd(string, char):
-	return string.rstrip(char)
-
-# Path functions
-
-def combinePaths( basePath, folder ):
-	return removeFromEnd( basePath, '/' ) + '/' + removeFromStart( folder, '/' )
-
-def getFileName(filename):
-	" Purpose: helper function to extrapolate the filename "
-	for splitChar in ["/", "\\"]:
-		array = filename.split(splitChar)
-		if (len(array) > 1):
-			filename = array[-1]
-	return filename
-
-def sanitizeFolderName( newFolderName ):
-	"Do a cleanup of the folder name to avoid possible problems"
-	# Remove . \ / | : ? * " < > and control characters
-	return re.sub( '(?u)\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]', '_', newFolderName )
-
-def sanitizeFileName( newFileName ):
-	"Do a cleanup of the file name to avoid possible problems"
-	# Replace dots in the name with underscores (only one dot can be there... security issue).
-	if ( Config.ForceSingleExtension ): # remove dots
-		newFileName = re.sub ( '/\\.(?![^.]*$)/', '_', newFileName ) ;
-	newFileName = newFileName.replace('\\','/')		# convert windows to unix path
-	newFileName = os.path.basename (newFileName)	# strip directories
-	# Remove \ / | : ? *
-	return re.sub ( '(?u)/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]/', '_', newFileName )
-
-def getCurrentFolder(currentFolder):
-	if not currentFolder:
-		currentFolder = '/'
-
-	# Check the current folder syntax (must begin and end with a slash).
-	if (currentFolder[-1] <> "/"):
-		currentFolder += "/"
-	if (currentFolder[0] <> "/"):
-		currentFolder = "/" + currentFolder
-
-	# Ensure the folder path has no double-slashes
-	while '//' in currentFolder:
-		currentFolder = currentFolder.replace('//','/')
-
-	# Check for invalid folder paths (..)
-	if '..' in currentFolder or '\\' in currentFolder:
-		return None
-
-	return currentFolder
-
-def mapServerPath( environ, url):
-	" Emulate the asp Server.mapPath function. Given an url path return the physical directory that it corresponds to "
-	# This isn't correct but for the moment there's no other solution
-	# If this script is under a virtual directory or symlink it will detect the problem and stop
-	return combinePaths( getRootPath(environ), url )
-
-def mapServerFolder(resourceTypePath, folderPath):
-	return combinePaths ( resourceTypePath  , folderPath )
-
-def getRootPath(environ):
-	"Purpose: returns the root path on the server"
-	# WARNING: this may not be thread safe, and doesn't work w/ VirtualServer/mod_python
-	# Use Config.UserFilesAbsolutePath instead
-
-	if environ.has_key('DOCUMENT_ROOT'):
-		return environ['DOCUMENT_ROOT']
-	else:
-		realPath = os.path.realpath( './' )
-		selfPath = environ['SCRIPT_FILENAME']
-		selfPath = selfPath [ :  selfPath.rfind( '/'  ) ]
-		selfPath = selfPath.replace( '/', os.path.sep)
-
-		position = realPath.find(selfPath)
-
-		# This can check only that this script isn't run from a virtual dir
-		# But it avoids the problems that arise if it isn't checked
-		raise realPath
-		if ( position < 0 or position <> len(realPath) - len(selfPath) or realPath[ : position ]==''):
-			raise Exception('Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/py/config.py".')
-		return realPath[ : position ]
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/htaccess.txt b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/htaccess.txt
deleted file mode 100644
index 82374196a9..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/htaccess.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# replace the name of this file to .htaccess (if using apache),
-# and set the proper options and paths according your enviroment
-
-Allow from all
-
-# If using mod_python uncomment this:
-PythonPath "[r'C:\Archivos de programa\Apache Software Foundation\Apache2.2\htdocs\fckeditor\editor\filemanager\connectors\py'] + sys.path"
-
-
-# Recomended: WSGI application running with mod_python and modpython_gateway
-SetHandler python-program
-PythonHandler modpython_gateway::handler
-PythonOption wsgi.application wsgi::App
-
-
-# Emulated CGI with mod_python and cgihandler
-#AddHandler mod_python .py
-#PythonHandler mod_python.cgihandler
-
-
-# Plain old CGI
-#Options +ExecCGI
-#AddHandler cgi-script py
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/upload.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/upload.py
deleted file mode 100644
index db5a5ab1a3..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/upload.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
-- GNU General Public License Version 2 or later (the "GPL")
-http://www.gnu.org/licenses/gpl.html
-
-- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-http://www.gnu.org/licenses/lgpl.html
-
-- Mozilla Public License Version 1.1 or later (the "MPL")
-http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-This is the "File Uploader" for Python
-
-"""
-import os
-
-from fckutil import *
-from fckcommands import * 	# default command's implementation
-from fckconnector import FCKeditorConnectorBase # import base connector
-import config as Config
-
-class FCKeditorQuickUpload(	FCKeditorConnectorBase,
-							UploadFileCommandMixin,
-							BaseHttpMixin, BaseHtmlMixin):
-	def doResponse(self):
-		"Main function. Process the request, set headers and return a string as response."
-		# Check if this connector is disabled
-		if not(Config.Enabled):
-			return self.sendUploadResults(1, "This file uploader is disabled. Please check the \"editor/filemanager/connectors/py/config.py\"")
-		command = 'QuickUpload'
-		# The file type (from the QueryString, by default 'File').
-		resourceType  = self.request.get('Type','File')
-		currentFolder = getCurrentFolder(self.request.get("CurrentFolder",""))
-		# Check for invalid paths
-		if currentFolder is None:
-			return self.sendUploadResults(102, '', '', "")
-
-		# Check if it is an allowed command
-		if ( not command in Config.ConfigAllowedCommands ):
-			return self.sendUploadResults( 1, '', '', 'The %s command isn\'t allowed' % command )
-
-		if ( not resourceType in Config.ConfigAllowedTypes  ):
-			return self.sendUploadResults( 1, '', '', 'Invalid type specified' )
-
-		# Setup paths
-		self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType]
-		self.webUserFilesFolder =  Config.QuickUploadPath[resourceType]
-		if not self.userFilesFolder: # no absolute path given (dangerous...)
-			self.userFilesFolder = mapServerPath(self.environ,
-									self.webUserFilesFolder)
-
-		# Ensure that the directory exists.
-		if not os.path.exists(self.userFilesFolder):
-			try:
-				self.createServerFoldercreateServerFolder( self.userFilesFolder )
-			except:
-				return self.sendError(1, "This connector couldn\'t access to local user\'s files directories.  Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ")
-
-		# File upload doesn't have to return XML, so intercept here
-		return self.uploadFile(resourceType, currentFolder)
-
-# Running from command line (plain old CGI)
-if __name__ == '__main__':
-	try:
-		# Create a Connector Instance
-		conn = FCKeditorQuickUpload()
-		data = conn.doResponse()
-		for header in conn.headers:
-			if not header is None:
-				print '%s: %s' % header
-		print
-		print data
-	except:
-		print "Content-Type: text/plain"
-		print
-		import cgi
-		cgi.print_exception()
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/wsgi.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/wsgi.py
deleted file mode 100644
index 9b6c432043..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/wsgi.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Connector/QuickUpload for Python (WSGI wrapper).
-
-See config.py for configuration settings
-
-"""
-
-from connector import FCKeditorConnector
-from upload import FCKeditorQuickUpload
-
-import cgitb
-from cStringIO import StringIO
-
-# Running from WSGI capable server (recomended)
-def App(environ, start_response):
-	"WSGI entry point. Run the connector"
-	if environ['SCRIPT_NAME'].endswith("connector.py"):
-		conn = FCKeditorConnector(environ)
-	elif environ['SCRIPT_NAME'].endswith("upload.py"):
-		conn = FCKeditorQuickUpload(environ)
-	else:
-		start_response ("200 Ok", [('Content-Type','text/html')])
-		yield "Unknown page requested: "
-		yield environ['SCRIPT_NAME']
-		return
-	try:
-		# run the connector
-		data = conn.doResponse()
-		# Start WSGI response:
-		start_response ("200 Ok", conn.headers)
-		# Send response text
-		yield data
-	except:
-		start_response("500 Internal Server Error",[("Content-type","text/html")])
-		file = StringIO()
-		cgitb.Hook(file = file).handle()
-		yield file.getvalue()
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/zope.py b/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/zope.py
deleted file mode 100644
index ed0d5f4528..0000000000
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/py/zope.py
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env python
-
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
-- GNU General Public License Version 2 or later (the "GPL")
-http://www.gnu.org/licenses/gpl.html
-
-- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-http://www.gnu.org/licenses/lgpl.html
-
-- Mozilla Public License Version 1.1 or later (the "MPL")
-http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-Connector for Python and Zope.
-
-This code was not tested at all.
-It just was ported from pre 2.5 release, so for further reference see
-\editor\filemanager\browser\default\connectors\py\connector.py in previous
-releases.
-
-"""
-
-from fckutil import *
-from connector import *
-import config as Config
-
-class FCKeditorConnectorZope(FCKeditorConnector):
-	"""
-	Zope versiof FCKeditorConnector
-	"""
-	# Allow access (Zope)
-	__allow_access_to_unprotected_subobjects__ = 1
-
-	def __init__(self, context=None):
-		"""
-		Constructor
-		"""
-		FCKeditorConnector.__init__(self, environ=None) # call superclass constructor
-		# Instance Attributes
-		self.context = context
-		self.request = FCKeditorRequest(context)
-
-	def getZopeRootContext(self):
-		if self.zopeRootContext is None:
-			self.zopeRootContext = self.context.getPhysicalRoot()
-		return self.zopeRootContext
-
-	def getZopeUploadContext(self):
-		if self.zopeUploadContext is None:
-			folderNames = self.userFilesFolder.split("/")
-			c = self.getZopeRootContext()
-			for folderName in folderNames:
-				if (folderName <> ""):
-					c = c[folderName]
-			self.zopeUploadContext = c
-		return self.zopeUploadContext
-
-	def setHeader(self, key, value):
-		self.context.REQUEST.RESPONSE.setHeader(key, value)
-
-	def getFolders(self, resourceType, currentFolder):
-		# Open the folders node
-		s = ""
-		s += """<Folders>"""
-		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
-		for (name, o) in zopeFolder.objectItems(["Folder"]):
-			s += """<Folder name="%s" />""" % (
-					convertToXmlAttribute(name)
-					)
-		# Close the folders node
-		s += """</Folders>"""
-		return s
-
-	def getZopeFoldersAndFiles(self, resourceType, currentFolder):
-		folders = self.getZopeFolders(resourceType, currentFolder)
-		files = self.getZopeFiles(resourceType, currentFolder)
-		s = folders + files
-		return s
-
-	def getZopeFiles(self, resourceType, currentFolder):
-		# Open the files node
-		s = ""
-		s += """<Files>"""
-		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
-		for (name, o) in zopeFolder.objectItems(["File","Image"]):
-			s += """<File name="%s" size="%s" />""" % (
-					convertToXmlAttribute(name),
-					((o.get_size() / 1024) + 1)
-					)
-		# Close the files node
-		s += """</Files>"""
-		return s
-
-	def findZopeFolder(self, resourceType, folderName):
-		# returns the context of the resource / folder
-		zopeFolder = self.getZopeUploadContext()
-		folderName = self.removeFromStart(folderName, "/")
-		folderName = self.removeFromEnd(folderName, "/")
-		if (resourceType <> ""):
-			try:
-				zopeFolder = zopeFolder[resourceType]
-			except:
-				zopeFolder.manage_addProduct["OFSP"].manage_addFolder(id=resourceType, title=resourceType)
-				zopeFolder = zopeFolder[resourceType]
-		if (folderName <> ""):
-			folderNames = folderName.split("/")
-			for folderName in folderNames:
-				zopeFolder = zopeFolder[folderName]
-		return zopeFolder
-
-	def createFolder(self, resourceType, currentFolder):
-		# Find out where we are
-		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
-		errorNo = 0
-		errorMsg = ""
-		if self.request.has_key("NewFolderName"):
-			newFolder = self.request.get("NewFolderName", None)
-			zopeFolder.manage_addProduct["OFSP"].manage_addFolder(id=newFolder, title=newFolder)
-		else:
-			errorNo = 102
-		return self.sendErrorNode ( errorNo, errorMsg )
-
-	def uploadFile(self, resourceType, currentFolder, count=None):
-		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
-		file = self.request.get("NewFile", None)
-		fileName = self.getFileName(file.filename)
-		fileNameOnly = self.removeExtension(fileName)
-		fileExtension = self.getExtension(fileName).lower()
-		if (count):
-			nid = "%s.%s.%s" % (fileNameOnly, count, fileExtension)
-		else:
-			nid = fileName
-		title = nid
-		try:
-			zopeFolder.manage_addProduct['OFSP'].manage_addFile(
-					id=nid,
-					title=title,
-					file=file.read()
-					)
-		except:
-			if (count):
-				count += 1
-			else:
-				count = 1
-			return self.zopeFileUpload(resourceType, currentFolder, count)
-		return self.sendUploadResults( 0 )
-
-class FCKeditorRequest(object):
-	"A wrapper around the request object"
-	def __init__(self, context=None):
-		r = context.REQUEST
-		self.request = r
-
-	def has_key(self, key):
-		return self.request.has_key(key)
-
-	def get(self, key, default=None):
-		return self.request.get(key, default)
-
-"""
-Running from zope, you will need to modify this connector.
-If you have uploaded the FCKeditor into Zope (like me), you need to
-move this connector out of Zope, and replace the "connector" with an
-alias as below.  The key to it is to pass the Zope context in, as
-we then have a like to the Zope context.
-
-## Script (Python) "connector.py"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=*args, **kws
-##title=ALIAS
-##
-
-import Products.zope as connector
-return connector.FCKeditorConnectorZope(context=context).doResponse()
-"""
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/test.html b/phpgwapi/js/fckeditor/editor/filemanager/connectors/test.html
index 14e5470735..fc160318e2 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/test.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/test.html
@@ -1,6 +1,6 @@
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/filemanager/connectors/uploadtest.html b/phpgwapi/js/fckeditor/editor/filemanager/connectors/uploadtest.html
index 16d4ba4962..c5bc8e2fb4 100644
--- a/phpgwapi/js/fckeditor/editor/filemanager/connectors/uploadtest.html
+++ b/phpgwapi/js/fckeditor/editor/filemanager/connectors/uploadtest.html
@@ -1,6 +1,6 @@
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/js/fckadobeair.js b/phpgwapi/js/fckeditor/editor/js/fckadobeair.js
index abc454eaeb..c44a3bf139 100644
--- a/phpgwapi/js/fckeditor/editor/js/fckadobeair.js
+++ b/phpgwapi/js/fckeditor/editor/js/fckadobeair.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js
index aac77c080c..5bc77fb351 100644
--- a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -23,27 +23,27 @@
  */
 
 var FCK_STATUS_NOTLOADED=window.parent.FCK_STATUS_NOTLOADED=0;var FCK_STATUS_ACTIVE=window.parent.FCK_STATUS_ACTIVE=1;var FCK_STATUS_COMPLETE=window.parent.FCK_STATUS_COMPLETE=2;var FCK_TRISTATE_OFF=window.parent.FCK_TRISTATE_OFF=0;var FCK_TRISTATE_ON=window.parent.FCK_TRISTATE_ON=1;var FCK_TRISTATE_DISABLED=window.parent.FCK_TRISTATE_DISABLED=-1;var FCK_UNKNOWN=window.parent.FCK_UNKNOWN=-9;var FCK_TOOLBARITEM_ONLYICON=window.parent.FCK_TOOLBARITEM_ONLYICON=0;var FCK_TOOLBARITEM_ONLYTEXT=window.parent.FCK_TOOLBARITEM_ONLYTEXT=1;var FCK_TOOLBARITEM_ICONTEXT=window.parent.FCK_TOOLBARITEM_ICONTEXT=2;var FCK_EDITMODE_WYSIWYG=window.parent.FCK_EDITMODE_WYSIWYG=0;var FCK_EDITMODE_SOURCE=window.parent.FCK_EDITMODE_SOURCE=1;var FCK_IMAGES_PATH='images/';var FCK_SPACER_PATH='images/spacer.gif';var CTRL=1000;var SHIFT=2000;var ALT=4000;var FCK_STYLE_BLOCK=0;var FCK_STYLE_INLINE=1;var FCK_STYLE_OBJECT=2;
-String.prototype.Contains=function(A){return (this.indexOf(A)>-1);};String.prototype.Equals=function(){var A=arguments;if (A.length==1&&A[0].pop) A=A[0];for (var i=0;i<A.length;i++){if (this==A[i]) return true;};return false;};String.prototype.IEquals=function(){var A=this.toUpperCase();var B=arguments;if (B.length==1&&B[0].pop) B=B[0];for (var i=0;i<B.length;i++){if (A==B[i].toUpperCase()) return true;};return false;};String.prototype.ReplaceAll=function(A,B){var C=this;for (var i=0;i<A.length;i++){C=C.replace(A[i],B[i]);};return C;};String.prototype.StartsWith=function(A){return (this.substr(0,A.length)==A);};String.prototype.EndsWith=function(A,B){var C=this.length;var D=A.length;if (D>C) return false;if (B){var E=new RegExp(A+'$','i');return E.test(this);}else return (D==0||this.substr(C-D,D)==A);};String.prototype.Remove=function(A,B){var s='';if (A>0) s=this.substring(0,A);if (A+B<this.length) s+=this.substring(A+B,this.length);return s;};String.prototype.Trim=function(){return this.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g,'');};String.prototype.LTrim=function(){return this.replace(/^[ \t\n\r]*/g,'');};String.prototype.RTrim=function(){return this.replace(/[ \t\n\r]*$/g,'');};String.prototype.ReplaceNewLineChars=function(A){return this.replace(/\n/g,A);};String.prototype.Replace=function(A,B,C){if (typeof B=='function'){return this.replace(A,function(){return B.apply(C||this,arguments);});}else return this.replace(A,B);};Array.prototype.AddItem=function(A){var i=this.length;this[i]=A;return i;};Array.prototype.IndexOf=function(A){for (var i=0;i<this.length;i++){if (this[i]==A) return i;};return-1;};
+String.prototype.Contains=function(A){return (this.indexOf(A)>-1);};String.prototype.Equals=function(){var A=arguments;if (A.length==1&&A[0].pop) A=A[0];for (var i=0;i<A.length;i++){if (this==A[i]) return true;};return false;};String.prototype.IEquals=function(){var A=this.toUpperCase();var B=arguments;if (B.length==1&&B[0].pop) B=B[0];for (var i=0;i<B.length;i++){if (A==B[i].toUpperCase()) return true;};return false;};String.prototype.ReplaceAll=function(A,B){var C=this;for (var i=0;i<A.length;i++){C=C.replace(A[i],B[i]);};return C;};String.prototype.StartsWith=function(A){return (this.substr(0,A.length)==A);};String.prototype.EndsWith=function(A,B){var C=this.length;var D=A.length;if (D>C) return false;if (B){var E=new RegExp(A+'$','i');return E.test(this);}else return (D==0||this.substr(C-D,D)==A);};String.prototype.Remove=function(A,B){var s='';if (A>0) s=this.substring(0,A);if (A+B<this.length) s+=this.substring(A+B,this.length);return s;};String.prototype.Trim=function(){return this.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g,'');};String.prototype.LTrim=function(){return this.replace(/^[ \t\n\r]*/g,'');};String.prototype.RTrim=function(){return this.replace(/[ \t\n\r]*$/g,'');};String.prototype.ReplaceNewLineChars=function(A){return this.replace(/\n/g,A);};String.prototype.Replace=function(A,B,C){if (typeof B=='function'){return this.replace(A,function(){return B.apply(C||this,arguments);});}else return this.replace(A,B);};Array.prototype.IndexOf=function(A){for (var i=0;i<this.length;i++){if (this[i]==A) return i;};return-1;};
 var s=navigator.userAgent.toLowerCase();var FCKBrowserInfo={IsIE:/*@cc_on!@*/false,IsIE7:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=7),IsIE6:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=6),IsSafari:s.Contains(' applewebkit/'),IsOpera:!!window.opera,IsAIR:s.Contains(' adobeair/'),IsMac:s.Contains('macintosh')};(function(A){A.IsGecko=(navigator.product=='Gecko')&&!A.IsSafari&&!A.IsOpera;A.IsGeckoLike=(A.IsGecko||A.IsSafari||A.IsOpera);if (A.IsGecko){var B=s.match(/rv:(\d+\.\d+)/);var C=B&&parseFloat(B[1]);if (C){A.IsGecko10=(C<1.8);A.IsGecko19=(C>1.8);}}})(FCKBrowserInfo);
 var FCKURLParams={};(function(){var A=document.location.search.substr(1).split('&');for (var i=0;i<A.length;i++){var B=A[i].split('=');var C=decodeURIComponent(B[0]);var D=decodeURIComponent(B[1]);FCKURLParams[C]=D;}})();
 var FCKEvents=function(A){this.Owner=A;this._RegisteredEvents={};};FCKEvents.prototype.AttachEvent=function(A,B){var C;if (!(C=this._RegisteredEvents[A])) this._RegisteredEvents[A]=[B];else{if (C.IndexOf(B)==-1) C.push(B);}};FCKEvents.prototype.FireEvent=function(A,B){var C=true;var D=this._RegisteredEvents[A];if (D){for (var i=0;i<D.length;i++){try{C=(D[i](this.Owner,B)&&C);}catch(e){if (e.number!=-2146823277) throw e;}}};return C;};
 var FCKDataProcessor=function(){};FCKDataProcessor.prototype={ConvertToHtml:function(A){if (FCKConfig.FullPage){FCK.DocTypeDeclaration=A.match(FCKRegexLib.DocTypeTag);if (!FCKRegexLib.HasBodyTag.test(A)) A='<body>'+A+'</body>';if (!FCKRegexLib.HtmlOpener.test(A)) A='<html dir="'+FCKConfig.ContentLangDirection+'">'+A+'</html>';if (!FCKRegexLib.HeadOpener.test(A)) A=A.replace(FCKRegexLib.HtmlOpener,'$&<head><title></title></head>');return A;}else{var B=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"';if (FCKBrowserInfo.IsIE&&FCKConfig.DocType.length>0&&!FCKRegexLib.Html4DocType.test(FCKConfig.DocType)) B+=' style="overflow-y: scroll"';B+='><head><title></title></head><body'+FCKConfig.GetBodyAttributes()+'>'+A+'</body></html>';return B;}},ConvertToDataFormat:function(A,B,C,D){var E=FCKXHtml.GetXHTML(A,!B,D);if (C&&FCKRegexLib.EmptyOutParagraph.test(E)) return '';return E;},FixHtml:function(A){return A;}};
-var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,DataProcessor:new FCKDataProcessor(),GetInstanceObject:(function(){var w=window;return function(name){return w[name];}})(),AttachToOnSelectionChange:function(A){this.Events.AttachEvent('OnSelectionChange',A);},GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else{if (!this.EditorDocument) return false;return (this.StartupValue!=this.EditorDocument.body.innerHTML);}},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};A.SetKeystrokes([CTRL+8,true]);this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=FCKConfig.FirefoxSpellChecker;this.SetData(this.GetLinkedFieldValue(),true);FCKTools.AddEventListener(document,"keydown",this._TabKeyHandler);this.AttachToOnSelectionChange(_FCK_PaddingNodeListener);if (FCKBrowserInfo.IsGecko) this.AttachToOnSelectionChange(this._ExecCheckEmptyBlock);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:var G=D.nodeName.toLowerCase();if (!FCKListsLib.BlockElements[G]&&G!='li'&&!D.getAttribute('_fckfakelement')&&D.getAttribute('_moz_dirty')==null) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;break;case 8:if (E) F=true;break;};if (F){var H=D.parentNode;if (!E) E=H.insertBefore(B.createElement(A),D);E.appendChild(H.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetData:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B=FCK.EditorDocument;if (!B) return null;var C=FCKConfig.FullPage;var D=FCK.DataProcessor.ConvertToDataFormat(C?B.documentElement:B.body,!C,FCKConfig.IgnoreEmptyParagraphValue,A);D=FCK.ProtectEventsRestore(D);if (FCKBrowserInfo.IsIE) D=D.replace(FCKRegexLib.ToReplace,'$1');if (C){if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) D=FCK.DocTypeDeclaration+'\n'+D;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) D=FCK.XmlDeclaration+'\n'+D;};return FCKConfig.ProtectedSource.Revert(D);},UpdateLinkedField:function(){var A=FCK.GetXHTML(FCKConfig.FormatOutput);if (FCKConfig.HtmlEncodeOutput) A=FCKTools.HTMLEncode(A);FCK.LinkedField.value=A;FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName.toUpperCase()];if (B){for (var i=0;i<B.length;i++) B[i](A);};B=FCK.RegisteredDoubleClickHandlers['*'];if (B){for (var i=0;i<B.length;i++) B[i](A);}},RegisterDoubleClickHandler:function(A,B){var C=B||'*';C=C.toUpperCase();var D;if (!(D=FCK.RegisteredDoubleClickHandlers[C])) FCK.RegisteredDoubleClickHandlers[C]=[A];else{if (D.IndexOf(A)==-1) D.push(A);}},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsArea,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR|XML|EMBED|OBJECT':'ABBR|XML|EMBED|OBJECT';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\\s|>|/)[\\s\\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetData:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCKBrowserInfo.IsIE&&FCK.EditorDocument){FCK.EditorDocument.detachEvent("onselectionchange",Doc_OnSelectionChange);};FCKTempBin.Reset();if (FCK.EditMode==0){this._ForceResetIsDirty=(B===true);A=FCKConfig.ProtectedSource.Protect(A);A=FCK.DataProcessor.ConvertToHtml(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) A=A.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);var C='';if (!FCKConfig.FullPage) C+=_FCK_GetEditorAreaStyleTags();if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+=FCKTools.GetStyleHtml(FCK_ShowTableBordersCSS,true);C+=FCKTools.GetStyleHtml(FCK_InternalCSS,true);A=A.replace(FCKRegexLib.HeadCloser,C+'$&');this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(A);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;FCKDomTools.PaddingNode=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C,D){if (!D) FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};if (!D) FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (FCKBrowserInfo.IsSafari&&FCK.EditorWindow&&A.IEquals('Paste')) return 0;if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else{return FCK.EditorDocument.queryCommandState(A)?1:0;}}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},Paste:function(A){if (FCK.Status!=2||!FCK.Events.FireEvent('OnPaste')) return false;return A||FCK._ExecPaste();},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) A=FCK.TempBaseTag+FCK.GetXHTML();else A=FCK.GetXHTML();}else{A=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body'+FCKConfig.GetBodyAttributes()+'>'+FCK.GetXHTML()+'</body></html>';};var B=FCKConfig.ScreenWidth*0.8;var C=FCKConfig.ScreenHeight*0.7;var D=(FCKConfig.ScreenWidth-B)/2;var E='';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A;E='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.opener._FCKHtmlToLoad );document.close() ;window.opener._FCKHtmlToLoad = null ;})() )';};var F=window.open(E,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+B+',height='+C+',left='+D);if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){F.document.write(A);F.document.close();}},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){FCKCommands.GetCommand('ShowBlocks').SaveState();if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (FCKBrowserInfo.IsIE) FCKTempBin.ToHtml();if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetData(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},InsertElement:function(A){if (typeof A=='string') A=this.EditorDocument.createElement(A);var B=A.nodeName.toLowerCase();FCKSelection.Restore();var C=new FCKDomRange(this.EditorWindow);C.MoveToSelection();C.DeleteContents();if (FCKListsLib.BlockElements[B]!=null){if (C.StartBlock){if (C.CheckStartOfBlock()) C.MoveToPosition(C.StartBlock,3);else if (C.CheckEndOfBlock()) C.MoveToPosition(C.StartBlock,4);else C.SplitBlock();};C.InsertNode(A);var D=FCKDomTools.GetNextSourceElement(A,false,null,['hr','br','param','img','area','input'],true);if (!D&&FCKConfig.EnterMode!='br'){D=this.EditorDocument.body.appendChild(this.EditorDocument.createElement(FCKConfig.EnterMode));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);};if (FCKListsLib.EmptyElements[B]==null) C.MoveToElementEditStart(A);else if (D) C.MoveToElementEditStart(D);else C.MoveToPosition(A,4);if (FCKBrowserInfo.IsGeckoLike){if (D) FCKDomTools.ScrollIntoView(D,false);FCKDomTools.ScrollIntoView(A,false);}}else{C.InsertNode(A);C.SetStart(A,4);C.SetEnd(A,4);};C.Select();C.Release();this.Focus();return A;},_InsertBlockElement:function(A){},_IsFunctionKey:function(A){if (A>=16&&A<=20) return true;if (A==27||(A>=33&&A<=40)) return true;if (A==45) return true;return false;},_KeyDownListener:function(A){if (!A) A=FCK.EditorWindow.event;if (FCK.EditorWindow){if (!FCK._IsFunctionKey(A.keyCode)&&!(A.ctrlKey||A.metaKey)&&!(A.keyCode==46)) FCK._KeyDownUndo();};return true;},_KeyDownUndo:function(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;FCKUndo.Changed=1;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}},_TabKeyHandler:function(A){if (!A) A=window.event;var B=A.keyCode;if (B==9&&FCK.EditMode!=0){if (FCKBrowserInfo.IsIE){var C=document.selection.createRange();if (C.parentElement()!=FCK.EditingArea.Textarea) return true;C.text='\t';C.select();}else{var a=[];var D=FCK.EditingArea.Textarea;var E=D.selectionStart;var F=D.selectionEnd;a.push(D.value.substr(0,E));a.push('\t');a.push(D.value.substr(F));D.value=a.join('');D.setSelectionRange(E+1,E+1);};if (A.preventDefault) return A.preventDefault();return A.returnValue=false;};return true;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML=FCK.GetData;FCK.SetHTML=FCK.SetData;FCK.InsertElementAndGetIt=FCK.CreateElement=FCK.InsertElement;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+encodeURIComponent(A)+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return decodeURIComponent(B);};function _FCK_MouseEventsListener(A){if (!A) A=window.event;if (A.type=='mousedown') FCK.MouseDownFlag=true;else if (A.type=='mouseup') FCK.MouseDownFlag=false;else if (A.type=='mousemove') FCK.Events.FireEvent('OnMouseMove',A);};function _FCK_PaddingNodeListener(){if (FCKConfig.EnterMode.IEquals('br')) return;FCKDomTools.EnforcePaddingNode(FCK.EditorDocument,FCKConfig.EnterMode);if (!FCKBrowserInfo.IsIE&&FCKDomTools.PaddingNode){var A=FCKSelection.GetSelection();if (A&&A.rangeCount==1){var B=A.getRangeAt(0);if (B.collapsed&&B.startContainer==FCK.EditorDocument.body&&B.startOffset==0){B.selectNodeContents(FCKDomTools.PaddingNode);B.collapse(true);A.removeAllRanges();A.addRange(B);}}}else if (FCKDomTools.PaddingNode){var C=FCKSelection.GetParentElement();var D=FCKDomTools.PaddingNode;if (C&&C.nodeName.IEquals('body')){if (FCK.EditorDocument.body.childNodes.length==1&&FCK.EditorDocument.body.firstChild==D){if (FCKSelection._GetSelectionDocument(FCK.EditorDocument.selection)!=FCK.EditorDocument) return;var B=FCK.EditorDocument.body.createTextRange();var F=false;if (!D.childNodes.firstChild){D.appendChild(FCKTools.GetElementDocument(D).createTextNode('\ufeff'));F=true;};B.moveToElementText(D);B.select();if (F) B.pasteHTML('');}}}};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;if (FCKBrowserInfo.IsIE) FCKTempBin.ToElements();FCK.InitializeBehaviors();FCK.MouseDownFlag=false;FCKTools.AddEventListener(FCK.EditorDocument,'mousemove',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mouseup',_FCK_MouseEventsListener);if (FCKBrowserInfo.IsSafari){var A=function(evt){if (!(evt.ctrlKey||evt.metaKey)) return;if (FCK.EditMode!=0) return;switch (evt.keyCode){case 89:FCKUndo.Redo();break;case 90:FCKUndo.Undo();break;}};FCKTools.AddEventListener(FCK.EditorDocument,'keyup',A);};FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode,FCKConfig.TabSpaces);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();FCKCommands.GetCommand('ShowBlocks').RestoreState();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){return FCKTools.GetStyleHtml(FCKConfig.EditorAreaCSS)+FCKTools.GetStyleHtml(FCKConfig.EditorAreaStyles);};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){switch (B){case 'Paste':return!FCK.Paste();case 'Cut':FCKUndo.SaveUndoStep();return false;}}else{if (B.Equals('Paste','Undo','Redo','SelectAll','Cut')) return false;};var C=FCK.Commands.GetCommand(B);if (C.GetState()==-1) return false;return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]=null;this.Elements.length=0;},ToHtml:function(){for (var i=0;i<this.Elements.length;i++){this.Elements[i]='<div>&nbsp;'+this.Elements[i].outerHTML+'</div>';this.Elements[i].isHtml=true;}},ToElements:function(){var A=FCK.EditorDocument.createElement('div');for (var i=0;i<this.Elements.length;i++){if (this.Elements[i].isHtml){A.innerHTML=this.Elements[i];this.Elements[i]=A.firstChild.removeChild(A.firstChild.lastChild);}}}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else if (FCKBrowserInfo.IsSafari) C=A;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){if (FCKFocusManager._IsFocusing) return;FCKFocusManager._IsFocusing=true;FCK.Focus();FCKFocusManager_Win_OnFocus();FCKTools.RunFunction(function(){delete FCKFocusManager._IsFocusing;});};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};(function(){var A=window.frameElement;var B=A.width;var C=A.height;if (/^\d+$/.test(B)) B+='px';if (/^\d+$/.test(C)) C+='px';var D=A.style;D.border=D.padding=D.margin=0;D.backgroundColor='transparent';D.backgroundImage='none';D.width=B;D.height=C;})();
-FCK.Description="FCKeditor for Gecko Browsers";FCK.InitializeBehaviors=function(){if (window.onresize) window.onresize();FCKFocusManager.AddWindow(this.EditorWindow);this.ExecOnSelectionChange=function(){FCK.Events.FireEvent("OnSelectionChange");};this._ExecDrop=function(evt){if (FCK.MouseDownFlag){FCK.MouseDownFlag=false;return;};if (FCKConfig.ForcePasteAsPlainText){if (evt.dataTransfer){var A=evt.dataTransfer.getData('Text');A=FCKTools.HTMLEncode(A);A=FCKTools.ProcessLineBreaks(window,FCKConfig,A);FCK.InsertHtml(A);}else if (FCKConfig.ShowDropDialog) FCK.PasteAsPlainText();evt.preventDefault();evt.stopPropagation();}};this._ExecCheckCaret=function(evt){if (FCK.EditMode!=0) return;if (evt.type=='keypress'){var B=evt.keyCode;if (B<33||B>40) return;};var C=function(H){if (H.nodeType!=1) return false;var D=H.tagName.toLowerCase();return (FCKListsLib.BlockElements[D]||FCKListsLib.EmptyElements[D]);};var E=function(){var F=FCKSelection.GetSelection();var G=F.getRangeAt(0);if (!G||!G.collapsed) return;var H=G.endContainer;if (H.nodeType!=3) return;if (H.nodeValue.length!=G.endOffset) return;var I=H.parentNode.tagName.toLowerCase();if (!(I=='a'||(!FCKBrowserInfo.IsOpera&&String(H.parentNode.contentEditable)=='false')||(!(FCKListsLib.BlockElements[I]||FCKListsLib.NonEmptyBlockElements[I])&&B==35))) return;var J=FCKTools.GetNextTextNode(H,H.parentNode,C);if (J) return;G=FCK.EditorDocument.createRange();J=FCKTools.GetNextTextNode(H,H.parentNode.parentNode,C);if (J){if (FCKBrowserInfo.IsOpera&&B==37) return;G.setStart(J,0);G.setEnd(J,0);}else{while (H.parentNode&&H.parentNode!=FCK.EditorDocument.body&&H.parentNode!=FCK.EditorDocument.documentElement&&H==H.parentNode.lastChild&&(!FCKListsLib.BlockElements[H.parentNode.tagName.toLowerCase()]&&!FCKListsLib.NonEmptyBlockElements[H.parentNode.tagName.toLowerCase()])) H=H.parentNode;if (FCKListsLib.BlockElements[I]||FCKListsLib.EmptyElements[I]||H==FCK.EditorDocument.body){G.setStart(H,H.childNodes.length);G.setEnd(H,H.childNodes.length);}else{var K=H.nextSibling;while (K){if (K.nodeType!=1){K=K.nextSibling;continue;};var L=K.tagName.toLowerCase();if (FCKListsLib.BlockElements[L]||FCKListsLib.EmptyElements[L]||FCKListsLib.NonEmptyBlockElements[L]) break;K=K.nextSibling;};var M=FCK.EditorDocument.createTextNode('');if (K) H.parentNode.insertBefore(M,K);else H.parentNode.appendChild(M);G.setStart(M,0);G.setEnd(M,0);}};F.removeAllRanges();F.addRange(G);FCK.Events.FireEvent("OnSelectionChange");};setTimeout(E,1);};this.ExecOnSelectionChangeTimer=function(){if (FCK.LastOnChangeTimer) window.clearTimeout(FCK.LastOnChangeTimer);FCK.LastOnChangeTimer=window.setTimeout(FCK.ExecOnSelectionChange,100);};this.EditorDocument.addEventListener('mouseup',this.ExecOnSelectionChange,false);this.EditorDocument.addEventListener('keyup',this.ExecOnSelectionChangeTimer,false);this._DblClickListener=function(e){FCK.OnDoubleClick(e.target);e.stopPropagation();};this.EditorDocument.addEventListener('dblclick',this._DblClickListener,true);this.EditorDocument.addEventListener('keydown',this._KeyDownListener,false);if (FCKBrowserInfo.IsGecko){this.EditorWindow.addEventListener('dragdrop',this._ExecDrop,true);}else if (FCKBrowserInfo.IsSafari){var N=function(evt){ if (!FCK.MouseDownFlag) evt.returnValue=false;};this.EditorDocument.addEventListener('dragenter',N,true);this.EditorDocument.addEventListener('dragover',N,true);this.EditorDocument.addEventListener('drop',this._ExecDrop,true);this.EditorDocument.addEventListener('mousedown',function(ev){var O=ev.srcElement;if (O.nodeName.IEquals('IMG','HR','INPUT','TEXTAREA','SELECT')){FCKSelection.SelectNode(O);}},true);this.EditorDocument.addEventListener('mouseup',function(ev){if (ev.srcElement.nodeName.IEquals('INPUT','TEXTAREA','SELECT')) ev.preventDefault()},true);this.EditorDocument.addEventListener('click',function(ev){if (ev.srcElement.nodeName.IEquals('INPUT','TEXTAREA','SELECT')) ev.preventDefault()},true);};if (FCKBrowserInfo.IsGecko||FCKBrowserInfo.IsOpera){this.EditorDocument.addEventListener('keypress',this._ExecCheckCaret,false);this.EditorDocument.addEventListener('click',this._ExecCheckCaret,false);};FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow(FCK.EditorWindow);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument);};FCK.MakeEditable=function(){this.EditingArea.MakeEditable();};function Document_OnContextMenu(e){if (!e.target._FCKShowContextMenu) e.preventDefault();};document.oncontextmenu=Document_OnContextMenu;FCK._BaseGetNamedCommandState=FCK.GetNamedCommandState;FCK.GetNamedCommandState=function(A){switch (A){case 'Unlink':return FCKSelection.HasAncestorNode('A')?0:-1;default:return FCK._BaseGetNamedCommandState(A);}};FCK.RedirectNamedCommands={Print:true,Paste:true};FCK.ExecuteRedirectedNamedCommand=function(A,B){switch (A){case 'Print':FCK.EditorWindow.print();break;case 'Paste':try{if (FCKBrowserInfo.IsSafari) throw '';if (FCK.Paste()) FCK.ExecuteNamedCommand('Paste',null,true);}catch (e)	{ FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security');};break;default:FCK.ExecuteNamedCommand(A,B);}};FCK._ExecPaste=function(){FCKUndo.SaveUndoStep();if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};return true;};FCK.InsertHtml=function(A){var B=FCK.EditorDocument,range;A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGecko){A=A.replace(/&nbsp;$/,'$&<span _fcktemp="1"/>');var C=new FCKDocumentFragment(this.EditorDocument);C.AppendHtml(A);var D=C.RootNode.lastChild;range=new FCKDomRange(this.EditorWindow);range.MoveToSelection();range.DeleteContents();range.InsertNode(C.RootNode);range.MoveToPosition(D,4);}else B.execCommand('inserthtml',false,A);this.Focus();if (!range){range=new FCKDomRange(this.EditorWindow);range.MoveToSelection();};var E=range.CreateBookmark();FCKDocumentProcessor.Process(B);try{range.MoveToBookmark(E);range.Select();}catch (e) {};this.Events.FireEvent("OnSelectionChange");};FCK.PasteAsPlainText=function(){FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText']);};FCK.GetClipboardHTML=function(){return '';};FCK.CreateLink=function(A,B){var C=[];if (FCKSelection.GetSelection().isCollapsed) return C;FCK.ExecuteNamedCommand('Unlink',null,false,!!B);if (A.length>0){var D='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',D,false,!!B);var E=this.EditorDocument.evaluate("//a[@href='"+D+"']",this.EditorDocument.body,null,XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,null);for (var i=0;i<E.snapshotLength;i++){var F=E.snapshotItem(i);F.href=A;C.push(F);}};return C;};FCK._FillEmptyBlock=function(A){if (!A||A.nodeType!=1) return;var B=A.tagName.toLowerCase();if (B!='p'&&B!='div') return;if (A.firstChild) return;FCKTools.AppendBogusBr(A);};FCK._ExecCheckEmptyBlock=function(){FCK._FillEmptyBlock(FCK.EditorDocument.body.firstChild);var A=FCKSelection.GetSelection();if (!A||A.rangeCount<1) return;var B=A.getRangeAt(0);FCK._FillEmptyBlock(B.startContainer);};
-var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi,'/');var sFullProtocol=document.location.href.match(/^(file\:\/{2,3})/)[1];if (FCKBrowserInfo.IsOpera) sFullProtocol+='localhost/';FCKConfig.BasePath=sFullProtocol+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);}else FCKConfig.BasePath=document.location.protocol+'//'+document.location.host+document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {  }};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;A.RemoveAttributesArray=(A.RemoveAttributes||'').split(',');if (!FCKConfig.SkinEditorCSS||FCKConfig.SkinEditorCSS.length==0) FCKConfig.SkinEditorCSS=FCKConfig.SkinPath+'fck_editor.css';if (!FCKConfig.SkinDialogCSS||FCKConfig.SkinDialogCSS.length==0) FCKConfig.SkinDialogCSS=FCKConfig.SkinPath+'fck_dialog.css';};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.AddItem([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource._CodeTag=(new Date()).valueOf();FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.AddItem(A);};FCKConfig.ProtectedSource.Protect=function(A){var B=this._CodeTag;function _Replace(protectedSource){var C=FCKTempBin.AddElement(protectedSource);return '<!--{'+B+C+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};var D=new RegExp("(<|&lt;)!--\\{"+this._CodeTag+"(\\d+)\\}--(>|&gt;)","g");return A.replace(D,_Replace);};FCKConfig.GetBodyAttributes=function(){var A='';if (this.BodyId&&this.BodyId.length>0) A+=' id="'+this.BodyId+'"';if (this.BodyClass&&this.BodyClass.length>0) A+=' class="'+this.BodyClass+'"';return A;};FCKConfig.ApplyBodyAttributes=function(A){if (this.BodyId&&this.BodyId.length>0) A.id=FCKConfig.BodyId;if (this.BodyClass&&this.BodyClass.length>0) A.className+=' '+FCKConfig.BodyClass;};
+var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,DataProcessor:new FCKDataProcessor(),GetInstanceObject:(function(){var w=window;return function(name){return w[name];}})(),AttachToOnSelectionChange:function(A){this.Events.AttachEvent('OnSelectionChange',A);},GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else{if (!this.EditorDocument) return false;return (this.StartupValue!=this.EditorDocument.body.innerHTML);}},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};A.SetKeystrokes([CTRL+8,true]);this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=FCKConfig.FirefoxSpellChecker;this.SetData(this.GetLinkedFieldValue(),true);FCKTools.AddEventListener(document,"keydown",this._TabKeyHandler);this.AttachToOnSelectionChange(_FCK_PaddingNodeListener);if (FCKBrowserInfo.IsGecko) this.AttachToOnSelectionChange(this._ExecCheckEmptyBlock);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:var G=D.nodeName.toLowerCase();if (!FCKListsLib.BlockElements[G]&&G!='li'&&!D.getAttribute('_fckfakelement')&&D.getAttribute('_moz_dirty')==null) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;break;case 8:if (E) F=true;break;};if (F){var H=D.parentNode;if (!E) E=H.insertBefore(B.createElement(A),D);E.appendChild(H.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetData:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B=FCK.EditorDocument;if (!B) return null;var C=FCKConfig.FullPage;var D=FCK.DataProcessor.ConvertToDataFormat(C?B.documentElement:B.body,!C,FCKConfig.IgnoreEmptyParagraphValue,A);D=FCK.ProtectEventsRestore(D);if (FCKBrowserInfo.IsIE) D=D.replace(FCKRegexLib.ToReplace,'$1');if (C){if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) D=FCK.DocTypeDeclaration+'\n'+D;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) D=FCK.XmlDeclaration+'\n'+D;};return FCKConfig.ProtectedSource.Revert(D);},UpdateLinkedField:function(){var A=FCK.GetXHTML(FCKConfig.FormatOutput);if (FCKConfig.HtmlEncodeOutput) A=FCKTools.HTMLEncode(A);FCK.LinkedField.value=A;FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName.toUpperCase()];if (B){for (var i=0;i<B.length;i++) B[i](A);};B=FCK.RegisteredDoubleClickHandlers['*'];if (B){for (var i=0;i<B.length;i++) B[i](A);}},RegisterDoubleClickHandler:function(A,B){var C=B||'*';C=C.toUpperCase();var D;if (!(D=FCK.RegisteredDoubleClickHandlers[C])) FCK.RegisteredDoubleClickHandlers[C]=[A];else{if (D.IndexOf(A)==-1) D.push(A);}},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsArea,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR|XML|EMBED|OBJECT':'ABBR|XML|EMBED|OBJECT';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\\s|>|/)[\\s\\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetData:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCKBrowserInfo.IsIE&&FCK.EditorDocument){FCK.EditorDocument.detachEvent("onselectionchange",Doc_OnSelectionChange);};FCKTempBin.Reset();FCK.Selection.Release();if (FCK.EditMode==0){this._ForceResetIsDirty=(B===true);A=FCKConfig.ProtectedSource.Protect(A);A=FCK.DataProcessor.ConvertToHtml(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) A=A.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);var C='';if (!FCKConfig.FullPage) C+=_FCK_GetEditorAreaStyleTags();if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+=FCKTools.GetStyleHtml(FCK_ShowTableBordersCSS,true);C+=FCKTools.GetStyleHtml(FCK_InternalCSS,true);A=A.replace(FCKRegexLib.HeadCloser,C+'$&');this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(A);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;FCKDomTools.PaddingNode=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C,D){if (!D) FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};if (!D) FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (FCKBrowserInfo.IsSafari&&FCK.EditorWindow&&A.IEquals('Paste')) return 0;if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else{return FCK.EditorDocument.queryCommandState(A)?1:0;}}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},Paste:function(A){if (FCK.Status!=2||!FCK.Events.FireEvent('OnPaste')) return false;return A||FCK._ExecPaste();},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) A=FCK.TempBaseTag+FCK.GetXHTML();else A=FCK.GetXHTML();}else{A=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body'+FCKConfig.GetBodyAttributes()+'>'+FCK.GetXHTML()+'</body></html>';};var B=FCKConfig.ScreenWidth*0.8;var C=FCKConfig.ScreenHeight*0.7;var D=(FCKConfig.ScreenWidth-B)/2;var E='';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A;E='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.opener._FCKHtmlToLoad );document.close() ;window.opener._FCKHtmlToLoad = null ;})() )';};var F=window.open(E,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+B+',height='+C+',left='+D);if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){F.document.write(A);F.document.close();}},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){FCKCommands.GetCommand('ShowBlocks').SaveState();if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (FCKBrowserInfo.IsIE) FCKTempBin.ToHtml();if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetData(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},InsertElement:function(A){if (typeof A=='string') A=this.EditorDocument.createElement(A);var B=A.nodeName.toLowerCase();FCKSelection.Restore();var C=new FCKDomRange(this.EditorWindow);C.MoveToSelection();C.DeleteContents();if (FCKListsLib.BlockElements[B]!=null){if (C.StartBlock){if (C.CheckStartOfBlock()) C.MoveToPosition(C.StartBlock,3);else if (C.CheckEndOfBlock()) C.MoveToPosition(C.StartBlock,4);else C.SplitBlock();};C.InsertNode(A);var D=FCKDomTools.GetNextSourceElement(A,false,null,['hr','br','param','img','area','input'],true);if (!D&&FCKConfig.EnterMode!='br'){D=this.EditorDocument.body.appendChild(this.EditorDocument.createElement(FCKConfig.EnterMode));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);};if (FCKListsLib.EmptyElements[B]==null) C.MoveToElementEditStart(A);else if (D) C.MoveToElementEditStart(D);else C.MoveToPosition(A,4);if (FCKBrowserInfo.IsGeckoLike){if (D) FCKDomTools.ScrollIntoView(D,false);FCKDomTools.ScrollIntoView(A,false);}}else{C.InsertNode(A);C.SetStart(A,4);C.SetEnd(A,4);};C.Select();C.Release();this.Focus();return A;},_InsertBlockElement:function(A){},_IsFunctionKey:function(A){if (A>=16&&A<=20) return true;if (A==27||(A>=33&&A<=40)) return true;if (A==45) return true;return false;},_KeyDownListener:function(A){if (!A) A=FCK.EditorWindow.event;if (FCK.EditorWindow){if (!FCK._IsFunctionKey(A.keyCode)&&!(A.ctrlKey||A.metaKey)&&!(A.keyCode==46)) FCK._KeyDownUndo();};return true;},_KeyDownUndo:function(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;FCKUndo.Changed=1;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}},_TabKeyHandler:function(A){if (!A) A=window.event;var B=A.keyCode;if (B==9&&FCK.EditMode!=0){if (FCKBrowserInfo.IsIE){var C=document.selection.createRange();if (C.parentElement()!=FCK.EditingArea.Textarea) return true;C.text='\t';C.select();}else{var a=[];var D=FCK.EditingArea.Textarea;var E=D.selectionStart;var F=D.selectionEnd;a.push(D.value.substr(0,E));a.push('\t');a.push(D.value.substr(F));D.value=a.join('');D.setSelectionRange(E+1,E+1);};if (A.preventDefault) return A.preventDefault();return A.returnValue=false;};return true;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML=FCK.GetData;FCK.SetHTML=FCK.SetData;FCK.InsertElementAndGetIt=FCK.CreateElement=FCK.InsertElement;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+encodeURIComponent(A)+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return decodeURIComponent(B);};function _FCK_MouseEventsListener(A){if (!A) A=window.event;if (A.type=='mousedown') FCK.MouseDownFlag=true;else if (A.type=='mouseup') FCK.MouseDownFlag=false;else if (A.type=='mousemove') FCK.Events.FireEvent('OnMouseMove',A);};function _FCK_PaddingNodeListener(){if (FCKConfig.EnterMode.IEquals('br')) return;FCKDomTools.EnforcePaddingNode(FCK.EditorDocument,FCKConfig.EnterMode);if (!FCKBrowserInfo.IsIE&&FCKDomTools.PaddingNode){var A=FCKSelection.GetSelection();if (A&&A.rangeCount==1){var B=A.getRangeAt(0);if (B.collapsed&&B.startContainer==FCK.EditorDocument.body&&B.startOffset==0){B.selectNodeContents(FCKDomTools.PaddingNode);B.collapse(true);A.removeAllRanges();A.addRange(B);}}}else if (FCKDomTools.PaddingNode){var C=FCKSelection.GetParentElement();var D=FCKDomTools.PaddingNode;if (C&&C.nodeName.IEquals('body')){if (FCK.EditorDocument.body.childNodes.length==1&&FCK.EditorDocument.body.firstChild==D){if (FCKSelection._GetSelectionDocument(FCK.EditorDocument.selection)!=FCK.EditorDocument) return;var B=FCK.EditorDocument.body.createTextRange();var F=false;if (!D.childNodes.firstChild){D.appendChild(FCKTools.GetElementDocument(D).createTextNode('\ufeff'));F=true;};B.moveToElementText(D);B.select();if (F) B.pasteHTML('');}}}};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;if (FCKBrowserInfo.IsIE) FCKTempBin.ToElements();FCK.InitializeBehaviors();FCK.MouseDownFlag=false;FCKTools.AddEventListener(FCK.EditorDocument,'mousemove',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mouseup',_FCK_MouseEventsListener);if (FCKBrowserInfo.IsSafari){var A=function(evt){if (!(evt.ctrlKey||evt.metaKey)) return;if (FCK.EditMode!=0) return;switch (evt.keyCode){case 89:FCKUndo.Redo();break;case 90:FCKUndo.Undo();break;}};FCKTools.AddEventListener(FCK.EditorDocument,'keyup',A);};FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode,FCKConfig.TabSpaces);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();FCKCommands.GetCommand('ShowBlocks').RestoreState();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){return FCKTools.GetStyleHtml(FCKConfig.EditorAreaCSS)+FCKTools.GetStyleHtml(FCKConfig.EditorAreaStyles);};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){switch (B){case 'Paste':return!FCK.Paste();case 'Cut':FCKUndo.SaveUndoStep();return false;}}else{if (B.Equals('Paste','Undo','Redo','SelectAll','Cut')) return false;};var C=FCK.Commands.GetCommand(B);if (C.GetState()==-1) return false;return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]=null;this.Elements.length=0;},ToHtml:function(){for (var i=0;i<this.Elements.length;i++){this.Elements[i]='<div>&nbsp;'+this.Elements[i].outerHTML+'</div>';this.Elements[i].isHtml=true;}},ToElements:function(){var A=FCK.EditorDocument.createElement('div');for (var i=0;i<this.Elements.length;i++){if (this.Elements[i].isHtml){A.innerHTML=this.Elements[i];this.Elements[i]=A.firstChild.removeChild(A.firstChild.lastChild);}}}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else if (FCKBrowserInfo.IsSafari) C=A;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){if (FCKFocusManager._IsFocusing) return;FCKFocusManager._IsFocusing=true;FCK.Focus();FCKFocusManager_Win_OnFocus();FCKTools.RunFunction(function(){delete FCKFocusManager._IsFocusing;});};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};(function(){var A=window.frameElement;var B=A.width;var C=A.height;if (/^\d+$/.test(B)) B+='px';if (/^\d+$/.test(C)) C+='px';var D=A.style;D.border=D.padding=D.margin=0;D.backgroundColor='transparent';D.backgroundImage='none';D.width=B;D.height=C;})();
+FCK.Description="FCKeditor for Gecko Browsers";FCK.InitializeBehaviors=function(){if (window.onresize) window.onresize();FCKFocusManager.AddWindow(this.EditorWindow);this.ExecOnSelectionChange=function(){FCK.Events.FireEvent("OnSelectionChange");};this._ExecDrop=function(evt){if (FCK.MouseDownFlag){FCK.MouseDownFlag=false;return;};if (FCKConfig.ForcePasteAsPlainText){if (evt.dataTransfer){var A=evt.dataTransfer.getData('Text');A=FCKTools.HTMLEncode(A);A=FCKTools.ProcessLineBreaks(window,FCKConfig,A);FCK.InsertHtml(A);}else if (FCKConfig.ShowDropDialog) FCK.PasteAsPlainText();evt.preventDefault();evt.stopPropagation();}};this._ExecCheckCaret=function(evt){if (FCK.EditMode!=0) return;if (evt.type=='keypress'){var B=evt.keyCode;if (B<33||B>40) return;};var C=function(H){if (H.nodeType!=1) return false;var D=H.tagName.toLowerCase();return (FCKListsLib.BlockElements[D]||FCKListsLib.EmptyElements[D]);};var E=function(){var F=FCKSelection.GetSelection();var G=F.getRangeAt(0);if (!G||!G.collapsed) return;var H=G.endContainer;if (H.nodeType!=3) return;if (H.nodeValue.length!=G.endOffset) return;var I=H.parentNode.tagName.toLowerCase();if (!(I=='a'||(!FCKBrowserInfo.IsOpera&&String(H.parentNode.contentEditable)=='false')||(!(FCKListsLib.BlockElements[I]||FCKListsLib.NonEmptyBlockElements[I])&&B==35))) return;var J=FCKTools.GetNextTextNode(H,H.parentNode,C);if (J) return;G=FCK.EditorDocument.createRange();J=FCKTools.GetNextTextNode(H,H.parentNode.parentNode,C);if (J){if (FCKBrowserInfo.IsOpera&&B==37) return;G.setStart(J,0);G.setEnd(J,0);}else{while (H.parentNode&&H.parentNode!=FCK.EditorDocument.body&&H.parentNode!=FCK.EditorDocument.documentElement&&H==H.parentNode.lastChild&&(!FCKListsLib.BlockElements[H.parentNode.tagName.toLowerCase()]&&!FCKListsLib.NonEmptyBlockElements[H.parentNode.tagName.toLowerCase()])) H=H.parentNode;if (FCKListsLib.BlockElements[I]||FCKListsLib.EmptyElements[I]||H==FCK.EditorDocument.body){G.setStart(H,H.childNodes.length);G.setEnd(H,H.childNodes.length);}else{var K=H.nextSibling;while (K){if (K.nodeType!=1){K=K.nextSibling;continue;};var L=K.tagName.toLowerCase();if (FCKListsLib.BlockElements[L]||FCKListsLib.EmptyElements[L]||FCKListsLib.NonEmptyBlockElements[L]) break;K=K.nextSibling;};var M=FCK.EditorDocument.createTextNode('');if (K) H.parentNode.insertBefore(M,K);else H.parentNode.appendChild(M);G.setStart(M,0);G.setEnd(M,0);}};F.removeAllRanges();F.addRange(G);FCK.Events.FireEvent("OnSelectionChange");};setTimeout(E,1);};this.ExecOnSelectionChangeTimer=function(){if (FCK.LastOnChangeTimer) window.clearTimeout(FCK.LastOnChangeTimer);FCK.LastOnChangeTimer=window.setTimeout(FCK.ExecOnSelectionChange,100);};this.EditorDocument.addEventListener('mouseup',this.ExecOnSelectionChange,false);this.EditorDocument.addEventListener('keyup',this.ExecOnSelectionChangeTimer,false);this._DblClickListener=function(e){FCK.OnDoubleClick(e.target);e.stopPropagation();};this.EditorDocument.addEventListener('dblclick',this._DblClickListener,true);this.EditorDocument.addEventListener('keydown',this._KeyDownListener,false);if (FCKBrowserInfo.IsGecko){this.EditorWindow.addEventListener('dragdrop',this._ExecDrop,true);}else if (FCKBrowserInfo.IsSafari){this.EditorDocument.addEventListener('dragover',function (evt){ if (!FCK.MouseDownFlag&&FCK.Config.ForcePasteAsPlainText) evt.returnValue=false;},true);this.EditorDocument.addEventListener('drop',this._ExecDrop,true);this.EditorDocument.addEventListener('mousedown',function(ev){var N=ev.srcElement;if (N.nodeName.IEquals('IMG','HR','INPUT','TEXTAREA','SELECT')){FCKSelection.SelectNode(N);}},true);this.EditorDocument.addEventListener('mouseup',function(ev){if (ev.srcElement.nodeName.IEquals('INPUT','TEXTAREA','SELECT')) ev.preventDefault()},true);this.EditorDocument.addEventListener('click',function(ev){if (ev.srcElement.nodeName.IEquals('INPUT','TEXTAREA','SELECT')) ev.preventDefault()},true);};if (FCKBrowserInfo.IsGecko||FCKBrowserInfo.IsOpera){this.EditorDocument.addEventListener('keypress',this._ExecCheckCaret,false);this.EditorDocument.addEventListener('click',this._ExecCheckCaret,false);};FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow(FCK.EditorWindow);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument);};FCK.MakeEditable=function(){this.EditingArea.MakeEditable();};function Document_OnContextMenu(e){if (!e.target._FCKShowContextMenu) e.preventDefault();};document.oncontextmenu=Document_OnContextMenu;FCK._BaseGetNamedCommandState=FCK.GetNamedCommandState;FCK.GetNamedCommandState=function(A){switch (A){case 'Unlink':return FCKSelection.HasAncestorNode('A')?0:-1;default:return FCK._BaseGetNamedCommandState(A);}};FCK.RedirectNamedCommands={Print:true,Paste:true};FCK.ExecuteRedirectedNamedCommand=function(A,B){switch (A){case 'Print':FCK.EditorWindow.print();break;case 'Paste':try{if (FCKBrowserInfo.IsSafari) throw '';if (FCK.Paste()) FCK.ExecuteNamedCommand('Paste',null,true);}catch (e)	{if (FCKConfig.ForcePasteAsPlainText) FCK.PasteAsPlainText();else FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security');};break;default:FCK.ExecuteNamedCommand(A,B);}};FCK._ExecPaste=function(){FCKUndo.SaveUndoStep();if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};return true;};FCK.InsertHtml=function(A){var B=FCK.EditorDocument,range;A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGecko){A=A.replace(/&nbsp;$/,'$&<span _fcktemp="1"/>');var C=new FCKDocumentFragment(this.EditorDocument);C.AppendHtml(A);var D=C.RootNode.lastChild;range=new FCKDomRange(this.EditorWindow);range.MoveToSelection();range.DeleteContents();range.InsertNode(C.RootNode);range.MoveToPosition(D,4);}else B.execCommand('inserthtml',false,A);this.Focus();if (!range){range=new FCKDomRange(this.EditorWindow);range.MoveToSelection();};var E=range.CreateBookmark();FCKDocumentProcessor.Process(B);try{range.MoveToBookmark(E);range.Select();}catch (e) {};this.Events.FireEvent("OnSelectionChange");};FCK.PasteAsPlainText=function(){FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText']);};FCK.GetClipboardHTML=function(){return '';};FCK.CreateLink=function(A,B){var C=[];if (FCKSelection.GetSelection().isCollapsed) return C;FCK.ExecuteNamedCommand('Unlink',null,false,!!B);if (A.length>0){var D='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',D,false,!!B);var E=this.EditorDocument.evaluate("//a[@href='"+D+"']",this.EditorDocument.body,null,XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,null);for (var i=0;i<E.snapshotLength;i++){var F=E.snapshotItem(i);F.href=A;C.push(F);}};return C;};FCK._FillEmptyBlock=function(A){if (!A||A.nodeType!=1) return;var B=A.tagName.toLowerCase();if (B!='p'&&B!='div') return;if (A.firstChild) return;FCKTools.AppendBogusBr(A);};FCK._ExecCheckEmptyBlock=function(){FCK._FillEmptyBlock(FCK.EditorDocument.body.firstChild);var A=FCKSelection.GetSelection();if (!A||A.rangeCount<1) return;var B=A.getRangeAt(0);FCK._FillEmptyBlock(B.startContainer);};
+var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi,'/');var sFullProtocol=document.location.href.match(/^(file\:\/{2,3})/)[1];if (FCKBrowserInfo.IsOpera) sFullProtocol+='localhost/';FCKConfig.BasePath=sFullProtocol+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);}else FCKConfig.BasePath=document.location.protocol+'//'+document.location.host+document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {  }};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;A.RemoveAttributesArray=(A.RemoveAttributes||'').split(',');if (!FCKConfig.SkinEditorCSS||FCKConfig.SkinEditorCSS.length==0) FCKConfig.SkinEditorCSS=FCKConfig.SkinPath+'fck_editor.css';if (!FCKConfig.SkinDialogCSS||FCKConfig.SkinDialogCSS.length==0) FCKConfig.SkinDialogCSS=FCKConfig.SkinPath+'fck_dialog.css';};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.push([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource._CodeTag=(new Date()).valueOf();FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.push(A);};FCKConfig.ProtectedSource.Protect=function(A){var B=this._CodeTag;function _Replace(protectedSource){var C=FCKTempBin.AddElement(protectedSource);return '<!--{'+B+C+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};var D=new RegExp("(<|&lt;)!--\\{"+this._CodeTag+"(\\d+)\\}--(>|&gt;)","g");return A.replace(D,_Replace);};FCKConfig.GetBodyAttributes=function(){var A='';if (this.BodyId&&this.BodyId.length>0) A+=' id="'+this.BodyId+'"';if (this.BodyClass&&this.BodyClass.length>0) A+=' class="'+this.BodyClass+'"';return A;};FCKConfig.ApplyBodyAttributes=function(A){if (this.BodyId&&this.BodyId.length>0) A.id=FCKConfig.BodyId;if (this.BodyClass&&this.BodyClass.length>0) A.className+=' '+FCKConfig.BodyClass;};
 var FCKDebug={Output:function(){},OutputObject:function(){}};
 var FCKDomTools={MoveChildren:function(A,B,C){if (A==B) return;var D;if (C){while ((D=A.lastChild)) B.insertBefore(A.removeChild(D),B.firstChild);}else{while ((D=A.firstChild)) B.appendChild(A.removeChild(D));}},MoveNode:function(A,B,C){if (C) B.insertBefore(FCKDomTools.RemoveNode(A),B.firstChild);else B.appendChild(FCKDomTools.RemoveNode(A));},TrimNode:function(A){this.LTrimNode(A);this.RTrimNode(A);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A){var B;while ((B=A.lastChild)){if (B.nodeType==3){var C=B.nodeValue.RTrim();var D=B.nodeValue.length;if (C.length==0){B.parentNode.removeChild(B);continue;}else if (C.length<D){B.splitText(C.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;};if (!FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsOpera){B=A.lastChild;if (B&&B.nodeType==1&&B.nodeName.toLowerCase()=='br'){B.parentNode.removeChild(B);}}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D,E){while((A=this.GetNextSourceNode(A,E))){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (D&&A.nodeName.IEquals(D)) return this.GetNextSourceElement(A,B,C,D);return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;};return null;},GetNextSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.firstChild) E=A.firstChild;else{if (D&&A==D) return null;E=A.nextSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetNextSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetNextSourceNode(E,false,C,D);return E;},GetPreviousSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.lastChild) E=A.lastChild;else{if (D&&A==D) return null;E=A.previousSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetPreviousSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetPreviousSourceNode(E,false,C,D);return E;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.unshift(A);A=A.parentNode;};return B;},GetCommonParents:function(A,B){var C=this.GetParents(A);var D=this.GetParents(B);var E=[];for (var i=0;i<C.length;i++){if (C[i]==D[i]) E.push(C[i]);};return E;},GetCommonParentNode:function(A,B,C){var D={};if (!C.pop) C=[C];while (C.length>0) D[C.pop().toLowerCase()]=1;var E=this.GetCommonParents(A,B);var F=null;while ((F=E.pop())){if (D[F.nodeName.toLowerCase()]) return F;};return null;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;},PaddingNode:null,EnforcePaddingNode:function(A,B){try{if (!A||!A.body) return;}catch (e){return;};this.CheckAndRemovePaddingNode(A,B,true);try{if (A.body.lastChild&&(A.body.lastChild.nodeType!=1||A.body.lastChild.tagName.toLowerCase()==B.toLowerCase())) return;}catch (e){return;};var C=A.createElement(B);if (FCKBrowserInfo.IsGecko&&FCKListsLib.NonEmptyBlockElements[B]) FCKTools.AppendBogusBr(C);this.PaddingNode=C;if (A.body.childNodes.length==1&&A.body.firstChild.nodeType==1&&A.body.firstChild.tagName.toLowerCase()=='br'&&(A.body.firstChild.getAttribute('_moz_dirty')!=null||A.body.firstChild.getAttribute('type')=='_moz')) A.body.replaceChild(C,A.body.firstChild);else A.body.appendChild(C);},CheckAndRemovePaddingNode:function(A,B,C){var D=this.PaddingNode;if (!D) return;try{if (D.parentNode!=A.body||D.tagName.toLowerCase()!=B||(D.childNodes.length>1)||(D.firstChild&&D.firstChild.nodeValue!='\xa0'&&String(D.firstChild.tagName).toLowerCase()!='br')){this.PaddingNode=null;return;}}catch (e){this.PaddingNode=null;return;};if (!C){if (D.parentNode.childNodes.length>1) D.parentNode.removeChild(D);this.PaddingNode=null;}},HasAttribute:function(A,B){if (A.hasAttribute) return A.hasAttribute(B);else{var C=A.attributes[B];return (C!=undefined&&C.specified);}},HasAttributes:function(A){var B=A.attributes;for (var i=0;i<B.length;i++){if (FCKBrowserInfo.IsIE&&B[i].nodeName=='class'){if (A.className.length>0) return true;}else if (B[i].specified) return true;};return false;},RemoveAttribute:function(A,B){if (FCKBrowserInfo.IsIE&&B.toLowerCase()=='class') B='className';return A.removeAttribute(B,0);},RemoveAttributes:function (A,B){for (var i=0;i<B.length;i++) this.RemoveAttribute(A,B[i]);},GetAttributeValue:function(A,B){var C=B;if (typeof B=='string') B=A.attributes[B];else C=B.nodeName;if (B&&B.specified){if (C=='style') return A.style.cssText;else if (C=='class'||C.indexOf('on')==0) return B.nodeValue;else{return A.getAttribute(C,2);}};return null;},Contains:function(A,B){if (A.contains&&B.nodeType==1) return A.contains(B);while ((B=B.parentNode)){if (B==A) return true;};return false;},BreakParent:function(A,B,C){var D=C||new FCKDomRange(FCKTools.GetElementWindow(A));D.SetStart(A,4);D.SetEnd(B,4);var E=D.ExtractContents();D.InsertNode(A.parentNode.removeChild(A));E.InsertAfterNode(A);D.Release(!!C);},GetNodeAddress:function(A,B){var C=[];while (A&&A!=FCKTools.GetElementDocument(A).documentElement){var D=A.parentNode;var E=-1;for(var i=0;i<D.childNodes.length;i++){var F=D.childNodes[i];if (B===true&&F.nodeType==3&&F.previousSibling&&F.previousSibling.nodeType==3) continue;E++;if (D.childNodes[i]==A) break;};C.unshift(E);A=A.parentNode;};return C;},GetNodeFromAddress:function(A,B,C){var D=A.documentElement;for (var i=0;i<B.length;i++){var E=B[i];if (!C){D=D.childNodes[E];continue;};var F=-1;for (var j=0;j<D.childNodes.length;j++){var G=D.childNodes[j];if (C===true&&G.nodeType==3&&G.previousSibling&&G.previousSibling.nodeType==3) continue;F++;if (F==E){D=G;break;}}};return D;},CloneElement:function(A){A=A.cloneNode(false);A.removeAttribute('id',false);return A;},ClearElementJSProperty:function(A,B){if (FCKBrowserInfo.IsIE) A.removeAttribute(B);else delete A[B];},SetElementMarker:function (A,B,C,D){var E=String(parseInt(Math.random()*0xffffffff,10));B._FCKMarkerId=E;B[C]=D;if (!A[E]) A[E]={ 'element':B,'markers':{} };A[E]['markers'][C]=D;},ClearElementMarkers:function(A,B,C){var D=B._FCKMarkerId;if (!D) return;this.ClearElementJSProperty(B,'_FCKMarkerId');for (var j in A[D]['markers']) this.ClearElementJSProperty(B,j);if (C) delete A[D];},ClearAllMarkers:function(A){for (var i in A) this.ClearElementMarkers(A,A[i]['element'],true);},ListToArray:function(A,B,C,D,E){if (!A.nodeName.IEquals(['ul','ol'])) return [];if (!D) D=0;if (!C) C=[];for (var i=0;i<A.childNodes.length;i++){var F=A.childNodes[i];if (!F.nodeName.IEquals('li')) continue;var G={ 'parent':A,'indent':D,'contents':[] };if (!E){G.grandparent=A.parentNode;if (G.grandparent&&G.grandparent.nodeName.IEquals('li')) G.grandparent=G.grandparent.parentNode;}else G.grandparent=E;if (B) this.SetElementMarker(B,F,'_FCK_ListArray_Index',C.length);C.push(G);for (var j=0;j<F.childNodes.length;j++){var H=F.childNodes[j];if (H.nodeName.IEquals(['ul','ol'])) this.ListToArray(H,B,C,D+1,G.grandparent);else G.contents.push(H);}};return C;},ArrayToList:function(A,B,C){if (C==undefined) C=0;if (!A||A.length<C+1) return null;var D=FCKTools.GetElementDocument(A[C].parent);var E=D.createDocumentFragment();var F=null;var G=C;var H=Math.max(A[C].indent,0);var I=null;while (true){var J=A[G];if (J.indent==H){if (!F||A[G].parent.nodeName!=F.nodeName){F=A[G].parent.cloneNode(false);E.appendChild(F);};I=D.createElement('li');F.appendChild(I);for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));G++;}else if (J.indent==Math.max(H,0)+1){var K=this.ArrayToList(A,null,G);I.appendChild(K.listNode);G=K.nextIndex;}else if (J.indent==-1&&C==0&&J.grandparent){var I;if (J.grandparent.nodeName.IEquals(['ul','ol'])) I=D.createElement('li');else{if (FCKConfig.EnterMode.IEquals(['div','p'])&&!J.grandparent.nodeName.IEquals('td')) I=D.createElement(FCKConfig.EnterMode);else I=D.createDocumentFragment();};for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));if (I.nodeType==11){if (I.lastChild&&I.lastChild.getAttribute&&I.lastChild.getAttribute('type')=='_moz') I.removeChild(I.lastChild);I.appendChild(D.createElement('br'));};if (I.nodeName.IEquals(FCKConfig.EnterMode)&&I.firstChild){this.TrimNode(I);if (FCKListsLib.BlockBoundaries[I.firstChild.nodeName.toLowerCase()]){var M=D.createDocumentFragment();while (I.firstChild) M.appendChild(I.removeChild(I.firstChild));I=M;}};if (FCKBrowserInfo.IsGeckoLike&&I.nodeName.IEquals(['div','p'])) FCKTools.AppendBogusBr(I);E.appendChild(I);F=null;G++;}else return null;if (A.length<=G||Math.max(A[G].indent,0)<H){break;}};if (B){var N=E.firstChild;while (N){if (N.nodeType==1) this.ClearElementMarkers(B,N);N=this.GetNextSourceNode(N);}};return { 'listNode':E,'nextIndex':G };},GetNextSibling:function(A,B){A=A.nextSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.nextSibling;return A;},GetPreviousSibling:function(A,B){A=A.previousSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.previousSibling;return A;},CheckIsEmptyElement:function(A,B){var C=A.firstChild;var D;while (C){if (C.nodeType==1){if (D||!FCKListsLib.InlineNonEmptyElements[C.nodeName.toLowerCase()]) return false;if (!B||B(C)===true) D=C;}else if (C.nodeType==3&&C.nodeValue.length>0) return false;C=C.nextSibling;};return D?this.CheckIsEmptyElement(D,B):true;},SetElementStyles:function(A,B){var C=A.style;for (var D in B) C[D]=B[D];},SetOpacity:function(A,B){if (FCKBrowserInfo.IsIE){B=Math.round(B*100);A.style.filter=(B>100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+B+')');}else A.style.opacity=B;},GetCurrentElementStyle:function(A,B){if (FCKBrowserInfo.IsIE) return A.currentStyle[B];else return A.ownerDocument.defaultView.getComputedStyle(A,'').getPropertyValue(B);},GetPositionedAncestor:function(A){var B=A;while (B!=FCKTools.GetElementDocument(B).documentElement){if (this.GetCurrentElementStyle(B,'position')!='static') return B;if (B==FCKTools.GetElementDocument(B).documentElement&&currentWindow!=w) B=currentWindow.frameElement;else B=B.parentNode;};return null;},ScrollIntoView:function(A,B){var C=FCKTools.GetElementWindow(A);var D=FCKTools.GetViewPaneSize(C).Height;var E=D*-1;if (B===false){E+=A.offsetHeight||0;E+=parseInt(this.GetCurrentElementStyle(A,'marginBottom')||0,10)||0;};var F=FCKTools.GetDocumentPosition(C,A);E+=F.y;var G=FCKTools.GetScrollPosition(C).Y;if (E>0&&(E>G||E<G-D)) C.scrollTo(0,E);},CheckIsEditable:function(A){var B=A.nodeName.toLowerCase();var C=FCK.DTD[B]||FCK.DTD.span;return (C['#']&&!FCKListsLib.NonEditableElements[B]);},GetSelectedDivContainers:function(){var A=[];var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.GetTouchedStartNode();var D=B.GetTouchedEndNode();var E=C;if (C==D){while (D.nodeType==1&&D.lastChild) D=D.lastChild;D=FCKDomTools.GetNextSourceNode(D);}while (E&&E!=D){if (E.nodeType!=3||!/^[ \t\n]*$/.test(E.nodeValue)){var F=new FCKElementPath(E);var G=F.BlockLimit;if (G&&G.nodeName.IEquals('div')&&A.IndexOf(G)==-1) A.push(G);};E=FCKDomTools.GetNextSourceNode(E);};return A;}};
 var FCKTools={};FCKTools.CreateBogusBR=function(A){var B=A.createElement('br');B.setAttribute('type','_moz');return B;};FCKTools.FixCssUrls=function(A,B){if (!A||A.length==0) return B;return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(match,opener,path,closer){if (/^\/|^\w?:/.test(path)) return match;else return 'url('+opener+A+path+closer+')';});};FCKTools._GetUrlFixedCss=function(A,B){var C=A.match(/^([^|]+)\|([\s\S]*)/);if (C) return FCKTools.FixCssUrls(C[1],C[2]);else return A;};FCKTools.AppendStyleSheet=function(A,B){if (!B) return [];if (typeof(B)=='string'){if (/[\\\/\.][^{}]*$/.test(B)){return this.AppendStyleSheet(A,B.split(','));}else return [this.AppendStyleString(A,FCKTools._GetUrlFixedCss(B))];}else{var C=[];for (var i=0;i<B.length;i++) C.push(this._AppendStyleSheet(A,B[i]));return C;}};FCKTools.GetStyleHtml=(function(){var A=function(styleDef,markTemp){if (styleDef.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<style type="text/css"'+B+'>'+styleDef+'</style>';};var C=function(cssFileUrl,markTemp){if (cssFileUrl.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<link href="'+cssFileUrl+'" type="text/css" rel="stylesheet" '+B+'/>';};return function(cssFileOrArrayOrDef,markTemp){if (!cssFileOrArrayOrDef) return '';if (typeof(cssFileOrArrayOrDef)=='string'){if (/[\\\/\.][^{}]*$/.test(cssFileOrArrayOrDef)){return this.GetStyleHtml(cssFileOrArrayOrDef.split(','),markTemp);}else return A(this._GetUrlFixedCss(cssFileOrArrayOrDef),markTemp);}else{var E='';for (var i=0;i<cssFileOrArrayOrDef.length;i++) E+=C(cssFileOrArrayOrDef[i],markTemp);return E;}}})();FCKTools.GetElementDocument=function (A){return A.ownerDocument||A.document;};FCKTools.GetElementWindow=function(A){return this.GetDocumentWindow(this.GetElementDocument(A));};FCKTools.GetDocumentWindow=function(A){if (FCKBrowserInfo.IsSafari&&!A.parentWindow) this.FixDocumentParentWindow(window.top);return A.parentWindow||A.defaultView;};FCKTools.FixDocumentParentWindow=function(A){if (A.document) A.document.parentWindow=A;for (var i=0;i<A.frames.length;i++) FCKTools.FixDocumentParentWindow(A.frames[i]);};FCKTools.HTMLEncode=function(A){if (!A) return '';A=A.replace(/&/g,'&amp;');A=A.replace(/</g,'&lt;');A=A.replace(/>/g,'&gt;');return A;};FCKTools.HTMLDecode=function(A){if (!A) return '';A=A.replace(/&gt;/g,'>');A=A.replace(/&lt;/g,'<');A=A.replace(/&amp;/g,'&');return A;};FCKTools._ProcessLineBreaksForPMode=function(A,B,C,D,E){var F=0;var G="<p>";var H="</p>";var I="<br />";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='p'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};var n=B.charAt(i+1);if (n=='\r'){i++;n=B.charAt(i+1);};if (n=='\n'){i++;if (F) E.push(H);E.push(G);F=1;}else E.push(I);}};FCKTools._ProcessLineBreaksForDivMode=function(A,B,C,D,E){var F=0;var G="<div>";var H="</div>";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='div'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F){if (E[E.length-1]==G){E.push("&nbsp;");};E.push(H);};E.push(G);F=1;};if (F) E.push(H);};FCKTools._ProcessLineBreaksForBrMode=function(A,B,C,D,E){var F=0;var G="<br />";var H="";if (C){G="<li>";H="</li>";F=1;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F&&H.length) E.push (H);E.push(G);F=1;}};FCKTools.ProcessLineBreaks=function(A,B,C){var D=B.EnterMode.toLowerCase();var E=[];var F=0;var G=new A.FCKDomRange(A.FCK.EditorWindow);G.MoveToSelection();var H=G._Range.startContainer;while (H&&H.nodeType!=1) H=H.parentNode;if (H&&H.tagName.toLowerCase()=='li') F=1;if (D=='p') this._ProcessLineBreaksForPMode(A,C,F,H,E);else if (D=='div') this._ProcessLineBreaksForDivMode(A,C,F,H,E);else if (D=='br') this._ProcessLineBreaksForBrMode(A,C,F,H,E);return E.join("");};FCKTools.AddSelectOption=function(A,B,C){var D=FCKTools.GetElementDocument(A).createElement("OPTION");D.text=B;D.value=C;A.options.add(D);return D;};FCKTools.RunFunction=function(A,B,C,D){if (A) this.SetTimeout(A,0,B,C,D);};FCKTools.SetTimeout=function(A,B,C,D,E){return (E||window).setTimeout(function(){if (D) A.apply(C,[].concat(D));else A.apply(C);},B);};FCKTools.SetInterval=function(A,B,C,D,E){return (E||window).setInterval(function(){A.apply(C,D||[]);},B);};FCKTools.ConvertStyleSizeToHtml=function(A){return A.EndsWith('%')?A:parseInt(A,10);};FCKTools.ConvertHtmlSizeToStyle=function(A){return A.EndsWith('%')?A:(A+'px');};FCKTools.GetElementAscensor=function(A,B){var e=A;var C=","+B.toUpperCase()+",";while (e){if (C.indexOf(","+e.nodeName.toUpperCase()+",")!=-1) return e;e=e.parentNode;};return null;};FCKTools.CreateEventListener=function(A,B){var f=function(){var C=[];for (var i=0;i<arguments.length;i++) C.push(arguments[i]);A.apply(this,C.concat(B));};return f;};FCKTools.IsStrictMode=function(A){return ('CSS1Compat'==(A.compatMode||(FCKBrowserInfo.IsSafari?'CSS1Compat':null)));};FCKTools.ArgumentsToArray=function(A,B,C){B=B||0;C=C||A.length;var D=[];for (var i=B;i<B+C&&i<A.length;i++) D.push(A[i]);return D;};FCKTools.CloneObject=function(A){var B=function() {};B.prototype=A;return new B;};FCKTools.AppendBogusBr=function(A){if (!A) return;var B=this.GetLastItem(A.getElementsByTagName('br'));if (!B||(B.getAttribute('type',2)!='_moz'&&B.getAttribute('_moz_dirty')==null)){var C=this.GetElementDocument(A);if (FCKBrowserInfo.IsOpera) A.appendChild(C.createTextNode(''));else A.appendChild(this.CreateBogusBR(C));}};FCKTools.GetLastItem=function(A){if (A.length>0) return A[A.length-1];return null;};FCKTools.GetDocumentPosition=function(w,A){var x=0;var y=0;var B=A;var C=null;var D=FCKTools.GetElementWindow(B);while (B&&!(D==w&&(B==w.document.body||B==w.document.documentElement))){x+=B.offsetLeft-B.scrollLeft;y+=B.offsetTop-B.scrollTop;if (!FCKBrowserInfo.IsOpera){var E=C;while (E&&E!=B){x-=E.scrollLeft;y-=E.scrollTop;E=E.parentNode;}};C=B;if (B.offsetParent) B=B.offsetParent;else{if (D!=w){B=D.frameElement;C=null;if (B) D=B.contentWindow.parent;}else B=null;}};if (FCKDomTools.GetCurrentElementStyle(w.document.body,'position')!='static'||(FCKBrowserInfo.IsIE&&FCKDomTools.GetPositionedAncestor(A)==null)){x+=w.document.body.offsetLeft;y+=w.document.body.offsetTop;};return { "x":x,"y":y };};FCKTools.GetWindowPosition=function(w,A){var B=this.GetDocumentPosition(w,A);var C=FCKTools.GetScrollPosition(w);B.x-=C.X;B.y-=C.Y;return B;};FCKTools.ProtectFormStyles=function(A){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return [];var B=[];var C=['style','className'];for (var i=0;i<C.length;i++){var D=C[i];if (A.elements.namedItem(D)){var E=A.elements.namedItem(D);B.push([E,E.nextSibling]);A.removeChild(E);}};return B;};FCKTools.RestoreFormStyles=function(A,B){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return;if (B.length>0){for (var i=B.length-1;i>=0;i--){var C=B[i][0];var D=B[i][1];if (D) A.insertBefore(C,D);else A.appendChild(C);}}};FCKTools.GetNextNode=function(A,B){if (A.firstChild) return A.firstChild;else if (A.nextSibling) return A.nextSibling;else{var C=A.parentNode;while (C){if (C==B) return null;if (C.nextSibling) return C.nextSibling;else C=C.parentNode;}};return null;};FCKTools.GetNextTextNode=function(A,B,C){node=this.GetNextNode(A,B);if (C&&node&&C(node)) return null;while (node&&node.nodeType!=3){node=this.GetNextNode(node,B);if (C&&node&&C(node)) return null;};return node;};FCKTools.Merge=function(){var A=arguments;var o=A[0];for (var i=1;i<A.length;i++){var B=A[i];for (var p in B) o[p]=B[p];};return o;};FCKTools.IsArray=function(A){return (A instanceof Array);};FCKTools.AppendLengthProperty=function(A,B){var C=0;for (var n in A) C++;return A[B||'length']=C;};FCKTools.NormalizeCssText=function(A){var B=document.createElement('span');B.style.cssText=A;return B.style.cssText;};FCKTools.Bind=function(A,B){return function(){ return B.apply(A,arguments);};};FCKTools.GetVoidUrl=function(){if (FCK_IS_CUSTOM_DOMAIN) return "javascript: void( function(){document.open();document.write('<html><head><title></title></head><body></body></html>');document.domain = '"+FCK_RUNTIME_DOMAIN+"';document.close();}() ) ;";if (FCKBrowserInfo.IsIE){if (FCKBrowserInfo.IsIE7||!FCKBrowserInfo.IsIE6) return "";else return "javascript: '';";};return "javascript: void(0);";};FCKTools.ResetStyles=function(A){A.style.cssText='margin:0;padding:0;border:0;background-color:transparent;background-image:none;';};
 FCKTools.CancelEvent=function(e){if (e) e.preventDefault();};FCKTools.DisableSelection=function(A){if (FCKBrowserInfo.IsGecko) A.style.MozUserSelect='none';else if (FCKBrowserInfo.IsSafari) A.style.KhtmlUserSelect='none';else A.style.userSelect='none';};FCKTools._AppendStyleSheet=function(A,B){var e=A.createElement('LINK');e.rel='stylesheet';e.type='text/css';e.href=B;A.getElementsByTagName("HEAD")[0].appendChild(e);return e;};FCKTools.AppendStyleString=function(A,B){if (!B) return null;var e=A.createElement("STYLE");e.appendChild(A.createTextNode(B));A.getElementsByTagName("HEAD")[0].appendChild(e);return e;};FCKTools.ClearElementAttributes=function(A){for (var i=0;i<A.attributes.length;i++){A.removeAttribute(A.attributes[i].name,0);}};FCKTools.GetAllChildrenIds=function(A){var B=[];var C=function(parent){for (var i=0;i<parent.childNodes.length;i++){var D=parent.childNodes[i].id;if (D&&D.length>0) B[B.length]=D;C(parent.childNodes[i]);}};C(A);return B;};FCKTools.RemoveOuterTags=function(e){var A=e.ownerDocument.createDocumentFragment();for (var i=0;i<e.childNodes.length;i++) A.appendChild(e.childNodes[i].cloneNode(true));e.parentNode.replaceChild(A,e);};FCKTools.CreateXmlObject=function(A){switch (A){case 'XmlHttp':return new XMLHttpRequest();case 'DOMDocument':var B=(new DOMParser()).parseFromString('<tmp></tmp>','text/xml');FCKDomTools.RemoveNode(B.firstChild);return B;};return null;};FCKTools.GetScrollPosition=function(A){return { X:A.pageXOffset,Y:A.pageYOffset };};FCKTools.AddEventListener=function(A,B,C){A.addEventListener(B,C,false);};FCKTools.RemoveEventListener=function(A,B,C){A.removeEventListener(B,C,false);};FCKTools.AddEventListenerEx=function(A,B,C,D){A.addEventListener(B,function(e){C.apply(A,[e].concat(D||[]));},false);};FCKTools.GetViewPaneSize=function(A){return { Width:A.innerWidth,Height:A.innerHeight };};FCKTools.SaveStyles=function(A){var B=FCKTools.ProtectFormStyles(A);var C={};if (A.className.length>0){C.Class=A.className;A.className='';};var D=A.getAttribute('style');if (D&&D.length>0){C.Inline=D;A.setAttribute('style','',0);};FCKTools.RestoreFormStyles(A,B);return C;};FCKTools.RestoreStyles=function(A,B){var C=FCKTools.ProtectFormStyles(A);A.className=B.Class||'';if (B.Inline) A.setAttribute('style',B.Inline,0);else A.removeAttribute('style',0);FCKTools.RestoreFormStyles(A,C);};FCKTools.RegisterDollarFunction=function(A){A.$=function(id){return A.document.getElementById(id);};};FCKTools.AppendElement=function(A,B){return A.appendChild(A.ownerDocument.createElement(B));};FCKTools.GetElementPosition=function(A,B){var c={ X:0,Y:0 };var C=B||window;var D=FCKTools.GetElementWindow(A);var E=null;while (A){var F=D.getComputedStyle(A,'').position;if (F&&F!='static'&&A.style.zIndex!=FCKConfig.FloatingPanelsZIndex) break;c.X+=A.offsetLeft-A.scrollLeft;c.Y+=A.offsetTop-A.scrollTop;if (!FCKBrowserInfo.IsOpera){var G=E;while (G&&G!=A){c.X-=G.scrollLeft;c.Y-=G.scrollTop;G=G.parentNode;}};E=A;if (A.offsetParent) A=A.offsetParent;else{if (D!=C){A=D.frameElement;E=null;if (A) D=FCKTools.GetElementWindow(A);}else{c.X+=A.scrollLeft;c.Y+=A.scrollTop;break;}}};return c;};
-var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.3",VersionBuild : "19836",Instances : new Object(),GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
+var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.4.1",VersionBuild : "23187",Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
 var FCKImagePreloader=function(){this._Images=[];};FCKImagePreloader.prototype={AddImages:function(A){if (typeof(A)=='string') A=A.split(';');this._Images=this._Images.concat(A);},Start:function(){var A=this._Images;this._PreloadCount=A.length;for (var i=0;i<A.length;i++){var B=document.createElement('img');FCKTools.AddEventListenerEx(B,'load',_FCKImagePreloader_OnImage,this);FCKTools.AddEventListenerEx(B,'error',_FCKImagePreloader_OnImage,this);B.src=A[i];_FCKImagePreloader_ImageCache.push(B);}}};var _FCKImagePreloader_ImageCache=[];function _FCKImagePreloader_OnImage(A,B){if ((--B._PreloadCount)==0&&B.OnComplete) B.OnComplete();};
 var FCKRegexLib={AposEntity:/&apos;/gi,ObjectElements:/^(?:IMG|TABLE|TR|TD|TH|INPUT|SELECT|TEXTAREA|HR|OBJECT|A|UL|OL|LI)$/i,NamedCommands:/^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i,BeforeBody:/(^[\s\S]*\<body[^\>]*\>)/i,AfterBody:/(\<\/body\>[\s\S]*$)/i,ToReplace:/___fcktoreplace:([\w]+)/ig,MetaHttpEquiv:/http-equiv\s*=\s*["']?([^"' ]+)/i,HasBaseTag:/<base /i,HasBodyTag:/<body[\s|>]/i,HtmlOpener:/<html\s?[^>]*>/i,HeadOpener:/<head\s?[^>]*>/i,HeadCloser:/<\/head\s*>/i,FCK_Class:/\s*FCK__[^ ]*(?=\s+|$)/,ElementName:/(^[a-z_:][\w.\-:]*\w$)|(^[a-z_]$)/,ForceSimpleAmpersand:/___FCKAmp___/g,SpaceNoClose:/\/>/g,EmptyParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/,EmptyOutParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/,TagBody:/></,GeckoEntitiesMarker:/#\?-\:/g,ProtectUrlsImg:/<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsA:/<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsArea:/<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,Html4DocType:/HTML 4\.0 Transitional/i,DocTypeTag:/<!DOCTYPE[^>]*>/i,HtmlDocType:/DTD HTML/,TagsWithEvent:/<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g,EventAttributes:/\s(on\w+)[\s\r\n]*=[\s\r\n]*?('|")([\s\S]*?)\2/g,ProtectedEvents:/\s\w+_fckprotectedatt="([^"]+)"/g,StyleProperties:/\S+\s*:/g,InvalidSelfCloseTags:/(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0-9:]+)[^>]*)\/>/gi,StyleVariableAttName:/#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,RegExp:/^\/(.*)\/([gim]*)$/,HtmlTag:/<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/};
 var FCKListsLib={BlockElements:{ address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,marquee:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },NonEmptyBlockElements:{ p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },InlineChildReqElements:{ abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },InlineNonEmptyElements:{ a:1,abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },EmptyElements:{ base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },PathBlockElements:{ address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 },PathBlockLimitElements:{ body:1,div:1,td:1,th:1,caption:1,form:1 },StyleBlockElements:{ address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 },StyleObjectElements:{ img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },NonEditableElements:{ button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },BlockBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },ListBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }};
-var FCKLanguageManager=FCK.Language={AvailableLanguages:{af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-uk':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',it:'Italian',ja:'Japanese',km:'Khmer',ko:'Korean',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},GetActiveLanguage:function(){if (FCKConfig.AutoDetectLanguage){var A;if (navigator.userLanguage) A=navigator.userLanguage.toLowerCase();else if (navigator.language) A=navigator.language.toLowerCase();else{return FCKConfig.DefaultLanguage;};if (A.length>=5){A=A.substr(0,5);if (this.AvailableLanguages[A]) return A;};if (A.length>=2){A=A.substr(0,2);if (this.AvailableLanguages[A]) return A;}};return this.DefaultLanguage;},TranslateElements:function(A,B,C,D){var e=A.getElementsByTagName(B);var E,s;for (var i=0;i<e.length;i++){if ((E=e[i].getAttribute('fckLang'))){if ((s=FCKLang[E])){if (D) s=FCKTools.HTMLEncode(s);e[i][C]=s;}}}},TranslatePage:function(A){this.TranslateElements(A,'INPUT','value');this.TranslateElements(A,'SPAN','innerHTML');this.TranslateElements(A,'LABEL','innerHTML');this.TranslateElements(A,'OPTION','innerHTML',true);this.TranslateElements(A,'LEGEND','innerHTML');},Initialize:function(){if (this.AvailableLanguages[FCKConfig.DefaultLanguage]) this.DefaultLanguage=FCKConfig.DefaultLanguage;else this.DefaultLanguage='en';this.ActiveLanguage={};this.ActiveLanguage.Code=this.GetActiveLanguage();this.ActiveLanguage.Name=this.AvailableLanguages[this.ActiveLanguage.Code];}};
-var FCKXHtmlEntities={};FCKXHtmlEntities.Initialize=function(){if (FCKXHtmlEntities.Entities) return;var A='';var B,e;if (FCKConfig.ProcessHTMLEntities){FCKXHtmlEntities.Entities={' ':'nbsp','¡':'iexcl','¢':'cent','£':'pound','¤':'curren','¥':'yen','¦':'brvbar','§':'sect','¨':'uml','©':'copy','ª':'ordf','«':'laquo','¬':'not','­':'shy','®':'reg','¯':'macr','°':'deg','±':'plusmn','²':'sup2','³':'sup3','´':'acute','µ':'micro','¶':'para','·':'middot','¸':'cedil','¹':'sup1','º':'ordm','»':'raquo','¼':'frac14','½':'frac12','¾':'frac34','¿':'iquest','×':'times','÷':'divide','ƒ':'fnof','•':'bull','…':'hellip','′':'prime','″':'Prime','‾':'oline','�':'frasl','℘':'weierp','ℑ':'image','ℜ':'real','™':'trade','ℵ':'alefsym','�':'larr','↑':'uarr','→':'rarr','↓':'darr','↔':'harr','↵':'crarr','�':'lArr','⇑':'uArr','⇒':'rArr','⇓':'dArr','⇔':'hArr','∀':'forall','∂':'part','∃':'exist','∅':'empty','∇':'nabla','∈':'isin','∉':'notin','∋':'ni','�':'prod','∑':'sum','−':'minus','∗':'lowast','√':'radic','�':'prop','∞':'infin','∠':'ang','∧':'and','∨':'or','∩':'cap','∪':'cup','∫':'int','∴':'there4','∼':'sim','≅':'cong','≈':'asymp','≠':'ne','≡':'equiv','≤':'le','≥':'ge','⊂':'sub','⊃':'sup','⊄':'nsub','⊆':'sube','⊇':'supe','⊕':'oplus','⊗':'otimes','⊥':'perp','⋅':'sdot','\u2308':'lceil','\u2309':'rceil','\u230a':'lfloor','\u230b':'rfloor','\u2329':'lang','\u232a':'rang','◊':'loz','♠':'spades','♣':'clubs','♥':'hearts','♦':'diams','"':'quot','ˆ':'circ','˜':'tilde',' ':'ensp',' ':'emsp',' ':'thinsp','‌':'zwnj','�':'zwj','‎':'lrm','�':'rlm','–':'ndash','—':'mdash','‘':'lsquo','’':'rsquo','‚':'sbquo','“':'ldquo','�':'rdquo','„':'bdquo','†':'dagger','‡':'Dagger','‰':'permil','‹':'lsaquo','›':'rsaquo','€':'euro'};for (e in FCKXHtmlEntities.Entities) A+=e;if (FCKConfig.IncludeLatinEntities){B={'À':'Agrave','�':'Aacute','Â':'Acirc','Ã':'Atilde','Ä':'Auml','Å':'Aring','Æ':'AElig','Ç':'Ccedil','È':'Egrave','É':'Eacute','Ê':'Ecirc','Ë':'Euml','Ì':'Igrave','�':'Iacute','Î':'Icirc','�':'Iuml','�':'ETH','Ñ':'Ntilde','Ò':'Ograve','Ó':'Oacute','Ô':'Ocirc','Õ':'Otilde','Ö':'Ouml','Ø':'Oslash','Ù':'Ugrave','Ú':'Uacute','Û':'Ucirc','Ü':'Uuml','�':'Yacute','Þ':'THORN','ß':'szlig','à':'agrave','á':'aacute','â':'acirc','ã':'atilde','ä':'auml','å':'aring','æ':'aelig','ç':'ccedil','è':'egrave','é':'eacute','ê':'ecirc','ë':'euml','ì':'igrave','í':'iacute','î':'icirc','ï':'iuml','ð':'eth','ñ':'ntilde','ò':'ograve','ó':'oacute','ô':'ocirc','õ':'otilde','ö':'ouml','ø':'oslash','ù':'ugrave','ú':'uacute','û':'ucirc','ü':'uuml','ý':'yacute','þ':'thorn','ÿ':'yuml','Œ':'OElig','œ':'oelig','Š':'Scaron','š':'scaron','Ÿ':'Yuml'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;};if (FCKConfig.IncludeGreekEntities){B={'Α':'Alpha','Β':'Beta','Γ':'Gamma','Δ':'Delta','Ε':'Epsilon','Ζ':'Zeta','Η':'Eta','Θ':'Theta','Ι':'Iota','Κ':'Kappa','Λ':'Lambda','Μ':'Mu','�':'Nu','Ξ':'Xi','Ο':'Omicron','Π':'Pi','Ρ':'Rho','Σ':'Sigma','Τ':'Tau','Υ':'Upsilon','Φ':'Phi','Χ':'Chi','Ψ':'Psi','Ω':'Omega','α':'alpha','β':'beta','γ':'gamma','δ':'delta','ε':'epsilon','ζ':'zeta','η':'eta','θ':'theta','ι':'iota','κ':'kappa','λ':'lambda','μ':'mu','ν':'nu','ξ':'xi','ο':'omicron','π':'pi','�':'rho','ς':'sigmaf','σ':'sigma','τ':'tau','υ':'upsilon','φ':'phi','χ':'chi','ψ':'psi','ω':'omega','\u03d1':'thetasym','\u03d2':'upsih','\u03d6':'piv'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;}}else{FCKXHtmlEntities.Entities={};A=' ';};var C='['+A+']';if (FCKConfig.ProcessNumericEntities) C='[^ -~]|'+C;var D=FCKConfig.AdditionalNumericEntities;if (D&&D.length>0) C+='|'+FCKConfig.AdditionalNumericEntities;FCKXHtmlEntities.EntitiesRegex=new RegExp(C,'g');};
-var FCKXHtml={};FCKXHtml.CurrentJobNum=0;FCKXHtml.GetXHTML=function(A,B,C){FCKDomTools.CheckAndRemovePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);FCKXHtmlEntities.Initialize();this._NbspEntity=(FCKConfig.ProcessHTMLEntities?'nbsp':'#160');var D=FCK.IsDirty();FCKXHtml.SpecialBlocks=[];this.XML=FCKTools.CreateXmlObject('DOMDocument');this.MainNode=this.XML.appendChild(this.XML.createElement('xhtml'));FCKXHtml.CurrentJobNum++;if (B) this._AppendNode(this.MainNode,A);else this._AppendChildNodes(this.MainNode,A,false);var E=this._GetMainXmlString();this.XML=null;if (FCKBrowserInfo.IsSafari) E=E.replace(/^<xhtml.*?>/,'<xhtml>');E=E.substr(7,E.length-15).Trim();if (FCKConfig.DocType.length>0&&FCKRegexLib.HtmlDocType.test(FCKConfig.DocType)) E=E.replace(FCKRegexLib.SpaceNoClose,'>');else E=E.replace(FCKRegexLib.SpaceNoClose,' />');if (FCKConfig.ForceSimpleAmpersand) E=E.replace(FCKRegexLib.ForceSimpleAmpersand,'&');if (C) E=FCKCodeFormatter.Format(E);for (var i=0;i<FCKXHtml.SpecialBlocks.length;i++){var F=new RegExp('___FCKsi___'+i);E=E.replace(F,FCKXHtml.SpecialBlocks[i]);};E=E.replace(FCKRegexLib.GeckoEntitiesMarker,'&');if (!D) FCK.ResetIsDirty();FCKDomTools.EnforcePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);return E;};FCKXHtml._AppendAttribute=function(A,B,C){try{if (C==undefined||C==null) C='';else if (C.replace){if (FCKConfig.ForceSimpleAmpersand) C=C.replace(/&/g,'___FCKAmp___');C=C.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity);};var D=this.XML.createAttribute(B);D.value=C;A.attributes.setNamedItem(D);}catch (e){}};FCKXHtml._AppendChildNodes=function(A,B,C){var D=B.firstChild;while (D){this._AppendNode(A,D);D=D.nextSibling;};if (C&&B.tagName&&B.tagName.toLowerCase()!='pre'){FCKDomTools.TrimNode(A);if (FCKConfig.FillEmptyBlocks){var E=A.lastChild;if (E&&E.nodeType==1&&E.nodeName=='br') this._AppendEntity(A,this._NbspEntity);}};if (A.childNodes.length==0){if (C&&FCKConfig.FillEmptyBlocks){this._AppendEntity(A,this._NbspEntity);return A;};var F=A.nodeName;if (FCKListsLib.InlineChildReqElements[F]) return null;if (!FCKListsLib.EmptyElements[F]) A.appendChild(this.XML.createTextNode(''));};return A;};FCKXHtml._AppendNode=function(A,B){if (!B) return false;switch (B.nodeType){case 1:if (FCKBrowserInfo.IsGecko&&B.tagName.toLowerCase()=='br'&&B.parentNode.tagName.toLowerCase()=='pre'){var C='\r';if (B==B.parentNode.firstChild) C+='\r';return FCKXHtml._AppendNode(A,this.XML.createTextNode(C));};if (B.getAttribute('_fckfakelement')) return FCKXHtml._AppendNode(A,FCK.GetRealElement(B));if (FCKBrowserInfo.IsGecko&&(B.hasAttribute('_moz_editor_bogus_node')||B.getAttribute('type')=='_moz')){if (B.nextSibling) return false;else{B.removeAttribute('_moz_editor_bogus_node');B.removeAttribute('type');}};if (B.getAttribute('_fcktemp')) return false;var D=B.tagName.toLowerCase();if (FCKBrowserInfo.IsIE){if (B.scopeName&&B.scopeName!='HTML'&&B.scopeName!='FCK') D=B.scopeName.toLowerCase()+':'+D;}else{if (D.StartsWith('fck:')) D=D.Remove(0,4);};if (!FCKRegexLib.ElementName.test(D)) return false;if (B._fckxhtmljob&&B._fckxhtmljob==FCKXHtml.CurrentJobNum) return false;var E=this.XML.createElement(D);FCKXHtml._AppendAttributes(A,B,E,D);B._fckxhtmljob=FCKXHtml.CurrentJobNum;var F=FCKXHtml.TagProcessors[D];if (F) E=F(E,B,A);else E=this._AppendChildNodes(E,B,Boolean(FCKListsLib.NonEmptyBlockElements[D]));if (!E) return false;A.appendChild(E);break;case 3:if (B.parentNode&&B.parentNode.nodeName.IEquals('pre')) return this._AppendTextNode(A,B.nodeValue);return this._AppendTextNode(A,B.nodeValue.ReplaceNewLineChars(' '));case 8:if (FCKBrowserInfo.IsIE&&!B.innerHTML) break;try { A.appendChild(this.XML.createComment(B.nodeValue));}catch (e) {};break;default:A.appendChild(this.XML.createComment("Element not supported - Type: "+B.nodeType+" Name: "+B.nodeName));break;};return true;};FCKXHtml._AppendSpecialItem=function(A){return '___FCKsi___'+FCKXHtml.SpecialBlocks.AddItem(A);};FCKXHtml._AppendEntity=function(A,B){A.appendChild(this.XML.createTextNode('#?-:'+B+';'));};FCKXHtml._AppendTextNode=function(A,B){var C=B.length>0;if (C) A.appendChild(this.XML.createTextNode(B.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity)));return C;};function FCKXHtml_GetEntity(A){var B=FCKXHtmlEntities.Entities[A]||('#'+A.charCodeAt(0));return '#?-:'+B+';';};FCKXHtml.TagProcessors={a:function(A,B){if (B.innerHTML.Trim().length==0&&!B.name) return false;var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);};A=FCKXHtml._AppendChildNodes(A,B,false);return A;},area:function(A,B){var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (!A.attributes.getNamedItem('coords')){var D=B.getAttribute('coords',2);if (D&&D!='0,0,0') FCKXHtml._AppendAttribute(A,'coords',D);};if (!A.attributes.getNamedItem('shape')){var E=B.getAttribute('shape',2);if (E&&E.length>0) FCKXHtml._AppendAttribute(A,'shape',E.toLowerCase());}};return A;},body:function(A,B){A=FCKXHtml._AppendChildNodes(A,B,false);A.removeAttribute('spellcheck');return A;},iframe:function(A,B){var C=B.innerHTML;if (FCKBrowserInfo.IsGecko) C=FCKTools.HTMLDecode(C);C=C.replace(/\s_fcksavedurl="[^"]*"/g,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},img:function(A,B){if (!A.attributes.getNamedItem('alt')) FCKXHtml._AppendAttribute(A,'alt','');var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'src',C);if (B.style.width) A.removeAttribute('width');if (B.style.height) A.removeAttribute('height');return A;},li:function(A,B,C){if (C.nodeName.IEquals(['ul','ol'])) return FCKXHtml._AppendChildNodes(A,B,true);var D=FCKXHtml.XML.createElement('ul');B._fckxhtmljob=null;do{FCKXHtml._AppendNode(D,B);do{B=FCKDomTools.GetNextSibling(B);} while (B&&B.nodeType==3&&B.nodeValue.Trim().length==0)}	while (B&&B.nodeName.toLowerCase()=='li') return D;},ol:function(A,B,C){if (B.innerHTML.Trim().length==0) return false;var D=C.lastChild;if (D&&D.nodeType==3) D=D.previousSibling;if (D&&D.nodeName.toUpperCase()=='LI'){B._fckxhtmljob=null;FCKXHtml._AppendNode(D,B);return false;};A=FCKXHtml._AppendChildNodes(A,B);return A;},pre:function (A,B){var C=B.firstChild;if (C&&C.nodeType==3) A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem('\r\n')));FCKXHtml._AppendChildNodes(A,B,true);return A;},script:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/javascript');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(B.text)));return A;},span:function(A,B){if (B.innerHTML.length==0) return false;A=FCKXHtml._AppendChildNodes(A,B,false);return A;},style:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/css');var C=B.innerHTML;if (FCKBrowserInfo.IsIE) C=C.replace(/^(\r\n|\n|\r)/,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},title:function(A,B){A.appendChild(FCKXHtml.XML.createTextNode(FCK.EditorDocument.title));return A;}};FCKXHtml.TagProcessors.ul=FCKXHtml.TagProcessors.ol;
+var FCKLanguageManager=FCK.Language={AvailableLanguages:{af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-uk':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',is:'Icelandic',it:'Italian',ja:'Japanese',km:'Khmer',ko:'Korean',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},GetActiveLanguage:function(){if (FCKConfig.AutoDetectLanguage){var A;if (navigator.userLanguage) A=navigator.userLanguage.toLowerCase();else if (navigator.language) A=navigator.language.toLowerCase();else{return FCKConfig.DefaultLanguage;};if (A.length>=5){A=A.substr(0,5);if (this.AvailableLanguages[A]) return A;};if (A.length>=2){A=A.substr(0,2);if (this.AvailableLanguages[A]) return A;}};return this.DefaultLanguage;},TranslateElements:function(A,B,C,D){var e=A.getElementsByTagName(B);var E,s;for (var i=0;i<e.length;i++){if ((E=e[i].getAttribute('fckLang'))){if ((s=FCKLang[E])){if (D) s=FCKTools.HTMLEncode(s);e[i][C]=s;}}}},TranslatePage:function(A){this.TranslateElements(A,'INPUT','value');this.TranslateElements(A,'SPAN','innerHTML');this.TranslateElements(A,'LABEL','innerHTML');this.TranslateElements(A,'OPTION','innerHTML',true);this.TranslateElements(A,'LEGEND','innerHTML');},Initialize:function(){if (this.AvailableLanguages[FCKConfig.DefaultLanguage]) this.DefaultLanguage=FCKConfig.DefaultLanguage;else this.DefaultLanguage='en';this.ActiveLanguage={};this.ActiveLanguage.Code=this.GetActiveLanguage();this.ActiveLanguage.Name=this.AvailableLanguages[this.ActiveLanguage.Code];}};
+var FCKXHtmlEntities={};FCKXHtmlEntities.Initialize=function(){if (FCKXHtmlEntities.Entities) return;var A='';var B,e;if (FCKConfig.ProcessHTMLEntities){FCKXHtmlEntities.Entities={' ':'nbsp','¡':'iexcl','¢':'cent','£':'pound','¤':'curren','¥':'yen','¦':'brvbar','§':'sect','¨':'uml','©':'copy','ª':'ordf','«':'laquo','¬':'not','­':'shy','®':'reg','¯':'macr','°':'deg','±':'plusmn','²':'sup2','³':'sup3','´':'acute','µ':'micro','¶':'para','·':'middot','¸':'cedil','¹':'sup1','º':'ordm','»':'raquo','¼':'frac14','½':'frac12','¾':'frac34','¿':'iquest','×':'times','÷':'divide','ƒ':'fnof','•':'bull','…':'hellip','′':'prime','″':'Prime','‾':'oline','�':'frasl','℘':'weierp','ℑ':'image','ℜ':'real','™':'trade','ℵ':'alefsym','�':'larr','↑':'uarr','→':'rarr','↓':'darr','↔':'harr','↵':'crarr','�':'lArr','⇑':'uArr','⇒':'rArr','⇓':'dArr','⇔':'hArr','∀':'forall','∂':'part','∃':'exist','∅':'empty','∇':'nabla','∈':'isin','∉':'notin','∋':'ni','�':'prod','∑':'sum','−':'minus','∗':'lowast','√':'radic','�':'prop','∞':'infin','∠':'ang','∧':'and','∨':'or','∩':'cap','∪':'cup','∫':'int','∴':'there4','∼':'sim','≅':'cong','≈':'asymp','≠':'ne','≡':'equiv','≤':'le','≥':'ge','⊂':'sub','⊃':'sup','⊄':'nsub','⊆':'sube','⊇':'supe','⊕':'oplus','⊗':'otimes','⊥':'perp','⋅':'sdot','\u2308':'lceil','\u2309':'rceil','\u230a':'lfloor','\u230b':'rfloor','\u2329':'lang','\u232a':'rang','◊':'loz','♠':'spades','♣':'clubs','♥':'hearts','♦':'diams','"':'quot','>':'gt','ˆ':'circ','˜':'tilde',' ':'ensp',' ':'emsp',' ':'thinsp','‌':'zwnj','�':'zwj','‎':'lrm','�':'rlm','–':'ndash','—':'mdash','‘':'lsquo','’':'rsquo','‚':'sbquo','“':'ldquo','�':'rdquo','„':'bdquo','†':'dagger','‡':'Dagger','‰':'permil','‹':'lsaquo','›':'rsaquo','€':'euro'};for (e in FCKXHtmlEntities.Entities) A+=e;if (FCKConfig.IncludeLatinEntities){B={'À':'Agrave','�':'Aacute','Â':'Acirc','Ã':'Atilde','Ä':'Auml','Å':'Aring','Æ':'AElig','Ç':'Ccedil','È':'Egrave','É':'Eacute','Ê':'Ecirc','Ë':'Euml','Ì':'Igrave','�':'Iacute','Î':'Icirc','�':'Iuml','�':'ETH','Ñ':'Ntilde','Ò':'Ograve','Ó':'Oacute','Ô':'Ocirc','Õ':'Otilde','Ö':'Ouml','Ø':'Oslash','Ù':'Ugrave','Ú':'Uacute','Û':'Ucirc','Ü':'Uuml','�':'Yacute','Þ':'THORN','ß':'szlig','à':'agrave','á':'aacute','â':'acirc','ã':'atilde','ä':'auml','å':'aring','æ':'aelig','ç':'ccedil','è':'egrave','é':'eacute','ê':'ecirc','ë':'euml','ì':'igrave','í':'iacute','î':'icirc','ï':'iuml','ð':'eth','ñ':'ntilde','ò':'ograve','ó':'oacute','ô':'ocirc','õ':'otilde','ö':'ouml','ø':'oslash','ù':'ugrave','ú':'uacute','û':'ucirc','ü':'uuml','ý':'yacute','þ':'thorn','ÿ':'yuml','Œ':'OElig','œ':'oelig','Š':'Scaron','š':'scaron','Ÿ':'Yuml'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;};if (FCKConfig.IncludeGreekEntities){B={'Α':'Alpha','Β':'Beta','Γ':'Gamma','Δ':'Delta','Ε':'Epsilon','Ζ':'Zeta','Η':'Eta','Θ':'Theta','Ι':'Iota','Κ':'Kappa','Λ':'Lambda','Μ':'Mu','�':'Nu','Ξ':'Xi','Ο':'Omicron','Π':'Pi','Ρ':'Rho','Σ':'Sigma','Τ':'Tau','Υ':'Upsilon','Φ':'Phi','Χ':'Chi','Ψ':'Psi','Ω':'Omega','α':'alpha','β':'beta','γ':'gamma','δ':'delta','ε':'epsilon','ζ':'zeta','η':'eta','θ':'theta','ι':'iota','κ':'kappa','λ':'lambda','μ':'mu','ν':'nu','ξ':'xi','ο':'omicron','π':'pi','�':'rho','ς':'sigmaf','σ':'sigma','τ':'tau','υ':'upsilon','φ':'phi','χ':'chi','ψ':'psi','ω':'omega','\u03d1':'thetasym','\u03d2':'upsih','\u03d6':'piv'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;}}else{FCKXHtmlEntities.Entities={'>':'gt'};A='>';A+=' ';};var C='['+A+']';if (FCKConfig.ProcessNumericEntities) C='[^ -~]|'+C;var D=FCKConfig.AdditionalNumericEntities;if (D&&D.length>0) C+='|'+FCKConfig.AdditionalNumericEntities;FCKXHtmlEntities.EntitiesRegex=new RegExp(C,'g');};
+var FCKXHtml={};FCKXHtml.CurrentJobNum=0;FCKXHtml.GetXHTML=function(A,B,C){FCKDomTools.CheckAndRemovePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);FCKXHtmlEntities.Initialize();this._NbspEntity=(FCKConfig.ProcessHTMLEntities?'nbsp':'#160');var D=FCK.IsDirty();FCKXHtml.SpecialBlocks=[];this.XML=FCKTools.CreateXmlObject('DOMDocument');this.MainNode=this.XML.appendChild(this.XML.createElement('xhtml'));FCKXHtml.CurrentJobNum++;if (B) this._AppendNode(this.MainNode,A);else this._AppendChildNodes(this.MainNode,A,false);var E=this._GetMainXmlString();this.XML=null;if (FCKBrowserInfo.IsSafari) E=E.replace(/^<xhtml.*?>/,'<xhtml>');E=E.substr(7,E.length-15).Trim();if (FCKConfig.DocType.length>0&&FCKRegexLib.HtmlDocType.test(FCKConfig.DocType)) E=E.replace(FCKRegexLib.SpaceNoClose,'>');else E=E.replace(FCKRegexLib.SpaceNoClose,' />');if (FCKConfig.ForceSimpleAmpersand) E=E.replace(FCKRegexLib.ForceSimpleAmpersand,'&');if (C) E=FCKCodeFormatter.Format(E);for (var i=0;i<FCKXHtml.SpecialBlocks.length;i++){var F=new RegExp('___FCKsi___'+i);E=E.replace(F,FCKXHtml.SpecialBlocks[i]);};E=E.replace(FCKRegexLib.GeckoEntitiesMarker,'&');if (!D) FCK.ResetIsDirty();FCKDomTools.EnforcePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);return E;};FCKXHtml._AppendAttribute=function(A,B,C){try{if (C==undefined||C==null) C='';else if (C.replace){if (FCKConfig.ForceSimpleAmpersand) C=C.replace(/&/g,'___FCKAmp___');C=C.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity);};var D=this.XML.createAttribute(B);D.value=C;A.attributes.setNamedItem(D);}catch (e){}};FCKXHtml._AppendChildNodes=function(A,B,C){var D=B.firstChild;while (D){this._AppendNode(A,D);D=D.nextSibling;};if (C&&B.tagName&&B.tagName.toLowerCase()!='pre'){FCKDomTools.TrimNode(A);if (FCKConfig.FillEmptyBlocks){var E=A.lastChild;if (E&&E.nodeType==1&&E.nodeName=='br') this._AppendEntity(A,this._NbspEntity);}};if (A.childNodes.length==0){if (C&&FCKConfig.FillEmptyBlocks){this._AppendEntity(A,this._NbspEntity);return A;};var F=A.nodeName;if (FCKListsLib.InlineChildReqElements[F]) return null;if (!FCKListsLib.EmptyElements[F]) A.appendChild(this.XML.createTextNode(''));};return A;};FCKXHtml._AppendNode=function(A,B){if (!B) return false;switch (B.nodeType){case 1:if (FCKBrowserInfo.IsGecko&&B.tagName.toLowerCase()=='br'&&B.parentNode.tagName.toLowerCase()=='pre'){var C='\r';if (B==B.parentNode.firstChild) C+='\r';return FCKXHtml._AppendNode(A,this.XML.createTextNode(C));};if (B.getAttribute('_fckfakelement')) return FCKXHtml._AppendNode(A,FCK.GetRealElement(B));if (FCKBrowserInfo.IsGecko&&(B.hasAttribute('_moz_editor_bogus_node')||B.getAttribute('type')=='_moz')){if (B.nextSibling) return false;else{B.removeAttribute('_moz_editor_bogus_node');B.removeAttribute('type');}};if (B.getAttribute('_fcktemp')) return false;var D=B.tagName.toLowerCase();if (FCKBrowserInfo.IsIE){if (B.scopeName&&B.scopeName!='HTML'&&B.scopeName!='FCK') D=B.scopeName.toLowerCase()+':'+D;}else{if (D.StartsWith('fck:')) D=D.Remove(0,4);};if (!FCKRegexLib.ElementName.test(D)) return false;if (B._fckxhtmljob&&B._fckxhtmljob==FCKXHtml.CurrentJobNum) return false;var E=this.XML.createElement(D);FCKXHtml._AppendAttributes(A,B,E,D);B._fckxhtmljob=FCKXHtml.CurrentJobNum;var F=FCKXHtml.TagProcessors[D];if (F) E=F(E,B,A);else E=this._AppendChildNodes(E,B,Boolean(FCKListsLib.NonEmptyBlockElements[D]));if (!E) return false;A.appendChild(E);break;case 3:if (B.parentNode&&B.parentNode.nodeName.IEquals('pre')) return this._AppendTextNode(A,B.nodeValue);return this._AppendTextNode(A,B.nodeValue.ReplaceNewLineChars(' '));case 8:if (FCKBrowserInfo.IsIE&&!B.innerHTML) break;try { A.appendChild(this.XML.createComment(B.nodeValue));}catch (e) {};break;default:A.appendChild(this.XML.createComment("Element not supported - Type: "+B.nodeType+" Name: "+B.nodeName));break;};return true;};FCKXHtml._AppendSpecialItem=function(A){return '___FCKsi___'+(FCKXHtml.SpecialBlocks.push(A)-1);};FCKXHtml._AppendEntity=function(A,B){A.appendChild(this.XML.createTextNode('#?-:'+B+';'));};FCKXHtml._AppendTextNode=function(A,B){var C=B.length>0;if (C) A.appendChild(this.XML.createTextNode(B.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity)));return C;};function FCKXHtml_GetEntity(A){var B=FCKXHtmlEntities.Entities[A]||('#'+A.charCodeAt(0));return '#?-:'+B+';';};FCKXHtml.TagProcessors={a:function(A,B){if (B.innerHTML.Trim().length==0&&!B.name) return false;var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);};A=FCKXHtml._AppendChildNodes(A,B,false);return A;},area:function(A,B){var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (!A.attributes.getNamedItem('coords')){var D=B.getAttribute('coords',2);if (D&&D!='0,0,0') FCKXHtml._AppendAttribute(A,'coords',D);};if (!A.attributes.getNamedItem('shape')){var E=B.getAttribute('shape',2);if (E&&E.length>0) FCKXHtml._AppendAttribute(A,'shape',E.toLowerCase());}};return A;},body:function(A,B){A=FCKXHtml._AppendChildNodes(A,B,false);A.removeAttribute('spellcheck');return A;},iframe:function(A,B){var C=B.innerHTML;if (FCKBrowserInfo.IsGecko) C=FCKTools.HTMLDecode(C);C=C.replace(/\s_fcksavedurl="[^"]*"/g,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},img:function(A,B){if (!A.attributes.getNamedItem('alt')) FCKXHtml._AppendAttribute(A,'alt','');var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'src',C);if (B.style.width) A.removeAttribute('width');if (B.style.height) A.removeAttribute('height');return A;},li:function(A,B,C){if (C.nodeName.IEquals(['ul','ol'])) return FCKXHtml._AppendChildNodes(A,B,true);var D=FCKXHtml.XML.createElement('ul');B._fckxhtmljob=null;do{FCKXHtml._AppendNode(D,B);do{B=FCKDomTools.GetNextSibling(B);} while (B&&B.nodeType==3&&B.nodeValue.Trim().length==0)}	while (B&&B.nodeName.toLowerCase()=='li') return D;},ol:function(A,B,C){if (B.innerHTML.Trim().length==0) return false;var D=C.lastChild;if (D&&D.nodeType==3) D=D.previousSibling;if (D&&D.nodeName.toUpperCase()=='LI'){B._fckxhtmljob=null;FCKXHtml._AppendNode(D,B);return false;};A=FCKXHtml._AppendChildNodes(A,B);return A;},pre:function (A,B){var C=B.firstChild;if (C&&C.nodeType==3) A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem('\r\n')));FCKXHtml._AppendChildNodes(A,B,true);return A;},script:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/javascript');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(B.text)));return A;},span:function(A,B){if (B.innerHTML.length==0) return false;A=FCKXHtml._AppendChildNodes(A,B,false);return A;},style:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/css');var C=B.innerHTML;if (FCKBrowserInfo.IsIE) C=C.replace(/^(\r\n|\n|\r)/,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},title:function(A,B){A.appendChild(FCKXHtml.XML.createTextNode(FCK.EditorDocument.title));return A;}};FCKXHtml.TagProcessors.ul=FCKXHtml.TagProcessors.ol;
 FCKXHtml._GetMainXmlString=function(){return (new XMLSerializer()).serializeToString(this.MainNode);};FCKXHtml._AppendAttributes=function(A,B,C){var D=B.attributes;for (var n=0;n<D.length;n++){var E=D[n];if (E.specified){var F=E.nodeName.toLowerCase();var G;if (F.StartsWith('_fck')) continue;else if (F.indexOf('_moz')==0) continue;else if (F=='class'){G=E.nodeValue.replace(FCKRegexLib.FCK_Class,'');if (G.length==0) continue;}else if (E.nodeValue===true) G=F;else G=B.getAttribute(F,2);this._AppendAttribute(C,F,G);}}};if (FCKBrowserInfo.IsOpera){FCKXHtml.TagProcessors['head']=function(A,B){FCKXHtml.XML._HeadElement=A;A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['meta']=function(A,B,C){if (B.parentNode.nodeName.toLowerCase()!='head'){var D=FCKXHtml.XML._HeadElement;if (D&&C!=D){delete B._fckxhtmljob;FCKXHtml._AppendNode(D,B);return null;}};return A;}};if (FCKBrowserInfo.IsGecko){FCKXHtml.TagProcessors['link']=function(A,B){if (B.href.substr(0,9).toLowerCase()=='chrome://') return false;return A;}};
-var FCKCodeFormatter={};FCKCodeFormatter.Init=function(){var A=this.Regex={};A.BlocksOpener=/\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.BlocksCloser=/\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.NewLineTags=/\<(BR|HR)[^\>]*\>/gi;A.MainTags=/\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi;A.LineSplitter=/\s*\n+\s*/g;A.IncreaseIndent=/^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i;A.DecreaseIndent=/^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i;A.FormatIndentatorRemove=new RegExp('^'+FCKConfig.FormatIndentator);A.ProtectedTags=/(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi;};FCKCodeFormatter._ProtectData=function(A,B,C,D){return B+'___FCKpd___'+FCKCodeFormatter.ProtectedData.AddItem(C)+D;};FCKCodeFormatter.Format=function(A){if (!this.Regex) this.Init();FCKCodeFormatter.ProtectedData=[];var B=A.replace(this.Regex.ProtectedTags,FCKCodeFormatter._ProtectData);B=B.replace(this.Regex.BlocksOpener,'\n$&');B=B.replace(this.Regex.BlocksCloser,'$&\n');B=B.replace(this.Regex.NewLineTags,'$&\n');B=B.replace(this.Regex.MainTags,'\n$&\n');var C='';var D=B.split(this.Regex.LineSplitter);B='';for (var i=0;i<D.length;i++){var E=D[i];if (E.length==0) continue;if (this.Regex.DecreaseIndent.test(E)) C=C.replace(this.Regex.FormatIndentatorRemove,'');B+=C+E+'\n';if (this.Regex.IncreaseIndent.test(E)) C+=FCKConfig.FormatIndentator;};for (var j=0;j<FCKCodeFormatter.ProtectedData.length;j++){var F=new RegExp('___FCKpd___'+j);B=B.replace(F,FCKCodeFormatter.ProtectedData[j].replace(/\$/g,'$$$$'));};return B.Trim();};
+var FCKCodeFormatter={};FCKCodeFormatter.Init=function(){var A=this.Regex={};A.BlocksOpener=/\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.BlocksCloser=/\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.NewLineTags=/\<(BR|HR)[^\>]*\>/gi;A.MainTags=/\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi;A.LineSplitter=/\s*\n+\s*/g;A.IncreaseIndent=/^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \/\>]/i;A.DecreaseIndent=/^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \>]/i;A.FormatIndentatorRemove=new RegExp('^'+FCKConfig.FormatIndentator);A.ProtectedTags=/(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi;};FCKCodeFormatter._ProtectData=function(A,B,C,D){return B+'___FCKpd___'+(FCKCodeFormatter.ProtectedData.push(C)-1)+D;};FCKCodeFormatter.Format=function(A){if (!this.Regex) this.Init();FCKCodeFormatter.ProtectedData=[];var B=A.replace(this.Regex.ProtectedTags,FCKCodeFormatter._ProtectData);B=B.replace(this.Regex.BlocksOpener,'\n$&');B=B.replace(this.Regex.BlocksCloser,'$&\n');B=B.replace(this.Regex.NewLineTags,'$&\n');B=B.replace(this.Regex.MainTags,'\n$&\n');var C='';var D=B.split(this.Regex.LineSplitter);B='';for (var i=0;i<D.length;i++){var E=D[i];if (E.length==0) continue;if (this.Regex.DecreaseIndent.test(E)) C=C.replace(this.Regex.FormatIndentatorRemove,'');B+=C+E+'\n';if (this.Regex.IncreaseIndent.test(E)) C+=FCKConfig.FormatIndentator;};for (var j=0;j<FCKCodeFormatter.ProtectedData.length;j++){var F=new RegExp('___FCKpd___'+j);B=B.replace(F,FCKCodeFormatter.ProtectedData[j].replace(/\$/g,'$$$$'));};return B.Trim();};
 var FCKUndo={};FCKUndo.SavedData=[];FCKUndo.CurrentIndex=-1;FCKUndo.TypesCount=0;FCKUndo.Changed=false;FCKUndo.MaxTypes=25;FCKUndo.Typing=false;FCKUndo.SaveLocked=false;FCKUndo._GetBookmark=function(){FCKSelection.Restore();var A=new FCKDomRange(FCK.EditorWindow);try{A.MoveToSelection();}catch (e){return null;};if (FCKBrowserInfo.IsIE){var B=A.CreateBookmark();var C=FCK.EditorDocument.body.innerHTML;A.MoveToBookmark(B);return [B,C];};return A.CreateBookmark2();};FCKUndo._SelectBookmark=function(A){if (!A) return;var B=new FCKDomRange(FCK.EditorWindow);if (A instanceof Object){if (FCKBrowserInfo.IsIE) B.MoveToBookmark(A[0]);else B.MoveToBookmark2(A);try{B.Select();}catch (e){B.MoveToPosition(FCK.EditorDocument.body,4);B.Select();}}};FCKUndo._CompareCursors=function(A,B){for (var i=0;i<Math.min(A.length,B.length);i++){if (A[i]<B[i]) return-1;else if (A[i]>B[i]) return 1;};if (A.length<B.length) return-1;else if (A.length>B.length) return 1;return 0;};FCKUndo._CheckIsBookmarksEqual=function(A,B){if (!(A&&B)) return false;if (FCKBrowserInfo.IsIE){var C=A[1].search(A[0].StartId);var D=B[1].search(B[0].StartId);var E=A[1].search(A[0].EndId);var F=B[1].search(B[0].EndId);return C==D&&E==F;}else{return this._CompareCursors(A.Start,B.Start)==0&&this._CompareCursors(A.End,B.End)==0;}};FCKUndo.SaveUndoStep=function(){if (FCK.EditMode!=0||this.SaveLocked) return;if (this.SavedData.length) this.Changed=true;var A=FCK.EditorDocument.body.innerHTML;var B=this._GetBookmark();this.SavedData=this.SavedData.slice(0,this.CurrentIndex+1);if (this.CurrentIndex>0&&A==this.SavedData[this.CurrentIndex][0]&&this._CheckIsBookmarksEqual(B,this.SavedData[this.CurrentIndex][1])) return;else if (this.CurrentIndex==0&&this.SavedData.length&&A==this.SavedData[0][0]){this.SavedData[0][1]=B;return;};if (this.CurrentIndex+1>=FCKConfig.MaxUndoLevels) this.SavedData.shift();else this.CurrentIndex++;this.SavedData[this.CurrentIndex]=[A,B];FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.CheckUndoState=function(){return (this.Changed||this.CurrentIndex>0);};FCKUndo.CheckRedoState=function(){return (this.CurrentIndex<(this.SavedData.length-1));};FCKUndo.Undo=function(){if (this.CheckUndoState()){if (this.CurrentIndex==(this.SavedData.length-1)){this.SaveUndoStep();};this._ApplyUndoLevel(--this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo.Redo=function(){if (this.CheckRedoState()){this._ApplyUndoLevel(++this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo._ApplyUndoLevel=function(A){var B=this.SavedData[A];if (!B) return;if (FCKBrowserInfo.IsIE){if (B[1]&&B[1][1]) FCK.SetInnerHtml(B[1][1]);else FCK.SetInnerHtml(B[0]);}else FCK.EditorDocument.body.innerHTML=B[0];this._SelectBookmark(B[1]);this.TypesCount=0;this.Changed=false;this.Typing=false;};
 var FCKEditingArea=function(A){this.TargetElement=A;this.Mode=0;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKEditingArea_Cleanup);};FCKEditingArea.prototype.Start=function(A,B){var C=this.TargetElement;var D=FCKTools.GetElementDocument(C);while(C.firstChild) C.removeChild(C.firstChild);if (this.Mode==0){if (FCK_IS_CUSTOM_DOMAIN) A='<script>document.domain="'+FCK_RUNTIME_DOMAIN+'";</script>'+A;if (FCKBrowserInfo.IsIE) A=A.replace(/(<base[^>]*?)\s*\/?>(?!\s*<\/base>)/gi,'$1></base>');else if (!B){var E=A.match(FCKRegexLib.BeforeBody);var F=A.match(FCKRegexLib.AfterBody);if (E&&F){var G=A.substr(E[1].length,A.length-E[1].length-F[1].length);A=E[1]+'&nbsp;'+F[1];if (FCKBrowserInfo.IsGecko&&(G.length==0||FCKRegexLib.EmptyParagraph.test(G))) G='<br type="_moz">';this._BodyHTML=G;}else this._BodyHTML=A;};var H=this.IFrame=D.createElement('iframe');var I='<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>';H.frameBorder=0;H.style.width=H.style.height='100%';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A.replace(/<head>/i,'<head>'+I);H.src='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.parent._FCKHtmlToLoad );document.close() ;window.parent._FCKHtmlToLoad = null ;})() )';}else if (!FCKBrowserInfo.IsGecko){H.src='javascript:void(0)';};C.appendChild(H);this.Window=H.contentWindow;if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){var J=this.Window.document;J.open();J.write(A.replace(/<head>/i,'<head>'+I));J.close();};if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.EditingArea_Start(J,A);if (FCKBrowserInfo.IsGecko10&&!B){this.Start(A,true);return;};if (H.readyState&&H.readyState!='completed'){var K=this;setTimeout(function(){try{K.Window.document.documentElement.doScroll("left");}catch(e){setTimeout(arguments.callee,0);return;};K.Window._FCKEditingArea=K;FCKEditingArea_CompleteStart.call(K.Window);},0);}else{this.Window._FCKEditingArea=this;if (FCKBrowserInfo.IsGecko10) this.Window.setTimeout(FCKEditingArea_CompleteStart,500);else FCKEditingArea_CompleteStart.call(this.Window);}}else{var L=this.Textarea=D.createElement('textarea');L.className='SourceField';L.dir='ltr';FCKDomTools.SetElementStyles(L,{width:'100%',height:'100%',border:'none',resize:'none',outline:'none'});C.appendChild(L);L.value=A;FCKTools.RunFunction(this.OnLoad);}};function FCKEditingArea_CompleteStart(){if (!this.document.body){this.setTimeout(FCKEditingArea_CompleteStart,50);return;};var A=this._FCKEditingArea;A.Document=A.Window.document;A.MakeEditable();FCKTools.RunFunction(A.OnLoad);};FCKEditingArea.prototype.MakeEditable=function(){var A=this.Document;if (FCKBrowserInfo.IsIE){A.body.disabled=true;A.body.contentEditable=true;A.body.removeAttribute("disabled");}else{try{A.body.spellcheck=(this.FFSpellChecker!==false);if (this._BodyHTML){A.body.innerHTML=this._BodyHTML;A.body.offsetLeft;this._BodyHTML=null;};A.designMode='on';A.execCommand('enableObjectResizing',false,!FCKConfig.DisableObjectResizing);A.execCommand('enableInlineTableEditing',false,!FCKConfig.DisableFFTableHandles);}catch (e){FCKTools.AddEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);}}};function FCKEditingArea_Document_AttributeNodeModified(A){var B=A.currentTarget.contentWindow._FCKEditingArea;if (B._timer) window.clearTimeout(B._timer);B._timer=FCKTools.SetTimeout(FCKEditingArea_MakeEditableByMutation,1000,B);};function FCKEditingArea_MakeEditableByMutation(){delete this._timer;FCKTools.RemoveEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);this.MakeEditable();};FCKEditingArea.prototype.Focus=function(){try{if (this.Mode==0){if (FCKBrowserInfo.IsIE) this._FocusIE();else this.Window.focus();}else{var A=FCKTools.GetElementDocument(this.Textarea);if ((!A.hasFocus||A.hasFocus())&&A.activeElement==this.Textarea) return;this.Textarea.focus();}}catch(e) {}};FCKEditingArea.prototype._FocusIE=function(){this.Document.body.setActive();this.Window.focus();var A=this.Document.selection.createRange();var B=A.parentElement();var C=B.nodeName.toLowerCase();if (B.childNodes.length>0||!(FCKListsLib.BlockElements[C]||FCKListsLib.NonEmptyBlockElements[C])){return;};A=new FCKDomRange(this.Window);A.MoveToElementEditStart(B);A.Select();};function FCKEditingArea_Cleanup(){if (this.Document) this.Document.body.innerHTML="";this.TargetElement=null;this.IFrame=null;this.Document=null;this.Textarea=null;if (this.Window){this.Window._FCKEditingArea=null;this.Window=null;}};
 var FCKKeystrokeHandler=function(A){this.Keystrokes={};this.CancelCtrlDefaults=(A!==false);};FCKKeystrokeHandler.prototype.AttachToElement=function(A){FCKTools.AddEventListenerEx(A,'keydown',_FCKKeystrokeHandler_OnKeyDown,this);if (FCKBrowserInfo.IsGecko10||FCKBrowserInfo.IsOpera||(FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac)) FCKTools.AddEventListenerEx(A,'keypress',_FCKKeystrokeHandler_OnKeyPress,this);};FCKKeystrokeHandler.prototype.SetKeystrokes=function(){for (var i=0;i<arguments.length;i++){var A=arguments[i];if (!A) continue;if (typeof(A[0])=='object') this.SetKeystrokes.apply(this,A);else{if (A.length==1) delete this.Keystrokes[A[0]];else this.Keystrokes[A[0]]=A[1]===true?true:A;}}};function _FCKKeystrokeHandler_OnKeyDown(A,B){var C=A.keyCode||A.which;var D=0;if (A.ctrlKey||A.metaKey) D+=CTRL;if (A.shiftKey) D+=SHIFT;if (A.altKey) D+=ALT;var E=C+D;var F=B._CancelIt=false;var G=B.Keystrokes[E];if (G){if (G===true||!(B.OnKeystroke&&B.OnKeystroke.apply(B,G))) return true;F=true;};if (F||(B.CancelCtrlDefaults&&D==CTRL&&(C<33||C>40))){B._CancelIt=true;if (A.preventDefault) return A.preventDefault();A.returnValue=false;A.cancelBubble=true;return false;};return true;};function _FCKKeystrokeHandler_OnKeyPress(A,B){if (B._CancelIt){if (A.preventDefault) return A.preventDefault();return false;};return true;};
@@ -52,37 +52,37 @@ var FCKStyle=function(A){this.Element=(A.Element||'span').toLowerCase();this._St
 var FCKStyles=FCK.Styles={_Callbacks:{},_ObjectStyles:{},ApplyStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){if (A.GetType()==2) A.ApplyToObject(FCKSelection.GetSelectedElement());else A.ApplyToSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},RemoveStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){A.RemoveFromSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},AttachStyleStateChange:function(A,B,C){var D=this._Callbacks[A];if (!D) D=this._Callbacks[A]=[];D.push([B,C]);},CheckSelectionChanges:function(){var A=FCKSelection.GetBoundaryParentElement(true);if (!A) return;var B=new FCKElementPath(A);var C=this.GetStyles();for (var D in C){var E=this._Callbacks[D];if (E){var F=C[D];var G=F.CheckActive(B);if (G!=(F._LastState||null)){F._LastState=G;for (var i=0;i<E.length;i++){var H=E[i][0];var I=E[i][1];H.call(I||window,D,G);}}}}},CheckStyleInSelection:function(A){return false;},_GetRemoveFormatTagsRegex:function (){var A=new RegExp('^(?:'+FCKConfig.RemoveFormatTags.replace(/,/g,'|')+')$','i');return (this._GetRemoveFormatTagsRegex=function(){return A;})&&A;},RemoveAll:function(){var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();if (A.CheckIsCollapsed()) return;A.Expand('inline_elements');var B=A.CreateBookmark(true);var C=A.GetBookmarkNode(B,true);var D=A.GetBookmarkNode(B,false);A.Release(true);var E=this._GetRemoveFormatTagsRegex();var F=new FCKElementPath(C);var G=F.Elements;var H;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;if (E.test(H.nodeName)) FCKDomTools.BreakParent(C,H,A);};F=new FCKElementPath(D);G=F.Elements;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;elementName=H.nodeName.toLowerCase();if (E.test(H.nodeName)) FCKDomTools.BreakParent(D,H,A);};var I=FCKDomTools.GetNextSourceNode(C,true,1);while (I){if (I==D) break;var J=FCKDomTools.GetNextSourceNode(I,false,1);if (E.test(I.nodeName)) FCKDomTools.RemoveNode(I,true);else FCKDomTools.RemoveAttributes(I,FCKConfig.RemoveAttributesArray);I=J;};A.SelectBookmark(B);FCK.Events.FireEvent('OnSelectionChange');},GetStyle:function(A){return this.GetStyles()[A];},GetStyles:function(){var A=this._GetStyles;if (!A){A=this._GetStyles=FCKTools.Merge(this._LoadStylesCore(),this._LoadStylesCustom(),this._LoadStylesXml());};return A;},CheckHasObjectStyle:function(A){return!!this._ObjectStyles[A];},_LoadStylesCore:function(){var A={};var B=FCKConfig.CoreStyles;for (var C in B){var D=A['_FCK_'+C]=new FCKStyle(B[C]);D.IsCore=true;};return A;},_LoadStylesCustom:function(){var A={};var B=FCKConfig.CustomStyles;if (B){for (var C in B){var D=A[C]=new FCKStyle(B[C]);D.Name=C;}};return A;},_LoadStylesXml:function(){var A={};var B=FCKConfig.StylesXmlPath;if (!B||B.length==0) return A;var C=new FCKXml();C.LoadUrl(B);var D=FCKXml.TransformToObject(C.SelectSingleNode('Styles'));var E=D.$Style;if (!E) return A;for (var i=0;i<E.length;i++){var F=E[i];var G=(F.element||'').toLowerCase();if (G.length==0) throw('The element name is required. Error loading "'+B+'"');var H={Element:G,Attributes:{},Styles:{},Overrides:[]};var I=F.$Attribute||[];for (var j=0;j<I.length;j++){H.Attributes[I[j].name]=I[j].value;};var J=F.$Style||[];for (j=0;j<J.length;j++){H.Styles[J[j].name]=J[j].value;};var K=F.$Override;if (K){for (j=0;j<K.length;j++){var L=K[j];var M={Element:L.element};var N=L.$Attribute;if (N){M.Attributes={};for (var k=0;k<N.length;k++){var O=N[k].value||null;if (O){var P=O&&FCKRegexLib.RegExp.exec(O);if (P) O=new RegExp(P[1],P[2]||'');};M.Attributes[N[k].name]=O;}};H.Overrides.push(M);}};var Q=new FCKStyle(H);Q.Name=F.name||G;if (Q.GetType()==2) this._ObjectStyles[G]=true;A[Q.Name]=Q;};return A;}};
 var FCKListHandler={OutdentListItem:function(A){var B=A.parentNode;if (B.tagName.toUpperCase().Equals('UL','OL')){var C=FCKTools.GetElementDocument(A);var D=new FCKDocumentFragment(C);var E=D.RootNode;var F=false;var G=FCKDomTools.GetFirstChild(A,['UL','OL']);if (G){F=true;var H;while ((H=G.firstChild)) E.appendChild(G.removeChild(H));FCKDomTools.RemoveNode(G);};var I;var J=false;while ((I=A.nextSibling)){if (!F&&I.nodeType==1&&I.nodeName.toUpperCase()=='LI') J=F=true;E.appendChild(I.parentNode.removeChild(I));if (!J&&I.nodeType==1&&I.nodeName.toUpperCase().Equals('UL','OL')) FCKDomTools.RemoveNode(I,true);};var K=B.parentNode.tagName.toUpperCase();var L=(K=='LI');if (L||K.Equals('UL','OL')){if (F){var G=B.cloneNode(false);D.AppendTo(G);A.appendChild(G);}else if (L) D.InsertAfterNode(B.parentNode);else D.InsertAfterNode(B);if (L) FCKDomTools.InsertAfterNode(B.parentNode,B.removeChild(A));else FCKDomTools.InsertAfterNode(B,B.removeChild(A));}else{if (F){var N=B.cloneNode(false);D.AppendTo(N);FCKDomTools.InsertAfterNode(B,N);};var O=C.createElement(FCKConfig.EnterMode=='p'?'p':'div');FCKDomTools.MoveChildren(B.removeChild(A),O);FCKDomTools.InsertAfterNode(B,O);if (FCKConfig.EnterMode=='br'){if (FCKBrowserInfo.IsGecko) O.parentNode.insertBefore(FCKTools.CreateBogusBR(C),O);else FCKDomTools.InsertAfterNode(O,FCKTools.CreateBogusBR(C));FCKDomTools.RemoveNode(O,true);}};if (this.CheckEmptyList(B)) FCKDomTools.RemoveNode(B,true);}},CheckEmptyList:function(A){return (FCKDomTools.GetFirstChild(A,'LI')==null);},CheckListHasContents:function(A){var B=A.firstChild;while (B){switch (B.nodeType){case 1:if (!B.nodeName.IEquals('UL','LI')) return true;break;case 3:if (B.nodeValue.Trim().length>0) return true;};B=B.nextSibling;};return false;}};
 var FCKElementPath=function(A){var B=null;var C=null;var D=[];var e=A;while (e){if (e.nodeType==1){if (!this.LastElement) this.LastElement=e;var E=e.nodeName.toLowerCase();if (FCKBrowserInfo.IsIE&&e.scopeName!='HTML') E=e.scopeName.toLowerCase()+':'+E;if (!C){if (!B&&FCKListsLib.PathBlockElements[E]!=null) B=e;if (FCKListsLib.PathBlockLimitElements[E]!=null){if (!B&&E=='div'&&!FCKElementPath._CheckHasBlock(e)) B=e;else C=e;}};D.push(e);if (E=='body') break;};e=e.parentNode;};this.Block=B;this.BlockLimit=C;this.Elements=D;};FCKElementPath._CheckHasBlock=function(A){var B=A.childNodes;for (var i=0,count=B.length;i<count;i++){var C=B[i];if (C.nodeType==1&&FCKListsLib.BlockElements[C.nodeName.toLowerCase()]) return true;};return false;};
-var FCKDomRange=function(A){this.Window=A;this._Cache={};};FCKDomRange.prototype={_UpdateElementInfo:function(){var A=this._Range;if (!A) this.Release(true);else{var B=A.startContainer;var C=new FCKElementPath(B);this.StartNode=B.nodeType==3?B:B.childNodes[A.startOffset];this.StartContainer=B;this.StartBlock=C.Block;this.StartBlockLimit=C.BlockLimit;if (A.collapsed){this.EndNode=this.StartNode;this.EndContainer=this.StartContainer;this.EndBlock=this.StartBlock;this.EndBlockLimit=this.StartBlockLimit;}else{var D=A.endContainer;if (B!=D) C=new FCKElementPath(D);var E=D;if (A.endOffset==0){while (E&&!E.previousSibling) E=E.parentNode;if (E) E=E.previousSibling;}else if (E.nodeType==1) E=E.childNodes[A.endOffset-1];this.EndNode=E;this.EndContainer=D;this.EndBlock=C.Block;this.EndBlockLimit=C.BlockLimit;}};this._Cache={};},CreateRange:function(){return new FCKW3CRange(this.Window.document);},DeleteContents:function(){if (this._Range){this._Range.deleteContents();this._UpdateElementInfo();}},ExtractContents:function(){if (this._Range){var A=this._Range.extractContents();this._UpdateElementInfo();return A;};return null;},CheckIsCollapsed:function(){if (this._Range) return this._Range.collapsed;return false;},Collapse:function(A){if (this._Range) this._Range.collapse(A);this._UpdateElementInfo();},Clone:function(){var A=FCKTools.CloneObject(this);if (this._Range) A._Range=this._Range.cloneRange();return A;},MoveToNodeContents:function(A){if (!this._Range) this._Range=this.CreateRange();this._Range.selectNodeContents(A);this._UpdateElementInfo();},MoveToElementStart:function(A){this.SetStart(A,1);this.SetEnd(A,1);},MoveToElementEditStart:function(A){var B;while (A&&A.nodeType==1){if (FCKDomTools.CheckIsEditable(A)) B=A;else if (B) break;A=A.firstChild;};if (B) this.MoveToElementStart(B);},InsertNode:function(A){if (this._Range) this._Range.insertNode(A);},CheckIsEmpty:function(){if (this.CheckIsCollapsed()) return true;var A=this.Window.document.createElement('div');this._Range.cloneContents().AppendTo(A);FCKDomTools.TrimNode(A);return (A.innerHTML.length==0);},CheckStartOfBlock:function(){var A=this._Cache;var B=A.IsStartOfBlock;if (B!=undefined) return B;var C=this.StartBlock||this.StartBlockLimit;var D=this._Range.startContainer;var E=this._Range.startOffset;var F;if (E>0){if (D.nodeType==3){var G=D.nodeValue.substr(0,E).Trim();if (G.length!=0) return A.IsStartOfBlock=false;}else F=D.childNodes[E-1];};if (!F) F=FCKDomTools.GetPreviousSourceNode(D,true,null,C);while (F){switch (F.nodeType){case 1:if (!FCKListsLib.InlineChildReqElements[F.nodeName.toLowerCase()]) return A.IsStartOfBlock=false;break;case 3:if (F.nodeValue.Trim().length>0) return A.IsStartOfBlock=false;};F=FCKDomTools.GetPreviousSourceNode(F,false,null,C);};return A.IsStartOfBlock=true;},CheckEndOfBlock:function(A){var B=this._Cache.IsEndOfBlock;if (B!=undefined) return B;var C=this.EndBlock||this.EndBlockLimit;var D=this._Range.endContainer;var E=this._Range.endOffset;var F;if (D.nodeType==3){var G=D.nodeValue;if (E<G.length){G=G.substr(E);if (G.Trim().length!=0) return this._Cache.IsEndOfBlock=false;}}else F=D.childNodes[E];if (!F) F=FCKDomTools.GetNextSourceNode(D,true,null,C);var H=false;while (F){switch (F.nodeType){case 1:var I=F.nodeName.toLowerCase();if (FCKListsLib.InlineChildReqElements[I]) break;if (I=='br'&&!H){H=true;break;};return this._Cache.IsEndOfBlock=false;case 3:if (F.nodeValue.Trim().length>0) return this._Cache.IsEndOfBlock=false;};F=FCKDomTools.GetNextSourceNode(F,false,null,C);};if (A) this.Select();return this._Cache.IsEndOfBlock=true;},CreateBookmark:function(A){var B={StartId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'S',EndId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'E'};var C=this.Window.document;var D;var E;var F;if (!this.CheckIsCollapsed()){E=C.createElement('span');E.style.display='none';E.id=B.EndId;E.setAttribute('_fck_bookmark',true);E.innerHTML='&nbsp;';F=this.Clone();F.Collapse(false);F.InsertNode(E);};D=C.createElement('span');D.style.display='none';D.id=B.StartId;D.setAttribute('_fck_bookmark',true);D.innerHTML='&nbsp;';F=this.Clone();F.Collapse(true);F.InsertNode(D);if (A){B.StartNode=D;B.EndNode=E;};if (E){this.SetStart(D,4);this.SetEnd(E,3);}else this.MoveToPosition(D,4);return B;},GetBookmarkNode:function(A,B){var C=this.Window.document;if (B) return A.StartNode||C.getElementById(A.StartId);else return A.EndNode||C.getElementById(A.EndId);},MoveToBookmark:function(A,B){var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);this.SetStart(C,3);if (!B) FCKDomTools.RemoveNode(C);if (D){this.SetEnd(D,3);if (!B) FCKDomTools.RemoveNode(D);}else this.Collapse(true);this._UpdateElementInfo();},CreateBookmark2:function(){if (!this._Range) return { "Start":0,"End":0 };var A={"Start":[this._Range.startOffset],"End":[this._Range.endOffset]};var B=this._Range.startContainer.previousSibling;var C=this._Range.endContainer.previousSibling;var D=this._Range.startContainer;var E=this._Range.endContainer;while (B&&D.nodeType==3){A.Start[0]+=B.length;D=B;B=B.previousSibling;}while (C&&E.nodeType==3){A.End[0]+=C.length;E=C;C=C.previousSibling;};if (D.nodeType==1&&D.childNodes[A.Start[0]]&&D.childNodes[A.Start[0]].nodeType==3){var F=D.childNodes[A.Start[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};D=F;A.Start[0]=G;};if (E.nodeType==1&&E.childNodes[A.End[0]]&&E.childNodes[A.End[0]].nodeType==3){var F=E.childNodes[A.End[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};E=F;A.End[0]=G;};A.Start=FCKDomTools.GetNodeAddress(D,true).concat(A.Start);A.End=FCKDomTools.GetNodeAddress(E,true).concat(A.End);return A;},MoveToBookmark2:function(A){var B=FCKDomTools.GetNodeFromAddress(this.Window.document,A.Start.slice(0,-1),true);var C=FCKDomTools.GetNodeFromAddress(this.Window.document,A.End.slice(0,-1),true);this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var D=A.Start[A.Start.length-1];var E=A.End[A.End.length-1];while (B.nodeType==3&&D>B.length){if (!B.nextSibling||B.nextSibling.nodeType!=3) break;D-=B.length;B=B.nextSibling;}while (C.nodeType==3&&E>C.length){if (!C.nextSibling||C.nextSibling.nodeType!=3) break;E-=C.length;C=C.nextSibling;};this._Range.setStart(B,D);this._Range.setEnd(C,E);this._UpdateElementInfo();},MoveToPosition:function(A,B){this.SetStart(A,B);this.Collapse(true);},SetStart:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setStart(A,0);break;case 2:D.setStart(A,A.childNodes.length);break;case 3:D.setStartBefore(A);break;case 4:D.setStartAfter(A);};if (!C) this._UpdateElementInfo();},SetEnd:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setEnd(A,0);break;case 2:D.setEnd(A,A.childNodes.length);break;case 3:D.setEndBefore(A);break;case 4:D.setEndAfter(A);};if (!C) this._UpdateElementInfo();},Expand:function(A){var B,oSibling;switch (A){case 'inline_elements':if (this._Range.startOffset==0){B=this._Range.startContainer;if (B.nodeType!=1) B=B.previousSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setStartBefore(B);if (B!=B.parentNode.firstChild) break;B=B.parentNode;}}};B=this._Range.endContainer;var C=this._Range.endOffset;if ((B.nodeType==3&&C>=B.nodeValue.length)||(B.nodeType==1&&C>=B.childNodes.length)||(B.nodeType!=1&&B.nodeType!=3)){if (B.nodeType!=1) B=B.nextSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setEndAfter(B);if (B!=B.parentNode.lastChild) break;B=B.parentNode;}}};break;case 'block_contents':case 'list_contents':var D=FCKListsLib.BlockBoundaries;if (A=='list_contents'||FCKConfig.EnterMode=='br') D=FCKListsLib.ListBoundaries;if (this.StartBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents') this.SetStart(this.StartBlock,1);else{B=this._Range.startContainer;if (B.nodeType==1){var E=B.childNodes[this._Range.startOffset];if (E) B=FCKDomTools.GetPreviousSourceNode(E,true);else B=B.lastChild||B;}while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setStartBefore(B);B=B.previousSibling||B.parentNode;}};if (this.EndBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents'&&this.EndBlock.nodeName.toLowerCase()!='li') this.SetEnd(this.EndBlock,2);else{B=this._Range.endContainer;if (B.nodeType==1) B=B.childNodes[this._Range.endOffset]||B.lastChild;while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setEndAfter(B);B=B.nextSibling||B.parentNode;};if (B&&B.nodeName.toLowerCase()=='br') this._Range.setEndAfter(B);};this._UpdateElementInfo();}},SplitBlock:function(A){var B=A||FCKConfig.EnterMode;if (!this._Range) this.MoveToSelection();if (this.StartBlockLimit==this.EndBlockLimit){var C=this.StartBlock;var D=this.EndBlock;var E=null;if (B!='br'){if (!C){C=this.FixBlock(true,B);D=this.EndBlock;};if (!D) D=this.FixBlock(false,B);};var F=(C!=null&&this.CheckStartOfBlock());var G=(D!=null&&this.CheckEndOfBlock());if (!this.CheckIsEmpty()) this.DeleteContents();if (C&&D&&C==D){if (G){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(D,4);D=null;}else if (F){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(C,3);C=null;}else{this.SetEnd(C,2);var H=this.ExtractContents();D=C.cloneNode(false);D.removeAttribute('id',false);H.AppendTo(D);FCKDomTools.InsertAfterNode(C,D);this.MoveToPosition(C,4);if (FCKBrowserInfo.IsGecko&&!C.nodeName.IEquals(['ul','ol'])) FCKTools.AppendBogusBr(C);}};return {PreviousBlock:C,NextBlock:D,WasStartOfBlock:F,WasEndOfBlock:G,ElementPath:E};};return null;},FixBlock:function(A,B){var C=this.CreateBookmark();this.Collapse(A);this.Expand('block_contents');var D=this.Window.document.createElement(B);this.ExtractContents().AppendTo(D);FCKDomTools.TrimNode(D);if (FCKDomTools.CheckIsEmptyElement(D,function(element) { return element.getAttribute('_fck_bookmark')!='true';})&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);this.InsertNode(D);this.MoveToBookmark(C);return D;},Release:function(A){if (!A) this.Window=null;this.StartNode=null;this.StartContainer=null;this.StartBlock=null;this.StartBlockLimit=null;this.EndNode=null;this.EndContainer=null;this.EndBlock=null;this.EndBlockLimit=null;this._Range=null;this._Cache=null;},CheckHasRange:function(){return!!this._Range;},GetTouchedStartNode:function(){var A=this._Range;var B=A.startContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.startOffset]||B;},GetTouchedEndNode:function(){var A=this._Range;var B=A.endContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.endOffset-1]||B;}};
+var FCKDomRange=function(A){this.Window=A;this._Cache={};};FCKDomRange.prototype={_UpdateElementInfo:function(){var A=this._Range;if (!A) this.Release(true);else{var B=A.startContainer;var C=new FCKElementPath(B);this.StartNode=B.nodeType==3?B:B.childNodes[A.startOffset];this.StartContainer=B;this.StartBlock=C.Block;this.StartBlockLimit=C.BlockLimit;if (A.collapsed){this.EndNode=this.StartNode;this.EndContainer=this.StartContainer;this.EndBlock=this.StartBlock;this.EndBlockLimit=this.StartBlockLimit;}else{var D=A.endContainer;if (B!=D) C=new FCKElementPath(D);var E=D;if (A.endOffset==0){while (E&&!E.previousSibling) E=E.parentNode;if (E) E=E.previousSibling;}else if (E.nodeType==1) E=E.childNodes[A.endOffset-1];this.EndNode=E;this.EndContainer=D;this.EndBlock=C.Block;this.EndBlockLimit=C.BlockLimit;}};this._Cache={};},CreateRange:function(){return new FCKW3CRange(this.Window.document);},DeleteContents:function(){if (this._Range){this._Range.deleteContents();this._UpdateElementInfo();}},ExtractContents:function(){if (this._Range){var A=this._Range.extractContents();this._UpdateElementInfo();return A;};return null;},CheckIsCollapsed:function(){if (this._Range) return this._Range.collapsed;return false;},Collapse:function(A){if (this._Range) this._Range.collapse(A);this._UpdateElementInfo();},Clone:function(){var A=FCKTools.CloneObject(this);if (this._Range) A._Range=this._Range.cloneRange();return A;},MoveToNodeContents:function(A){if (!this._Range) this._Range=this.CreateRange();this._Range.selectNodeContents(A);this._UpdateElementInfo();},MoveToElementStart:function(A){this.SetStart(A,1);this.SetEnd(A,1);},MoveToElementEditStart:function(A){var B;while (A&&A.nodeType==1){if (FCKDomTools.CheckIsEditable(A)) B=A;else if (B) break;A=A.firstChild;};if (B) this.MoveToElementStart(B);},InsertNode:function(A){if (this._Range) this._Range.insertNode(A);},CheckIsEmpty:function(){if (this.CheckIsCollapsed()) return true;var A=this.Window.document.createElement('div');this._Range.cloneContents().AppendTo(A);FCKDomTools.TrimNode(A);return (A.innerHTML.length==0);},CheckStartOfBlock:function(){var A=this._Cache;var B=A.IsStartOfBlock;if (B!=undefined) return B;var C=this.StartBlock||this.StartBlockLimit;var D=this._Range.startContainer;var E=this._Range.startOffset;var F;if (E>0){if (D.nodeType==3){var G=D.nodeValue.substr(0,E).Trim();if (G.length!=0) return A.IsStartOfBlock=false;}else F=D.childNodes[E-1];};if (!F) F=FCKDomTools.GetPreviousSourceNode(D,true,null,C);while (F){switch (F.nodeType){case 1:if (!FCKListsLib.InlineChildReqElements[F.nodeName.toLowerCase()]) return A.IsStartOfBlock=false;break;case 3:if (F.nodeValue.Trim().length>0) return A.IsStartOfBlock=false;};F=FCKDomTools.GetPreviousSourceNode(F,false,null,C);};return A.IsStartOfBlock=true;},CheckEndOfBlock:function(A){var B=this._Cache.IsEndOfBlock;if (B!=undefined) return B;var C=this.EndBlock||this.EndBlockLimit;var D=this._Range.endContainer;var E=this._Range.endOffset;var F;if (D.nodeType==3){var G=D.nodeValue;if (E<G.length){G=G.substr(E);if (G.Trim().length!=0) return this._Cache.IsEndOfBlock=false;}}else F=D.childNodes[E];if (!F) F=FCKDomTools.GetNextSourceNode(D,true,null,C);var H=false;while (F){switch (F.nodeType){case 1:var I=F.nodeName.toLowerCase();if (FCKListsLib.InlineChildReqElements[I]) break;if (I=='br'&&!H){H=true;break;};return this._Cache.IsEndOfBlock=false;case 3:if (F.nodeValue.Trim().length>0) return this._Cache.IsEndOfBlock=false;};F=FCKDomTools.GetNextSourceNode(F,false,null,C);};if (A) this.Select();return this._Cache.IsEndOfBlock=true;},CreateBookmark:function(A){var B={StartId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'S',EndId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'E'};var C=this.Window.document;var D;var E;var F;if (!this.CheckIsCollapsed()){E=C.createElement('span');E.style.display='none';E.id=B.EndId;E.setAttribute('_fck_bookmark',true);E.innerHTML='&nbsp;';F=this.Clone();F.Collapse(false);F.InsertNode(E);};D=C.createElement('span');D.style.display='none';D.id=B.StartId;D.setAttribute('_fck_bookmark',true);D.innerHTML='&nbsp;';F=this.Clone();F.Collapse(true);F.InsertNode(D);if (A){B.StartNode=D;B.EndNode=E;};if (E){this.SetStart(D,4);this.SetEnd(E,3);}else this.MoveToPosition(D,4);return B;},GetBookmarkNode:function(A,B){var C=this.Window.document;if (B) return A.StartNode||C.getElementById(A.StartId);else return A.EndNode||C.getElementById(A.EndId);},MoveToBookmark:function(A,B){var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);this.SetStart(C,3);if (!B) FCKDomTools.RemoveNode(C);if (D){this.SetEnd(D,3);if (!B) FCKDomTools.RemoveNode(D);}else this.Collapse(true);this._UpdateElementInfo();},CreateBookmark2:function(){if (!this._Range) return { "Start":0,"End":0 };var A={"Start":[this._Range.startOffset],"End":[this._Range.endOffset]};var B=this._Range.startContainer.previousSibling;var C=this._Range.endContainer.previousSibling;var D=this._Range.startContainer;var E=this._Range.endContainer;while (B&&B.nodeType==3&&D.nodeType==3){A.Start[0]+=B.length;D=B;B=B.previousSibling;}while (C&&C.nodeType==3&&E.nodeType==3){A.End[0]+=C.length;E=C;C=C.previousSibling;};if (D.nodeType==1&&D.childNodes[A.Start[0]]&&D.childNodes[A.Start[0]].nodeType==3){var F=D.childNodes[A.Start[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};D=F;A.Start[0]=G;};if (E.nodeType==1&&E.childNodes[A.End[0]]&&E.childNodes[A.End[0]].nodeType==3){var F=E.childNodes[A.End[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};E=F;A.End[0]=G;};A.Start=FCKDomTools.GetNodeAddress(D,true).concat(A.Start);A.End=FCKDomTools.GetNodeAddress(E,true).concat(A.End);return A;},MoveToBookmark2:function(A){var B=FCKDomTools.GetNodeFromAddress(this.Window.document,A.Start.slice(0,-1),true);var C=FCKDomTools.GetNodeFromAddress(this.Window.document,A.End.slice(0,-1),true);this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var D=A.Start[A.Start.length-1];var E=A.End[A.End.length-1];while (B.nodeType==3&&D>B.length){if (!B.nextSibling||B.nextSibling.nodeType!=3) break;D-=B.length;B=B.nextSibling;}while (C.nodeType==3&&E>C.length){if (!C.nextSibling||C.nextSibling.nodeType!=3) break;E-=C.length;C=C.nextSibling;};this._Range.setStart(B,D);this._Range.setEnd(C,E);this._UpdateElementInfo();},MoveToPosition:function(A,B){this.SetStart(A,B);this.Collapse(true);},SetStart:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setStart(A,0);break;case 2:D.setStart(A,A.childNodes.length);break;case 3:D.setStartBefore(A);break;case 4:D.setStartAfter(A);};if (!C) this._UpdateElementInfo();},SetEnd:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setEnd(A,0);break;case 2:D.setEnd(A,A.childNodes.length);break;case 3:D.setEndBefore(A);break;case 4:D.setEndAfter(A);};if (!C) this._UpdateElementInfo();},Expand:function(A){var B,oSibling;switch (A){case 'inline_elements':if (this._Range.startOffset==0){B=this._Range.startContainer;if (B.nodeType!=1) B=B.previousSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setStartBefore(B);if (B!=B.parentNode.firstChild) break;B=B.parentNode;}}};B=this._Range.endContainer;var C=this._Range.endOffset;if ((B.nodeType==3&&C>=B.nodeValue.length)||(B.nodeType==1&&C>=B.childNodes.length)||(B.nodeType!=1&&B.nodeType!=3)){if (B.nodeType!=1) B=B.nextSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setEndAfter(B);if (B!=B.parentNode.lastChild) break;B=B.parentNode;}}};break;case 'block_contents':case 'list_contents':var D=FCKListsLib.BlockBoundaries;if (A=='list_contents'||FCKConfig.EnterMode=='br') D=FCKListsLib.ListBoundaries;if (this.StartBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents') this.SetStart(this.StartBlock,1);else{B=this._Range.startContainer;if (B.nodeType==1){var E=B.childNodes[this._Range.startOffset];if (E) B=FCKDomTools.GetPreviousSourceNode(E,true);else B=B.lastChild||B;}while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setStartBefore(B);B=B.previousSibling||B.parentNode;}};if (this.EndBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents'&&this.EndBlock.nodeName.toLowerCase()!='li') this.SetEnd(this.EndBlock,2);else{B=this._Range.endContainer;if (B.nodeType==1) B=B.childNodes[this._Range.endOffset]||B.lastChild;while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setEndAfter(B);B=B.nextSibling||B.parentNode;};if (B&&B.nodeName.toLowerCase()=='br') this._Range.setEndAfter(B);};this._UpdateElementInfo();}},SplitBlock:function(A){var B=A||FCKConfig.EnterMode;if (!this._Range) this.MoveToSelection();if (this.StartBlockLimit==this.EndBlockLimit){var C=this.StartBlock;var D=this.EndBlock;var E=null;if (B!='br'){if (!C){C=this.FixBlock(true,B);D=this.EndBlock;};if (!D) D=this.FixBlock(false,B);};var F=(C!=null&&this.CheckStartOfBlock());var G=(D!=null&&this.CheckEndOfBlock());if (!this.CheckIsEmpty()) this.DeleteContents();if (C&&D&&C==D){if (G){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(D,4);D=null;}else if (F){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(C,3);C=null;}else{this.SetEnd(C,2);var H=this.ExtractContents();D=C.cloneNode(false);D.removeAttribute('id',false);H.AppendTo(D);FCKDomTools.InsertAfterNode(C,D);this.MoveToPosition(C,4);if (FCKBrowserInfo.IsGecko&&!C.nodeName.IEquals(['ul','ol'])) FCKTools.AppendBogusBr(C);}};return {PreviousBlock:C,NextBlock:D,WasStartOfBlock:F,WasEndOfBlock:G,ElementPath:E};};return null;},FixBlock:function(A,B){var C=this.CreateBookmark();this.Collapse(A);this.Expand('block_contents');var D=this.Window.document.createElement(B);this.ExtractContents().AppendTo(D);FCKDomTools.TrimNode(D);if (FCKDomTools.CheckIsEmptyElement(D,function(element) { return element.getAttribute('_fck_bookmark')!='true';})&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);this.InsertNode(D);this.MoveToBookmark(C);return D;},Release:function(A){if (!A) this.Window=null;this.StartNode=null;this.StartContainer=null;this.StartBlock=null;this.StartBlockLimit=null;this.EndNode=null;this.EndContainer=null;this.EndBlock=null;this.EndBlockLimit=null;this._Range=null;this._Cache=null;},CheckHasRange:function(){return!!this._Range;},GetTouchedStartNode:function(){var A=this._Range;var B=A.startContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.startOffset]||B;},GetTouchedEndNode:function(){var A=this._Range;var B=A.endContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.endOffset-1]||B;}};
 FCKDomRange.prototype.MoveToSelection=function(){this.Release(true);var A=this.Window.getSelection();if (A&&A.rangeCount>0){this._Range=FCKW3CRange.CreateFromRange(this.Window.document,A.getRangeAt(0));this._UpdateElementInfo();}else if (this.Window.document) this.MoveToElementStart(this.Window.document.body);};FCKDomRange.prototype.Select=function(){var A=this._Range;if (A){var B=A.startContainer;if (A.collapsed&&B.nodeType==1&&B.childNodes.length==0) B.appendChild(A._Document.createTextNode(''));var C=this.Window.document.createRange();C.setStart(B,A.startOffset);try{C.setEnd(A.endContainer,A.endOffset);}catch (e){if (e.toString().Contains('NS_ERROR_ILLEGAL_VALUE')){A.collapse(true);C.setEnd(A.endContainer,A.endOffset);}else throw(e);};var D=this.Window.getSelection();D.removeAllRanges();D.addRange(C);}};FCKDomRange.prototype.SelectBookmark=function(A){var B=this.Window.document.createRange();var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);B.setStart(C.parentNode,FCKDomTools.GetIndexOf(C));FCKDomTools.RemoveNode(C);if (D){B.setEnd(D.parentNode,FCKDomTools.GetIndexOf(D));FCKDomTools.RemoveNode(D);};var E=this.Window.getSelection();E.removeAllRanges();E.addRange(B);};
-var FCKDomRangeIterator=function(A){this.Range=A;this.ForceBrBreak=false;this.EnforceRealBlocks=false;};FCKDomRangeIterator.CreateFromSelection=function(A){var B=new FCKDomRange(A);B.MoveToSelection();return new FCKDomRangeIterator(B);};FCKDomRangeIterator.prototype={GetNextParagraph:function(){var A;var B;var C;var D;var E;var F=this.ForceBrBreak?FCKListsLib.ListBoundaries:FCKListsLib.BlockBoundaries;if (!this._LastNode){var B=this.Range.Clone();B.Expand(this.ForceBrBreak?'list_contents':'block_contents');this._NextNode=B.GetTouchedStartNode();this._LastNode=B.GetTouchedEndNode();B=null;};var H=this._NextNode;var I=this._LastNode;this._NextNode=null;while (H){var J=false;var K=(H.nodeType!=1);var L=false;if (!K){var M=H.nodeName.toLowerCase();if (F[M]&&(!FCKBrowserInfo.IsIE||H.scopeName=='HTML')){if (M=='br') K=true;else if (!B&&H.childNodes.length==0&&M!='hr'){A=H;C=H==I;break;};if (B){B.SetEnd(H,3,true);if (M!='br') this._NextNode=FCKDomTools.GetNextSourceNode(H,true,null,I);};J=true;}else{if (H.firstChild){if (!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};H=H.firstChild;continue;};K=true;}}else if (H.nodeType==3){if (/^[\r\n\t ]+$/.test(H.nodeValue)) K=false;};if (K&&!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};C=((!J||K)&&H==I);if (B&&!J){while (!H.nextSibling&&!C){var N=H.parentNode;if (F[N.nodeName.toLowerCase()]){J=true;C=C||(N==I);break;};H=N;K=true;C=(H==I);L=true;}};if (K) B.SetEnd(H,4,true);if ((J||C)&&B){B._UpdateElementInfo();if (B.StartNode==B.EndNode&&B.StartNode.parentNode==B.StartBlockLimit&&B.StartNode.getAttribute&&B.StartNode.getAttribute('_fck_bookmark')) B=null;else break;};if (C) break;H=FCKDomTools.GetNextSourceNode(H,L,null,I);};if (!A){if (!B){this._NextNode=null;return null;};A=B.StartBlock;if (!A&&!this.EnforceRealBlocks&&B.StartBlockLimit.nodeName.IEquals('DIV','TH','TD')&&B.CheckStartOfBlock()&&B.CheckEndOfBlock()){A=B.StartBlockLimit;}else if (!A||(this.EnforceRealBlocks&&A.nodeName.toLowerCase()=='li')){A=this.Range.Window.document.createElement(FCKConfig.EnterMode=='p'?'p':'div');B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);B.InsertNode(A);D=true;E=true;}else if (A.nodeName.toLowerCase()!='li'){if (!B.CheckStartOfBlock()||!B.CheckEndOfBlock()){A=A.cloneNode(false);B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);var O=B.SplitBlock();D=!O.WasStartOfBlock;E=!O.WasEndOfBlock;B.InsertNode(A);}}else if (!C){this._NextNode=A==I?null:FCKDomTools.GetNextSourceNode(B.EndNode,true,null,I);return A;}};if (D){var P=A.previousSibling;if (P&&P.nodeType==1){if (P.nodeName.toLowerCase()=='br') P.parentNode.removeChild(P);else if (P.lastChild&&P.lastChild.nodeName.IEquals('br')) P.removeChild(P.lastChild);}};if (E){var Q=A.lastChild;if (Q&&Q.nodeType==1&&Q.nodeName.toLowerCase()=='br') A.removeChild(Q);};if (!this._NextNode) this._NextNode=(C||A==I)?null:FCKDomTools.GetNextSourceNode(A,true,null,I);return A;}};
+var FCKDomRangeIterator=function(A){this.Range=A;this.ForceBrBreak=false;this.EnforceRealBlocks=false;};FCKDomRangeIterator.CreateFromSelection=function(A){var B=new FCKDomRange(A);B.MoveToSelection();return new FCKDomRangeIterator(B);};FCKDomRangeIterator.prototype={GetNextParagraph:function(){var A;var B;var C;var D;var E;var F=this.ForceBrBreak?FCKListsLib.ListBoundaries:FCKListsLib.BlockBoundaries;if (!this._LastNode){var B=this.Range.Clone();B.Expand(this.ForceBrBreak?'list_contents':'block_contents');this._NextNode=B.GetTouchedStartNode();this._LastNode=B.GetTouchedEndNode();B=null;};var H=this._NextNode;var I=this._LastNode;this._NextNode=null;while (H){var J=false;var K=(H.nodeType!=1);var L=false;if (!K){var M=H.nodeName.toLowerCase();if (F[M]&&(!FCKBrowserInfo.IsIE||H.scopeName=='HTML')){if (M=='br') K=true;else if (!B&&H.childNodes.length==0&&M!='hr'){A=H;C=H==I;break;};if (B){B.SetEnd(H,3,true);if (M!='br') this._NextNode=FCKDomTools.GetNextSourceNode(H,true,null,I)||H;};J=true;}else{if (H.firstChild){if (!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};H=H.firstChild;continue;};K=true;}}else if (H.nodeType==3){if (/^[\r\n\t ]+$/.test(H.nodeValue)) K=false;};if (K&&!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};C=((!J||K)&&H==I);if (B&&!J){while (!H.nextSibling&&!C){var N=H.parentNode;if (F[N.nodeName.toLowerCase()]){J=true;C=C||(N==I);break;};H=N;K=true;C=(H==I);L=true;}};if (K) B.SetEnd(H,4,true);if ((J||C)&&B){B._UpdateElementInfo();if (B.StartNode==B.EndNode&&B.StartNode.parentNode==B.StartBlockLimit&&B.StartNode.getAttribute&&B.StartNode.getAttribute('_fck_bookmark')) B=null;else break;};if (C) break;H=FCKDomTools.GetNextSourceNode(H,L,null,I);};if (!A){if (!B){this._NextNode=null;return null;};A=B.StartBlock;if (!A&&!this.EnforceRealBlocks&&B.StartBlockLimit.nodeName.IEquals('DIV','TH','TD')&&B.CheckStartOfBlock()&&B.CheckEndOfBlock()){A=B.StartBlockLimit;}else if (!A||(this.EnforceRealBlocks&&A.nodeName.toLowerCase()=='li')){A=this.Range.Window.document.createElement(FCKConfig.EnterMode=='p'?'p':'div');B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);B.InsertNode(A);D=true;E=true;}else if (A.nodeName.toLowerCase()!='li'){if (!B.CheckStartOfBlock()||!B.CheckEndOfBlock()){A=A.cloneNode(false);B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);var O=B.SplitBlock();D=!O.WasStartOfBlock;E=!O.WasEndOfBlock;B.InsertNode(A);}}else if (!C){this._NextNode=A==I?null:FCKDomTools.GetNextSourceNode(B.EndNode,true,null,I);return A;}};if (D){var P=A.previousSibling;if (P&&P.nodeType==1){if (P.nodeName.toLowerCase()=='br') P.parentNode.removeChild(P);else if (P.lastChild&&P.lastChild.nodeName.IEquals('br')) P.removeChild(P.lastChild);}};if (E){var Q=A.lastChild;if (Q&&Q.nodeType==1&&Q.nodeName.toLowerCase()=='br') A.removeChild(Q);};if (!this._NextNode) this._NextNode=(C||A==I)?null:FCKDomTools.GetNextSourceNode(A,true,null,I);return A;}};
 var FCKDocumentFragment=function(A,B){this.RootNode=B||A.createDocumentFragment();};FCKDocumentFragment.prototype={AppendTo:function(A){A.appendChild(this.RootNode);},AppendHtml:function(A){var B=this.RootNode.ownerDocument.createElement('div');B.innerHTML=A;FCKDomTools.MoveChildren(B,this.RootNode);},InsertAfterNode:function(A){FCKDomTools.InsertAfterNode(A,this.RootNode);}};
 var FCKW3CRange=function(A){this._Document=A;this.startContainer=null;this.startOffset=null;this.endContainer=null;this.endOffset=null;this.collapsed=true;};FCKW3CRange.CreateRange=function(A){return new FCKW3CRange(A);};FCKW3CRange.CreateFromRange=function(A,B){var C=FCKW3CRange.CreateRange(A);C.setStart(B.startContainer,B.startOffset);C.setEnd(B.endContainer,B.endOffset);return C;};FCKW3CRange.prototype={_UpdateCollapsed:function(){this.collapsed=(this.startContainer==this.endContainer&&this.startOffset==this.endOffset);},setStart:function(A,B){this.startContainer=A;this.startOffset=B;if (!this.endContainer){this.endContainer=A;this.endOffset=B;};this._UpdateCollapsed();},setEnd:function(A,B){this.endContainer=A;this.endOffset=B;if (!this.startContainer){this.startContainer=A;this.startOffset=B;};this._UpdateCollapsed();},setStartAfter:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setStartBefore:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A));},setEndAfter:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setEndBefore:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A));},collapse:function(A){if (A){this.endContainer=this.startContainer;this.endOffset=this.startOffset;}else{this.startContainer=this.endContainer;this.startOffset=this.endOffset;};this.collapsed=true;},selectNodeContents:function(A){this.setStart(A,0);this.setEnd(A,A.nodeType==3?A.data.length:A.childNodes.length);},insertNode:function(A){var B=this.startContainer;var C=this.startOffset;if (B.nodeType==3){B.splitText(C);if (B==this.endContainer) this.setEnd(B.nextSibling,this.endOffset-this.startOffset);FCKDomTools.InsertAfterNode(B,A);return;}else{B.insertBefore(A,B.childNodes[C]||null);if (B==this.endContainer){this.endOffset++;this.collapsed=false;}}},deleteContents:function(){if (this.collapsed) return;this._ExecContentsAction(0);},extractContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(1,A);return A;},cloneContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(2,A);return A;},_ExecContentsAction:function(A,B){var C=this.startContainer;var D=this.endContainer;var E=this.startOffset;var F=this.endOffset;var G=false;var H=false;if (D.nodeType==3) D=D.splitText(F);else{if (D.childNodes.length>0){if (F>D.childNodes.length-1){D=FCKDomTools.InsertAfterNode(D.lastChild,this._Document.createTextNode(''));H=true;}else D=D.childNodes[F];}};if (C.nodeType==3){C.splitText(E);if (C==D) D=C.nextSibling;}else{if (E==0){C=C.insertBefore(this._Document.createTextNode(''),C.firstChild);G=true;}else if (E>C.childNodes.length-1){C=C.appendChild(this._Document.createTextNode(''));G=true;}else C=C.childNodes[E].previousSibling;};var I=FCKDomTools.GetParents(C);var J=FCKDomTools.GetParents(D);var i,topStart,topEnd;for (i=0;i<I.length;i++){topStart=I[i];topEnd=J[i];if (topStart!=topEnd) break;};var K,levelStartNode,levelClone,currentNode,currentSibling;if (B) K=B.RootNode;for (var j=i;j<I.length;j++){levelStartNode=I[j];if (K&&levelStartNode!=C) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==C));currentNode=levelStartNode.nextSibling;while(currentNode){if (currentNode==J[j]||currentNode==D) break;currentSibling=currentNode.nextSibling;if (A==2) K.appendChild(currentNode.cloneNode(true));else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.appendChild(currentNode);};currentNode=currentSibling;};if (K) K=levelClone;};if (B) K=B.RootNode;for (var k=i;k<J.length;k++){levelStartNode=J[k];if (A>0&&levelStartNode!=D) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==D));if (!I[k]||levelStartNode.parentNode!=I[k].parentNode){currentNode=levelStartNode.previousSibling;while(currentNode){if (currentNode==I[k]||currentNode==C) break;currentSibling=currentNode.previousSibling;if (A==2) K.insertBefore(currentNode.cloneNode(true),K.firstChild);else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.insertBefore(currentNode,K.firstChild);};currentNode=currentSibling;}};if (K) K=levelClone;};if (A==2){var L=this.startContainer;if (L.nodeType==3){L.data+=L.nextSibling.data;L.parentNode.removeChild(L.nextSibling);};var M=this.endContainer;if (M.nodeType==3&&M.nextSibling){M.data+=M.nextSibling.data;M.parentNode.removeChild(M.nextSibling);}}else{if (topStart&&topEnd&&(C.parentNode!=topStart.parentNode||D.parentNode!=topEnd.parentNode)){var N=FCKDomTools.GetIndexOf(topEnd);if (G&&topEnd.parentNode==C.parentNode) N--;this.setStart(topEnd.parentNode,N);};this.collapse(true);};if(G) C.parentNode.removeChild(C);if(H&&D.parentNode) D.parentNode.removeChild(D);},cloneRange:function(){return FCKW3CRange.CreateFromRange(this._Document,this);}};
-var FCKEnterKey=function(A,B,C,D){this.Window=A;this.EnterMode=B||'p';this.ShiftEnterMode=C||'br';var E=new FCKKeystrokeHandler(false);E._EnterKey=this;E.OnKeystroke=FCKEnterKey_OnKeystroke;E.SetKeystrokes([[13,'Enter'],[SHIFT+13,'ShiftEnter'],[8,'Backspace'],[CTRL+8,'CtrlBackspace'],[46,'Delete']]);this.TabText='';if (D>0||FCKBrowserInfo.IsSafari){while (D--) this.TabText+='\xa0';E.SetKeystrokes([9,'Tab']);};E.AttachToElement(A.document);};function FCKEnterKey_OnKeystroke(A,B){var C=this._EnterKey;try{switch (B){case 'Enter':return C.DoEnter();break;case 'ShiftEnter':return C.DoShiftEnter();break;case 'Backspace':return C.DoBackspace();break;case 'Delete':return C.DoDelete();break;case 'Tab':return C.DoTab();break;case 'CtrlBackspace':return C.DoCtrlBackspace();break;}}catch (e){};return false;};FCKEnterKey.prototype.DoEnter=function(A,B){FCKUndo.SaveUndoStep();this._HasShift=(B===true);var C=FCKSelection.GetParentElement();var D=new FCKElementPath(C);var E=A||this.EnterMode;if (E=='br'||D.Block&&D.Block.tagName.toLowerCase()=='pre') return this._ExecuteEnterBr();else return this._ExecuteEnterBlock(E);};FCKEnterKey.prototype.DoShiftEnter=function(){return this.DoEnter(this.ShiftEnterMode,true);};FCKEnterKey.prototype.DoBackspace=function(){var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};var C=B.CheckIsCollapsed();if (!C){if (FCKBrowserInfo.IsIE&&this.Window.document.selection.type.toLowerCase()=="control"){var D=this.Window.document.selection.createRange();for (var i=D.length-1;i>=0;i--){var E=D.item(i);E.parentNode.removeChild(E);};return true;};return false;};if (FCKBrowserInfo.IsIE){var F=FCKDomTools.GetPreviousSourceElement(B.StartNode,true);if (F&&F.nodeName.toLowerCase()=='br'){var G=B.Clone();G.SetStart(F,4);if (G.CheckIsEmpty()){F.parentNode.removeChild(F);return true;}}};var H=B.StartBlock;var I=B.EndBlock;if (B.StartBlockLimit==B.EndBlockLimit&&H&&I){if (!C){var J=B.CheckEndOfBlock();B.DeleteContents();if (H!=I){B.SetStart(I,1);B.SetEnd(I,1);};B.Select();A=(H==I);};if (B.CheckStartOfBlock()){var K=B.StartBlock;var L=FCKDomTools.GetPreviousSourceElement(K,true,['BODY',B.StartBlockLimit.nodeName],['UL','OL']);A=this._ExecuteBackspace(B,L,K);}else if (FCKBrowserInfo.IsGeckoLike){B.Select();}};B.Release();return A;};FCKEnterKey.prototype.DoCtrlBackspace=function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(this.Window);A.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(A,this.Window.document.body)){this._FixIESelectAllBug(A);return true;};return false;};FCKEnterKey.prototype._ExecuteBackspace=function(A,B,C){var D=false;if (!B&&C&&C.nodeName.IEquals('LI')&&C.parentNode.parentNode.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};if (B&&B.nodeName.IEquals('LI')){var E=FCKDomTools.GetLastChild(B,['UL','OL']);while (E){B=FCKDomTools.GetLastChild(E,'LI');E=FCKDomTools.GetLastChild(B,['UL','OL']);}};if (B&&C){if (C.nodeName.IEquals('LI')&&!B.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};var F=C.parentNode;var G=B.nodeName.toLowerCase();if (FCKListsLib.EmptyElements[G]!=null||G=='table'){FCKDomTools.RemoveNode(B);D=true;}else{FCKDomTools.RemoveNode(C);while (F.innerHTML.Trim().length==0){var H=F.parentNode;H.removeChild(F);F=H;};FCKDomTools.LTrimNode(C);FCKDomTools.RTrimNode(B);A.SetStart(B,2,true);A.Collapse(true);var I=A.CreateBookmark(true);if (!C.tagName.IEquals(['TABLE'])) FCKDomTools.MoveChildren(C,B);A.SelectBookmark(I);D=true;}};return D;};FCKEnterKey.prototype.DoDelete=function(){FCKUndo.SaveUndoStep();var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};if (B.CheckIsCollapsed()&&B.CheckEndOfBlock(FCKBrowserInfo.IsGeckoLike)){var C=B.StartBlock;var D=FCKTools.GetElementAscensor(C,'td');var E=FCKDomTools.GetNextSourceElement(C,true,[B.StartBlockLimit.nodeName],['UL','OL','TR'],true);if (D){var F=FCKTools.GetElementAscensor(E,'td');if (F!=D) return true;};A=this._ExecuteBackspace(B,C,E);};B.Release();return A;};FCKEnterKey.prototype.DoTab=function(){var A=new FCKDomRange(this.Window);A.MoveToSelection();var B=A._Range.startContainer;while (B){if (B.nodeType==1){var C=B.tagName.toLowerCase();if (C=="tr"||C=="td"||C=="th"||C=="tbody"||C=="table") return false;else break;};B=B.parentNode;};if (this.TabText){A.DeleteContents();A.InsertNode(this.Window.document.createTextNode(this.TabText));A.Collapse(false);A.Select();};return true;};FCKEnterKey.prototype._ExecuteEnterBlock=function(A,B){var C=B||new FCKDomRange(this.Window);var D=C.SplitBlock(A);if (D){var E=D.PreviousBlock;var F=D.NextBlock;var G=D.WasStartOfBlock;var H=D.WasEndOfBlock;if (F){if (F.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(F,F.parentNode);FCKDomTools.MoveNode(F,F.nextSibling,true);}}else if (E&&E.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(E,E.parentNode);C.MoveToElementEditStart(E.nextSibling);FCKDomTools.MoveNode(E,E.previousSibling);};if (!G&&!H){if (F.nodeName.IEquals('li')&&F.firstChild&&F.firstChild.nodeName.IEquals(['ul','ol'])) F.insertBefore(FCKTools.GetElementDocument(F).createTextNode('\xa0'),F.firstChild);if (F) C.MoveToElementEditStart(F);}else{if (G&&H&&E.tagName.toUpperCase()=='LI'){C.MoveToElementStart(E);this._OutdentWithSelection(E,C);C.Release();return true;};var I;if (E){var J=E.tagName.toUpperCase();if (!this._HasShift&&!(/^H[1-6]$/).test(J)){I=FCKDomTools.CloneElement(E);}}else if (F) I=FCKDomTools.CloneElement(F);if (!I) I=this.Window.document.createElement(A);var K=D.ElementPath;if (K){for (var i=0,len=K.Elements.length;i<len;i++){var L=K.Elements[i];if (L==K.Block||L==K.BlockLimit) break;if (FCKListsLib.InlineChildReqElements[L.nodeName.toLowerCase()]){L=FCKDomTools.CloneElement(L);FCKDomTools.MoveChildren(I,L);I.appendChild(L);}}};if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);C.InsertNode(I);if (FCKBrowserInfo.IsIE){C.MoveToElementEditStart(I);C.Select();};C.MoveToElementEditStart(G&&!H?F:I);};if (FCKBrowserInfo.IsGeckoLike) FCKDomTools.ScrollIntoView(F||I,false);C.Select();};C.Release();return true;};FCKEnterKey.prototype._ExecuteEnterBr=function(A){var B=new FCKDomRange(this.Window);B.MoveToSelection();if (B.StartBlockLimit==B.EndBlockLimit){B.DeleteContents();B.MoveToSelection();var C=B.CheckStartOfBlock();var D=B.CheckEndOfBlock();var E=B.StartBlock?B.StartBlock.tagName.toUpperCase():'';var F=this._HasShift;var G=false;if (!F&&E=='LI') return this._ExecuteEnterBlock(null,B);if (!F&&D&&(/^H[1-6]$/).test(E)){FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createElement('br'));if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createTextNode(''));B.SetStart(B.StartBlock.nextSibling,FCKBrowserInfo.IsIE?3:1);}else{var H;G=E.IEquals('pre');if (G) H=this.Window.document.createTextNode(FCKBrowserInfo.IsIE?'\r':'\n');else H=this.Window.document.createElement('br');B.InsertNode(H);if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(H,this.Window.document.createTextNode(''));if (D&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H.parentNode);if (FCKBrowserInfo.IsIE) B.SetStart(H,4);else B.SetStart(H.nextSibling,1);if (!FCKBrowserInfo.IsIE){var I=null;if (FCKBrowserInfo.IsOpera) I=this.Window.document.createElement('span');else I=this.Window.document.createElement('br');H.parentNode.insertBefore(I,H.nextSibling);FCKDomTools.ScrollIntoView(I,false);I.parentNode.removeChild(I);}};B.Collapse(true);B.Select(G);};B.Release();return true;};FCKEnterKey.prototype._OutdentWithSelection=function(A,B){var C=B.CreateBookmark();FCKListHandler.OutdentListItem(A);B.MoveToBookmark(C);B.Select();};FCKEnterKey.prototype._CheckIsAllContentsIncluded=function(A,B){var C=false;var D=false;if (A.StartContainer==B||A.StartContainer==B.firstChild) C=(A._Range.startOffset==0);if (A.EndContainer==B||A.EndContainer==B.lastChild){var E=A.EndContainer.nodeType==3?A.EndContainer.length:A.EndContainer.childNodes.length;D=(A._Range.endOffset==E);};return C&&D;};FCKEnterKey.prototype._FixIESelectAllBug=function(A){var B=this.Window.document;B.body.innerHTML='';var C;if (FCKConfig.EnterMode.IEquals(['div','p'])){C=B.createElement(FCKConfig.EnterMode);B.body.appendChild(C);}else C=B.body;A.MoveToNodeContents(C);A.Collapse(true);A.Select();A.Release();};
-var FCKDocumentProcessor={};FCKDocumentProcessor._Items=[];FCKDocumentProcessor.AppendNew=function(){var A={};this._Items.AddItem(A);return A;};FCKDocumentProcessor.Process=function(A){var B=FCK.IsDirty();var C,i=0;while((C=this._Items[i++])) C.ProcessDocument(A);if (!B) FCK.ResetIsDirty();};var FCKDocumentProcessor_CreateFakeImage=function(A,B){var C=FCKTools.GetElementDocument(B).createElement('IMG');C.className=A;C.src=FCKConfig.BasePath+'images/spacer.gif';C.setAttribute('_fckfakelement','true',0);C.setAttribute('_fckrealelement',FCKTempBin.AddElement(B),0);return C;};if (FCKBrowserInfo.IsIE||FCKBrowserInfo.IsOpera){var FCKAnchorsProcessor=FCKDocumentProcessor.AppendNew();FCKAnchorsProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('A');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.name.length>0){if (C.innerHTML!==''){if (FCKBrowserInfo.IsIE) C.className+=' FCK__AnchorC';}else{var D=FCKDocumentProcessor_CreateFakeImage('FCK__Anchor',C.cloneNode(true));D.setAttribute('_fckanchor','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}}}};var FCKPageBreaksProcessor=FCKDocumentProcessor.AppendNew();FCKPageBreaksProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('DIV');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.style.pageBreakAfter=='always'&&C.childNodes.length==1&&C.childNodes[0].style&&C.childNodes[0].style.display=='none'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',C.cloneNode(true));C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor=(function(){var A=[];var B=function(el){var C=el.cloneNode(true);var D;var E=D=FCKDocumentProcessor_CreateFakeImage('FCK__UnknownObject',C);FCKEmbedAndObjectProcessor.RefreshView(E,el);for (var i=0;i<A.length;i++) D=A[i](el,D)||D;if (D!=E) FCKTempBin.RemoveElement(E.getAttribute('_fckrealelement'));el.parentNode.replaceChild(D,el);};var F=function(elementName,doc){var G=doc.getElementsByTagName(elementName);for (var i=G.length-1;i>=0;i--) B(G[i]);};var H=function(doc){F('object',doc);F('embed',doc);};return FCKTools.Merge(FCKDocumentProcessor.AppendNew(),{ProcessDocument:function(doc){if (FCKBrowserInfo.IsGecko) FCKTools.RunFunction(H,this,[doc]);else H(doc);},RefreshView:function(placeHolder,original){if (original.getAttribute('width')>0) placeHolder.style.width=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('width'));if (original.getAttribute('height')>0) placeHolder.style.height=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('height'));},AddCustomHandler:function(func){A.push(func);}});})();FCK.GetRealElement=function(A){var e=FCKTempBin.Elements[A.getAttribute('_fckrealelement')];if (A.getAttribute('_fckflash')){if (A.style.width.length>0) e.width=FCKTools.ConvertStyleSizeToHtml(A.style.width);if (A.style.height.length>0) e.height=FCKTools.ConvertStyleSizeToHtml(A.style.height);};return e;};if (FCKBrowserInfo.IsIE){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('HR');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){var D=A.createElement('hr');D.mergeAttributes(C,true);FCKDomTools.InsertAfterNode(C,D);C.parentNode.removeChild(C);}}};FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('INPUT');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.type=='hidden'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__InputHidden',C.cloneNode(true));D.setAttribute('_fckinputhidden','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor.AddCustomHandler(function(A,B){if (!(A.nodeName.IEquals('embed')&&(A.type=='application/x-shockwave-flash'||/\.swf($|#|\?)/i.test(A.src)))) return;B.className='FCK__Flash';B.setAttribute('_fckflash','true',0);});if (FCKBrowserInfo.IsSafari){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByClassName?A.getElementsByClassName('Apple-style-span'):Array.prototype.filter.call(A.getElementsByTagName('span'),function(item){ return item.className=='Apple-style-span';});for (var i=B.length-1;i>=0;i--) FCKDomTools.RemoveNode(B[i],true);}};
+var FCKEnterKey=function(A,B,C,D){this.Window=A;this.EnterMode=B||'p';this.ShiftEnterMode=C||'br';var E=new FCKKeystrokeHandler(false);E._EnterKey=this;E.OnKeystroke=FCKEnterKey_OnKeystroke;E.SetKeystrokes([[13,'Enter'],[SHIFT+13,'ShiftEnter'],[8,'Backspace'],[CTRL+8,'CtrlBackspace'],[46,'Delete']]);this.TabText='';if (D>0||FCKBrowserInfo.IsSafari){while (D--) this.TabText+='\xa0';E.SetKeystrokes([9,'Tab']);};E.AttachToElement(A.document);};function FCKEnterKey_OnKeystroke(A,B){var C=this._EnterKey;try{switch (B){case 'Enter':return C.DoEnter();break;case 'ShiftEnter':return C.DoShiftEnter();break;case 'Backspace':return C.DoBackspace();break;case 'Delete':return C.DoDelete();break;case 'Tab':return C.DoTab();break;case 'CtrlBackspace':return C.DoCtrlBackspace();break;}}catch (e){};return false;};FCKEnterKey.prototype.DoEnter=function(A,B){FCKUndo.SaveUndoStep();this._HasShift=(B===true);var C=FCKSelection.GetParentElement();var D=new FCKElementPath(C);var E=A||this.EnterMode;if (E=='br'||D.Block&&D.Block.tagName.toLowerCase()=='pre') return this._ExecuteEnterBr();else return this._ExecuteEnterBlock(E);};FCKEnterKey.prototype.DoShiftEnter=function(){return this.DoEnter(this.ShiftEnterMode,true);};FCKEnterKey.prototype.DoBackspace=function(){var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};var C=B.CheckIsCollapsed();if (!C){if (FCKBrowserInfo.IsIE&&this.Window.document.selection.type.toLowerCase()=="control"){var D=this.Window.document.selection.createRange();for (var i=D.length-1;i>=0;i--){var E=D.item(i);E.parentNode.removeChild(E);};return true;};return false;};if (FCKBrowserInfo.IsIE){var F=FCKDomTools.GetPreviousSourceElement(B.StartNode,true);if (F&&F.nodeName.toLowerCase()=='br'){var G=B.Clone();G.SetStart(F,4);if (G.CheckIsEmpty()){F.parentNode.removeChild(F);return true;}}};var H=B.StartBlock;var I=B.EndBlock;if (B.StartBlockLimit==B.EndBlockLimit&&H&&I){if (!C){var J=B.CheckEndOfBlock();B.DeleteContents();if (H!=I){B.SetStart(I,1);B.SetEnd(I,1);};B.Select();A=(H==I);};if (B.CheckStartOfBlock()){var K=B.StartBlock;var L=FCKDomTools.GetPreviousSourceElement(K,true,['BODY',B.StartBlockLimit.nodeName],['UL','OL']);A=this._ExecuteBackspace(B,L,K);}else if (FCKBrowserInfo.IsGeckoLike){B.Select();}};B.Release();return A;};FCKEnterKey.prototype.DoCtrlBackspace=function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(this.Window);A.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(A,this.Window.document.body)){this._FixIESelectAllBug(A);return true;};return false;};FCKEnterKey.prototype._ExecuteBackspace=function(A,B,C){var D=false;if (!B&&C&&C.nodeName.IEquals('LI')&&C.parentNode.parentNode.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};if (B&&B.nodeName.IEquals('LI')){var E=FCKDomTools.GetLastChild(B,['UL','OL']);while (E){B=FCKDomTools.GetLastChild(E,'LI');E=FCKDomTools.GetLastChild(B,['UL','OL']);}};if (B&&C){if (C.nodeName.IEquals('LI')&&!B.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};var F=C.parentNode;var G=B.nodeName.toLowerCase();if (FCKListsLib.EmptyElements[G]!=null||G=='table'){FCKDomTools.RemoveNode(B);D=true;}else{FCKDomTools.RemoveNode(C);while (F.innerHTML.Trim().length==0){var H=F.parentNode;H.removeChild(F);F=H;};FCKDomTools.LTrimNode(C);FCKDomTools.RTrimNode(B);A.SetStart(B,2,true);A.Collapse(true);var I=A.CreateBookmark(true);if (!C.tagName.IEquals(['TABLE'])) FCKDomTools.MoveChildren(C,B);A.SelectBookmark(I);D=true;}};return D;};FCKEnterKey.prototype.DoDelete=function(){FCKUndo.SaveUndoStep();var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};if (B.CheckIsCollapsed()&&B.CheckEndOfBlock(FCKBrowserInfo.IsGeckoLike)){var C=B.StartBlock;var D=FCKTools.GetElementAscensor(C,'td');var E=FCKDomTools.GetNextSourceElement(C,true,[B.StartBlockLimit.nodeName],['UL','OL','TR'],true);if (D){var F=FCKTools.GetElementAscensor(E,'td');if (F!=D) return true;};A=this._ExecuteBackspace(B,C,E);};B.Release();return A;};FCKEnterKey.prototype.DoTab=function(){var A=new FCKDomRange(this.Window);A.MoveToSelection();var B=A._Range.startContainer;while (B){if (B.nodeType==1){var C=B.tagName.toLowerCase();if (C=="tr"||C=="td"||C=="th"||C=="tbody"||C=="table") return false;else break;};B=B.parentNode;};if (this.TabText){A.DeleteContents();A.InsertNode(this.Window.document.createTextNode(this.TabText));A.Collapse(false);A.Select();};return true;};FCKEnterKey.prototype._ExecuteEnterBlock=function(A,B){var C=B||new FCKDomRange(this.Window);var D=C.SplitBlock(A);if (D){var E=D.PreviousBlock;var F=D.NextBlock;var G=D.WasStartOfBlock;var H=D.WasEndOfBlock;if (F){if (F.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(F,F.parentNode);FCKDomTools.MoveNode(F,F.nextSibling,true);}}else if (E&&E.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(E,E.parentNode);C.MoveToElementEditStart(E.nextSibling);FCKDomTools.MoveNode(E,E.previousSibling);};if (!G&&!H){if (F.nodeName.IEquals('li')&&F.firstChild&&F.firstChild.nodeName.IEquals(['ul','ol'])) F.insertBefore(FCKTools.GetElementDocument(F).createTextNode('\xa0'),F.firstChild);if (F) C.MoveToElementEditStart(F);}else{if (G&&H&&E.tagName.toUpperCase()=='LI'){C.MoveToElementStart(E);this._OutdentWithSelection(E,C);C.Release();return true;};var I;if (E){var J=E.tagName.toUpperCase();if (!this._HasShift&&!(/^H[1-6]$/).test(J)){I=FCKDomTools.CloneElement(E);}}else if (F) I=FCKDomTools.CloneElement(F);if (!I) I=this.Window.document.createElement(A);var K=D.ElementPath;if (K){for (var i=0,len=K.Elements.length;i<len;i++){var L=K.Elements[i];if (L==K.Block||L==K.BlockLimit) break;if (FCKListsLib.InlineChildReqElements[L.nodeName.toLowerCase()]){L=FCKDomTools.CloneElement(L);FCKDomTools.MoveChildren(I,L);I.appendChild(L);}}};if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);C.InsertNode(I);if (FCKBrowserInfo.IsIE){C.MoveToElementEditStart(I);C.Select();};C.MoveToElementEditStart(G&&!H?F:I);};if (FCKBrowserInfo.IsGeckoLike){if (F){var M=this.Window.document.createElement('span');M.innerHTML='&nbsp;';C.InsertNode(M);FCKDomTools.ScrollIntoView(M,false);C.DeleteContents();}else{FCKDomTools.ScrollIntoView(F||I,false);}};C.Select();};C.Release();return true;};FCKEnterKey.prototype._ExecuteEnterBr=function(A){var B=new FCKDomRange(this.Window);B.MoveToSelection();if (B.StartBlockLimit==B.EndBlockLimit){B.DeleteContents();B.MoveToSelection();var C=B.CheckStartOfBlock();var D=B.CheckEndOfBlock();var E=B.StartBlock?B.StartBlock.tagName.toUpperCase():'';var F=this._HasShift;var G=false;if (!F&&E=='LI') return this._ExecuteEnterBlock(null,B);if (!F&&D&&(/^H[1-6]$/).test(E)){FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createElement('br'));if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createTextNode(''));B.SetStart(B.StartBlock.nextSibling,FCKBrowserInfo.IsIE?3:1);}else{var H;G=E.IEquals('pre');if (G) H=this.Window.document.createTextNode(FCKBrowserInfo.IsIE?'\r':'\n');else H=this.Window.document.createElement('br');B.InsertNode(H);if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(H,this.Window.document.createTextNode(''));if (D&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H.parentNode);if (FCKBrowserInfo.IsIE) B.SetStart(H,4);else B.SetStart(H.nextSibling,1);if (!FCKBrowserInfo.IsIE){var I=null;if (FCKBrowserInfo.IsOpera) I=this.Window.document.createElement('span');else I=this.Window.document.createElement('br');H.parentNode.insertBefore(I,H.nextSibling);FCKDomTools.ScrollIntoView(I,false);I.parentNode.removeChild(I);}};B.Collapse(true);B.Select(G);};B.Release();return true;};FCKEnterKey.prototype._OutdentWithSelection=function(A,B){var C=B.CreateBookmark();FCKListHandler.OutdentListItem(A);B.MoveToBookmark(C);B.Select();};FCKEnterKey.prototype._CheckIsAllContentsIncluded=function(A,B){var C=false;var D=false;if (A.StartContainer==B||A.StartContainer==B.firstChild) C=(A._Range.startOffset==0);if (A.EndContainer==B||A.EndContainer==B.lastChild){var E=A.EndContainer.nodeType==3?A.EndContainer.length:A.EndContainer.childNodes.length;D=(A._Range.endOffset==E);};return C&&D;};FCKEnterKey.prototype._FixIESelectAllBug=function(A){var B=this.Window.document;B.body.innerHTML='';var C;if (FCKConfig.EnterMode.IEquals(['div','p'])){C=B.createElement(FCKConfig.EnterMode);B.body.appendChild(C);}else C=B.body;A.MoveToNodeContents(C);A.Collapse(true);A.Select();A.Release();};
+var FCKDocumentProcessor={};FCKDocumentProcessor._Items=[];FCKDocumentProcessor.AppendNew=function(){var A={};this._Items.push(A);return A;};FCKDocumentProcessor.Process=function(A){var B=FCK.IsDirty();var C,i=0;while((C=this._Items[i++])) C.ProcessDocument(A);if (!B) FCK.ResetIsDirty();};var FCKDocumentProcessor_CreateFakeImage=function(A,B){var C=FCKTools.GetElementDocument(B).createElement('IMG');C.className=A;C.src=FCKConfig.BasePath+'images/spacer.gif';C.setAttribute('_fckfakelement','true',0);C.setAttribute('_fckrealelement',FCKTempBin.AddElement(B),0);return C;};if (FCKBrowserInfo.IsIE||FCKBrowserInfo.IsOpera){var FCKAnchorsProcessor=FCKDocumentProcessor.AppendNew();FCKAnchorsProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('A');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.name.length>0){if (C.innerHTML!==''){if (FCKBrowserInfo.IsIE) C.className+=' FCK__AnchorC';}else{var D=FCKDocumentProcessor_CreateFakeImage('FCK__Anchor',C.cloneNode(true));D.setAttribute('_fckanchor','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}}}};var FCKPageBreaksProcessor=FCKDocumentProcessor.AppendNew();FCKPageBreaksProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('DIV');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.style.pageBreakAfter=='always'&&C.childNodes.length==1&&C.childNodes[0].style&&C.childNodes[0].style.display=='none'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',C.cloneNode(true));C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};var FCKEmbedAndObjectProcessor=(function(){var A=[];var B=function(el){var C=el.cloneNode(true);var D;var E=D=FCKDocumentProcessor_CreateFakeImage('FCK__UnknownObject',C);FCKEmbedAndObjectProcessor.RefreshView(E,el);for (var i=0;i<A.length;i++) D=A[i](el,D)||D;if (D!=E) FCKTempBin.RemoveElement(E.getAttribute('_fckrealelement'));el.parentNode.replaceChild(D,el);};var F=function(elementName,doc){var G=doc.getElementsByTagName(elementName);for (var i=G.length-1;i>=0;i--) B(G[i]);};var H=function(doc){F('object',doc);F('embed',doc);};return FCKTools.Merge(FCKDocumentProcessor.AppendNew(),{ProcessDocument:function(doc){if (FCKBrowserInfo.IsGecko) FCKTools.RunFunction(H,this,[doc]);else H(doc);},RefreshView:function(placeHolder,original){if (original.getAttribute('width')>0) placeHolder.style.width=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('width'));if (original.getAttribute('height')>0) placeHolder.style.height=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('height'));},AddCustomHandler:function(func){A.push(func);}});})();FCK.GetRealElement=function(A){var e=FCKTempBin.Elements[A.getAttribute('_fckrealelement')];if (A.getAttribute('_fckflash')){if (A.style.width.length>0) e.width=FCKTools.ConvertStyleSizeToHtml(A.style.width);if (A.style.height.length>0) e.height=FCKTools.ConvertStyleSizeToHtml(A.style.height);};return e;};if (FCKBrowserInfo.IsIE){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('HR');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){var D=A.createElement('hr');D.mergeAttributes(C,true);FCKDomTools.InsertAfterNode(C,D);C.parentNode.removeChild(C);}}};FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('INPUT');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.type=='hidden'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__InputHidden',C.cloneNode(true));D.setAttribute('_fckinputhidden','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor.AddCustomHandler(function(A,B){if (!(A.nodeName.IEquals('embed')&&(A.type=='application/x-shockwave-flash'||/\.swf($|#|\?)/i.test(A.src)))) return;B.className='FCK__Flash';B.setAttribute('_fckflash','true',0);});if (FCKBrowserInfo.IsSafari){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByClassName?A.getElementsByClassName('Apple-style-span'):Array.prototype.filter.call(A.getElementsByTagName('span'),function(item){ return item.className=='Apple-style-span';});for (var i=B.length-1;i>=0;i--) FCKDomTools.RemoveNode(B[i],true);}};
 var FCKSelection=FCK.Selection={GetParentBlock:function(){var A=this.GetParentElement();while (A){if (FCKListsLib.BlockBoundaries[A.nodeName.toLowerCase()]) break;A=A.parentNode;};return A;},ApplyStyle:function(A){FCKStyles.ApplyStyle(new FCKStyle(A));}};
 FCKSelection.GetType=function(){var A='Text';var B;try { B=this.GetSelection();} catch (e) {};if (B&&B.rangeCount==1){var C=B.getRangeAt(0);if (C.startContainer==C.endContainer&&(C.endOffset-C.startOffset)==1&&C.startContainer.nodeType==1&&FCKListsLib.StyleObjectElements[C.startContainer.childNodes[C.startOffset].nodeName.toLowerCase()]){A='Control';}};return A;};FCKSelection.GetSelectedElement=function(){var A=!!FCK.EditorWindow&&this.GetSelection();if (!A||A.rangeCount<1) return null;var B=A.getRangeAt(0);if (B.startContainer!=B.endContainer||B.startContainer.nodeType!=1||B.startOffset!=B.endOffset-1) return null;var C=B.startContainer.childNodes[B.startOffset];if (C.nodeType!=1) return null;return C;};FCKSelection.GetParentElement=function(){if (this.GetType()=='Control') return FCKSelection.GetSelectedElement().parentNode;else{var A=this.GetSelection();if (A){if (A.anchorNode&&A.anchorNode==A.focusNode){var B=A.getRangeAt(0);if (B.collapsed||B.startContainer.nodeType==3) return A.anchorNode.parentNode;else return A.anchorNode;};var C=new FCKElementPath(A.anchorNode);var D=new FCKElementPath(A.focusNode);var E=null;var F=null;if (C.Elements.length>D.Elements.length){E=C.Elements;F=D.Elements;}else{E=D.Elements;F=C.Elements;};var G=E.length-F.length;for(var i=0;i<F.length;i++){if (E[G+i]==F[i]) return F[i];};return null;}};return null;};FCKSelection.GetBoundaryParentElement=function(A){if (!FCK.EditorWindow) return null;if (this.GetType()=='Control') return FCKSelection.GetSelectedElement().parentNode;else{var B=this.GetSelection();if (B&&B.rangeCount>0){var C=B.getRangeAt(A?0:(B.rangeCount-1));var D=A?C.startContainer:C.endContainer;return (D.nodeType==1?D:D.parentNode);}};return null;};FCKSelection.SelectNode=function(A){var B=FCK.EditorDocument.createRange();B.selectNode(A);var C=this.GetSelection();C.removeAllRanges();C.addRange(B);};FCKSelection.Collapse=function(A){var B=this.GetSelection();if (A==null||A===true) B.collapseToStart();else B.collapseToEnd();};FCKSelection.HasAncestorNode=function(A){var B=this.GetSelectedElement();if (!B&&FCK.EditorWindow){try		{ B=this.GetSelection().getRangeAt(0).startContainer;}catch(e){}}while (B){if (B.nodeType==1&&B.nodeName.IEquals(A)) return true;B=B.parentNode;};return false;};FCKSelection.MoveToAncestorNode=function(A){var B;var C=this.GetSelectedElement();if (!C) C=this.GetSelection().getRangeAt(0).startContainer;while (C){if (C.nodeName.IEquals(A)) return C;C=C.parentNode;};return null;};FCKSelection.Delete=function(){var A=this.GetSelection();for (var i=0;i<A.rangeCount;i++){A.getRangeAt(i).deleteContents();};return A;};FCKSelection.GetSelection=function(){return FCK.EditorWindow.getSelection();};FCKSelection.Save=function(){};FCKSelection.Restore=function(){};FCKSelection.Release=function(){};
-var FCKTableHandler={};FCKTableHandler.InsertRow=function(A){var B=FCKSelection.MoveToAncestorNode('TR');if (!B) return;var C=B.cloneNode(true);B.parentNode.insertBefore(C,B);FCKTableHandler.ClearRow(A?C:B);};FCKTableHandler.DeleteRows=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();var C=[];for (var i=0;i<B.length;i++){var D=FCKTools.GetElementAscensor(B[i],'TR');C[D.rowIndex]=D;};for (var i=C.length;i>=0;i--){if (C[i]) FCKTableHandler.DeleteRows(C[i]);};return;};var E=FCKTools.GetElementAscensor(A,'TABLE');if (E.rows.length==1){FCKTableHandler.DeleteTable(E);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteTable=function(A){if (!A){A=FCKSelection.GetSelectedElement();if (!A||A.tagName!='TABLE') A=FCKSelection.MoveToAncestorNode('TABLE');};if (!A) return;FCKSelection.SelectNode(A);FCKSelection.Collapse();if (A.parentNode.childNodes.length==1) A.parentNode.parentNode.removeChild(A.parentNode);else A.parentNode.removeChild(A);};FCKTableHandler.InsertColumn=function(A){var B=null;var C=this.GetSelectedCells();if (C&&C.length) B=C[A?0:(C.length-1)];if (!B) return;var D=FCKTools.GetElementAscensor(B,'TABLE');var E=B.cellIndex;for (var i=0;i<D.rows.length;i++){var F=D.rows[i];if (F.cells.length<(E+1)) continue;B=F.cells[E].cloneNode(false);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B);var G=F.cells[E];if (A) F.insertBefore(B,G);else if (G.nextSibling) F.insertBefore(B,G.nextSibling);else F.appendChild(B);}};FCKTableHandler.DeleteColumns=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();for (var i=B.length;i>=0;i--){if (B[i]) FCKTableHandler.DeleteColumns(B[i]);};return;};if (!A) return;var C=FCKTools.GetElementAscensor(A,'TABLE');var D=A.cellIndex;for (var i=C.rows.length-1;i>=0;i--){var E=C.rows[i];if (D==0&&E.cells.length==1){FCKTableHandler.DeleteRows(E);continue;};if (E.cells[D]) E.removeChild(E.cells[D]);}};FCKTableHandler.InsertCell=function(A,B){var C=null;var D=this.GetSelectedCells();if (D&&D.length) C=D[B?0:(D.length-1)];if (!C) return null;var E=FCK.EditorDocument.createElement('TD');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(E);if (!B&&C.cellIndex==C.parentNode.cells.length-1) C.parentNode.appendChild(E);else C.parentNode.insertBefore(E,B?C:C.nextSibling);return E;};FCKTableHandler.DeleteCell=function(A){if (A.parentNode.cells.length==1){FCKTableHandler.DeleteRows(FCKTools.GetElementAscensor(A,'TR'));return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteCells=function(){var A=FCKTableHandler.GetSelectedCells();for (var i=A.length-1;i>=0;i--){FCKTableHandler.DeleteCell(A[i]);}};FCKTableHandler._MarkCells=function(A,B){for (var i=0;i<A.length;i++) A[i][B]=true;};FCKTableHandler._UnmarkCells=function(A,B){for (var i=0;i<A.length;i++){if (FCKBrowserInfo.IsIE) A[i].removeAttribute(B);else delete A[i][B];}};FCKTableHandler._ReplaceCellsByMarker=function(A,B,C){for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){if (A[i][j][B]) A[i][j]=C;}}};FCKTableHandler._GetMarkerGeometry=function(A,B,C,D){var E=0;var F=0;var G=0;var H=0;for (var i=C;A[B][i]&&A[B][i][D];i++) E++;for (var i=C-1;A[B][i]&&A[B][i][D];i--){E++;G++;};for (var i=B;A[i]&&A[i][C]&&A[i][C][D];i++) F++;for (var i=B-1;A[i]&&A[i][C]&&A[i][C][D];i--){F++;H++;};return { 'width':E,'height':F,'x':G,'y':H };};FCKTableHandler.CheckIsSelectionRectangular=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length<1) return false;this._MarkCells(A,'_CellSelected');var B=this._CreateTableMap(A[0].parentNode.parentNode);var C=A[0].parentNode.rowIndex;var D=this._GetCellIndexSpan(B,C,A[0]);var E=this._GetMarkerGeometry(B,C,D,'_CellSelected');var F=D-E.x;var G=C-E.y;if (E.width>=E.height){for (D=F;D<F+E.width;D++){C=G+(D-F) % E.height;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}}else{for (C=G;C<G+E.height;C++){D=F+(C-G) % E.width;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}};this._UnmarkCells(A,'_CellSelected');return true;};FCKTableHandler.MergeCells=function(){var A=this.GetSelectedCells();if (A.length<2) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);this._MarkCells(A,'_SelectedCells');var F=this._GetMarkerGeometry(C,D,E,'_SelectedCells');var G=E-F.x;var H=D-F.y;var I=FCKTools.GetElementDocument(B).createDocumentFragment();for (var i=0;i<F.height;i++){var J=0;for (var j=0;j<F.width;j++){var K=C[H+i][G+j];while (K.childNodes.length>0){var L=K.removeChild(K.firstChild);if (L.nodeType!=1||(L.getAttribute('type',2)!='_moz'&&L.getAttribute('_moz_dirty')!=null)){I.appendChild(L);J++;}}};if (J>0) I.appendChild(FCKTools.GetElementDocument(B).createElement('br'));};this._ReplaceCellsByMarker(C,'_SelectedCells',B);this._UnmarkCells(A,'_SelectedCells');this._InstallTableMap(C,B.parentNode.parentNode);B.appendChild(I);if (FCKBrowserInfo.IsGeckoLike&&(!B.firstChild)) FCKTools.AppendBogusBr(B);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeRight=function(){var A=this.GetMergeRightTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCK.EditorDocument.createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));D.parentNode.removeChild(D);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeDown=function(){var A=this.GetMergeDownTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCKTools.GetElementDocument(B).createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));if (E.firstChild) E.insertBefore(FCKTools.GetElementDocument(D).createElement('br'),E.firstChild);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.HorizontalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;if (F>1){var G=Math.ceil(F/2);var H=FCKTools.GetElementDocument(B).createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H);var I=E+G;var J=E+F;var K=isNaN(B.rowSpan)?1:B.rowSpan;for (var r=D;r<D+K;r++){for (var i=I;i<J;i++) C[r][i]=H;}}else{var L=[];for (var i=0;i<C.length;i++){var M=C[i].slice(0,E);if (C[i].length<=E){L.push(M);continue;};if (C[i][E]==B){M.push(B);M.push(FCKTools.GetElementDocument(B).createElement('td'));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(M[M.length-1]);}else{M.push(C[i][E]);M.push(C[i][E]);};for (var j=E+1;j<C[i].length;j++) M.push(C[i][j]);L.push(M);};C=L;};this._InstallTableMap(C,B.parentNode.parentNode);};FCKTableHandler.VerticalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=FCKTableHandler._GetCellIndexSpan(C,B.parentNode.rowIndex,B);var E=B.rowSpan;var F=B.parentNode.rowIndex;if (isNaN(E)) E=1;if (E>1){B.rowSpan=Math.ceil(E/2);var G=F+Math.ceil(E/2);var H=null;for (var i=D+1;i<C[G].length;i++){if (C[G][i].parentNode.rowIndex==G){H=C[G][i];break;}};var I=FCK.EditorDocument.createElement('td');I.rowSpan=Math.floor(E/2);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);B.parentNode.parentNode.rows[G].insertBefore(I,H);}else{var G=F+1;var K=FCK.EditorDocument.createElement('tr');var L=B.parentNode.parentNode;if (L.rows.length>G) L.insertBefore(K,L.rows[G]);else L.appendChild(K);for (var i=0;i<C[F].length;){var M=C[F][i].colSpan;if (isNaN(M)||M<1) M=1;if (i==D){i+=M;continue;};var N=C[F][i].rowSpan;if (isNaN(N)) N=1;C[F][i].rowSpan=N+1;i+=M;};var I=FCK.EditorDocument.createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);K.appendChild(I);}};FCKTableHandler._GetCellIndexSpan=function(A,B,C){if (A.length<B+1) return null;var D=A[B];for (var c=0;c<D.length;c++){if (D[c]==C) return c;};return null;};FCKTableHandler._GetCellLocation=function(A,B){for (var i=0;i<A.length;i++){for (var c=0;c<A[i].length;c++){if (A[i][c]==B) return [i,c];}};return null;};FCKTableHandler._GetColumnCells=function(A,B){var C=[];for (var r=0;r<A.length;r++){var D=A[r][B];if (D&&(C.length==0||C[C.length-1]!=D)) C[C.length]=D;};return C;};FCKTableHandler._CreateTableMap=function(A){var B=A.rows;var r=-1;var C=[];for (var i=0;i<B.length;i++){r++;if (!C[r]) C[r]=[];var c=-1;for (var j=0;j<B[i].cells.length;j++){var D=B[i].cells[j];c++;while (C[r][c]) c++;var E=isNaN(D.colSpan)?1:D.colSpan;var F=isNaN(D.rowSpan)?1:D.rowSpan;for (var G=0;G<F;G++){if (!C[r+G]) C[r+G]=[];for (var H=0;H<E;H++){C[r+G][c+H]=B[i].cells[j];}};c+=E-1;}};return C;};FCKTableHandler._InstallTableMap=function(A,B){var C=FCKBrowserInfo.IsIE?"_fckrowspan":"rowSpan";while (B.rows.length>0){var D=B.rows[0];D.parentNode.removeChild(D);};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (E.parentNode) E.parentNode.removeChild(E);E.colSpan=E[C]=1;}};var F=0;for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (!E) continue;if (j>F) F=j;if (E._colScanned===true) continue;if (A[i][j-1]==E) E.colSpan++;if (A[i][j+1]!=E) E._colScanned=true;}};for (var i=0;i<=F;i++){for (var j=0;j<A.length;j++){if (!A[j]) continue;var E=A[j][i];if (!E||E._rowScanned===true) continue;if (A[j-1]&&A[j-1][i]==E) E[C]++;if (!A[j+1]||A[j+1][i]!=E) E._rowScanned=true;}};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (FCKBrowserInfo.IsIE){E.removeAttribute('_colScanned');E.removeAttribute('_rowScanned');}else{delete E._colScanned;delete E._rowScanned;}}};for (var i=0;i<A.length;i++){var J=FCKTools.GetElementDocument(B).createElement('tr');for (var j=0;j<A[i].length;){var E=A[i][j];if (A[i-1]&&A[i-1][j]==E){j+=E.colSpan;continue;};J.appendChild(E);if (C!='rowSpan'){E.rowSpan=E[C];E.removeAttribute(C);};j+=E.colSpan;if (E.colSpan==1) E.removeAttribute('colspan');if (E.rowSpan==1) E.removeAttribute('rowspan');};B.appendChild(J);}};FCKTableHandler._MoveCaretToCell=function (A,B){var C=new FCKDomRange(FCK.EditorWindow);C.MoveToNodeContents(A);C.Collapse(B);C.Select();};FCKTableHandler.ClearRow=function(A){var B=A.cells;for (var i=0;i<B.length;i++){B[i].innerHTML='';if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B[i]);}};FCKTableHandler.GetMergeRightTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=E+(isNaN(B.colSpan)?1:B.colSpan);var G=C[D][F];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,D,F,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.height!=I.height||H.y!=I.y) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};FCKTableHandler.GetMergeDownTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=D+(isNaN(B.rowSpan)?1:B.rowSpan);if (!C[F]) return null;var G=C[F][E];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,F,E,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.width!=I.width||H.x!=I.x) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};
-FCKTableHandler.GetSelectedCells=function(){var A=[];var B=FCKSelection.GetSelection();if (B.rangeCount==1&&B.anchorNode.nodeType==3){var C=FCKTools.GetElementAscensor(B.anchorNode,'TD,TH');if (C) A[0]=C;return A;};for (var i=0;i<B.rangeCount;i++){var D=B.getRangeAt(i);var E;if (D.startContainer.tagName.Equals('TD','TH')) E=D.startContainer;else E=D.startContainer.childNodes[D.startOffset];if (E.tagName.Equals('TD','TH')) A[A.length]=E;};return A;};
+var FCKTableHandler={};FCKTableHandler.InsertRow=function(A){var B=FCKSelection.MoveToAncestorNode('TR');if (!B) return;var C=B.cloneNode(true);B.parentNode.insertBefore(C,B);FCKTableHandler.ClearRow(A?C:B);};FCKTableHandler.DeleteRows=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();var C=[];for (var i=0;i<B.length;i++){var D=B[i].parentNode;C[D.rowIndex]=D;};for (var i=C.length;i>=0;i--){if (C[i]) FCKTableHandler.DeleteRows(C[i]);};return;};var E=FCKTools.GetElementAscensor(A,'TABLE');if (E.rows.length==1){FCKTableHandler.DeleteTable(E);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteTable=function(A){if (!A){A=FCKSelection.GetSelectedElement();if (!A||A.tagName!='TABLE') A=FCKSelection.MoveToAncestorNode('TABLE');};if (!A) return;FCKSelection.SelectNode(A);FCKSelection.Collapse();if (A.parentNode.childNodes.length==1) A.parentNode.parentNode.removeChild(A.parentNode);else A.parentNode.removeChild(A);};FCKTableHandler.InsertColumn=function(A){var B=null;var C=this.GetSelectedCells();if (C&&C.length) B=C[A?0:(C.length-1)];if (!B) return;var D=FCKTools.GetElementAscensor(B,'TABLE');var E=B.cellIndex;for (var i=0;i<D.rows.length;i++){var F=D.rows[i];if (F.cells.length<(E+1)) continue;B=F.cells[E].cloneNode(false);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B);var G=F.cells[E];F.insertBefore(B,(A?G:G.nextSibling));}};FCKTableHandler.DeleteColumns=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();for (var i=B.length;i>=0;i--){if (B[i]) FCKTableHandler.DeleteColumns(B[i]);};return;};if (!A) return;var C=FCKTools.GetElementAscensor(A,'TABLE');var D=A.cellIndex;for (var i=C.rows.length-1;i>=0;i--){var E=C.rows[i];if (D==0&&E.cells.length==1){FCKTableHandler.DeleteRows(E);continue;};if (E.cells[D]) E.removeChild(E.cells[D]);}};FCKTableHandler.InsertCell=function(A,B){var C=null;var D=this.GetSelectedCells();if (D&&D.length) C=D[B?0:(D.length-1)];if (!C) return null;var E=FCK.EditorDocument.createElement('TD');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(E);if (!B&&C.cellIndex==C.parentNode.cells.length-1) C.parentNode.appendChild(E);else C.parentNode.insertBefore(E,B?C:C.nextSibling);return E;};FCKTableHandler.DeleteCell=function(A){if (A.parentNode.cells.length==1){FCKTableHandler.DeleteRows(A.parentNode);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteCells=function(){var A=FCKTableHandler.GetSelectedCells();for (var i=A.length-1;i>=0;i--){FCKTableHandler.DeleteCell(A[i]);}};FCKTableHandler._MarkCells=function(A,B){for (var i=0;i<A.length;i++) A[i][B]=true;};FCKTableHandler._UnmarkCells=function(A,B){for (var i=0;i<A.length;i++){FCKDomTools.ClearElementJSProperty(A[i],B);}};FCKTableHandler._ReplaceCellsByMarker=function(A,B,C){for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){if (A[i][j][B]) A[i][j]=C;}}};FCKTableHandler._GetMarkerGeometry=function(A,B,C,D){var E=0;var F=0;var G=0;var H=0;for (var i=C;A[B][i]&&A[B][i][D];i++) E++;for (var i=C-1;A[B][i]&&A[B][i][D];i--){E++;G++;};for (var i=B;A[i]&&A[i][C]&&A[i][C][D];i++) F++;for (var i=B-1;A[i]&&A[i][C]&&A[i][C][D];i--){F++;H++;};return { 'width':E,'height':F,'x':G,'y':H };};FCKTableHandler.CheckIsSelectionRectangular=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length<1) return false;for (var i=0;i<A.length;i++){if (A[i].parentNode.parentNode!=A[0].parentNode.parentNode) return false;};this._MarkCells(A,'_CellSelected');var B=this._CreateTableMap(A[0]);var C=A[0].parentNode.rowIndex;var D=this._GetCellIndexSpan(B,C,A[0]);var E=this._GetMarkerGeometry(B,C,D,'_CellSelected');var F=D-E.x;var G=C-E.y;if (E.width>=E.height){for (D=F;D<F+E.width;D++){C=G+(D-F) % E.height;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}}else{for (C=G;C<G+E.height;C++){D=F+(C-G) % E.width;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}};this._UnmarkCells(A,'_CellSelected');return true;};FCKTableHandler.MergeCells=function(){var A=this.GetSelectedCells();if (A.length<2) return;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);this._MarkCells(A,'_SelectedCells');var F=this._GetMarkerGeometry(C,D,E,'_SelectedCells');var G=E-F.x;var H=D-F.y;var I=FCKTools.GetElementDocument(B).createDocumentFragment();for (var i=0;i<F.height;i++){var J=0;for (var j=0;j<F.width;j++){var K=C[H+i][G+j];while (K.childNodes.length>0){var L=K.removeChild(K.firstChild);if (L.nodeType!=1||(L.getAttribute('type',2)!='_moz'&&L.getAttribute('_moz_dirty')!=null)){I.appendChild(L);J++;}}};if (J>0) I.appendChild(FCK.EditorDocument.createElement('br'));};this._ReplaceCellsByMarker(C,'_SelectedCells',B);this._UnmarkCells(A,'_SelectedCells');this._InstallTableMap(C,B.parentNode.parentNode.parentNode);B.appendChild(I);if (FCKBrowserInfo.IsGeckoLike&&(!B.firstChild)) FCKTools.AppendBogusBr(B);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeRight=function(){var A=this.GetMergeRightTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCK.EditorDocument.createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));D.parentNode.removeChild(D);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeDown=function(){var A=this.GetMergeDownTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCKTools.GetElementDocument(B).createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));if (E.firstChild) E.insertBefore(FCK.EditorDocument.createElement('br'),E.firstChild);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.HorizontalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;if (F>1){var G=Math.ceil(F/2);var H=FCK.EditorDocument.createElement(B.nodeName);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H);var I=E+G;var J=E+F;var K=isNaN(B.rowSpan)?1:B.rowSpan;for (var r=D;r<D+K;r++){for (var i=I;i<J;i++) C[r][i]=H;}}else{var L=[];for (var i=0;i<C.length;i++){var M=C[i].slice(0,E);if (C[i].length<=E){L.push(M);continue;};if (C[i][E]==B){M.push(B);M.push(FCK.EditorDocument.createElement(B.nodeName));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(M[M.length-1]);}else{M.push(C[i][E]);M.push(C[i][E]);};for (var j=E+1;j<C[i].length;j++) M.push(C[i][j]);L.push(M);};C=L;};this._InstallTableMap(C,B.parentNode.parentNode.parentNode);};FCKTableHandler.VerticalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;var G=B.rowSpan;if (isNaN(G)) G=1;if (G>1){B.rowSpan=Math.ceil(G/2);var H=D+Math.ceil(G/2);var I=C[H];var J=null;for (var i=E+1;i<I.length;i++){if (I[i].parentNode.rowIndex==H){J=I[i];break;}};var K=FCK.EditorDocument.createElement(B.nodeName);K.rowSpan=Math.floor(G/2);if (F>1) K.colSpan=F;if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(K);B.parentNode.parentNode.parentNode.rows[H].insertBefore(K,J);}else{var L=B.parentNode.sectionRowIndex+1;var M=FCK.EditorDocument.createElement('tr');var N=B.parentNode.parentNode;if (N.rows.length>L) N.insertBefore(M,N.rows[L]);else N.appendChild(M);for (var i=0;i<C[D].length;){var O=C[D][i].colSpan;if (isNaN(O)||O<1) O=1;if (i==E){i+=O;continue;};var P=C[D][i].rowSpan;if (isNaN(P)) P=1;C[D][i].rowSpan=P+1;i+=O;};var K=FCK.EditorDocument.createElement(B.nodeName);if (F>1) K.colSpan=F;if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(K);M.appendChild(K);}};FCKTableHandler._GetCellIndexSpan=function(A,B,C){if (A.length<B+1) return null;var D=A[B];for (var c=0;c<D.length;c++){if (D[c]==C) return c;};return null;};FCKTableHandler._GetCellLocation=function(A,B){for (var i=0;i<A.length;i++){for (var c=0;c<A[i].length;c++){if (A[i][c]==B) return [i,c];}};return null;};FCKTableHandler._CreateTableMap=function(A){var B=(A.nodeName=='TABLE'?A:A.parentNode.parentNode.parentNode);var C=B.rows;var r=-1;var D=[];for (var i=0;i<C.length;i++){r++;if (!D[r]) D[r]=[];var c=-1;for (var j=0;j<C[i].cells.length;j++){var E=C[i].cells[j];c++;while (D[r][c]) c++;var F=isNaN(E.colSpan)?1:E.colSpan;var G=isNaN(E.rowSpan)?1:E.rowSpan;for (var H=0;H<G;H++){if (!D[r+H]) D[r+H]=[];for (var I=0;I<F;I++){D[r+H][c+I]=C[i].cells[j];}};c+=F-1;}};return D;};FCKTableHandler._InstallTableMap=function(A,B){var C=FCKBrowserInfo.IsIE?"_fckrowspan":"rowSpan";for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var D=A[i][j];if (D.parentNode) D.parentNode.removeChild(D);D.colSpan=D[C]=1;}};var E=0;for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var D=A[i][j];if (!D) continue;if (j>E) E=j;if (D._colScanned===true) continue;if (A[i][j-1]==D) D.colSpan++;if (A[i][j+1]!=D) D._colScanned=true;}};for (var i=0;i<=E;i++){for (var j=0;j<A.length;j++){if (!A[j]) continue;var D=A[j][i];if (!D||D._rowScanned===true) continue;if (A[j-1]&&A[j-1][i]==D) D[C]++;if (!A[j+1]||A[j+1][i]!=D) D._rowScanned=true;}};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var D=A[i][j];FCKDomTools.ClearElementJSProperty(D,'_colScanned');FCKDomTools.ClearElementJSProperty(D,'_rowScanned');}};for (var i=0;i<A.length;i++){var I=FCK.EditorDocument.createElement('tr');for (var j=0;j<A[i].length;){var D=A[i][j];if (A[i-1]&&A[i-1][j]==D){j+=D.colSpan;continue;};I.appendChild(D);if (C!='rowSpan'){D.rowSpan=D[C];D.removeAttribute(C);};j+=D.colSpan;if (D.colSpan==1) D.removeAttribute('colspan');if (D.rowSpan==1) D.removeAttribute('rowspan');};if (FCKBrowserInfo.IsIE){B.rows[i].replaceNode(I);}else{B.rows[i].innerHTML='';FCKDomTools.MoveChildren(I,B.rows[i]);}}};FCKTableHandler._MoveCaretToCell=function (A,B){var C=new FCKDomRange(FCK.EditorWindow);C.MoveToNodeContents(A);C.Collapse(B);C.Select();};FCKTableHandler.ClearRow=function(A){var B=A.cells;for (var i=0;i<B.length;i++){B[i].innerHTML='';if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B[i]);}};FCKTableHandler.GetMergeRightTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=E+(isNaN(B.colSpan)?1:B.colSpan);var G=C[D][F];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,D,F,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.height!=I.height||H.y!=I.y) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};FCKTableHandler.GetMergeDownTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=D+(isNaN(B.rowSpan)?1:B.rowSpan);if (!C[F]) return null;var G=C[F][E];if (!G) return null;if (B.parentNode.parentNode!=G.parentNode.parentNode) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,F,E,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.width!=I.width||H.x!=I.x) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};
+FCKTableHandler.GetSelectedCells=function(){var A=[];var B=FCKSelection.GetSelection();if (B.rangeCount==1&&B.anchorNode.nodeType==3){var C=FCKTools.GetElementAscensor(B.anchorNode,'TD,TH');if (C) A[0]=C;return A;};for (var i=0;i<B.rangeCount;i++){var D=B.getRangeAt(i);var E;if (D.startContainer.tagName.Equals('TD','TH')) E=D.startContainer;else E=D.startContainer.childNodes[D.startOffset];if (E.nodeName.Equals('TD','TH')) A[A.length]=E;};return A;};
 var FCKXml=function(){this.Error=false;};FCKXml.GetAttribute=function(A,B,C){var D=A.attributes.getNamedItem(B);return D?D.value:C;};FCKXml.TransformToObject=function(A){if (!A) return null;var B={};var C=A.attributes;for (var i=0;i<C.length;i++){var D=C[i];B[D.name]=D.value;};var E=A.childNodes;for (i=0;i<E.length;i++){var F=E[i];if (F.nodeType==1){var G='$'+F.nodeName;var H=B[G];if (!H) H=B[G]=[];H.push(this.TransformToObject(F));}};return B;};
 FCKXml.prototype={LoadUrl:function(A){this.Error=false;var B;var C=FCKTools.CreateXmlObject('XmlHttp');C.open('GET',A,false);C.send(null);if (C.status==200||C.status==304||(C.status==0&&C.readyState==4)){B=C.responseXML;if (!B) B=(new DOMParser()).parseFromString(C.responseText,'text/xml');}else B=null;if (B){try{var D=B.firstChild;}catch (e){B=(new DOMParser()).parseFromString(C.responseText,'text/xml');}};if (!B||!B.firstChild){this.Error=true;if (window.confirm('Error loading "'+A+'" (HTTP Status: '+C.status+').\r\nDo you want to see the server response dump?')) alert(C.responseText);};this.DOMDocument=B;},SelectNodes:function(A,B){if (this.Error) return [];var C=[];var D=this.DOMDocument.evaluate(A,B?B:this.DOMDocument,this.DOMDocument.createNSResolver(this.DOMDocument.documentElement),XPathResult.ORDERED_NODE_ITERATOR_TYPE,null);if (D){var E=D.iterateNext();while(E){C[C.length]=E;E=D.iterateNext();}};return C;},SelectSingleNode:function(A,B){if (this.Error) return null;var C=this.DOMDocument.evaluate(A,B?B:this.DOMDocument,this.DOMDocument.createNSResolver(this.DOMDocument.documentElement),9,null);if (C&&C.singleNodeValue) return C.singleNodeValue;else return null;}};
 var FCKNamedCommand=function(A){this.Name=A;};FCKNamedCommand.prototype.Execute=function(){FCK.ExecuteNamedCommand(this.Name);};FCKNamedCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState(this.Name);};
 var FCKStyleCommand=function(){};FCKStyleCommand.prototype={Name:'Style',Execute:function(A,B){FCKUndo.SaveUndoStep();if (B.Selected) FCK.Styles.RemoveStyle(B.Style);else FCK.Styles.ApplyStyle(B.Style);FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorDocument) return -1;if (FCKSelection.GetType()=='Control'){var A=FCKSelection.GetSelectedElement();if (!A||!FCKStyles.CheckHasObjectStyle(A.nodeName.toLowerCase())) return -1;};return 0;}};
-var FCKDialogCommand=function(A,B,C,D,E,F,G,H){this.Name=A;this.Title=B;this.Url=C;this.Width=D;this.Height=E;this.CustomValue=H;this.GetStateFunction=F;this.GetStateParam=G;this.Resizable=false;};FCKDialogCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_'+this.Name,this.Title,this.Url,this.Width,this.Height,this.CustomValue,null,this.Resizable);};FCKDialogCommand.prototype.GetState=function(){if (this.GetStateFunction) return this.GetStateFunction(this.GetStateParam);else return FCK.EditMode==0?0:-1;};var FCKUndefinedCommand=function(){this.Name='Undefined';};FCKUndefinedCommand.prototype.Execute=function(){alert(FCKLang.NotImplemented);};FCKUndefinedCommand.prototype.GetState=function(){return 0;};var FCKFormatBlockCommand=function(){};FCKFormatBlockCommand.prototype={Name:'FormatBlock',Execute:FCKStyleCommand.prototype.Execute,GetState:function(){return FCK.EditorDocument?0:-1;}};var FCKFontNameCommand=function(){};FCKFontNameCommand.prototype={Name:'FontName',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKFontSizeCommand=function(){};FCKFontSizeCommand.prototype={Name:'FontSize',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKPreviewCommand=function(){this.Name='Preview';};FCKPreviewCommand.prototype.Execute=function(){FCK.Preview();};FCKPreviewCommand.prototype.GetState=function(){return 0;};var FCKSaveCommand=function(){this.Name='Save';};FCKSaveCommand.prototype.Execute=function(){var A=FCK.GetParentForm();if (typeof(A.onsubmit)=='function'){var B=A.onsubmit();if (B!=null&&B===false) return;};if (typeof(A.submit)=='function') A.submit();else A.submit.click();};FCKSaveCommand.prototype.GetState=function(){return 0;};var FCKNewPageCommand=function(){this.Name='NewPage';};FCKNewPageCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();FCK.SetData('');FCKUndo.Typing=true;FCK.Focus();};FCKNewPageCommand.prototype.GetState=function(){return 0;};var FCKSourceCommand=function(){this.Name='Source';};FCKSourceCommand.prototype.Execute=function(){if (FCKConfig.SourcePopup){var A=FCKConfig.ScreenWidth*0.65;var B=FCKConfig.ScreenHeight*0.65;FCKDialog.OpenDialog('FCKDialog_Source',FCKLang.Source,'dialog/fck_source.html',A,B,null,null,true);}else FCK.SwitchEditMode();};FCKSourceCommand.prototype.GetState=function(){return (FCK.EditMode==0?0:1);};var FCKUndoCommand=function(){this.Name='Undo';};FCKUndoCommand.prototype.Execute=function(){FCKUndo.Undo();};FCKUndoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckUndoState()?0:-1);};var FCKRedoCommand=function(){this.Name='Redo';};FCKRedoCommand.prototype.Execute=function(){FCKUndo.Redo();};FCKRedoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckRedoState()?0:-1);};var FCKPageBreakCommand=function(){this.Name='PageBreak';};FCKPageBreakCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();var e=FCK.EditorDocument.createElement('DIV');e.style.pageBreakAfter='always';e.innerHTML='<span style="DISPLAY:none">&nbsp;</span>';var A=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',e);var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.SplitBlock();B.InsertNode(A);FCK.Events.FireEvent('OnSelectionChange');};FCKPageBreakCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKUnlinkCommand=function(){this.Name='Unlink';};FCKUnlinkCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGeckoLike){var A=FCK.Selection.MoveToAncestorNode('A');if (A) FCKTools.RemoveOuterTags(A);return;};FCK.ExecuteNamedCommand(this.Name);};FCKUnlinkCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState(this.Name);if (A==0&&FCK.EditMode==0){var B=FCKSelection.MoveToAncestorNode('A');var C=(B&&B.name.length>0&&B.href.length==0);if (C) A=-1;};return A;};FCKVisitLinkCommand=function(){this.Name='VisitLink';};FCKVisitLinkCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState('Unlink');if (A==0){var B=FCKSelection.MoveToAncestorNode('A');if (!B.href) A=-1;};return A;},Execute:function(){var A=FCKSelection.MoveToAncestorNode('A');var B=A.getAttribute('_fcksavedurl')||A.getAttribute('href',2);if (!/:\/\//.test(B)){var C=FCKConfig.BaseHref;var D=FCK.GetInstanceObject('parent');if (!C){C=D.document.location.href;C=C.substring(0,C.lastIndexOf('/')+1);};if (/^\//.test(B)){try{C=C.match(/^.*:\/\/+[^\/]+/)[0];}catch (e){C=D.document.location.protocol+'://'+D.parent.document.location.host;}};B=C+B;};if (!window.open(B,'_blank')) alert(FCKLang.VisitLinkBlocked);}};var FCKSelectAllCommand=function(){this.Name='SelectAll';};FCKSelectAllCommand.prototype.Execute=function(){if (FCK.EditMode==0){FCK.ExecuteNamedCommand('SelectAll');}else{var A=FCK.EditingArea.Textarea;if (FCKBrowserInfo.IsIE){A.createTextRange().execCommand('SelectAll');}else{A.selectionStart=0;A.selectionEnd=A.value.length;};A.focus();}};FCKSelectAllCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKPasteCommand=function(){this.Name='Paste';};FCKPasteCommand.prototype={Execute:function(){if (FCKBrowserInfo.IsIE) FCK.Paste();else FCK.ExecuteNamedCommand('Paste');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');}};var FCKRuleCommand=function(){this.Name='Rule';};FCKRuleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();FCK.InsertElement('hr');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('InsertHorizontalRule');}};var FCKCutCopyCommand=function(A){this.Name=A?'Cut':'Copy';};FCKCutCopyCommand.prototype={Execute:function(){var A=false;if (FCKBrowserInfo.IsIE){var B=function(){A=true;};var C='on'+this.Name.toLowerCase();FCK.EditorDocument.body.attachEvent(C,B);FCK.ExecuteNamedCommand(this.Name);FCK.EditorDocument.body.detachEvent(C,B);}else{try{FCK.ExecuteNamedCommand(this.Name);A=true;}catch(e){}};if (!A) alert(FCKLang['PasteError'+this.Name]);},GetState:function(){return FCK.EditMode!=0?-1:FCK.GetNamedCommandState('Cut');}};var FCKAnchorDeleteCommand=function(){this.Name='AnchorDelete';};FCKAnchorDeleteCommand.prototype={Execute:function(){if (FCK.Selection.GetType()=='Control'){FCK.Selection.Delete();}else{var A=FCK.Selection.GetSelectedElement();if (A){if (A.tagName=='IMG'&&A.getAttribute('_fckanchor')) oAnchor=FCK.GetRealElement(A);else A=null;};if (!A){oAnchor=FCK.Selection.MoveToAncestorNode('A');if (oAnchor) FCK.Selection.SelectNode(oAnchor);};if (oAnchor.href.length!=0){oAnchor.removeAttribute('name');if (FCKBrowserInfo.IsIE) oAnchor.className=oAnchor.className.replace(FCKRegexLib.FCK_Class,'');return;};if (A){A.parentNode.removeChild(A);return;};if (oAnchor.innerHTML.length==0){oAnchor.parentNode.removeChild(oAnchor);return;};FCKTools.RemoveOuterTags(oAnchor);};if (FCKBrowserInfo.IsGecko) FCK.Selection.Collapse(true);},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Unlink');}};var FCKDeleteDivCommand=function(){};FCKDeleteDivCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCKSelection.GetParentElement();var B=new FCKElementPath(A);return B.BlockLimit&&B.BlockLimit.nodeName.IEquals('div')?0:-1;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCKDomTools.GetSelectedDivContainers();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();for (var i=0;i<A.length;i++) FCKDomTools.RemoveNode(A[i],true);B.MoveToBookmark(C);B.Select();}};var FCKNbsp=function(){this.Name='Non Breaking Space';};FCKNbsp.prototype={Execute:function(){FCK.InsertHtml('&nbsp;');},GetState:function(){return (FCK.EditMode!=0?-1:0);}};
-var FCKShowBlockCommand=function(A,B){this.Name=A;if (B!=undefined) this._SavedState=B;else this._SavedState=null;};FCKShowBlockCommand.prototype.Execute=function(){var A=this.GetState();if (A==-1) return;var B=FCK.EditorDocument.body;if (A==1) B.className=B.className.replace(/(^| )FCK__ShowBlocks/g,'');else B.className+=' FCK__ShowBlocks';if (FCKBrowserInfo.IsIE){try{FCK.EditorDocument.selection.createRange().select();}catch (e){}}else{var C=FCK.EditorWindow.getSelection().focusNode;if (C.nodeType!=1) C=C.parentNode;FCKDomTools.ScrollIntoView(C,false);};FCK.Events.FireEvent('OnSelectionChange');};FCKShowBlockCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;if (!FCK.EditorDocument) return 0;if (/FCK__ShowBlocks(?:\s|$)/.test(FCK.EditorDocument.body.className)) return 1;return 0;};FCKShowBlockCommand.prototype.SaveState=function(){this._SavedState=this.GetState();};FCKShowBlockCommand.prototype.RestoreState=function(){if (this._SavedState!=null&&this.GetState()!=this._SavedState) this.Execute();};
-var FCKSpellCheckCommand=function(){this.Name='SpellCheck';this.IsEnabled=(FCKConfig.SpellChecker=='SpellerPages');};FCKSpellCheckCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','dialog/fck_spellerpages.html',440,480);};FCKSpellCheckCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return this.IsEnabled?0:-1;};
+var FCKDialogCommand=function(A,B,C,D,E,F,G,H){this.Name=A;this.Title=B;this.Url=C;this.Width=D;this.Height=E;this.CustomValue=H;this.GetStateFunction=F;this.GetStateParam=G;this.Resizable=false;};FCKDialogCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_'+this.Name,this.Title,this.Url,this.Width,this.Height,this.CustomValue,null,this.Resizable);};FCKDialogCommand.prototype.GetState=function(){if (this.GetStateFunction) return this.GetStateFunction(this.GetStateParam);else return FCK.EditMode==0?0:-1;};var FCKUndefinedCommand=function(){this.Name='Undefined';};FCKUndefinedCommand.prototype.Execute=function(){alert(FCKLang.NotImplemented);};FCKUndefinedCommand.prototype.GetState=function(){return 0;};var FCKFormatBlockCommand=function(){};FCKFormatBlockCommand.prototype={Name:'FormatBlock',Execute:FCKStyleCommand.prototype.Execute,GetState:function(){return FCK.EditorDocument?0:-1;}};var FCKFontNameCommand=function(){};FCKFontNameCommand.prototype={Name:'FontName',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKFontSizeCommand=function(){};FCKFontSizeCommand.prototype={Name:'FontSize',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKPreviewCommand=function(){this.Name='Preview';};FCKPreviewCommand.prototype.Execute=function(){FCK.Preview();};FCKPreviewCommand.prototype.GetState=function(){return 0;};var FCKSaveCommand=function(){this.Name='Save';};FCKSaveCommand.prototype.Execute=function(){var A=FCK.GetParentForm();if (typeof(A.onsubmit)=='function'){var B=A.onsubmit();if (B!=null&&B===false) return;};if (typeof(A.submit)=='function') A.submit();else A.submit.click();};FCKSaveCommand.prototype.GetState=function(){return 0;};var FCKNewPageCommand=function(){this.Name='NewPage';};FCKNewPageCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();FCK.SetData('');FCKUndo.Typing=true;FCK.Focus();};FCKNewPageCommand.prototype.GetState=function(){return 0;};var FCKSourceCommand=function(){this.Name='Source';};FCKSourceCommand.prototype.Execute=function(){if (FCKConfig.SourcePopup){var A=FCKConfig.ScreenWidth*0.65;var B=FCKConfig.ScreenHeight*0.65;FCKDialog.OpenDialog('FCKDialog_Source',FCKLang.Source,'dialog/fck_source.html',A,B,null,null,true);}else FCK.SwitchEditMode();};FCKSourceCommand.prototype.GetState=function(){return (FCK.EditMode==0?0:1);};var FCKUndoCommand=function(){this.Name='Undo';};FCKUndoCommand.prototype.Execute=function(){FCKUndo.Undo();};FCKUndoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckUndoState()?0:-1);};var FCKRedoCommand=function(){this.Name='Redo';};FCKRedoCommand.prototype.Execute=function(){FCKUndo.Redo();};FCKRedoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckRedoState()?0:-1);};var FCKPageBreakCommand=function(){this.Name='PageBreak';};FCKPageBreakCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();var e=FCK.EditorDocument.createElement('DIV');e.style.pageBreakAfter='always';e.innerHTML='<span style="DISPLAY:none">&nbsp;</span>';var A=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',e);var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.SplitBlock();B.InsertNode(A);FCK.Events.FireEvent('OnSelectionChange');};FCKPageBreakCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKUnlinkCommand=function(){this.Name='Unlink';};FCKUnlinkCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGeckoLike){var A=FCK.Selection.MoveToAncestorNode('A');if (A) FCKTools.RemoveOuterTags(A);return;};FCK.ExecuteNamedCommand(this.Name);};FCKUnlinkCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState(this.Name);if (A==0&&FCK.EditMode==0){var B=FCKSelection.MoveToAncestorNode('A');var C=(B&&B.name.length>0&&B.href.length==0);if (C) A=-1;};return A;};var FCKVisitLinkCommand=function(){this.Name='VisitLink';};FCKVisitLinkCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState('Unlink');if (A==0){var B=FCKSelection.MoveToAncestorNode('A');if (!B.href) A=-1;};return A;},Execute:function(){var A=FCKSelection.MoveToAncestorNode('A');var B=A.getAttribute('_fcksavedurl')||A.getAttribute('href',2);if (!/:\/\//.test(B)){var C=FCKConfig.BaseHref;var D=FCK.GetInstanceObject('parent');if (!C){C=D.document.location.href;C=C.substring(0,C.lastIndexOf('/')+1);};if (/^\//.test(B)){try{C=C.match(/^.*:\/\/+[^\/]+/)[0];}catch (e){C=D.document.location.protocol+'://'+D.parent.document.location.host;}};B=C+B;};if (!window.open(B,'_blank')) alert(FCKLang.VisitLinkBlocked);}};var FCKSelectAllCommand=function(){this.Name='SelectAll';};FCKSelectAllCommand.prototype.Execute=function(){if (FCK.EditMode==0){FCK.ExecuteNamedCommand('SelectAll');}else{var A=FCK.EditingArea.Textarea;if (FCKBrowserInfo.IsIE){A.createTextRange().execCommand('SelectAll');}else{A.selectionStart=0;A.selectionEnd=A.value.length;};A.focus();}};FCKSelectAllCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKPasteCommand=function(){this.Name='Paste';};FCKPasteCommand.prototype={Execute:function(){if (FCKBrowserInfo.IsIE) FCK.Paste();else FCK.ExecuteNamedCommand('Paste');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');}};var FCKRuleCommand=function(){this.Name='Rule';};FCKRuleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();FCK.InsertElement('hr');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('InsertHorizontalRule');}};var FCKCutCopyCommand=function(A){this.Name=A?'Cut':'Copy';};FCKCutCopyCommand.prototype={Execute:function(){var A=false;if (FCKBrowserInfo.IsIE){var B=function(){A=true;};var C='on'+this.Name.toLowerCase();FCK.EditorDocument.body.attachEvent(C,B);FCK.ExecuteNamedCommand(this.Name);FCK.EditorDocument.body.detachEvent(C,B);}else{try{FCK.ExecuteNamedCommand(this.Name);A=true;}catch(e){}};if (!A) alert(FCKLang['PasteError'+this.Name]);},GetState:function(){return FCK.EditMode!=0?-1:FCK.GetNamedCommandState('Cut');}};var FCKAnchorDeleteCommand=function(){this.Name='AnchorDelete';};FCKAnchorDeleteCommand.prototype={Execute:function(){if (FCK.Selection.GetType()=='Control'){FCK.Selection.Delete();}else{var A=FCK.Selection.GetSelectedElement();if (A){if (A.tagName=='IMG'&&A.getAttribute('_fckanchor')) oAnchor=FCK.GetRealElement(A);else A=null;};if (!A){oAnchor=FCK.Selection.MoveToAncestorNode('A');if (oAnchor) FCK.Selection.SelectNode(oAnchor);};if (oAnchor.href.length!=0){oAnchor.removeAttribute('name');if (FCKBrowserInfo.IsIE) oAnchor.className=oAnchor.className.replace(FCKRegexLib.FCK_Class,'');return;};if (A){A.parentNode.removeChild(A);return;};if (oAnchor.innerHTML.length==0){oAnchor.parentNode.removeChild(oAnchor);return;};FCKTools.RemoveOuterTags(oAnchor);};if (FCKBrowserInfo.IsGecko) FCK.Selection.Collapse(true);},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Unlink');}};var FCKDeleteDivCommand=function(){};FCKDeleteDivCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCKSelection.GetParentElement();var B=new FCKElementPath(A);return B.BlockLimit&&B.BlockLimit.nodeName.IEquals('div')?0:-1;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCKDomTools.GetSelectedDivContainers();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();for (var i=0;i<A.length;i++) FCKDomTools.RemoveNode(A[i],true);B.MoveToBookmark(C);B.Select();}};var FCKNbsp=function(){this.Name='Non Breaking Space';};FCKNbsp.prototype={Execute:function(){FCK.InsertHtml('&nbsp;');},GetState:function(){return (FCK.EditMode!=0?-1:0);}};
+var FCKShowBlockCommand=function(A,B){this.Name=A;if (B!=undefined) this._SavedState=B;else this._SavedState=null;};FCKShowBlockCommand.prototype.Execute=function(){var A=this.GetState();if (A==-1) return;var B=FCK.EditorDocument.body;if (A==1) B.className=B.className.replace(/(^| )FCK__ShowBlocks/g,'');else B.className+=' FCK__ShowBlocks';if (FCKBrowserInfo.IsIE){try{FCK.EditorDocument.selection.createRange().select();}catch (e){}}else{var C=FCK.EditorWindow.getSelection().focusNode;if (C){if (C.nodeType!=1) C=C.parentNode;FCKDomTools.ScrollIntoView(C,false);}};FCK.Events.FireEvent('OnSelectionChange');};FCKShowBlockCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;if (!FCK.EditorDocument) return 0;if (/FCK__ShowBlocks(?:\s|$)/.test(FCK.EditorDocument.body.className)) return 1;return 0;};FCKShowBlockCommand.prototype.SaveState=function(){this._SavedState=this.GetState();};FCKShowBlockCommand.prototype.RestoreState=function(){if (this._SavedState!=null&&this.GetState()!=this._SavedState) this.Execute();};
+var FCKSpellCheckCommand=function(){this.Name='SpellCheck';this.IsEnabled=(FCKConfig.SpellChecker!='ieSpell');};FCKSpellCheckCommand.prototype.Execute=function(){switch (FCKConfig.SpellChecker){case 'SpellerPages':FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','dialog/fck_spellerpages.html',440,480);break;case 'WSC':FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','wsc/w.html',530,480);}};FCKSpellCheckCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return this.IsEnabled?0:-1;};
 var FCKTextColorCommand=function(A){this.Name=A=='ForeColor'?'TextColor':'BGColor';this.Type=A;var B;if (FCKBrowserInfo.IsIE) B=window;else if (FCK.ToolbarSet._IFrame) B=FCKTools.GetElementWindow(FCK.ToolbarSet._IFrame);else B=window.parent;this._Panel=new FCKPanel(B);this._Panel.AppendStyleSheet(FCKConfig.SkinEditorCSS);this._Panel.MainNode.className='FCK_Panel';this._CreatePanelBody(this._Panel.Document,this._Panel.MainNode);FCK.ToolbarSet.ToolbarItems.GetItem(this.Name).RegisterPanel(this._Panel);FCKTools.DisableSelection(this._Panel.Document.body);};FCKTextColorCommand.prototype.Execute=function(A,B,C){this._Panel.Show(A,B,C);};FCKTextColorCommand.prototype.SetColor=function(A){FCKUndo.SaveUndoStep();var B=FCKStyles.GetStyle('_FCK_'+(this.Type=='ForeColor'?'Color':'BackColor'));if (!A||A.length==0) FCK.Styles.RemoveStyle(B);else{B.SetVariable('Color',A);FCKStyles.ApplyStyle(B);};FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');};FCKTextColorCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};function FCKTextColorCommand_OnMouseOver(){this.className='ColorSelected';};function FCKTextColorCommand_OnMouseOut(){this.className='ColorDeselected';};function FCKTextColorCommand_OnClick(A,B,C){this.className='ColorDeselected';B.SetColor(C);B._Panel.Hide();};function FCKTextColorCommand_AutoOnClick(A,B){this.className='ColorDeselected';B.SetColor('');B._Panel.Hide();};function FCKTextColorCommand_MoreOnClick(A,B){this.className='ColorDeselected';B._Panel.Hide();FCKDialog.OpenDialog('FCKDialog_Color',FCKLang.DlgColorTitle,'dialog/fck_colorselector.html',410,320,FCKTools.Bind(B,B.SetColor));};FCKTextColorCommand.prototype._CreatePanelBody=function(A,B){function CreateSelectionDiv(){var C=A.createElement("DIV");C.className='ColorDeselected';FCKTools.AddEventListenerEx(C,'mouseover',FCKTextColorCommand_OnMouseOver);FCKTools.AddEventListenerEx(C,'mouseout',FCKTextColorCommand_OnMouseOut);return C;};var D=B.appendChild(A.createElement("TABLE"));D.className='ForceBaseFont';D.style.tableLayout='fixed';D.cellPadding=0;D.cellSpacing=0;D.border=0;D.width=150;var E=D.insertRow(-1).insertCell(-1);E.colSpan=8;var C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table cellspacing="0" cellpadding="0" width="100%" border="0">\n			<tr>\n				<td><div class="ColorBoxBorder"><div class="ColorBox" style="background-color: #000000"></div></div></td>\n				<td nowrap width="100%" align="center">'+FCKLang.ColorAutomatic+'</td>\n			</tr>\n		</table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_AutoOnClick,this);if (!FCKBrowserInfo.IsIE) C.style.width='96%';var G=FCKConfig.FontColors.toString().split(',');var H=0;while (H<G.length){var I=D.insertRow(-1);for (var i=0;i<8;i++,H++){if (H<G.length){var J=G[H].split('/');var K='#'+J[0];var L=J[1]||K;};C=I.insertCell(-1).appendChild(CreateSelectionDiv());C.innerHTML='<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: '+K+'"></div></div>';if (H>=G.length) C.style.visibility='hidden';else FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_OnClick,[this,L]);}};if (FCKConfig.EnableMoreFontColors){E=D.insertRow(-1).insertCell(-1);E.colSpan=8;C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">'+FCKLang.ColorMoreColors+'</td></tr></table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_MoreOnClick,this);};if (!FCKBrowserInfo.IsIE) C.style.width='96%';};
 var FCKPastePlainTextCommand=function(){this.Name='PasteText';};FCKPastePlainTextCommand.prototype.Execute=function(){FCK.PasteAsPlainText();};FCKPastePlainTextCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');};
 var FCKPasteWordCommand=function(){this.Name='PasteWord';};FCKPasteWordCommand.prototype.Execute=function(){FCK.PasteFromWord();};FCKPasteWordCommand.prototype.GetState=function(){if (FCK.EditMode!=0||FCKConfig.ForcePasteAsPlainText) return -1;else return FCK.GetNamedCommandState('Paste');};
 var FCKTableCommand=function(A){this.Name=A;};FCKTableCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (!FCKBrowserInfo.IsGecko){switch (this.Name){case 'TableMergeRight':return FCKTableHandler.MergeRight();case 'TableMergeDown':return FCKTableHandler.MergeDown();}};switch (this.Name){case 'TableInsertRowAfter':return FCKTableHandler.InsertRow(false);case 'TableInsertRowBefore':return FCKTableHandler.InsertRow(true);case 'TableDeleteRows':return FCKTableHandler.DeleteRows();case 'TableInsertColumnAfter':return FCKTableHandler.InsertColumn(false);case 'TableInsertColumnBefore':return FCKTableHandler.InsertColumn(true);case 'TableDeleteColumns':return FCKTableHandler.DeleteColumns();case 'TableInsertCellAfter':return FCKTableHandler.InsertCell(null,false);case 'TableInsertCellBefore':return FCKTableHandler.InsertCell(null,true);case 'TableDeleteCells':return FCKTableHandler.DeleteCells();case 'TableMergeCells':return FCKTableHandler.MergeCells();case 'TableHorizontalSplitCell':return FCKTableHandler.HorizontalSplitCell();case 'TableVerticalSplitCell':return FCKTableHandler.VerticalSplitCell();case 'TableDelete':return FCKTableHandler.DeleteTable();default:return alert(FCKLang.UnknownCommand.replace(/%1/g,this.Name));}};FCKTableCommand.prototype.GetState=function(){if (FCK.EditorDocument!=null&&FCKSelection.HasAncestorNode('TABLE')){switch (this.Name){case 'TableHorizontalSplitCell':case 'TableVerticalSplitCell':if (FCKTableHandler.GetSelectedCells().length==1) return 0;else return -1;case 'TableMergeCells':if (FCKTableHandler.CheckIsSelectionRectangular()&&FCKTableHandler.GetSelectedCells().length>1) return 0;else return -1;case 'TableMergeRight':return FCKTableHandler.GetMergeRightTarget()?0:-1;case 'TableMergeDown':return FCKTableHandler.GetMergeDownTarget()?0:-1;default:return 0;}}else return -1;};
-var FCKFitWindow=function(){this.Name='FitWindow';};FCKFitWindow.prototype.Execute=function(){var A=window.frameElement;var B=A.style;var C=parent;var D=C.document.documentElement;var E=C.document.body;var F=E.style;var G;var H=new FCKDomRange(FCK.EditorWindow);H.MoveToSelection();var I=FCKTools.GetScrollPosition(FCK.EditorWindow);if (!this.IsMaximized){if(FCKBrowserInfo.IsIE) C.attachEvent('onresize',FCKFitWindow_Resize);else C.addEventListener('resize',FCKFitWindow_Resize,true);this._ScrollPos=FCKTools.GetScrollPosition(C);G=A;while((G=G.parentNode)){if (G.nodeType==1){G._fckSavedStyles=FCKTools.SaveStyles(G);G.style.zIndex=FCKConfig.FloatingPanelsZIndex-1;}};if (FCKBrowserInfo.IsIE){this.documentElementOverflow=D.style.overflow;D.style.overflow='hidden';F.overflow='hidden';}else{F.overflow='hidden';F.width='0px';F.height='0px';};this._EditorFrameStyles=FCKTools.SaveStyles(A);var J=FCKTools.GetViewPaneSize(C);B.position="absolute";A.offsetLeft;B.zIndex=FCKConfig.FloatingPanelsZIndex-1;B.left="0px";B.top="0px";B.width=J.Width+"px";B.height=J.Height+"px";if (!FCKBrowserInfo.IsIE){B.borderRight=B.borderBottom="9999px solid white";B.backgroundColor="white";};C.scrollTo(0,0);var K=FCKTools.GetWindowPosition(C,A);if (K.x!=0) B.left=(-1*K.x)+"px";if (K.y!=0) B.top=(-1*K.y)+"px";this.IsMaximized=true;}else{if(FCKBrowserInfo.IsIE) C.detachEvent("onresize",FCKFitWindow_Resize);else C.removeEventListener("resize",FCKFitWindow_Resize,true);G=A;while((G=G.parentNode)){if (G._fckSavedStyles){FCKTools.RestoreStyles(G,G._fckSavedStyles);G._fckSavedStyles=null;}};if (FCKBrowserInfo.IsIE) D.style.overflow=this.documentElementOverflow;FCKTools.RestoreStyles(A,this._EditorFrameStyles);C.scrollTo(this._ScrollPos.X,this._ScrollPos.Y);this.IsMaximized=false;};FCKToolbarItems.GetItem('FitWindow').RefreshState();if (FCK.EditMode==0) FCK.EditingArea.MakeEditable();FCK.Focus();H.Select();FCK.EditorWindow.scrollTo(I.X,I.Y);};FCKFitWindow.prototype.GetState=function(){if (FCKConfig.ToolbarLocation!='In') return -1;else return (this.IsMaximized?1:0);};function FCKFitWindow_Resize(){var A=FCKTools.GetViewPaneSize(parent);var B=window.frameElement.style;B.width=A.Width+'px';B.height=A.Height+'px';};
+var FCKFitWindow=function(){this.Name='FitWindow';};FCKFitWindow.prototype.Execute=function(){var A=window.frameElement;var B=A.style;var C=parent;var D=C.document.documentElement;var E=C.document.body;var F=E.style;var G;var H,oEditorScrollPos;if (FCK.EditMode==0){H=new FCKDomRange(FCK.EditorWindow);H.MoveToSelection();oEditorScrollPos=FCKTools.GetScrollPosition(FCK.EditorWindow);}else{var I=FCK.EditingArea.Textarea;H=!FCKBrowserInfo.IsIE&&[I.selectionStart,I.selectionEnd];oEditorScrollPos=[I.scrollLeft,I.scrollTop];};if (!this.IsMaximized){if(FCKBrowserInfo.IsIE) C.attachEvent('onresize',FCKFitWindow_Resize);else C.addEventListener('resize',FCKFitWindow_Resize,true);this._ScrollPos=FCKTools.GetScrollPosition(C);G=A;while((G=G.parentNode)){if (G.nodeType==1){G._fckSavedStyles=FCKTools.SaveStyles(G);G.style.zIndex=FCKConfig.FloatingPanelsZIndex-1;}};if (FCKBrowserInfo.IsIE){this.documentElementOverflow=D.style.overflow;D.style.overflow='hidden';F.overflow='hidden';}else{F.overflow='hidden';F.width='0px';F.height='0px';};this._EditorFrameStyles=FCKTools.SaveStyles(A);var J=FCKTools.GetViewPaneSize(C);B.position="absolute";A.offsetLeft;B.zIndex=FCKConfig.FloatingPanelsZIndex-1;B.left="0px";B.top="0px";B.width=J.Width+"px";B.height=J.Height+"px";if (!FCKBrowserInfo.IsIE){B.borderRight=B.borderBottom="9999px solid white";B.backgroundColor="white";};C.scrollTo(0,0);var K=FCKTools.GetWindowPosition(C,A);if (K.x!=0) B.left=(-1*K.x)+"px";if (K.y!=0) B.top=(-1*K.y)+"px";this.IsMaximized=true;}else{if(FCKBrowserInfo.IsIE) C.detachEvent("onresize",FCKFitWindow_Resize);else C.removeEventListener("resize",FCKFitWindow_Resize,true);G=A;while((G=G.parentNode)){if (G._fckSavedStyles){FCKTools.RestoreStyles(G,G._fckSavedStyles);G._fckSavedStyles=null;}};if (FCKBrowserInfo.IsIE) D.style.overflow=this.documentElementOverflow;FCKTools.RestoreStyles(A,this._EditorFrameStyles);C.scrollTo(this._ScrollPos.X,this._ScrollPos.Y);this.IsMaximized=false;};FCKToolbarItems.GetItem('FitWindow').RefreshState();if (FCK.EditMode==0) FCK.EditingArea.MakeEditable();FCK.Focus();if (FCK.EditMode==0){H.Select();FCK.EditorWindow.scrollTo(oEditorScrollPos.X,oEditorScrollPos.Y);}else{if (!FCKBrowserInfo.IsIE){I.selectionStart=H[0];I.selectionEnd=H[1];};I.scrollLeft=oEditorScrollPos[0];I.scrollTop=oEditorScrollPos[1];}};FCKFitWindow.prototype.GetState=function(){if (FCKConfig.ToolbarLocation!='In') return -1;else return (this.IsMaximized?1:0);};function FCKFitWindow_Resize(){var A=FCKTools.GetViewPaneSize(parent);var B=window.frameElement.style;B.width=A.Width+'px';B.height=A.Height+'px';};
 var FCKListCommand=function(A,B){this.Name=A;this.TagName=B;};FCKListCommand.prototype={GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=FCKSelection.GetBoundaryParentElement(true);var B=A;while (B){if (B.nodeName.IEquals(['ul','ol'])) break;B=B.parentNode;};if (B&&B.nodeName.IEquals(this.TagName)) return 1;else return 0;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCK.EditorDocument;var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=this.GetState();if (C==0){FCKDomTools.TrimNode(A.body);if (!A.body.firstChild){var D=A.createElement('p');A.body.appendChild(D);B.MoveToNodeContents(D);}};var E=B.CreateBookmark();var F=[];var G={};var H=new FCKDomRangeIterator(B);var I;H.ForceBrBreak=(C==0);var J=true;var K=null;while (J){while ((I=H.GetNextParagraph())){var L=new FCKElementPath(I);var M=null;var N=false;var O=L.BlockLimit;for (var i=L.Elements.length-1;i>=0;i--){var P=L.Elements[i];if (P.nodeName.IEquals(['ol','ul'])){if (O._FCK_ListGroupObject) O._FCK_ListGroupObject=null;var Q=P._FCK_ListGroupObject;if (Q) Q.contents.push(I);else{Q={ 'root':P,'contents':[I] };F.push(Q);FCKDomTools.SetElementMarker(G,P,'_FCK_ListGroupObject',Q);};N=true;break;}};if (N) continue;var R=O;if (R._FCK_ListGroupObject) R._FCK_ListGroupObject.contents.push(I);else{var Q={ 'root':R,'contents':[I] };FCKDomTools.SetElementMarker(G,R,'_FCK_ListGroupObject',Q);F.push(Q);}};if (FCKBrowserInfo.IsIE) J=false;else{if (K==null){K=[];var T=FCKSelection.GetSelection();if (T&&F.length==0) K.push(T.getRangeAt(0));for (var i=1;T&&i<T.rangeCount;i++) K.push(T.getRangeAt(i));};if (K.length<1) J=false;else{var U=FCKW3CRange.CreateFromRange(A,K.shift());B._Range=U;B._UpdateElementInfo();if (B.StartNode.nodeName.IEquals('td')) B.SetStart(B.StartNode,1);if (B.EndNode.nodeName.IEquals('td')) B.SetEnd(B.EndNode,2);H=new FCKDomRangeIterator(B);H.ForceBrBreak=(C==0);}}};var W=[];while (F.length>0){var Q=F.shift();if (C==0){if (Q.root.nodeName.IEquals(['ul','ol'])) this._ChangeListType(Q,G,W);else this._CreateList(Q,W);}else if (C==1&&Q.root.nodeName.IEquals(['ul','ol'])) this._RemoveList(Q,G);};for (var i=0;i<W.length;i++){var M=W[i];var Z=false;var a=M;while (!Z){a=a.nextSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.firstChild) M.appendChild(a.removeChild(a.firstChild));};Z=false;a=M;while (!Z){a=a.previousSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.lastChild) M.insertBefore(a.removeChild(a.lastChild),M.firstChild);}};FCKDomTools.ClearAllMarkers(G);B.MoveToBookmark(E);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},_ChangeListType:function(A,B,C){var D=FCKDomTools.ListToArray(A.root,B);var E=[];for (var i=0;i<A.contents.length;i++){var F=A.contents[i];F=FCKTools.GetElementAscensor(F,'li');if (!F||F._FCK_ListItem_Processed) continue;E.push(F);FCKDomTools.SetElementMarker(B,F,'_FCK_ListItem_Processed',true);};var G=FCKTools.GetElementDocument(A.root).createElement(this.TagName);for (var i=0;i<E.length;i++){var H=E[i]._FCK_ListArray_Index;D[H].parent=G;};var I=FCKDomTools.ArrayToList(D,B);for (var i=0;i<I.listNode.childNodes.length;i++){if (I.listNode.childNodes[i].nodeName.IEquals(this.TagName)) C.push(I.listNode.childNodes[i]);};A.root.parentNode.replaceChild(I.listNode,A.root);},_CreateList:function(A,B){var C=A.contents;var D=FCKTools.GetElementDocument(A.root);var E=[];if (C.length==1&&C[0]==A.root){var F=D.createElement('div');while (C[0].firstChild) F.appendChild(C[0].removeChild(C[0].firstChild));C[0].appendChild(F);C[0]=F;};var G=A.contents[0].parentNode;for (var i=0;i<C.length;i++) G=FCKDomTools.GetCommonParents(G,C[i].parentNode).pop();for (var i=0;i<C.length;i++){var H=C[i];while (H.parentNode){if (H.parentNode==G){E.push(H);break;};H=H.parentNode;}};if (E.length<1) return;var I=E[E.length-1].nextSibling;var J=D.createElement(this.TagName);B.push(J);while (E.length){var K=E.shift();var L=D.createDocumentFragment();while (K.firstChild) L.appendChild(K.removeChild(K.firstChild));K.parentNode.removeChild(K);var M=D.createElement('li');M.appendChild(L);J.appendChild(M);};G.insertBefore(J,I);},_RemoveList:function(A,B){var C=FCKDomTools.ListToArray(A.root,B);var D=[];for (var i=0;i<A.contents.length;i++){var E=A.contents[i];E=FCKTools.GetElementAscensor(E,'li');if (!E||E._FCK_ListItem_Processed) continue;D.push(E);FCKDomTools.SetElementMarker(B,E,'_FCK_ListItem_Processed',true);};var F=null;for (var i=0;i<D.length;i++){var G=D[i]._FCK_ListArray_Index;C[G].indent=-1;F=G;};for (var i=F+1;i<C.length;i++){if (C[i].indent>C[i-1].indent+1){var H=C[i-1].indent+1-C[i].indent;var I=C[i].indent;while (C[i]&&C[i].indent>=I){C[i].indent+=H;i++;};i--;}};var J=FCKDomTools.ArrayToList(C,B);if (A.root.nextSibling==null||A.root.nextSibling.nodeName.IEquals('br')){if (J.listNode.lastChild.nodeName.IEquals('br')) J.listNode.removeChild(J.listNode.lastChild);};A.root.parentNode.replaceChild(J.listNode,A.root);}};
 var FCKJustifyCommand=function(A){this.AlignValue=A;var B=FCKConfig.ContentLangDirection.toLowerCase();this.IsDefaultAlign=(A=='left'&&B=='ltr')||(A=='right'&&B=='rtl');var C=this._CssClassName=(function(){var D=FCKConfig.JustifyClasses;if (D){switch (A){case 'left':return D[0]||null;case 'center':return D[1]||null;case 'right':return D[2]||null;case 'justify':return D[3]||null;}};return null;})();if (C&&C.length>0) this._CssClassRegex=new RegExp('(?:^|\\s+)'+C+'(?=$|\\s)');};FCKJustifyCommand._GetClassNameRegex=function(){var A=FCKJustifyCommand._ClassRegex;if (A!=undefined) return A;var B=[];var C=FCKConfig.JustifyClasses;if (C){for (var i=0;i<4;i++){var D=C[i];if (D&&D.length>0) B.push(D);}};if (B.length>0) A=new RegExp('(?:^|\\s+)(?:'+B.join('|')+')(?=$|\\s)');else A=null;return FCKJustifyCommand._ClassRegex=A;};FCKJustifyCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=this.GetState();if (B==-1) return;var C=A.CreateBookmark();var D=this._CssClassName;var E=new FCKDomRangeIterator(A);var F;while ((F=E.GetNextParagraph())){F.removeAttribute('align');if (D){var G=F.className.replace(FCKJustifyCommand._GetClassNameRegex(),'');if (B==0){if (G.length>0) G+=' ';F.className=G+D;}else if (G.length==0) FCKDomTools.RemoveAttribute(F,'class');}else{var H=F.style;if (B==0) H.textAlign=this.AlignValue;else{H.textAlign='';if (H.cssText.length==0) F.removeAttribute('style');}}};A.MoveToBookmark(C);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;var C;if (FCKBrowserInfo.IsIE) C=B.currentStyle.textAlign;else C=FCK.EditorWindow.getComputedStyle(B,'').getPropertyValue('text-align');C=C.replace(/(-moz-|-webkit-|start|auto)/i,'');if ((!C&&this.IsDefaultAlign)||C==this.AlignValue) return 1;return 0;}};
 var FCKIndentCommand=function(A,B){this.Name=A;this.Offset=B;this.IndentCSSProperty=FCKConfig.ContentLangDirection.IEquals('ltr')?'marginLeft':'marginRight';};FCKIndentCommand._InitIndentModeParameters=function(){if (FCKConfig.IndentClasses&&FCKConfig.IndentClasses.length>0){this._UseIndentClasses=true;this._IndentClassMap={};for (var i=0;i<FCKConfig.IndentClasses.length;i++) this._IndentClassMap[FCKConfig.IndentClasses[i]]=i+1;this._ClassNameRegex=new RegExp('(?:^|\\s+)('+FCKConfig.IndentClasses.join('|')+')(?=$|\\s)');}else this._UseIndentClasses=false;};FCKIndentCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=A.CreateBookmark();var C=FCKDomTools.GetCommonParentNode(A.StartNode||A.StartContainer,A.EndNode||A.EndContainer,['ul','ol']);if (C) this._IndentList(A,C);else this._IndentBlock(A);A.MoveToBookmark(B);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;if (FCKIndentCommand._UseIndentClasses==undefined) FCKIndentCommand._InitIndentModeParameters();var A=FCKSelection.GetBoundaryParentElement(true);var B=FCKSelection.GetBoundaryParentElement(false);var C=FCKDomTools.GetCommonParentNode(A,B,['ul','ol']);if (C){if (this.Name.IEquals('outdent')) return 0;var D=FCKTools.GetElementAscensor(A,'li');if (!D||!D.previousSibling) return -1;return 0;};if (!FCKIndentCommand._UseIndentClasses&&this.Name.IEquals('indent')) return 0;var E=new FCKElementPath(A);var F=E.Block||E.BlockLimit;if (!F) return -1;if (FCKIndentCommand._UseIndentClasses){var G=F.className.match(FCKIndentCommand._ClassNameRegex);var H=0;if (G!=null){G=G[1];H=FCKIndentCommand._IndentClassMap[G];};if ((this.Name=='outdent'&&H==0)||(this.Name=='indent'&&H==FCKConfig.IndentClasses.length)) return -1;return 0;}else{var I=parseInt(F.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;if (I<=0) return -1;return 0;}},_IndentBlock:function(A){var B=new FCKDomRangeIterator(A);B.EnforceRealBlocks=true;A.Expand('block_contents');var C=FCKDomTools.GetCommonParents(A.StartContainer,A.EndContainer);var D=C[C.length-1];var E;while ((E=B.GetNextParagraph())){if (!(E==D||E.parentNode==D)) continue;if (FCKIndentCommand._UseIndentClasses){var F=E.className.match(FCKIndentCommand._ClassNameRegex);var G=0;if (F!=null){F=F[1];G=FCKIndentCommand._IndentClassMap[F];};if (this.Name.IEquals('outdent')) G--;else if (this.Name.IEquals('indent')) G++;G=Math.min(G,FCKConfig.IndentClasses.length);G=Math.max(G,0);var H=E.className.replace(FCKIndentCommand._ClassNameRegex,'');if (G<1) E.className=H;else E.className=(H.length>0?H+' ':'')+FCKConfig.IndentClasses[G-1];}else{var I=parseInt(E.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;I+=this.Offset;I=Math.max(I,0);I=Math.ceil(I/this.Offset)*this.Offset;E.style[this.IndentCSSProperty]=I?I+FCKConfig.IndentUnit:'';if (E.getAttribute('style')=='') E.removeAttribute('style');}}},_IndentList:function(A,B){var C=A.StartContainer;var D=A.EndContainer;while (C&&C.parentNode!=B) C=C.parentNode;while (D&&D.parentNode!=B) D=D.parentNode;if (!C||!D) return;var E=C;var F=[];var G=false;while (G==false){if (E==D) G=true;F.push(E);E=E.nextSibling;};if (F.length<1) return;var H=FCKDomTools.GetParents(B);for (var i=0;i<H.length;i++){if (H[i].nodeName.IEquals(['ul','ol'])){B=H[i];break;}};var I=this.Name.IEquals('indent')?1:-1;var J=F[0];var K=F[F.length-1];var L={};var M=FCKDomTools.ListToArray(B,L);var N=M[K._FCK_ListArray_Index].indent;for (var i=J._FCK_ListArray_Index;i<=K._FCK_ListArray_Index;i++) M[i].indent+=I;for (var i=K._FCK_ListArray_Index+1;i<M.length&&M[i].indent>N;i++) M[i].indent+=I;var O=FCKDomTools.ArrayToList(M);if (O) B.parentNode.replaceChild(O.listNode,B);FCKDomTools.ClearAllMarkers(L);}};
-var FCKBlockQuoteCommand=function(){};FCKBlockQuoteCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=this.GetState();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();if (FCKBrowserInfo.IsIE){var D=B.GetBookmarkNode(C,true);var E=B.GetBookmarkNode(C,false);var F;if (D&&D.parentNode.nodeName.IEquals('blockquote')&&!D.previousSibling){F=D;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]) FCKDomTools.MoveNode(D,F,true);}};if (E&&E.parentNode.nodeName.IEquals('blockquote')&&!E.previousSibling){F=E;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]){if (F.firstChild==D) FCKDomTools.InsertAfterNode(D,E);else FCKDomTools.MoveNode(E,F,true);}}}};var G=new FCKDomRangeIterator(B);var H;if (A==0){G.EnforceRealBlocks=true;var I=[];while ((H=G.GetNextParagraph())) I.push(H);if (I.length<1){para=B.Window.document.createElement(FCKConfig.EnterMode.IEquals('p')?'p':'div');B.InsertNode(para);para.appendChild(B.Window.document.createTextNode('\ufeff'));B.MoveToBookmark(C);B.MoveToNodeContents(para);B.Collapse(true);C=B.CreateBookmark();I.push(para);};var J=I[0].parentNode;var K=[];for (var i=0;i<I.length;i++){H=I[i];J=FCKDomTools.GetCommonParents(H.parentNode,J).pop();};var L=null;while (I.length>0){H=I.shift();while (H.parentNode!=J) H=H.parentNode;if (H!=L) K.push(H);L=H;}while (K.length>0){H=K.shift();if (H.nodeName.IEquals('blockquote')){var M=FCKTools.GetElementDocument(H).createDocumentFragment();while (H.firstChild){M.appendChild(H.removeChild(H.firstChild));I.push(M.lastChild);};H.parentNode.replaceChild(M,H);}else I.push(H);};var N=B.Window.document.createElement('blockquote');J.insertBefore(N,I[0]);while (I.length>0){H=I.shift();N.appendChild(H);}}else if (A==1){var O=[];while ((H=G.GetNextParagraph())){var P=null;var Q=null;while (H.parentNode){if (H.parentNode.nodeName.IEquals('blockquote')){P=H.parentNode;Q=H;break;};H=H.parentNode;};if (P&&Q) O.push(Q);};var R=[];while (O.length>0){var S=O.shift();var N=S.parentNode;if (S==S.parentNode.firstChild){N.parentNode.insertBefore(N.removeChild(S),N);if (!N.firstChild) N.parentNode.removeChild(N);}else if (S==S.parentNode.lastChild){N.parentNode.insertBefore(N.removeChild(S),N.nextSibling);if (!N.firstChild) N.parentNode.removeChild(N);}else FCKDomTools.BreakParent(S,S.parentNode,B);R.push(S);};if (FCKConfig.EnterMode.IEquals('br')){while (R.length){var S=R.shift();var W=true;if (S.nodeName.IEquals('div')){var M=FCKTools.GetElementDocument(S).createDocumentFragment();var Y=W&&S.previousSibling&&!FCKListsLib.BlockBoundaries[S.previousSibling.nodeName.toLowerCase()];if (W&&Y) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));var Z=S.nextSibling&&!FCKListsLib.BlockBoundaries[S.nextSibling.nodeName.toLowerCase()];while (S.firstChild) M.appendChild(S.removeChild(S.firstChild));if (Z) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));S.parentNode.replaceChild(M,S);W=false;}}}};B.MoveToBookmark(C);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;for (var i=0;i<A.Elements.length;i++){if (A.Elements[i].nodeName.IEquals('blockquote')) return 1;};return 0;}};
+var FCKBlockQuoteCommand=function(){};FCKBlockQuoteCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=this.GetState();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();if (FCKBrowserInfo.IsIE){var D=B.GetBookmarkNode(C,true);var E=B.GetBookmarkNode(C,false);var F;if (D&&D.parentNode.nodeName.IEquals('blockquote')&&!D.previousSibling){F=D;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]) FCKDomTools.MoveNode(D,F,true);}};if (E&&E.parentNode.nodeName.IEquals('blockquote')&&!E.previousSibling){F=E;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]){if (F.firstChild==D) FCKDomTools.InsertAfterNode(D,E);else FCKDomTools.MoveNode(E,F,true);}}}};var G=new FCKDomRangeIterator(B);var H;if (A==0){var I=[];while ((H=G.GetNextParagraph())) I.push(H);if (I.length<1){para=B.Window.document.createElement(FCKConfig.EnterMode.IEquals('p')?'p':'div');B.InsertNode(para);para.appendChild(B.Window.document.createTextNode('\ufeff'));B.MoveToBookmark(C);B.MoveToNodeContents(para);B.Collapse(true);C=B.CreateBookmark();I.push(para);};var J=I[0].parentNode;var K=[];for (var i=0;i<I.length;i++){H=I[i];J=FCKDomTools.GetCommonParents(H.parentNode,J).pop();}while (J.nodeName.IEquals('table','tbody','tr','ol','ul')) J=J.parentNode;var L=null;while (I.length>0){H=I.shift();while (H.parentNode!=J) H=H.parentNode;if (H!=L) K.push(H);L=H;}while (K.length>0){H=K.shift();if (H.nodeName.IEquals('blockquote')){var M=FCKTools.GetElementDocument(H).createDocumentFragment();while (H.firstChild){M.appendChild(H.removeChild(H.firstChild));I.push(M.lastChild);};H.parentNode.replaceChild(M,H);}else I.push(H);};var N=B.Window.document.createElement('blockquote');J.insertBefore(N,I[0]);while (I.length>0){H=I.shift();N.appendChild(H);}}else if (A==1){var O=[];var P={};while ((H=G.GetNextParagraph())){var Q=null;var R=null;while (H.parentNode){if (H.parentNode.nodeName.IEquals('blockquote')){Q=H.parentNode;R=H;break;};H=H.parentNode;};if (Q&&R&&!R._fckblockquotemoveout){O.push(R);FCKDomTools.SetElementMarker(P,R,'_fckblockquotemoveout',true);}};FCKDomTools.ClearAllMarkers(P);var S=[];var T=[],P={};var U=function(N){for (var i=0;i<N.childNodes.length;i++){if (FCKListsLib.BlockElements[N.childNodes[i].nodeName.toLowerCase()]) return false;};return true;};while (O.length>0){var W=O.shift();var N=W.parentNode;if (W==W.parentNode.firstChild) N.parentNode.insertBefore(N.removeChild(W),N);else if (W==W.parentNode.lastChild) N.parentNode.insertBefore(N.removeChild(W),N.nextSibling);else FCKDomTools.BreakParent(W,W.parentNode,B);if (!N._fckbqprocessed){T.push(N);FCKDomTools.SetElementMarker(P,N,'_fckbqprocessed',true);};S.push(W);};for (var i=T.length-1;i>=0;i--){var N=T[i];if (U(N)) FCKDomTools.RemoveNode(N);};FCKDomTools.ClearAllMarkers(P);if (FCKConfig.EnterMode.IEquals('br')){while (S.length){var W=S.shift();var a=true;if (W.nodeName.IEquals('div')){var M=FCKTools.GetElementDocument(W).createDocumentFragment();var c=a&&W.previousSibling&&!FCKListsLib.BlockBoundaries[W.previousSibling.nodeName.toLowerCase()];if (a&&c) M.appendChild(FCKTools.GetElementDocument(W).createElement('br'));var d=W.nextSibling&&!FCKListsLib.BlockBoundaries[W.nextSibling.nodeName.toLowerCase()];while (W.firstChild) M.appendChild(W.removeChild(W.firstChild));if (d) M.appendChild(FCKTools.GetElementDocument(W).createElement('br'));W.parentNode.replaceChild(M,W);a=false;}}}};B.MoveToBookmark(C);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;for (var i=0;i<A.Elements.length;i++){if (A.Elements[i].nodeName.IEquals('blockquote')) return 1;};return 0;}};
 var FCKCoreStyleCommand=function(A){this.Name='CoreStyle';this.StyleName='_FCK_'+A;this.IsActive=false;FCKStyles.AttachStyleStateChange(this.StyleName,this._OnStyleStateChange,this);};FCKCoreStyleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();if (this.IsActive) FCKStyles.RemoveStyle(this.StyleName);else FCKStyles.ApplyStyle(this.StyleName);FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0) return -1;return this.IsActive?1:0;},_OnStyleStateChange:function(A,B){this.IsActive=B;}};
 var FCKRemoveFormatCommand=function(){this.Name='RemoveFormat';};FCKRemoveFormatCommand.prototype={Execute:function(){FCKStyles.RemoveAll();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){return FCK.EditorWindow?0:-1;}};
 var FCKCommands=FCK.Commands={};FCKCommands.LoadedCommands={};FCKCommands.RegisterCommand=function(A,B){this.LoadedCommands[A]=B;};FCKCommands.GetCommand=function(A){var B=FCKCommands.LoadedCommands[A];if (B) return B;switch (A){case 'Bold':case 'Italic':case 'Underline':case 'StrikeThrough':case 'Subscript':case 'Superscript':B=new FCKCoreStyleCommand(A);break;case 'RemoveFormat':B=new FCKRemoveFormatCommand();break;case 'DocProps':B=new FCKDialogCommand('DocProps',FCKLang.DocProps,'dialog/fck_docprops.html',400,380,FCKCommands.GetFullPageState);break;case 'Templates':B=new FCKDialogCommand('Templates',FCKLang.DlgTemplatesTitle,'dialog/fck_template.html',380,450);break;case 'Link':B=new FCKDialogCommand('Link',FCKLang.DlgLnkWindowTitle,'dialog/fck_link.html',400,300);break;case 'Unlink':B=new FCKUnlinkCommand();break;case 'VisitLink':B=new FCKVisitLinkCommand();break;case 'Anchor':B=new FCKDialogCommand('Anchor',FCKLang.DlgAnchorTitle,'dialog/fck_anchor.html',370,160);break;case 'AnchorDelete':B=new FCKAnchorDeleteCommand();break;case 'BulletedList':B=new FCKDialogCommand('BulletedList',FCKLang.BulletedListProp,'dialog/fck_listprop.html?UL',370,160);break;case 'NumberedList':B=new FCKDialogCommand('NumberedList',FCKLang.NumberedListProp,'dialog/fck_listprop.html?OL',370,160);break;case 'About':B=new FCKDialogCommand('About',FCKLang.About,'dialog/fck_about.html',420,330,function(){ return 0;});break;case 'Find':B=new FCKDialogCommand('Find',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Find');break;case 'Replace':B=new FCKDialogCommand('Replace',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Replace');break;case 'Image':B=new FCKDialogCommand('Image',FCKLang.DlgImgTitle,'dialog/fck_image.html',450,390);break;case 'Flash':B=new FCKDialogCommand('Flash',FCKLang.DlgFlashTitle,'dialog/fck_flash.html',450,390);break;case 'SpecialChar':B=new FCKDialogCommand('SpecialChar',FCKLang.DlgSpecialCharTitle,'dialog/fck_specialchar.html',400,290);break;case 'Smiley':B=new FCKDialogCommand('Smiley',FCKLang.DlgSmileyTitle,'dialog/fck_smiley.html',FCKConfig.SmileyWindowWidth,FCKConfig.SmileyWindowHeight);break;case 'Table':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html',480,250);break;case 'TableProp':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html?Parent',480,250);break;case 'TableCellProp':B=new FCKDialogCommand('TableCell',FCKLang.DlgCellTitle,'dialog/fck_tablecell.html',550,240);break;case 'Style':B=new FCKStyleCommand();break;case 'FontName':B=new FCKFontNameCommand();break;case 'FontSize':B=new FCKFontSizeCommand();break;case 'FontFormat':B=new FCKFormatBlockCommand();break;case 'Source':B=new FCKSourceCommand();break;case 'Preview':B=new FCKPreviewCommand();break;case 'Save':B=new FCKSaveCommand();break;case 'NewPage':B=new FCKNewPageCommand();break;case 'PageBreak':B=new FCKPageBreakCommand();break;case 'Rule':B=new FCKRuleCommand();break;case 'Nbsp':B=new FCKNbsp();break;case 'TextColor':B=new FCKTextColorCommand('ForeColor');break;case 'BGColor':B=new FCKTextColorCommand('BackColor');break;case 'Paste':B=new FCKPasteCommand();break;case 'PasteText':B=new FCKPastePlainTextCommand();break;case 'PasteWord':B=new FCKPasteWordCommand();break;case 'JustifyLeft':B=new FCKJustifyCommand('left');break;case 'JustifyCenter':B=new FCKJustifyCommand('center');break;case 'JustifyRight':B=new FCKJustifyCommand('right');break;case 'JustifyFull':B=new FCKJustifyCommand('justify');break;case 'Indent':B=new FCKIndentCommand('indent',FCKConfig.IndentLength);break;case 'Outdent':B=new FCKIndentCommand('outdent',FCKConfig.IndentLength*-1);break;case 'Blockquote':B=new FCKBlockQuoteCommand();break;case 'CreateDiv':B=new FCKDialogCommand('CreateDiv',FCKLang.CreateDiv,'dialog/fck_div.html',380,210,null,null,true);break;case 'EditDiv':B=new FCKDialogCommand('EditDiv',FCKLang.EditDiv,'dialog/fck_div.html',380,210,null,null,false);break;case 'DeleteDiv':B=new FCKDeleteDivCommand();break;case 'TableInsertRowAfter':B=new FCKTableCommand('TableInsertRowAfter');break;case 'TableInsertRowBefore':B=new FCKTableCommand('TableInsertRowBefore');break;case 'TableDeleteRows':B=new FCKTableCommand('TableDeleteRows');break;case 'TableInsertColumnAfter':B=new FCKTableCommand('TableInsertColumnAfter');break;case 'TableInsertColumnBefore':B=new FCKTableCommand('TableInsertColumnBefore');break;case 'TableDeleteColumns':B=new FCKTableCommand('TableDeleteColumns');break;case 'TableInsertCellAfter':B=new FCKTableCommand('TableInsertCellAfter');break;case 'TableInsertCellBefore':B=new FCKTableCommand('TableInsertCellBefore');break;case 'TableDeleteCells':B=new FCKTableCommand('TableDeleteCells');break;case 'TableMergeCells':B=new FCKTableCommand('TableMergeCells');break;case 'TableMergeRight':B=new FCKTableCommand('TableMergeRight');break;case 'TableMergeDown':B=new FCKTableCommand('TableMergeDown');break;case 'TableHorizontalSplitCell':B=new FCKTableCommand('TableHorizontalSplitCell');break;case 'TableVerticalSplitCell':B=new FCKTableCommand('TableVerticalSplitCell');break;case 'TableDelete':B=new FCKTableCommand('TableDelete');break;case 'Form':B=new FCKDialogCommand('Form',FCKLang.Form,'dialog/fck_form.html',380,210);break;case 'Checkbox':B=new FCKDialogCommand('Checkbox',FCKLang.Checkbox,'dialog/fck_checkbox.html',380,200);break;case 'Radio':B=new FCKDialogCommand('Radio',FCKLang.RadioButton,'dialog/fck_radiobutton.html',380,200);break;case 'TextField':B=new FCKDialogCommand('TextField',FCKLang.TextField,'dialog/fck_textfield.html',380,210);break;case 'Textarea':B=new FCKDialogCommand('Textarea',FCKLang.Textarea,'dialog/fck_textarea.html',380,210);break;case 'HiddenField':B=new FCKDialogCommand('HiddenField',FCKLang.HiddenField,'dialog/fck_hiddenfield.html',380,190);break;case 'Button':B=new FCKDialogCommand('Button',FCKLang.Button,'dialog/fck_button.html',380,210);break;case 'Select':B=new FCKDialogCommand('Select',FCKLang.SelectionField,'dialog/fck_select.html',400,340);break;case 'ImageButton':B=new FCKDialogCommand('ImageButton',FCKLang.ImageButton,'dialog/fck_image.html?ImageButton',450,390);break;case 'SpellCheck':B=new FCKSpellCheckCommand();break;case 'FitWindow':B=new FCKFitWindow();break;case 'Undo':B=new FCKUndoCommand();break;case 'Redo':B=new FCKRedoCommand();break;case 'Copy':B=new FCKCutCopyCommand(false);break;case 'Cut':B=new FCKCutCopyCommand(true);break;case 'SelectAll':B=new FCKSelectAllCommand();break;case 'InsertOrderedList':B=new FCKListCommand('insertorderedlist','ol');break;case 'InsertUnorderedList':B=new FCKListCommand('insertunorderedlist','ul');break;case 'ShowBlocks':B=new FCKShowBlockCommand('ShowBlocks',FCKConfig.StartupShowBlocks?1:0);break;case 'Undefined':B=new FCKUndefinedCommand();break;default:if (FCKRegexLib.NamedCommands.test(A)) B=new FCKNamedCommand(A);else{alert(FCKLang.UnknownCommand.replace(/%1/g,A));return null;}};FCKCommands.LoadedCommands[A]=B;return B;};FCKCommands.GetFullPageState=function(){return FCKConfig.FullPage?0:-1;};FCKCommands.GetBooleanState=function(A){return A?-1:0;};
-var FCKPanel=function(A){this.IsRTL=(FCKLang.Dir=='rtl');this.IsContextMenu=false;this._LockCounter=0;this._Window=A||window;var B;if (FCKBrowserInfo.IsIE){this._Popup=this._Window.createPopup();var C=this._Window.document;if (FCK_IS_CUSTOM_DOMAIN&&!FCKBrowserInfo.IsIE7){C.domain=FCK_ORIGINAL_DOMAIN;document.domain=FCK_ORIGINAL_DOMAIN;};B=this.Document=this._Popup.document;if (FCK_IS_CUSTOM_DOMAIN){B.domain=FCK_RUNTIME_DOMAIN;C.domain=FCK_RUNTIME_DOMAIN;document.domain=FCK_RUNTIME_DOMAIN;};FCK.IECleanup.AddItem(this,FCKPanel_Cleanup);}else{var D=this._IFrame=this._Window.document.createElement('iframe');FCKTools.ResetStyles(D);D.src='javascript:void(0)';D.allowTransparency=true;D.frameBorder='0';D.scrolling='no';D.style.width=D.style.height='0px';FCKDomTools.SetElementStyles(D,{position:'absolute',zIndex:FCKConfig.FloatingPanelsZIndex});this._Window.document.body.appendChild(D);var E=D.contentWindow;B=this.Document=E.document;var F='';if (FCKBrowserInfo.IsSafari) F='<base href="'+window.document.location+'">';B.open();B.write('<html><head>'+F+'<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>');B.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.Panel_Contructor(B,window.document.location);FCKTools.AddEventListenerEx(E,'focus',FCKPanel_Window_OnFocus,this);FCKTools.AddEventListenerEx(E,'blur',FCKPanel_Window_OnBlur,this);};B.dir=FCKLang.Dir;FCKTools.AddEventListener(B,'contextmenu',FCKTools.CancelEvent);this.MainNode=B.body.appendChild(B.createElement('DIV'));this.MainNode.style.cssFloat=this.IsRTL?'right':'left';};FCKPanel.prototype.AppendStyleSheet=function(A){FCKTools.AppendStyleSheet(this.Document,A);};FCKPanel.prototype.Preload=function(x,y,A){if (this._Popup) this._Popup.show(x,y,0,0,A);};FCKPanel.prototype.Show=function(x,y,A,B,C){var D;var E=this.MainNode;if (this._Popup){this._Popup.show(x,y,0,0,A);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=(x*-1)+A.offsetWidth-D;};this._Popup.show(x,y,D,E.offsetHeight,A);if (this.OnHide){if (this._Timer) CheckPopupOnHide.call(this,true);this._Timer=FCKTools.SetInterval(CheckPopupOnHide,100,this);}}else{if (typeof(FCK.ToolbarSet.CurrentInstance.FocusManager)!='undefined') FCK.ToolbarSet.CurrentInstance.FocusManager.Lock();if (this.ParentPanel){this.ParentPanel.Lock();FCKPanel_Window_OnBlur(null,this.ParentPanel);};if (FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac){this._IFrame.scrolling='';FCKTools.RunFunction(function(){ this._IFrame.scrolling='no';},this);};if (FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel&&FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel!=this) FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel.Hide(false,true);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (!B)	this._IFrame.width=1;if (!C)	this._IFrame.height=1;D=E.offsetWidth||E.firstChild.offsetWidth;var F=FCKTools.GetDocumentPosition(this._Window,A.nodeType==9?(FCKTools.IsStrictMode(A)?A.documentElement:A.body):A);var G=FCKDomTools.GetPositionedAncestor(this._IFrame.parentNode);if (G){var H=FCKTools.GetDocumentPosition(FCKTools.GetElementWindow(G),G);F.x-=H.x;F.y-=H.y;};if (this.IsRTL&&!this.IsContextMenu) x=(x*-1);x+=F.x;y+=F.y;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=x+A.offsetWidth-D;}else{var I=FCKTools.GetViewPaneSize(this._Window);var J=FCKTools.GetScrollPosition(this._Window);var K=I.Height+J.Y;var L=I.Width+J.X;if ((x+D)>L) x-=x+D-L;if ((y+E.offsetHeight)>K) y-=y+E.offsetHeight-K;};FCKDomTools.SetElementStyles(this._IFrame,{left:x+'px',top:y+'px'});this._IFrame.contentWindow.focus();this._IsOpened=true;var M=this;this._resizeTimer=setTimeout(function(){var N=E.offsetWidth||E.firstChild.offsetWidth;var O=E.offsetHeight;M._IFrame.style.width=N+'px';M._IFrame.style.height=O+'px';},0);FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel=this;};FCKTools.RunFunction(this.OnShow,this);};FCKPanel.prototype.Hide=function(A,B){if (this._Popup) this._Popup.hide();else{if (!this._IsOpened||this._LockCounter>0) return;if (typeof(FCKFocusManager)!='undefined'&&!B) FCKFocusManager.Unlock();this._IFrame.style.width=this._IFrame.style.height='0px';this._IsOpened=false;if (this._resizeTimer){clearTimeout(this._resizeTimer);this._resizeTimer=null;};if (this.ParentPanel) this.ParentPanel.Unlock();if (!A) FCKTools.RunFunction(this.OnHide,this);}};FCKPanel.prototype.CheckIsOpened=function(){if (this._Popup) return this._Popup.isOpen;else return this._IsOpened;};FCKPanel.prototype.CreateChildPanel=function(){var A=this._Popup?FCKTools.GetDocumentWindow(this.Document):this._Window;var B=new FCKPanel(A);B.ParentPanel=this;return B;};FCKPanel.prototype.Lock=function(){this._LockCounter++;};FCKPanel.prototype.Unlock=function(){if (--this._LockCounter==0&&!this.HasFocus) this.Hide();};function FCKPanel_Window_OnFocus(e,A){A.HasFocus=true;};function FCKPanel_Window_OnBlur(e,A){A.HasFocus=false;if (A._LockCounter==0) FCKTools.RunFunction(A.Hide,A);};function CheckPopupOnHide(A){if (A||!this._Popup.isOpen){window.clearInterval(this._Timer);this._Timer=null;FCKTools.RunFunction(this.OnHide,this);}};function FCKPanel_Cleanup(){this._Popup=null;this._Window=null;this.Document=null;this.MainNode=null;};
+var FCKPanel=function(A){this.IsRTL=(FCKLang.Dir=='rtl');this.IsContextMenu=false;this._LockCounter=0;this._Window=A||window;var B;if (FCKBrowserInfo.IsIE){this._Popup=this._Window.createPopup();var C=this._Window.document;if (FCK_IS_CUSTOM_DOMAIN&&!FCKBrowserInfo.IsIE7){C.domain=FCK_ORIGINAL_DOMAIN;document.domain=FCK_ORIGINAL_DOMAIN;};B=this.Document=this._Popup.document;if (FCK_IS_CUSTOM_DOMAIN){B.domain=FCK_RUNTIME_DOMAIN;C.domain=FCK_RUNTIME_DOMAIN;document.domain=FCK_RUNTIME_DOMAIN;};FCK.IECleanup.AddItem(this,FCKPanel_Cleanup);}else{var D=this._IFrame=this._Window.document.createElement('iframe');FCKTools.ResetStyles(D);D.src='javascript:void(0)';D.allowTransparency=true;D.frameBorder='0';D.scrolling='no';D.style.width=D.style.height='0px';FCKDomTools.SetElementStyles(D,{position:'absolute',zIndex:FCKConfig.FloatingPanelsZIndex});this._Window.document.body.appendChild(D);var E=D.contentWindow;B=this.Document=E.document;var F='';if (FCKBrowserInfo.IsSafari) F='<base href="'+window.document.location+'">';B.open();B.write('<html><head>'+F+'<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>');B.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.Panel_Contructor(B,window.document.location);FCKTools.AddEventListenerEx(E,'focus',FCKPanel_Window_OnFocus,this);FCKTools.AddEventListenerEx(E,'blur',FCKPanel_Window_OnBlur,this);};B.dir=FCKLang.Dir;FCKTools.AddEventListener(B,'contextmenu',FCKTools.CancelEvent);this.MainNode=B.body.appendChild(B.createElement('DIV'));this.MainNode.style.cssFloat=this.IsRTL?'right':'left';};FCKPanel.prototype.AppendStyleSheet=function(A){FCKTools.AppendStyleSheet(this.Document,A);};FCKPanel.prototype.Preload=function(x,y,A){if (this._Popup) this._Popup.show(x,y,0,0,A);};FCKPanel.prototype.ResizeForSubpanel=function(A,B,C){if (!FCKBrowserInfo.IsIE7) return false;if (!this._Popup.isOpen){this.Subpanel=null;return false;};if (B==0&&C==0){if (this.Subpanel!==A) return false;this.Subpanel=null;this.IncreasedX=0;}else{this.Subpanel=A;if ((this.IncreasedX>=B)&&(this.IncreasedY>=C)) return false;this.IncreasedX=Math.max(this.IncreasedX,B);this.IncreasedY=Math.max(this.IncreasedY,C);};var x=this.ShowRect.x;var w=this.IncreasedX;if (this.IsRTL) x=x-w;var D=this.ShowRect.w+w;var E=Math.max(this.ShowRect.h,this.IncreasedY);if (this.ParentPanel) this.ParentPanel.ResizeForSubpanel(this,D,E);this._Popup.show(x,this.ShowRect.y,D,E,this.RelativeElement);return this.IsRTL;};FCKPanel.prototype.Show=function(x,y,A,B,C){var D;var E=this.MainNode;if (this._Popup){this._Popup.show(x,y,0,0,A);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (FCKBrowserInfo.IsIE7){if (this.ParentPanel&&this.ParentPanel.ResizeForSubpanel(this,D,E.offsetHeight)){FCKTools.RunFunction(this.Show,this,[x,y,A]);return;}};if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=(x*-1)+A.offsetWidth-D;};if (FCKBrowserInfo.IsIE7){this.ShowRect={x:x,y:y,w:D,h:E.offsetHeight};this.IncreasedX=0;this.IncreasedY=0;this.RelativeElement=A;};this._Popup.show(x,y,D,E.offsetHeight,A);if (this.OnHide){if (this._Timer) CheckPopupOnHide.call(this,true);this._Timer=FCKTools.SetInterval(CheckPopupOnHide,100,this);}}else{if (typeof(FCK.ToolbarSet.CurrentInstance.FocusManager)!='undefined') FCK.ToolbarSet.CurrentInstance.FocusManager.Lock();if (this.ParentPanel){this.ParentPanel.Lock();FCKPanel_Window_OnBlur(null,this.ParentPanel);};if (FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac){this._IFrame.scrolling='';FCKTools.RunFunction(function(){ this._IFrame.scrolling='no';},this);};if (FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel&&FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel!=this) FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel.Hide(false,true);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (!B)	this._IFrame.width=1;if (!C)	this._IFrame.height=1;D=E.offsetWidth||E.firstChild.offsetWidth;var F=FCKTools.GetDocumentPosition(this._Window,A.nodeType==9?(FCKTools.IsStrictMode(A)?A.documentElement:A.body):A);var G=FCKDomTools.GetPositionedAncestor(this._IFrame.parentNode);if (G){var H=FCKTools.GetDocumentPosition(FCKTools.GetElementWindow(G),G);F.x-=H.x;F.y-=H.y;};if (this.IsRTL&&!this.IsContextMenu) x=(x*-1);x+=F.x;y+=F.y;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=x+A.offsetWidth-D;}else{var I=FCKTools.GetViewPaneSize(this._Window);var J=FCKTools.GetScrollPosition(this._Window);var K=I.Height+J.Y;var L=I.Width+J.X;if ((x+D)>L) x-=x+D-L;if ((y+E.offsetHeight)>K) y-=y+E.offsetHeight-K;};FCKDomTools.SetElementStyles(this._IFrame,{left:x+'px',top:y+'px'});this._IFrame.contentWindow.focus();this._IsOpened=true;var M=this;this._resizeTimer=setTimeout(function(){var N=E.offsetWidth||E.firstChild.offsetWidth;var O=E.offsetHeight;M._IFrame.style.width=N+'px';M._IFrame.style.height=O+'px';},0);FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel=this;};FCKTools.RunFunction(this.OnShow,this);};FCKPanel.prototype.Hide=function(A,B){if (this._Popup) this._Popup.hide();else{if (!this._IsOpened||this._LockCounter>0) return;if (typeof(FCKFocusManager)!='undefined'&&!B) FCKFocusManager.Unlock();this._IFrame.style.width=this._IFrame.style.height='0px';this._IsOpened=false;if (this._resizeTimer){clearTimeout(this._resizeTimer);this._resizeTimer=null;};if (this.ParentPanel) this.ParentPanel.Unlock();if (!A) FCKTools.RunFunction(this.OnHide,this);}};FCKPanel.prototype.CheckIsOpened=function(){if (this._Popup) return this._Popup.isOpen;else return this._IsOpened;};FCKPanel.prototype.CreateChildPanel=function(){var A=this._Popup?FCKTools.GetDocumentWindow(this.Document):this._Window;var B=new FCKPanel(A);B.ParentPanel=this;return B;};FCKPanel.prototype.Lock=function(){this._LockCounter++;};FCKPanel.prototype.Unlock=function(){if (--this._LockCounter==0&&!this.HasFocus) this.Hide();};function FCKPanel_Window_OnFocus(e,A){A.HasFocus=true;};function FCKPanel_Window_OnBlur(e,A){A.HasFocus=false;if (A._LockCounter==0) FCKTools.RunFunction(A.Hide,A);};function CheckPopupOnHide(A){if (A||!this._Popup.isOpen){window.clearInterval(this._Timer);this._Timer=null;if (this._Popup&&this.ParentPanel&&!A) this.ParentPanel.ResizeForSubpanel(this,0,0);FCKTools.RunFunction(this.OnHide,this);}};function FCKPanel_Cleanup(){this._Popup=null;this._Window=null;this.Document=null;this.MainNode=null;this.RelativeElement=null;};
 var FCKIcon=function(A){var B=A?typeof(A):'undefined';switch (B){case 'number':this.Path=FCKConfig.SkinPath+'fck_strip.gif';this.Size=16;this.Position=A;break;case 'undefined':this.Path=FCK_SPACER_PATH;break;case 'string':this.Path=A;break;default:this.Path=A[0];this.Size=A[1];this.Position=A[2];}};FCKIcon.prototype.CreateIconElement=function(A){var B,eIconImage;if (this.Position){var C='-'+((this.Position-1)*this.Size)+'px';if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path;eIconImage.style.top=C;}else{B=A.createElement('IMG');B.src=FCK_SPACER_PATH;B.style.backgroundPosition='0px '+C;B.style.backgroundImage='url("'+this.Path+'")';}}else{if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path?this.Path:FCK_SPACER_PATH;}else{B=A.createElement('IMG');B.src=this.Path?this.Path:FCK_SPACER_PATH;}};B.className='TB_Button_Image';return B;};
 var FCKToolbarButtonUI=function(A,B,C,D,E,F){this.Name=A;this.Label=B||A;this.Tooltip=C||this.Label;this.Style=E||0;this.State=F||0;this.Icon=new FCKIcon(D);if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarButtonUI_Cleanup);};FCKToolbarButtonUI.prototype._CreatePaddingElement=function(A){var B=A.createElement('IMG');B.className='TB_Button_Padding';B.src=FCK_SPACER_PATH;return B;};FCKToolbarButtonUI.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var C=this.MainElement=B.createElement('DIV');C.title=this.Tooltip;if (FCKBrowserInfo.IsGecko) C.onmousedown=FCKTools.CancelEvent;FCKTools.AddEventListenerEx(C,'mouseover',FCKToolbarButtonUI_OnMouseOver,this);FCKTools.AddEventListenerEx(C,'mouseout',FCKToolbarButtonUI_OnMouseOut,this);FCKTools.AddEventListenerEx(C,'click',FCKToolbarButtonUI_OnClick,this);this.ChangeState(this.State,true);if (this.Style==0&&!this.ShowArrow){C.appendChild(this.Icon.CreateIconElement(B));}else{var D=C.appendChild(B.createElement('TABLE'));D.cellPadding=0;D.cellSpacing=0;var E=D.insertRow(-1);var F=E.insertCell(-1);if (this.Style==0||this.Style==2) F.appendChild(this.Icon.CreateIconElement(B));else F.appendChild(this._CreatePaddingElement(B));if (this.Style==1||this.Style==2){F=E.insertCell(-1);F.className='TB_Button_Text';F.noWrap=true;F.appendChild(B.createTextNode(this.Label));};if (this.ShowArrow){if (this.Style!=0){E.insertCell(-1).appendChild(this._CreatePaddingElement(B));};F=E.insertCell(-1);var G=F.appendChild(B.createElement('IMG'));G.src=FCKConfig.SkinPath+'images/toolbar.buttonarrow.gif';G.width=5;G.height=3;};F=E.insertCell(-1);F.appendChild(this._CreatePaddingElement(B));};A.appendChild(C);};FCKToolbarButtonUI.prototype.ChangeState=function(A,B){if (!B&&this.State==A) return;var e=this.MainElement;if (!e) return;switch (parseInt(A,10)){case 0:e.className='TB_Button_Off';break;case 1:e.className='TB_Button_On';break;case -1:e.className='TB_Button_Disabled';break;};this.State=A;};function FCKToolbarButtonUI_OnMouseOver(A,B){if (B.State==0) this.className='TB_Button_Off_Over';else if (B.State==1) this.className='TB_Button_On_Over';};function FCKToolbarButtonUI_OnMouseOut(A,B){if (B.State==0) this.className='TB_Button_Off';else if (B.State==1) this.className='TB_Button_On';};function FCKToolbarButtonUI_OnClick(A,B){if (B.OnClick&&B.State!=-1) B.OnClick(B);};function FCKToolbarButtonUI_Cleanup(){this.MainElement=null;};
 var FCKToolbarButton=function(A,B,C,D,E,F,G){this.CommandName=A;this.Label=B;this.Tooltip=C;this.Style=D;this.SourceView=E?true:false;this.ContextSensitive=F?true:false;if (G==null) this.IconPath=FCKConfig.SkinPath+'toolbar/'+A.toLowerCase()+'.gif';else if (typeof(G)=='number') this.IconPath=[FCKConfig.SkinPath+'fck_strip.gif',16,G];else this.IconPath=G;};FCKToolbarButton.prototype.Create=function(A){this._UIButton=new FCKToolbarButtonUI(this.CommandName,this.Label,this.Tooltip,this.IconPath,this.Style);this._UIButton.OnClick=this.Click;this._UIButton._ToolbarButton=this;this._UIButton.Create(A);};FCKToolbarButton.prototype.RefreshState=function(){var A=this._UIButton;if (!A) return;var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).GetState();if (B==A.State) return;A.ChangeState(B);};FCKToolbarButton.prototype.Click=function(){var A=this._ToolbarButton||this;FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(A.CommandName).Execute();};FCKToolbarButton.prototype.Enable=function(){this.RefreshState();};FCKToolbarButton.prototype.Disable=function(){this._UIButton.ChangeState(-1);};
@@ -97,12 +97,12 @@ var FCKToolbarItems={};FCKToolbarItems.LoadedItems={};FCKToolbarItems.RegisterIt
 var FCKToolbar=function(){this.Items=[];};FCKToolbar.prototype.AddItem=function(A){return this.Items[this.Items.length]=A;};FCKToolbar.prototype.AddButton=function(A,B,C,D,E,F){if (typeof(D)=='number') D=[this.DefaultIconsStrip,this.DefaultIconSize,D];var G=new FCKToolbarButtonUI(A,B,C,D,E,F);G._FCKToolbar=this;G.OnClick=FCKToolbar_OnItemClick;return this.AddItem(G);};function FCKToolbar_OnItemClick(A){var B=A._FCKToolbar;if (B.OnItemClick) B.OnItemClick(B,A);};FCKToolbar.prototype.AddSeparator=function(){this.AddItem(new FCKToolbarSeparator());};FCKToolbar.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var e=B.createElement('table');e.className='TB_Toolbar';e.style.styleFloat=e.style.cssFloat=(FCKLang.Dir=='ltr'?'left':'right');e.dir=FCKLang.Dir;e.cellPadding=0;e.cellSpacing=0;var C=e.insertRow(-1);var D;if (!this.HideStart){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_Start';};for (var i=0;i<this.Items.length;i++){this.Items[i].Create(C.insertCell(-1));};if (!this.HideEnd){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_End';};A.appendChild(e);};var FCKToolbarSeparator=function(){};FCKToolbarSeparator.prototype.Create=function(A){FCKTools.AppendElement(A,'div').className='TB_Separator';};
 var FCKToolbarBreak=function(){};FCKToolbarBreak.prototype.Create=function(A){var B=A.ownerDocument.createElement('div');B.style.clear=B.style.cssFloat=FCKLang.Dir=='rtl'?'right':'left';A.appendChild(B);};
 function FCKToolbarSet_Create(A){var B;var C=A||FCKConfig.ToolbarLocation;switch (C){case 'In':document.getElementById('xToolbarRow').style.display='';B=new FCKToolbarSet(document);break;case 'None':B=new FCKToolbarSet(document);break;default:FCK.Events.AttachEvent('OnBlur',FCK_OnBlur);FCK.Events.AttachEvent('OnFocus',FCK_OnFocus);var D;var E=C.match(/^Out:(.+)\((\w+)\)$/);if (E){if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_GetOutElement(window,E);else D=eval('parent.'+E[1]).document.getElementById(E[2]);}else{E=C.match(/^Out:(\w+)$/);if (E) D=parent.document.getElementById(E[1]);};if (!D){alert('Invalid value for "ToolbarLocation"');return arguments.callee('In');};B=D.__FCKToolbarSet;if (B) break;var F=FCKTools.GetElementDocument(D).createElement('iframe');F.src='javascript:void(0)';F.frameBorder=0;F.width='100%';F.height='10';D.appendChild(F);F.unselectable='on';var G=F.contentWindow.document;var H='';if (FCKBrowserInfo.IsSafari) H='<base href="'+window.document.location+'">';G.open();G.write('<html><head>'+H+'<script type="text/javascript"> var adjust = function() { window.frameElement.height = document.body.scrollHeight ; }; window.onresize = window.onload = function(){var timer = null;var lastHeight = -1;var lastChange = 0;var poller = function(){var currentHeight = document.body.scrollHeight || 0;var currentTime = (new Date()).getTime();if (currentHeight != lastHeight){lastChange = currentTime;adjust();lastHeight = document.body.scrollHeight;}if (lastChange < currentTime - 1000) clearInterval(timer);};timer = setInterval(poller, 100);}</script></head><body style="overflow: hidden">'+document.getElementById('xToolbarSpace').innerHTML+'</body></html>');G.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_InitOutFrame(G);FCKTools.AddEventListener(G,'contextmenu',FCKTools.CancelEvent);FCKTools.AppendStyleSheet(G,FCKConfig.SkinEditorCSS);B=D.__FCKToolbarSet=new FCKToolbarSet(G);B._IFrame=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(D,FCKToolbarSet_Target_Cleanup);};B.CurrentInstance=FCK;if (!B.ToolbarItems) B.ToolbarItems=FCKToolbarItems;FCK.AttachToOnSelectionChange(B.RefreshItemsState);return B;};function FCK_OnBlur(A){var B=A.ToolbarSet;if (B.CurrentInstance==A) B.Disable();};function FCK_OnFocus(A){var B=A.ToolbarSet;var C=A||FCK;B.CurrentInstance.FocusManager.RemoveWindow(B._IFrame.contentWindow);B.CurrentInstance=C;C.FocusManager.AddWindow(B._IFrame.contentWindow,true);B.Enable();};function FCKToolbarSet_Cleanup(){this._TargetElement=null;this._IFrame=null;};function FCKToolbarSet_Target_Cleanup(){this.__FCKToolbarSet=null;};var FCKToolbarSet=function(A){this._Document=A;this._TargetElement=A.getElementById('xToolbar');var B=A.getElementById('xExpandHandle');var C=A.getElementById('xCollapseHandle');B.title=FCKLang.ToolbarExpand;FCKTools.AddEventListener(B,'click',FCKToolbarSet_Expand_OnClick);C.title=FCKLang.ToolbarCollapse;FCKTools.AddEventListener(C,'click',FCKToolbarSet_Collapse_OnClick);if (!FCKConfig.ToolbarCanCollapse||FCKConfig.ToolbarStartExpanded) this.Expand();else this.Collapse();C.style.display=FCKConfig.ToolbarCanCollapse?'':'none';if (FCKConfig.ToolbarCanCollapse) C.style.display='';else A.getElementById('xTBLeftBorder').style.display='';this.Toolbars=[];this.IsLoaded=false;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarSet_Cleanup);};function FCKToolbarSet_Expand_OnClick(){FCK.ToolbarSet.Expand();};function FCKToolbarSet_Collapse_OnClick(){FCK.ToolbarSet.Collapse();};FCKToolbarSet.prototype.Expand=function(){this._ChangeVisibility(false);};FCKToolbarSet.prototype.Collapse=function(){this._ChangeVisibility(true);};FCKToolbarSet.prototype._ChangeVisibility=function(A){this._Document.getElementById('xCollapsed').style.display=A?'':'none';this._Document.getElementById('xExpanded').style.display=A?'none':'';if (FCKBrowserInfo.IsGecko){FCKTools.RunFunction(window.onresize);}};FCKToolbarSet.prototype.Load=function(A){this.Name=A;this.Items=[];this.ItemsWysiwygOnly=[];this.ItemsContextSensitive=[];this._TargetElement.innerHTML='';var B=FCKConfig.ToolbarSets[A];if (!B){alert(FCKLang.UnknownToolbarSet.replace(/%1/g,A));return;};this.Toolbars=[];for (var x=0;x<B.length;x++){var C=B[x];if (!C) continue;var D;if (typeof(C)=='string'){if (C=='/') D=new FCKToolbarBreak();}else{D=new FCKToolbar();for (var j=0;j<C.length;j++){var E=C[j];if (E=='-') D.AddSeparator();else{var F=FCKToolbarItems.GetItem(E);if (F){D.AddItem(F);this.Items.push(F);if (!F.SourceView) this.ItemsWysiwygOnly.push(F);if (F.ContextSensitive) this.ItemsContextSensitive.push(F);}}}};D.Create(this._TargetElement);this.Toolbars[this.Toolbars.length]=D;};FCKTools.DisableSelection(this._Document.getElementById('xCollapseHandle').parentNode);if (FCK.Status!=2) FCK.Events.AttachEvent('OnStatusChange',this.RefreshModeState);else this.RefreshModeState();this.IsLoaded=true;this.IsEnabled=true;FCKTools.RunFunction(this.OnLoad);};FCKToolbarSet.prototype.Enable=function(){if (this.IsEnabled) return;this.IsEnabled=true;var A=this.Items;for (var i=0;i<A.length;i++) A[i].RefreshState();};FCKToolbarSet.prototype.Disable=function(){if (!this.IsEnabled) return;this.IsEnabled=false;var A=this.Items;for (var i=0;i<A.length;i++) A[i].Disable();};FCKToolbarSet.prototype.RefreshModeState=function(A){if (FCK.Status!=2) return;var B=A?A.ToolbarSet:this;var C=B.ItemsWysiwygOnly;if (FCK.EditMode==0){for (var i=0;i<C.length;i++) C[i].Enable();B.RefreshItemsState(A);}else{B.RefreshItemsState(A);for (var j=0;j<C.length;j++) C[j].Disable();}};FCKToolbarSet.prototype.RefreshItemsState=function(A){var B=(A?A.ToolbarSet:this).ItemsContextSensitive;for (var i=0;i<B.length;i++) B[i].RefreshState();};
-var FCKDialog=(function(){var A;var B;var C;var D=window.parent;while (D.parent&&D.parent!=D){try{if (D.parent.document.domain!=document.domain) break;if (D.parent.document.getElementsByTagName('frameset').length>0) break;}catch (e){break;};D=D.parent;};var E=D.document;var F=function(){if (!B) B=FCKConfig.FloatingPanelsZIndex+999;return++B;};var G=function(){if (!C) return;var H=FCKTools.IsStrictMode(E)?E.documentElement:E.body;FCKDomTools.SetElementStyles(C,{'width':Math.max(H.scrollWidth,H.clientWidth,E.scrollWidth||0)-1+'px','height':Math.max(H.scrollHeight,H.clientHeight,E.scrollHeight||0)-1+'px'});};return {OpenDialog:function(dialogName,dialogTitle,dialogPage,width,height,customValue,parentWindow,resizable){if (!A) this.DisplayMainCover();var I={Title:dialogTitle,Page:dialogPage,Editor:window,CustomValue:customValue,TopWindow:D};FCK.ToolbarSet.CurrentInstance.Selection.Save();var J=FCKTools.GetViewPaneSize(D);var K={ 'X':0,'Y':0 };var L=FCKBrowserInfo.IsIE&&(!FCKBrowserInfo.IsIE7||!FCKTools.IsStrictMode(D.document));if (L) K=FCKTools.GetScrollPosition(D);var M=Math.max(K.Y+(J.Height-height-20)/2,0);var N=Math.max(K.X+(J.Width-width-20)/2,0);var O=E.createElement('iframe');FCKTools.ResetStyles(O);O.src=FCKConfig.BasePath+'fckdialog.html';O.frameBorder=0;O.allowTransparency=true;FCKDomTools.SetElementStyles(O,{'position':(L)?'absolute':'fixed','top':M+'px','left':N+'px','width':width+'px','height':height+'px','zIndex':F()});O._DialogArguments=I;E.body.appendChild(O);O._ParentDialog=A;A=O;},OnDialogClose:function(dialogWindow){var O=dialogWindow.frameElement;FCKDomTools.RemoveNode(O);if (O._ParentDialog){A=O._ParentDialog;O._ParentDialog.contentWindow.SetEnabled(true);}else{if (!FCKBrowserInfo.IsIE) FCK.Focus();this.HideMainCover();setTimeout(function(){ A=null;},0);FCK.ToolbarSet.CurrentInstance.Selection.Release();}},DisplayMainCover:function(){C=E.createElement('div');FCKTools.ResetStyles(C);FCKDomTools.SetElementStyles(C,{'position':'absolute','zIndex':F(),'top':'0px','left':'0px','backgroundColor':FCKConfig.BackgroundBlockerColor});FCKDomTools.SetOpacity(C,FCKConfig.BackgroundBlockerOpacity);if (FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsIE7){var Q=E.createElement('iframe');FCKTools.ResetStyles(Q);Q.hideFocus=true;Q.frameBorder=0;Q.src=FCKTools.GetVoidUrl();FCKDomTools.SetElementStyles(Q,{'width':'100%','height':'100%','position':'absolute','left':'0px','top':'0px','filter':'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'});C.appendChild(Q);};FCKTools.AddEventListener(D,'resize',G);G();E.body.appendChild(C);FCKFocusManager.Lock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R._fck_originalTabIndex=R.tabIndex;R.tabIndex=-1;},HideMainCover:function(){FCKDomTools.RemoveNode(C);FCKFocusManager.Unlock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R.tabIndex=R._fck_originalTabIndex;FCKDomTools.ClearElementJSProperty(R,'_fck_originalTabIndex');},GetCover:function(){return C;}};})();
+var FCKDialog=(function(){var A;var B;var C;var D=window.parent;while (D.parent&&D.parent!=D){try{if (D.parent.document.domain!=document.domain) break;if (D.parent.document.getElementsByTagName('frameset').length>0) break;}catch (e){break;};D=D.parent;};var E=D.document;var F=function(){if (!B) B=FCKConfig.FloatingPanelsZIndex+999;return++B;};var G=function(){if (!C) return;var H=FCKTools.IsStrictMode(E)?E.documentElement:E.body;FCKDomTools.SetElementStyles(C,{'width':Math.max(H.scrollWidth,H.clientWidth,E.scrollWidth||0)-1+'px','height':Math.max(H.scrollHeight,H.clientHeight,E.scrollHeight||0)-1+'px'});};return {OpenDialog:function(dialogName,dialogTitle,dialogPage,width,height,customValue,parentWindow,resizable){if (!A) this.DisplayMainCover();var I={Title:dialogTitle,Page:dialogPage,Editor:window,CustomValue:customValue,TopWindow:D};FCK.ToolbarSet.CurrentInstance.Selection.Save(true);var J=FCKTools.GetViewPaneSize(D);var K={ 'X':0,'Y':0 };var L=FCKBrowserInfo.IsIE&&(!FCKBrowserInfo.IsIE7||!FCKTools.IsStrictMode(D.document));if (L) K=FCKTools.GetScrollPosition(D);var M=Math.max(K.Y+(J.Height-height-20)/2,0);var N=Math.max(K.X+(J.Width-width-20)/2,0);var O=E.createElement('iframe');FCKTools.ResetStyles(O);O.src=FCKConfig.BasePath+'fckdialog.html';O.frameBorder=0;O.allowTransparency=true;FCKDomTools.SetElementStyles(O,{'position':(L)?'absolute':'fixed','top':M+'px','left':N+'px','width':width+'px','height':height+'px','zIndex':F()});O._DialogArguments=I;E.body.appendChild(O);O._ParentDialog=A;A=O;},OnDialogClose:function(dialogWindow){var O=dialogWindow.frameElement;FCKDomTools.RemoveNode(O);if (O._ParentDialog){A=O._ParentDialog;O._ParentDialog.contentWindow.SetEnabled(true);}else{if (!FCKBrowserInfo.IsIE) FCK.Focus();this.HideMainCover();setTimeout(function(){ A=null;},0);FCK.ToolbarSet.CurrentInstance.Selection.Release();}},DisplayMainCover:function(){C=E.createElement('div');FCKTools.ResetStyles(C);FCKDomTools.SetElementStyles(C,{'position':'absolute','zIndex':F(),'top':'0px','left':'0px','backgroundColor':FCKConfig.BackgroundBlockerColor});FCKDomTools.SetOpacity(C,FCKConfig.BackgroundBlockerOpacity);if (FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsIE7){var Q=E.createElement('iframe');FCKTools.ResetStyles(Q);Q.hideFocus=true;Q.frameBorder=0;Q.src=FCKTools.GetVoidUrl();FCKDomTools.SetElementStyles(Q,{'width':'100%','height':'100%','position':'absolute','left':'0px','top':'0px','filter':'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'});C.appendChild(Q);};FCKTools.AddEventListener(D,'resize',G);G();E.body.appendChild(C);FCKFocusManager.Lock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R._fck_originalTabIndex=R.tabIndex;R.tabIndex=-1;},HideMainCover:function(){FCKDomTools.RemoveNode(C);FCKFocusManager.Unlock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R.tabIndex=R._fck_originalTabIndex;FCKDomTools.ClearElementJSProperty(R,'_fck_originalTabIndex');},GetCover:function(){return C;}};})();
 var FCKMenuItem=function(A,B,C,D,E,F){this.Name=B;this.Label=C||B;this.IsDisabled=E;this.Icon=new FCKIcon(D);this.SubMenu=new FCKMenuBlockPanel();this.SubMenu.Parent=A;this.SubMenu.OnClick=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnClick,this);this.CustomData=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuItem_Cleanup);};FCKMenuItem.prototype.AddItem=function(A,B,C,D,E){this.HasSubMenu=true;return this.SubMenu.AddItem(A,B,C,D,E);};FCKMenuItem.prototype.AddSeparator=function(){this.SubMenu.AddSeparator();};FCKMenuItem.prototype.Create=function(A){var B=this.HasSubMenu;var C=FCKTools.GetElementDocument(A);var r=this.MainElement=A.insertRow(-1);r.className=this.IsDisabled?'MN_Item_Disabled':'MN_Item';if (!this.IsDisabled){FCKTools.AddEventListenerEx(r,'mouseover',FCKMenuItem_OnMouseOver,[this]);FCKTools.AddEventListenerEx(r,'click',FCKMenuItem_OnClick,[this]);if (!B) FCKTools.AddEventListenerEx(r,'mouseout',FCKMenuItem_OnMouseOut,[this]);};var D=r.insertCell(-1);D.className='MN_Icon';D.appendChild(this.Icon.CreateIconElement(C));D=r.insertCell(-1);D.className='MN_Label';D.noWrap=true;D.appendChild(C.createTextNode(this.Label));D=r.insertCell(-1);if (B){D.className='MN_Arrow';var E=D.appendChild(C.createElement('IMG'));E.src=FCK_IMAGES_PATH+'arrow_'+FCKLang.Dir+'.gif';E.width=4;E.height=7;this.SubMenu.Create();this.SubMenu.Panel.OnHide=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnHide,this);}};FCKMenuItem.prototype.Activate=function(){this.MainElement.className='MN_Item_Over';if (this.HasSubMenu){this.SubMenu.Show(this.MainElement.offsetWidth+2,-2,this.MainElement);};FCKTools.RunFunction(this.OnActivate,this);};FCKMenuItem.prototype.Deactivate=function(){this.MainElement.className='MN_Item';if (this.HasSubMenu) this.SubMenu.Hide();};function FCKMenuItem_SubMenu_OnClick(A,B){FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuItem_SubMenu_OnHide(A){A.Deactivate();};function FCKMenuItem_OnClick(A,B){if (B.HasSubMenu) B.Activate();else{B.Deactivate();FCKTools.RunFunction(B.OnClick,B,[B]);}};function FCKMenuItem_OnMouseOver(A,B){B.Activate();};function FCKMenuItem_OnMouseOut(A,B){B.Deactivate();};function FCKMenuItem_Cleanup(){this.MainElement=null;};
 var FCKMenuBlock=function(){this._Items=[];};FCKMenuBlock.prototype.Count=function(){return this._Items.length;};FCKMenuBlock.prototype.AddItem=function(A,B,C,D,E){var F=new FCKMenuItem(this,A,B,C,D,E);F.OnClick=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnClick,this);F.OnActivate=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnActivate,this);this._Items.push(F);return F;};FCKMenuBlock.prototype.AddSeparator=function(){this._Items.push(new FCKMenuSeparator());};FCKMenuBlock.prototype.RemoveAllItems=function(){this._Items=[];var A=this._ItemsTable;if (A){while (A.rows.length>0) A.deleteRow(0);}};FCKMenuBlock.prototype.Create=function(A){if (!this._ItemsTable){if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuBlock_Cleanup);this._Window=FCKTools.GetElementWindow(A);var B=FCKTools.GetElementDocument(A);var C=A.appendChild(B.createElement('table'));C.cellPadding=0;C.cellSpacing=0;FCKTools.DisableSelection(C);var D=C.insertRow(-1).insertCell(-1);D.className='MN_Menu';var E=this._ItemsTable=D.appendChild(B.createElement('table'));E.cellPadding=0;E.cellSpacing=0;};for (var i=0;i<this._Items.length;i++) this._Items[i].Create(this._ItemsTable);};function FCKMenuBlock_Item_OnClick(A,B){if (B.Hide) B.Hide();FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuBlock_Item_OnActivate(A){var B=A._ActiveItem;if (B&&B!=this){if (!FCKBrowserInfo.IsIE&&B.HasSubMenu&&!this.HasSubMenu){A._Window.focus();A.Panel.HasFocus=true;};B.Deactivate();};A._ActiveItem=this;};function FCKMenuBlock_Cleanup(){this._Window=null;this._ItemsTable=null;};var FCKMenuSeparator=function(){};FCKMenuSeparator.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var r=A.insertRow(-1);var C=r.insertCell(-1);C.className='MN_Separator MN_Icon';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';};
 var FCKMenuBlockPanel=function(){FCKMenuBlock.call(this);};FCKMenuBlockPanel.prototype=new FCKMenuBlock();FCKMenuBlockPanel.prototype.Create=function(){var A=this.Panel=(this.Parent&&this.Parent.Panel?this.Parent.Panel.CreateChildPanel():new FCKPanel());A.AppendStyleSheet(FCKConfig.SkinEditorCSS);FCKMenuBlock.prototype.Create.call(this,A.MainNode);};FCKMenuBlockPanel.prototype.Show=function(x,y,A){if (!this.Panel.CheckIsOpened()) this.Panel.Show(x,y,A);};FCKMenuBlockPanel.prototype.Hide=function(){if (this.Panel.CheckIsOpened()) this.Panel.Hide();};
 var FCKContextMenu=function(A,B){this.CtrlDisable=false;var C=this._Panel=new FCKPanel(A);C.AppendStyleSheet(FCKConfig.SkinEditorCSS);C.IsContextMenu=true;if (FCKBrowserInfo.IsGecko) C.Document.addEventListener('draggesture',function(e) {e.preventDefault();return false;},true);var D=this._MenuBlock=new FCKMenuBlock();D.Panel=C;D.OnClick=FCKTools.CreateEventListener(FCKContextMenu_MenuBlock_OnClick,this);this._Redraw=true;};FCKContextMenu.prototype.SetMouseClickWindow=function(A){if (!FCKBrowserInfo.IsIE){this._Document=A.document;if (FCKBrowserInfo.IsOpera&&!('oncontextmenu' in document.createElement('foo'))){this._Document.addEventListener('mousedown',FCKContextMenu_Document_OnMouseDown,false);this._Document.addEventListener('mouseup',FCKContextMenu_Document_OnMouseUp,false);};this._Document.addEventListener('contextmenu',FCKContextMenu_Document_OnContextMenu,false);}};FCKContextMenu.prototype.AddItem=function(A,B,C,D,E){var F=this._MenuBlock.AddItem(A,B,C,D,E);this._Redraw=true;return F;};FCKContextMenu.prototype.AddSeparator=function(){this._MenuBlock.AddSeparator();this._Redraw=true;};FCKContextMenu.prototype.RemoveAllItems=function(){this._MenuBlock.RemoveAllItems();this._Redraw=true;};FCKContextMenu.prototype.AttachToElement=function(A){if (FCKBrowserInfo.IsIE) FCKTools.AddEventListenerEx(A,'contextmenu',FCKContextMenu_AttachedElement_OnContextMenu,this);else A._FCKContextMenu=this;};function FCKContextMenu_Document_OnContextMenu(e){if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;FCKTools.CancelEvent(e);FCKContextMenu_AttachedElement_OnContextMenu(e,A._FCKContextMenu,A);return false;};A=A.parentNode;};return true;};var FCKContextMenu_OverrideButton;function FCKContextMenu_Document_OnMouseDown(e){if(!e||e.button!=2) return false;if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;var B=FCKContextMenu_OverrideButton;if(!B){var C=FCKTools.GetElementDocument(e.target);B=FCKContextMenu_OverrideButton=C.createElement('input');B.type='button';var D=C.createElement('p');C.body.appendChild(D);D.appendChild(B);};B.style.cssText='position:absolute;top:'+(e.clientY-2)+'px;left:'+(e.clientX-2)+'px;width:5px;height:5px;opacity:0.01';};A=A.parentNode;};return false;};function FCKContextMenu_Document_OnMouseUp(e){if (FCKConfig.BrowserContextMenu) return true;var A=FCKContextMenu_OverrideButton;if (A){var B=A.parentNode;B.parentNode.removeChild(B);FCKContextMenu_OverrideButton=undefined;if(e&&e.button==2){FCKContextMenu_Document_OnContextMenu(e);return false;}};return true;};function FCKContextMenu_AttachedElement_OnContextMenu(A,B,C){if ((B.CtrlDisable&&(A.ctrlKey||A.metaKey))||FCKConfig.BrowserContextMenu) return true;var D=C||this;if (B.OnBeforeOpen) B.OnBeforeOpen.call(B,D);if (B._MenuBlock.Count()==0) return false;if (B._Redraw){B._MenuBlock.Create(B._Panel.MainNode);B._Redraw=false;};FCKTools.DisableSelection(B._Panel.Document.body);var x=0;var y=0;if (FCKBrowserInfo.IsIE){x=A.screenX;y=A.screenY;}else if (FCKBrowserInfo.IsSafari){x=A.clientX;y=A.clientY;}else{x=A.pageX;y=A.pageY;};B._Panel.Show(x,y,A.currentTarget||null);return false;};function FCKContextMenu_MenuBlock_OnClick(A,B){B._Panel.Hide();FCKTools.RunFunction(B.OnItemClick,B,A);};
-FCK.ContextMenu={};FCK.ContextMenu.Listeners=[];FCK.ContextMenu.RegisterListener=function(A){if (A) this.Listeners.push(A);};function FCK_ContextMenu_Init(){var A=FCK.ContextMenu._InnerContextMenu=new FCKContextMenu(FCKBrowserInfo.IsIE?window:window.parent,FCKLang.Dir);A.CtrlDisable=FCKConfig.BrowserContextMenuOnCtrl;A.OnBeforeOpen=FCK_ContextMenu_OnBeforeOpen;A.OnItemClick=FCK_ContextMenu_OnItemClick;var B=FCK.ContextMenu;for (var i=0;i<FCKConfig.ContextMenu.length;i++) B.RegisterListener(FCK_ContextMenu_GetListener(FCKConfig.ContextMenu[i]));};function FCK_ContextMenu_GetListener(A){switch (A){case 'Generic':return {AddItems:function(menu,tag,tagName){menu.AddItem('Cut',FCKLang.Cut,7,FCKCommands.GetCommand('Cut').GetState()==-1);menu.AddItem('Copy',FCKLang.Copy,8,FCKCommands.GetCommand('Copy').GetState()==-1);menu.AddItem('Paste',FCKLang.Paste,9,FCKCommands.GetCommand('Paste').GetState()==-1);}};case 'Table':return {AddItems:function(menu,tag,tagName){var B=(tagName=='TABLE');var C=(!B&&FCKSelection.HasAncestorNode('TABLE'));if (C){menu.AddSeparator();var D=menu.AddItem('Cell',FCKLang.CellCM);D.AddItem('TableInsertCellBefore',FCKLang.InsertCellBefore,69);D.AddItem('TableInsertCellAfter',FCKLang.InsertCellAfter,58);D.AddItem('TableDeleteCells',FCKLang.DeleteCells,59);if (FCKBrowserInfo.IsGecko) D.AddItem('TableMergeCells',FCKLang.MergeCells,60,FCKCommands.GetCommand('TableMergeCells').GetState()==-1);else{D.AddItem('TableMergeRight',FCKLang.MergeRight,60,FCKCommands.GetCommand('TableMergeRight').GetState()==-1);D.AddItem('TableMergeDown',FCKLang.MergeDown,60,FCKCommands.GetCommand('TableMergeDown').GetState()==-1);};D.AddItem('TableHorizontalSplitCell',FCKLang.HorizontalSplitCell,61,FCKCommands.GetCommand('TableHorizontalSplitCell').GetState()==-1);D.AddItem('TableVerticalSplitCell',FCKLang.VerticalSplitCell,61,FCKCommands.GetCommand('TableVerticalSplitCell').GetState()==-1);D.AddSeparator();D.AddItem('TableCellProp',FCKLang.CellProperties,57,FCKCommands.GetCommand('TableCellProp').GetState()==-1);menu.AddSeparator();D=menu.AddItem('Row',FCKLang.RowCM);D.AddItem('TableInsertRowBefore',FCKLang.InsertRowBefore,70);D.AddItem('TableInsertRowAfter',FCKLang.InsertRowAfter,62);D.AddItem('TableDeleteRows',FCKLang.DeleteRows,63);menu.AddSeparator();D=menu.AddItem('Column',FCKLang.ColumnCM);D.AddItem('TableInsertColumnBefore',FCKLang.InsertColumnBefore,71);D.AddItem('TableInsertColumnAfter',FCKLang.InsertColumnAfter,64);D.AddItem('TableDeleteColumns',FCKLang.DeleteColumns,65);};if (B||C){menu.AddSeparator();menu.AddItem('TableDelete',FCKLang.TableDelete);menu.AddItem('TableProp',FCKLang.TableProperties,39);}}};case 'Link':return {AddItems:function(menu,tag,tagName){var E=(tagName=='A'||FCKSelection.HasAncestorNode('A'));if (E||FCK.GetNamedCommandState('Unlink')!=-1){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0&&F.href.length==0);if (G) return;menu.AddSeparator();menu.AddItem('VisitLink',FCKLang.VisitLink);menu.AddSeparator();if (E) menu.AddItem('Link',FCKLang.EditLink,34);menu.AddItem('Unlink',FCKLang.RemoveLink,35);}}};case 'Image':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&!tag.getAttribute('_fckfakelement')){menu.AddSeparator();menu.AddItem('Image',FCKLang.ImageProperties,37);}}};case 'Anchor':return {AddItems:function(menu,tag,tagName){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0);if (G||(tagName=='IMG'&&tag.getAttribute('_fckanchor'))){menu.AddSeparator();menu.AddItem('Anchor',FCKLang.AnchorProp,36);menu.AddItem('AnchorDelete',FCKLang.AnchorDelete);}}};case 'Flash':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckflash')){menu.AddSeparator();menu.AddItem('Flash',FCKLang.FlashProperties,38);}}};case 'Form':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('FORM')){menu.AddSeparator();menu.AddItem('Form',FCKLang.FormProp,48);}}};case 'Checkbox':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='checkbox'){menu.AddSeparator();menu.AddItem('Checkbox',FCKLang.CheckboxProp,49);}}};case 'Radio':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='radio'){menu.AddSeparator();menu.AddItem('Radio',FCKLang.RadioButtonProp,50);}}};case 'TextField':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='text'||tag.type=='password')){menu.AddSeparator();menu.AddItem('TextField',FCKLang.TextFieldProp,51);}}};case 'HiddenField':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckinputhidden')){menu.AddSeparator();menu.AddItem('HiddenField',FCKLang.HiddenFieldProp,56);}}};case 'ImageButton':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='image'){menu.AddSeparator();menu.AddItem('ImageButton',FCKLang.ImageButtonProp,55);}}};case 'Button':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='button'||tag.type=='submit'||tag.type=='reset')){menu.AddSeparator();menu.AddItem('Button',FCKLang.ButtonProp,54);}}};case 'Select':return {AddItems:function(menu,tag,tagName){if (tagName=='SELECT'){menu.AddSeparator();menu.AddItem('Select',FCKLang.SelectionFieldProp,53);}}};case 'Textarea':return {AddItems:function(menu,tag,tagName){if (tagName=='TEXTAREA'){menu.AddSeparator();menu.AddItem('Textarea',FCKLang.TextareaProp,52);}}};case 'BulletedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('UL')){menu.AddSeparator();menu.AddItem('BulletedList',FCKLang.BulletedListProp,27);}}};case 'NumberedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('OL')){menu.AddSeparator();menu.AddItem('NumberedList',FCKLang.NumberedListProp,26);}}};case 'DivContainer':return {AddItems:function(menu,tag,tagName){var J=FCKDomTools.GetSelectedDivContainers();if (J.length>0){menu.AddSeparator();menu.AddItem('EditDiv',FCKLang.EditDiv,75);menu.AddItem('DeleteDiv',FCKLang.DeleteDiv,76);}}};};return null;};function FCK_ContextMenu_OnBeforeOpen(){FCK.Events.FireEvent('OnSelectionChange');var A,sTagName;if ((A=FCKSelection.GetSelectedElement())) sTagName=A.tagName;var B=FCK.ContextMenu._InnerContextMenu;B.RemoveAllItems();var C=FCK.ContextMenu.Listeners;for (var i=0;i<C.length;i++) C[i].AddItems(B,A,sTagName);};function FCK_ContextMenu_OnItemClick(A){FCK.Focus();FCKCommands.GetCommand(A.Name).Execute(A.CustomData);};
+FCK.ContextMenu={};FCK.ContextMenu.Listeners=[];FCK.ContextMenu.RegisterListener=function(A){if (A) this.Listeners.push(A);};function FCK_ContextMenu_Init(){var A=FCK.ContextMenu._InnerContextMenu=new FCKContextMenu(FCKBrowserInfo.IsIE?window:window.parent,FCKLang.Dir);A.CtrlDisable=FCKConfig.BrowserContextMenuOnCtrl;A.OnBeforeOpen=FCK_ContextMenu_OnBeforeOpen;A.OnItemClick=FCK_ContextMenu_OnItemClick;var B=FCK.ContextMenu;for (var i=0;i<FCKConfig.ContextMenu.length;i++) B.RegisterListener(FCK_ContextMenu_GetListener(FCKConfig.ContextMenu[i]));};function FCK_ContextMenu_GetListener(A){switch (A){case 'Generic':return {AddItems:function(menu,tag,tagName){menu.AddItem('Cut',FCKLang.Cut,7,FCKCommands.GetCommand('Cut').GetState()==-1);menu.AddItem('Copy',FCKLang.Copy,8,FCKCommands.GetCommand('Copy').GetState()==-1);menu.AddItem('Paste',FCKLang.Paste,9,FCKCommands.GetCommand('Paste').GetState()==-1);}};case 'Table':return {AddItems:function(menu,tag,tagName){var B=(tagName=='TABLE');var C=(!B&&FCKSelection.HasAncestorNode('TABLE'));if (C){menu.AddSeparator();var D=menu.AddItem('Cell',FCKLang.CellCM);D.AddItem('TableInsertCellBefore',FCKLang.InsertCellBefore,69);D.AddItem('TableInsertCellAfter',FCKLang.InsertCellAfter,58);D.AddItem('TableDeleteCells',FCKLang.DeleteCells,59);if (FCKBrowserInfo.IsGecko) D.AddItem('TableMergeCells',FCKLang.MergeCells,60,FCKCommands.GetCommand('TableMergeCells').GetState()==-1);else{D.AddItem('TableMergeRight',FCKLang.MergeRight,60,FCKCommands.GetCommand('TableMergeRight').GetState()==-1);D.AddItem('TableMergeDown',FCKLang.MergeDown,60,FCKCommands.GetCommand('TableMergeDown').GetState()==-1);};D.AddItem('TableHorizontalSplitCell',FCKLang.HorizontalSplitCell,61,FCKCommands.GetCommand('TableHorizontalSplitCell').GetState()==-1);D.AddItem('TableVerticalSplitCell',FCKLang.VerticalSplitCell,61,FCKCommands.GetCommand('TableVerticalSplitCell').GetState()==-1);D.AddSeparator();D.AddItem('TableCellProp',FCKLang.CellProperties,57,FCKCommands.GetCommand('TableCellProp').GetState()==-1);menu.AddSeparator();D=menu.AddItem('Row',FCKLang.RowCM);D.AddItem('TableInsertRowBefore',FCKLang.InsertRowBefore,70);D.AddItem('TableInsertRowAfter',FCKLang.InsertRowAfter,62);D.AddItem('TableDeleteRows',FCKLang.DeleteRows,63);menu.AddSeparator();D=menu.AddItem('Column',FCKLang.ColumnCM);D.AddItem('TableInsertColumnBefore',FCKLang.InsertColumnBefore,71);D.AddItem('TableInsertColumnAfter',FCKLang.InsertColumnAfter,64);D.AddItem('TableDeleteColumns',FCKLang.DeleteColumns,65);};if (B||C){menu.AddSeparator();menu.AddItem('TableDelete',FCKLang.TableDelete);menu.AddItem('TableProp',FCKLang.TableProperties,39);}}};case 'Link':return {AddItems:function(menu,tag,tagName){var E=(tagName=='A'||FCKSelection.HasAncestorNode('A'));if (E||FCK.GetNamedCommandState('Unlink')!=-1){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0&&F.href.length==0);if (G) return;menu.AddSeparator();menu.AddItem('VisitLink',FCKLang.VisitLink);menu.AddSeparator();if (E) menu.AddItem('Link',FCKLang.EditLink,34);menu.AddItem('Unlink',FCKLang.RemoveLink,35);}}};case 'Image':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&!tag.getAttribute('_fckfakelement')){menu.AddSeparator();menu.AddItem('Image',FCKLang.ImageProperties,37);}}};case 'Anchor':return {AddItems:function(menu,tag,tagName){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0);if (G||(tagName=='IMG'&&tag.getAttribute('_fckanchor'))){menu.AddSeparator();menu.AddItem('Anchor',FCKLang.AnchorProp,36);menu.AddItem('AnchorDelete',FCKLang.AnchorDelete);}}};case 'Flash':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckflash')){menu.AddSeparator();menu.AddItem('Flash',FCKLang.FlashProperties,38);}}};case 'Form':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('FORM')){menu.AddSeparator();menu.AddItem('Form',FCKLang.FormProp,48);}}};case 'Checkbox':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='checkbox'){menu.AddSeparator();menu.AddItem('Checkbox',FCKLang.CheckboxProp,49);}}};case 'Radio':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='radio'){menu.AddSeparator();menu.AddItem('Radio',FCKLang.RadioButtonProp,50);}}};case 'TextField':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='text'||tag.type=='password')){menu.AddSeparator();menu.AddItem('TextField',FCKLang.TextFieldProp,51);}}};case 'HiddenField':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckinputhidden')){menu.AddSeparator();menu.AddItem('HiddenField',FCKLang.HiddenFieldProp,56);}}};case 'ImageButton':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='image'){menu.AddSeparator();menu.AddItem('ImageButton',FCKLang.ImageButtonProp,55);}}};case 'Button':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='button'||tag.type=='submit'||tag.type=='reset')){menu.AddSeparator();menu.AddItem('Button',FCKLang.ButtonProp,54);}}};case 'Select':return {AddItems:function(menu,tag,tagName){if (tagName=='SELECT'){menu.AddSeparator();menu.AddItem('Select',FCKLang.SelectionFieldProp,53);}}};case 'Textarea':return {AddItems:function(menu,tag,tagName){if (tagName=='TEXTAREA'){menu.AddSeparator();menu.AddItem('Textarea',FCKLang.TextareaProp,52);}}};case 'BulletedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('UL')){menu.AddSeparator();menu.AddItem('BulletedList',FCKLang.BulletedListProp,27);}}};case 'NumberedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('OL')){menu.AddSeparator();menu.AddItem('NumberedList',FCKLang.NumberedListProp,26);}}};case 'DivContainer':return {AddItems:function(menu,tag,tagName){var J=FCKDomTools.GetSelectedDivContainers();if (J.length>0){menu.AddSeparator();menu.AddItem('EditDiv',FCKLang.EditDiv,75);menu.AddItem('DeleteDiv',FCKLang.DeleteDiv,76);}}};};return null;};function FCK_ContextMenu_OnBeforeOpen(){FCK.Events.FireEvent('OnSelectionChange');var A,sTagName;if ((A=FCKSelection.GetSelectedElement())) sTagName=A.tagName;var B=FCK.ContextMenu._InnerContextMenu;B.RemoveAllItems();var C=FCK.ContextMenu.Listeners;for (var i=0;i<C.length;i++) C[i].AddItems(B,A,sTagName);};function FCK_ContextMenu_OnItemClick(A){if (!FCKBrowserInfo.IsIE) FCK.Focus();FCKCommands.GetCommand(A.Name).Execute(A.CustomData);};
 var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};
 var FCKPlugin=function(A,B,C){this.Name=A;this.BasePath=C?C:FCKConfig.PluginsPath;this.Path=this.BasePath+A+'/';if (!B||B.length==0) this.AvailableLangs=[];else this.AvailableLangs=B.split(',');};FCKPlugin.prototype.Load=function(){if (this.AvailableLangs.length>0){var A;if (this.AvailableLangs.IndexOf(FCKLanguageManager.ActiveLanguage.Code)>=0) A=FCKLanguageManager.ActiveLanguage.Code;else A=this.AvailableLangs[0];LoadScript(this.Path+'lang/'+A+'.js');};LoadScript(this.Path+'fckplugin.js');};
 var FCKPlugins=FCK.Plugins={};FCKPlugins.ItemsCount=0;FCKPlugins.Items={};FCKPlugins.Load=function(){var A=FCKPlugins.Items;for (var i=0;i<FCKConfig.Plugins.Items.length;i++){var B=FCKConfig.Plugins.Items[i];var C=A[B[0]]=new FCKPlugin(B[0],B[1],B[2]);FCKPlugins.ItemsCount++;};for (var s in A) A[s].Load();FCKPlugins.Load=null;};
diff --git a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js
index cca80e075f..06ac7c124a 100644
--- a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js
+++ b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -23,28 +23,28 @@
  */
 
 var FCK_STATUS_NOTLOADED=window.parent.FCK_STATUS_NOTLOADED=0;var FCK_STATUS_ACTIVE=window.parent.FCK_STATUS_ACTIVE=1;var FCK_STATUS_COMPLETE=window.parent.FCK_STATUS_COMPLETE=2;var FCK_TRISTATE_OFF=window.parent.FCK_TRISTATE_OFF=0;var FCK_TRISTATE_ON=window.parent.FCK_TRISTATE_ON=1;var FCK_TRISTATE_DISABLED=window.parent.FCK_TRISTATE_DISABLED=-1;var FCK_UNKNOWN=window.parent.FCK_UNKNOWN=-9;var FCK_TOOLBARITEM_ONLYICON=window.parent.FCK_TOOLBARITEM_ONLYICON=0;var FCK_TOOLBARITEM_ONLYTEXT=window.parent.FCK_TOOLBARITEM_ONLYTEXT=1;var FCK_TOOLBARITEM_ICONTEXT=window.parent.FCK_TOOLBARITEM_ICONTEXT=2;var FCK_EDITMODE_WYSIWYG=window.parent.FCK_EDITMODE_WYSIWYG=0;var FCK_EDITMODE_SOURCE=window.parent.FCK_EDITMODE_SOURCE=1;var FCK_IMAGES_PATH='images/';var FCK_SPACER_PATH='images/spacer.gif';var CTRL=1000;var SHIFT=2000;var ALT=4000;var FCK_STYLE_BLOCK=0;var FCK_STYLE_INLINE=1;var FCK_STYLE_OBJECT=2;
-String.prototype.Contains=function(A){return (this.indexOf(A)>-1);};String.prototype.Equals=function(){var A=arguments;if (A.length==1&&A[0].pop) A=A[0];for (var i=0;i<A.length;i++){if (this==A[i]) return true;};return false;};String.prototype.IEquals=function(){var A=this.toUpperCase();var B=arguments;if (B.length==1&&B[0].pop) B=B[0];for (var i=0;i<B.length;i++){if (A==B[i].toUpperCase()) return true;};return false;};String.prototype.ReplaceAll=function(A,B){var C=this;for (var i=0;i<A.length;i++){C=C.replace(A[i],B[i]);};return C;};String.prototype.StartsWith=function(A){return (this.substr(0,A.length)==A);};String.prototype.EndsWith=function(A,B){var C=this.length;var D=A.length;if (D>C) return false;if (B){var E=new RegExp(A+'$','i');return E.test(this);}else return (D==0||this.substr(C-D,D)==A);};String.prototype.Remove=function(A,B){var s='';if (A>0) s=this.substring(0,A);if (A+B<this.length) s+=this.substring(A+B,this.length);return s;};String.prototype.Trim=function(){return this.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g,'');};String.prototype.LTrim=function(){return this.replace(/^[ \t\n\r]*/g,'');};String.prototype.RTrim=function(){return this.replace(/[ \t\n\r]*$/g,'');};String.prototype.ReplaceNewLineChars=function(A){return this.replace(/\n/g,A);};String.prototype.Replace=function(A,B,C){if (typeof B=='function'){return this.replace(A,function(){return B.apply(C||this,arguments);});}else return this.replace(A,B);};Array.prototype.AddItem=function(A){var i=this.length;this[i]=A;return i;};Array.prototype.IndexOf=function(A){for (var i=0;i<this.length;i++){if (this[i]==A) return i;};return-1;};
+String.prototype.Contains=function(A){return (this.indexOf(A)>-1);};String.prototype.Equals=function(){var A=arguments;if (A.length==1&&A[0].pop) A=A[0];for (var i=0;i<A.length;i++){if (this==A[i]) return true;};return false;};String.prototype.IEquals=function(){var A=this.toUpperCase();var B=arguments;if (B.length==1&&B[0].pop) B=B[0];for (var i=0;i<B.length;i++){if (A==B[i].toUpperCase()) return true;};return false;};String.prototype.ReplaceAll=function(A,B){var C=this;for (var i=0;i<A.length;i++){C=C.replace(A[i],B[i]);};return C;};String.prototype.StartsWith=function(A){return (this.substr(0,A.length)==A);};String.prototype.EndsWith=function(A,B){var C=this.length;var D=A.length;if (D>C) return false;if (B){var E=new RegExp(A+'$','i');return E.test(this);}else return (D==0||this.substr(C-D,D)==A);};String.prototype.Remove=function(A,B){var s='';if (A>0) s=this.substring(0,A);if (A+B<this.length) s+=this.substring(A+B,this.length);return s;};String.prototype.Trim=function(){return this.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g,'');};String.prototype.LTrim=function(){return this.replace(/^[ \t\n\r]*/g,'');};String.prototype.RTrim=function(){return this.replace(/[ \t\n\r]*$/g,'');};String.prototype.ReplaceNewLineChars=function(A){return this.replace(/\n/g,A);};String.prototype.Replace=function(A,B,C){if (typeof B=='function'){return this.replace(A,function(){return B.apply(C||this,arguments);});}else return this.replace(A,B);};Array.prototype.IndexOf=function(A){for (var i=0;i<this.length;i++){if (this[i]==A) return i;};return-1;};
 var	FCKIECleanup=function(A){if (A._FCKCleanupObj) this.Items=A._FCKCleanupObj.Items;else{this.Items=[];A._FCKCleanupObj=this;FCKTools.AddEventListenerEx(A,'unload',FCKIECleanup_Cleanup);}};FCKIECleanup.prototype.AddItem=function(A,B){this.Items.push([A,B]);};function FCKIECleanup_Cleanup(){if (!this._FCKCleanupObj||(FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag)) return;var A=this._FCKCleanupObj.Items;while (A.length>0){var B=A.pop();if (B) B[1].call(B[0]);};this._FCKCleanupObj=null;if (CollectGarbage) CollectGarbage();};
 var s=navigator.userAgent.toLowerCase();var FCKBrowserInfo={IsIE:/*@cc_on!@*/false,IsIE7:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=7),IsIE6:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=6),IsSafari:s.Contains(' applewebkit/'),IsOpera:!!window.opera,IsAIR:s.Contains(' adobeair/'),IsMac:s.Contains('macintosh')};(function(A){A.IsGecko=(navigator.product=='Gecko')&&!A.IsSafari&&!A.IsOpera;A.IsGeckoLike=(A.IsGecko||A.IsSafari||A.IsOpera);if (A.IsGecko){var B=s.match(/rv:(\d+\.\d+)/);var C=B&&parseFloat(B[1]);if (C){A.IsGecko10=(C<1.8);A.IsGecko19=(C>1.8);}}})(FCKBrowserInfo);
 var FCKURLParams={};(function(){var A=document.location.search.substr(1).split('&');for (var i=0;i<A.length;i++){var B=A[i].split('=');var C=decodeURIComponent(B[0]);var D=decodeURIComponent(B[1]);FCKURLParams[C]=D;}})();
 var FCKEvents=function(A){this.Owner=A;this._RegisteredEvents={};};FCKEvents.prototype.AttachEvent=function(A,B){var C;if (!(C=this._RegisteredEvents[A])) this._RegisteredEvents[A]=[B];else{if (C.IndexOf(B)==-1) C.push(B);}};FCKEvents.prototype.FireEvent=function(A,B){var C=true;var D=this._RegisteredEvents[A];if (D){for (var i=0;i<D.length;i++){try{C=(D[i](this.Owner,B)&&C);}catch(e){if (e.number!=-2146823277) throw e;}}};return C;};
 var FCKDataProcessor=function(){};FCKDataProcessor.prototype={ConvertToHtml:function(A){if (FCKConfig.FullPage){FCK.DocTypeDeclaration=A.match(FCKRegexLib.DocTypeTag);if (!FCKRegexLib.HasBodyTag.test(A)) A='<body>'+A+'</body>';if (!FCKRegexLib.HtmlOpener.test(A)) A='<html dir="'+FCKConfig.ContentLangDirection+'">'+A+'</html>';if (!FCKRegexLib.HeadOpener.test(A)) A=A.replace(FCKRegexLib.HtmlOpener,'$&<head><title></title></head>');return A;}else{var B=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"';if (FCKBrowserInfo.IsIE&&FCKConfig.DocType.length>0&&!FCKRegexLib.Html4DocType.test(FCKConfig.DocType)) B+=' style="overflow-y: scroll"';B+='><head><title></title></head><body'+FCKConfig.GetBodyAttributes()+'>'+A+'</body></html>';return B;}},ConvertToDataFormat:function(A,B,C,D){var E=FCKXHtml.GetXHTML(A,!B,D);if (C&&FCKRegexLib.EmptyOutParagraph.test(E)) return '';return E;},FixHtml:function(A){return A;}};
-var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,DataProcessor:new FCKDataProcessor(),GetInstanceObject:(function(){var w=window;return function(name){return w[name];}})(),AttachToOnSelectionChange:function(A){this.Events.AttachEvent('OnSelectionChange',A);},GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else{if (!this.EditorDocument) return false;return (this.StartupValue!=this.EditorDocument.body.innerHTML);}},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};A.SetKeystrokes([CTRL+8,true]);this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=FCKConfig.FirefoxSpellChecker;this.SetData(this.GetLinkedFieldValue(),true);FCKTools.AddEventListener(document,"keydown",this._TabKeyHandler);this.AttachToOnSelectionChange(_FCK_PaddingNodeListener);if (FCKBrowserInfo.IsGecko) this.AttachToOnSelectionChange(this._ExecCheckEmptyBlock);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:var G=D.nodeName.toLowerCase();if (!FCKListsLib.BlockElements[G]&&G!='li'&&!D.getAttribute('_fckfakelement')&&D.getAttribute('_moz_dirty')==null) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;break;case 8:if (E) F=true;break;};if (F){var H=D.parentNode;if (!E) E=H.insertBefore(B.createElement(A),D);E.appendChild(H.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetData:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B=FCK.EditorDocument;if (!B) return null;var C=FCKConfig.FullPage;var D=FCK.DataProcessor.ConvertToDataFormat(C?B.documentElement:B.body,!C,FCKConfig.IgnoreEmptyParagraphValue,A);D=FCK.ProtectEventsRestore(D);if (FCKBrowserInfo.IsIE) D=D.replace(FCKRegexLib.ToReplace,'$1');if (C){if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) D=FCK.DocTypeDeclaration+'\n'+D;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) D=FCK.XmlDeclaration+'\n'+D;};return FCKConfig.ProtectedSource.Revert(D);},UpdateLinkedField:function(){var A=FCK.GetXHTML(FCKConfig.FormatOutput);if (FCKConfig.HtmlEncodeOutput) A=FCKTools.HTMLEncode(A);FCK.LinkedField.value=A;FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName.toUpperCase()];if (B){for (var i=0;i<B.length;i++) B[i](A);};B=FCK.RegisteredDoubleClickHandlers['*'];if (B){for (var i=0;i<B.length;i++) B[i](A);}},RegisterDoubleClickHandler:function(A,B){var C=B||'*';C=C.toUpperCase();var D;if (!(D=FCK.RegisteredDoubleClickHandlers[C])) FCK.RegisteredDoubleClickHandlers[C]=[A];else{if (D.IndexOf(A)==-1) D.push(A);}},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsArea,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR|XML|EMBED|OBJECT':'ABBR|XML|EMBED|OBJECT';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\\s|>|/)[\\s\\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetData:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCKBrowserInfo.IsIE&&FCK.EditorDocument){FCK.EditorDocument.detachEvent("onselectionchange",Doc_OnSelectionChange);};FCKTempBin.Reset();if (FCK.EditMode==0){this._ForceResetIsDirty=(B===true);A=FCKConfig.ProtectedSource.Protect(A);A=FCK.DataProcessor.ConvertToHtml(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) A=A.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);var C='';if (!FCKConfig.FullPage) C+=_FCK_GetEditorAreaStyleTags();if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+=FCKTools.GetStyleHtml(FCK_ShowTableBordersCSS,true);C+=FCKTools.GetStyleHtml(FCK_InternalCSS,true);A=A.replace(FCKRegexLib.HeadCloser,C+'$&');this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(A);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;FCKDomTools.PaddingNode=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C,D){if (!D) FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};if (!D) FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (FCKBrowserInfo.IsSafari&&FCK.EditorWindow&&A.IEquals('Paste')) return 0;if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else{return FCK.EditorDocument.queryCommandState(A)?1:0;}}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},Paste:function(A){if (FCK.Status!=2||!FCK.Events.FireEvent('OnPaste')) return false;return A||FCK._ExecPaste();},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) A=FCK.TempBaseTag+FCK.GetXHTML();else A=FCK.GetXHTML();}else{A=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body'+FCKConfig.GetBodyAttributes()+'>'+FCK.GetXHTML()+'</body></html>';};var B=FCKConfig.ScreenWidth*0.8;var C=FCKConfig.ScreenHeight*0.7;var D=(FCKConfig.ScreenWidth-B)/2;var E='';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A;E='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.opener._FCKHtmlToLoad );document.close() ;window.opener._FCKHtmlToLoad = null ;})() )';};var F=window.open(E,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+B+',height='+C+',left='+D);if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){F.document.write(A);F.document.close();}},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){FCKCommands.GetCommand('ShowBlocks').SaveState();if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (FCKBrowserInfo.IsIE) FCKTempBin.ToHtml();if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetData(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},InsertElement:function(A){if (typeof A=='string') A=this.EditorDocument.createElement(A);var B=A.nodeName.toLowerCase();FCKSelection.Restore();var C=new FCKDomRange(this.EditorWindow);C.MoveToSelection();C.DeleteContents();if (FCKListsLib.BlockElements[B]!=null){if (C.StartBlock){if (C.CheckStartOfBlock()) C.MoveToPosition(C.StartBlock,3);else if (C.CheckEndOfBlock()) C.MoveToPosition(C.StartBlock,4);else C.SplitBlock();};C.InsertNode(A);var D=FCKDomTools.GetNextSourceElement(A,false,null,['hr','br','param','img','area','input'],true);if (!D&&FCKConfig.EnterMode!='br'){D=this.EditorDocument.body.appendChild(this.EditorDocument.createElement(FCKConfig.EnterMode));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);};if (FCKListsLib.EmptyElements[B]==null) C.MoveToElementEditStart(A);else if (D) C.MoveToElementEditStart(D);else C.MoveToPosition(A,4);if (FCKBrowserInfo.IsGeckoLike){if (D) FCKDomTools.ScrollIntoView(D,false);FCKDomTools.ScrollIntoView(A,false);}}else{C.InsertNode(A);C.SetStart(A,4);C.SetEnd(A,4);};C.Select();C.Release();this.Focus();return A;},_InsertBlockElement:function(A){},_IsFunctionKey:function(A){if (A>=16&&A<=20) return true;if (A==27||(A>=33&&A<=40)) return true;if (A==45) return true;return false;},_KeyDownListener:function(A){if (!A) A=FCK.EditorWindow.event;if (FCK.EditorWindow){if (!FCK._IsFunctionKey(A.keyCode)&&!(A.ctrlKey||A.metaKey)&&!(A.keyCode==46)) FCK._KeyDownUndo();};return true;},_KeyDownUndo:function(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;FCKUndo.Changed=1;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}},_TabKeyHandler:function(A){if (!A) A=window.event;var B=A.keyCode;if (B==9&&FCK.EditMode!=0){if (FCKBrowserInfo.IsIE){var C=document.selection.createRange();if (C.parentElement()!=FCK.EditingArea.Textarea) return true;C.text='\t';C.select();}else{var a=[];var D=FCK.EditingArea.Textarea;var E=D.selectionStart;var F=D.selectionEnd;a.push(D.value.substr(0,E));a.push('\t');a.push(D.value.substr(F));D.value=a.join('');D.setSelectionRange(E+1,E+1);};if (A.preventDefault) return A.preventDefault();return A.returnValue=false;};return true;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML=FCK.GetData;FCK.SetHTML=FCK.SetData;FCK.InsertElementAndGetIt=FCK.CreateElement=FCK.InsertElement;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+encodeURIComponent(A)+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return decodeURIComponent(B);};function _FCK_MouseEventsListener(A){if (!A) A=window.event;if (A.type=='mousedown') FCK.MouseDownFlag=true;else if (A.type=='mouseup') FCK.MouseDownFlag=false;else if (A.type=='mousemove') FCK.Events.FireEvent('OnMouseMove',A);};function _FCK_PaddingNodeListener(){if (FCKConfig.EnterMode.IEquals('br')) return;FCKDomTools.EnforcePaddingNode(FCK.EditorDocument,FCKConfig.EnterMode);if (!FCKBrowserInfo.IsIE&&FCKDomTools.PaddingNode){var A=FCKSelection.GetSelection();if (A&&A.rangeCount==1){var B=A.getRangeAt(0);if (B.collapsed&&B.startContainer==FCK.EditorDocument.body&&B.startOffset==0){B.selectNodeContents(FCKDomTools.PaddingNode);B.collapse(true);A.removeAllRanges();A.addRange(B);}}}else if (FCKDomTools.PaddingNode){var C=FCKSelection.GetParentElement();var D=FCKDomTools.PaddingNode;if (C&&C.nodeName.IEquals('body')){if (FCK.EditorDocument.body.childNodes.length==1&&FCK.EditorDocument.body.firstChild==D){if (FCKSelection._GetSelectionDocument(FCK.EditorDocument.selection)!=FCK.EditorDocument) return;var B=FCK.EditorDocument.body.createTextRange();var F=false;if (!D.childNodes.firstChild){D.appendChild(FCKTools.GetElementDocument(D).createTextNode('\ufeff'));F=true;};B.moveToElementText(D);B.select();if (F) B.pasteHTML('');}}}};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;if (FCKBrowserInfo.IsIE) FCKTempBin.ToElements();FCK.InitializeBehaviors();FCK.MouseDownFlag=false;FCKTools.AddEventListener(FCK.EditorDocument,'mousemove',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mouseup',_FCK_MouseEventsListener);if (FCKBrowserInfo.IsSafari){var A=function(evt){if (!(evt.ctrlKey||evt.metaKey)) return;if (FCK.EditMode!=0) return;switch (evt.keyCode){case 89:FCKUndo.Redo();break;case 90:FCKUndo.Undo();break;}};FCKTools.AddEventListener(FCK.EditorDocument,'keyup',A);};FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode,FCKConfig.TabSpaces);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();FCKCommands.GetCommand('ShowBlocks').RestoreState();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){return FCKTools.GetStyleHtml(FCKConfig.EditorAreaCSS)+FCKTools.GetStyleHtml(FCKConfig.EditorAreaStyles);};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){switch (B){case 'Paste':return!FCK.Paste();case 'Cut':FCKUndo.SaveUndoStep();return false;}}else{if (B.Equals('Paste','Undo','Redo','SelectAll','Cut')) return false;};var C=FCK.Commands.GetCommand(B);if (C.GetState()==-1) return false;return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]=null;this.Elements.length=0;},ToHtml:function(){for (var i=0;i<this.Elements.length;i++){this.Elements[i]='<div>&nbsp;'+this.Elements[i].outerHTML+'</div>';this.Elements[i].isHtml=true;}},ToElements:function(){var A=FCK.EditorDocument.createElement('div');for (var i=0;i<this.Elements.length;i++){if (this.Elements[i].isHtml){A.innerHTML=this.Elements[i];this.Elements[i]=A.firstChild.removeChild(A.firstChild.lastChild);}}}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else if (FCKBrowserInfo.IsSafari) C=A;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){if (FCKFocusManager._IsFocusing) return;FCKFocusManager._IsFocusing=true;FCK.Focus();FCKFocusManager_Win_OnFocus();FCKTools.RunFunction(function(){delete FCKFocusManager._IsFocusing;});};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};(function(){var A=window.frameElement;var B=A.width;var C=A.height;if (/^\d+$/.test(B)) B+='px';if (/^\d+$/.test(C)) C+='px';var D=A.style;D.border=D.padding=D.margin=0;D.backgroundColor='transparent';D.backgroundImage='none';D.width=B;D.height=C;})();
-FCK.Description="FCKeditor for Internet Explorer 5.5+";FCK._GetBehaviorsStyle=function(){if (!FCK._BehaviorsStyle){var A=FCKConfig.BasePath;var B='';var C;C='<style type="text/css" _fcktemp="true">';if (FCKConfig.ShowBorders) B='url('+A+'css/behaviors/showtableborders.htc)';C+='INPUT,TEXTAREA,SELECT,.FCK__Anchor,.FCK__PageBreak,.FCK__InputHidden';if (FCKConfig.DisableObjectResizing){C+=',IMG';B+=' url('+A+'css/behaviors/disablehandles.htc)';};C+=' { behavior: url('+A+'css/behaviors/disablehandles.htc) ; }';if (B.length>0) C+='TABLE { behavior: '+B+' ; }';C+='</style>';FCK._BehaviorsStyle=C;};return FCK._BehaviorsStyle;};function Doc_OnMouseUp(){if (FCK.EditorWindow.event.srcElement.tagName=='HTML'){FCK.Focus();FCK.EditorWindow.event.cancelBubble=true;FCK.EditorWindow.event.returnValue=false;}};function Doc_OnPaste(){var A=FCK.EditorDocument.body;A.detachEvent('onpaste',Doc_OnPaste);var B=FCK.Paste(!FCKConfig.ForcePasteAsPlainText&&!FCKConfig.AutoDetectPasteFromWord);A.attachEvent('onpaste',Doc_OnPaste);return B;};function Doc_OnDblClick(){FCK.OnDoubleClick(FCK.EditorWindow.event.srcElement);FCK.EditorWindow.event.cancelBubble=true;};function Doc_OnSelectionChange(){if (!FCK.IsSelectionChangeLocked&&FCK.EditorDocument) FCK.Events.FireEvent("OnSelectionChange");};function Doc_OnDrop(){if (FCK.MouseDownFlag){FCK.MouseDownFlag=false;return;};if (FCKConfig.ForcePasteAsPlainText){var A=FCK.EditorWindow.event;if (FCK._CheckIsPastingEnabled()||FCKConfig.ShowDropDialog) FCK.PasteAsPlainText(A.dataTransfer.getData('Text'));A.returnValue=false;A.cancelBubble=true;}};FCK.InitializeBehaviors=function(A){this.EditorDocument.attachEvent('onmouseup',Doc_OnMouseUp);this.EditorDocument.body.attachEvent('onpaste',Doc_OnPaste);this.EditorDocument.body.attachEvent('ondrop',Doc_OnDrop);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument.body);this.EditorDocument.attachEvent("onkeydown",FCK._KeyDownListener);this.EditorDocument.attachEvent("ondblclick",Doc_OnDblClick);this.EditorDocument.attachEvent("onbeforedeactivate",function(){ FCKSelection.Save(true);});this.EditorDocument.attachEvent("onselectionchange",Doc_OnSelectionChange);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',Doc_OnMouseDown);};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCKSelection.Restore();FCK.EditorWindow.focus();FCKUndo.SaveUndoStep();var B=FCKSelection.GetSelection();if (B.type.toLowerCase()=='control') B.clear();A='<span id="__fakeFCKRemove__" style="display:none;">fakeFCKRemove</span>'+A;B.createRange().pasteHTML(A);FCK.EditorDocument.getElementById('__fakeFCKRemove__').removeNode(true);FCKDocumentProcessor.Process(FCK.EditorDocument);this.Events.FireEvent("OnSelectionChange");};FCK.SetInnerHtml=function(A){var B=FCK.EditorDocument;B.body.innerHTML='<div id="__fakeFCKRemove__">&nbsp;</div>'+A;B.getElementById('__fakeFCKRemove__').removeNode(true);};function FCK_PreloadImages(){var A=new FCKImagePreloader();A.AddImages(FCKConfig.PreloadImages);A.AddImages(FCKConfig.SkinPath+'fck_strip.gif');A.OnComplete=LoadToolbarSetup;A.Start();};function Document_OnContextMenu(){return (event.srcElement._FCKShowContextMenu==true);};document.oncontextmenu=Document_OnContextMenu;function FCK_Cleanup(){this.LinkedField=null;this.EditorWindow=null;this.EditorDocument=null;};FCK._ExecPaste=function(){if (FCK._PasteIsRunning) return true;if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};var A=FCK._CheckIsPastingEnabled(true);if (A===false) FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security']);else{if (FCKConfig.AutoDetectPasteFromWord&&A.length>0){var B=/<\w[^>]*(( class="?MsoNormal"?)|(="mso-))/gi;if (B.test(A)){if (confirm(FCKLang.PasteWordConfirm)){FCK.PasteFromWord();return false;}}};FCK._PasteIsRunning=true;FCK.ExecuteNamedCommand('Paste');delete FCK._PasteIsRunning;};return false;};FCK.PasteAsPlainText=function(A){if (!FCK._CheckIsPastingEnabled()){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText');return;};var B=null;if (!A) B=clipboardData.getData("Text");else B=A;if (B&&B.length>0){B=FCKTools.HTMLEncode(B);B=FCKTools.ProcessLineBreaks(window,FCKConfig,B);var C=B.search('</p>');var D=B.search('<p>');if ((C!=-1&&D!=-1&&C<D)||(C!=-1&&D==-1)){var E=B.substr(0,C);B=B.substr(C+4);this.InsertHtml(E);};FCKUndo.SaveLocked=true;this.InsertHtml(B);FCKUndo.SaveLocked=false;}};FCK._CheckIsPastingEnabled=function(A){FCK._PasteIsEnabled=false;document.body.attachEvent('onpaste',FCK_CheckPasting_Listener);var B=FCK.GetClipboardHTML();document.body.detachEvent('onpaste',FCK_CheckPasting_Listener);if (FCK._PasteIsEnabled){if (!A) B=true;}else B=false;delete FCK._PasteIsEnabled;return B;};function FCK_CheckPasting_Listener(){FCK._PasteIsEnabled=true;};FCK.GetClipboardHTML=function(){var A=document.getElementById('___FCKHiddenDiv');if (!A){A=document.createElement('DIV');A.id='___FCKHiddenDiv';var B=A.style;B.position='absolute';B.visibility=B.overflow='hidden';B.width=B.height=1;document.body.appendChild(A);};A.innerHTML='';var C=document.body.createTextRange();C.moveToElementText(A);C.execCommand('Paste');var D=A.innerHTML;A.innerHTML='';return D;};FCK.CreateLink=function(A,B){var C=[];FCK.ExecuteNamedCommand('Unlink',null,false,!!B);if (A.length>0){if (FCKSelection.GetType()=='Control'){var D=this.EditorDocument.createElement('A');D.href=A;var E=FCKSelection.GetSelectedElement();E.parentNode.insertBefore(D,E);E.parentNode.removeChild(E);D.appendChild(E);return [D];};var F='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',F,false,!!B);var G=this.EditorDocument.links;for (i=0;i<G.length;i++){var D=G[i];if (D.getAttribute('href',2)==F){var I=D.innerHTML;D.href=A;D.innerHTML=I;var J=D.lastChild;if (J&&J.nodeName=='BR'){FCKDomTools.InsertAfterNode(D,D.removeChild(J));};C.push(D);}}};return C;};function _FCK_RemoveDisabledAtt(){this.removeAttribute('disabled');};function Doc_OnMouseDown(A){var e=A.srcElement;if (e.nodeName.IEquals('input')&&e.type.IEquals(['radio','checkbox'])&&!e.disabled){e.disabled=true;FCKTools.SetTimeout(_FCK_RemoveDisabledAtt,1,e);}};
-var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi,'/');var sFullProtocol=document.location.href.match(/^(file\:\/{2,3})/)[1];if (FCKBrowserInfo.IsOpera) sFullProtocol+='localhost/';FCKConfig.BasePath=sFullProtocol+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);}else FCKConfig.BasePath=document.location.protocol+'//'+document.location.host+document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {  }};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;A.RemoveAttributesArray=(A.RemoveAttributes||'').split(',');if (!FCKConfig.SkinEditorCSS||FCKConfig.SkinEditorCSS.length==0) FCKConfig.SkinEditorCSS=FCKConfig.SkinPath+'fck_editor.css';if (!FCKConfig.SkinDialogCSS||FCKConfig.SkinDialogCSS.length==0) FCKConfig.SkinDialogCSS=FCKConfig.SkinPath+'fck_dialog.css';};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.AddItem([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource._CodeTag=(new Date()).valueOf();FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.AddItem(A);};FCKConfig.ProtectedSource.Protect=function(A){var B=this._CodeTag;function _Replace(protectedSource){var C=FCKTempBin.AddElement(protectedSource);return '<!--{'+B+C+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};var D=new RegExp("(<|&lt;)!--\\{"+this._CodeTag+"(\\d+)\\}--(>|&gt;)","g");return A.replace(D,_Replace);};FCKConfig.GetBodyAttributes=function(){var A='';if (this.BodyId&&this.BodyId.length>0) A+=' id="'+this.BodyId+'"';if (this.BodyClass&&this.BodyClass.length>0) A+=' class="'+this.BodyClass+'"';return A;};FCKConfig.ApplyBodyAttributes=function(A){if (this.BodyId&&this.BodyId.length>0) A.id=FCKConfig.BodyId;if (this.BodyClass&&this.BodyClass.length>0) A.className+=' '+FCKConfig.BodyClass;};
+var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,DataProcessor:new FCKDataProcessor(),GetInstanceObject:(function(){var w=window;return function(name){return w[name];}})(),AttachToOnSelectionChange:function(A){this.Events.AttachEvent('OnSelectionChange',A);},GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else{if (!this.EditorDocument) return false;return (this.StartupValue!=this.EditorDocument.body.innerHTML);}},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};A.SetKeystrokes([CTRL+8,true]);this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=FCKConfig.FirefoxSpellChecker;this.SetData(this.GetLinkedFieldValue(),true);FCKTools.AddEventListener(document,"keydown",this._TabKeyHandler);this.AttachToOnSelectionChange(_FCK_PaddingNodeListener);if (FCKBrowserInfo.IsGecko) this.AttachToOnSelectionChange(this._ExecCheckEmptyBlock);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:var G=D.nodeName.toLowerCase();if (!FCKListsLib.BlockElements[G]&&G!='li'&&!D.getAttribute('_fckfakelement')&&D.getAttribute('_moz_dirty')==null) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;break;case 8:if (E) F=true;break;};if (F){var H=D.parentNode;if (!E) E=H.insertBefore(B.createElement(A),D);E.appendChild(H.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetData:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B=FCK.EditorDocument;if (!B) return null;var C=FCKConfig.FullPage;var D=FCK.DataProcessor.ConvertToDataFormat(C?B.documentElement:B.body,!C,FCKConfig.IgnoreEmptyParagraphValue,A);D=FCK.ProtectEventsRestore(D);if (FCKBrowserInfo.IsIE) D=D.replace(FCKRegexLib.ToReplace,'$1');if (C){if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) D=FCK.DocTypeDeclaration+'\n'+D;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) D=FCK.XmlDeclaration+'\n'+D;};return FCKConfig.ProtectedSource.Revert(D);},UpdateLinkedField:function(){var A=FCK.GetXHTML(FCKConfig.FormatOutput);if (FCKConfig.HtmlEncodeOutput) A=FCKTools.HTMLEncode(A);FCK.LinkedField.value=A;FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName.toUpperCase()];if (B){for (var i=0;i<B.length;i++) B[i](A);};B=FCK.RegisteredDoubleClickHandlers['*'];if (B){for (var i=0;i<B.length;i++) B[i](A);}},RegisterDoubleClickHandler:function(A,B){var C=B||'*';C=C.toUpperCase();var D;if (!(D=FCK.RegisteredDoubleClickHandlers[C])) FCK.RegisteredDoubleClickHandlers[C]=[A];else{if (D.IndexOf(A)==-1) D.push(A);}},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsArea,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR|XML|EMBED|OBJECT':'ABBR|XML|EMBED|OBJECT';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\\s|>|/)[\\s\\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetData:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCKBrowserInfo.IsIE&&FCK.EditorDocument){FCK.EditorDocument.detachEvent("onselectionchange",Doc_OnSelectionChange);};FCKTempBin.Reset();FCK.Selection.Release();if (FCK.EditMode==0){this._ForceResetIsDirty=(B===true);A=FCKConfig.ProtectedSource.Protect(A);A=FCK.DataProcessor.ConvertToHtml(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) A=A.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);var C='';if (!FCKConfig.FullPage) C+=_FCK_GetEditorAreaStyleTags();if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+=FCKTools.GetStyleHtml(FCK_ShowTableBordersCSS,true);C+=FCKTools.GetStyleHtml(FCK_InternalCSS,true);A=A.replace(FCKRegexLib.HeadCloser,C+'$&');this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(A);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;FCKDomTools.PaddingNode=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C,D){if (!D) FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};if (!D) FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (FCKBrowserInfo.IsSafari&&FCK.EditorWindow&&A.IEquals('Paste')) return 0;if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else{return FCK.EditorDocument.queryCommandState(A)?1:0;}}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},Paste:function(A){if (FCK.Status!=2||!FCK.Events.FireEvent('OnPaste')) return false;return A||FCK._ExecPaste();},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) A=FCK.TempBaseTag+FCK.GetXHTML();else A=FCK.GetXHTML();}else{A=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body'+FCKConfig.GetBodyAttributes()+'>'+FCK.GetXHTML()+'</body></html>';};var B=FCKConfig.ScreenWidth*0.8;var C=FCKConfig.ScreenHeight*0.7;var D=(FCKConfig.ScreenWidth-B)/2;var E='';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A;E='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.opener._FCKHtmlToLoad );document.close() ;window.opener._FCKHtmlToLoad = null ;})() )';};var F=window.open(E,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+B+',height='+C+',left='+D);if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){F.document.write(A);F.document.close();}},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){FCKCommands.GetCommand('ShowBlocks').SaveState();if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (FCKBrowserInfo.IsIE) FCKTempBin.ToHtml();if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetData(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},InsertElement:function(A){if (typeof A=='string') A=this.EditorDocument.createElement(A);var B=A.nodeName.toLowerCase();FCKSelection.Restore();var C=new FCKDomRange(this.EditorWindow);C.MoveToSelection();C.DeleteContents();if (FCKListsLib.BlockElements[B]!=null){if (C.StartBlock){if (C.CheckStartOfBlock()) C.MoveToPosition(C.StartBlock,3);else if (C.CheckEndOfBlock()) C.MoveToPosition(C.StartBlock,4);else C.SplitBlock();};C.InsertNode(A);var D=FCKDomTools.GetNextSourceElement(A,false,null,['hr','br','param','img','area','input'],true);if (!D&&FCKConfig.EnterMode!='br'){D=this.EditorDocument.body.appendChild(this.EditorDocument.createElement(FCKConfig.EnterMode));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);};if (FCKListsLib.EmptyElements[B]==null) C.MoveToElementEditStart(A);else if (D) C.MoveToElementEditStart(D);else C.MoveToPosition(A,4);if (FCKBrowserInfo.IsGeckoLike){if (D) FCKDomTools.ScrollIntoView(D,false);FCKDomTools.ScrollIntoView(A,false);}}else{C.InsertNode(A);C.SetStart(A,4);C.SetEnd(A,4);};C.Select();C.Release();this.Focus();return A;},_InsertBlockElement:function(A){},_IsFunctionKey:function(A){if (A>=16&&A<=20) return true;if (A==27||(A>=33&&A<=40)) return true;if (A==45) return true;return false;},_KeyDownListener:function(A){if (!A) A=FCK.EditorWindow.event;if (FCK.EditorWindow){if (!FCK._IsFunctionKey(A.keyCode)&&!(A.ctrlKey||A.metaKey)&&!(A.keyCode==46)) FCK._KeyDownUndo();};return true;},_KeyDownUndo:function(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;FCKUndo.Changed=1;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}},_TabKeyHandler:function(A){if (!A) A=window.event;var B=A.keyCode;if (B==9&&FCK.EditMode!=0){if (FCKBrowserInfo.IsIE){var C=document.selection.createRange();if (C.parentElement()!=FCK.EditingArea.Textarea) return true;C.text='\t';C.select();}else{var a=[];var D=FCK.EditingArea.Textarea;var E=D.selectionStart;var F=D.selectionEnd;a.push(D.value.substr(0,E));a.push('\t');a.push(D.value.substr(F));D.value=a.join('');D.setSelectionRange(E+1,E+1);};if (A.preventDefault) return A.preventDefault();return A.returnValue=false;};return true;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML=FCK.GetData;FCK.SetHTML=FCK.SetData;FCK.InsertElementAndGetIt=FCK.CreateElement=FCK.InsertElement;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+encodeURIComponent(A)+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return decodeURIComponent(B);};function _FCK_MouseEventsListener(A){if (!A) A=window.event;if (A.type=='mousedown') FCK.MouseDownFlag=true;else if (A.type=='mouseup') FCK.MouseDownFlag=false;else if (A.type=='mousemove') FCK.Events.FireEvent('OnMouseMove',A);};function _FCK_PaddingNodeListener(){if (FCKConfig.EnterMode.IEquals('br')) return;FCKDomTools.EnforcePaddingNode(FCK.EditorDocument,FCKConfig.EnterMode);if (!FCKBrowserInfo.IsIE&&FCKDomTools.PaddingNode){var A=FCKSelection.GetSelection();if (A&&A.rangeCount==1){var B=A.getRangeAt(0);if (B.collapsed&&B.startContainer==FCK.EditorDocument.body&&B.startOffset==0){B.selectNodeContents(FCKDomTools.PaddingNode);B.collapse(true);A.removeAllRanges();A.addRange(B);}}}else if (FCKDomTools.PaddingNode){var C=FCKSelection.GetParentElement();var D=FCKDomTools.PaddingNode;if (C&&C.nodeName.IEquals('body')){if (FCK.EditorDocument.body.childNodes.length==1&&FCK.EditorDocument.body.firstChild==D){if (FCKSelection._GetSelectionDocument(FCK.EditorDocument.selection)!=FCK.EditorDocument) return;var B=FCK.EditorDocument.body.createTextRange();var F=false;if (!D.childNodes.firstChild){D.appendChild(FCKTools.GetElementDocument(D).createTextNode('\ufeff'));F=true;};B.moveToElementText(D);B.select();if (F) B.pasteHTML('');}}}};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;if (FCKBrowserInfo.IsIE) FCKTempBin.ToElements();FCK.InitializeBehaviors();FCK.MouseDownFlag=false;FCKTools.AddEventListener(FCK.EditorDocument,'mousemove',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mouseup',_FCK_MouseEventsListener);if (FCKBrowserInfo.IsSafari){var A=function(evt){if (!(evt.ctrlKey||evt.metaKey)) return;if (FCK.EditMode!=0) return;switch (evt.keyCode){case 89:FCKUndo.Redo();break;case 90:FCKUndo.Undo();break;}};FCKTools.AddEventListener(FCK.EditorDocument,'keyup',A);};FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode,FCKConfig.TabSpaces);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();FCKCommands.GetCommand('ShowBlocks').RestoreState();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){return FCKTools.GetStyleHtml(FCKConfig.EditorAreaCSS)+FCKTools.GetStyleHtml(FCKConfig.EditorAreaStyles);};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){switch (B){case 'Paste':return!FCK.Paste();case 'Cut':FCKUndo.SaveUndoStep();return false;}}else{if (B.Equals('Paste','Undo','Redo','SelectAll','Cut')) return false;};var C=FCK.Commands.GetCommand(B);if (C.GetState()==-1) return false;return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]=null;this.Elements.length=0;},ToHtml:function(){for (var i=0;i<this.Elements.length;i++){this.Elements[i]='<div>&nbsp;'+this.Elements[i].outerHTML+'</div>';this.Elements[i].isHtml=true;}},ToElements:function(){var A=FCK.EditorDocument.createElement('div');for (var i=0;i<this.Elements.length;i++){if (this.Elements[i].isHtml){A.innerHTML=this.Elements[i];this.Elements[i]=A.firstChild.removeChild(A.firstChild.lastChild);}}}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else if (FCKBrowserInfo.IsSafari) C=A;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){if (FCKFocusManager._IsFocusing) return;FCKFocusManager._IsFocusing=true;FCK.Focus();FCKFocusManager_Win_OnFocus();FCKTools.RunFunction(function(){delete FCKFocusManager._IsFocusing;});};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};(function(){var A=window.frameElement;var B=A.width;var C=A.height;if (/^\d+$/.test(B)) B+='px';if (/^\d+$/.test(C)) C+='px';var D=A.style;D.border=D.padding=D.margin=0;D.backgroundColor='transparent';D.backgroundImage='none';D.width=B;D.height=C;})();
+FCK.Description="FCKeditor for Internet Explorer 5.5+";FCK._GetBehaviorsStyle=function(){if (!FCK._BehaviorsStyle){var A=FCKConfig.BasePath;var B='';var C;C='<style type="text/css" _fcktemp="true">';if (FCKConfig.ShowBorders) B='url('+A+'css/behaviors/showtableborders.htc)';C+='INPUT,TEXTAREA,SELECT,.FCK__Anchor,.FCK__PageBreak,.FCK__InputHidden';if (FCKConfig.DisableObjectResizing){C+=',IMG';B+=' url('+A+'css/behaviors/disablehandles.htc)';};C+=' { behavior: url('+A+'css/behaviors/disablehandles.htc) ; }';if (B.length>0) C+='TABLE { behavior: '+B+' ; }';C+='</style>';FCK._BehaviorsStyle=C;};return FCK._BehaviorsStyle;};function Doc_OnMouseUp(){if (FCK.EditorWindow.event.srcElement.tagName=='HTML'){FCK.Focus();FCK.EditorWindow.event.cancelBubble=true;FCK.EditorWindow.event.returnValue=false;}};function Doc_OnPaste(){var A=FCK.EditorDocument.body;A.detachEvent('onpaste',Doc_OnPaste);var B=FCK.Paste(!FCKConfig.ForcePasteAsPlainText&&!FCKConfig.AutoDetectPasteFromWord);A.attachEvent('onpaste',Doc_OnPaste);return B;};function Doc_OnDblClick(){FCK.OnDoubleClick(FCK.EditorWindow.event.srcElement);FCK.EditorWindow.event.cancelBubble=true;};function Doc_OnSelectionChange(){if (!FCK.IsSelectionChangeLocked&&FCK.EditorDocument) FCK.Events.FireEvent("OnSelectionChange");};function Doc_OnDrop(){if (FCK.MouseDownFlag){FCK.MouseDownFlag=false;return;};if (FCKConfig.ForcePasteAsPlainText){var A=FCK.EditorWindow.event;if (FCK._CheckIsPastingEnabled()||FCKConfig.ShowDropDialog) FCK.PasteAsPlainText(A.dataTransfer.getData('Text'));A.returnValue=false;A.cancelBubble=true;}};FCK.InitializeBehaviors=function(A){this.EditorDocument.attachEvent('onmouseup',Doc_OnMouseUp);this.EditorDocument.body.attachEvent('onpaste',Doc_OnPaste);this.EditorDocument.body.attachEvent('ondrop',Doc_OnDrop);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument.body);this.EditorDocument.attachEvent("onkeydown",FCK._KeyDownListener);this.EditorDocument.attachEvent("ondblclick",Doc_OnDblClick);this.EditorDocument.attachEvent("onbeforedeactivate",function(){ FCKSelection.Save();});this.EditorDocument.attachEvent("onselectionchange",Doc_OnSelectionChange);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',Doc_OnMouseDown);};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCKSelection.Restore();FCK.EditorWindow.focus();FCKUndo.SaveUndoStep();var B=FCKSelection.GetSelection();if (B.type.toLowerCase()=='control') B.clear();A='<span id="__fakeFCKRemove__" style="display:none;">fakeFCKRemove</span>'+A;B.createRange().pasteHTML(A);FCK.EditorDocument.getElementById('__fakeFCKRemove__').removeNode(true);FCKDocumentProcessor.Process(FCK.EditorDocument);this.Events.FireEvent("OnSelectionChange");};FCK.SetInnerHtml=function(A){var B=FCK.EditorDocument;B.body.innerHTML='<div id="__fakeFCKRemove__">&nbsp;</div>'+A;B.getElementById('__fakeFCKRemove__').removeNode(true);};function FCK_PreloadImages(){var A=new FCKImagePreloader();A.AddImages(FCKConfig.PreloadImages);A.AddImages(FCKConfig.SkinPath+'fck_strip.gif');A.OnComplete=LoadToolbarSetup;A.Start();};function Document_OnContextMenu(){return (event.srcElement._FCKShowContextMenu==true);};document.oncontextmenu=Document_OnContextMenu;function FCK_Cleanup(){this.LinkedField=null;this.EditorWindow=null;this.EditorDocument=null;};FCK._ExecPaste=function(){if (FCK._PasteIsRunning) return true;if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};var A=FCK._CheckIsPastingEnabled(true);if (A===false) FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security']);else{if (FCKConfig.AutoDetectPasteFromWord&&A.length>0){var B=/<\w[^>]*(( class="?MsoNormal"?)|(="mso-))/gi;if (B.test(A)){if (confirm(FCKLang.PasteWordConfirm)){FCK.PasteFromWord();return false;}}};FCK._PasteIsRunning=true;FCK.ExecuteNamedCommand('Paste');delete FCK._PasteIsRunning;};return false;};FCK.PasteAsPlainText=function(A){if (!FCK._CheckIsPastingEnabled()){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText');return;};var B=null;if (!A) B=clipboardData.getData("Text");else B=A;if (B&&B.length>0){B=FCKTools.HTMLEncode(B);B=FCKTools.ProcessLineBreaks(window,FCKConfig,B);var C=B.search('</p>');var D=B.search('<p>');if ((C!=-1&&D!=-1&&C<D)||(C!=-1&&D==-1)){var E=B.substr(0,C);B=B.substr(C+4);this.InsertHtml(E);};FCKUndo.SaveLocked=true;this.InsertHtml(B);FCKUndo.SaveLocked=false;}};FCK._CheckIsPastingEnabled=function(A){FCK._PasteIsEnabled=false;document.body.attachEvent('onpaste',FCK_CheckPasting_Listener);var B=FCK.GetClipboardHTML();document.body.detachEvent('onpaste',FCK_CheckPasting_Listener);if (FCK._PasteIsEnabled){if (!A) B=true;}else B=false;delete FCK._PasteIsEnabled;return B;};function FCK_CheckPasting_Listener(){FCK._PasteIsEnabled=true;};FCK.GetClipboardHTML=function(){var A=document.getElementById('___FCKHiddenDiv');if (!A){A=document.createElement('DIV');A.id='___FCKHiddenDiv';var B=A.style;B.position='absolute';B.visibility=B.overflow='hidden';B.width=B.height=1;document.body.appendChild(A);};A.innerHTML='';var C=document.body.createTextRange();C.moveToElementText(A);C.execCommand('Paste');var D=A.innerHTML;A.innerHTML='';return D;};FCK.CreateLink=function(A,B){var C=[];FCK.ExecuteNamedCommand('Unlink',null,false,!!B);if (A.length>0){if (FCKSelection.GetType()=='Control'){var D=this.EditorDocument.createElement('A');D.href=A;var E=FCKSelection.GetSelectedElement();E.parentNode.insertBefore(D,E);E.parentNode.removeChild(E);D.appendChild(E);return [D];};var F='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',F,false,!!B);var G=this.EditorDocument.links;for (i=0;i<G.length;i++){var D=G[i];if (D.getAttribute('href',2)==F){var I=D.innerHTML;D.href=A;D.innerHTML=I;var J=D.lastChild;if (J&&J.nodeName=='BR'){FCKDomTools.InsertAfterNode(D,D.removeChild(J));};C.push(D);}}};return C;};function _FCK_RemoveDisabledAtt(){this.removeAttribute('disabled');};function Doc_OnMouseDown(A){var e=A.srcElement;if (e.nodeName.IEquals('input')&&e.type.IEquals(['radio','checkbox'])&&!e.disabled){e.disabled=true;FCKTools.SetTimeout(_FCK_RemoveDisabledAtt,1,e);}};
+var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi,'/');var sFullProtocol=document.location.href.match(/^(file\:\/{2,3})/)[1];if (FCKBrowserInfo.IsOpera) sFullProtocol+='localhost/';FCKConfig.BasePath=sFullProtocol+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);}else FCKConfig.BasePath=document.location.protocol+'//'+document.location.host+document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {  }};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;A.RemoveAttributesArray=(A.RemoveAttributes||'').split(',');if (!FCKConfig.SkinEditorCSS||FCKConfig.SkinEditorCSS.length==0) FCKConfig.SkinEditorCSS=FCKConfig.SkinPath+'fck_editor.css';if (!FCKConfig.SkinDialogCSS||FCKConfig.SkinDialogCSS.length==0) FCKConfig.SkinDialogCSS=FCKConfig.SkinPath+'fck_dialog.css';};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.push([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource._CodeTag=(new Date()).valueOf();FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.push(A);};FCKConfig.ProtectedSource.Protect=function(A){var B=this._CodeTag;function _Replace(protectedSource){var C=FCKTempBin.AddElement(protectedSource);return '<!--{'+B+C+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};var D=new RegExp("(<|&lt;)!--\\{"+this._CodeTag+"(\\d+)\\}--(>|&gt;)","g");return A.replace(D,_Replace);};FCKConfig.GetBodyAttributes=function(){var A='';if (this.BodyId&&this.BodyId.length>0) A+=' id="'+this.BodyId+'"';if (this.BodyClass&&this.BodyClass.length>0) A+=' class="'+this.BodyClass+'"';return A;};FCKConfig.ApplyBodyAttributes=function(A){if (this.BodyId&&this.BodyId.length>0) A.id=FCKConfig.BodyId;if (this.BodyClass&&this.BodyClass.length>0) A.className+=' '+FCKConfig.BodyClass;};
 var FCKDebug={Output:function(){},OutputObject:function(){}};
 var FCKDomTools={MoveChildren:function(A,B,C){if (A==B) return;var D;if (C){while ((D=A.lastChild)) B.insertBefore(A.removeChild(D),B.firstChild);}else{while ((D=A.firstChild)) B.appendChild(A.removeChild(D));}},MoveNode:function(A,B,C){if (C) B.insertBefore(FCKDomTools.RemoveNode(A),B.firstChild);else B.appendChild(FCKDomTools.RemoveNode(A));},TrimNode:function(A){this.LTrimNode(A);this.RTrimNode(A);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A){var B;while ((B=A.lastChild)){if (B.nodeType==3){var C=B.nodeValue.RTrim();var D=B.nodeValue.length;if (C.length==0){B.parentNode.removeChild(B);continue;}else if (C.length<D){B.splitText(C.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;};if (!FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsOpera){B=A.lastChild;if (B&&B.nodeType==1&&B.nodeName.toLowerCase()=='br'){B.parentNode.removeChild(B);}}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D,E){while((A=this.GetNextSourceNode(A,E))){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (D&&A.nodeName.IEquals(D)) return this.GetNextSourceElement(A,B,C,D);return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;};return null;},GetNextSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.firstChild) E=A.firstChild;else{if (D&&A==D) return null;E=A.nextSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetNextSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetNextSourceNode(E,false,C,D);return E;},GetPreviousSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.lastChild) E=A.lastChild;else{if (D&&A==D) return null;E=A.previousSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetPreviousSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetPreviousSourceNode(E,false,C,D);return E;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.unshift(A);A=A.parentNode;};return B;},GetCommonParents:function(A,B){var C=this.GetParents(A);var D=this.GetParents(B);var E=[];for (var i=0;i<C.length;i++){if (C[i]==D[i]) E.push(C[i]);};return E;},GetCommonParentNode:function(A,B,C){var D={};if (!C.pop) C=[C];while (C.length>0) D[C.pop().toLowerCase()]=1;var E=this.GetCommonParents(A,B);var F=null;while ((F=E.pop())){if (D[F.nodeName.toLowerCase()]) return F;};return null;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;},PaddingNode:null,EnforcePaddingNode:function(A,B){try{if (!A||!A.body) return;}catch (e){return;};this.CheckAndRemovePaddingNode(A,B,true);try{if (A.body.lastChild&&(A.body.lastChild.nodeType!=1||A.body.lastChild.tagName.toLowerCase()==B.toLowerCase())) return;}catch (e){return;};var C=A.createElement(B);if (FCKBrowserInfo.IsGecko&&FCKListsLib.NonEmptyBlockElements[B]) FCKTools.AppendBogusBr(C);this.PaddingNode=C;if (A.body.childNodes.length==1&&A.body.firstChild.nodeType==1&&A.body.firstChild.tagName.toLowerCase()=='br'&&(A.body.firstChild.getAttribute('_moz_dirty')!=null||A.body.firstChild.getAttribute('type')=='_moz')) A.body.replaceChild(C,A.body.firstChild);else A.body.appendChild(C);},CheckAndRemovePaddingNode:function(A,B,C){var D=this.PaddingNode;if (!D) return;try{if (D.parentNode!=A.body||D.tagName.toLowerCase()!=B||(D.childNodes.length>1)||(D.firstChild&&D.firstChild.nodeValue!='\xa0'&&String(D.firstChild.tagName).toLowerCase()!='br')){this.PaddingNode=null;return;}}catch (e){this.PaddingNode=null;return;};if (!C){if (D.parentNode.childNodes.length>1) D.parentNode.removeChild(D);this.PaddingNode=null;}},HasAttribute:function(A,B){if (A.hasAttribute) return A.hasAttribute(B);else{var C=A.attributes[B];return (C!=undefined&&C.specified);}},HasAttributes:function(A){var B=A.attributes;for (var i=0;i<B.length;i++){if (FCKBrowserInfo.IsIE&&B[i].nodeName=='class'){if (A.className.length>0) return true;}else if (B[i].specified) return true;};return false;},RemoveAttribute:function(A,B){if (FCKBrowserInfo.IsIE&&B.toLowerCase()=='class') B='className';return A.removeAttribute(B,0);},RemoveAttributes:function (A,B){for (var i=0;i<B.length;i++) this.RemoveAttribute(A,B[i]);},GetAttributeValue:function(A,B){var C=B;if (typeof B=='string') B=A.attributes[B];else C=B.nodeName;if (B&&B.specified){if (C=='style') return A.style.cssText;else if (C=='class'||C.indexOf('on')==0) return B.nodeValue;else{return A.getAttribute(C,2);}};return null;},Contains:function(A,B){if (A.contains&&B.nodeType==1) return A.contains(B);while ((B=B.parentNode)){if (B==A) return true;};return false;},BreakParent:function(A,B,C){var D=C||new FCKDomRange(FCKTools.GetElementWindow(A));D.SetStart(A,4);D.SetEnd(B,4);var E=D.ExtractContents();D.InsertNode(A.parentNode.removeChild(A));E.InsertAfterNode(A);D.Release(!!C);},GetNodeAddress:function(A,B){var C=[];while (A&&A!=FCKTools.GetElementDocument(A).documentElement){var D=A.parentNode;var E=-1;for(var i=0;i<D.childNodes.length;i++){var F=D.childNodes[i];if (B===true&&F.nodeType==3&&F.previousSibling&&F.previousSibling.nodeType==3) continue;E++;if (D.childNodes[i]==A) break;};C.unshift(E);A=A.parentNode;};return C;},GetNodeFromAddress:function(A,B,C){var D=A.documentElement;for (var i=0;i<B.length;i++){var E=B[i];if (!C){D=D.childNodes[E];continue;};var F=-1;for (var j=0;j<D.childNodes.length;j++){var G=D.childNodes[j];if (C===true&&G.nodeType==3&&G.previousSibling&&G.previousSibling.nodeType==3) continue;F++;if (F==E){D=G;break;}}};return D;},CloneElement:function(A){A=A.cloneNode(false);A.removeAttribute('id',false);return A;},ClearElementJSProperty:function(A,B){if (FCKBrowserInfo.IsIE) A.removeAttribute(B);else delete A[B];},SetElementMarker:function (A,B,C,D){var E=String(parseInt(Math.random()*0xffffffff,10));B._FCKMarkerId=E;B[C]=D;if (!A[E]) A[E]={ 'element':B,'markers':{} };A[E]['markers'][C]=D;},ClearElementMarkers:function(A,B,C){var D=B._FCKMarkerId;if (!D) return;this.ClearElementJSProperty(B,'_FCKMarkerId');for (var j in A[D]['markers']) this.ClearElementJSProperty(B,j);if (C) delete A[D];},ClearAllMarkers:function(A){for (var i in A) this.ClearElementMarkers(A,A[i]['element'],true);},ListToArray:function(A,B,C,D,E){if (!A.nodeName.IEquals(['ul','ol'])) return [];if (!D) D=0;if (!C) C=[];for (var i=0;i<A.childNodes.length;i++){var F=A.childNodes[i];if (!F.nodeName.IEquals('li')) continue;var G={ 'parent':A,'indent':D,'contents':[] };if (!E){G.grandparent=A.parentNode;if (G.grandparent&&G.grandparent.nodeName.IEquals('li')) G.grandparent=G.grandparent.parentNode;}else G.grandparent=E;if (B) this.SetElementMarker(B,F,'_FCK_ListArray_Index',C.length);C.push(G);for (var j=0;j<F.childNodes.length;j++){var H=F.childNodes[j];if (H.nodeName.IEquals(['ul','ol'])) this.ListToArray(H,B,C,D+1,G.grandparent);else G.contents.push(H);}};return C;},ArrayToList:function(A,B,C){if (C==undefined) C=0;if (!A||A.length<C+1) return null;var D=FCKTools.GetElementDocument(A[C].parent);var E=D.createDocumentFragment();var F=null;var G=C;var H=Math.max(A[C].indent,0);var I=null;while (true){var J=A[G];if (J.indent==H){if (!F||A[G].parent.nodeName!=F.nodeName){F=A[G].parent.cloneNode(false);E.appendChild(F);};I=D.createElement('li');F.appendChild(I);for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));G++;}else if (J.indent==Math.max(H,0)+1){var K=this.ArrayToList(A,null,G);I.appendChild(K.listNode);G=K.nextIndex;}else if (J.indent==-1&&C==0&&J.grandparent){var I;if (J.grandparent.nodeName.IEquals(['ul','ol'])) I=D.createElement('li');else{if (FCKConfig.EnterMode.IEquals(['div','p'])&&!J.grandparent.nodeName.IEquals('td')) I=D.createElement(FCKConfig.EnterMode);else I=D.createDocumentFragment();};for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));if (I.nodeType==11){if (I.lastChild&&I.lastChild.getAttribute&&I.lastChild.getAttribute('type')=='_moz') I.removeChild(I.lastChild);I.appendChild(D.createElement('br'));};if (I.nodeName.IEquals(FCKConfig.EnterMode)&&I.firstChild){this.TrimNode(I);if (FCKListsLib.BlockBoundaries[I.firstChild.nodeName.toLowerCase()]){var M=D.createDocumentFragment();while (I.firstChild) M.appendChild(I.removeChild(I.firstChild));I=M;}};if (FCKBrowserInfo.IsGeckoLike&&I.nodeName.IEquals(['div','p'])) FCKTools.AppendBogusBr(I);E.appendChild(I);F=null;G++;}else return null;if (A.length<=G||Math.max(A[G].indent,0)<H){break;}};if (B){var N=E.firstChild;while (N){if (N.nodeType==1) this.ClearElementMarkers(B,N);N=this.GetNextSourceNode(N);}};return { 'listNode':E,'nextIndex':G };},GetNextSibling:function(A,B){A=A.nextSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.nextSibling;return A;},GetPreviousSibling:function(A,B){A=A.previousSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.previousSibling;return A;},CheckIsEmptyElement:function(A,B){var C=A.firstChild;var D;while (C){if (C.nodeType==1){if (D||!FCKListsLib.InlineNonEmptyElements[C.nodeName.toLowerCase()]) return false;if (!B||B(C)===true) D=C;}else if (C.nodeType==3&&C.nodeValue.length>0) return false;C=C.nextSibling;};return D?this.CheckIsEmptyElement(D,B):true;},SetElementStyles:function(A,B){var C=A.style;for (var D in B) C[D]=B[D];},SetOpacity:function(A,B){if (FCKBrowserInfo.IsIE){B=Math.round(B*100);A.style.filter=(B>100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+B+')');}else A.style.opacity=B;},GetCurrentElementStyle:function(A,B){if (FCKBrowserInfo.IsIE) return A.currentStyle[B];else return A.ownerDocument.defaultView.getComputedStyle(A,'').getPropertyValue(B);},GetPositionedAncestor:function(A){var B=A;while (B!=FCKTools.GetElementDocument(B).documentElement){if (this.GetCurrentElementStyle(B,'position')!='static') return B;if (B==FCKTools.GetElementDocument(B).documentElement&&currentWindow!=w) B=currentWindow.frameElement;else B=B.parentNode;};return null;},ScrollIntoView:function(A,B){var C=FCKTools.GetElementWindow(A);var D=FCKTools.GetViewPaneSize(C).Height;var E=D*-1;if (B===false){E+=A.offsetHeight||0;E+=parseInt(this.GetCurrentElementStyle(A,'marginBottom')||0,10)||0;};var F=FCKTools.GetDocumentPosition(C,A);E+=F.y;var G=FCKTools.GetScrollPosition(C).Y;if (E>0&&(E>G||E<G-D)) C.scrollTo(0,E);},CheckIsEditable:function(A){var B=A.nodeName.toLowerCase();var C=FCK.DTD[B]||FCK.DTD.span;return (C['#']&&!FCKListsLib.NonEditableElements[B]);},GetSelectedDivContainers:function(){var A=[];var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.GetTouchedStartNode();var D=B.GetTouchedEndNode();var E=C;if (C==D){while (D.nodeType==1&&D.lastChild) D=D.lastChild;D=FCKDomTools.GetNextSourceNode(D);}while (E&&E!=D){if (E.nodeType!=3||!/^[ \t\n]*$/.test(E.nodeValue)){var F=new FCKElementPath(E);var G=F.BlockLimit;if (G&&G.nodeName.IEquals('div')&&A.IndexOf(G)==-1) A.push(G);};E=FCKDomTools.GetNextSourceNode(E);};return A;}};
 var FCKTools={};FCKTools.CreateBogusBR=function(A){var B=A.createElement('br');B.setAttribute('type','_moz');return B;};FCKTools.FixCssUrls=function(A,B){if (!A||A.length==0) return B;return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(match,opener,path,closer){if (/^\/|^\w?:/.test(path)) return match;else return 'url('+opener+A+path+closer+')';});};FCKTools._GetUrlFixedCss=function(A,B){var C=A.match(/^([^|]+)\|([\s\S]*)/);if (C) return FCKTools.FixCssUrls(C[1],C[2]);else return A;};FCKTools.AppendStyleSheet=function(A,B){if (!B) return [];if (typeof(B)=='string'){if (/[\\\/\.][^{}]*$/.test(B)){return this.AppendStyleSheet(A,B.split(','));}else return [this.AppendStyleString(A,FCKTools._GetUrlFixedCss(B))];}else{var C=[];for (var i=0;i<B.length;i++) C.push(this._AppendStyleSheet(A,B[i]));return C;}};FCKTools.GetStyleHtml=(function(){var A=function(styleDef,markTemp){if (styleDef.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<style type="text/css"'+B+'>'+styleDef+'</style>';};var C=function(cssFileUrl,markTemp){if (cssFileUrl.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<link href="'+cssFileUrl+'" type="text/css" rel="stylesheet" '+B+'/>';};return function(cssFileOrArrayOrDef,markTemp){if (!cssFileOrArrayOrDef) return '';if (typeof(cssFileOrArrayOrDef)=='string'){if (/[\\\/\.][^{}]*$/.test(cssFileOrArrayOrDef)){return this.GetStyleHtml(cssFileOrArrayOrDef.split(','),markTemp);}else return A(this._GetUrlFixedCss(cssFileOrArrayOrDef),markTemp);}else{var E='';for (var i=0;i<cssFileOrArrayOrDef.length;i++) E+=C(cssFileOrArrayOrDef[i],markTemp);return E;}}})();FCKTools.GetElementDocument=function (A){return A.ownerDocument||A.document;};FCKTools.GetElementWindow=function(A){return this.GetDocumentWindow(this.GetElementDocument(A));};FCKTools.GetDocumentWindow=function(A){if (FCKBrowserInfo.IsSafari&&!A.parentWindow) this.FixDocumentParentWindow(window.top);return A.parentWindow||A.defaultView;};FCKTools.FixDocumentParentWindow=function(A){if (A.document) A.document.parentWindow=A;for (var i=0;i<A.frames.length;i++) FCKTools.FixDocumentParentWindow(A.frames[i]);};FCKTools.HTMLEncode=function(A){if (!A) return '';A=A.replace(/&/g,'&amp;');A=A.replace(/</g,'&lt;');A=A.replace(/>/g,'&gt;');return A;};FCKTools.HTMLDecode=function(A){if (!A) return '';A=A.replace(/&gt;/g,'>');A=A.replace(/&lt;/g,'<');A=A.replace(/&amp;/g,'&');return A;};FCKTools._ProcessLineBreaksForPMode=function(A,B,C,D,E){var F=0;var G="<p>";var H="</p>";var I="<br />";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='p'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};var n=B.charAt(i+1);if (n=='\r'){i++;n=B.charAt(i+1);};if (n=='\n'){i++;if (F) E.push(H);E.push(G);F=1;}else E.push(I);}};FCKTools._ProcessLineBreaksForDivMode=function(A,B,C,D,E){var F=0;var G="<div>";var H="</div>";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='div'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F){if (E[E.length-1]==G){E.push("&nbsp;");};E.push(H);};E.push(G);F=1;};if (F) E.push(H);};FCKTools._ProcessLineBreaksForBrMode=function(A,B,C,D,E){var F=0;var G="<br />";var H="";if (C){G="<li>";H="</li>";F=1;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F&&H.length) E.push (H);E.push(G);F=1;}};FCKTools.ProcessLineBreaks=function(A,B,C){var D=B.EnterMode.toLowerCase();var E=[];var F=0;var G=new A.FCKDomRange(A.FCK.EditorWindow);G.MoveToSelection();var H=G._Range.startContainer;while (H&&H.nodeType!=1) H=H.parentNode;if (H&&H.tagName.toLowerCase()=='li') F=1;if (D=='p') this._ProcessLineBreaksForPMode(A,C,F,H,E);else if (D=='div') this._ProcessLineBreaksForDivMode(A,C,F,H,E);else if (D=='br') this._ProcessLineBreaksForBrMode(A,C,F,H,E);return E.join("");};FCKTools.AddSelectOption=function(A,B,C){var D=FCKTools.GetElementDocument(A).createElement("OPTION");D.text=B;D.value=C;A.options.add(D);return D;};FCKTools.RunFunction=function(A,B,C,D){if (A) this.SetTimeout(A,0,B,C,D);};FCKTools.SetTimeout=function(A,B,C,D,E){return (E||window).setTimeout(function(){if (D) A.apply(C,[].concat(D));else A.apply(C);},B);};FCKTools.SetInterval=function(A,B,C,D,E){return (E||window).setInterval(function(){A.apply(C,D||[]);},B);};FCKTools.ConvertStyleSizeToHtml=function(A){return A.EndsWith('%')?A:parseInt(A,10);};FCKTools.ConvertHtmlSizeToStyle=function(A){return A.EndsWith('%')?A:(A+'px');};FCKTools.GetElementAscensor=function(A,B){var e=A;var C=","+B.toUpperCase()+",";while (e){if (C.indexOf(","+e.nodeName.toUpperCase()+",")!=-1) return e;e=e.parentNode;};return null;};FCKTools.CreateEventListener=function(A,B){var f=function(){var C=[];for (var i=0;i<arguments.length;i++) C.push(arguments[i]);A.apply(this,C.concat(B));};return f;};FCKTools.IsStrictMode=function(A){return ('CSS1Compat'==(A.compatMode||(FCKBrowserInfo.IsSafari?'CSS1Compat':null)));};FCKTools.ArgumentsToArray=function(A,B,C){B=B||0;C=C||A.length;var D=[];for (var i=B;i<B+C&&i<A.length;i++) D.push(A[i]);return D;};FCKTools.CloneObject=function(A){var B=function() {};B.prototype=A;return new B;};FCKTools.AppendBogusBr=function(A){if (!A) return;var B=this.GetLastItem(A.getElementsByTagName('br'));if (!B||(B.getAttribute('type',2)!='_moz'&&B.getAttribute('_moz_dirty')==null)){var C=this.GetElementDocument(A);if (FCKBrowserInfo.IsOpera) A.appendChild(C.createTextNode(''));else A.appendChild(this.CreateBogusBR(C));}};FCKTools.GetLastItem=function(A){if (A.length>0) return A[A.length-1];return null;};FCKTools.GetDocumentPosition=function(w,A){var x=0;var y=0;var B=A;var C=null;var D=FCKTools.GetElementWindow(B);while (B&&!(D==w&&(B==w.document.body||B==w.document.documentElement))){x+=B.offsetLeft-B.scrollLeft;y+=B.offsetTop-B.scrollTop;if (!FCKBrowserInfo.IsOpera){var E=C;while (E&&E!=B){x-=E.scrollLeft;y-=E.scrollTop;E=E.parentNode;}};C=B;if (B.offsetParent) B=B.offsetParent;else{if (D!=w){B=D.frameElement;C=null;if (B) D=B.contentWindow.parent;}else B=null;}};if (FCKDomTools.GetCurrentElementStyle(w.document.body,'position')!='static'||(FCKBrowserInfo.IsIE&&FCKDomTools.GetPositionedAncestor(A)==null)){x+=w.document.body.offsetLeft;y+=w.document.body.offsetTop;};return { "x":x,"y":y };};FCKTools.GetWindowPosition=function(w,A){var B=this.GetDocumentPosition(w,A);var C=FCKTools.GetScrollPosition(w);B.x-=C.X;B.y-=C.Y;return B;};FCKTools.ProtectFormStyles=function(A){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return [];var B=[];var C=['style','className'];for (var i=0;i<C.length;i++){var D=C[i];if (A.elements.namedItem(D)){var E=A.elements.namedItem(D);B.push([E,E.nextSibling]);A.removeChild(E);}};return B;};FCKTools.RestoreFormStyles=function(A,B){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return;if (B.length>0){for (var i=B.length-1;i>=0;i--){var C=B[i][0];var D=B[i][1];if (D) A.insertBefore(C,D);else A.appendChild(C);}}};FCKTools.GetNextNode=function(A,B){if (A.firstChild) return A.firstChild;else if (A.nextSibling) return A.nextSibling;else{var C=A.parentNode;while (C){if (C==B) return null;if (C.nextSibling) return C.nextSibling;else C=C.parentNode;}};return null;};FCKTools.GetNextTextNode=function(A,B,C){node=this.GetNextNode(A,B);if (C&&node&&C(node)) return null;while (node&&node.nodeType!=3){node=this.GetNextNode(node,B);if (C&&node&&C(node)) return null;};return node;};FCKTools.Merge=function(){var A=arguments;var o=A[0];for (var i=1;i<A.length;i++){var B=A[i];for (var p in B) o[p]=B[p];};return o;};FCKTools.IsArray=function(A){return (A instanceof Array);};FCKTools.AppendLengthProperty=function(A,B){var C=0;for (var n in A) C++;return A[B||'length']=C;};FCKTools.NormalizeCssText=function(A){var B=document.createElement('span');B.style.cssText=A;return B.style.cssText;};FCKTools.Bind=function(A,B){return function(){ return B.apply(A,arguments);};};FCKTools.GetVoidUrl=function(){if (FCK_IS_CUSTOM_DOMAIN) return "javascript: void( function(){document.open();document.write('<html><head><title></title></head><body></body></html>');document.domain = '"+FCK_RUNTIME_DOMAIN+"';document.close();}() ) ;";if (FCKBrowserInfo.IsIE){if (FCKBrowserInfo.IsIE7||!FCKBrowserInfo.IsIE6) return "";else return "javascript: '';";};return "javascript: void(0);";};FCKTools.ResetStyles=function(A){A.style.cssText='margin:0;padding:0;border:0;background-color:transparent;background-image:none;';};
 FCKTools.CancelEvent=function(e){return false;};FCKTools._AppendStyleSheet=function(A,B){return A.createStyleSheet(B).owningElement;};FCKTools.AppendStyleString=function(A,B){if (!B) return null;var s=A.createStyleSheet("");s.cssText=B;return s;};FCKTools.ClearElementAttributes=function(A){A.clearAttributes();};FCKTools.GetAllChildrenIds=function(A){var B=[];for (var i=0;i<A.all.length;i++){var C=A.all[i].id;if (C&&C.length>0) B[B.length]=C;};return B;};FCKTools.RemoveOuterTags=function(e){e.insertAdjacentHTML('beforeBegin',e.innerHTML);e.parentNode.removeChild(e);};FCKTools.CreateXmlObject=function(A){var B;switch (A){case 'XmlHttp':if (document.location.protocol!='file:') try { return new XMLHttpRequest();} catch (e) {};B=['MSXML2.XmlHttp','Microsoft.XmlHttp'];break;case 'DOMDocument':B=['MSXML2.DOMDocument','Microsoft.XmlDom'];break;};for (var i=0;i<2;i++){try { return new ActiveXObject(B[i]);}catch (e){}};if (FCKLang.NoActiveX){alert(FCKLang.NoActiveX);FCKLang.NoActiveX=null;};return null;};FCKTools.DisableSelection=function(A){A.unselectable='on';var e,i=0;while ((e=A.all[i++])){switch (e.tagName){case 'IFRAME':case 'TEXTAREA':case 'INPUT':case 'SELECT':break;default:e.unselectable='on';}}};FCKTools.GetScrollPosition=function(A){var B=A.document;var C={ X:B.documentElement.scrollLeft,Y:B.documentElement.scrollTop };if (C.X>0||C.Y>0) return C;return { X:B.body.scrollLeft,Y:B.body.scrollTop };};FCKTools.AddEventListener=function(A,B,C){A.attachEvent('on'+B,C);};FCKTools.RemoveEventListener=function(A,B,C){A.detachEvent('on'+B,C);};FCKTools.AddEventListenerEx=function(A,B,C,D){var o={};o.Source=A;o.Params=D||[];o.Listener=function(ev){return C.apply(o.Source,[ev].concat(o.Params));};if (FCK.IECleanup) FCK.IECleanup.AddItem(null,function() { o.Source=null;o.Params=null;});A.attachEvent('on'+B,o.Listener);A=null;D=null;};FCKTools.GetViewPaneSize=function(A){var B;var C=A.document.documentElement;if (C&&C.clientWidth) B=C;else B=A.document.body;if (B) return { Width:B.clientWidth,Height:B.clientHeight };else return { Width:0,Height:0 };};FCKTools.SaveStyles=function(A){var B=FCKTools.ProtectFormStyles(A);var C={};if (A.className.length>0){C.Class=A.className;A.className='';};var D=A.style.cssText;if (D.length>0){C.Inline=D;A.style.cssText='';};FCKTools.RestoreFormStyles(A,B);return C;};FCKTools.RestoreStyles=function(A,B){var C=FCKTools.ProtectFormStyles(A);A.className=B.Class||'';A.style.cssText=B.Inline||'';FCKTools.RestoreFormStyles(A,C);};FCKTools.RegisterDollarFunction=function(A){A.$=A.document.getElementById;};FCKTools.AppendElement=function(A,B){return A.appendChild(this.GetElementDocument(A).createElement(B));};FCKTools.ToLowerCase=function(A){return A.toLowerCase();};
-var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.3",VersionBuild : "19836",Instances : new Object(),GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
+var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.4.1",VersionBuild : "23187",Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
 var FCKImagePreloader=function(){this._Images=[];};FCKImagePreloader.prototype={AddImages:function(A){if (typeof(A)=='string') A=A.split(';');this._Images=this._Images.concat(A);},Start:function(){var A=this._Images;this._PreloadCount=A.length;for (var i=0;i<A.length;i++){var B=document.createElement('img');FCKTools.AddEventListenerEx(B,'load',_FCKImagePreloader_OnImage,this);FCKTools.AddEventListenerEx(B,'error',_FCKImagePreloader_OnImage,this);B.src=A[i];_FCKImagePreloader_ImageCache.push(B);}}};var _FCKImagePreloader_ImageCache=[];function _FCKImagePreloader_OnImage(A,B){if ((--B._PreloadCount)==0&&B.OnComplete) B.OnComplete();};
 var FCKRegexLib={AposEntity:/&apos;/gi,ObjectElements:/^(?:IMG|TABLE|TR|TD|TH|INPUT|SELECT|TEXTAREA|HR|OBJECT|A|UL|OL|LI)$/i,NamedCommands:/^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i,BeforeBody:/(^[\s\S]*\<body[^\>]*\>)/i,AfterBody:/(\<\/body\>[\s\S]*$)/i,ToReplace:/___fcktoreplace:([\w]+)/ig,MetaHttpEquiv:/http-equiv\s*=\s*["']?([^"' ]+)/i,HasBaseTag:/<base /i,HasBodyTag:/<body[\s|>]/i,HtmlOpener:/<html\s?[^>]*>/i,HeadOpener:/<head\s?[^>]*>/i,HeadCloser:/<\/head\s*>/i,FCK_Class:/\s*FCK__[^ ]*(?=\s+|$)/,ElementName:/(^[a-z_:][\w.\-:]*\w$)|(^[a-z_]$)/,ForceSimpleAmpersand:/___FCKAmp___/g,SpaceNoClose:/\/>/g,EmptyParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/,EmptyOutParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/,TagBody:/></,GeckoEntitiesMarker:/#\?-\:/g,ProtectUrlsImg:/<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsA:/<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsArea:/<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,Html4DocType:/HTML 4\.0 Transitional/i,DocTypeTag:/<!DOCTYPE[^>]*>/i,HtmlDocType:/DTD HTML/,TagsWithEvent:/<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g,EventAttributes:/\s(on\w+)[\s\r\n]*=[\s\r\n]*?('|")([\s\S]*?)\2/g,ProtectedEvents:/\s\w+_fckprotectedatt="([^"]+)"/g,StyleProperties:/\S+\s*:/g,InvalidSelfCloseTags:/(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0-9:]+)[^>]*)\/>/gi,StyleVariableAttName:/#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,RegExp:/^\/(.*)\/([gim]*)$/,HtmlTag:/<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/};
 var FCKListsLib={BlockElements:{ address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,marquee:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },NonEmptyBlockElements:{ p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },InlineChildReqElements:{ abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },InlineNonEmptyElements:{ a:1,abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },EmptyElements:{ base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },PathBlockElements:{ address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 },PathBlockLimitElements:{ body:1,div:1,td:1,th:1,caption:1,form:1 },StyleBlockElements:{ address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 },StyleObjectElements:{ img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },NonEditableElements:{ button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },BlockBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },ListBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }};
-var FCKLanguageManager=FCK.Language={AvailableLanguages:{af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-uk':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',it:'Italian',ja:'Japanese',km:'Khmer',ko:'Korean',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},GetActiveLanguage:function(){if (FCKConfig.AutoDetectLanguage){var A;if (navigator.userLanguage) A=navigator.userLanguage.toLowerCase();else if (navigator.language) A=navigator.language.toLowerCase();else{return FCKConfig.DefaultLanguage;};if (A.length>=5){A=A.substr(0,5);if (this.AvailableLanguages[A]) return A;};if (A.length>=2){A=A.substr(0,2);if (this.AvailableLanguages[A]) return A;}};return this.DefaultLanguage;},TranslateElements:function(A,B,C,D){var e=A.getElementsByTagName(B);var E,s;for (var i=0;i<e.length;i++){if ((E=e[i].getAttribute('fckLang'))){if ((s=FCKLang[E])){if (D) s=FCKTools.HTMLEncode(s);e[i][C]=s;}}}},TranslatePage:function(A){this.TranslateElements(A,'INPUT','value');this.TranslateElements(A,'SPAN','innerHTML');this.TranslateElements(A,'LABEL','innerHTML');this.TranslateElements(A,'OPTION','innerHTML',true);this.TranslateElements(A,'LEGEND','innerHTML');},Initialize:function(){if (this.AvailableLanguages[FCKConfig.DefaultLanguage]) this.DefaultLanguage=FCKConfig.DefaultLanguage;else this.DefaultLanguage='en';this.ActiveLanguage={};this.ActiveLanguage.Code=this.GetActiveLanguage();this.ActiveLanguage.Name=this.AvailableLanguages[this.ActiveLanguage.Code];}};
-var FCKXHtmlEntities={};FCKXHtmlEntities.Initialize=function(){if (FCKXHtmlEntities.Entities) return;var A='';var B,e;if (FCKConfig.ProcessHTMLEntities){FCKXHtmlEntities.Entities={' ':'nbsp','¡':'iexcl','¢':'cent','£':'pound','¤':'curren','¥':'yen','¦':'brvbar','§':'sect','¨':'uml','©':'copy','ª':'ordf','«':'laquo','¬':'not','­':'shy','®':'reg','¯':'macr','°':'deg','±':'plusmn','²':'sup2','³':'sup3','´':'acute','µ':'micro','¶':'para','·':'middot','¸':'cedil','¹':'sup1','º':'ordm','»':'raquo','¼':'frac14','½':'frac12','¾':'frac34','¿':'iquest','×':'times','÷':'divide','ƒ':'fnof','•':'bull','…':'hellip','′':'prime','″':'Prime','‾':'oline','�':'frasl','℘':'weierp','ℑ':'image','ℜ':'real','™':'trade','ℵ':'alefsym','�':'larr','↑':'uarr','→':'rarr','↓':'darr','↔':'harr','↵':'crarr','�':'lArr','⇑':'uArr','⇒':'rArr','⇓':'dArr','⇔':'hArr','∀':'forall','∂':'part','∃':'exist','∅':'empty','∇':'nabla','∈':'isin','∉':'notin','∋':'ni','�':'prod','∑':'sum','−':'minus','∗':'lowast','√':'radic','�':'prop','∞':'infin','∠':'ang','∧':'and','∨':'or','∩':'cap','∪':'cup','∫':'int','∴':'there4','∼':'sim','≅':'cong','≈':'asymp','≠':'ne','≡':'equiv','≤':'le','≥':'ge','⊂':'sub','⊃':'sup','⊄':'nsub','⊆':'sube','⊇':'supe','⊕':'oplus','⊗':'otimes','⊥':'perp','⋅':'sdot','\u2308':'lceil','\u2309':'rceil','\u230a':'lfloor','\u230b':'rfloor','\u2329':'lang','\u232a':'rang','◊':'loz','♠':'spades','♣':'clubs','♥':'hearts','♦':'diams','"':'quot','ˆ':'circ','˜':'tilde',' ':'ensp',' ':'emsp',' ':'thinsp','‌':'zwnj','�':'zwj','‎':'lrm','�':'rlm','–':'ndash','—':'mdash','‘':'lsquo','’':'rsquo','‚':'sbquo','“':'ldquo','�':'rdquo','„':'bdquo','†':'dagger','‡':'Dagger','‰':'permil','‹':'lsaquo','›':'rsaquo','€':'euro'};for (e in FCKXHtmlEntities.Entities) A+=e;if (FCKConfig.IncludeLatinEntities){B={'À':'Agrave','�':'Aacute','Â':'Acirc','Ã':'Atilde','Ä':'Auml','Å':'Aring','Æ':'AElig','Ç':'Ccedil','È':'Egrave','É':'Eacute','Ê':'Ecirc','Ë':'Euml','Ì':'Igrave','�':'Iacute','Î':'Icirc','�':'Iuml','�':'ETH','Ñ':'Ntilde','Ò':'Ograve','Ó':'Oacute','Ô':'Ocirc','Õ':'Otilde','Ö':'Ouml','Ø':'Oslash','Ù':'Ugrave','Ú':'Uacute','Û':'Ucirc','Ü':'Uuml','�':'Yacute','Þ':'THORN','ß':'szlig','à':'agrave','á':'aacute','â':'acirc','ã':'atilde','ä':'auml','å':'aring','æ':'aelig','ç':'ccedil','è':'egrave','é':'eacute','ê':'ecirc','ë':'euml','ì':'igrave','í':'iacute','î':'icirc','ï':'iuml','ð':'eth','ñ':'ntilde','ò':'ograve','ó':'oacute','ô':'ocirc','õ':'otilde','ö':'ouml','ø':'oslash','ù':'ugrave','ú':'uacute','û':'ucirc','ü':'uuml','ý':'yacute','þ':'thorn','ÿ':'yuml','Œ':'OElig','œ':'oelig','Š':'Scaron','š':'scaron','Ÿ':'Yuml'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;};if (FCKConfig.IncludeGreekEntities){B={'Α':'Alpha','Β':'Beta','Γ':'Gamma','Δ':'Delta','Ε':'Epsilon','Ζ':'Zeta','Η':'Eta','Θ':'Theta','Ι':'Iota','Κ':'Kappa','Λ':'Lambda','Μ':'Mu','�':'Nu','Ξ':'Xi','Ο':'Omicron','Π':'Pi','Ρ':'Rho','Σ':'Sigma','Τ':'Tau','Υ':'Upsilon','Φ':'Phi','Χ':'Chi','Ψ':'Psi','Ω':'Omega','α':'alpha','β':'beta','γ':'gamma','δ':'delta','ε':'epsilon','ζ':'zeta','η':'eta','θ':'theta','ι':'iota','κ':'kappa','λ':'lambda','μ':'mu','ν':'nu','ξ':'xi','ο':'omicron','π':'pi','�':'rho','ς':'sigmaf','σ':'sigma','τ':'tau','υ':'upsilon','φ':'phi','χ':'chi','ψ':'psi','ω':'omega','\u03d1':'thetasym','\u03d2':'upsih','\u03d6':'piv'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;}}else{FCKXHtmlEntities.Entities={};A=' ';};var C='['+A+']';if (FCKConfig.ProcessNumericEntities) C='[^ -~]|'+C;var D=FCKConfig.AdditionalNumericEntities;if (D&&D.length>0) C+='|'+FCKConfig.AdditionalNumericEntities;FCKXHtmlEntities.EntitiesRegex=new RegExp(C,'g');};
-var FCKXHtml={};FCKXHtml.CurrentJobNum=0;FCKXHtml.GetXHTML=function(A,B,C){FCKDomTools.CheckAndRemovePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);FCKXHtmlEntities.Initialize();this._NbspEntity=(FCKConfig.ProcessHTMLEntities?'nbsp':'#160');var D=FCK.IsDirty();FCKXHtml.SpecialBlocks=[];this.XML=FCKTools.CreateXmlObject('DOMDocument');this.MainNode=this.XML.appendChild(this.XML.createElement('xhtml'));FCKXHtml.CurrentJobNum++;if (B) this._AppendNode(this.MainNode,A);else this._AppendChildNodes(this.MainNode,A,false);var E=this._GetMainXmlString();this.XML=null;if (FCKBrowserInfo.IsSafari) E=E.replace(/^<xhtml.*?>/,'<xhtml>');E=E.substr(7,E.length-15).Trim();if (FCKConfig.DocType.length>0&&FCKRegexLib.HtmlDocType.test(FCKConfig.DocType)) E=E.replace(FCKRegexLib.SpaceNoClose,'>');else E=E.replace(FCKRegexLib.SpaceNoClose,' />');if (FCKConfig.ForceSimpleAmpersand) E=E.replace(FCKRegexLib.ForceSimpleAmpersand,'&');if (C) E=FCKCodeFormatter.Format(E);for (var i=0;i<FCKXHtml.SpecialBlocks.length;i++){var F=new RegExp('___FCKsi___'+i);E=E.replace(F,FCKXHtml.SpecialBlocks[i]);};E=E.replace(FCKRegexLib.GeckoEntitiesMarker,'&');if (!D) FCK.ResetIsDirty();FCKDomTools.EnforcePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);return E;};FCKXHtml._AppendAttribute=function(A,B,C){try{if (C==undefined||C==null) C='';else if (C.replace){if (FCKConfig.ForceSimpleAmpersand) C=C.replace(/&/g,'___FCKAmp___');C=C.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity);};var D=this.XML.createAttribute(B);D.value=C;A.attributes.setNamedItem(D);}catch (e){}};FCKXHtml._AppendChildNodes=function(A,B,C){var D=B.firstChild;while (D){this._AppendNode(A,D);D=D.nextSibling;};if (C&&B.tagName&&B.tagName.toLowerCase()!='pre'){FCKDomTools.TrimNode(A);if (FCKConfig.FillEmptyBlocks){var E=A.lastChild;if (E&&E.nodeType==1&&E.nodeName=='br') this._AppendEntity(A,this._NbspEntity);}};if (A.childNodes.length==0){if (C&&FCKConfig.FillEmptyBlocks){this._AppendEntity(A,this._NbspEntity);return A;};var F=A.nodeName;if (FCKListsLib.InlineChildReqElements[F]) return null;if (!FCKListsLib.EmptyElements[F]) A.appendChild(this.XML.createTextNode(''));};return A;};FCKXHtml._AppendNode=function(A,B){if (!B) return false;switch (B.nodeType){case 1:if (FCKBrowserInfo.IsGecko&&B.tagName.toLowerCase()=='br'&&B.parentNode.tagName.toLowerCase()=='pre'){var C='\r';if (B==B.parentNode.firstChild) C+='\r';return FCKXHtml._AppendNode(A,this.XML.createTextNode(C));};if (B.getAttribute('_fckfakelement')) return FCKXHtml._AppendNode(A,FCK.GetRealElement(B));if (FCKBrowserInfo.IsGecko&&(B.hasAttribute('_moz_editor_bogus_node')||B.getAttribute('type')=='_moz')){if (B.nextSibling) return false;else{B.removeAttribute('_moz_editor_bogus_node');B.removeAttribute('type');}};if (B.getAttribute('_fcktemp')) return false;var D=B.tagName.toLowerCase();if (FCKBrowserInfo.IsIE){if (B.scopeName&&B.scopeName!='HTML'&&B.scopeName!='FCK') D=B.scopeName.toLowerCase()+':'+D;}else{if (D.StartsWith('fck:')) D=D.Remove(0,4);};if (!FCKRegexLib.ElementName.test(D)) return false;if (B._fckxhtmljob&&B._fckxhtmljob==FCKXHtml.CurrentJobNum) return false;var E=this.XML.createElement(D);FCKXHtml._AppendAttributes(A,B,E,D);B._fckxhtmljob=FCKXHtml.CurrentJobNum;var F=FCKXHtml.TagProcessors[D];if (F) E=F(E,B,A);else E=this._AppendChildNodes(E,B,Boolean(FCKListsLib.NonEmptyBlockElements[D]));if (!E) return false;A.appendChild(E);break;case 3:if (B.parentNode&&B.parentNode.nodeName.IEquals('pre')) return this._AppendTextNode(A,B.nodeValue);return this._AppendTextNode(A,B.nodeValue.ReplaceNewLineChars(' '));case 8:if (FCKBrowserInfo.IsIE&&!B.innerHTML) break;try { A.appendChild(this.XML.createComment(B.nodeValue));}catch (e) {};break;default:A.appendChild(this.XML.createComment("Element not supported - Type: "+B.nodeType+" Name: "+B.nodeName));break;};return true;};FCKXHtml._AppendSpecialItem=function(A){return '___FCKsi___'+FCKXHtml.SpecialBlocks.AddItem(A);};FCKXHtml._AppendEntity=function(A,B){A.appendChild(this.XML.createTextNode('#?-:'+B+';'));};FCKXHtml._AppendTextNode=function(A,B){var C=B.length>0;if (C) A.appendChild(this.XML.createTextNode(B.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity)));return C;};function FCKXHtml_GetEntity(A){var B=FCKXHtmlEntities.Entities[A]||('#'+A.charCodeAt(0));return '#?-:'+B+';';};FCKXHtml.TagProcessors={a:function(A,B){if (B.innerHTML.Trim().length==0&&!B.name) return false;var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);};A=FCKXHtml._AppendChildNodes(A,B,false);return A;},area:function(A,B){var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (!A.attributes.getNamedItem('coords')){var D=B.getAttribute('coords',2);if (D&&D!='0,0,0') FCKXHtml._AppendAttribute(A,'coords',D);};if (!A.attributes.getNamedItem('shape')){var E=B.getAttribute('shape',2);if (E&&E.length>0) FCKXHtml._AppendAttribute(A,'shape',E.toLowerCase());}};return A;},body:function(A,B){A=FCKXHtml._AppendChildNodes(A,B,false);A.removeAttribute('spellcheck');return A;},iframe:function(A,B){var C=B.innerHTML;if (FCKBrowserInfo.IsGecko) C=FCKTools.HTMLDecode(C);C=C.replace(/\s_fcksavedurl="[^"]*"/g,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},img:function(A,B){if (!A.attributes.getNamedItem('alt')) FCKXHtml._AppendAttribute(A,'alt','');var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'src',C);if (B.style.width) A.removeAttribute('width');if (B.style.height) A.removeAttribute('height');return A;},li:function(A,B,C){if (C.nodeName.IEquals(['ul','ol'])) return FCKXHtml._AppendChildNodes(A,B,true);var D=FCKXHtml.XML.createElement('ul');B._fckxhtmljob=null;do{FCKXHtml._AppendNode(D,B);do{B=FCKDomTools.GetNextSibling(B);} while (B&&B.nodeType==3&&B.nodeValue.Trim().length==0)}	while (B&&B.nodeName.toLowerCase()=='li') return D;},ol:function(A,B,C){if (B.innerHTML.Trim().length==0) return false;var D=C.lastChild;if (D&&D.nodeType==3) D=D.previousSibling;if (D&&D.nodeName.toUpperCase()=='LI'){B._fckxhtmljob=null;FCKXHtml._AppendNode(D,B);return false;};A=FCKXHtml._AppendChildNodes(A,B);return A;},pre:function (A,B){var C=B.firstChild;if (C&&C.nodeType==3) A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem('\r\n')));FCKXHtml._AppendChildNodes(A,B,true);return A;},script:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/javascript');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(B.text)));return A;},span:function(A,B){if (B.innerHTML.length==0) return false;A=FCKXHtml._AppendChildNodes(A,B,false);return A;},style:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/css');var C=B.innerHTML;if (FCKBrowserInfo.IsIE) C=C.replace(/^(\r\n|\n|\r)/,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},title:function(A,B){A.appendChild(FCKXHtml.XML.createTextNode(FCK.EditorDocument.title));return A;}};FCKXHtml.TagProcessors.ul=FCKXHtml.TagProcessors.ol;
+var FCKLanguageManager=FCK.Language={AvailableLanguages:{af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-uk':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',is:'Icelandic',it:'Italian',ja:'Japanese',km:'Khmer',ko:'Korean',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},GetActiveLanguage:function(){if (FCKConfig.AutoDetectLanguage){var A;if (navigator.userLanguage) A=navigator.userLanguage.toLowerCase();else if (navigator.language) A=navigator.language.toLowerCase();else{return FCKConfig.DefaultLanguage;};if (A.length>=5){A=A.substr(0,5);if (this.AvailableLanguages[A]) return A;};if (A.length>=2){A=A.substr(0,2);if (this.AvailableLanguages[A]) return A;}};return this.DefaultLanguage;},TranslateElements:function(A,B,C,D){var e=A.getElementsByTagName(B);var E,s;for (var i=0;i<e.length;i++){if ((E=e[i].getAttribute('fckLang'))){if ((s=FCKLang[E])){if (D) s=FCKTools.HTMLEncode(s);e[i][C]=s;}}}},TranslatePage:function(A){this.TranslateElements(A,'INPUT','value');this.TranslateElements(A,'SPAN','innerHTML');this.TranslateElements(A,'LABEL','innerHTML');this.TranslateElements(A,'OPTION','innerHTML',true);this.TranslateElements(A,'LEGEND','innerHTML');},Initialize:function(){if (this.AvailableLanguages[FCKConfig.DefaultLanguage]) this.DefaultLanguage=FCKConfig.DefaultLanguage;else this.DefaultLanguage='en';this.ActiveLanguage={};this.ActiveLanguage.Code=this.GetActiveLanguage();this.ActiveLanguage.Name=this.AvailableLanguages[this.ActiveLanguage.Code];}};
+var FCKXHtmlEntities={};FCKXHtmlEntities.Initialize=function(){if (FCKXHtmlEntities.Entities) return;var A='';var B,e;if (FCKConfig.ProcessHTMLEntities){FCKXHtmlEntities.Entities={' ':'nbsp','¡':'iexcl','¢':'cent','£':'pound','¤':'curren','¥':'yen','¦':'brvbar','§':'sect','¨':'uml','©':'copy','ª':'ordf','«':'laquo','¬':'not','­':'shy','®':'reg','¯':'macr','°':'deg','±':'plusmn','²':'sup2','³':'sup3','´':'acute','µ':'micro','¶':'para','·':'middot','¸':'cedil','¹':'sup1','º':'ordm','»':'raquo','¼':'frac14','½':'frac12','¾':'frac34','¿':'iquest','×':'times','÷':'divide','ƒ':'fnof','•':'bull','…':'hellip','′':'prime','″':'Prime','‾':'oline','�':'frasl','℘':'weierp','ℑ':'image','ℜ':'real','™':'trade','ℵ':'alefsym','�':'larr','↑':'uarr','→':'rarr','↓':'darr','↔':'harr','↵':'crarr','�':'lArr','⇑':'uArr','⇒':'rArr','⇓':'dArr','⇔':'hArr','∀':'forall','∂':'part','∃':'exist','∅':'empty','∇':'nabla','∈':'isin','∉':'notin','∋':'ni','�':'prod','∑':'sum','−':'minus','∗':'lowast','√':'radic','�':'prop','∞':'infin','∠':'ang','∧':'and','∨':'or','∩':'cap','∪':'cup','∫':'int','∴':'there4','∼':'sim','≅':'cong','≈':'asymp','≠':'ne','≡':'equiv','≤':'le','≥':'ge','⊂':'sub','⊃':'sup','⊄':'nsub','⊆':'sube','⊇':'supe','⊕':'oplus','⊗':'otimes','⊥':'perp','⋅':'sdot','\u2308':'lceil','\u2309':'rceil','\u230a':'lfloor','\u230b':'rfloor','\u2329':'lang','\u232a':'rang','◊':'loz','♠':'spades','♣':'clubs','♥':'hearts','♦':'diams','"':'quot','>':'gt','ˆ':'circ','˜':'tilde',' ':'ensp',' ':'emsp',' ':'thinsp','‌':'zwnj','�':'zwj','‎':'lrm','�':'rlm','–':'ndash','—':'mdash','‘':'lsquo','’':'rsquo','‚':'sbquo','“':'ldquo','�':'rdquo','„':'bdquo','†':'dagger','‡':'Dagger','‰':'permil','‹':'lsaquo','›':'rsaquo','€':'euro'};for (e in FCKXHtmlEntities.Entities) A+=e;if (FCKConfig.IncludeLatinEntities){B={'À':'Agrave','�':'Aacute','Â':'Acirc','Ã':'Atilde','Ä':'Auml','Å':'Aring','Æ':'AElig','Ç':'Ccedil','È':'Egrave','É':'Eacute','Ê':'Ecirc','Ë':'Euml','Ì':'Igrave','�':'Iacute','Î':'Icirc','�':'Iuml','�':'ETH','Ñ':'Ntilde','Ò':'Ograve','Ó':'Oacute','Ô':'Ocirc','Õ':'Otilde','Ö':'Ouml','Ø':'Oslash','Ù':'Ugrave','Ú':'Uacute','Û':'Ucirc','Ü':'Uuml','�':'Yacute','Þ':'THORN','ß':'szlig','à':'agrave','á':'aacute','â':'acirc','ã':'atilde','ä':'auml','å':'aring','æ':'aelig','ç':'ccedil','è':'egrave','é':'eacute','ê':'ecirc','ë':'euml','ì':'igrave','í':'iacute','î':'icirc','ï':'iuml','ð':'eth','ñ':'ntilde','ò':'ograve','ó':'oacute','ô':'ocirc','õ':'otilde','ö':'ouml','ø':'oslash','ù':'ugrave','ú':'uacute','û':'ucirc','ü':'uuml','ý':'yacute','þ':'thorn','ÿ':'yuml','Œ':'OElig','œ':'oelig','Š':'Scaron','š':'scaron','Ÿ':'Yuml'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;};if (FCKConfig.IncludeGreekEntities){B={'Α':'Alpha','Β':'Beta','Γ':'Gamma','Δ':'Delta','Ε':'Epsilon','Ζ':'Zeta','Η':'Eta','Θ':'Theta','Ι':'Iota','Κ':'Kappa','Λ':'Lambda','Μ':'Mu','�':'Nu','Ξ':'Xi','Ο':'Omicron','Π':'Pi','Ρ':'Rho','Σ':'Sigma','Τ':'Tau','Υ':'Upsilon','Φ':'Phi','Χ':'Chi','Ψ':'Psi','Ω':'Omega','α':'alpha','β':'beta','γ':'gamma','δ':'delta','ε':'epsilon','ζ':'zeta','η':'eta','θ':'theta','ι':'iota','κ':'kappa','λ':'lambda','μ':'mu','ν':'nu','ξ':'xi','ο':'omicron','π':'pi','�':'rho','ς':'sigmaf','σ':'sigma','τ':'tau','υ':'upsilon','φ':'phi','χ':'chi','ψ':'psi','ω':'omega','\u03d1':'thetasym','\u03d2':'upsih','\u03d6':'piv'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;}}else{FCKXHtmlEntities.Entities={'>':'gt'};A='>';A+=' ';};var C='['+A+']';if (FCKConfig.ProcessNumericEntities) C='[^ -~]|'+C;var D=FCKConfig.AdditionalNumericEntities;if (D&&D.length>0) C+='|'+FCKConfig.AdditionalNumericEntities;FCKXHtmlEntities.EntitiesRegex=new RegExp(C,'g');};
+var FCKXHtml={};FCKXHtml.CurrentJobNum=0;FCKXHtml.GetXHTML=function(A,B,C){FCKDomTools.CheckAndRemovePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);FCKXHtmlEntities.Initialize();this._NbspEntity=(FCKConfig.ProcessHTMLEntities?'nbsp':'#160');var D=FCK.IsDirty();FCKXHtml.SpecialBlocks=[];this.XML=FCKTools.CreateXmlObject('DOMDocument');this.MainNode=this.XML.appendChild(this.XML.createElement('xhtml'));FCKXHtml.CurrentJobNum++;if (B) this._AppendNode(this.MainNode,A);else this._AppendChildNodes(this.MainNode,A,false);var E=this._GetMainXmlString();this.XML=null;if (FCKBrowserInfo.IsSafari) E=E.replace(/^<xhtml.*?>/,'<xhtml>');E=E.substr(7,E.length-15).Trim();if (FCKConfig.DocType.length>0&&FCKRegexLib.HtmlDocType.test(FCKConfig.DocType)) E=E.replace(FCKRegexLib.SpaceNoClose,'>');else E=E.replace(FCKRegexLib.SpaceNoClose,' />');if (FCKConfig.ForceSimpleAmpersand) E=E.replace(FCKRegexLib.ForceSimpleAmpersand,'&');if (C) E=FCKCodeFormatter.Format(E);for (var i=0;i<FCKXHtml.SpecialBlocks.length;i++){var F=new RegExp('___FCKsi___'+i);E=E.replace(F,FCKXHtml.SpecialBlocks[i]);};E=E.replace(FCKRegexLib.GeckoEntitiesMarker,'&');if (!D) FCK.ResetIsDirty();FCKDomTools.EnforcePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);return E;};FCKXHtml._AppendAttribute=function(A,B,C){try{if (C==undefined||C==null) C='';else if (C.replace){if (FCKConfig.ForceSimpleAmpersand) C=C.replace(/&/g,'___FCKAmp___');C=C.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity);};var D=this.XML.createAttribute(B);D.value=C;A.attributes.setNamedItem(D);}catch (e){}};FCKXHtml._AppendChildNodes=function(A,B,C){var D=B.firstChild;while (D){this._AppendNode(A,D);D=D.nextSibling;};if (C&&B.tagName&&B.tagName.toLowerCase()!='pre'){FCKDomTools.TrimNode(A);if (FCKConfig.FillEmptyBlocks){var E=A.lastChild;if (E&&E.nodeType==1&&E.nodeName=='br') this._AppendEntity(A,this._NbspEntity);}};if (A.childNodes.length==0){if (C&&FCKConfig.FillEmptyBlocks){this._AppendEntity(A,this._NbspEntity);return A;};var F=A.nodeName;if (FCKListsLib.InlineChildReqElements[F]) return null;if (!FCKListsLib.EmptyElements[F]) A.appendChild(this.XML.createTextNode(''));};return A;};FCKXHtml._AppendNode=function(A,B){if (!B) return false;switch (B.nodeType){case 1:if (FCKBrowserInfo.IsGecko&&B.tagName.toLowerCase()=='br'&&B.parentNode.tagName.toLowerCase()=='pre'){var C='\r';if (B==B.parentNode.firstChild) C+='\r';return FCKXHtml._AppendNode(A,this.XML.createTextNode(C));};if (B.getAttribute('_fckfakelement')) return FCKXHtml._AppendNode(A,FCK.GetRealElement(B));if (FCKBrowserInfo.IsGecko&&(B.hasAttribute('_moz_editor_bogus_node')||B.getAttribute('type')=='_moz')){if (B.nextSibling) return false;else{B.removeAttribute('_moz_editor_bogus_node');B.removeAttribute('type');}};if (B.getAttribute('_fcktemp')) return false;var D=B.tagName.toLowerCase();if (FCKBrowserInfo.IsIE){if (B.scopeName&&B.scopeName!='HTML'&&B.scopeName!='FCK') D=B.scopeName.toLowerCase()+':'+D;}else{if (D.StartsWith('fck:')) D=D.Remove(0,4);};if (!FCKRegexLib.ElementName.test(D)) return false;if (B._fckxhtmljob&&B._fckxhtmljob==FCKXHtml.CurrentJobNum) return false;var E=this.XML.createElement(D);FCKXHtml._AppendAttributes(A,B,E,D);B._fckxhtmljob=FCKXHtml.CurrentJobNum;var F=FCKXHtml.TagProcessors[D];if (F) E=F(E,B,A);else E=this._AppendChildNodes(E,B,Boolean(FCKListsLib.NonEmptyBlockElements[D]));if (!E) return false;A.appendChild(E);break;case 3:if (B.parentNode&&B.parentNode.nodeName.IEquals('pre')) return this._AppendTextNode(A,B.nodeValue);return this._AppendTextNode(A,B.nodeValue.ReplaceNewLineChars(' '));case 8:if (FCKBrowserInfo.IsIE&&!B.innerHTML) break;try { A.appendChild(this.XML.createComment(B.nodeValue));}catch (e) {};break;default:A.appendChild(this.XML.createComment("Element not supported - Type: "+B.nodeType+" Name: "+B.nodeName));break;};return true;};FCKXHtml._AppendSpecialItem=function(A){return '___FCKsi___'+(FCKXHtml.SpecialBlocks.push(A)-1);};FCKXHtml._AppendEntity=function(A,B){A.appendChild(this.XML.createTextNode('#?-:'+B+';'));};FCKXHtml._AppendTextNode=function(A,B){var C=B.length>0;if (C) A.appendChild(this.XML.createTextNode(B.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity)));return C;};function FCKXHtml_GetEntity(A){var B=FCKXHtmlEntities.Entities[A]||('#'+A.charCodeAt(0));return '#?-:'+B+';';};FCKXHtml.TagProcessors={a:function(A,B){if (B.innerHTML.Trim().length==0&&!B.name) return false;var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);};A=FCKXHtml._AppendChildNodes(A,B,false);return A;},area:function(A,B){var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (!A.attributes.getNamedItem('coords')){var D=B.getAttribute('coords',2);if (D&&D!='0,0,0') FCKXHtml._AppendAttribute(A,'coords',D);};if (!A.attributes.getNamedItem('shape')){var E=B.getAttribute('shape',2);if (E&&E.length>0) FCKXHtml._AppendAttribute(A,'shape',E.toLowerCase());}};return A;},body:function(A,B){A=FCKXHtml._AppendChildNodes(A,B,false);A.removeAttribute('spellcheck');return A;},iframe:function(A,B){var C=B.innerHTML;if (FCKBrowserInfo.IsGecko) C=FCKTools.HTMLDecode(C);C=C.replace(/\s_fcksavedurl="[^"]*"/g,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},img:function(A,B){if (!A.attributes.getNamedItem('alt')) FCKXHtml._AppendAttribute(A,'alt','');var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'src',C);if (B.style.width) A.removeAttribute('width');if (B.style.height) A.removeAttribute('height');return A;},li:function(A,B,C){if (C.nodeName.IEquals(['ul','ol'])) return FCKXHtml._AppendChildNodes(A,B,true);var D=FCKXHtml.XML.createElement('ul');B._fckxhtmljob=null;do{FCKXHtml._AppendNode(D,B);do{B=FCKDomTools.GetNextSibling(B);} while (B&&B.nodeType==3&&B.nodeValue.Trim().length==0)}	while (B&&B.nodeName.toLowerCase()=='li') return D;},ol:function(A,B,C){if (B.innerHTML.Trim().length==0) return false;var D=C.lastChild;if (D&&D.nodeType==3) D=D.previousSibling;if (D&&D.nodeName.toUpperCase()=='LI'){B._fckxhtmljob=null;FCKXHtml._AppendNode(D,B);return false;};A=FCKXHtml._AppendChildNodes(A,B);return A;},pre:function (A,B){var C=B.firstChild;if (C&&C.nodeType==3) A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem('\r\n')));FCKXHtml._AppendChildNodes(A,B,true);return A;},script:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/javascript');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(B.text)));return A;},span:function(A,B){if (B.innerHTML.length==0) return false;A=FCKXHtml._AppendChildNodes(A,B,false);return A;},style:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/css');var C=B.innerHTML;if (FCKBrowserInfo.IsIE) C=C.replace(/^(\r\n|\n|\r)/,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},title:function(A,B){A.appendChild(FCKXHtml.XML.createTextNode(FCK.EditorDocument.title));return A;}};FCKXHtml.TagProcessors.ul=FCKXHtml.TagProcessors.ol;
 FCKXHtml._GetMainXmlString=function(){return this.MainNode.xml;};FCKXHtml._AppendAttributes=function(A,B,C,D){var E=B.attributes,bHasStyle;for (var n=0;n<E.length;n++){var F=E[n];if (F.specified){var G=F.nodeName.toLowerCase();var H;if (G.StartsWith('_fck')) continue;else if (G=='style'){bHasStyle=true;continue;}else if (G=='class'){H=F.nodeValue.replace(FCKRegexLib.FCK_Class,'');if (H.length==0) continue;}else if (G.indexOf('on')==0) H=F.nodeValue;else if (D=='body'&&G=='contenteditable') continue;else if (F.nodeValue===true) H=G;else{try{H=B.getAttribute(G,2);}catch (e) {}};this._AppendAttribute(C,G,H||F.nodeValue);}};if (bHasStyle||B.style.cssText.length>0){var I=FCKTools.ProtectFormStyles(B);var J=B.style.cssText.replace(FCKRegexLib.StyleProperties,FCKTools.ToLowerCase);FCKTools.RestoreFormStyles(B,I);this._AppendAttribute(C,'style',J);}};FCKXHtml.TagProcessors['div']=function(A,B){if (B.align.length>0) FCKXHtml._AppendAttribute(A,'align',B.align);A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['font']=function(A,B){if (A.attributes.length==0) A=FCKXHtml.XML.createDocumentFragment();A=FCKXHtml._AppendChildNodes(A,B);return A;};FCKXHtml.TagProcessors['form']=function(A,B){if (B.acceptCharset&&B.acceptCharset.length>0&&B.acceptCharset!='UNKNOWN') FCKXHtml._AppendAttribute(A,'accept-charset',B.acceptCharset);var C=B.attributes['name'];if (C&&C.value.length>0) FCKXHtml._AppendAttribute(A,'name',C.value);A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['input']=function(A,B){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);if (B.value&&!A.attributes.getNamedItem('value')) FCKXHtml._AppendAttribute(A,'value',B.value);if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text');return A;};FCKXHtml.TagProcessors['label']=function(A,B){if (B.htmlFor.length>0) FCKXHtml._AppendAttribute(A,'for',B.htmlFor);A=FCKXHtml._AppendChildNodes(A,B);return A;};FCKXHtml.TagProcessors['map']=function(A,B){if (!A.attributes.getNamedItem('name')){var C=B.name;if (C) FCKXHtml._AppendAttribute(A,'name',C);};A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['meta']=function(A,B){var C=A.attributes.getNamedItem('http-equiv');if (C==null||C.value.length==0){var D=B.outerHTML.match(FCKRegexLib.MetaHttpEquiv);if (D){D=D[1];FCKXHtml._AppendAttribute(A,'http-equiv',D);}};return A;};FCKXHtml.TagProcessors['option']=function(A,B){if (B.selected&&!A.attributes.getNamedItem('selected')) FCKXHtml._AppendAttribute(A,'selected','selected');A=FCKXHtml._AppendChildNodes(A,B);return A;};FCKXHtml.TagProcessors['textarea']=FCKXHtml.TagProcessors['select']=function(A,B){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);A=FCKXHtml._AppendChildNodes(A,B);return A;};
-var FCKCodeFormatter={};FCKCodeFormatter.Init=function(){var A=this.Regex={};A.BlocksOpener=/\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.BlocksCloser=/\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.NewLineTags=/\<(BR|HR)[^\>]*\>/gi;A.MainTags=/\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi;A.LineSplitter=/\s*\n+\s*/g;A.IncreaseIndent=/^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i;A.DecreaseIndent=/^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i;A.FormatIndentatorRemove=new RegExp('^'+FCKConfig.FormatIndentator);A.ProtectedTags=/(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi;};FCKCodeFormatter._ProtectData=function(A,B,C,D){return B+'___FCKpd___'+FCKCodeFormatter.ProtectedData.AddItem(C)+D;};FCKCodeFormatter.Format=function(A){if (!this.Regex) this.Init();FCKCodeFormatter.ProtectedData=[];var B=A.replace(this.Regex.ProtectedTags,FCKCodeFormatter._ProtectData);B=B.replace(this.Regex.BlocksOpener,'\n$&');B=B.replace(this.Regex.BlocksCloser,'$&\n');B=B.replace(this.Regex.NewLineTags,'$&\n');B=B.replace(this.Regex.MainTags,'\n$&\n');var C='';var D=B.split(this.Regex.LineSplitter);B='';for (var i=0;i<D.length;i++){var E=D[i];if (E.length==0) continue;if (this.Regex.DecreaseIndent.test(E)) C=C.replace(this.Regex.FormatIndentatorRemove,'');B+=C+E+'\n';if (this.Regex.IncreaseIndent.test(E)) C+=FCKConfig.FormatIndentator;};for (var j=0;j<FCKCodeFormatter.ProtectedData.length;j++){var F=new RegExp('___FCKpd___'+j);B=B.replace(F,FCKCodeFormatter.ProtectedData[j].replace(/\$/g,'$$$$'));};return B.Trim();};
+var FCKCodeFormatter={};FCKCodeFormatter.Init=function(){var A=this.Regex={};A.BlocksOpener=/\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.BlocksCloser=/\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.NewLineTags=/\<(BR|HR)[^\>]*\>/gi;A.MainTags=/\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi;A.LineSplitter=/\s*\n+\s*/g;A.IncreaseIndent=/^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \/\>]/i;A.DecreaseIndent=/^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \>]/i;A.FormatIndentatorRemove=new RegExp('^'+FCKConfig.FormatIndentator);A.ProtectedTags=/(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi;};FCKCodeFormatter._ProtectData=function(A,B,C,D){return B+'___FCKpd___'+(FCKCodeFormatter.ProtectedData.push(C)-1)+D;};FCKCodeFormatter.Format=function(A){if (!this.Regex) this.Init();FCKCodeFormatter.ProtectedData=[];var B=A.replace(this.Regex.ProtectedTags,FCKCodeFormatter._ProtectData);B=B.replace(this.Regex.BlocksOpener,'\n$&');B=B.replace(this.Regex.BlocksCloser,'$&\n');B=B.replace(this.Regex.NewLineTags,'$&\n');B=B.replace(this.Regex.MainTags,'\n$&\n');var C='';var D=B.split(this.Regex.LineSplitter);B='';for (var i=0;i<D.length;i++){var E=D[i];if (E.length==0) continue;if (this.Regex.DecreaseIndent.test(E)) C=C.replace(this.Regex.FormatIndentatorRemove,'');B+=C+E+'\n';if (this.Regex.IncreaseIndent.test(E)) C+=FCKConfig.FormatIndentator;};for (var j=0;j<FCKCodeFormatter.ProtectedData.length;j++){var F=new RegExp('___FCKpd___'+j);B=B.replace(F,FCKCodeFormatter.ProtectedData[j].replace(/\$/g,'$$$$'));};return B.Trim();};
 var FCKUndo={};FCKUndo.SavedData=[];FCKUndo.CurrentIndex=-1;FCKUndo.TypesCount=0;FCKUndo.Changed=false;FCKUndo.MaxTypes=25;FCKUndo.Typing=false;FCKUndo.SaveLocked=false;FCKUndo._GetBookmark=function(){FCKSelection.Restore();var A=new FCKDomRange(FCK.EditorWindow);try{A.MoveToSelection();}catch (e){return null;};if (FCKBrowserInfo.IsIE){var B=A.CreateBookmark();var C=FCK.EditorDocument.body.innerHTML;A.MoveToBookmark(B);return [B,C];};return A.CreateBookmark2();};FCKUndo._SelectBookmark=function(A){if (!A) return;var B=new FCKDomRange(FCK.EditorWindow);if (A instanceof Object){if (FCKBrowserInfo.IsIE) B.MoveToBookmark(A[0]);else B.MoveToBookmark2(A);try{B.Select();}catch (e){B.MoveToPosition(FCK.EditorDocument.body,4);B.Select();}}};FCKUndo._CompareCursors=function(A,B){for (var i=0;i<Math.min(A.length,B.length);i++){if (A[i]<B[i]) return-1;else if (A[i]>B[i]) return 1;};if (A.length<B.length) return-1;else if (A.length>B.length) return 1;return 0;};FCKUndo._CheckIsBookmarksEqual=function(A,B){if (!(A&&B)) return false;if (FCKBrowserInfo.IsIE){var C=A[1].search(A[0].StartId);var D=B[1].search(B[0].StartId);var E=A[1].search(A[0].EndId);var F=B[1].search(B[0].EndId);return C==D&&E==F;}else{return this._CompareCursors(A.Start,B.Start)==0&&this._CompareCursors(A.End,B.End)==0;}};FCKUndo.SaveUndoStep=function(){if (FCK.EditMode!=0||this.SaveLocked) return;if (this.SavedData.length) this.Changed=true;var A=FCK.EditorDocument.body.innerHTML;var B=this._GetBookmark();this.SavedData=this.SavedData.slice(0,this.CurrentIndex+1);if (this.CurrentIndex>0&&A==this.SavedData[this.CurrentIndex][0]&&this._CheckIsBookmarksEqual(B,this.SavedData[this.CurrentIndex][1])) return;else if (this.CurrentIndex==0&&this.SavedData.length&&A==this.SavedData[0][0]){this.SavedData[0][1]=B;return;};if (this.CurrentIndex+1>=FCKConfig.MaxUndoLevels) this.SavedData.shift();else this.CurrentIndex++;this.SavedData[this.CurrentIndex]=[A,B];FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.CheckUndoState=function(){return (this.Changed||this.CurrentIndex>0);};FCKUndo.CheckRedoState=function(){return (this.CurrentIndex<(this.SavedData.length-1));};FCKUndo.Undo=function(){if (this.CheckUndoState()){if (this.CurrentIndex==(this.SavedData.length-1)){this.SaveUndoStep();};this._ApplyUndoLevel(--this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo.Redo=function(){if (this.CheckRedoState()){this._ApplyUndoLevel(++this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo._ApplyUndoLevel=function(A){var B=this.SavedData[A];if (!B) return;if (FCKBrowserInfo.IsIE){if (B[1]&&B[1][1]) FCK.SetInnerHtml(B[1][1]);else FCK.SetInnerHtml(B[0]);}else FCK.EditorDocument.body.innerHTML=B[0];this._SelectBookmark(B[1]);this.TypesCount=0;this.Changed=false;this.Typing=false;};
 var FCKEditingArea=function(A){this.TargetElement=A;this.Mode=0;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKEditingArea_Cleanup);};FCKEditingArea.prototype.Start=function(A,B){var C=this.TargetElement;var D=FCKTools.GetElementDocument(C);while(C.firstChild) C.removeChild(C.firstChild);if (this.Mode==0){if (FCK_IS_CUSTOM_DOMAIN) A='<script>document.domain="'+FCK_RUNTIME_DOMAIN+'";</script>'+A;if (FCKBrowserInfo.IsIE) A=A.replace(/(<base[^>]*?)\s*\/?>(?!\s*<\/base>)/gi,'$1></base>');else if (!B){var E=A.match(FCKRegexLib.BeforeBody);var F=A.match(FCKRegexLib.AfterBody);if (E&&F){var G=A.substr(E[1].length,A.length-E[1].length-F[1].length);A=E[1]+'&nbsp;'+F[1];if (FCKBrowserInfo.IsGecko&&(G.length==0||FCKRegexLib.EmptyParagraph.test(G))) G='<br type="_moz">';this._BodyHTML=G;}else this._BodyHTML=A;};var H=this.IFrame=D.createElement('iframe');var I='<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>';H.frameBorder=0;H.style.width=H.style.height='100%';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A.replace(/<head>/i,'<head>'+I);H.src='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.parent._FCKHtmlToLoad );document.close() ;window.parent._FCKHtmlToLoad = null ;})() )';}else if (!FCKBrowserInfo.IsGecko){H.src='javascript:void(0)';};C.appendChild(H);this.Window=H.contentWindow;if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){var J=this.Window.document;J.open();J.write(A.replace(/<head>/i,'<head>'+I));J.close();};if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.EditingArea_Start(J,A);if (FCKBrowserInfo.IsGecko10&&!B){this.Start(A,true);return;};if (H.readyState&&H.readyState!='completed'){var K=this;setTimeout(function(){try{K.Window.document.documentElement.doScroll("left");}catch(e){setTimeout(arguments.callee,0);return;};K.Window._FCKEditingArea=K;FCKEditingArea_CompleteStart.call(K.Window);},0);}else{this.Window._FCKEditingArea=this;if (FCKBrowserInfo.IsGecko10) this.Window.setTimeout(FCKEditingArea_CompleteStart,500);else FCKEditingArea_CompleteStart.call(this.Window);}}else{var L=this.Textarea=D.createElement('textarea');L.className='SourceField';L.dir='ltr';FCKDomTools.SetElementStyles(L,{width:'100%',height:'100%',border:'none',resize:'none',outline:'none'});C.appendChild(L);L.value=A;FCKTools.RunFunction(this.OnLoad);}};function FCKEditingArea_CompleteStart(){if (!this.document.body){this.setTimeout(FCKEditingArea_CompleteStart,50);return;};var A=this._FCKEditingArea;A.Document=A.Window.document;A.MakeEditable();FCKTools.RunFunction(A.OnLoad);};FCKEditingArea.prototype.MakeEditable=function(){var A=this.Document;if (FCKBrowserInfo.IsIE){A.body.disabled=true;A.body.contentEditable=true;A.body.removeAttribute("disabled");}else{try{A.body.spellcheck=(this.FFSpellChecker!==false);if (this._BodyHTML){A.body.innerHTML=this._BodyHTML;A.body.offsetLeft;this._BodyHTML=null;};A.designMode='on';A.execCommand('enableObjectResizing',false,!FCKConfig.DisableObjectResizing);A.execCommand('enableInlineTableEditing',false,!FCKConfig.DisableFFTableHandles);}catch (e){FCKTools.AddEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);}}};function FCKEditingArea_Document_AttributeNodeModified(A){var B=A.currentTarget.contentWindow._FCKEditingArea;if (B._timer) window.clearTimeout(B._timer);B._timer=FCKTools.SetTimeout(FCKEditingArea_MakeEditableByMutation,1000,B);};function FCKEditingArea_MakeEditableByMutation(){delete this._timer;FCKTools.RemoveEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);this.MakeEditable();};FCKEditingArea.prototype.Focus=function(){try{if (this.Mode==0){if (FCKBrowserInfo.IsIE) this._FocusIE();else this.Window.focus();}else{var A=FCKTools.GetElementDocument(this.Textarea);if ((!A.hasFocus||A.hasFocus())&&A.activeElement==this.Textarea) return;this.Textarea.focus();}}catch(e) {}};FCKEditingArea.prototype._FocusIE=function(){this.Document.body.setActive();this.Window.focus();var A=this.Document.selection.createRange();var B=A.parentElement();var C=B.nodeName.toLowerCase();if (B.childNodes.length>0||!(FCKListsLib.BlockElements[C]||FCKListsLib.NonEmptyBlockElements[C])){return;};A=new FCKDomRange(this.Window);A.MoveToElementEditStart(B);A.Select();};function FCKEditingArea_Cleanup(){if (this.Document) this.Document.body.innerHTML="";this.TargetElement=null;this.IFrame=null;this.Document=null;this.Textarea=null;if (this.Window){this.Window._FCKEditingArea=null;this.Window=null;}};
 var FCKKeystrokeHandler=function(A){this.Keystrokes={};this.CancelCtrlDefaults=(A!==false);};FCKKeystrokeHandler.prototype.AttachToElement=function(A){FCKTools.AddEventListenerEx(A,'keydown',_FCKKeystrokeHandler_OnKeyDown,this);if (FCKBrowserInfo.IsGecko10||FCKBrowserInfo.IsOpera||(FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac)) FCKTools.AddEventListenerEx(A,'keypress',_FCKKeystrokeHandler_OnKeyPress,this);};FCKKeystrokeHandler.prototype.SetKeystrokes=function(){for (var i=0;i<arguments.length;i++){var A=arguments[i];if (!A) continue;if (typeof(A[0])=='object') this.SetKeystrokes.apply(this,A);else{if (A.length==1) delete this.Keystrokes[A[0]];else this.Keystrokes[A[0]]=A[1]===true?true:A;}}};function _FCKKeystrokeHandler_OnKeyDown(A,B){var C=A.keyCode||A.which;var D=0;if (A.ctrlKey||A.metaKey) D+=CTRL;if (A.shiftKey) D+=SHIFT;if (A.altKey) D+=ALT;var E=C+D;var F=B._CancelIt=false;var G=B.Keystrokes[E];if (G){if (G===true||!(B.OnKeystroke&&B.OnKeystroke.apply(B,G))) return true;F=true;};if (F||(B.CancelCtrlDefaults&&D==CTRL&&(C<33||C>40))){B._CancelIt=true;if (A.preventDefault) return A.preventDefault();A.returnValue=false;A.cancelBubble=true;return false;};return true;};function _FCKKeystrokeHandler_OnKeyPress(A,B){if (B._CancelIt){if (A.preventDefault) return A.preventDefault();return false;};return true;};
@@ -53,37 +53,37 @@ var FCKStyle=function(A){this.Element=(A.Element||'span').toLowerCase();this._St
 var FCKStyles=FCK.Styles={_Callbacks:{},_ObjectStyles:{},ApplyStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){if (A.GetType()==2) A.ApplyToObject(FCKSelection.GetSelectedElement());else A.ApplyToSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},RemoveStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){A.RemoveFromSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},AttachStyleStateChange:function(A,B,C){var D=this._Callbacks[A];if (!D) D=this._Callbacks[A]=[];D.push([B,C]);},CheckSelectionChanges:function(){var A=FCKSelection.GetBoundaryParentElement(true);if (!A) return;var B=new FCKElementPath(A);var C=this.GetStyles();for (var D in C){var E=this._Callbacks[D];if (E){var F=C[D];var G=F.CheckActive(B);if (G!=(F._LastState||null)){F._LastState=G;for (var i=0;i<E.length;i++){var H=E[i][0];var I=E[i][1];H.call(I||window,D,G);}}}}},CheckStyleInSelection:function(A){return false;},_GetRemoveFormatTagsRegex:function (){var A=new RegExp('^(?:'+FCKConfig.RemoveFormatTags.replace(/,/g,'|')+')$','i');return (this._GetRemoveFormatTagsRegex=function(){return A;})&&A;},RemoveAll:function(){var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();if (A.CheckIsCollapsed()) return;A.Expand('inline_elements');var B=A.CreateBookmark(true);var C=A.GetBookmarkNode(B,true);var D=A.GetBookmarkNode(B,false);A.Release(true);var E=this._GetRemoveFormatTagsRegex();var F=new FCKElementPath(C);var G=F.Elements;var H;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;if (E.test(H.nodeName)) FCKDomTools.BreakParent(C,H,A);};F=new FCKElementPath(D);G=F.Elements;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;elementName=H.nodeName.toLowerCase();if (E.test(H.nodeName)) FCKDomTools.BreakParent(D,H,A);};var I=FCKDomTools.GetNextSourceNode(C,true,1);while (I){if (I==D) break;var J=FCKDomTools.GetNextSourceNode(I,false,1);if (E.test(I.nodeName)) FCKDomTools.RemoveNode(I,true);else FCKDomTools.RemoveAttributes(I,FCKConfig.RemoveAttributesArray);I=J;};A.SelectBookmark(B);FCK.Events.FireEvent('OnSelectionChange');},GetStyle:function(A){return this.GetStyles()[A];},GetStyles:function(){var A=this._GetStyles;if (!A){A=this._GetStyles=FCKTools.Merge(this._LoadStylesCore(),this._LoadStylesCustom(),this._LoadStylesXml());};return A;},CheckHasObjectStyle:function(A){return!!this._ObjectStyles[A];},_LoadStylesCore:function(){var A={};var B=FCKConfig.CoreStyles;for (var C in B){var D=A['_FCK_'+C]=new FCKStyle(B[C]);D.IsCore=true;};return A;},_LoadStylesCustom:function(){var A={};var B=FCKConfig.CustomStyles;if (B){for (var C in B){var D=A[C]=new FCKStyle(B[C]);D.Name=C;}};return A;},_LoadStylesXml:function(){var A={};var B=FCKConfig.StylesXmlPath;if (!B||B.length==0) return A;var C=new FCKXml();C.LoadUrl(B);var D=FCKXml.TransformToObject(C.SelectSingleNode('Styles'));var E=D.$Style;if (!E) return A;for (var i=0;i<E.length;i++){var F=E[i];var G=(F.element||'').toLowerCase();if (G.length==0) throw('The element name is required. Error loading "'+B+'"');var H={Element:G,Attributes:{},Styles:{},Overrides:[]};var I=F.$Attribute||[];for (var j=0;j<I.length;j++){H.Attributes[I[j].name]=I[j].value;};var J=F.$Style||[];for (j=0;j<J.length;j++){H.Styles[J[j].name]=J[j].value;};var K=F.$Override;if (K){for (j=0;j<K.length;j++){var L=K[j];var M={Element:L.element};var N=L.$Attribute;if (N){M.Attributes={};for (var k=0;k<N.length;k++){var O=N[k].value||null;if (O){var P=O&&FCKRegexLib.RegExp.exec(O);if (P) O=new RegExp(P[1],P[2]||'');};M.Attributes[N[k].name]=O;}};H.Overrides.push(M);}};var Q=new FCKStyle(H);Q.Name=F.name||G;if (Q.GetType()==2) this._ObjectStyles[G]=true;A[Q.Name]=Q;};return A;}};
 var FCKListHandler={OutdentListItem:function(A){var B=A.parentNode;if (B.tagName.toUpperCase().Equals('UL','OL')){var C=FCKTools.GetElementDocument(A);var D=new FCKDocumentFragment(C);var E=D.RootNode;var F=false;var G=FCKDomTools.GetFirstChild(A,['UL','OL']);if (G){F=true;var H;while ((H=G.firstChild)) E.appendChild(G.removeChild(H));FCKDomTools.RemoveNode(G);};var I;var J=false;while ((I=A.nextSibling)){if (!F&&I.nodeType==1&&I.nodeName.toUpperCase()=='LI') J=F=true;E.appendChild(I.parentNode.removeChild(I));if (!J&&I.nodeType==1&&I.nodeName.toUpperCase().Equals('UL','OL')) FCKDomTools.RemoveNode(I,true);};var K=B.parentNode.tagName.toUpperCase();var L=(K=='LI');if (L||K.Equals('UL','OL')){if (F){var G=B.cloneNode(false);D.AppendTo(G);A.appendChild(G);}else if (L) D.InsertAfterNode(B.parentNode);else D.InsertAfterNode(B);if (L) FCKDomTools.InsertAfterNode(B.parentNode,B.removeChild(A));else FCKDomTools.InsertAfterNode(B,B.removeChild(A));}else{if (F){var N=B.cloneNode(false);D.AppendTo(N);FCKDomTools.InsertAfterNode(B,N);};var O=C.createElement(FCKConfig.EnterMode=='p'?'p':'div');FCKDomTools.MoveChildren(B.removeChild(A),O);FCKDomTools.InsertAfterNode(B,O);if (FCKConfig.EnterMode=='br'){if (FCKBrowserInfo.IsGecko) O.parentNode.insertBefore(FCKTools.CreateBogusBR(C),O);else FCKDomTools.InsertAfterNode(O,FCKTools.CreateBogusBR(C));FCKDomTools.RemoveNode(O,true);}};if (this.CheckEmptyList(B)) FCKDomTools.RemoveNode(B,true);}},CheckEmptyList:function(A){return (FCKDomTools.GetFirstChild(A,'LI')==null);},CheckListHasContents:function(A){var B=A.firstChild;while (B){switch (B.nodeType){case 1:if (!B.nodeName.IEquals('UL','LI')) return true;break;case 3:if (B.nodeValue.Trim().length>0) return true;};B=B.nextSibling;};return false;}};
 var FCKElementPath=function(A){var B=null;var C=null;var D=[];var e=A;while (e){if (e.nodeType==1){if (!this.LastElement) this.LastElement=e;var E=e.nodeName.toLowerCase();if (FCKBrowserInfo.IsIE&&e.scopeName!='HTML') E=e.scopeName.toLowerCase()+':'+E;if (!C){if (!B&&FCKListsLib.PathBlockElements[E]!=null) B=e;if (FCKListsLib.PathBlockLimitElements[E]!=null){if (!B&&E=='div'&&!FCKElementPath._CheckHasBlock(e)) B=e;else C=e;}};D.push(e);if (E=='body') break;};e=e.parentNode;};this.Block=B;this.BlockLimit=C;this.Elements=D;};FCKElementPath._CheckHasBlock=function(A){var B=A.childNodes;for (var i=0,count=B.length;i<count;i++){var C=B[i];if (C.nodeType==1&&FCKListsLib.BlockElements[C.nodeName.toLowerCase()]) return true;};return false;};
-var FCKDomRange=function(A){this.Window=A;this._Cache={};};FCKDomRange.prototype={_UpdateElementInfo:function(){var A=this._Range;if (!A) this.Release(true);else{var B=A.startContainer;var C=new FCKElementPath(B);this.StartNode=B.nodeType==3?B:B.childNodes[A.startOffset];this.StartContainer=B;this.StartBlock=C.Block;this.StartBlockLimit=C.BlockLimit;if (A.collapsed){this.EndNode=this.StartNode;this.EndContainer=this.StartContainer;this.EndBlock=this.StartBlock;this.EndBlockLimit=this.StartBlockLimit;}else{var D=A.endContainer;if (B!=D) C=new FCKElementPath(D);var E=D;if (A.endOffset==0){while (E&&!E.previousSibling) E=E.parentNode;if (E) E=E.previousSibling;}else if (E.nodeType==1) E=E.childNodes[A.endOffset-1];this.EndNode=E;this.EndContainer=D;this.EndBlock=C.Block;this.EndBlockLimit=C.BlockLimit;}};this._Cache={};},CreateRange:function(){return new FCKW3CRange(this.Window.document);},DeleteContents:function(){if (this._Range){this._Range.deleteContents();this._UpdateElementInfo();}},ExtractContents:function(){if (this._Range){var A=this._Range.extractContents();this._UpdateElementInfo();return A;};return null;},CheckIsCollapsed:function(){if (this._Range) return this._Range.collapsed;return false;},Collapse:function(A){if (this._Range) this._Range.collapse(A);this._UpdateElementInfo();},Clone:function(){var A=FCKTools.CloneObject(this);if (this._Range) A._Range=this._Range.cloneRange();return A;},MoveToNodeContents:function(A){if (!this._Range) this._Range=this.CreateRange();this._Range.selectNodeContents(A);this._UpdateElementInfo();},MoveToElementStart:function(A){this.SetStart(A,1);this.SetEnd(A,1);},MoveToElementEditStart:function(A){var B;while (A&&A.nodeType==1){if (FCKDomTools.CheckIsEditable(A)) B=A;else if (B) break;A=A.firstChild;};if (B) this.MoveToElementStart(B);},InsertNode:function(A){if (this._Range) this._Range.insertNode(A);},CheckIsEmpty:function(){if (this.CheckIsCollapsed()) return true;var A=this.Window.document.createElement('div');this._Range.cloneContents().AppendTo(A);FCKDomTools.TrimNode(A);return (A.innerHTML.length==0);},CheckStartOfBlock:function(){var A=this._Cache;var B=A.IsStartOfBlock;if (B!=undefined) return B;var C=this.StartBlock||this.StartBlockLimit;var D=this._Range.startContainer;var E=this._Range.startOffset;var F;if (E>0){if (D.nodeType==3){var G=D.nodeValue.substr(0,E).Trim();if (G.length!=0) return A.IsStartOfBlock=false;}else F=D.childNodes[E-1];};if (!F) F=FCKDomTools.GetPreviousSourceNode(D,true,null,C);while (F){switch (F.nodeType){case 1:if (!FCKListsLib.InlineChildReqElements[F.nodeName.toLowerCase()]) return A.IsStartOfBlock=false;break;case 3:if (F.nodeValue.Trim().length>0) return A.IsStartOfBlock=false;};F=FCKDomTools.GetPreviousSourceNode(F,false,null,C);};return A.IsStartOfBlock=true;},CheckEndOfBlock:function(A){var B=this._Cache.IsEndOfBlock;if (B!=undefined) return B;var C=this.EndBlock||this.EndBlockLimit;var D=this._Range.endContainer;var E=this._Range.endOffset;var F;if (D.nodeType==3){var G=D.nodeValue;if (E<G.length){G=G.substr(E);if (G.Trim().length!=0) return this._Cache.IsEndOfBlock=false;}}else F=D.childNodes[E];if (!F) F=FCKDomTools.GetNextSourceNode(D,true,null,C);var H=false;while (F){switch (F.nodeType){case 1:var I=F.nodeName.toLowerCase();if (FCKListsLib.InlineChildReqElements[I]) break;if (I=='br'&&!H){H=true;break;};return this._Cache.IsEndOfBlock=false;case 3:if (F.nodeValue.Trim().length>0) return this._Cache.IsEndOfBlock=false;};F=FCKDomTools.GetNextSourceNode(F,false,null,C);};if (A) this.Select();return this._Cache.IsEndOfBlock=true;},CreateBookmark:function(A){var B={StartId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'S',EndId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'E'};var C=this.Window.document;var D;var E;var F;if (!this.CheckIsCollapsed()){E=C.createElement('span');E.style.display='none';E.id=B.EndId;E.setAttribute('_fck_bookmark',true);E.innerHTML='&nbsp;';F=this.Clone();F.Collapse(false);F.InsertNode(E);};D=C.createElement('span');D.style.display='none';D.id=B.StartId;D.setAttribute('_fck_bookmark',true);D.innerHTML='&nbsp;';F=this.Clone();F.Collapse(true);F.InsertNode(D);if (A){B.StartNode=D;B.EndNode=E;};if (E){this.SetStart(D,4);this.SetEnd(E,3);}else this.MoveToPosition(D,4);return B;},GetBookmarkNode:function(A,B){var C=this.Window.document;if (B) return A.StartNode||C.getElementById(A.StartId);else return A.EndNode||C.getElementById(A.EndId);},MoveToBookmark:function(A,B){var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);this.SetStart(C,3);if (!B) FCKDomTools.RemoveNode(C);if (D){this.SetEnd(D,3);if (!B) FCKDomTools.RemoveNode(D);}else this.Collapse(true);this._UpdateElementInfo();},CreateBookmark2:function(){if (!this._Range) return { "Start":0,"End":0 };var A={"Start":[this._Range.startOffset],"End":[this._Range.endOffset]};var B=this._Range.startContainer.previousSibling;var C=this._Range.endContainer.previousSibling;var D=this._Range.startContainer;var E=this._Range.endContainer;while (B&&D.nodeType==3){A.Start[0]+=B.length;D=B;B=B.previousSibling;}while (C&&E.nodeType==3){A.End[0]+=C.length;E=C;C=C.previousSibling;};if (D.nodeType==1&&D.childNodes[A.Start[0]]&&D.childNodes[A.Start[0]].nodeType==3){var F=D.childNodes[A.Start[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};D=F;A.Start[0]=G;};if (E.nodeType==1&&E.childNodes[A.End[0]]&&E.childNodes[A.End[0]].nodeType==3){var F=E.childNodes[A.End[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};E=F;A.End[0]=G;};A.Start=FCKDomTools.GetNodeAddress(D,true).concat(A.Start);A.End=FCKDomTools.GetNodeAddress(E,true).concat(A.End);return A;},MoveToBookmark2:function(A){var B=FCKDomTools.GetNodeFromAddress(this.Window.document,A.Start.slice(0,-1),true);var C=FCKDomTools.GetNodeFromAddress(this.Window.document,A.End.slice(0,-1),true);this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var D=A.Start[A.Start.length-1];var E=A.End[A.End.length-1];while (B.nodeType==3&&D>B.length){if (!B.nextSibling||B.nextSibling.nodeType!=3) break;D-=B.length;B=B.nextSibling;}while (C.nodeType==3&&E>C.length){if (!C.nextSibling||C.nextSibling.nodeType!=3) break;E-=C.length;C=C.nextSibling;};this._Range.setStart(B,D);this._Range.setEnd(C,E);this._UpdateElementInfo();},MoveToPosition:function(A,B){this.SetStart(A,B);this.Collapse(true);},SetStart:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setStart(A,0);break;case 2:D.setStart(A,A.childNodes.length);break;case 3:D.setStartBefore(A);break;case 4:D.setStartAfter(A);};if (!C) this._UpdateElementInfo();},SetEnd:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setEnd(A,0);break;case 2:D.setEnd(A,A.childNodes.length);break;case 3:D.setEndBefore(A);break;case 4:D.setEndAfter(A);};if (!C) this._UpdateElementInfo();},Expand:function(A){var B,oSibling;switch (A){case 'inline_elements':if (this._Range.startOffset==0){B=this._Range.startContainer;if (B.nodeType!=1) B=B.previousSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setStartBefore(B);if (B!=B.parentNode.firstChild) break;B=B.parentNode;}}};B=this._Range.endContainer;var C=this._Range.endOffset;if ((B.nodeType==3&&C>=B.nodeValue.length)||(B.nodeType==1&&C>=B.childNodes.length)||(B.nodeType!=1&&B.nodeType!=3)){if (B.nodeType!=1) B=B.nextSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setEndAfter(B);if (B!=B.parentNode.lastChild) break;B=B.parentNode;}}};break;case 'block_contents':case 'list_contents':var D=FCKListsLib.BlockBoundaries;if (A=='list_contents'||FCKConfig.EnterMode=='br') D=FCKListsLib.ListBoundaries;if (this.StartBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents') this.SetStart(this.StartBlock,1);else{B=this._Range.startContainer;if (B.nodeType==1){var E=B.childNodes[this._Range.startOffset];if (E) B=FCKDomTools.GetPreviousSourceNode(E,true);else B=B.lastChild||B;}while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setStartBefore(B);B=B.previousSibling||B.parentNode;}};if (this.EndBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents'&&this.EndBlock.nodeName.toLowerCase()!='li') this.SetEnd(this.EndBlock,2);else{B=this._Range.endContainer;if (B.nodeType==1) B=B.childNodes[this._Range.endOffset]||B.lastChild;while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setEndAfter(B);B=B.nextSibling||B.parentNode;};if (B&&B.nodeName.toLowerCase()=='br') this._Range.setEndAfter(B);};this._UpdateElementInfo();}},SplitBlock:function(A){var B=A||FCKConfig.EnterMode;if (!this._Range) this.MoveToSelection();if (this.StartBlockLimit==this.EndBlockLimit){var C=this.StartBlock;var D=this.EndBlock;var E=null;if (B!='br'){if (!C){C=this.FixBlock(true,B);D=this.EndBlock;};if (!D) D=this.FixBlock(false,B);};var F=(C!=null&&this.CheckStartOfBlock());var G=(D!=null&&this.CheckEndOfBlock());if (!this.CheckIsEmpty()) this.DeleteContents();if (C&&D&&C==D){if (G){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(D,4);D=null;}else if (F){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(C,3);C=null;}else{this.SetEnd(C,2);var H=this.ExtractContents();D=C.cloneNode(false);D.removeAttribute('id',false);H.AppendTo(D);FCKDomTools.InsertAfterNode(C,D);this.MoveToPosition(C,4);if (FCKBrowserInfo.IsGecko&&!C.nodeName.IEquals(['ul','ol'])) FCKTools.AppendBogusBr(C);}};return {PreviousBlock:C,NextBlock:D,WasStartOfBlock:F,WasEndOfBlock:G,ElementPath:E};};return null;},FixBlock:function(A,B){var C=this.CreateBookmark();this.Collapse(A);this.Expand('block_contents');var D=this.Window.document.createElement(B);this.ExtractContents().AppendTo(D);FCKDomTools.TrimNode(D);if (FCKDomTools.CheckIsEmptyElement(D,function(element) { return element.getAttribute('_fck_bookmark')!='true';})&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);this.InsertNode(D);this.MoveToBookmark(C);return D;},Release:function(A){if (!A) this.Window=null;this.StartNode=null;this.StartContainer=null;this.StartBlock=null;this.StartBlockLimit=null;this.EndNode=null;this.EndContainer=null;this.EndBlock=null;this.EndBlockLimit=null;this._Range=null;this._Cache=null;},CheckHasRange:function(){return!!this._Range;},GetTouchedStartNode:function(){var A=this._Range;var B=A.startContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.startOffset]||B;},GetTouchedEndNode:function(){var A=this._Range;var B=A.endContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.endOffset-1]||B;}};
+var FCKDomRange=function(A){this.Window=A;this._Cache={};};FCKDomRange.prototype={_UpdateElementInfo:function(){var A=this._Range;if (!A) this.Release(true);else{var B=A.startContainer;var C=new FCKElementPath(B);this.StartNode=B.nodeType==3?B:B.childNodes[A.startOffset];this.StartContainer=B;this.StartBlock=C.Block;this.StartBlockLimit=C.BlockLimit;if (A.collapsed){this.EndNode=this.StartNode;this.EndContainer=this.StartContainer;this.EndBlock=this.StartBlock;this.EndBlockLimit=this.StartBlockLimit;}else{var D=A.endContainer;if (B!=D) C=new FCKElementPath(D);var E=D;if (A.endOffset==0){while (E&&!E.previousSibling) E=E.parentNode;if (E) E=E.previousSibling;}else if (E.nodeType==1) E=E.childNodes[A.endOffset-1];this.EndNode=E;this.EndContainer=D;this.EndBlock=C.Block;this.EndBlockLimit=C.BlockLimit;}};this._Cache={};},CreateRange:function(){return new FCKW3CRange(this.Window.document);},DeleteContents:function(){if (this._Range){this._Range.deleteContents();this._UpdateElementInfo();}},ExtractContents:function(){if (this._Range){var A=this._Range.extractContents();this._UpdateElementInfo();return A;};return null;},CheckIsCollapsed:function(){if (this._Range) return this._Range.collapsed;return false;},Collapse:function(A){if (this._Range) this._Range.collapse(A);this._UpdateElementInfo();},Clone:function(){var A=FCKTools.CloneObject(this);if (this._Range) A._Range=this._Range.cloneRange();return A;},MoveToNodeContents:function(A){if (!this._Range) this._Range=this.CreateRange();this._Range.selectNodeContents(A);this._UpdateElementInfo();},MoveToElementStart:function(A){this.SetStart(A,1);this.SetEnd(A,1);},MoveToElementEditStart:function(A){var B;while (A&&A.nodeType==1){if (FCKDomTools.CheckIsEditable(A)) B=A;else if (B) break;A=A.firstChild;};if (B) this.MoveToElementStart(B);},InsertNode:function(A){if (this._Range) this._Range.insertNode(A);},CheckIsEmpty:function(){if (this.CheckIsCollapsed()) return true;var A=this.Window.document.createElement('div');this._Range.cloneContents().AppendTo(A);FCKDomTools.TrimNode(A);return (A.innerHTML.length==0);},CheckStartOfBlock:function(){var A=this._Cache;var B=A.IsStartOfBlock;if (B!=undefined) return B;var C=this.StartBlock||this.StartBlockLimit;var D=this._Range.startContainer;var E=this._Range.startOffset;var F;if (E>0){if (D.nodeType==3){var G=D.nodeValue.substr(0,E).Trim();if (G.length!=0) return A.IsStartOfBlock=false;}else F=D.childNodes[E-1];};if (!F) F=FCKDomTools.GetPreviousSourceNode(D,true,null,C);while (F){switch (F.nodeType){case 1:if (!FCKListsLib.InlineChildReqElements[F.nodeName.toLowerCase()]) return A.IsStartOfBlock=false;break;case 3:if (F.nodeValue.Trim().length>0) return A.IsStartOfBlock=false;};F=FCKDomTools.GetPreviousSourceNode(F,false,null,C);};return A.IsStartOfBlock=true;},CheckEndOfBlock:function(A){var B=this._Cache.IsEndOfBlock;if (B!=undefined) return B;var C=this.EndBlock||this.EndBlockLimit;var D=this._Range.endContainer;var E=this._Range.endOffset;var F;if (D.nodeType==3){var G=D.nodeValue;if (E<G.length){G=G.substr(E);if (G.Trim().length!=0) return this._Cache.IsEndOfBlock=false;}}else F=D.childNodes[E];if (!F) F=FCKDomTools.GetNextSourceNode(D,true,null,C);var H=false;while (F){switch (F.nodeType){case 1:var I=F.nodeName.toLowerCase();if (FCKListsLib.InlineChildReqElements[I]) break;if (I=='br'&&!H){H=true;break;};return this._Cache.IsEndOfBlock=false;case 3:if (F.nodeValue.Trim().length>0) return this._Cache.IsEndOfBlock=false;};F=FCKDomTools.GetNextSourceNode(F,false,null,C);};if (A) this.Select();return this._Cache.IsEndOfBlock=true;},CreateBookmark:function(A){var B={StartId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'S',EndId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'E'};var C=this.Window.document;var D;var E;var F;if (!this.CheckIsCollapsed()){E=C.createElement('span');E.style.display='none';E.id=B.EndId;E.setAttribute('_fck_bookmark',true);E.innerHTML='&nbsp;';F=this.Clone();F.Collapse(false);F.InsertNode(E);};D=C.createElement('span');D.style.display='none';D.id=B.StartId;D.setAttribute('_fck_bookmark',true);D.innerHTML='&nbsp;';F=this.Clone();F.Collapse(true);F.InsertNode(D);if (A){B.StartNode=D;B.EndNode=E;};if (E){this.SetStart(D,4);this.SetEnd(E,3);}else this.MoveToPosition(D,4);return B;},GetBookmarkNode:function(A,B){var C=this.Window.document;if (B) return A.StartNode||C.getElementById(A.StartId);else return A.EndNode||C.getElementById(A.EndId);},MoveToBookmark:function(A,B){var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);this.SetStart(C,3);if (!B) FCKDomTools.RemoveNode(C);if (D){this.SetEnd(D,3);if (!B) FCKDomTools.RemoveNode(D);}else this.Collapse(true);this._UpdateElementInfo();},CreateBookmark2:function(){if (!this._Range) return { "Start":0,"End":0 };var A={"Start":[this._Range.startOffset],"End":[this._Range.endOffset]};var B=this._Range.startContainer.previousSibling;var C=this._Range.endContainer.previousSibling;var D=this._Range.startContainer;var E=this._Range.endContainer;while (B&&B.nodeType==3&&D.nodeType==3){A.Start[0]+=B.length;D=B;B=B.previousSibling;}while (C&&C.nodeType==3&&E.nodeType==3){A.End[0]+=C.length;E=C;C=C.previousSibling;};if (D.nodeType==1&&D.childNodes[A.Start[0]]&&D.childNodes[A.Start[0]].nodeType==3){var F=D.childNodes[A.Start[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};D=F;A.Start[0]=G;};if (E.nodeType==1&&E.childNodes[A.End[0]]&&E.childNodes[A.End[0]].nodeType==3){var F=E.childNodes[A.End[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};E=F;A.End[0]=G;};A.Start=FCKDomTools.GetNodeAddress(D,true).concat(A.Start);A.End=FCKDomTools.GetNodeAddress(E,true).concat(A.End);return A;},MoveToBookmark2:function(A){var B=FCKDomTools.GetNodeFromAddress(this.Window.document,A.Start.slice(0,-1),true);var C=FCKDomTools.GetNodeFromAddress(this.Window.document,A.End.slice(0,-1),true);this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var D=A.Start[A.Start.length-1];var E=A.End[A.End.length-1];while (B.nodeType==3&&D>B.length){if (!B.nextSibling||B.nextSibling.nodeType!=3) break;D-=B.length;B=B.nextSibling;}while (C.nodeType==3&&E>C.length){if (!C.nextSibling||C.nextSibling.nodeType!=3) break;E-=C.length;C=C.nextSibling;};this._Range.setStart(B,D);this._Range.setEnd(C,E);this._UpdateElementInfo();},MoveToPosition:function(A,B){this.SetStart(A,B);this.Collapse(true);},SetStart:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setStart(A,0);break;case 2:D.setStart(A,A.childNodes.length);break;case 3:D.setStartBefore(A);break;case 4:D.setStartAfter(A);};if (!C) this._UpdateElementInfo();},SetEnd:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setEnd(A,0);break;case 2:D.setEnd(A,A.childNodes.length);break;case 3:D.setEndBefore(A);break;case 4:D.setEndAfter(A);};if (!C) this._UpdateElementInfo();},Expand:function(A){var B,oSibling;switch (A){case 'inline_elements':if (this._Range.startOffset==0){B=this._Range.startContainer;if (B.nodeType!=1) B=B.previousSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setStartBefore(B);if (B!=B.parentNode.firstChild) break;B=B.parentNode;}}};B=this._Range.endContainer;var C=this._Range.endOffset;if ((B.nodeType==3&&C>=B.nodeValue.length)||(B.nodeType==1&&C>=B.childNodes.length)||(B.nodeType!=1&&B.nodeType!=3)){if (B.nodeType!=1) B=B.nextSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setEndAfter(B);if (B!=B.parentNode.lastChild) break;B=B.parentNode;}}};break;case 'block_contents':case 'list_contents':var D=FCKListsLib.BlockBoundaries;if (A=='list_contents'||FCKConfig.EnterMode=='br') D=FCKListsLib.ListBoundaries;if (this.StartBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents') this.SetStart(this.StartBlock,1);else{B=this._Range.startContainer;if (B.nodeType==1){var E=B.childNodes[this._Range.startOffset];if (E) B=FCKDomTools.GetPreviousSourceNode(E,true);else B=B.lastChild||B;}while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setStartBefore(B);B=B.previousSibling||B.parentNode;}};if (this.EndBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents'&&this.EndBlock.nodeName.toLowerCase()!='li') this.SetEnd(this.EndBlock,2);else{B=this._Range.endContainer;if (B.nodeType==1) B=B.childNodes[this._Range.endOffset]||B.lastChild;while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setEndAfter(B);B=B.nextSibling||B.parentNode;};if (B&&B.nodeName.toLowerCase()=='br') this._Range.setEndAfter(B);};this._UpdateElementInfo();}},SplitBlock:function(A){var B=A||FCKConfig.EnterMode;if (!this._Range) this.MoveToSelection();if (this.StartBlockLimit==this.EndBlockLimit){var C=this.StartBlock;var D=this.EndBlock;var E=null;if (B!='br'){if (!C){C=this.FixBlock(true,B);D=this.EndBlock;};if (!D) D=this.FixBlock(false,B);};var F=(C!=null&&this.CheckStartOfBlock());var G=(D!=null&&this.CheckEndOfBlock());if (!this.CheckIsEmpty()) this.DeleteContents();if (C&&D&&C==D){if (G){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(D,4);D=null;}else if (F){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(C,3);C=null;}else{this.SetEnd(C,2);var H=this.ExtractContents();D=C.cloneNode(false);D.removeAttribute('id',false);H.AppendTo(D);FCKDomTools.InsertAfterNode(C,D);this.MoveToPosition(C,4);if (FCKBrowserInfo.IsGecko&&!C.nodeName.IEquals(['ul','ol'])) FCKTools.AppendBogusBr(C);}};return {PreviousBlock:C,NextBlock:D,WasStartOfBlock:F,WasEndOfBlock:G,ElementPath:E};};return null;},FixBlock:function(A,B){var C=this.CreateBookmark();this.Collapse(A);this.Expand('block_contents');var D=this.Window.document.createElement(B);this.ExtractContents().AppendTo(D);FCKDomTools.TrimNode(D);if (FCKDomTools.CheckIsEmptyElement(D,function(element) { return element.getAttribute('_fck_bookmark')!='true';})&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);this.InsertNode(D);this.MoveToBookmark(C);return D;},Release:function(A){if (!A) this.Window=null;this.StartNode=null;this.StartContainer=null;this.StartBlock=null;this.StartBlockLimit=null;this.EndNode=null;this.EndContainer=null;this.EndBlock=null;this.EndBlockLimit=null;this._Range=null;this._Cache=null;},CheckHasRange:function(){return!!this._Range;},GetTouchedStartNode:function(){var A=this._Range;var B=A.startContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.startOffset]||B;},GetTouchedEndNode:function(){var A=this._Range;var B=A.endContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.endOffset-1]||B;}};
 FCKDomRange.prototype.MoveToSelection=function(){this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var A=this.Window.document.selection;if (A.type!='Control'){var B=this._GetSelectionMarkerTag(true);var C=this._GetSelectionMarkerTag(false);if (!B&&!C){this._Range.setStart(this.Window.document.body,0);this._UpdateElementInfo();return;};this._Range.setStart(B.parentNode,FCKDomTools.GetIndexOf(B));B.parentNode.removeChild(B);this._Range.setEnd(C.parentNode,FCKDomTools.GetIndexOf(C));C.parentNode.removeChild(C);this._UpdateElementInfo();}else{var D=A.createRange().item(0);if (D){this._Range.setStartBefore(D);this._Range.setEndAfter(D);this._UpdateElementInfo();}}};FCKDomRange.prototype.Select=function(A){if (this._Range) this.SelectBookmark(this.CreateBookmark(true),A);};FCKDomRange.prototype.SelectBookmark=function(A,B){var C=this.CheckIsCollapsed();var D;var E;var F=this.GetBookmarkNode(A,true);if (!F) return;var G;if (!C) G=this.GetBookmarkNode(A,false);var H=this.Window.document.body.createTextRange();H.moveToElementText(F);H.moveStart('character',1);if (G){var I=this.Window.document.body.createTextRange();I.moveToElementText(G);H.setEndPoint('EndToEnd',I);H.moveEnd('character',-1);}else{D=(B||!F.previousSibling||F.previousSibling.nodeName.toLowerCase()=='br')&&!F.nextSibing;E=this.Window.document.createElement('span');E.innerHTML='&#65279;';F.parentNode.insertBefore(E,F);if (D){F.parentNode.insertBefore(this.Window.document.createTextNode('\ufeff'),F);}};if (!this._Range) this._Range=this.CreateRange();this._Range.setStartBefore(F);F.parentNode.removeChild(F);if (C){if (D){H.moveStart('character',-1);H.select();this.Window.document.selection.clear();}else H.select();FCKDomTools.RemoveNode(E);}else{this._Range.setEndBefore(G);G.parentNode.removeChild(G);H.select();}};FCKDomRange.prototype._GetSelectionMarkerTag=function(A){var B=this.Window.document;var C=B.selection;var D;try{D=C.createRange();}catch (e){return null;};if (D.parentElement().document!=B) return null;D.collapse(A===true);var E='fck_dom_range_temp_'+(new Date()).valueOf()+'_'+Math.floor(Math.random()*1000);D.pasteHTML('<span id="'+E+'"></span>');return B.getElementById(E);};
-var FCKDomRangeIterator=function(A){this.Range=A;this.ForceBrBreak=false;this.EnforceRealBlocks=false;};FCKDomRangeIterator.CreateFromSelection=function(A){var B=new FCKDomRange(A);B.MoveToSelection();return new FCKDomRangeIterator(B);};FCKDomRangeIterator.prototype={GetNextParagraph:function(){var A;var B;var C;var D;var E;var F=this.ForceBrBreak?FCKListsLib.ListBoundaries:FCKListsLib.BlockBoundaries;if (!this._LastNode){var B=this.Range.Clone();B.Expand(this.ForceBrBreak?'list_contents':'block_contents');this._NextNode=B.GetTouchedStartNode();this._LastNode=B.GetTouchedEndNode();B=null;};var H=this._NextNode;var I=this._LastNode;this._NextNode=null;while (H){var J=false;var K=(H.nodeType!=1);var L=false;if (!K){var M=H.nodeName.toLowerCase();if (F[M]&&(!FCKBrowserInfo.IsIE||H.scopeName=='HTML')){if (M=='br') K=true;else if (!B&&H.childNodes.length==0&&M!='hr'){A=H;C=H==I;break;};if (B){B.SetEnd(H,3,true);if (M!='br') this._NextNode=FCKDomTools.GetNextSourceNode(H,true,null,I);};J=true;}else{if (H.firstChild){if (!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};H=H.firstChild;continue;};K=true;}}else if (H.nodeType==3){if (/^[\r\n\t ]+$/.test(H.nodeValue)) K=false;};if (K&&!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};C=((!J||K)&&H==I);if (B&&!J){while (!H.nextSibling&&!C){var N=H.parentNode;if (F[N.nodeName.toLowerCase()]){J=true;C=C||(N==I);break;};H=N;K=true;C=(H==I);L=true;}};if (K) B.SetEnd(H,4,true);if ((J||C)&&B){B._UpdateElementInfo();if (B.StartNode==B.EndNode&&B.StartNode.parentNode==B.StartBlockLimit&&B.StartNode.getAttribute&&B.StartNode.getAttribute('_fck_bookmark')) B=null;else break;};if (C) break;H=FCKDomTools.GetNextSourceNode(H,L,null,I);};if (!A){if (!B){this._NextNode=null;return null;};A=B.StartBlock;if (!A&&!this.EnforceRealBlocks&&B.StartBlockLimit.nodeName.IEquals('DIV','TH','TD')&&B.CheckStartOfBlock()&&B.CheckEndOfBlock()){A=B.StartBlockLimit;}else if (!A||(this.EnforceRealBlocks&&A.nodeName.toLowerCase()=='li')){A=this.Range.Window.document.createElement(FCKConfig.EnterMode=='p'?'p':'div');B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);B.InsertNode(A);D=true;E=true;}else if (A.nodeName.toLowerCase()!='li'){if (!B.CheckStartOfBlock()||!B.CheckEndOfBlock()){A=A.cloneNode(false);B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);var O=B.SplitBlock();D=!O.WasStartOfBlock;E=!O.WasEndOfBlock;B.InsertNode(A);}}else if (!C){this._NextNode=A==I?null:FCKDomTools.GetNextSourceNode(B.EndNode,true,null,I);return A;}};if (D){var P=A.previousSibling;if (P&&P.nodeType==1){if (P.nodeName.toLowerCase()=='br') P.parentNode.removeChild(P);else if (P.lastChild&&P.lastChild.nodeName.IEquals('br')) P.removeChild(P.lastChild);}};if (E){var Q=A.lastChild;if (Q&&Q.nodeType==1&&Q.nodeName.toLowerCase()=='br') A.removeChild(Q);};if (!this._NextNode) this._NextNode=(C||A==I)?null:FCKDomTools.GetNextSourceNode(A,true,null,I);return A;}};
+var FCKDomRangeIterator=function(A){this.Range=A;this.ForceBrBreak=false;this.EnforceRealBlocks=false;};FCKDomRangeIterator.CreateFromSelection=function(A){var B=new FCKDomRange(A);B.MoveToSelection();return new FCKDomRangeIterator(B);};FCKDomRangeIterator.prototype={GetNextParagraph:function(){var A;var B;var C;var D;var E;var F=this.ForceBrBreak?FCKListsLib.ListBoundaries:FCKListsLib.BlockBoundaries;if (!this._LastNode){var B=this.Range.Clone();B.Expand(this.ForceBrBreak?'list_contents':'block_contents');this._NextNode=B.GetTouchedStartNode();this._LastNode=B.GetTouchedEndNode();B=null;};var H=this._NextNode;var I=this._LastNode;this._NextNode=null;while (H){var J=false;var K=(H.nodeType!=1);var L=false;if (!K){var M=H.nodeName.toLowerCase();if (F[M]&&(!FCKBrowserInfo.IsIE||H.scopeName=='HTML')){if (M=='br') K=true;else if (!B&&H.childNodes.length==0&&M!='hr'){A=H;C=H==I;break;};if (B){B.SetEnd(H,3,true);if (M!='br') this._NextNode=FCKDomTools.GetNextSourceNode(H,true,null,I)||H;};J=true;}else{if (H.firstChild){if (!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};H=H.firstChild;continue;};K=true;}}else if (H.nodeType==3){if (/^[\r\n\t ]+$/.test(H.nodeValue)) K=false;};if (K&&!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};C=((!J||K)&&H==I);if (B&&!J){while (!H.nextSibling&&!C){var N=H.parentNode;if (F[N.nodeName.toLowerCase()]){J=true;C=C||(N==I);break;};H=N;K=true;C=(H==I);L=true;}};if (K) B.SetEnd(H,4,true);if ((J||C)&&B){B._UpdateElementInfo();if (B.StartNode==B.EndNode&&B.StartNode.parentNode==B.StartBlockLimit&&B.StartNode.getAttribute&&B.StartNode.getAttribute('_fck_bookmark')) B=null;else break;};if (C) break;H=FCKDomTools.GetNextSourceNode(H,L,null,I);};if (!A){if (!B){this._NextNode=null;return null;};A=B.StartBlock;if (!A&&!this.EnforceRealBlocks&&B.StartBlockLimit.nodeName.IEquals('DIV','TH','TD')&&B.CheckStartOfBlock()&&B.CheckEndOfBlock()){A=B.StartBlockLimit;}else if (!A||(this.EnforceRealBlocks&&A.nodeName.toLowerCase()=='li')){A=this.Range.Window.document.createElement(FCKConfig.EnterMode=='p'?'p':'div');B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);B.InsertNode(A);D=true;E=true;}else if (A.nodeName.toLowerCase()!='li'){if (!B.CheckStartOfBlock()||!B.CheckEndOfBlock()){A=A.cloneNode(false);B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);var O=B.SplitBlock();D=!O.WasStartOfBlock;E=!O.WasEndOfBlock;B.InsertNode(A);}}else if (!C){this._NextNode=A==I?null:FCKDomTools.GetNextSourceNode(B.EndNode,true,null,I);return A;}};if (D){var P=A.previousSibling;if (P&&P.nodeType==1){if (P.nodeName.toLowerCase()=='br') P.parentNode.removeChild(P);else if (P.lastChild&&P.lastChild.nodeName.IEquals('br')) P.removeChild(P.lastChild);}};if (E){var Q=A.lastChild;if (Q&&Q.nodeType==1&&Q.nodeName.toLowerCase()=='br') A.removeChild(Q);};if (!this._NextNode) this._NextNode=(C||A==I)?null:FCKDomTools.GetNextSourceNode(A,true,null,I);return A;}};
 var FCKDocumentFragment=function(A){this._Document=A;this.RootNode=A.createElement('div');};FCKDocumentFragment.prototype={AppendTo:function(A){FCKDomTools.MoveChildren(this.RootNode,A);},AppendHtml:function(A){var B=this._Document.createElement('div');B.innerHTML=A;FCKDomTools.MoveChildren(B,this.RootNode);},InsertAfterNode:function(A){var B=this.RootNode;var C;while((C=B.lastChild)) FCKDomTools.InsertAfterNode(A,B.removeChild(C));}};
 var FCKW3CRange=function(A){this._Document=A;this.startContainer=null;this.startOffset=null;this.endContainer=null;this.endOffset=null;this.collapsed=true;};FCKW3CRange.CreateRange=function(A){return new FCKW3CRange(A);};FCKW3CRange.CreateFromRange=function(A,B){var C=FCKW3CRange.CreateRange(A);C.setStart(B.startContainer,B.startOffset);C.setEnd(B.endContainer,B.endOffset);return C;};FCKW3CRange.prototype={_UpdateCollapsed:function(){this.collapsed=(this.startContainer==this.endContainer&&this.startOffset==this.endOffset);},setStart:function(A,B){this.startContainer=A;this.startOffset=B;if (!this.endContainer){this.endContainer=A;this.endOffset=B;};this._UpdateCollapsed();},setEnd:function(A,B){this.endContainer=A;this.endOffset=B;if (!this.startContainer){this.startContainer=A;this.startOffset=B;};this._UpdateCollapsed();},setStartAfter:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setStartBefore:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A));},setEndAfter:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setEndBefore:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A));},collapse:function(A){if (A){this.endContainer=this.startContainer;this.endOffset=this.startOffset;}else{this.startContainer=this.endContainer;this.startOffset=this.endOffset;};this.collapsed=true;},selectNodeContents:function(A){this.setStart(A,0);this.setEnd(A,A.nodeType==3?A.data.length:A.childNodes.length);},insertNode:function(A){var B=this.startContainer;var C=this.startOffset;if (B.nodeType==3){B.splitText(C);if (B==this.endContainer) this.setEnd(B.nextSibling,this.endOffset-this.startOffset);FCKDomTools.InsertAfterNode(B,A);return;}else{B.insertBefore(A,B.childNodes[C]||null);if (B==this.endContainer){this.endOffset++;this.collapsed=false;}}},deleteContents:function(){if (this.collapsed) return;this._ExecContentsAction(0);},extractContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(1,A);return A;},cloneContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(2,A);return A;},_ExecContentsAction:function(A,B){var C=this.startContainer;var D=this.endContainer;var E=this.startOffset;var F=this.endOffset;var G=false;var H=false;if (D.nodeType==3) D=D.splitText(F);else{if (D.childNodes.length>0){if (F>D.childNodes.length-1){D=FCKDomTools.InsertAfterNode(D.lastChild,this._Document.createTextNode(''));H=true;}else D=D.childNodes[F];}};if (C.nodeType==3){C.splitText(E);if (C==D) D=C.nextSibling;}else{if (E==0){C=C.insertBefore(this._Document.createTextNode(''),C.firstChild);G=true;}else if (E>C.childNodes.length-1){C=C.appendChild(this._Document.createTextNode(''));G=true;}else C=C.childNodes[E].previousSibling;};var I=FCKDomTools.GetParents(C);var J=FCKDomTools.GetParents(D);var i,topStart,topEnd;for (i=0;i<I.length;i++){topStart=I[i];topEnd=J[i];if (topStart!=topEnd) break;};var K,levelStartNode,levelClone,currentNode,currentSibling;if (B) K=B.RootNode;for (var j=i;j<I.length;j++){levelStartNode=I[j];if (K&&levelStartNode!=C) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==C));currentNode=levelStartNode.nextSibling;while(currentNode){if (currentNode==J[j]||currentNode==D) break;currentSibling=currentNode.nextSibling;if (A==2) K.appendChild(currentNode.cloneNode(true));else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.appendChild(currentNode);};currentNode=currentSibling;};if (K) K=levelClone;};if (B) K=B.RootNode;for (var k=i;k<J.length;k++){levelStartNode=J[k];if (A>0&&levelStartNode!=D) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==D));if (!I[k]||levelStartNode.parentNode!=I[k].parentNode){currentNode=levelStartNode.previousSibling;while(currentNode){if (currentNode==I[k]||currentNode==C) break;currentSibling=currentNode.previousSibling;if (A==2) K.insertBefore(currentNode.cloneNode(true),K.firstChild);else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.insertBefore(currentNode,K.firstChild);};currentNode=currentSibling;}};if (K) K=levelClone;};if (A==2){var L=this.startContainer;if (L.nodeType==3){L.data+=L.nextSibling.data;L.parentNode.removeChild(L.nextSibling);};var M=this.endContainer;if (M.nodeType==3&&M.nextSibling){M.data+=M.nextSibling.data;M.parentNode.removeChild(M.nextSibling);}}else{if (topStart&&topEnd&&(C.parentNode!=topStart.parentNode||D.parentNode!=topEnd.parentNode)){var N=FCKDomTools.GetIndexOf(topEnd);if (G&&topEnd.parentNode==C.parentNode) N--;this.setStart(topEnd.parentNode,N);};this.collapse(true);};if(G) C.parentNode.removeChild(C);if(H&&D.parentNode) D.parentNode.removeChild(D);},cloneRange:function(){return FCKW3CRange.CreateFromRange(this._Document,this);}};
-var FCKEnterKey=function(A,B,C,D){this.Window=A;this.EnterMode=B||'p';this.ShiftEnterMode=C||'br';var E=new FCKKeystrokeHandler(false);E._EnterKey=this;E.OnKeystroke=FCKEnterKey_OnKeystroke;E.SetKeystrokes([[13,'Enter'],[SHIFT+13,'ShiftEnter'],[8,'Backspace'],[CTRL+8,'CtrlBackspace'],[46,'Delete']]);this.TabText='';if (D>0||FCKBrowserInfo.IsSafari){while (D--) this.TabText+='\xa0';E.SetKeystrokes([9,'Tab']);};E.AttachToElement(A.document);};function FCKEnterKey_OnKeystroke(A,B){var C=this._EnterKey;try{switch (B){case 'Enter':return C.DoEnter();break;case 'ShiftEnter':return C.DoShiftEnter();break;case 'Backspace':return C.DoBackspace();break;case 'Delete':return C.DoDelete();break;case 'Tab':return C.DoTab();break;case 'CtrlBackspace':return C.DoCtrlBackspace();break;}}catch (e){};return false;};FCKEnterKey.prototype.DoEnter=function(A,B){FCKUndo.SaveUndoStep();this._HasShift=(B===true);var C=FCKSelection.GetParentElement();var D=new FCKElementPath(C);var E=A||this.EnterMode;if (E=='br'||D.Block&&D.Block.tagName.toLowerCase()=='pre') return this._ExecuteEnterBr();else return this._ExecuteEnterBlock(E);};FCKEnterKey.prototype.DoShiftEnter=function(){return this.DoEnter(this.ShiftEnterMode,true);};FCKEnterKey.prototype.DoBackspace=function(){var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};var C=B.CheckIsCollapsed();if (!C){if (FCKBrowserInfo.IsIE&&this.Window.document.selection.type.toLowerCase()=="control"){var D=this.Window.document.selection.createRange();for (var i=D.length-1;i>=0;i--){var E=D.item(i);E.parentNode.removeChild(E);};return true;};return false;};if (FCKBrowserInfo.IsIE){var F=FCKDomTools.GetPreviousSourceElement(B.StartNode,true);if (F&&F.nodeName.toLowerCase()=='br'){var G=B.Clone();G.SetStart(F,4);if (G.CheckIsEmpty()){F.parentNode.removeChild(F);return true;}}};var H=B.StartBlock;var I=B.EndBlock;if (B.StartBlockLimit==B.EndBlockLimit&&H&&I){if (!C){var J=B.CheckEndOfBlock();B.DeleteContents();if (H!=I){B.SetStart(I,1);B.SetEnd(I,1);};B.Select();A=(H==I);};if (B.CheckStartOfBlock()){var K=B.StartBlock;var L=FCKDomTools.GetPreviousSourceElement(K,true,['BODY',B.StartBlockLimit.nodeName],['UL','OL']);A=this._ExecuteBackspace(B,L,K);}else if (FCKBrowserInfo.IsGeckoLike){B.Select();}};B.Release();return A;};FCKEnterKey.prototype.DoCtrlBackspace=function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(this.Window);A.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(A,this.Window.document.body)){this._FixIESelectAllBug(A);return true;};return false;};FCKEnterKey.prototype._ExecuteBackspace=function(A,B,C){var D=false;if (!B&&C&&C.nodeName.IEquals('LI')&&C.parentNode.parentNode.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};if (B&&B.nodeName.IEquals('LI')){var E=FCKDomTools.GetLastChild(B,['UL','OL']);while (E){B=FCKDomTools.GetLastChild(E,'LI');E=FCKDomTools.GetLastChild(B,['UL','OL']);}};if (B&&C){if (C.nodeName.IEquals('LI')&&!B.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};var F=C.parentNode;var G=B.nodeName.toLowerCase();if (FCKListsLib.EmptyElements[G]!=null||G=='table'){FCKDomTools.RemoveNode(B);D=true;}else{FCKDomTools.RemoveNode(C);while (F.innerHTML.Trim().length==0){var H=F.parentNode;H.removeChild(F);F=H;};FCKDomTools.LTrimNode(C);FCKDomTools.RTrimNode(B);A.SetStart(B,2,true);A.Collapse(true);var I=A.CreateBookmark(true);if (!C.tagName.IEquals(['TABLE'])) FCKDomTools.MoveChildren(C,B);A.SelectBookmark(I);D=true;}};return D;};FCKEnterKey.prototype.DoDelete=function(){FCKUndo.SaveUndoStep();var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};if (B.CheckIsCollapsed()&&B.CheckEndOfBlock(FCKBrowserInfo.IsGeckoLike)){var C=B.StartBlock;var D=FCKTools.GetElementAscensor(C,'td');var E=FCKDomTools.GetNextSourceElement(C,true,[B.StartBlockLimit.nodeName],['UL','OL','TR'],true);if (D){var F=FCKTools.GetElementAscensor(E,'td');if (F!=D) return true;};A=this._ExecuteBackspace(B,C,E);};B.Release();return A;};FCKEnterKey.prototype.DoTab=function(){var A=new FCKDomRange(this.Window);A.MoveToSelection();var B=A._Range.startContainer;while (B){if (B.nodeType==1){var C=B.tagName.toLowerCase();if (C=="tr"||C=="td"||C=="th"||C=="tbody"||C=="table") return false;else break;};B=B.parentNode;};if (this.TabText){A.DeleteContents();A.InsertNode(this.Window.document.createTextNode(this.TabText));A.Collapse(false);A.Select();};return true;};FCKEnterKey.prototype._ExecuteEnterBlock=function(A,B){var C=B||new FCKDomRange(this.Window);var D=C.SplitBlock(A);if (D){var E=D.PreviousBlock;var F=D.NextBlock;var G=D.WasStartOfBlock;var H=D.WasEndOfBlock;if (F){if (F.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(F,F.parentNode);FCKDomTools.MoveNode(F,F.nextSibling,true);}}else if (E&&E.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(E,E.parentNode);C.MoveToElementEditStart(E.nextSibling);FCKDomTools.MoveNode(E,E.previousSibling);};if (!G&&!H){if (F.nodeName.IEquals('li')&&F.firstChild&&F.firstChild.nodeName.IEquals(['ul','ol'])) F.insertBefore(FCKTools.GetElementDocument(F).createTextNode('\xa0'),F.firstChild);if (F) C.MoveToElementEditStart(F);}else{if (G&&H&&E.tagName.toUpperCase()=='LI'){C.MoveToElementStart(E);this._OutdentWithSelection(E,C);C.Release();return true;};var I;if (E){var J=E.tagName.toUpperCase();if (!this._HasShift&&!(/^H[1-6]$/).test(J)){I=FCKDomTools.CloneElement(E);}}else if (F) I=FCKDomTools.CloneElement(F);if (!I) I=this.Window.document.createElement(A);var K=D.ElementPath;if (K){for (var i=0,len=K.Elements.length;i<len;i++){var L=K.Elements[i];if (L==K.Block||L==K.BlockLimit) break;if (FCKListsLib.InlineChildReqElements[L.nodeName.toLowerCase()]){L=FCKDomTools.CloneElement(L);FCKDomTools.MoveChildren(I,L);I.appendChild(L);}}};if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);C.InsertNode(I);if (FCKBrowserInfo.IsIE){C.MoveToElementEditStart(I);C.Select();};C.MoveToElementEditStart(G&&!H?F:I);};if (FCKBrowserInfo.IsGeckoLike) FCKDomTools.ScrollIntoView(F||I,false);C.Select();};C.Release();return true;};FCKEnterKey.prototype._ExecuteEnterBr=function(A){var B=new FCKDomRange(this.Window);B.MoveToSelection();if (B.StartBlockLimit==B.EndBlockLimit){B.DeleteContents();B.MoveToSelection();var C=B.CheckStartOfBlock();var D=B.CheckEndOfBlock();var E=B.StartBlock?B.StartBlock.tagName.toUpperCase():'';var F=this._HasShift;var G=false;if (!F&&E=='LI') return this._ExecuteEnterBlock(null,B);if (!F&&D&&(/^H[1-6]$/).test(E)){FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createElement('br'));if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createTextNode(''));B.SetStart(B.StartBlock.nextSibling,FCKBrowserInfo.IsIE?3:1);}else{var H;G=E.IEquals('pre');if (G) H=this.Window.document.createTextNode(FCKBrowserInfo.IsIE?'\r':'\n');else H=this.Window.document.createElement('br');B.InsertNode(H);if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(H,this.Window.document.createTextNode(''));if (D&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H.parentNode);if (FCKBrowserInfo.IsIE) B.SetStart(H,4);else B.SetStart(H.nextSibling,1);if (!FCKBrowserInfo.IsIE){var I=null;if (FCKBrowserInfo.IsOpera) I=this.Window.document.createElement('span');else I=this.Window.document.createElement('br');H.parentNode.insertBefore(I,H.nextSibling);FCKDomTools.ScrollIntoView(I,false);I.parentNode.removeChild(I);}};B.Collapse(true);B.Select(G);};B.Release();return true;};FCKEnterKey.prototype._OutdentWithSelection=function(A,B){var C=B.CreateBookmark();FCKListHandler.OutdentListItem(A);B.MoveToBookmark(C);B.Select();};FCKEnterKey.prototype._CheckIsAllContentsIncluded=function(A,B){var C=false;var D=false;if (A.StartContainer==B||A.StartContainer==B.firstChild) C=(A._Range.startOffset==0);if (A.EndContainer==B||A.EndContainer==B.lastChild){var E=A.EndContainer.nodeType==3?A.EndContainer.length:A.EndContainer.childNodes.length;D=(A._Range.endOffset==E);};return C&&D;};FCKEnterKey.prototype._FixIESelectAllBug=function(A){var B=this.Window.document;B.body.innerHTML='';var C;if (FCKConfig.EnterMode.IEquals(['div','p'])){C=B.createElement(FCKConfig.EnterMode);B.body.appendChild(C);}else C=B.body;A.MoveToNodeContents(C);A.Collapse(true);A.Select();A.Release();};
-var FCKDocumentProcessor={};FCKDocumentProcessor._Items=[];FCKDocumentProcessor.AppendNew=function(){var A={};this._Items.AddItem(A);return A;};FCKDocumentProcessor.Process=function(A){var B=FCK.IsDirty();var C,i=0;while((C=this._Items[i++])) C.ProcessDocument(A);if (!B) FCK.ResetIsDirty();};var FCKDocumentProcessor_CreateFakeImage=function(A,B){var C=FCKTools.GetElementDocument(B).createElement('IMG');C.className=A;C.src=FCKConfig.BasePath+'images/spacer.gif';C.setAttribute('_fckfakelement','true',0);C.setAttribute('_fckrealelement',FCKTempBin.AddElement(B),0);return C;};if (FCKBrowserInfo.IsIE||FCKBrowserInfo.IsOpera){var FCKAnchorsProcessor=FCKDocumentProcessor.AppendNew();FCKAnchorsProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('A');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.name.length>0){if (C.innerHTML!==''){if (FCKBrowserInfo.IsIE) C.className+=' FCK__AnchorC';}else{var D=FCKDocumentProcessor_CreateFakeImage('FCK__Anchor',C.cloneNode(true));D.setAttribute('_fckanchor','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}}}};var FCKPageBreaksProcessor=FCKDocumentProcessor.AppendNew();FCKPageBreaksProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('DIV');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.style.pageBreakAfter=='always'&&C.childNodes.length==1&&C.childNodes[0].style&&C.childNodes[0].style.display=='none'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',C.cloneNode(true));C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor=(function(){var A=[];var B=function(el){var C=el.cloneNode(true);var D;var E=D=FCKDocumentProcessor_CreateFakeImage('FCK__UnknownObject',C);FCKEmbedAndObjectProcessor.RefreshView(E,el);for (var i=0;i<A.length;i++) D=A[i](el,D)||D;if (D!=E) FCKTempBin.RemoveElement(E.getAttribute('_fckrealelement'));el.parentNode.replaceChild(D,el);};var F=function(elementName,doc){var G=doc.getElementsByTagName(elementName);for (var i=G.length-1;i>=0;i--) B(G[i]);};var H=function(doc){F('object',doc);F('embed',doc);};return FCKTools.Merge(FCKDocumentProcessor.AppendNew(),{ProcessDocument:function(doc){if (FCKBrowserInfo.IsGecko) FCKTools.RunFunction(H,this,[doc]);else H(doc);},RefreshView:function(placeHolder,original){if (original.getAttribute('width')>0) placeHolder.style.width=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('width'));if (original.getAttribute('height')>0) placeHolder.style.height=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('height'));},AddCustomHandler:function(func){A.push(func);}});})();FCK.GetRealElement=function(A){var e=FCKTempBin.Elements[A.getAttribute('_fckrealelement')];if (A.getAttribute('_fckflash')){if (A.style.width.length>0) e.width=FCKTools.ConvertStyleSizeToHtml(A.style.width);if (A.style.height.length>0) e.height=FCKTools.ConvertStyleSizeToHtml(A.style.height);};return e;};if (FCKBrowserInfo.IsIE){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('HR');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){var D=A.createElement('hr');D.mergeAttributes(C,true);FCKDomTools.InsertAfterNode(C,D);C.parentNode.removeChild(C);}}};FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('INPUT');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.type=='hidden'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__InputHidden',C.cloneNode(true));D.setAttribute('_fckinputhidden','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor.AddCustomHandler(function(A,B){if (!(A.nodeName.IEquals('embed')&&(A.type=='application/x-shockwave-flash'||/\.swf($|#|\?)/i.test(A.src)))) return;B.className='FCK__Flash';B.setAttribute('_fckflash','true',0);});if (FCKBrowserInfo.IsSafari){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByClassName?A.getElementsByClassName('Apple-style-span'):Array.prototype.filter.call(A.getElementsByTagName('span'),function(item){ return item.className=='Apple-style-span';});for (var i=B.length-1;i>=0;i--) FCKDomTools.RemoveNode(B[i],true);}};
+var FCKEnterKey=function(A,B,C,D){this.Window=A;this.EnterMode=B||'p';this.ShiftEnterMode=C||'br';var E=new FCKKeystrokeHandler(false);E._EnterKey=this;E.OnKeystroke=FCKEnterKey_OnKeystroke;E.SetKeystrokes([[13,'Enter'],[SHIFT+13,'ShiftEnter'],[8,'Backspace'],[CTRL+8,'CtrlBackspace'],[46,'Delete']]);this.TabText='';if (D>0||FCKBrowserInfo.IsSafari){while (D--) this.TabText+='\xa0';E.SetKeystrokes([9,'Tab']);};E.AttachToElement(A.document);};function FCKEnterKey_OnKeystroke(A,B){var C=this._EnterKey;try{switch (B){case 'Enter':return C.DoEnter();break;case 'ShiftEnter':return C.DoShiftEnter();break;case 'Backspace':return C.DoBackspace();break;case 'Delete':return C.DoDelete();break;case 'Tab':return C.DoTab();break;case 'CtrlBackspace':return C.DoCtrlBackspace();break;}}catch (e){};return false;};FCKEnterKey.prototype.DoEnter=function(A,B){FCKUndo.SaveUndoStep();this._HasShift=(B===true);var C=FCKSelection.GetParentElement();var D=new FCKElementPath(C);var E=A||this.EnterMode;if (E=='br'||D.Block&&D.Block.tagName.toLowerCase()=='pre') return this._ExecuteEnterBr();else return this._ExecuteEnterBlock(E);};FCKEnterKey.prototype.DoShiftEnter=function(){return this.DoEnter(this.ShiftEnterMode,true);};FCKEnterKey.prototype.DoBackspace=function(){var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};var C=B.CheckIsCollapsed();if (!C){if (FCKBrowserInfo.IsIE&&this.Window.document.selection.type.toLowerCase()=="control"){var D=this.Window.document.selection.createRange();for (var i=D.length-1;i>=0;i--){var E=D.item(i);E.parentNode.removeChild(E);};return true;};return false;};if (FCKBrowserInfo.IsIE){var F=FCKDomTools.GetPreviousSourceElement(B.StartNode,true);if (F&&F.nodeName.toLowerCase()=='br'){var G=B.Clone();G.SetStart(F,4);if (G.CheckIsEmpty()){F.parentNode.removeChild(F);return true;}}};var H=B.StartBlock;var I=B.EndBlock;if (B.StartBlockLimit==B.EndBlockLimit&&H&&I){if (!C){var J=B.CheckEndOfBlock();B.DeleteContents();if (H!=I){B.SetStart(I,1);B.SetEnd(I,1);};B.Select();A=(H==I);};if (B.CheckStartOfBlock()){var K=B.StartBlock;var L=FCKDomTools.GetPreviousSourceElement(K,true,['BODY',B.StartBlockLimit.nodeName],['UL','OL']);A=this._ExecuteBackspace(B,L,K);}else if (FCKBrowserInfo.IsGeckoLike){B.Select();}};B.Release();return A;};FCKEnterKey.prototype.DoCtrlBackspace=function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(this.Window);A.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(A,this.Window.document.body)){this._FixIESelectAllBug(A);return true;};return false;};FCKEnterKey.prototype._ExecuteBackspace=function(A,B,C){var D=false;if (!B&&C&&C.nodeName.IEquals('LI')&&C.parentNode.parentNode.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};if (B&&B.nodeName.IEquals('LI')){var E=FCKDomTools.GetLastChild(B,['UL','OL']);while (E){B=FCKDomTools.GetLastChild(E,'LI');E=FCKDomTools.GetLastChild(B,['UL','OL']);}};if (B&&C){if (C.nodeName.IEquals('LI')&&!B.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};var F=C.parentNode;var G=B.nodeName.toLowerCase();if (FCKListsLib.EmptyElements[G]!=null||G=='table'){FCKDomTools.RemoveNode(B);D=true;}else{FCKDomTools.RemoveNode(C);while (F.innerHTML.Trim().length==0){var H=F.parentNode;H.removeChild(F);F=H;};FCKDomTools.LTrimNode(C);FCKDomTools.RTrimNode(B);A.SetStart(B,2,true);A.Collapse(true);var I=A.CreateBookmark(true);if (!C.tagName.IEquals(['TABLE'])) FCKDomTools.MoveChildren(C,B);A.SelectBookmark(I);D=true;}};return D;};FCKEnterKey.prototype.DoDelete=function(){FCKUndo.SaveUndoStep();var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};if (B.CheckIsCollapsed()&&B.CheckEndOfBlock(FCKBrowserInfo.IsGeckoLike)){var C=B.StartBlock;var D=FCKTools.GetElementAscensor(C,'td');var E=FCKDomTools.GetNextSourceElement(C,true,[B.StartBlockLimit.nodeName],['UL','OL','TR'],true);if (D){var F=FCKTools.GetElementAscensor(E,'td');if (F!=D) return true;};A=this._ExecuteBackspace(B,C,E);};B.Release();return A;};FCKEnterKey.prototype.DoTab=function(){var A=new FCKDomRange(this.Window);A.MoveToSelection();var B=A._Range.startContainer;while (B){if (B.nodeType==1){var C=B.tagName.toLowerCase();if (C=="tr"||C=="td"||C=="th"||C=="tbody"||C=="table") return false;else break;};B=B.parentNode;};if (this.TabText){A.DeleteContents();A.InsertNode(this.Window.document.createTextNode(this.TabText));A.Collapse(false);A.Select();};return true;};FCKEnterKey.prototype._ExecuteEnterBlock=function(A,B){var C=B||new FCKDomRange(this.Window);var D=C.SplitBlock(A);if (D){var E=D.PreviousBlock;var F=D.NextBlock;var G=D.WasStartOfBlock;var H=D.WasEndOfBlock;if (F){if (F.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(F,F.parentNode);FCKDomTools.MoveNode(F,F.nextSibling,true);}}else if (E&&E.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(E,E.parentNode);C.MoveToElementEditStart(E.nextSibling);FCKDomTools.MoveNode(E,E.previousSibling);};if (!G&&!H){if (F.nodeName.IEquals('li')&&F.firstChild&&F.firstChild.nodeName.IEquals(['ul','ol'])) F.insertBefore(FCKTools.GetElementDocument(F).createTextNode('\xa0'),F.firstChild);if (F) C.MoveToElementEditStart(F);}else{if (G&&H&&E.tagName.toUpperCase()=='LI'){C.MoveToElementStart(E);this._OutdentWithSelection(E,C);C.Release();return true;};var I;if (E){var J=E.tagName.toUpperCase();if (!this._HasShift&&!(/^H[1-6]$/).test(J)){I=FCKDomTools.CloneElement(E);}}else if (F) I=FCKDomTools.CloneElement(F);if (!I) I=this.Window.document.createElement(A);var K=D.ElementPath;if (K){for (var i=0,len=K.Elements.length;i<len;i++){var L=K.Elements[i];if (L==K.Block||L==K.BlockLimit) break;if (FCKListsLib.InlineChildReqElements[L.nodeName.toLowerCase()]){L=FCKDomTools.CloneElement(L);FCKDomTools.MoveChildren(I,L);I.appendChild(L);}}};if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);C.InsertNode(I);if (FCKBrowserInfo.IsIE){C.MoveToElementEditStart(I);C.Select();};C.MoveToElementEditStart(G&&!H?F:I);};if (FCKBrowserInfo.IsGeckoLike){if (F){var M=this.Window.document.createElement('span');M.innerHTML='&nbsp;';C.InsertNode(M);FCKDomTools.ScrollIntoView(M,false);C.DeleteContents();}else{FCKDomTools.ScrollIntoView(F||I,false);}};C.Select();};C.Release();return true;};FCKEnterKey.prototype._ExecuteEnterBr=function(A){var B=new FCKDomRange(this.Window);B.MoveToSelection();if (B.StartBlockLimit==B.EndBlockLimit){B.DeleteContents();B.MoveToSelection();var C=B.CheckStartOfBlock();var D=B.CheckEndOfBlock();var E=B.StartBlock?B.StartBlock.tagName.toUpperCase():'';var F=this._HasShift;var G=false;if (!F&&E=='LI') return this._ExecuteEnterBlock(null,B);if (!F&&D&&(/^H[1-6]$/).test(E)){FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createElement('br'));if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createTextNode(''));B.SetStart(B.StartBlock.nextSibling,FCKBrowserInfo.IsIE?3:1);}else{var H;G=E.IEquals('pre');if (G) H=this.Window.document.createTextNode(FCKBrowserInfo.IsIE?'\r':'\n');else H=this.Window.document.createElement('br');B.InsertNode(H);if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(H,this.Window.document.createTextNode(''));if (D&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H.parentNode);if (FCKBrowserInfo.IsIE) B.SetStart(H,4);else B.SetStart(H.nextSibling,1);if (!FCKBrowserInfo.IsIE){var I=null;if (FCKBrowserInfo.IsOpera) I=this.Window.document.createElement('span');else I=this.Window.document.createElement('br');H.parentNode.insertBefore(I,H.nextSibling);FCKDomTools.ScrollIntoView(I,false);I.parentNode.removeChild(I);}};B.Collapse(true);B.Select(G);};B.Release();return true;};FCKEnterKey.prototype._OutdentWithSelection=function(A,B){var C=B.CreateBookmark();FCKListHandler.OutdentListItem(A);B.MoveToBookmark(C);B.Select();};FCKEnterKey.prototype._CheckIsAllContentsIncluded=function(A,B){var C=false;var D=false;if (A.StartContainer==B||A.StartContainer==B.firstChild) C=(A._Range.startOffset==0);if (A.EndContainer==B||A.EndContainer==B.lastChild){var E=A.EndContainer.nodeType==3?A.EndContainer.length:A.EndContainer.childNodes.length;D=(A._Range.endOffset==E);};return C&&D;};FCKEnterKey.prototype._FixIESelectAllBug=function(A){var B=this.Window.document;B.body.innerHTML='';var C;if (FCKConfig.EnterMode.IEquals(['div','p'])){C=B.createElement(FCKConfig.EnterMode);B.body.appendChild(C);}else C=B.body;A.MoveToNodeContents(C);A.Collapse(true);A.Select();A.Release();};
+var FCKDocumentProcessor={};FCKDocumentProcessor._Items=[];FCKDocumentProcessor.AppendNew=function(){var A={};this._Items.push(A);return A;};FCKDocumentProcessor.Process=function(A){var B=FCK.IsDirty();var C,i=0;while((C=this._Items[i++])) C.ProcessDocument(A);if (!B) FCK.ResetIsDirty();};var FCKDocumentProcessor_CreateFakeImage=function(A,B){var C=FCKTools.GetElementDocument(B).createElement('IMG');C.className=A;C.src=FCKConfig.BasePath+'images/spacer.gif';C.setAttribute('_fckfakelement','true',0);C.setAttribute('_fckrealelement',FCKTempBin.AddElement(B),0);return C;};if (FCKBrowserInfo.IsIE||FCKBrowserInfo.IsOpera){var FCKAnchorsProcessor=FCKDocumentProcessor.AppendNew();FCKAnchorsProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('A');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.name.length>0){if (C.innerHTML!==''){if (FCKBrowserInfo.IsIE) C.className+=' FCK__AnchorC';}else{var D=FCKDocumentProcessor_CreateFakeImage('FCK__Anchor',C.cloneNode(true));D.setAttribute('_fckanchor','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}}}};var FCKPageBreaksProcessor=FCKDocumentProcessor.AppendNew();FCKPageBreaksProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('DIV');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.style.pageBreakAfter=='always'&&C.childNodes.length==1&&C.childNodes[0].style&&C.childNodes[0].style.display=='none'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',C.cloneNode(true));C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};var FCKEmbedAndObjectProcessor=(function(){var A=[];var B=function(el){var C=el.cloneNode(true);var D;var E=D=FCKDocumentProcessor_CreateFakeImage('FCK__UnknownObject',C);FCKEmbedAndObjectProcessor.RefreshView(E,el);for (var i=0;i<A.length;i++) D=A[i](el,D)||D;if (D!=E) FCKTempBin.RemoveElement(E.getAttribute('_fckrealelement'));el.parentNode.replaceChild(D,el);};var F=function(elementName,doc){var G=doc.getElementsByTagName(elementName);for (var i=G.length-1;i>=0;i--) B(G[i]);};var H=function(doc){F('object',doc);F('embed',doc);};return FCKTools.Merge(FCKDocumentProcessor.AppendNew(),{ProcessDocument:function(doc){if (FCKBrowserInfo.IsGecko) FCKTools.RunFunction(H,this,[doc]);else H(doc);},RefreshView:function(placeHolder,original){if (original.getAttribute('width')>0) placeHolder.style.width=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('width'));if (original.getAttribute('height')>0) placeHolder.style.height=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('height'));},AddCustomHandler:function(func){A.push(func);}});})();FCK.GetRealElement=function(A){var e=FCKTempBin.Elements[A.getAttribute('_fckrealelement')];if (A.getAttribute('_fckflash')){if (A.style.width.length>0) e.width=FCKTools.ConvertStyleSizeToHtml(A.style.width);if (A.style.height.length>0) e.height=FCKTools.ConvertStyleSizeToHtml(A.style.height);};return e;};if (FCKBrowserInfo.IsIE){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('HR');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){var D=A.createElement('hr');D.mergeAttributes(C,true);FCKDomTools.InsertAfterNode(C,D);C.parentNode.removeChild(C);}}};FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('INPUT');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.type=='hidden'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__InputHidden',C.cloneNode(true));D.setAttribute('_fckinputhidden','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor.AddCustomHandler(function(A,B){if (!(A.nodeName.IEquals('embed')&&(A.type=='application/x-shockwave-flash'||/\.swf($|#|\?)/i.test(A.src)))) return;B.className='FCK__Flash';B.setAttribute('_fckflash','true',0);});if (FCKBrowserInfo.IsSafari){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByClassName?A.getElementsByClassName('Apple-style-span'):Array.prototype.filter.call(A.getElementsByTagName('span'),function(item){ return item.className=='Apple-style-span';});for (var i=B.length-1;i>=0;i--) FCKDomTools.RemoveNode(B[i],true);}};
 var FCKSelection=FCK.Selection={GetParentBlock:function(){var A=this.GetParentElement();while (A){if (FCKListsLib.BlockBoundaries[A.nodeName.toLowerCase()]) break;A=A.parentNode;};return A;},ApplyStyle:function(A){FCKStyles.ApplyStyle(new FCKStyle(A));}};
-FCKSelection.GetType=function(){try{var A=FCKSelection.GetSelection().type;if (A=='Control'||A=='Text') return A;if (this.GetSelection().createRange().parentElement) return 'Text';}catch(e){};return 'None';};FCKSelection.GetSelectedElement=function(){if (this.GetType()=='Control'){var A=this.GetSelection().createRange();if (A&&A.item) return this.GetSelection().createRange().item(0);};return null;};FCKSelection.GetParentElement=function(){switch (this.GetType()){case 'Control':var A=FCKSelection.GetSelectedElement();return A?A.parentElement:null;case 'None':return null;default:return this.GetSelection().createRange().parentElement();}};FCKSelection.GetBoundaryParentElement=function(A){switch (this.GetType()){case 'Control':var B=FCKSelection.GetSelectedElement();return B?B.parentElement:null;case 'None':return null;default:var C=FCK.EditorDocument;var D=C.selection.createRange();D.collapse(A!==false);var B=D.parentElement();return FCKTools.GetElementDocument(B)==C?B:null;}};FCKSelection.SelectNode=function(A){FCK.Focus();this.GetSelection().empty();var B;try{B=FCK.EditorDocument.body.createControlRange();B.addElement(A);}catch(e){B=FCK.EditorDocument.body.createTextRange();B.moveToElementText(A);};B.select();};FCKSelection.Collapse=function(A){FCK.Focus();if (this.GetType()=='Text'){var B=this.GetSelection().createRange();B.collapse(A==null||A===true);B.select();}};FCKSelection.HasAncestorNode=function(A){var B;if (this.GetSelection().type=="Control"){B=this.GetSelectedElement();}else{var C=this.GetSelection().createRange();B=C.parentElement();}while (B){if (B.nodeName.IEquals(A)) return true;B=B.parentNode;};return false;};FCKSelection.MoveToAncestorNode=function(A){var B,oRange;if (!FCK.EditorDocument) return null;if (this.GetSelection().type=="Control"){oRange=this.GetSelection().createRange();for (i=0;i<oRange.length;i++){if (oRange(i).parentNode){B=oRange(i).parentNode;break;}}}else{oRange=this.GetSelection().createRange();B=oRange.parentElement();}while (B&&B.nodeName!=A) B=B.parentNode;return B;};FCKSelection.Delete=function(){var A=this.GetSelection();if (A.type.toLowerCase()!="none"){A.clear();};return A;};FCKSelection.GetSelection=function(){this.Restore();return FCK.EditorDocument.selection;};FCKSelection.Save=function(A){if (!A) FCK.Focus();var B=FCK.EditorDocument;if (!B) return;var C=B.selection;var D;if (C){D=C.createRange();if (D){if (D.parentElement&&FCKTools.GetElementDocument(D.parentElement())!=B) D=null;else if (D.item&&FCKTools.GetElementDocument(D.item(0))!=B) D=null;}};this.SelectionData=D;};FCKSelection._GetSelectionDocument=function(A){var B=A.createRange();if (!B) return null;else if (B.item) return FCKTools.GetElementDocument(B.item(0));else return FCKTools.GetElementDocument(B.parentElement());};FCKSelection.Restore=function(){if (this.SelectionData){FCK.IsSelectionChangeLocked=true;try{if (String(this._GetSelectionDocument(FCK.EditorDocument.selection).body.contentEditable)=='true'){FCK.IsSelectionChangeLocked=false;return;};this.SelectionData.select();}catch (e) {};FCK.IsSelectionChangeLocked=false;}};FCKSelection.Release=function(){delete this.SelectionData;};
-var FCKTableHandler={};FCKTableHandler.InsertRow=function(A){var B=FCKSelection.MoveToAncestorNode('TR');if (!B) return;var C=B.cloneNode(true);B.parentNode.insertBefore(C,B);FCKTableHandler.ClearRow(A?C:B);};FCKTableHandler.DeleteRows=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();var C=[];for (var i=0;i<B.length;i++){var D=FCKTools.GetElementAscensor(B[i],'TR');C[D.rowIndex]=D;};for (var i=C.length;i>=0;i--){if (C[i]) FCKTableHandler.DeleteRows(C[i]);};return;};var E=FCKTools.GetElementAscensor(A,'TABLE');if (E.rows.length==1){FCKTableHandler.DeleteTable(E);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteTable=function(A){if (!A){A=FCKSelection.GetSelectedElement();if (!A||A.tagName!='TABLE') A=FCKSelection.MoveToAncestorNode('TABLE');};if (!A) return;FCKSelection.SelectNode(A);FCKSelection.Collapse();if (A.parentNode.childNodes.length==1) A.parentNode.parentNode.removeChild(A.parentNode);else A.parentNode.removeChild(A);};FCKTableHandler.InsertColumn=function(A){var B=null;var C=this.GetSelectedCells();if (C&&C.length) B=C[A?0:(C.length-1)];if (!B) return;var D=FCKTools.GetElementAscensor(B,'TABLE');var E=B.cellIndex;for (var i=0;i<D.rows.length;i++){var F=D.rows[i];if (F.cells.length<(E+1)) continue;B=F.cells[E].cloneNode(false);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B);var G=F.cells[E];if (A) F.insertBefore(B,G);else if (G.nextSibling) F.insertBefore(B,G.nextSibling);else F.appendChild(B);}};FCKTableHandler.DeleteColumns=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();for (var i=B.length;i>=0;i--){if (B[i]) FCKTableHandler.DeleteColumns(B[i]);};return;};if (!A) return;var C=FCKTools.GetElementAscensor(A,'TABLE');var D=A.cellIndex;for (var i=C.rows.length-1;i>=0;i--){var E=C.rows[i];if (D==0&&E.cells.length==1){FCKTableHandler.DeleteRows(E);continue;};if (E.cells[D]) E.removeChild(E.cells[D]);}};FCKTableHandler.InsertCell=function(A,B){var C=null;var D=this.GetSelectedCells();if (D&&D.length) C=D[B?0:(D.length-1)];if (!C) return null;var E=FCK.EditorDocument.createElement('TD');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(E);if (!B&&C.cellIndex==C.parentNode.cells.length-1) C.parentNode.appendChild(E);else C.parentNode.insertBefore(E,B?C:C.nextSibling);return E;};FCKTableHandler.DeleteCell=function(A){if (A.parentNode.cells.length==1){FCKTableHandler.DeleteRows(FCKTools.GetElementAscensor(A,'TR'));return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteCells=function(){var A=FCKTableHandler.GetSelectedCells();for (var i=A.length-1;i>=0;i--){FCKTableHandler.DeleteCell(A[i]);}};FCKTableHandler._MarkCells=function(A,B){for (var i=0;i<A.length;i++) A[i][B]=true;};FCKTableHandler._UnmarkCells=function(A,B){for (var i=0;i<A.length;i++){if (FCKBrowserInfo.IsIE) A[i].removeAttribute(B);else delete A[i][B];}};FCKTableHandler._ReplaceCellsByMarker=function(A,B,C){for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){if (A[i][j][B]) A[i][j]=C;}}};FCKTableHandler._GetMarkerGeometry=function(A,B,C,D){var E=0;var F=0;var G=0;var H=0;for (var i=C;A[B][i]&&A[B][i][D];i++) E++;for (var i=C-1;A[B][i]&&A[B][i][D];i--){E++;G++;};for (var i=B;A[i]&&A[i][C]&&A[i][C][D];i++) F++;for (var i=B-1;A[i]&&A[i][C]&&A[i][C][D];i--){F++;H++;};return { 'width':E,'height':F,'x':G,'y':H };};FCKTableHandler.CheckIsSelectionRectangular=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length<1) return false;this._MarkCells(A,'_CellSelected');var B=this._CreateTableMap(A[0].parentNode.parentNode);var C=A[0].parentNode.rowIndex;var D=this._GetCellIndexSpan(B,C,A[0]);var E=this._GetMarkerGeometry(B,C,D,'_CellSelected');var F=D-E.x;var G=C-E.y;if (E.width>=E.height){for (D=F;D<F+E.width;D++){C=G+(D-F) % E.height;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}}else{for (C=G;C<G+E.height;C++){D=F+(C-G) % E.width;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}};this._UnmarkCells(A,'_CellSelected');return true;};FCKTableHandler.MergeCells=function(){var A=this.GetSelectedCells();if (A.length<2) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);this._MarkCells(A,'_SelectedCells');var F=this._GetMarkerGeometry(C,D,E,'_SelectedCells');var G=E-F.x;var H=D-F.y;var I=FCKTools.GetElementDocument(B).createDocumentFragment();for (var i=0;i<F.height;i++){var J=0;for (var j=0;j<F.width;j++){var K=C[H+i][G+j];while (K.childNodes.length>0){var L=K.removeChild(K.firstChild);if (L.nodeType!=1||(L.getAttribute('type',2)!='_moz'&&L.getAttribute('_moz_dirty')!=null)){I.appendChild(L);J++;}}};if (J>0) I.appendChild(FCKTools.GetElementDocument(B).createElement('br'));};this._ReplaceCellsByMarker(C,'_SelectedCells',B);this._UnmarkCells(A,'_SelectedCells');this._InstallTableMap(C,B.parentNode.parentNode);B.appendChild(I);if (FCKBrowserInfo.IsGeckoLike&&(!B.firstChild)) FCKTools.AppendBogusBr(B);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeRight=function(){var A=this.GetMergeRightTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCK.EditorDocument.createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));D.parentNode.removeChild(D);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeDown=function(){var A=this.GetMergeDownTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCKTools.GetElementDocument(B).createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));if (E.firstChild) E.insertBefore(FCKTools.GetElementDocument(D).createElement('br'),E.firstChild);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.HorizontalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;if (F>1){var G=Math.ceil(F/2);var H=FCKTools.GetElementDocument(B).createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H);var I=E+G;var J=E+F;var K=isNaN(B.rowSpan)?1:B.rowSpan;for (var r=D;r<D+K;r++){for (var i=I;i<J;i++) C[r][i]=H;}}else{var L=[];for (var i=0;i<C.length;i++){var M=C[i].slice(0,E);if (C[i].length<=E){L.push(M);continue;};if (C[i][E]==B){M.push(B);M.push(FCKTools.GetElementDocument(B).createElement('td'));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(M[M.length-1]);}else{M.push(C[i][E]);M.push(C[i][E]);};for (var j=E+1;j<C[i].length;j++) M.push(C[i][j]);L.push(M);};C=L;};this._InstallTableMap(C,B.parentNode.parentNode);};FCKTableHandler.VerticalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=FCKTableHandler._GetCellIndexSpan(C,B.parentNode.rowIndex,B);var E=B.rowSpan;var F=B.parentNode.rowIndex;if (isNaN(E)) E=1;if (E>1){B.rowSpan=Math.ceil(E/2);var G=F+Math.ceil(E/2);var H=null;for (var i=D+1;i<C[G].length;i++){if (C[G][i].parentNode.rowIndex==G){H=C[G][i];break;}};var I=FCK.EditorDocument.createElement('td');I.rowSpan=Math.floor(E/2);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);B.parentNode.parentNode.rows[G].insertBefore(I,H);}else{var G=F+1;var K=FCK.EditorDocument.createElement('tr');var L=B.parentNode.parentNode;if (L.rows.length>G) L.insertBefore(K,L.rows[G]);else L.appendChild(K);for (var i=0;i<C[F].length;){var M=C[F][i].colSpan;if (isNaN(M)||M<1) M=1;if (i==D){i+=M;continue;};var N=C[F][i].rowSpan;if (isNaN(N)) N=1;C[F][i].rowSpan=N+1;i+=M;};var I=FCK.EditorDocument.createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);K.appendChild(I);}};FCKTableHandler._GetCellIndexSpan=function(A,B,C){if (A.length<B+1) return null;var D=A[B];for (var c=0;c<D.length;c++){if (D[c]==C) return c;};return null;};FCKTableHandler._GetCellLocation=function(A,B){for (var i=0;i<A.length;i++){for (var c=0;c<A[i].length;c++){if (A[i][c]==B) return [i,c];}};return null;};FCKTableHandler._GetColumnCells=function(A,B){var C=[];for (var r=0;r<A.length;r++){var D=A[r][B];if (D&&(C.length==0||C[C.length-1]!=D)) C[C.length]=D;};return C;};FCKTableHandler._CreateTableMap=function(A){var B=A.rows;var r=-1;var C=[];for (var i=0;i<B.length;i++){r++;if (!C[r]) C[r]=[];var c=-1;for (var j=0;j<B[i].cells.length;j++){var D=B[i].cells[j];c++;while (C[r][c]) c++;var E=isNaN(D.colSpan)?1:D.colSpan;var F=isNaN(D.rowSpan)?1:D.rowSpan;for (var G=0;G<F;G++){if (!C[r+G]) C[r+G]=[];for (var H=0;H<E;H++){C[r+G][c+H]=B[i].cells[j];}};c+=E-1;}};return C;};FCKTableHandler._InstallTableMap=function(A,B){var C=FCKBrowserInfo.IsIE?"_fckrowspan":"rowSpan";while (B.rows.length>0){var D=B.rows[0];D.parentNode.removeChild(D);};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (E.parentNode) E.parentNode.removeChild(E);E.colSpan=E[C]=1;}};var F=0;for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (!E) continue;if (j>F) F=j;if (E._colScanned===true) continue;if (A[i][j-1]==E) E.colSpan++;if (A[i][j+1]!=E) E._colScanned=true;}};for (var i=0;i<=F;i++){for (var j=0;j<A.length;j++){if (!A[j]) continue;var E=A[j][i];if (!E||E._rowScanned===true) continue;if (A[j-1]&&A[j-1][i]==E) E[C]++;if (!A[j+1]||A[j+1][i]!=E) E._rowScanned=true;}};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (FCKBrowserInfo.IsIE){E.removeAttribute('_colScanned');E.removeAttribute('_rowScanned');}else{delete E._colScanned;delete E._rowScanned;}}};for (var i=0;i<A.length;i++){var J=FCKTools.GetElementDocument(B).createElement('tr');for (var j=0;j<A[i].length;){var E=A[i][j];if (A[i-1]&&A[i-1][j]==E){j+=E.colSpan;continue;};J.appendChild(E);if (C!='rowSpan'){E.rowSpan=E[C];E.removeAttribute(C);};j+=E.colSpan;if (E.colSpan==1) E.removeAttribute('colspan');if (E.rowSpan==1) E.removeAttribute('rowspan');};B.appendChild(J);}};FCKTableHandler._MoveCaretToCell=function (A,B){var C=new FCKDomRange(FCK.EditorWindow);C.MoveToNodeContents(A);C.Collapse(B);C.Select();};FCKTableHandler.ClearRow=function(A){var B=A.cells;for (var i=0;i<B.length;i++){B[i].innerHTML='';if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B[i]);}};FCKTableHandler.GetMergeRightTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=E+(isNaN(B.colSpan)?1:B.colSpan);var G=C[D][F];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,D,F,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.height!=I.height||H.y!=I.y) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};FCKTableHandler.GetMergeDownTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=D+(isNaN(B.rowSpan)?1:B.rowSpan);if (!C[F]) return null;var G=C[F][E];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,F,E,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.width!=I.width||H.x!=I.x) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};
-FCKTableHandler.GetSelectedCells=function(){if (FCKSelection.GetType()=='Control'){var A=FCKSelection.MoveToAncestorNode('TD');return A?[A]:[];};var B=[];var C=FCKSelection.GetSelection().createRange();var D=FCKSelection.GetParentElement();if (D&&D.tagName.Equals('TD','TH')) B[0]=D;else{D=FCKSelection.MoveToAncestorNode('TABLE');if (D){for (var i=0;i<D.cells.length;i++){var E=FCK.EditorDocument.body.createTextRange();E.moveToElementText(D.cells[i]);if (C.inRange(E)||(C.compareEndPoints('StartToStart',E)>=0&&C.compareEndPoints('StartToEnd',E)<=0)||(C.compareEndPoints('EndToStart',E)>=0&&C.compareEndPoints('EndToEnd',E)<=0)){B[B.length]=D.cells[i];}}}};return B;};
+FCKSelection.GetType=function(){try{var A=FCKSelection.GetSelection().type;if (A=='Control'||A=='Text') return A;if (this.GetSelection().createRange().parentElement) return 'Text';}catch(e){};return 'None';};FCKSelection.GetSelectedElement=function(){if (this.GetType()=='Control'){var A=this.GetSelection().createRange();if (A&&A.item) return this.GetSelection().createRange().item(0);};return null;};FCKSelection.GetParentElement=function(){switch (this.GetType()){case 'Control':var A=FCKSelection.GetSelectedElement();return A?A.parentElement:null;case 'None':return null;default:return this.GetSelection().createRange().parentElement();}};FCKSelection.GetBoundaryParentElement=function(A){switch (this.GetType()){case 'Control':var B=FCKSelection.GetSelectedElement();return B?B.parentElement:null;case 'None':return null;default:var C=FCK.EditorDocument;var D=C.selection.createRange();D.collapse(A!==false);var B=D.parentElement();return FCKTools.GetElementDocument(B)==C?B:null;}};FCKSelection.SelectNode=function(A){FCK.Focus();this.GetSelection().empty();var B;try{B=FCK.EditorDocument.body.createControlRange();B.addElement(A);}catch(e){B=FCK.EditorDocument.body.createTextRange();B.moveToElementText(A);};B.select();};FCKSelection.Collapse=function(A){FCK.Focus();if (this.GetType()=='Text'){var B=this.GetSelection().createRange();B.collapse(A==null||A===true);B.select();}};FCKSelection.HasAncestorNode=function(A){var B;if (this.GetSelection().type=="Control"){B=this.GetSelectedElement();}else{var C=this.GetSelection().createRange();B=C.parentElement();}while (B){if (B.nodeName.IEquals(A)) return true;B=B.parentNode;};return false;};FCKSelection.MoveToAncestorNode=function(A){var B,oRange;if (!FCK.EditorDocument) return null;if (this.GetSelection().type=="Control"){oRange=this.GetSelection().createRange();for (i=0;i<oRange.length;i++){if (oRange(i).parentNode){B=oRange(i).parentNode;break;}}}else{oRange=this.GetSelection().createRange();B=oRange.parentElement();}while (B&&!B.nodeName.Equals(A)) B=B.parentNode;return B;};FCKSelection.Delete=function(){var A=this.GetSelection();if (A.type.toLowerCase()!="none"){A.clear();};return A;};FCKSelection.GetSelection=function(){this.Restore();return FCK.EditorDocument.selection;};FCKSelection.Save=function(A){var B=FCK.EditorDocument;if (!B) return;if (this.locked) return;this.locked=!!A;var C=B.selection;var D;if (C){try {D=C.createRange();}catch(e) {};if (D){if (D.parentElement&&FCKTools.GetElementDocument(D.parentElement())!=B) D=null;else if (D.item&&FCKTools.GetElementDocument(D.item(0))!=B) D=null;}};this.SelectionData=D;};FCKSelection._GetSelectionDocument=function(A){var B=A.createRange();if (!B) return null;else if (B.item) return FCKTools.GetElementDocument(B.item(0));else return FCKTools.GetElementDocument(B.parentElement());};FCKSelection.Restore=function(){if (this.SelectionData){FCK.IsSelectionChangeLocked=true;try{if (String(this._GetSelectionDocument(FCK.EditorDocument.selection).body.contentEditable)=='true'){FCK.IsSelectionChangeLocked=false;return;};this.SelectionData.select();}catch (e) {};FCK.IsSelectionChangeLocked=false;}};FCKSelection.Release=function(){this.locked=false;delete this.SelectionData;};
+var FCKTableHandler={};FCKTableHandler.InsertRow=function(A){var B=FCKSelection.MoveToAncestorNode('TR');if (!B) return;var C=B.cloneNode(true);B.parentNode.insertBefore(C,B);FCKTableHandler.ClearRow(A?C:B);};FCKTableHandler.DeleteRows=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();var C=[];for (var i=0;i<B.length;i++){var D=B[i].parentNode;C[D.rowIndex]=D;};for (var i=C.length;i>=0;i--){if (C[i]) FCKTableHandler.DeleteRows(C[i]);};return;};var E=FCKTools.GetElementAscensor(A,'TABLE');if (E.rows.length==1){FCKTableHandler.DeleteTable(E);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteTable=function(A){if (!A){A=FCKSelection.GetSelectedElement();if (!A||A.tagName!='TABLE') A=FCKSelection.MoveToAncestorNode('TABLE');};if (!A) return;FCKSelection.SelectNode(A);FCKSelection.Collapse();if (A.parentNode.childNodes.length==1) A.parentNode.parentNode.removeChild(A.parentNode);else A.parentNode.removeChild(A);};FCKTableHandler.InsertColumn=function(A){var B=null;var C=this.GetSelectedCells();if (C&&C.length) B=C[A?0:(C.length-1)];if (!B) return;var D=FCKTools.GetElementAscensor(B,'TABLE');var E=B.cellIndex;for (var i=0;i<D.rows.length;i++){var F=D.rows[i];if (F.cells.length<(E+1)) continue;B=F.cells[E].cloneNode(false);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B);var G=F.cells[E];F.insertBefore(B,(A?G:G.nextSibling));}};FCKTableHandler.DeleteColumns=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();for (var i=B.length;i>=0;i--){if (B[i]) FCKTableHandler.DeleteColumns(B[i]);};return;};if (!A) return;var C=FCKTools.GetElementAscensor(A,'TABLE');var D=A.cellIndex;for (var i=C.rows.length-1;i>=0;i--){var E=C.rows[i];if (D==0&&E.cells.length==1){FCKTableHandler.DeleteRows(E);continue;};if (E.cells[D]) E.removeChild(E.cells[D]);}};FCKTableHandler.InsertCell=function(A,B){var C=null;var D=this.GetSelectedCells();if (D&&D.length) C=D[B?0:(D.length-1)];if (!C) return null;var E=FCK.EditorDocument.createElement('TD');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(E);if (!B&&C.cellIndex==C.parentNode.cells.length-1) C.parentNode.appendChild(E);else C.parentNode.insertBefore(E,B?C:C.nextSibling);return E;};FCKTableHandler.DeleteCell=function(A){if (A.parentNode.cells.length==1){FCKTableHandler.DeleteRows(A.parentNode);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteCells=function(){var A=FCKTableHandler.GetSelectedCells();for (var i=A.length-1;i>=0;i--){FCKTableHandler.DeleteCell(A[i]);}};FCKTableHandler._MarkCells=function(A,B){for (var i=0;i<A.length;i++) A[i][B]=true;};FCKTableHandler._UnmarkCells=function(A,B){for (var i=0;i<A.length;i++){FCKDomTools.ClearElementJSProperty(A[i],B);}};FCKTableHandler._ReplaceCellsByMarker=function(A,B,C){for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){if (A[i][j][B]) A[i][j]=C;}}};FCKTableHandler._GetMarkerGeometry=function(A,B,C,D){var E=0;var F=0;var G=0;var H=0;for (var i=C;A[B][i]&&A[B][i][D];i++) E++;for (var i=C-1;A[B][i]&&A[B][i][D];i--){E++;G++;};for (var i=B;A[i]&&A[i][C]&&A[i][C][D];i++) F++;for (var i=B-1;A[i]&&A[i][C]&&A[i][C][D];i--){F++;H++;};return { 'width':E,'height':F,'x':G,'y':H };};FCKTableHandler.CheckIsSelectionRectangular=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length<1) return false;for (var i=0;i<A.length;i++){if (A[i].parentNode.parentNode!=A[0].parentNode.parentNode) return false;};this._MarkCells(A,'_CellSelected');var B=this._CreateTableMap(A[0]);var C=A[0].parentNode.rowIndex;var D=this._GetCellIndexSpan(B,C,A[0]);var E=this._GetMarkerGeometry(B,C,D,'_CellSelected');var F=D-E.x;var G=C-E.y;if (E.width>=E.height){for (D=F;D<F+E.width;D++){C=G+(D-F) % E.height;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}}else{for (C=G;C<G+E.height;C++){D=F+(C-G) % E.width;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}};this._UnmarkCells(A,'_CellSelected');return true;};FCKTableHandler.MergeCells=function(){var A=this.GetSelectedCells();if (A.length<2) return;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);this._MarkCells(A,'_SelectedCells');var F=this._GetMarkerGeometry(C,D,E,'_SelectedCells');var G=E-F.x;var H=D-F.y;var I=FCKTools.GetElementDocument(B).createDocumentFragment();for (var i=0;i<F.height;i++){var J=0;for (var j=0;j<F.width;j++){var K=C[H+i][G+j];while (K.childNodes.length>0){var L=K.removeChild(K.firstChild);if (L.nodeType!=1||(L.getAttribute('type',2)!='_moz'&&L.getAttribute('_moz_dirty')!=null)){I.appendChild(L);J++;}}};if (J>0) I.appendChild(FCK.EditorDocument.createElement('br'));};this._ReplaceCellsByMarker(C,'_SelectedCells',B);this._UnmarkCells(A,'_SelectedCells');this._InstallTableMap(C,B.parentNode.parentNode.parentNode);B.appendChild(I);if (FCKBrowserInfo.IsGeckoLike&&(!B.firstChild)) FCKTools.AppendBogusBr(B);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeRight=function(){var A=this.GetMergeRightTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCK.EditorDocument.createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));D.parentNode.removeChild(D);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeDown=function(){var A=this.GetMergeDownTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCKTools.GetElementDocument(B).createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));if (E.firstChild) E.insertBefore(FCK.EditorDocument.createElement('br'),E.firstChild);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.HorizontalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;if (F>1){var G=Math.ceil(F/2);var H=FCK.EditorDocument.createElement(B.nodeName);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H);var I=E+G;var J=E+F;var K=isNaN(B.rowSpan)?1:B.rowSpan;for (var r=D;r<D+K;r++){for (var i=I;i<J;i++) C[r][i]=H;}}else{var L=[];for (var i=0;i<C.length;i++){var M=C[i].slice(0,E);if (C[i].length<=E){L.push(M);continue;};if (C[i][E]==B){M.push(B);M.push(FCK.EditorDocument.createElement(B.nodeName));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(M[M.length-1]);}else{M.push(C[i][E]);M.push(C[i][E]);};for (var j=E+1;j<C[i].length;j++) M.push(C[i][j]);L.push(M);};C=L;};this._InstallTableMap(C,B.parentNode.parentNode.parentNode);};FCKTableHandler.VerticalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;var G=B.rowSpan;if (isNaN(G)) G=1;if (G>1){B.rowSpan=Math.ceil(G/2);var H=D+Math.ceil(G/2);var I=C[H];var J=null;for (var i=E+1;i<I.length;i++){if (I[i].parentNode.rowIndex==H){J=I[i];break;}};var K=FCK.EditorDocument.createElement(B.nodeName);K.rowSpan=Math.floor(G/2);if (F>1) K.colSpan=F;if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(K);B.parentNode.parentNode.parentNode.rows[H].insertBefore(K,J);}else{var L=B.parentNode.sectionRowIndex+1;var M=FCK.EditorDocument.createElement('tr');var N=B.parentNode.parentNode;if (N.rows.length>L) N.insertBefore(M,N.rows[L]);else N.appendChild(M);for (var i=0;i<C[D].length;){var O=C[D][i].colSpan;if (isNaN(O)||O<1) O=1;if (i==E){i+=O;continue;};var P=C[D][i].rowSpan;if (isNaN(P)) P=1;C[D][i].rowSpan=P+1;i+=O;};var K=FCK.EditorDocument.createElement(B.nodeName);if (F>1) K.colSpan=F;if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(K);M.appendChild(K);}};FCKTableHandler._GetCellIndexSpan=function(A,B,C){if (A.length<B+1) return null;var D=A[B];for (var c=0;c<D.length;c++){if (D[c]==C) return c;};return null;};FCKTableHandler._GetCellLocation=function(A,B){for (var i=0;i<A.length;i++){for (var c=0;c<A[i].length;c++){if (A[i][c]==B) return [i,c];}};return null;};FCKTableHandler._CreateTableMap=function(A){var B=(A.nodeName=='TABLE'?A:A.parentNode.parentNode.parentNode);var C=B.rows;var r=-1;var D=[];for (var i=0;i<C.length;i++){r++;if (!D[r]) D[r]=[];var c=-1;for (var j=0;j<C[i].cells.length;j++){var E=C[i].cells[j];c++;while (D[r][c]) c++;var F=isNaN(E.colSpan)?1:E.colSpan;var G=isNaN(E.rowSpan)?1:E.rowSpan;for (var H=0;H<G;H++){if (!D[r+H]) D[r+H]=[];for (var I=0;I<F;I++){D[r+H][c+I]=C[i].cells[j];}};c+=F-1;}};return D;};FCKTableHandler._InstallTableMap=function(A,B){var C=FCKBrowserInfo.IsIE?"_fckrowspan":"rowSpan";for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var D=A[i][j];if (D.parentNode) D.parentNode.removeChild(D);D.colSpan=D[C]=1;}};var E=0;for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var D=A[i][j];if (!D) continue;if (j>E) E=j;if (D._colScanned===true) continue;if (A[i][j-1]==D) D.colSpan++;if (A[i][j+1]!=D) D._colScanned=true;}};for (var i=0;i<=E;i++){for (var j=0;j<A.length;j++){if (!A[j]) continue;var D=A[j][i];if (!D||D._rowScanned===true) continue;if (A[j-1]&&A[j-1][i]==D) D[C]++;if (!A[j+1]||A[j+1][i]!=D) D._rowScanned=true;}};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var D=A[i][j];FCKDomTools.ClearElementJSProperty(D,'_colScanned');FCKDomTools.ClearElementJSProperty(D,'_rowScanned');}};for (var i=0;i<A.length;i++){var I=FCK.EditorDocument.createElement('tr');for (var j=0;j<A[i].length;){var D=A[i][j];if (A[i-1]&&A[i-1][j]==D){j+=D.colSpan;continue;};I.appendChild(D);if (C!='rowSpan'){D.rowSpan=D[C];D.removeAttribute(C);};j+=D.colSpan;if (D.colSpan==1) D.removeAttribute('colspan');if (D.rowSpan==1) D.removeAttribute('rowspan');};if (FCKBrowserInfo.IsIE){B.rows[i].replaceNode(I);}else{B.rows[i].innerHTML='';FCKDomTools.MoveChildren(I,B.rows[i]);}}};FCKTableHandler._MoveCaretToCell=function (A,B){var C=new FCKDomRange(FCK.EditorWindow);C.MoveToNodeContents(A);C.Collapse(B);C.Select();};FCKTableHandler.ClearRow=function(A){var B=A.cells;for (var i=0;i<B.length;i++){B[i].innerHTML='';if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B[i]);}};FCKTableHandler.GetMergeRightTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=E+(isNaN(B.colSpan)?1:B.colSpan);var G=C[D][F];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,D,F,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.height!=I.height||H.y!=I.y) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};FCKTableHandler.GetMergeDownTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=D+(isNaN(B.rowSpan)?1:B.rowSpan);if (!C[F]) return null;var G=C[F][E];if (!G) return null;if (B.parentNode.parentNode!=G.parentNode.parentNode) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,F,E,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.width!=I.width||H.x!=I.x) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};
+FCKTableHandler.GetSelectedCells=function(){if (FCKSelection.GetType()=='Control'){var A=FCKSelection.MoveToAncestorNode(['TD','TH']);return A?[A]:[];};var B=[];var C=FCKSelection.GetSelection().createRange();var D=FCKSelection.GetParentElement();if (D&&D.tagName.Equals('TD','TH')) B[0]=D;else{D=FCKSelection.MoveToAncestorNode('TABLE');if (D){for (var i=0;i<D.cells.length;i++){var E=FCK.EditorDocument.body.createTextRange();E.moveToElementText(D.cells[i]);if (C.inRange(E)||(C.compareEndPoints('StartToStart',E)>=0&&C.compareEndPoints('StartToEnd',E)<=0)||(C.compareEndPoints('EndToStart',E)>=0&&C.compareEndPoints('EndToEnd',E)<=0)){B[B.length]=D.cells[i];}}}};return B;};
 var FCKXml=function(){this.Error=false;};FCKXml.GetAttribute=function(A,B,C){var D=A.attributes.getNamedItem(B);return D?D.value:C;};FCKXml.TransformToObject=function(A){if (!A) return null;var B={};var C=A.attributes;for (var i=0;i<C.length;i++){var D=C[i];B[D.name]=D.value;};var E=A.childNodes;for (i=0;i<E.length;i++){var F=E[i];if (F.nodeType==1){var G='$'+F.nodeName;var H=B[G];if (!H) H=B[G]=[];H.push(this.TransformToObject(F));}};return B;};
 FCKXml.prototype={LoadUrl:function(A){this.Error=false;var B=FCKTools.CreateXmlObject('XmlHttp');if (!B){this.Error=true;return;};B.open("GET",A,false);B.send(null);if (B.status==200||B.status==304||(B.status==0&&B.readyState==4)){this.DOMDocument=B.responseXML;if (!this.DOMDocument||this.DOMDocument.firstChild==null){this.DOMDocument=FCKTools.CreateXmlObject('DOMDocument');this.DOMDocument.async=false;this.DOMDocument.resolveExternals=false;this.DOMDocument.loadXML(B.responseText);}}else{this.DOMDocument=null;};if (this.DOMDocument==null||this.DOMDocument.firstChild==null){this.Error=true;if (window.confirm('Error loading "'+A+'"\r\nDo you want to see more info?')) alert('URL requested: "'+A+'"\r\nServer response:\r\nStatus: '+B.status+'\r\nResponse text:\r\n'+B.responseText);}},SelectNodes:function(A,B){if (this.Error) return [];if (B) return B.selectNodes(A);else return this.DOMDocument.selectNodes(A);},SelectSingleNode:function(A,B){if (this.Error) return null;if (B) return B.selectSingleNode(A);else return this.DOMDocument.selectSingleNode(A);}};
 var FCKNamedCommand=function(A){this.Name=A;};FCKNamedCommand.prototype.Execute=function(){FCK.ExecuteNamedCommand(this.Name);};FCKNamedCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState(this.Name);};
 var FCKStyleCommand=function(){};FCKStyleCommand.prototype={Name:'Style',Execute:function(A,B){FCKUndo.SaveUndoStep();if (B.Selected) FCK.Styles.RemoveStyle(B.Style);else FCK.Styles.ApplyStyle(B.Style);FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorDocument) return -1;if (FCKSelection.GetType()=='Control'){var A=FCKSelection.GetSelectedElement();if (!A||!FCKStyles.CheckHasObjectStyle(A.nodeName.toLowerCase())) return -1;};return 0;}};
-var FCKDialogCommand=function(A,B,C,D,E,F,G,H){this.Name=A;this.Title=B;this.Url=C;this.Width=D;this.Height=E;this.CustomValue=H;this.GetStateFunction=F;this.GetStateParam=G;this.Resizable=false;};FCKDialogCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_'+this.Name,this.Title,this.Url,this.Width,this.Height,this.CustomValue,null,this.Resizable);};FCKDialogCommand.prototype.GetState=function(){if (this.GetStateFunction) return this.GetStateFunction(this.GetStateParam);else return FCK.EditMode==0?0:-1;};var FCKUndefinedCommand=function(){this.Name='Undefined';};FCKUndefinedCommand.prototype.Execute=function(){alert(FCKLang.NotImplemented);};FCKUndefinedCommand.prototype.GetState=function(){return 0;};var FCKFormatBlockCommand=function(){};FCKFormatBlockCommand.prototype={Name:'FormatBlock',Execute:FCKStyleCommand.prototype.Execute,GetState:function(){return FCK.EditorDocument?0:-1;}};var FCKFontNameCommand=function(){};FCKFontNameCommand.prototype={Name:'FontName',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKFontSizeCommand=function(){};FCKFontSizeCommand.prototype={Name:'FontSize',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKPreviewCommand=function(){this.Name='Preview';};FCKPreviewCommand.prototype.Execute=function(){FCK.Preview();};FCKPreviewCommand.prototype.GetState=function(){return 0;};var FCKSaveCommand=function(){this.Name='Save';};FCKSaveCommand.prototype.Execute=function(){var A=FCK.GetParentForm();if (typeof(A.onsubmit)=='function'){var B=A.onsubmit();if (B!=null&&B===false) return;};if (typeof(A.submit)=='function') A.submit();else A.submit.click();};FCKSaveCommand.prototype.GetState=function(){return 0;};var FCKNewPageCommand=function(){this.Name='NewPage';};FCKNewPageCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();FCK.SetData('');FCKUndo.Typing=true;FCK.Focus();};FCKNewPageCommand.prototype.GetState=function(){return 0;};var FCKSourceCommand=function(){this.Name='Source';};FCKSourceCommand.prototype.Execute=function(){if (FCKConfig.SourcePopup){var A=FCKConfig.ScreenWidth*0.65;var B=FCKConfig.ScreenHeight*0.65;FCKDialog.OpenDialog('FCKDialog_Source',FCKLang.Source,'dialog/fck_source.html',A,B,null,null,true);}else FCK.SwitchEditMode();};FCKSourceCommand.prototype.GetState=function(){return (FCK.EditMode==0?0:1);};var FCKUndoCommand=function(){this.Name='Undo';};FCKUndoCommand.prototype.Execute=function(){FCKUndo.Undo();};FCKUndoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckUndoState()?0:-1);};var FCKRedoCommand=function(){this.Name='Redo';};FCKRedoCommand.prototype.Execute=function(){FCKUndo.Redo();};FCKRedoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckRedoState()?0:-1);};var FCKPageBreakCommand=function(){this.Name='PageBreak';};FCKPageBreakCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();var e=FCK.EditorDocument.createElement('DIV');e.style.pageBreakAfter='always';e.innerHTML='<span style="DISPLAY:none">&nbsp;</span>';var A=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',e);var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.SplitBlock();B.InsertNode(A);FCK.Events.FireEvent('OnSelectionChange');};FCKPageBreakCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKUnlinkCommand=function(){this.Name='Unlink';};FCKUnlinkCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGeckoLike){var A=FCK.Selection.MoveToAncestorNode('A');if (A) FCKTools.RemoveOuterTags(A);return;};FCK.ExecuteNamedCommand(this.Name);};FCKUnlinkCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState(this.Name);if (A==0&&FCK.EditMode==0){var B=FCKSelection.MoveToAncestorNode('A');var C=(B&&B.name.length>0&&B.href.length==0);if (C) A=-1;};return A;};FCKVisitLinkCommand=function(){this.Name='VisitLink';};FCKVisitLinkCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState('Unlink');if (A==0){var B=FCKSelection.MoveToAncestorNode('A');if (!B.href) A=-1;};return A;},Execute:function(){var A=FCKSelection.MoveToAncestorNode('A');var B=A.getAttribute('_fcksavedurl')||A.getAttribute('href',2);if (!/:\/\//.test(B)){var C=FCKConfig.BaseHref;var D=FCK.GetInstanceObject('parent');if (!C){C=D.document.location.href;C=C.substring(0,C.lastIndexOf('/')+1);};if (/^\//.test(B)){try{C=C.match(/^.*:\/\/+[^\/]+/)[0];}catch (e){C=D.document.location.protocol+'://'+D.parent.document.location.host;}};B=C+B;};if (!window.open(B,'_blank')) alert(FCKLang.VisitLinkBlocked);}};var FCKSelectAllCommand=function(){this.Name='SelectAll';};FCKSelectAllCommand.prototype.Execute=function(){if (FCK.EditMode==0){FCK.ExecuteNamedCommand('SelectAll');}else{var A=FCK.EditingArea.Textarea;if (FCKBrowserInfo.IsIE){A.createTextRange().execCommand('SelectAll');}else{A.selectionStart=0;A.selectionEnd=A.value.length;};A.focus();}};FCKSelectAllCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKPasteCommand=function(){this.Name='Paste';};FCKPasteCommand.prototype={Execute:function(){if (FCKBrowserInfo.IsIE) FCK.Paste();else FCK.ExecuteNamedCommand('Paste');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');}};var FCKRuleCommand=function(){this.Name='Rule';};FCKRuleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();FCK.InsertElement('hr');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('InsertHorizontalRule');}};var FCKCutCopyCommand=function(A){this.Name=A?'Cut':'Copy';};FCKCutCopyCommand.prototype={Execute:function(){var A=false;if (FCKBrowserInfo.IsIE){var B=function(){A=true;};var C='on'+this.Name.toLowerCase();FCK.EditorDocument.body.attachEvent(C,B);FCK.ExecuteNamedCommand(this.Name);FCK.EditorDocument.body.detachEvent(C,B);}else{try{FCK.ExecuteNamedCommand(this.Name);A=true;}catch(e){}};if (!A) alert(FCKLang['PasteError'+this.Name]);},GetState:function(){return FCK.EditMode!=0?-1:FCK.GetNamedCommandState('Cut');}};var FCKAnchorDeleteCommand=function(){this.Name='AnchorDelete';};FCKAnchorDeleteCommand.prototype={Execute:function(){if (FCK.Selection.GetType()=='Control'){FCK.Selection.Delete();}else{var A=FCK.Selection.GetSelectedElement();if (A){if (A.tagName=='IMG'&&A.getAttribute('_fckanchor')) oAnchor=FCK.GetRealElement(A);else A=null;};if (!A){oAnchor=FCK.Selection.MoveToAncestorNode('A');if (oAnchor) FCK.Selection.SelectNode(oAnchor);};if (oAnchor.href.length!=0){oAnchor.removeAttribute('name');if (FCKBrowserInfo.IsIE) oAnchor.className=oAnchor.className.replace(FCKRegexLib.FCK_Class,'');return;};if (A){A.parentNode.removeChild(A);return;};if (oAnchor.innerHTML.length==0){oAnchor.parentNode.removeChild(oAnchor);return;};FCKTools.RemoveOuterTags(oAnchor);};if (FCKBrowserInfo.IsGecko) FCK.Selection.Collapse(true);},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Unlink');}};var FCKDeleteDivCommand=function(){};FCKDeleteDivCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCKSelection.GetParentElement();var B=new FCKElementPath(A);return B.BlockLimit&&B.BlockLimit.nodeName.IEquals('div')?0:-1;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCKDomTools.GetSelectedDivContainers();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();for (var i=0;i<A.length;i++) FCKDomTools.RemoveNode(A[i],true);B.MoveToBookmark(C);B.Select();}};var FCKNbsp=function(){this.Name='Non Breaking Space';};FCKNbsp.prototype={Execute:function(){FCK.InsertHtml('&nbsp;');},GetState:function(){return (FCK.EditMode!=0?-1:0);}};
-var FCKShowBlockCommand=function(A,B){this.Name=A;if (B!=undefined) this._SavedState=B;else this._SavedState=null;};FCKShowBlockCommand.prototype.Execute=function(){var A=this.GetState();if (A==-1) return;var B=FCK.EditorDocument.body;if (A==1) B.className=B.className.replace(/(^| )FCK__ShowBlocks/g,'');else B.className+=' FCK__ShowBlocks';if (FCKBrowserInfo.IsIE){try{FCK.EditorDocument.selection.createRange().select();}catch (e){}}else{var C=FCK.EditorWindow.getSelection().focusNode;if (C.nodeType!=1) C=C.parentNode;FCKDomTools.ScrollIntoView(C,false);};FCK.Events.FireEvent('OnSelectionChange');};FCKShowBlockCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;if (!FCK.EditorDocument) return 0;if (/FCK__ShowBlocks(?:\s|$)/.test(FCK.EditorDocument.body.className)) return 1;return 0;};FCKShowBlockCommand.prototype.SaveState=function(){this._SavedState=this.GetState();};FCKShowBlockCommand.prototype.RestoreState=function(){if (this._SavedState!=null&&this.GetState()!=this._SavedState) this.Execute();};
-var FCKSpellCheckCommand=function(){this.Name='SpellCheck';this.IsEnabled=(FCKConfig.SpellChecker=='ieSpell'||FCKConfig.SpellChecker=='SpellerPages');};FCKSpellCheckCommand.prototype.Execute=function(){switch (FCKConfig.SpellChecker){case 'ieSpell':this._RunIeSpell();break;case 'SpellerPages':FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','dialog/fck_spellerpages.html',440,480);break;}};FCKSpellCheckCommand.prototype._RunIeSpell=function(){try{var A=new ActiveXObject("ieSpell.ieSpellExtension");A.CheckAllLinkedDocuments(FCK.EditorDocument);}catch(e){if(e.number==-2146827859){if (confirm(FCKLang.IeSpellDownload)) window.open(FCKConfig.IeSpellDownloadUrl,'IeSpellDownload');}else alert('Error Loading ieSpell: '+e.message+' ('+e.number+')');}};FCKSpellCheckCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return this.IsEnabled?0:-1;};
+var FCKDialogCommand=function(A,B,C,D,E,F,G,H){this.Name=A;this.Title=B;this.Url=C;this.Width=D;this.Height=E;this.CustomValue=H;this.GetStateFunction=F;this.GetStateParam=G;this.Resizable=false;};FCKDialogCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_'+this.Name,this.Title,this.Url,this.Width,this.Height,this.CustomValue,null,this.Resizable);};FCKDialogCommand.prototype.GetState=function(){if (this.GetStateFunction) return this.GetStateFunction(this.GetStateParam);else return FCK.EditMode==0?0:-1;};var FCKUndefinedCommand=function(){this.Name='Undefined';};FCKUndefinedCommand.prototype.Execute=function(){alert(FCKLang.NotImplemented);};FCKUndefinedCommand.prototype.GetState=function(){return 0;};var FCKFormatBlockCommand=function(){};FCKFormatBlockCommand.prototype={Name:'FormatBlock',Execute:FCKStyleCommand.prototype.Execute,GetState:function(){return FCK.EditorDocument?0:-1;}};var FCKFontNameCommand=function(){};FCKFontNameCommand.prototype={Name:'FontName',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKFontSizeCommand=function(){};FCKFontSizeCommand.prototype={Name:'FontSize',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKPreviewCommand=function(){this.Name='Preview';};FCKPreviewCommand.prototype.Execute=function(){FCK.Preview();};FCKPreviewCommand.prototype.GetState=function(){return 0;};var FCKSaveCommand=function(){this.Name='Save';};FCKSaveCommand.prototype.Execute=function(){var A=FCK.GetParentForm();if (typeof(A.onsubmit)=='function'){var B=A.onsubmit();if (B!=null&&B===false) return;};if (typeof(A.submit)=='function') A.submit();else A.submit.click();};FCKSaveCommand.prototype.GetState=function(){return 0;};var FCKNewPageCommand=function(){this.Name='NewPage';};FCKNewPageCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();FCK.SetData('');FCKUndo.Typing=true;FCK.Focus();};FCKNewPageCommand.prototype.GetState=function(){return 0;};var FCKSourceCommand=function(){this.Name='Source';};FCKSourceCommand.prototype.Execute=function(){if (FCKConfig.SourcePopup){var A=FCKConfig.ScreenWidth*0.65;var B=FCKConfig.ScreenHeight*0.65;FCKDialog.OpenDialog('FCKDialog_Source',FCKLang.Source,'dialog/fck_source.html',A,B,null,null,true);}else FCK.SwitchEditMode();};FCKSourceCommand.prototype.GetState=function(){return (FCK.EditMode==0?0:1);};var FCKUndoCommand=function(){this.Name='Undo';};FCKUndoCommand.prototype.Execute=function(){FCKUndo.Undo();};FCKUndoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckUndoState()?0:-1);};var FCKRedoCommand=function(){this.Name='Redo';};FCKRedoCommand.prototype.Execute=function(){FCKUndo.Redo();};FCKRedoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckRedoState()?0:-1);};var FCKPageBreakCommand=function(){this.Name='PageBreak';};FCKPageBreakCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();var e=FCK.EditorDocument.createElement('DIV');e.style.pageBreakAfter='always';e.innerHTML='<span style="DISPLAY:none">&nbsp;</span>';var A=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',e);var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.SplitBlock();B.InsertNode(A);FCK.Events.FireEvent('OnSelectionChange');};FCKPageBreakCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKUnlinkCommand=function(){this.Name='Unlink';};FCKUnlinkCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGeckoLike){var A=FCK.Selection.MoveToAncestorNode('A');if (A) FCKTools.RemoveOuterTags(A);return;};FCK.ExecuteNamedCommand(this.Name);};FCKUnlinkCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState(this.Name);if (A==0&&FCK.EditMode==0){var B=FCKSelection.MoveToAncestorNode('A');var C=(B&&B.name.length>0&&B.href.length==0);if (C) A=-1;};return A;};var FCKVisitLinkCommand=function(){this.Name='VisitLink';};FCKVisitLinkCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState('Unlink');if (A==0){var B=FCKSelection.MoveToAncestorNode('A');if (!B.href) A=-1;};return A;},Execute:function(){var A=FCKSelection.MoveToAncestorNode('A');var B=A.getAttribute('_fcksavedurl')||A.getAttribute('href',2);if (!/:\/\//.test(B)){var C=FCKConfig.BaseHref;var D=FCK.GetInstanceObject('parent');if (!C){C=D.document.location.href;C=C.substring(0,C.lastIndexOf('/')+1);};if (/^\//.test(B)){try{C=C.match(/^.*:\/\/+[^\/]+/)[0];}catch (e){C=D.document.location.protocol+'://'+D.parent.document.location.host;}};B=C+B;};if (!window.open(B,'_blank')) alert(FCKLang.VisitLinkBlocked);}};var FCKSelectAllCommand=function(){this.Name='SelectAll';};FCKSelectAllCommand.prototype.Execute=function(){if (FCK.EditMode==0){FCK.ExecuteNamedCommand('SelectAll');}else{var A=FCK.EditingArea.Textarea;if (FCKBrowserInfo.IsIE){A.createTextRange().execCommand('SelectAll');}else{A.selectionStart=0;A.selectionEnd=A.value.length;};A.focus();}};FCKSelectAllCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKPasteCommand=function(){this.Name='Paste';};FCKPasteCommand.prototype={Execute:function(){if (FCKBrowserInfo.IsIE) FCK.Paste();else FCK.ExecuteNamedCommand('Paste');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');}};var FCKRuleCommand=function(){this.Name='Rule';};FCKRuleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();FCK.InsertElement('hr');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('InsertHorizontalRule');}};var FCKCutCopyCommand=function(A){this.Name=A?'Cut':'Copy';};FCKCutCopyCommand.prototype={Execute:function(){var A=false;if (FCKBrowserInfo.IsIE){var B=function(){A=true;};var C='on'+this.Name.toLowerCase();FCK.EditorDocument.body.attachEvent(C,B);FCK.ExecuteNamedCommand(this.Name);FCK.EditorDocument.body.detachEvent(C,B);}else{try{FCK.ExecuteNamedCommand(this.Name);A=true;}catch(e){}};if (!A) alert(FCKLang['PasteError'+this.Name]);},GetState:function(){return FCK.EditMode!=0?-1:FCK.GetNamedCommandState('Cut');}};var FCKAnchorDeleteCommand=function(){this.Name='AnchorDelete';};FCKAnchorDeleteCommand.prototype={Execute:function(){if (FCK.Selection.GetType()=='Control'){FCK.Selection.Delete();}else{var A=FCK.Selection.GetSelectedElement();if (A){if (A.tagName=='IMG'&&A.getAttribute('_fckanchor')) oAnchor=FCK.GetRealElement(A);else A=null;};if (!A){oAnchor=FCK.Selection.MoveToAncestorNode('A');if (oAnchor) FCK.Selection.SelectNode(oAnchor);};if (oAnchor.href.length!=0){oAnchor.removeAttribute('name');if (FCKBrowserInfo.IsIE) oAnchor.className=oAnchor.className.replace(FCKRegexLib.FCK_Class,'');return;};if (A){A.parentNode.removeChild(A);return;};if (oAnchor.innerHTML.length==0){oAnchor.parentNode.removeChild(oAnchor);return;};FCKTools.RemoveOuterTags(oAnchor);};if (FCKBrowserInfo.IsGecko) FCK.Selection.Collapse(true);},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Unlink');}};var FCKDeleteDivCommand=function(){};FCKDeleteDivCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCKSelection.GetParentElement();var B=new FCKElementPath(A);return B.BlockLimit&&B.BlockLimit.nodeName.IEquals('div')?0:-1;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCKDomTools.GetSelectedDivContainers();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();for (var i=0;i<A.length;i++) FCKDomTools.RemoveNode(A[i],true);B.MoveToBookmark(C);B.Select();}};var FCKNbsp=function(){this.Name='Non Breaking Space';};FCKNbsp.prototype={Execute:function(){FCK.InsertHtml('&nbsp;');},GetState:function(){return (FCK.EditMode!=0?-1:0);}};
+var FCKShowBlockCommand=function(A,B){this.Name=A;if (B!=undefined) this._SavedState=B;else this._SavedState=null;};FCKShowBlockCommand.prototype.Execute=function(){var A=this.GetState();if (A==-1) return;var B=FCK.EditorDocument.body;if (A==1) B.className=B.className.replace(/(^| )FCK__ShowBlocks/g,'');else B.className+=' FCK__ShowBlocks';if (FCKBrowserInfo.IsIE){try{FCK.EditorDocument.selection.createRange().select();}catch (e){}}else{var C=FCK.EditorWindow.getSelection().focusNode;if (C){if (C.nodeType!=1) C=C.parentNode;FCKDomTools.ScrollIntoView(C,false);}};FCK.Events.FireEvent('OnSelectionChange');};FCKShowBlockCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;if (!FCK.EditorDocument) return 0;if (/FCK__ShowBlocks(?:\s|$)/.test(FCK.EditorDocument.body.className)) return 1;return 0;};FCKShowBlockCommand.prototype.SaveState=function(){this._SavedState=this.GetState();};FCKShowBlockCommand.prototype.RestoreState=function(){if (this._SavedState!=null&&this.GetState()!=this._SavedState) this.Execute();};
+var FCKSpellCheckCommand=function(){this.Name='SpellCheck';this.IsEnabled=true;};FCKSpellCheckCommand.prototype.Execute=function(){switch (FCKConfig.SpellChecker){case 'ieSpell':this._RunIeSpell();break;case 'SpellerPages':FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','dialog/fck_spellerpages.html',440,480);break;case 'WSC':FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','wsc/w.html',530,480);}};FCKSpellCheckCommand.prototype._RunIeSpell=function(){try{var A=new ActiveXObject("ieSpell.ieSpellExtension");A.CheckAllLinkedDocuments(FCK.EditorDocument);}catch(e){if(e.number==-2146827859){if (confirm(FCKLang.IeSpellDownload)) window.open(FCKConfig.IeSpellDownloadUrl,'IeSpellDownload');}else alert('Error Loading ieSpell: '+e.message+' ('+e.number+')');}};FCKSpellCheckCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return this.IsEnabled?0:-1;};
 var FCKTextColorCommand=function(A){this.Name=A=='ForeColor'?'TextColor':'BGColor';this.Type=A;var B;if (FCKBrowserInfo.IsIE) B=window;else if (FCK.ToolbarSet._IFrame) B=FCKTools.GetElementWindow(FCK.ToolbarSet._IFrame);else B=window.parent;this._Panel=new FCKPanel(B);this._Panel.AppendStyleSheet(FCKConfig.SkinEditorCSS);this._Panel.MainNode.className='FCK_Panel';this._CreatePanelBody(this._Panel.Document,this._Panel.MainNode);FCK.ToolbarSet.ToolbarItems.GetItem(this.Name).RegisterPanel(this._Panel);FCKTools.DisableSelection(this._Panel.Document.body);};FCKTextColorCommand.prototype.Execute=function(A,B,C){this._Panel.Show(A,B,C);};FCKTextColorCommand.prototype.SetColor=function(A){FCKUndo.SaveUndoStep();var B=FCKStyles.GetStyle('_FCK_'+(this.Type=='ForeColor'?'Color':'BackColor'));if (!A||A.length==0) FCK.Styles.RemoveStyle(B);else{B.SetVariable('Color',A);FCKStyles.ApplyStyle(B);};FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');};FCKTextColorCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};function FCKTextColorCommand_OnMouseOver(){this.className='ColorSelected';};function FCKTextColorCommand_OnMouseOut(){this.className='ColorDeselected';};function FCKTextColorCommand_OnClick(A,B,C){this.className='ColorDeselected';B.SetColor(C);B._Panel.Hide();};function FCKTextColorCommand_AutoOnClick(A,B){this.className='ColorDeselected';B.SetColor('');B._Panel.Hide();};function FCKTextColorCommand_MoreOnClick(A,B){this.className='ColorDeselected';B._Panel.Hide();FCKDialog.OpenDialog('FCKDialog_Color',FCKLang.DlgColorTitle,'dialog/fck_colorselector.html',410,320,FCKTools.Bind(B,B.SetColor));};FCKTextColorCommand.prototype._CreatePanelBody=function(A,B){function CreateSelectionDiv(){var C=A.createElement("DIV");C.className='ColorDeselected';FCKTools.AddEventListenerEx(C,'mouseover',FCKTextColorCommand_OnMouseOver);FCKTools.AddEventListenerEx(C,'mouseout',FCKTextColorCommand_OnMouseOut);return C;};var D=B.appendChild(A.createElement("TABLE"));D.className='ForceBaseFont';D.style.tableLayout='fixed';D.cellPadding=0;D.cellSpacing=0;D.border=0;D.width=150;var E=D.insertRow(-1).insertCell(-1);E.colSpan=8;var C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table cellspacing="0" cellpadding="0" width="100%" border="0">\n			<tr>\n				<td><div class="ColorBoxBorder"><div class="ColorBox" style="background-color: #000000"></div></div></td>\n				<td nowrap width="100%" align="center">'+FCKLang.ColorAutomatic+'</td>\n			</tr>\n		</table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_AutoOnClick,this);if (!FCKBrowserInfo.IsIE) C.style.width='96%';var G=FCKConfig.FontColors.toString().split(',');var H=0;while (H<G.length){var I=D.insertRow(-1);for (var i=0;i<8;i++,H++){if (H<G.length){var J=G[H].split('/');var K='#'+J[0];var L=J[1]||K;};C=I.insertCell(-1).appendChild(CreateSelectionDiv());C.innerHTML='<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: '+K+'"></div></div>';if (H>=G.length) C.style.visibility='hidden';else FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_OnClick,[this,L]);}};if (FCKConfig.EnableMoreFontColors){E=D.insertRow(-1).insertCell(-1);E.colSpan=8;C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">'+FCKLang.ColorMoreColors+'</td></tr></table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_MoreOnClick,this);};if (!FCKBrowserInfo.IsIE) C.style.width='96%';};
 var FCKPastePlainTextCommand=function(){this.Name='PasteText';};FCKPastePlainTextCommand.prototype.Execute=function(){FCK.PasteAsPlainText();};FCKPastePlainTextCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');};
 var FCKPasteWordCommand=function(){this.Name='PasteWord';};FCKPasteWordCommand.prototype.Execute=function(){FCK.PasteFromWord();};FCKPasteWordCommand.prototype.GetState=function(){if (FCK.EditMode!=0||FCKConfig.ForcePasteAsPlainText) return -1;else return FCK.GetNamedCommandState('Paste');};
 var FCKTableCommand=function(A){this.Name=A;};FCKTableCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (!FCKBrowserInfo.IsGecko){switch (this.Name){case 'TableMergeRight':return FCKTableHandler.MergeRight();case 'TableMergeDown':return FCKTableHandler.MergeDown();}};switch (this.Name){case 'TableInsertRowAfter':return FCKTableHandler.InsertRow(false);case 'TableInsertRowBefore':return FCKTableHandler.InsertRow(true);case 'TableDeleteRows':return FCKTableHandler.DeleteRows();case 'TableInsertColumnAfter':return FCKTableHandler.InsertColumn(false);case 'TableInsertColumnBefore':return FCKTableHandler.InsertColumn(true);case 'TableDeleteColumns':return FCKTableHandler.DeleteColumns();case 'TableInsertCellAfter':return FCKTableHandler.InsertCell(null,false);case 'TableInsertCellBefore':return FCKTableHandler.InsertCell(null,true);case 'TableDeleteCells':return FCKTableHandler.DeleteCells();case 'TableMergeCells':return FCKTableHandler.MergeCells();case 'TableHorizontalSplitCell':return FCKTableHandler.HorizontalSplitCell();case 'TableVerticalSplitCell':return FCKTableHandler.VerticalSplitCell();case 'TableDelete':return FCKTableHandler.DeleteTable();default:return alert(FCKLang.UnknownCommand.replace(/%1/g,this.Name));}};FCKTableCommand.prototype.GetState=function(){if (FCK.EditorDocument!=null&&FCKSelection.HasAncestorNode('TABLE')){switch (this.Name){case 'TableHorizontalSplitCell':case 'TableVerticalSplitCell':if (FCKTableHandler.GetSelectedCells().length==1) return 0;else return -1;case 'TableMergeCells':if (FCKTableHandler.CheckIsSelectionRectangular()&&FCKTableHandler.GetSelectedCells().length>1) return 0;else return -1;case 'TableMergeRight':return FCKTableHandler.GetMergeRightTarget()?0:-1;case 'TableMergeDown':return FCKTableHandler.GetMergeDownTarget()?0:-1;default:return 0;}}else return -1;};
-var FCKFitWindow=function(){this.Name='FitWindow';};FCKFitWindow.prototype.Execute=function(){var A=window.frameElement;var B=A.style;var C=parent;var D=C.document.documentElement;var E=C.document.body;var F=E.style;var G;var H=new FCKDomRange(FCK.EditorWindow);H.MoveToSelection();var I=FCKTools.GetScrollPosition(FCK.EditorWindow);if (!this.IsMaximized){if(FCKBrowserInfo.IsIE) C.attachEvent('onresize',FCKFitWindow_Resize);else C.addEventListener('resize',FCKFitWindow_Resize,true);this._ScrollPos=FCKTools.GetScrollPosition(C);G=A;while((G=G.parentNode)){if (G.nodeType==1){G._fckSavedStyles=FCKTools.SaveStyles(G);G.style.zIndex=FCKConfig.FloatingPanelsZIndex-1;}};if (FCKBrowserInfo.IsIE){this.documentElementOverflow=D.style.overflow;D.style.overflow='hidden';F.overflow='hidden';}else{F.overflow='hidden';F.width='0px';F.height='0px';};this._EditorFrameStyles=FCKTools.SaveStyles(A);var J=FCKTools.GetViewPaneSize(C);B.position="absolute";A.offsetLeft;B.zIndex=FCKConfig.FloatingPanelsZIndex-1;B.left="0px";B.top="0px";B.width=J.Width+"px";B.height=J.Height+"px";if (!FCKBrowserInfo.IsIE){B.borderRight=B.borderBottom="9999px solid white";B.backgroundColor="white";};C.scrollTo(0,0);var K=FCKTools.GetWindowPosition(C,A);if (K.x!=0) B.left=(-1*K.x)+"px";if (K.y!=0) B.top=(-1*K.y)+"px";this.IsMaximized=true;}else{if(FCKBrowserInfo.IsIE) C.detachEvent("onresize",FCKFitWindow_Resize);else C.removeEventListener("resize",FCKFitWindow_Resize,true);G=A;while((G=G.parentNode)){if (G._fckSavedStyles){FCKTools.RestoreStyles(G,G._fckSavedStyles);G._fckSavedStyles=null;}};if (FCKBrowserInfo.IsIE) D.style.overflow=this.documentElementOverflow;FCKTools.RestoreStyles(A,this._EditorFrameStyles);C.scrollTo(this._ScrollPos.X,this._ScrollPos.Y);this.IsMaximized=false;};FCKToolbarItems.GetItem('FitWindow').RefreshState();if (FCK.EditMode==0) FCK.EditingArea.MakeEditable();FCK.Focus();H.Select();FCK.EditorWindow.scrollTo(I.X,I.Y);};FCKFitWindow.prototype.GetState=function(){if (FCKConfig.ToolbarLocation!='In') return -1;else return (this.IsMaximized?1:0);};function FCKFitWindow_Resize(){var A=FCKTools.GetViewPaneSize(parent);var B=window.frameElement.style;B.width=A.Width+'px';B.height=A.Height+'px';};
+var FCKFitWindow=function(){this.Name='FitWindow';};FCKFitWindow.prototype.Execute=function(){var A=window.frameElement;var B=A.style;var C=parent;var D=C.document.documentElement;var E=C.document.body;var F=E.style;var G;var H,oEditorScrollPos;if (FCK.EditMode==0){H=new FCKDomRange(FCK.EditorWindow);H.MoveToSelection();oEditorScrollPos=FCKTools.GetScrollPosition(FCK.EditorWindow);}else{var I=FCK.EditingArea.Textarea;H=!FCKBrowserInfo.IsIE&&[I.selectionStart,I.selectionEnd];oEditorScrollPos=[I.scrollLeft,I.scrollTop];};if (!this.IsMaximized){if(FCKBrowserInfo.IsIE) C.attachEvent('onresize',FCKFitWindow_Resize);else C.addEventListener('resize',FCKFitWindow_Resize,true);this._ScrollPos=FCKTools.GetScrollPosition(C);G=A;while((G=G.parentNode)){if (G.nodeType==1){G._fckSavedStyles=FCKTools.SaveStyles(G);G.style.zIndex=FCKConfig.FloatingPanelsZIndex-1;}};if (FCKBrowserInfo.IsIE){this.documentElementOverflow=D.style.overflow;D.style.overflow='hidden';F.overflow='hidden';}else{F.overflow='hidden';F.width='0px';F.height='0px';};this._EditorFrameStyles=FCKTools.SaveStyles(A);var J=FCKTools.GetViewPaneSize(C);B.position="absolute";A.offsetLeft;B.zIndex=FCKConfig.FloatingPanelsZIndex-1;B.left="0px";B.top="0px";B.width=J.Width+"px";B.height=J.Height+"px";if (!FCKBrowserInfo.IsIE){B.borderRight=B.borderBottom="9999px solid white";B.backgroundColor="white";};C.scrollTo(0,0);var K=FCKTools.GetWindowPosition(C,A);if (K.x!=0) B.left=(-1*K.x)+"px";if (K.y!=0) B.top=(-1*K.y)+"px";this.IsMaximized=true;}else{if(FCKBrowserInfo.IsIE) C.detachEvent("onresize",FCKFitWindow_Resize);else C.removeEventListener("resize",FCKFitWindow_Resize,true);G=A;while((G=G.parentNode)){if (G._fckSavedStyles){FCKTools.RestoreStyles(G,G._fckSavedStyles);G._fckSavedStyles=null;}};if (FCKBrowserInfo.IsIE) D.style.overflow=this.documentElementOverflow;FCKTools.RestoreStyles(A,this._EditorFrameStyles);C.scrollTo(this._ScrollPos.X,this._ScrollPos.Y);this.IsMaximized=false;};FCKToolbarItems.GetItem('FitWindow').RefreshState();if (FCK.EditMode==0) FCK.EditingArea.MakeEditable();FCK.Focus();if (FCK.EditMode==0){H.Select();FCK.EditorWindow.scrollTo(oEditorScrollPos.X,oEditorScrollPos.Y);}else{if (!FCKBrowserInfo.IsIE){I.selectionStart=H[0];I.selectionEnd=H[1];};I.scrollLeft=oEditorScrollPos[0];I.scrollTop=oEditorScrollPos[1];}};FCKFitWindow.prototype.GetState=function(){if (FCKConfig.ToolbarLocation!='In') return -1;else return (this.IsMaximized?1:0);};function FCKFitWindow_Resize(){var A=FCKTools.GetViewPaneSize(parent);var B=window.frameElement.style;B.width=A.Width+'px';B.height=A.Height+'px';};
 var FCKListCommand=function(A,B){this.Name=A;this.TagName=B;};FCKListCommand.prototype={GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=FCKSelection.GetBoundaryParentElement(true);var B=A;while (B){if (B.nodeName.IEquals(['ul','ol'])) break;B=B.parentNode;};if (B&&B.nodeName.IEquals(this.TagName)) return 1;else return 0;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCK.EditorDocument;var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=this.GetState();if (C==0){FCKDomTools.TrimNode(A.body);if (!A.body.firstChild){var D=A.createElement('p');A.body.appendChild(D);B.MoveToNodeContents(D);}};var E=B.CreateBookmark();var F=[];var G={};var H=new FCKDomRangeIterator(B);var I;H.ForceBrBreak=(C==0);var J=true;var K=null;while (J){while ((I=H.GetNextParagraph())){var L=new FCKElementPath(I);var M=null;var N=false;var O=L.BlockLimit;for (var i=L.Elements.length-1;i>=0;i--){var P=L.Elements[i];if (P.nodeName.IEquals(['ol','ul'])){if (O._FCK_ListGroupObject) O._FCK_ListGroupObject=null;var Q=P._FCK_ListGroupObject;if (Q) Q.contents.push(I);else{Q={ 'root':P,'contents':[I] };F.push(Q);FCKDomTools.SetElementMarker(G,P,'_FCK_ListGroupObject',Q);};N=true;break;}};if (N) continue;var R=O;if (R._FCK_ListGroupObject) R._FCK_ListGroupObject.contents.push(I);else{var Q={ 'root':R,'contents':[I] };FCKDomTools.SetElementMarker(G,R,'_FCK_ListGroupObject',Q);F.push(Q);}};if (FCKBrowserInfo.IsIE) J=false;else{if (K==null){K=[];var T=FCKSelection.GetSelection();if (T&&F.length==0) K.push(T.getRangeAt(0));for (var i=1;T&&i<T.rangeCount;i++) K.push(T.getRangeAt(i));};if (K.length<1) J=false;else{var U=FCKW3CRange.CreateFromRange(A,K.shift());B._Range=U;B._UpdateElementInfo();if (B.StartNode.nodeName.IEquals('td')) B.SetStart(B.StartNode,1);if (B.EndNode.nodeName.IEquals('td')) B.SetEnd(B.EndNode,2);H=new FCKDomRangeIterator(B);H.ForceBrBreak=(C==0);}}};var W=[];while (F.length>0){var Q=F.shift();if (C==0){if (Q.root.nodeName.IEquals(['ul','ol'])) this._ChangeListType(Q,G,W);else this._CreateList(Q,W);}else if (C==1&&Q.root.nodeName.IEquals(['ul','ol'])) this._RemoveList(Q,G);};for (var i=0;i<W.length;i++){var M=W[i];var Z=false;var a=M;while (!Z){a=a.nextSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.firstChild) M.appendChild(a.removeChild(a.firstChild));};Z=false;a=M;while (!Z){a=a.previousSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.lastChild) M.insertBefore(a.removeChild(a.lastChild),M.firstChild);}};FCKDomTools.ClearAllMarkers(G);B.MoveToBookmark(E);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},_ChangeListType:function(A,B,C){var D=FCKDomTools.ListToArray(A.root,B);var E=[];for (var i=0;i<A.contents.length;i++){var F=A.contents[i];F=FCKTools.GetElementAscensor(F,'li');if (!F||F._FCK_ListItem_Processed) continue;E.push(F);FCKDomTools.SetElementMarker(B,F,'_FCK_ListItem_Processed',true);};var G=FCKTools.GetElementDocument(A.root).createElement(this.TagName);for (var i=0;i<E.length;i++){var H=E[i]._FCK_ListArray_Index;D[H].parent=G;};var I=FCKDomTools.ArrayToList(D,B);for (var i=0;i<I.listNode.childNodes.length;i++){if (I.listNode.childNodes[i].nodeName.IEquals(this.TagName)) C.push(I.listNode.childNodes[i]);};A.root.parentNode.replaceChild(I.listNode,A.root);},_CreateList:function(A,B){var C=A.contents;var D=FCKTools.GetElementDocument(A.root);var E=[];if (C.length==1&&C[0]==A.root){var F=D.createElement('div');while (C[0].firstChild) F.appendChild(C[0].removeChild(C[0].firstChild));C[0].appendChild(F);C[0]=F;};var G=A.contents[0].parentNode;for (var i=0;i<C.length;i++) G=FCKDomTools.GetCommonParents(G,C[i].parentNode).pop();for (var i=0;i<C.length;i++){var H=C[i];while (H.parentNode){if (H.parentNode==G){E.push(H);break;};H=H.parentNode;}};if (E.length<1) return;var I=E[E.length-1].nextSibling;var J=D.createElement(this.TagName);B.push(J);while (E.length){var K=E.shift();var L=D.createDocumentFragment();while (K.firstChild) L.appendChild(K.removeChild(K.firstChild));K.parentNode.removeChild(K);var M=D.createElement('li');M.appendChild(L);J.appendChild(M);};G.insertBefore(J,I);},_RemoveList:function(A,B){var C=FCKDomTools.ListToArray(A.root,B);var D=[];for (var i=0;i<A.contents.length;i++){var E=A.contents[i];E=FCKTools.GetElementAscensor(E,'li');if (!E||E._FCK_ListItem_Processed) continue;D.push(E);FCKDomTools.SetElementMarker(B,E,'_FCK_ListItem_Processed',true);};var F=null;for (var i=0;i<D.length;i++){var G=D[i]._FCK_ListArray_Index;C[G].indent=-1;F=G;};for (var i=F+1;i<C.length;i++){if (C[i].indent>C[i-1].indent+1){var H=C[i-1].indent+1-C[i].indent;var I=C[i].indent;while (C[i]&&C[i].indent>=I){C[i].indent+=H;i++;};i--;}};var J=FCKDomTools.ArrayToList(C,B);if (A.root.nextSibling==null||A.root.nextSibling.nodeName.IEquals('br')){if (J.listNode.lastChild.nodeName.IEquals('br')) J.listNode.removeChild(J.listNode.lastChild);};A.root.parentNode.replaceChild(J.listNode,A.root);}};
 var FCKJustifyCommand=function(A){this.AlignValue=A;var B=FCKConfig.ContentLangDirection.toLowerCase();this.IsDefaultAlign=(A=='left'&&B=='ltr')||(A=='right'&&B=='rtl');var C=this._CssClassName=(function(){var D=FCKConfig.JustifyClasses;if (D){switch (A){case 'left':return D[0]||null;case 'center':return D[1]||null;case 'right':return D[2]||null;case 'justify':return D[3]||null;}};return null;})();if (C&&C.length>0) this._CssClassRegex=new RegExp('(?:^|\\s+)'+C+'(?=$|\\s)');};FCKJustifyCommand._GetClassNameRegex=function(){var A=FCKJustifyCommand._ClassRegex;if (A!=undefined) return A;var B=[];var C=FCKConfig.JustifyClasses;if (C){for (var i=0;i<4;i++){var D=C[i];if (D&&D.length>0) B.push(D);}};if (B.length>0) A=new RegExp('(?:^|\\s+)(?:'+B.join('|')+')(?=$|\\s)');else A=null;return FCKJustifyCommand._ClassRegex=A;};FCKJustifyCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=this.GetState();if (B==-1) return;var C=A.CreateBookmark();var D=this._CssClassName;var E=new FCKDomRangeIterator(A);var F;while ((F=E.GetNextParagraph())){F.removeAttribute('align');if (D){var G=F.className.replace(FCKJustifyCommand._GetClassNameRegex(),'');if (B==0){if (G.length>0) G+=' ';F.className=G+D;}else if (G.length==0) FCKDomTools.RemoveAttribute(F,'class');}else{var H=F.style;if (B==0) H.textAlign=this.AlignValue;else{H.textAlign='';if (H.cssText.length==0) F.removeAttribute('style');}}};A.MoveToBookmark(C);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;var C;if (FCKBrowserInfo.IsIE) C=B.currentStyle.textAlign;else C=FCK.EditorWindow.getComputedStyle(B,'').getPropertyValue('text-align');C=C.replace(/(-moz-|-webkit-|start|auto)/i,'');if ((!C&&this.IsDefaultAlign)||C==this.AlignValue) return 1;return 0;}};
 var FCKIndentCommand=function(A,B){this.Name=A;this.Offset=B;this.IndentCSSProperty=FCKConfig.ContentLangDirection.IEquals('ltr')?'marginLeft':'marginRight';};FCKIndentCommand._InitIndentModeParameters=function(){if (FCKConfig.IndentClasses&&FCKConfig.IndentClasses.length>0){this._UseIndentClasses=true;this._IndentClassMap={};for (var i=0;i<FCKConfig.IndentClasses.length;i++) this._IndentClassMap[FCKConfig.IndentClasses[i]]=i+1;this._ClassNameRegex=new RegExp('(?:^|\\s+)('+FCKConfig.IndentClasses.join('|')+')(?=$|\\s)');}else this._UseIndentClasses=false;};FCKIndentCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=A.CreateBookmark();var C=FCKDomTools.GetCommonParentNode(A.StartNode||A.StartContainer,A.EndNode||A.EndContainer,['ul','ol']);if (C) this._IndentList(A,C);else this._IndentBlock(A);A.MoveToBookmark(B);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;if (FCKIndentCommand._UseIndentClasses==undefined) FCKIndentCommand._InitIndentModeParameters();var A=FCKSelection.GetBoundaryParentElement(true);var B=FCKSelection.GetBoundaryParentElement(false);var C=FCKDomTools.GetCommonParentNode(A,B,['ul','ol']);if (C){if (this.Name.IEquals('outdent')) return 0;var D=FCKTools.GetElementAscensor(A,'li');if (!D||!D.previousSibling) return -1;return 0;};if (!FCKIndentCommand._UseIndentClasses&&this.Name.IEquals('indent')) return 0;var E=new FCKElementPath(A);var F=E.Block||E.BlockLimit;if (!F) return -1;if (FCKIndentCommand._UseIndentClasses){var G=F.className.match(FCKIndentCommand._ClassNameRegex);var H=0;if (G!=null){G=G[1];H=FCKIndentCommand._IndentClassMap[G];};if ((this.Name=='outdent'&&H==0)||(this.Name=='indent'&&H==FCKConfig.IndentClasses.length)) return -1;return 0;}else{var I=parseInt(F.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;if (I<=0) return -1;return 0;}},_IndentBlock:function(A){var B=new FCKDomRangeIterator(A);B.EnforceRealBlocks=true;A.Expand('block_contents');var C=FCKDomTools.GetCommonParents(A.StartContainer,A.EndContainer);var D=C[C.length-1];var E;while ((E=B.GetNextParagraph())){if (!(E==D||E.parentNode==D)) continue;if (FCKIndentCommand._UseIndentClasses){var F=E.className.match(FCKIndentCommand._ClassNameRegex);var G=0;if (F!=null){F=F[1];G=FCKIndentCommand._IndentClassMap[F];};if (this.Name.IEquals('outdent')) G--;else if (this.Name.IEquals('indent')) G++;G=Math.min(G,FCKConfig.IndentClasses.length);G=Math.max(G,0);var H=E.className.replace(FCKIndentCommand._ClassNameRegex,'');if (G<1) E.className=H;else E.className=(H.length>0?H+' ':'')+FCKConfig.IndentClasses[G-1];}else{var I=parseInt(E.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;I+=this.Offset;I=Math.max(I,0);I=Math.ceil(I/this.Offset)*this.Offset;E.style[this.IndentCSSProperty]=I?I+FCKConfig.IndentUnit:'';if (E.getAttribute('style')=='') E.removeAttribute('style');}}},_IndentList:function(A,B){var C=A.StartContainer;var D=A.EndContainer;while (C&&C.parentNode!=B) C=C.parentNode;while (D&&D.parentNode!=B) D=D.parentNode;if (!C||!D) return;var E=C;var F=[];var G=false;while (G==false){if (E==D) G=true;F.push(E);E=E.nextSibling;};if (F.length<1) return;var H=FCKDomTools.GetParents(B);for (var i=0;i<H.length;i++){if (H[i].nodeName.IEquals(['ul','ol'])){B=H[i];break;}};var I=this.Name.IEquals('indent')?1:-1;var J=F[0];var K=F[F.length-1];var L={};var M=FCKDomTools.ListToArray(B,L);var N=M[K._FCK_ListArray_Index].indent;for (var i=J._FCK_ListArray_Index;i<=K._FCK_ListArray_Index;i++) M[i].indent+=I;for (var i=K._FCK_ListArray_Index+1;i<M.length&&M[i].indent>N;i++) M[i].indent+=I;var O=FCKDomTools.ArrayToList(M);if (O) B.parentNode.replaceChild(O.listNode,B);FCKDomTools.ClearAllMarkers(L);}};
-var FCKBlockQuoteCommand=function(){};FCKBlockQuoteCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=this.GetState();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();if (FCKBrowserInfo.IsIE){var D=B.GetBookmarkNode(C,true);var E=B.GetBookmarkNode(C,false);var F;if (D&&D.parentNode.nodeName.IEquals('blockquote')&&!D.previousSibling){F=D;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]) FCKDomTools.MoveNode(D,F,true);}};if (E&&E.parentNode.nodeName.IEquals('blockquote')&&!E.previousSibling){F=E;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]){if (F.firstChild==D) FCKDomTools.InsertAfterNode(D,E);else FCKDomTools.MoveNode(E,F,true);}}}};var G=new FCKDomRangeIterator(B);var H;if (A==0){G.EnforceRealBlocks=true;var I=[];while ((H=G.GetNextParagraph())) I.push(H);if (I.length<1){para=B.Window.document.createElement(FCKConfig.EnterMode.IEquals('p')?'p':'div');B.InsertNode(para);para.appendChild(B.Window.document.createTextNode('\ufeff'));B.MoveToBookmark(C);B.MoveToNodeContents(para);B.Collapse(true);C=B.CreateBookmark();I.push(para);};var J=I[0].parentNode;var K=[];for (var i=0;i<I.length;i++){H=I[i];J=FCKDomTools.GetCommonParents(H.parentNode,J).pop();};var L=null;while (I.length>0){H=I.shift();while (H.parentNode!=J) H=H.parentNode;if (H!=L) K.push(H);L=H;}while (K.length>0){H=K.shift();if (H.nodeName.IEquals('blockquote')){var M=FCKTools.GetElementDocument(H).createDocumentFragment();while (H.firstChild){M.appendChild(H.removeChild(H.firstChild));I.push(M.lastChild);};H.parentNode.replaceChild(M,H);}else I.push(H);};var N=B.Window.document.createElement('blockquote');J.insertBefore(N,I[0]);while (I.length>0){H=I.shift();N.appendChild(H);}}else if (A==1){var O=[];while ((H=G.GetNextParagraph())){var P=null;var Q=null;while (H.parentNode){if (H.parentNode.nodeName.IEquals('blockquote')){P=H.parentNode;Q=H;break;};H=H.parentNode;};if (P&&Q) O.push(Q);};var R=[];while (O.length>0){var S=O.shift();var N=S.parentNode;if (S==S.parentNode.firstChild){N.parentNode.insertBefore(N.removeChild(S),N);if (!N.firstChild) N.parentNode.removeChild(N);}else if (S==S.parentNode.lastChild){N.parentNode.insertBefore(N.removeChild(S),N.nextSibling);if (!N.firstChild) N.parentNode.removeChild(N);}else FCKDomTools.BreakParent(S,S.parentNode,B);R.push(S);};if (FCKConfig.EnterMode.IEquals('br')){while (R.length){var S=R.shift();var W=true;if (S.nodeName.IEquals('div')){var M=FCKTools.GetElementDocument(S).createDocumentFragment();var Y=W&&S.previousSibling&&!FCKListsLib.BlockBoundaries[S.previousSibling.nodeName.toLowerCase()];if (W&&Y) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));var Z=S.nextSibling&&!FCKListsLib.BlockBoundaries[S.nextSibling.nodeName.toLowerCase()];while (S.firstChild) M.appendChild(S.removeChild(S.firstChild));if (Z) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));S.parentNode.replaceChild(M,S);W=false;}}}};B.MoveToBookmark(C);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;for (var i=0;i<A.Elements.length;i++){if (A.Elements[i].nodeName.IEquals('blockquote')) return 1;};return 0;}};
+var FCKBlockQuoteCommand=function(){};FCKBlockQuoteCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=this.GetState();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();if (FCKBrowserInfo.IsIE){var D=B.GetBookmarkNode(C,true);var E=B.GetBookmarkNode(C,false);var F;if (D&&D.parentNode.nodeName.IEquals('blockquote')&&!D.previousSibling){F=D;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]) FCKDomTools.MoveNode(D,F,true);}};if (E&&E.parentNode.nodeName.IEquals('blockquote')&&!E.previousSibling){F=E;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]){if (F.firstChild==D) FCKDomTools.InsertAfterNode(D,E);else FCKDomTools.MoveNode(E,F,true);}}}};var G=new FCKDomRangeIterator(B);var H;if (A==0){var I=[];while ((H=G.GetNextParagraph())) I.push(H);if (I.length<1){para=B.Window.document.createElement(FCKConfig.EnterMode.IEquals('p')?'p':'div');B.InsertNode(para);para.appendChild(B.Window.document.createTextNode('\ufeff'));B.MoveToBookmark(C);B.MoveToNodeContents(para);B.Collapse(true);C=B.CreateBookmark();I.push(para);};var J=I[0].parentNode;var K=[];for (var i=0;i<I.length;i++){H=I[i];J=FCKDomTools.GetCommonParents(H.parentNode,J).pop();}while (J.nodeName.IEquals('table','tbody','tr','ol','ul')) J=J.parentNode;var L=null;while (I.length>0){H=I.shift();while (H.parentNode!=J) H=H.parentNode;if (H!=L) K.push(H);L=H;}while (K.length>0){H=K.shift();if (H.nodeName.IEquals('blockquote')){var M=FCKTools.GetElementDocument(H).createDocumentFragment();while (H.firstChild){M.appendChild(H.removeChild(H.firstChild));I.push(M.lastChild);};H.parentNode.replaceChild(M,H);}else I.push(H);};var N=B.Window.document.createElement('blockquote');J.insertBefore(N,I[0]);while (I.length>0){H=I.shift();N.appendChild(H);}}else if (A==1){var O=[];var P={};while ((H=G.GetNextParagraph())){var Q=null;var R=null;while (H.parentNode){if (H.parentNode.nodeName.IEquals('blockquote')){Q=H.parentNode;R=H;break;};H=H.parentNode;};if (Q&&R&&!R._fckblockquotemoveout){O.push(R);FCKDomTools.SetElementMarker(P,R,'_fckblockquotemoveout',true);}};FCKDomTools.ClearAllMarkers(P);var S=[];var T=[],P={};var U=function(N){for (var i=0;i<N.childNodes.length;i++){if (FCKListsLib.BlockElements[N.childNodes[i].nodeName.toLowerCase()]) return false;};return true;};while (O.length>0){var W=O.shift();var N=W.parentNode;if (W==W.parentNode.firstChild) N.parentNode.insertBefore(N.removeChild(W),N);else if (W==W.parentNode.lastChild) N.parentNode.insertBefore(N.removeChild(W),N.nextSibling);else FCKDomTools.BreakParent(W,W.parentNode,B);if (!N._fckbqprocessed){T.push(N);FCKDomTools.SetElementMarker(P,N,'_fckbqprocessed',true);};S.push(W);};for (var i=T.length-1;i>=0;i--){var N=T[i];if (U(N)) FCKDomTools.RemoveNode(N);};FCKDomTools.ClearAllMarkers(P);if (FCKConfig.EnterMode.IEquals('br')){while (S.length){var W=S.shift();var a=true;if (W.nodeName.IEquals('div')){var M=FCKTools.GetElementDocument(W).createDocumentFragment();var c=a&&W.previousSibling&&!FCKListsLib.BlockBoundaries[W.previousSibling.nodeName.toLowerCase()];if (a&&c) M.appendChild(FCKTools.GetElementDocument(W).createElement('br'));var d=W.nextSibling&&!FCKListsLib.BlockBoundaries[W.nextSibling.nodeName.toLowerCase()];while (W.firstChild) M.appendChild(W.removeChild(W.firstChild));if (d) M.appendChild(FCKTools.GetElementDocument(W).createElement('br'));W.parentNode.replaceChild(M,W);a=false;}}}};B.MoveToBookmark(C);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;for (var i=0;i<A.Elements.length;i++){if (A.Elements[i].nodeName.IEquals('blockquote')) return 1;};return 0;}};
 var FCKCoreStyleCommand=function(A){this.Name='CoreStyle';this.StyleName='_FCK_'+A;this.IsActive=false;FCKStyles.AttachStyleStateChange(this.StyleName,this._OnStyleStateChange,this);};FCKCoreStyleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();if (this.IsActive) FCKStyles.RemoveStyle(this.StyleName);else FCKStyles.ApplyStyle(this.StyleName);FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0) return -1;return this.IsActive?1:0;},_OnStyleStateChange:function(A,B){this.IsActive=B;}};
 var FCKRemoveFormatCommand=function(){this.Name='RemoveFormat';};FCKRemoveFormatCommand.prototype={Execute:function(){FCKStyles.RemoveAll();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){return FCK.EditorWindow?0:-1;}};
 var FCKCommands=FCK.Commands={};FCKCommands.LoadedCommands={};FCKCommands.RegisterCommand=function(A,B){this.LoadedCommands[A]=B;};FCKCommands.GetCommand=function(A){var B=FCKCommands.LoadedCommands[A];if (B) return B;switch (A){case 'Bold':case 'Italic':case 'Underline':case 'StrikeThrough':case 'Subscript':case 'Superscript':B=new FCKCoreStyleCommand(A);break;case 'RemoveFormat':B=new FCKRemoveFormatCommand();break;case 'DocProps':B=new FCKDialogCommand('DocProps',FCKLang.DocProps,'dialog/fck_docprops.html',400,380,FCKCommands.GetFullPageState);break;case 'Templates':B=new FCKDialogCommand('Templates',FCKLang.DlgTemplatesTitle,'dialog/fck_template.html',380,450);break;case 'Link':B=new FCKDialogCommand('Link',FCKLang.DlgLnkWindowTitle,'dialog/fck_link.html',400,300);break;case 'Unlink':B=new FCKUnlinkCommand();break;case 'VisitLink':B=new FCKVisitLinkCommand();break;case 'Anchor':B=new FCKDialogCommand('Anchor',FCKLang.DlgAnchorTitle,'dialog/fck_anchor.html',370,160);break;case 'AnchorDelete':B=new FCKAnchorDeleteCommand();break;case 'BulletedList':B=new FCKDialogCommand('BulletedList',FCKLang.BulletedListProp,'dialog/fck_listprop.html?UL',370,160);break;case 'NumberedList':B=new FCKDialogCommand('NumberedList',FCKLang.NumberedListProp,'dialog/fck_listprop.html?OL',370,160);break;case 'About':B=new FCKDialogCommand('About',FCKLang.About,'dialog/fck_about.html',420,330,function(){ return 0;});break;case 'Find':B=new FCKDialogCommand('Find',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Find');break;case 'Replace':B=new FCKDialogCommand('Replace',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Replace');break;case 'Image':B=new FCKDialogCommand('Image',FCKLang.DlgImgTitle,'dialog/fck_image.html',450,390);break;case 'Flash':B=new FCKDialogCommand('Flash',FCKLang.DlgFlashTitle,'dialog/fck_flash.html',450,390);break;case 'SpecialChar':B=new FCKDialogCommand('SpecialChar',FCKLang.DlgSpecialCharTitle,'dialog/fck_specialchar.html',400,290);break;case 'Smiley':B=new FCKDialogCommand('Smiley',FCKLang.DlgSmileyTitle,'dialog/fck_smiley.html',FCKConfig.SmileyWindowWidth,FCKConfig.SmileyWindowHeight);break;case 'Table':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html',480,250);break;case 'TableProp':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html?Parent',480,250);break;case 'TableCellProp':B=new FCKDialogCommand('TableCell',FCKLang.DlgCellTitle,'dialog/fck_tablecell.html',550,240);break;case 'Style':B=new FCKStyleCommand();break;case 'FontName':B=new FCKFontNameCommand();break;case 'FontSize':B=new FCKFontSizeCommand();break;case 'FontFormat':B=new FCKFormatBlockCommand();break;case 'Source':B=new FCKSourceCommand();break;case 'Preview':B=new FCKPreviewCommand();break;case 'Save':B=new FCKSaveCommand();break;case 'NewPage':B=new FCKNewPageCommand();break;case 'PageBreak':B=new FCKPageBreakCommand();break;case 'Rule':B=new FCKRuleCommand();break;case 'Nbsp':B=new FCKNbsp();break;case 'TextColor':B=new FCKTextColorCommand('ForeColor');break;case 'BGColor':B=new FCKTextColorCommand('BackColor');break;case 'Paste':B=new FCKPasteCommand();break;case 'PasteText':B=new FCKPastePlainTextCommand();break;case 'PasteWord':B=new FCKPasteWordCommand();break;case 'JustifyLeft':B=new FCKJustifyCommand('left');break;case 'JustifyCenter':B=new FCKJustifyCommand('center');break;case 'JustifyRight':B=new FCKJustifyCommand('right');break;case 'JustifyFull':B=new FCKJustifyCommand('justify');break;case 'Indent':B=new FCKIndentCommand('indent',FCKConfig.IndentLength);break;case 'Outdent':B=new FCKIndentCommand('outdent',FCKConfig.IndentLength*-1);break;case 'Blockquote':B=new FCKBlockQuoteCommand();break;case 'CreateDiv':B=new FCKDialogCommand('CreateDiv',FCKLang.CreateDiv,'dialog/fck_div.html',380,210,null,null,true);break;case 'EditDiv':B=new FCKDialogCommand('EditDiv',FCKLang.EditDiv,'dialog/fck_div.html',380,210,null,null,false);break;case 'DeleteDiv':B=new FCKDeleteDivCommand();break;case 'TableInsertRowAfter':B=new FCKTableCommand('TableInsertRowAfter');break;case 'TableInsertRowBefore':B=new FCKTableCommand('TableInsertRowBefore');break;case 'TableDeleteRows':B=new FCKTableCommand('TableDeleteRows');break;case 'TableInsertColumnAfter':B=new FCKTableCommand('TableInsertColumnAfter');break;case 'TableInsertColumnBefore':B=new FCKTableCommand('TableInsertColumnBefore');break;case 'TableDeleteColumns':B=new FCKTableCommand('TableDeleteColumns');break;case 'TableInsertCellAfter':B=new FCKTableCommand('TableInsertCellAfter');break;case 'TableInsertCellBefore':B=new FCKTableCommand('TableInsertCellBefore');break;case 'TableDeleteCells':B=new FCKTableCommand('TableDeleteCells');break;case 'TableMergeCells':B=new FCKTableCommand('TableMergeCells');break;case 'TableMergeRight':B=new FCKTableCommand('TableMergeRight');break;case 'TableMergeDown':B=new FCKTableCommand('TableMergeDown');break;case 'TableHorizontalSplitCell':B=new FCKTableCommand('TableHorizontalSplitCell');break;case 'TableVerticalSplitCell':B=new FCKTableCommand('TableVerticalSplitCell');break;case 'TableDelete':B=new FCKTableCommand('TableDelete');break;case 'Form':B=new FCKDialogCommand('Form',FCKLang.Form,'dialog/fck_form.html',380,210);break;case 'Checkbox':B=new FCKDialogCommand('Checkbox',FCKLang.Checkbox,'dialog/fck_checkbox.html',380,200);break;case 'Radio':B=new FCKDialogCommand('Radio',FCKLang.RadioButton,'dialog/fck_radiobutton.html',380,200);break;case 'TextField':B=new FCKDialogCommand('TextField',FCKLang.TextField,'dialog/fck_textfield.html',380,210);break;case 'Textarea':B=new FCKDialogCommand('Textarea',FCKLang.Textarea,'dialog/fck_textarea.html',380,210);break;case 'HiddenField':B=new FCKDialogCommand('HiddenField',FCKLang.HiddenField,'dialog/fck_hiddenfield.html',380,190);break;case 'Button':B=new FCKDialogCommand('Button',FCKLang.Button,'dialog/fck_button.html',380,210);break;case 'Select':B=new FCKDialogCommand('Select',FCKLang.SelectionField,'dialog/fck_select.html',400,340);break;case 'ImageButton':B=new FCKDialogCommand('ImageButton',FCKLang.ImageButton,'dialog/fck_image.html?ImageButton',450,390);break;case 'SpellCheck':B=new FCKSpellCheckCommand();break;case 'FitWindow':B=new FCKFitWindow();break;case 'Undo':B=new FCKUndoCommand();break;case 'Redo':B=new FCKRedoCommand();break;case 'Copy':B=new FCKCutCopyCommand(false);break;case 'Cut':B=new FCKCutCopyCommand(true);break;case 'SelectAll':B=new FCKSelectAllCommand();break;case 'InsertOrderedList':B=new FCKListCommand('insertorderedlist','ol');break;case 'InsertUnorderedList':B=new FCKListCommand('insertunorderedlist','ul');break;case 'ShowBlocks':B=new FCKShowBlockCommand('ShowBlocks',FCKConfig.StartupShowBlocks?1:0);break;case 'Undefined':B=new FCKUndefinedCommand();break;default:if (FCKRegexLib.NamedCommands.test(A)) B=new FCKNamedCommand(A);else{alert(FCKLang.UnknownCommand.replace(/%1/g,A));return null;}};FCKCommands.LoadedCommands[A]=B;return B;};FCKCommands.GetFullPageState=function(){return FCKConfig.FullPage?0:-1;};FCKCommands.GetBooleanState=function(A){return A?-1:0;};
-var FCKPanel=function(A){this.IsRTL=(FCKLang.Dir=='rtl');this.IsContextMenu=false;this._LockCounter=0;this._Window=A||window;var B;if (FCKBrowserInfo.IsIE){this._Popup=this._Window.createPopup();var C=this._Window.document;if (FCK_IS_CUSTOM_DOMAIN&&!FCKBrowserInfo.IsIE7){C.domain=FCK_ORIGINAL_DOMAIN;document.domain=FCK_ORIGINAL_DOMAIN;};B=this.Document=this._Popup.document;if (FCK_IS_CUSTOM_DOMAIN){B.domain=FCK_RUNTIME_DOMAIN;C.domain=FCK_RUNTIME_DOMAIN;document.domain=FCK_RUNTIME_DOMAIN;};FCK.IECleanup.AddItem(this,FCKPanel_Cleanup);}else{var D=this._IFrame=this._Window.document.createElement('iframe');FCKTools.ResetStyles(D);D.src='javascript:void(0)';D.allowTransparency=true;D.frameBorder='0';D.scrolling='no';D.style.width=D.style.height='0px';FCKDomTools.SetElementStyles(D,{position:'absolute',zIndex:FCKConfig.FloatingPanelsZIndex});this._Window.document.body.appendChild(D);var E=D.contentWindow;B=this.Document=E.document;var F='';if (FCKBrowserInfo.IsSafari) F='<base href="'+window.document.location+'">';B.open();B.write('<html><head>'+F+'<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>');B.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.Panel_Contructor(B,window.document.location);FCKTools.AddEventListenerEx(E,'focus',FCKPanel_Window_OnFocus,this);FCKTools.AddEventListenerEx(E,'blur',FCKPanel_Window_OnBlur,this);};B.dir=FCKLang.Dir;FCKTools.AddEventListener(B,'contextmenu',FCKTools.CancelEvent);this.MainNode=B.body.appendChild(B.createElement('DIV'));this.MainNode.style.cssFloat=this.IsRTL?'right':'left';};FCKPanel.prototype.AppendStyleSheet=function(A){FCKTools.AppendStyleSheet(this.Document,A);};FCKPanel.prototype.Preload=function(x,y,A){if (this._Popup) this._Popup.show(x,y,0,0,A);};FCKPanel.prototype.Show=function(x,y,A,B,C){var D;var E=this.MainNode;if (this._Popup){this._Popup.show(x,y,0,0,A);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=(x*-1)+A.offsetWidth-D;};this._Popup.show(x,y,D,E.offsetHeight,A);if (this.OnHide){if (this._Timer) CheckPopupOnHide.call(this,true);this._Timer=FCKTools.SetInterval(CheckPopupOnHide,100,this);}}else{if (typeof(FCK.ToolbarSet.CurrentInstance.FocusManager)!='undefined') FCK.ToolbarSet.CurrentInstance.FocusManager.Lock();if (this.ParentPanel){this.ParentPanel.Lock();FCKPanel_Window_OnBlur(null,this.ParentPanel);};if (FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac){this._IFrame.scrolling='';FCKTools.RunFunction(function(){ this._IFrame.scrolling='no';},this);};if (FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel&&FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel!=this) FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel.Hide(false,true);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (!B)	this._IFrame.width=1;if (!C)	this._IFrame.height=1;D=E.offsetWidth||E.firstChild.offsetWidth;var F=FCKTools.GetDocumentPosition(this._Window,A.nodeType==9?(FCKTools.IsStrictMode(A)?A.documentElement:A.body):A);var G=FCKDomTools.GetPositionedAncestor(this._IFrame.parentNode);if (G){var H=FCKTools.GetDocumentPosition(FCKTools.GetElementWindow(G),G);F.x-=H.x;F.y-=H.y;};if (this.IsRTL&&!this.IsContextMenu) x=(x*-1);x+=F.x;y+=F.y;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=x+A.offsetWidth-D;}else{var I=FCKTools.GetViewPaneSize(this._Window);var J=FCKTools.GetScrollPosition(this._Window);var K=I.Height+J.Y;var L=I.Width+J.X;if ((x+D)>L) x-=x+D-L;if ((y+E.offsetHeight)>K) y-=y+E.offsetHeight-K;};FCKDomTools.SetElementStyles(this._IFrame,{left:x+'px',top:y+'px'});this._IFrame.contentWindow.focus();this._IsOpened=true;var M=this;this._resizeTimer=setTimeout(function(){var N=E.offsetWidth||E.firstChild.offsetWidth;var O=E.offsetHeight;M._IFrame.style.width=N+'px';M._IFrame.style.height=O+'px';},0);FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel=this;};FCKTools.RunFunction(this.OnShow,this);};FCKPanel.prototype.Hide=function(A,B){if (this._Popup) this._Popup.hide();else{if (!this._IsOpened||this._LockCounter>0) return;if (typeof(FCKFocusManager)!='undefined'&&!B) FCKFocusManager.Unlock();this._IFrame.style.width=this._IFrame.style.height='0px';this._IsOpened=false;if (this._resizeTimer){clearTimeout(this._resizeTimer);this._resizeTimer=null;};if (this.ParentPanel) this.ParentPanel.Unlock();if (!A) FCKTools.RunFunction(this.OnHide,this);}};FCKPanel.prototype.CheckIsOpened=function(){if (this._Popup) return this._Popup.isOpen;else return this._IsOpened;};FCKPanel.prototype.CreateChildPanel=function(){var A=this._Popup?FCKTools.GetDocumentWindow(this.Document):this._Window;var B=new FCKPanel(A);B.ParentPanel=this;return B;};FCKPanel.prototype.Lock=function(){this._LockCounter++;};FCKPanel.prototype.Unlock=function(){if (--this._LockCounter==0&&!this.HasFocus) this.Hide();};function FCKPanel_Window_OnFocus(e,A){A.HasFocus=true;};function FCKPanel_Window_OnBlur(e,A){A.HasFocus=false;if (A._LockCounter==0) FCKTools.RunFunction(A.Hide,A);};function CheckPopupOnHide(A){if (A||!this._Popup.isOpen){window.clearInterval(this._Timer);this._Timer=null;FCKTools.RunFunction(this.OnHide,this);}};function FCKPanel_Cleanup(){this._Popup=null;this._Window=null;this.Document=null;this.MainNode=null;};
+var FCKPanel=function(A){this.IsRTL=(FCKLang.Dir=='rtl');this.IsContextMenu=false;this._LockCounter=0;this._Window=A||window;var B;if (FCKBrowserInfo.IsIE){this._Popup=this._Window.createPopup();var C=this._Window.document;if (FCK_IS_CUSTOM_DOMAIN&&!FCKBrowserInfo.IsIE7){C.domain=FCK_ORIGINAL_DOMAIN;document.domain=FCK_ORIGINAL_DOMAIN;};B=this.Document=this._Popup.document;if (FCK_IS_CUSTOM_DOMAIN){B.domain=FCK_RUNTIME_DOMAIN;C.domain=FCK_RUNTIME_DOMAIN;document.domain=FCK_RUNTIME_DOMAIN;};FCK.IECleanup.AddItem(this,FCKPanel_Cleanup);}else{var D=this._IFrame=this._Window.document.createElement('iframe');FCKTools.ResetStyles(D);D.src='javascript:void(0)';D.allowTransparency=true;D.frameBorder='0';D.scrolling='no';D.style.width=D.style.height='0px';FCKDomTools.SetElementStyles(D,{position:'absolute',zIndex:FCKConfig.FloatingPanelsZIndex});this._Window.document.body.appendChild(D);var E=D.contentWindow;B=this.Document=E.document;var F='';if (FCKBrowserInfo.IsSafari) F='<base href="'+window.document.location+'">';B.open();B.write('<html><head>'+F+'<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>');B.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.Panel_Contructor(B,window.document.location);FCKTools.AddEventListenerEx(E,'focus',FCKPanel_Window_OnFocus,this);FCKTools.AddEventListenerEx(E,'blur',FCKPanel_Window_OnBlur,this);};B.dir=FCKLang.Dir;FCKTools.AddEventListener(B,'contextmenu',FCKTools.CancelEvent);this.MainNode=B.body.appendChild(B.createElement('DIV'));this.MainNode.style.cssFloat=this.IsRTL?'right':'left';};FCKPanel.prototype.AppendStyleSheet=function(A){FCKTools.AppendStyleSheet(this.Document,A);};FCKPanel.prototype.Preload=function(x,y,A){if (this._Popup) this._Popup.show(x,y,0,0,A);};FCKPanel.prototype.ResizeForSubpanel=function(A,B,C){if (!FCKBrowserInfo.IsIE7) return false;if (!this._Popup.isOpen){this.Subpanel=null;return false;};if (B==0&&C==0){if (this.Subpanel!==A) return false;this.Subpanel=null;this.IncreasedX=0;}else{this.Subpanel=A;if ((this.IncreasedX>=B)&&(this.IncreasedY>=C)) return false;this.IncreasedX=Math.max(this.IncreasedX,B);this.IncreasedY=Math.max(this.IncreasedY,C);};var x=this.ShowRect.x;var w=this.IncreasedX;if (this.IsRTL) x=x-w;var D=this.ShowRect.w+w;var E=Math.max(this.ShowRect.h,this.IncreasedY);if (this.ParentPanel) this.ParentPanel.ResizeForSubpanel(this,D,E);this._Popup.show(x,this.ShowRect.y,D,E,this.RelativeElement);return this.IsRTL;};FCKPanel.prototype.Show=function(x,y,A,B,C){var D;var E=this.MainNode;if (this._Popup){this._Popup.show(x,y,0,0,A);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (FCKBrowserInfo.IsIE7){if (this.ParentPanel&&this.ParentPanel.ResizeForSubpanel(this,D,E.offsetHeight)){FCKTools.RunFunction(this.Show,this,[x,y,A]);return;}};if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=(x*-1)+A.offsetWidth-D;};if (FCKBrowserInfo.IsIE7){this.ShowRect={x:x,y:y,w:D,h:E.offsetHeight};this.IncreasedX=0;this.IncreasedY=0;this.RelativeElement=A;};this._Popup.show(x,y,D,E.offsetHeight,A);if (this.OnHide){if (this._Timer) CheckPopupOnHide.call(this,true);this._Timer=FCKTools.SetInterval(CheckPopupOnHide,100,this);}}else{if (typeof(FCK.ToolbarSet.CurrentInstance.FocusManager)!='undefined') FCK.ToolbarSet.CurrentInstance.FocusManager.Lock();if (this.ParentPanel){this.ParentPanel.Lock();FCKPanel_Window_OnBlur(null,this.ParentPanel);};if (FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac){this._IFrame.scrolling='';FCKTools.RunFunction(function(){ this._IFrame.scrolling='no';},this);};if (FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel&&FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel!=this) FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel.Hide(false,true);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (!B)	this._IFrame.width=1;if (!C)	this._IFrame.height=1;D=E.offsetWidth||E.firstChild.offsetWidth;var F=FCKTools.GetDocumentPosition(this._Window,A.nodeType==9?(FCKTools.IsStrictMode(A)?A.documentElement:A.body):A);var G=FCKDomTools.GetPositionedAncestor(this._IFrame.parentNode);if (G){var H=FCKTools.GetDocumentPosition(FCKTools.GetElementWindow(G),G);F.x-=H.x;F.y-=H.y;};if (this.IsRTL&&!this.IsContextMenu) x=(x*-1);x+=F.x;y+=F.y;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=x+A.offsetWidth-D;}else{var I=FCKTools.GetViewPaneSize(this._Window);var J=FCKTools.GetScrollPosition(this._Window);var K=I.Height+J.Y;var L=I.Width+J.X;if ((x+D)>L) x-=x+D-L;if ((y+E.offsetHeight)>K) y-=y+E.offsetHeight-K;};FCKDomTools.SetElementStyles(this._IFrame,{left:x+'px',top:y+'px'});this._IFrame.contentWindow.focus();this._IsOpened=true;var M=this;this._resizeTimer=setTimeout(function(){var N=E.offsetWidth||E.firstChild.offsetWidth;var O=E.offsetHeight;M._IFrame.style.width=N+'px';M._IFrame.style.height=O+'px';},0);FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel=this;};FCKTools.RunFunction(this.OnShow,this);};FCKPanel.prototype.Hide=function(A,B){if (this._Popup) this._Popup.hide();else{if (!this._IsOpened||this._LockCounter>0) return;if (typeof(FCKFocusManager)!='undefined'&&!B) FCKFocusManager.Unlock();this._IFrame.style.width=this._IFrame.style.height='0px';this._IsOpened=false;if (this._resizeTimer){clearTimeout(this._resizeTimer);this._resizeTimer=null;};if (this.ParentPanel) this.ParentPanel.Unlock();if (!A) FCKTools.RunFunction(this.OnHide,this);}};FCKPanel.prototype.CheckIsOpened=function(){if (this._Popup) return this._Popup.isOpen;else return this._IsOpened;};FCKPanel.prototype.CreateChildPanel=function(){var A=this._Popup?FCKTools.GetDocumentWindow(this.Document):this._Window;var B=new FCKPanel(A);B.ParentPanel=this;return B;};FCKPanel.prototype.Lock=function(){this._LockCounter++;};FCKPanel.prototype.Unlock=function(){if (--this._LockCounter==0&&!this.HasFocus) this.Hide();};function FCKPanel_Window_OnFocus(e,A){A.HasFocus=true;};function FCKPanel_Window_OnBlur(e,A){A.HasFocus=false;if (A._LockCounter==0) FCKTools.RunFunction(A.Hide,A);};function CheckPopupOnHide(A){if (A||!this._Popup.isOpen){window.clearInterval(this._Timer);this._Timer=null;if (this._Popup&&this.ParentPanel&&!A) this.ParentPanel.ResizeForSubpanel(this,0,0);FCKTools.RunFunction(this.OnHide,this);}};function FCKPanel_Cleanup(){this._Popup=null;this._Window=null;this.Document=null;this.MainNode=null;this.RelativeElement=null;};
 var FCKIcon=function(A){var B=A?typeof(A):'undefined';switch (B){case 'number':this.Path=FCKConfig.SkinPath+'fck_strip.gif';this.Size=16;this.Position=A;break;case 'undefined':this.Path=FCK_SPACER_PATH;break;case 'string':this.Path=A;break;default:this.Path=A[0];this.Size=A[1];this.Position=A[2];}};FCKIcon.prototype.CreateIconElement=function(A){var B,eIconImage;if (this.Position){var C='-'+((this.Position-1)*this.Size)+'px';if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path;eIconImage.style.top=C;}else{B=A.createElement('IMG');B.src=FCK_SPACER_PATH;B.style.backgroundPosition='0px '+C;B.style.backgroundImage='url("'+this.Path+'")';}}else{if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path?this.Path:FCK_SPACER_PATH;}else{B=A.createElement('IMG');B.src=this.Path?this.Path:FCK_SPACER_PATH;}};B.className='TB_Button_Image';return B;};
 var FCKToolbarButtonUI=function(A,B,C,D,E,F){this.Name=A;this.Label=B||A;this.Tooltip=C||this.Label;this.Style=E||0;this.State=F||0;this.Icon=new FCKIcon(D);if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarButtonUI_Cleanup);};FCKToolbarButtonUI.prototype._CreatePaddingElement=function(A){var B=A.createElement('IMG');B.className='TB_Button_Padding';B.src=FCK_SPACER_PATH;return B;};FCKToolbarButtonUI.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var C=this.MainElement=B.createElement('DIV');C.title=this.Tooltip;if (FCKBrowserInfo.IsGecko) C.onmousedown=FCKTools.CancelEvent;FCKTools.AddEventListenerEx(C,'mouseover',FCKToolbarButtonUI_OnMouseOver,this);FCKTools.AddEventListenerEx(C,'mouseout',FCKToolbarButtonUI_OnMouseOut,this);FCKTools.AddEventListenerEx(C,'click',FCKToolbarButtonUI_OnClick,this);this.ChangeState(this.State,true);if (this.Style==0&&!this.ShowArrow){C.appendChild(this.Icon.CreateIconElement(B));}else{var D=C.appendChild(B.createElement('TABLE'));D.cellPadding=0;D.cellSpacing=0;var E=D.insertRow(-1);var F=E.insertCell(-1);if (this.Style==0||this.Style==2) F.appendChild(this.Icon.CreateIconElement(B));else F.appendChild(this._CreatePaddingElement(B));if (this.Style==1||this.Style==2){F=E.insertCell(-1);F.className='TB_Button_Text';F.noWrap=true;F.appendChild(B.createTextNode(this.Label));};if (this.ShowArrow){if (this.Style!=0){E.insertCell(-1).appendChild(this._CreatePaddingElement(B));};F=E.insertCell(-1);var G=F.appendChild(B.createElement('IMG'));G.src=FCKConfig.SkinPath+'images/toolbar.buttonarrow.gif';G.width=5;G.height=3;};F=E.insertCell(-1);F.appendChild(this._CreatePaddingElement(B));};A.appendChild(C);};FCKToolbarButtonUI.prototype.ChangeState=function(A,B){if (!B&&this.State==A) return;var e=this.MainElement;if (!e) return;switch (parseInt(A,10)){case 0:e.className='TB_Button_Off';break;case 1:e.className='TB_Button_On';break;case -1:e.className='TB_Button_Disabled';break;};this.State=A;};function FCKToolbarButtonUI_OnMouseOver(A,B){if (B.State==0) this.className='TB_Button_Off_Over';else if (B.State==1) this.className='TB_Button_On_Over';};function FCKToolbarButtonUI_OnMouseOut(A,B){if (B.State==0) this.className='TB_Button_Off';else if (B.State==1) this.className='TB_Button_On';};function FCKToolbarButtonUI_OnClick(A,B){if (B.OnClick&&B.State!=-1) B.OnClick(B);};function FCKToolbarButtonUI_Cleanup(){this.MainElement=null;};
 var FCKToolbarButton=function(A,B,C,D,E,F,G){this.CommandName=A;this.Label=B;this.Tooltip=C;this.Style=D;this.SourceView=E?true:false;this.ContextSensitive=F?true:false;if (G==null) this.IconPath=FCKConfig.SkinPath+'toolbar/'+A.toLowerCase()+'.gif';else if (typeof(G)=='number') this.IconPath=[FCKConfig.SkinPath+'fck_strip.gif',16,G];else this.IconPath=G;};FCKToolbarButton.prototype.Create=function(A){this._UIButton=new FCKToolbarButtonUI(this.CommandName,this.Label,this.Tooltip,this.IconPath,this.Style);this._UIButton.OnClick=this.Click;this._UIButton._ToolbarButton=this;this._UIButton.Create(A);};FCKToolbarButton.prototype.RefreshState=function(){var A=this._UIButton;if (!A) return;var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).GetState();if (B==A.State) return;A.ChangeState(B);};FCKToolbarButton.prototype.Click=function(){var A=this._ToolbarButton||this;FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(A.CommandName).Execute();};FCKToolbarButton.prototype.Enable=function(){this.RefreshState();};FCKToolbarButton.prototype.Disable=function(){this._UIButton.ChangeState(-1);};
@@ -98,12 +98,12 @@ var FCKToolbarItems={};FCKToolbarItems.LoadedItems={};FCKToolbarItems.RegisterIt
 var FCKToolbar=function(){this.Items=[];};FCKToolbar.prototype.AddItem=function(A){return this.Items[this.Items.length]=A;};FCKToolbar.prototype.AddButton=function(A,B,C,D,E,F){if (typeof(D)=='number') D=[this.DefaultIconsStrip,this.DefaultIconSize,D];var G=new FCKToolbarButtonUI(A,B,C,D,E,F);G._FCKToolbar=this;G.OnClick=FCKToolbar_OnItemClick;return this.AddItem(G);};function FCKToolbar_OnItemClick(A){var B=A._FCKToolbar;if (B.OnItemClick) B.OnItemClick(B,A);};FCKToolbar.prototype.AddSeparator=function(){this.AddItem(new FCKToolbarSeparator());};FCKToolbar.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var e=B.createElement('table');e.className='TB_Toolbar';e.style.styleFloat=e.style.cssFloat=(FCKLang.Dir=='ltr'?'left':'right');e.dir=FCKLang.Dir;e.cellPadding=0;e.cellSpacing=0;var C=e.insertRow(-1);var D;if (!this.HideStart){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_Start';};for (var i=0;i<this.Items.length;i++){this.Items[i].Create(C.insertCell(-1));};if (!this.HideEnd){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_End';};A.appendChild(e);};var FCKToolbarSeparator=function(){};FCKToolbarSeparator.prototype.Create=function(A){FCKTools.AppendElement(A,'div').className='TB_Separator';};
 var FCKToolbarBreak=function(){};FCKToolbarBreak.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A).createElement('div');B.className='TB_Break';B.style.clear=FCKLang.Dir=='rtl'?'left':'right';A.appendChild(B);};
 function FCKToolbarSet_Create(A){var B;var C=A||FCKConfig.ToolbarLocation;switch (C){case 'In':document.getElementById('xToolbarRow').style.display='';B=new FCKToolbarSet(document);break;case 'None':B=new FCKToolbarSet(document);break;default:FCK.Events.AttachEvent('OnBlur',FCK_OnBlur);FCK.Events.AttachEvent('OnFocus',FCK_OnFocus);var D;var E=C.match(/^Out:(.+)\((\w+)\)$/);if (E){if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_GetOutElement(window,E);else D=eval('parent.'+E[1]).document.getElementById(E[2]);}else{E=C.match(/^Out:(\w+)$/);if (E) D=parent.document.getElementById(E[1]);};if (!D){alert('Invalid value for "ToolbarLocation"');return arguments.callee('In');};B=D.__FCKToolbarSet;if (B) break;var F=FCKTools.GetElementDocument(D).createElement('iframe');F.src='javascript:void(0)';F.frameBorder=0;F.width='100%';F.height='10';D.appendChild(F);F.unselectable='on';var G=F.contentWindow.document;var H='';if (FCKBrowserInfo.IsSafari) H='<base href="'+window.document.location+'">';G.open();G.write('<html><head>'+H+'<script type="text/javascript"> var adjust = function() { window.frameElement.height = document.body.scrollHeight ; }; window.onresize = window.onload = function(){var timer = null;var lastHeight = -1;var lastChange = 0;var poller = function(){var currentHeight = document.body.scrollHeight || 0;var currentTime = (new Date()).getTime();if (currentHeight != lastHeight){lastChange = currentTime;adjust();lastHeight = document.body.scrollHeight;}if (lastChange < currentTime - 1000) clearInterval(timer);};timer = setInterval(poller, 100);}</script></head><body style="overflow: hidden">'+document.getElementById('xToolbarSpace').innerHTML+'</body></html>');G.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_InitOutFrame(G);FCKTools.AddEventListener(G,'contextmenu',FCKTools.CancelEvent);FCKTools.AppendStyleSheet(G,FCKConfig.SkinEditorCSS);B=D.__FCKToolbarSet=new FCKToolbarSet(G);B._IFrame=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(D,FCKToolbarSet_Target_Cleanup);};B.CurrentInstance=FCK;if (!B.ToolbarItems) B.ToolbarItems=FCKToolbarItems;FCK.AttachToOnSelectionChange(B.RefreshItemsState);return B;};function FCK_OnBlur(A){var B=A.ToolbarSet;if (B.CurrentInstance==A) B.Disable();};function FCK_OnFocus(A){var B=A.ToolbarSet;var C=A||FCK;B.CurrentInstance.FocusManager.RemoveWindow(B._IFrame.contentWindow);B.CurrentInstance=C;C.FocusManager.AddWindow(B._IFrame.contentWindow,true);B.Enable();};function FCKToolbarSet_Cleanup(){this._TargetElement=null;this._IFrame=null;};function FCKToolbarSet_Target_Cleanup(){this.__FCKToolbarSet=null;};var FCKToolbarSet=function(A){this._Document=A;this._TargetElement=A.getElementById('xToolbar');var B=A.getElementById('xExpandHandle');var C=A.getElementById('xCollapseHandle');B.title=FCKLang.ToolbarExpand;FCKTools.AddEventListener(B,'click',FCKToolbarSet_Expand_OnClick);C.title=FCKLang.ToolbarCollapse;FCKTools.AddEventListener(C,'click',FCKToolbarSet_Collapse_OnClick);if (!FCKConfig.ToolbarCanCollapse||FCKConfig.ToolbarStartExpanded) this.Expand();else this.Collapse();C.style.display=FCKConfig.ToolbarCanCollapse?'':'none';if (FCKConfig.ToolbarCanCollapse) C.style.display='';else A.getElementById('xTBLeftBorder').style.display='';this.Toolbars=[];this.IsLoaded=false;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarSet_Cleanup);};function FCKToolbarSet_Expand_OnClick(){FCK.ToolbarSet.Expand();};function FCKToolbarSet_Collapse_OnClick(){FCK.ToolbarSet.Collapse();};FCKToolbarSet.prototype.Expand=function(){this._ChangeVisibility(false);};FCKToolbarSet.prototype.Collapse=function(){this._ChangeVisibility(true);};FCKToolbarSet.prototype._ChangeVisibility=function(A){this._Document.getElementById('xCollapsed').style.display=A?'':'none';this._Document.getElementById('xExpanded').style.display=A?'none':'';if (FCKBrowserInfo.IsGecko){FCKTools.RunFunction(window.onresize);}};FCKToolbarSet.prototype.Load=function(A){this.Name=A;this.Items=[];this.ItemsWysiwygOnly=[];this.ItemsContextSensitive=[];this._TargetElement.innerHTML='';var B=FCKConfig.ToolbarSets[A];if (!B){alert(FCKLang.UnknownToolbarSet.replace(/%1/g,A));return;};this.Toolbars=[];for (var x=0;x<B.length;x++){var C=B[x];if (!C) continue;var D;if (typeof(C)=='string'){if (C=='/') D=new FCKToolbarBreak();}else{D=new FCKToolbar();for (var j=0;j<C.length;j++){var E=C[j];if (E=='-') D.AddSeparator();else{var F=FCKToolbarItems.GetItem(E);if (F){D.AddItem(F);this.Items.push(F);if (!F.SourceView) this.ItemsWysiwygOnly.push(F);if (F.ContextSensitive) this.ItemsContextSensitive.push(F);}}}};D.Create(this._TargetElement);this.Toolbars[this.Toolbars.length]=D;};FCKTools.DisableSelection(this._Document.getElementById('xCollapseHandle').parentNode);if (FCK.Status!=2) FCK.Events.AttachEvent('OnStatusChange',this.RefreshModeState);else this.RefreshModeState();this.IsLoaded=true;this.IsEnabled=true;FCKTools.RunFunction(this.OnLoad);};FCKToolbarSet.prototype.Enable=function(){if (this.IsEnabled) return;this.IsEnabled=true;var A=this.Items;for (var i=0;i<A.length;i++) A[i].RefreshState();};FCKToolbarSet.prototype.Disable=function(){if (!this.IsEnabled) return;this.IsEnabled=false;var A=this.Items;for (var i=0;i<A.length;i++) A[i].Disable();};FCKToolbarSet.prototype.RefreshModeState=function(A){if (FCK.Status!=2) return;var B=A?A.ToolbarSet:this;var C=B.ItemsWysiwygOnly;if (FCK.EditMode==0){for (var i=0;i<C.length;i++) C[i].Enable();B.RefreshItemsState(A);}else{B.RefreshItemsState(A);for (var j=0;j<C.length;j++) C[j].Disable();}};FCKToolbarSet.prototype.RefreshItemsState=function(A){var B=(A?A.ToolbarSet:this).ItemsContextSensitive;for (var i=0;i<B.length;i++) B[i].RefreshState();};
-var FCKDialog=(function(){var A;var B;var C;var D=window.parent;while (D.parent&&D.parent!=D){try{if (D.parent.document.domain!=document.domain) break;if (D.parent.document.getElementsByTagName('frameset').length>0) break;}catch (e){break;};D=D.parent;};var E=D.document;var F=function(){if (!B) B=FCKConfig.FloatingPanelsZIndex+999;return++B;};var G=function(){if (!C) return;var H=FCKTools.IsStrictMode(E)?E.documentElement:E.body;FCKDomTools.SetElementStyles(C,{'width':Math.max(H.scrollWidth,H.clientWidth,E.scrollWidth||0)-1+'px','height':Math.max(H.scrollHeight,H.clientHeight,E.scrollHeight||0)-1+'px'});};return {OpenDialog:function(dialogName,dialogTitle,dialogPage,width,height,customValue,parentWindow,resizable){if (!A) this.DisplayMainCover();var I={Title:dialogTitle,Page:dialogPage,Editor:window,CustomValue:customValue,TopWindow:D};FCK.ToolbarSet.CurrentInstance.Selection.Save();var J=FCKTools.GetViewPaneSize(D);var K={ 'X':0,'Y':0 };var L=FCKBrowserInfo.IsIE&&(!FCKBrowserInfo.IsIE7||!FCKTools.IsStrictMode(D.document));if (L) K=FCKTools.GetScrollPosition(D);var M=Math.max(K.Y+(J.Height-height-20)/2,0);var N=Math.max(K.X+(J.Width-width-20)/2,0);var O=E.createElement('iframe');FCKTools.ResetStyles(O);O.src=FCKConfig.BasePath+'fckdialog.html';O.frameBorder=0;O.allowTransparency=true;FCKDomTools.SetElementStyles(O,{'position':(L)?'absolute':'fixed','top':M+'px','left':N+'px','width':width+'px','height':height+'px','zIndex':F()});O._DialogArguments=I;E.body.appendChild(O);O._ParentDialog=A;A=O;},OnDialogClose:function(dialogWindow){var O=dialogWindow.frameElement;FCKDomTools.RemoveNode(O);if (O._ParentDialog){A=O._ParentDialog;O._ParentDialog.contentWindow.SetEnabled(true);}else{if (!FCKBrowserInfo.IsIE) FCK.Focus();this.HideMainCover();setTimeout(function(){ A=null;},0);FCK.ToolbarSet.CurrentInstance.Selection.Release();}},DisplayMainCover:function(){C=E.createElement('div');FCKTools.ResetStyles(C);FCKDomTools.SetElementStyles(C,{'position':'absolute','zIndex':F(),'top':'0px','left':'0px','backgroundColor':FCKConfig.BackgroundBlockerColor});FCKDomTools.SetOpacity(C,FCKConfig.BackgroundBlockerOpacity);if (FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsIE7){var Q=E.createElement('iframe');FCKTools.ResetStyles(Q);Q.hideFocus=true;Q.frameBorder=0;Q.src=FCKTools.GetVoidUrl();FCKDomTools.SetElementStyles(Q,{'width':'100%','height':'100%','position':'absolute','left':'0px','top':'0px','filter':'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'});C.appendChild(Q);};FCKTools.AddEventListener(D,'resize',G);G();E.body.appendChild(C);FCKFocusManager.Lock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R._fck_originalTabIndex=R.tabIndex;R.tabIndex=-1;},HideMainCover:function(){FCKDomTools.RemoveNode(C);FCKFocusManager.Unlock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R.tabIndex=R._fck_originalTabIndex;FCKDomTools.ClearElementJSProperty(R,'_fck_originalTabIndex');},GetCover:function(){return C;}};})();
+var FCKDialog=(function(){var A;var B;var C;var D=window.parent;while (D.parent&&D.parent!=D){try{if (D.parent.document.domain!=document.domain) break;if (D.parent.document.getElementsByTagName('frameset').length>0) break;}catch (e){break;};D=D.parent;};var E=D.document;var F=function(){if (!B) B=FCKConfig.FloatingPanelsZIndex+999;return++B;};var G=function(){if (!C) return;var H=FCKTools.IsStrictMode(E)?E.documentElement:E.body;FCKDomTools.SetElementStyles(C,{'width':Math.max(H.scrollWidth,H.clientWidth,E.scrollWidth||0)-1+'px','height':Math.max(H.scrollHeight,H.clientHeight,E.scrollHeight||0)-1+'px'});};return {OpenDialog:function(dialogName,dialogTitle,dialogPage,width,height,customValue,parentWindow,resizable){if (!A) this.DisplayMainCover();var I={Title:dialogTitle,Page:dialogPage,Editor:window,CustomValue:customValue,TopWindow:D};FCK.ToolbarSet.CurrentInstance.Selection.Save(true);var J=FCKTools.GetViewPaneSize(D);var K={ 'X':0,'Y':0 };var L=FCKBrowserInfo.IsIE&&(!FCKBrowserInfo.IsIE7||!FCKTools.IsStrictMode(D.document));if (L) K=FCKTools.GetScrollPosition(D);var M=Math.max(K.Y+(J.Height-height-20)/2,0);var N=Math.max(K.X+(J.Width-width-20)/2,0);var O=E.createElement('iframe');FCKTools.ResetStyles(O);O.src=FCKConfig.BasePath+'fckdialog.html';O.frameBorder=0;O.allowTransparency=true;FCKDomTools.SetElementStyles(O,{'position':(L)?'absolute':'fixed','top':M+'px','left':N+'px','width':width+'px','height':height+'px','zIndex':F()});O._DialogArguments=I;E.body.appendChild(O);O._ParentDialog=A;A=O;},OnDialogClose:function(dialogWindow){var O=dialogWindow.frameElement;FCKDomTools.RemoveNode(O);if (O._ParentDialog){A=O._ParentDialog;O._ParentDialog.contentWindow.SetEnabled(true);}else{if (!FCKBrowserInfo.IsIE) FCK.Focus();this.HideMainCover();setTimeout(function(){ A=null;},0);FCK.ToolbarSet.CurrentInstance.Selection.Release();}},DisplayMainCover:function(){C=E.createElement('div');FCKTools.ResetStyles(C);FCKDomTools.SetElementStyles(C,{'position':'absolute','zIndex':F(),'top':'0px','left':'0px','backgroundColor':FCKConfig.BackgroundBlockerColor});FCKDomTools.SetOpacity(C,FCKConfig.BackgroundBlockerOpacity);if (FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsIE7){var Q=E.createElement('iframe');FCKTools.ResetStyles(Q);Q.hideFocus=true;Q.frameBorder=0;Q.src=FCKTools.GetVoidUrl();FCKDomTools.SetElementStyles(Q,{'width':'100%','height':'100%','position':'absolute','left':'0px','top':'0px','filter':'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'});C.appendChild(Q);};FCKTools.AddEventListener(D,'resize',G);G();E.body.appendChild(C);FCKFocusManager.Lock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R._fck_originalTabIndex=R.tabIndex;R.tabIndex=-1;},HideMainCover:function(){FCKDomTools.RemoveNode(C);FCKFocusManager.Unlock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R.tabIndex=R._fck_originalTabIndex;FCKDomTools.ClearElementJSProperty(R,'_fck_originalTabIndex');},GetCover:function(){return C;}};})();
 var FCKMenuItem=function(A,B,C,D,E,F){this.Name=B;this.Label=C||B;this.IsDisabled=E;this.Icon=new FCKIcon(D);this.SubMenu=new FCKMenuBlockPanel();this.SubMenu.Parent=A;this.SubMenu.OnClick=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnClick,this);this.CustomData=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuItem_Cleanup);};FCKMenuItem.prototype.AddItem=function(A,B,C,D,E){this.HasSubMenu=true;return this.SubMenu.AddItem(A,B,C,D,E);};FCKMenuItem.prototype.AddSeparator=function(){this.SubMenu.AddSeparator();};FCKMenuItem.prototype.Create=function(A){var B=this.HasSubMenu;var C=FCKTools.GetElementDocument(A);var r=this.MainElement=A.insertRow(-1);r.className=this.IsDisabled?'MN_Item_Disabled':'MN_Item';if (!this.IsDisabled){FCKTools.AddEventListenerEx(r,'mouseover',FCKMenuItem_OnMouseOver,[this]);FCKTools.AddEventListenerEx(r,'click',FCKMenuItem_OnClick,[this]);if (!B) FCKTools.AddEventListenerEx(r,'mouseout',FCKMenuItem_OnMouseOut,[this]);};var D=r.insertCell(-1);D.className='MN_Icon';D.appendChild(this.Icon.CreateIconElement(C));D=r.insertCell(-1);D.className='MN_Label';D.noWrap=true;D.appendChild(C.createTextNode(this.Label));D=r.insertCell(-1);if (B){D.className='MN_Arrow';var E=D.appendChild(C.createElement('IMG'));E.src=FCK_IMAGES_PATH+'arrow_'+FCKLang.Dir+'.gif';E.width=4;E.height=7;this.SubMenu.Create();this.SubMenu.Panel.OnHide=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnHide,this);}};FCKMenuItem.prototype.Activate=function(){this.MainElement.className='MN_Item_Over';if (this.HasSubMenu){this.SubMenu.Show(this.MainElement.offsetWidth+2,-2,this.MainElement);};FCKTools.RunFunction(this.OnActivate,this);};FCKMenuItem.prototype.Deactivate=function(){this.MainElement.className='MN_Item';if (this.HasSubMenu) this.SubMenu.Hide();};function FCKMenuItem_SubMenu_OnClick(A,B){FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuItem_SubMenu_OnHide(A){A.Deactivate();};function FCKMenuItem_OnClick(A,B){if (B.HasSubMenu) B.Activate();else{B.Deactivate();FCKTools.RunFunction(B.OnClick,B,[B]);}};function FCKMenuItem_OnMouseOver(A,B){B.Activate();};function FCKMenuItem_OnMouseOut(A,B){B.Deactivate();};function FCKMenuItem_Cleanup(){this.MainElement=null;};
 var FCKMenuBlock=function(){this._Items=[];};FCKMenuBlock.prototype.Count=function(){return this._Items.length;};FCKMenuBlock.prototype.AddItem=function(A,B,C,D,E){var F=new FCKMenuItem(this,A,B,C,D,E);F.OnClick=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnClick,this);F.OnActivate=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnActivate,this);this._Items.push(F);return F;};FCKMenuBlock.prototype.AddSeparator=function(){this._Items.push(new FCKMenuSeparator());};FCKMenuBlock.prototype.RemoveAllItems=function(){this._Items=[];var A=this._ItemsTable;if (A){while (A.rows.length>0) A.deleteRow(0);}};FCKMenuBlock.prototype.Create=function(A){if (!this._ItemsTable){if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuBlock_Cleanup);this._Window=FCKTools.GetElementWindow(A);var B=FCKTools.GetElementDocument(A);var C=A.appendChild(B.createElement('table'));C.cellPadding=0;C.cellSpacing=0;FCKTools.DisableSelection(C);var D=C.insertRow(-1).insertCell(-1);D.className='MN_Menu';var E=this._ItemsTable=D.appendChild(B.createElement('table'));E.cellPadding=0;E.cellSpacing=0;};for (var i=0;i<this._Items.length;i++) this._Items[i].Create(this._ItemsTable);};function FCKMenuBlock_Item_OnClick(A,B){if (B.Hide) B.Hide();FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuBlock_Item_OnActivate(A){var B=A._ActiveItem;if (B&&B!=this){if (!FCKBrowserInfo.IsIE&&B.HasSubMenu&&!this.HasSubMenu){A._Window.focus();A.Panel.HasFocus=true;};B.Deactivate();};A._ActiveItem=this;};function FCKMenuBlock_Cleanup(){this._Window=null;this._ItemsTable=null;};var FCKMenuSeparator=function(){};FCKMenuSeparator.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var r=A.insertRow(-1);var C=r.insertCell(-1);C.className='MN_Separator MN_Icon';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';};
 var FCKMenuBlockPanel=function(){FCKMenuBlock.call(this);};FCKMenuBlockPanel.prototype=new FCKMenuBlock();FCKMenuBlockPanel.prototype.Create=function(){var A=this.Panel=(this.Parent&&this.Parent.Panel?this.Parent.Panel.CreateChildPanel():new FCKPanel());A.AppendStyleSheet(FCKConfig.SkinEditorCSS);FCKMenuBlock.prototype.Create.call(this,A.MainNode);};FCKMenuBlockPanel.prototype.Show=function(x,y,A){if (!this.Panel.CheckIsOpened()) this.Panel.Show(x,y,A);};FCKMenuBlockPanel.prototype.Hide=function(){if (this.Panel.CheckIsOpened()) this.Panel.Hide();};
 var FCKContextMenu=function(A,B){this.CtrlDisable=false;var C=this._Panel=new FCKPanel(A);C.AppendStyleSheet(FCKConfig.SkinEditorCSS);C.IsContextMenu=true;if (FCKBrowserInfo.IsGecko) C.Document.addEventListener('draggesture',function(e) {e.preventDefault();return false;},true);var D=this._MenuBlock=new FCKMenuBlock();D.Panel=C;D.OnClick=FCKTools.CreateEventListener(FCKContextMenu_MenuBlock_OnClick,this);this._Redraw=true;};FCKContextMenu.prototype.SetMouseClickWindow=function(A){if (!FCKBrowserInfo.IsIE){this._Document=A.document;if (FCKBrowserInfo.IsOpera&&!('oncontextmenu' in document.createElement('foo'))){this._Document.addEventListener('mousedown',FCKContextMenu_Document_OnMouseDown,false);this._Document.addEventListener('mouseup',FCKContextMenu_Document_OnMouseUp,false);};this._Document.addEventListener('contextmenu',FCKContextMenu_Document_OnContextMenu,false);}};FCKContextMenu.prototype.AddItem=function(A,B,C,D,E){var F=this._MenuBlock.AddItem(A,B,C,D,E);this._Redraw=true;return F;};FCKContextMenu.prototype.AddSeparator=function(){this._MenuBlock.AddSeparator();this._Redraw=true;};FCKContextMenu.prototype.RemoveAllItems=function(){this._MenuBlock.RemoveAllItems();this._Redraw=true;};FCKContextMenu.prototype.AttachToElement=function(A){if (FCKBrowserInfo.IsIE) FCKTools.AddEventListenerEx(A,'contextmenu',FCKContextMenu_AttachedElement_OnContextMenu,this);else A._FCKContextMenu=this;};function FCKContextMenu_Document_OnContextMenu(e){if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;FCKTools.CancelEvent(e);FCKContextMenu_AttachedElement_OnContextMenu(e,A._FCKContextMenu,A);return false;};A=A.parentNode;};return true;};var FCKContextMenu_OverrideButton;function FCKContextMenu_Document_OnMouseDown(e){if(!e||e.button!=2) return false;if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;var B=FCKContextMenu_OverrideButton;if(!B){var C=FCKTools.GetElementDocument(e.target);B=FCKContextMenu_OverrideButton=C.createElement('input');B.type='button';var D=C.createElement('p');C.body.appendChild(D);D.appendChild(B);};B.style.cssText='position:absolute;top:'+(e.clientY-2)+'px;left:'+(e.clientX-2)+'px;width:5px;height:5px;opacity:0.01';};A=A.parentNode;};return false;};function FCKContextMenu_Document_OnMouseUp(e){if (FCKConfig.BrowserContextMenu) return true;var A=FCKContextMenu_OverrideButton;if (A){var B=A.parentNode;B.parentNode.removeChild(B);FCKContextMenu_OverrideButton=undefined;if(e&&e.button==2){FCKContextMenu_Document_OnContextMenu(e);return false;}};return true;};function FCKContextMenu_AttachedElement_OnContextMenu(A,B,C){if ((B.CtrlDisable&&(A.ctrlKey||A.metaKey))||FCKConfig.BrowserContextMenu) return true;var D=C||this;if (B.OnBeforeOpen) B.OnBeforeOpen.call(B,D);if (B._MenuBlock.Count()==0) return false;if (B._Redraw){B._MenuBlock.Create(B._Panel.MainNode);B._Redraw=false;};FCKTools.DisableSelection(B._Panel.Document.body);var x=0;var y=0;if (FCKBrowserInfo.IsIE){x=A.screenX;y=A.screenY;}else if (FCKBrowserInfo.IsSafari){x=A.clientX;y=A.clientY;}else{x=A.pageX;y=A.pageY;};B._Panel.Show(x,y,A.currentTarget||null);return false;};function FCKContextMenu_MenuBlock_OnClick(A,B){B._Panel.Hide();FCKTools.RunFunction(B.OnItemClick,B,A);};
-FCK.ContextMenu={};FCK.ContextMenu.Listeners=[];FCK.ContextMenu.RegisterListener=function(A){if (A) this.Listeners.push(A);};function FCK_ContextMenu_Init(){var A=FCK.ContextMenu._InnerContextMenu=new FCKContextMenu(FCKBrowserInfo.IsIE?window:window.parent,FCKLang.Dir);A.CtrlDisable=FCKConfig.BrowserContextMenuOnCtrl;A.OnBeforeOpen=FCK_ContextMenu_OnBeforeOpen;A.OnItemClick=FCK_ContextMenu_OnItemClick;var B=FCK.ContextMenu;for (var i=0;i<FCKConfig.ContextMenu.length;i++) B.RegisterListener(FCK_ContextMenu_GetListener(FCKConfig.ContextMenu[i]));};function FCK_ContextMenu_GetListener(A){switch (A){case 'Generic':return {AddItems:function(menu,tag,tagName){menu.AddItem('Cut',FCKLang.Cut,7,FCKCommands.GetCommand('Cut').GetState()==-1);menu.AddItem('Copy',FCKLang.Copy,8,FCKCommands.GetCommand('Copy').GetState()==-1);menu.AddItem('Paste',FCKLang.Paste,9,FCKCommands.GetCommand('Paste').GetState()==-1);}};case 'Table':return {AddItems:function(menu,tag,tagName){var B=(tagName=='TABLE');var C=(!B&&FCKSelection.HasAncestorNode('TABLE'));if (C){menu.AddSeparator();var D=menu.AddItem('Cell',FCKLang.CellCM);D.AddItem('TableInsertCellBefore',FCKLang.InsertCellBefore,69);D.AddItem('TableInsertCellAfter',FCKLang.InsertCellAfter,58);D.AddItem('TableDeleteCells',FCKLang.DeleteCells,59);if (FCKBrowserInfo.IsGecko) D.AddItem('TableMergeCells',FCKLang.MergeCells,60,FCKCommands.GetCommand('TableMergeCells').GetState()==-1);else{D.AddItem('TableMergeRight',FCKLang.MergeRight,60,FCKCommands.GetCommand('TableMergeRight').GetState()==-1);D.AddItem('TableMergeDown',FCKLang.MergeDown,60,FCKCommands.GetCommand('TableMergeDown').GetState()==-1);};D.AddItem('TableHorizontalSplitCell',FCKLang.HorizontalSplitCell,61,FCKCommands.GetCommand('TableHorizontalSplitCell').GetState()==-1);D.AddItem('TableVerticalSplitCell',FCKLang.VerticalSplitCell,61,FCKCommands.GetCommand('TableVerticalSplitCell').GetState()==-1);D.AddSeparator();D.AddItem('TableCellProp',FCKLang.CellProperties,57,FCKCommands.GetCommand('TableCellProp').GetState()==-1);menu.AddSeparator();D=menu.AddItem('Row',FCKLang.RowCM);D.AddItem('TableInsertRowBefore',FCKLang.InsertRowBefore,70);D.AddItem('TableInsertRowAfter',FCKLang.InsertRowAfter,62);D.AddItem('TableDeleteRows',FCKLang.DeleteRows,63);menu.AddSeparator();D=menu.AddItem('Column',FCKLang.ColumnCM);D.AddItem('TableInsertColumnBefore',FCKLang.InsertColumnBefore,71);D.AddItem('TableInsertColumnAfter',FCKLang.InsertColumnAfter,64);D.AddItem('TableDeleteColumns',FCKLang.DeleteColumns,65);};if (B||C){menu.AddSeparator();menu.AddItem('TableDelete',FCKLang.TableDelete);menu.AddItem('TableProp',FCKLang.TableProperties,39);}}};case 'Link':return {AddItems:function(menu,tag,tagName){var E=(tagName=='A'||FCKSelection.HasAncestorNode('A'));if (E||FCK.GetNamedCommandState('Unlink')!=-1){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0&&F.href.length==0);if (G) return;menu.AddSeparator();menu.AddItem('VisitLink',FCKLang.VisitLink);menu.AddSeparator();if (E) menu.AddItem('Link',FCKLang.EditLink,34);menu.AddItem('Unlink',FCKLang.RemoveLink,35);}}};case 'Image':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&!tag.getAttribute('_fckfakelement')){menu.AddSeparator();menu.AddItem('Image',FCKLang.ImageProperties,37);}}};case 'Anchor':return {AddItems:function(menu,tag,tagName){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0);if (G||(tagName=='IMG'&&tag.getAttribute('_fckanchor'))){menu.AddSeparator();menu.AddItem('Anchor',FCKLang.AnchorProp,36);menu.AddItem('AnchorDelete',FCKLang.AnchorDelete);}}};case 'Flash':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckflash')){menu.AddSeparator();menu.AddItem('Flash',FCKLang.FlashProperties,38);}}};case 'Form':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('FORM')){menu.AddSeparator();menu.AddItem('Form',FCKLang.FormProp,48);}}};case 'Checkbox':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='checkbox'){menu.AddSeparator();menu.AddItem('Checkbox',FCKLang.CheckboxProp,49);}}};case 'Radio':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='radio'){menu.AddSeparator();menu.AddItem('Radio',FCKLang.RadioButtonProp,50);}}};case 'TextField':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='text'||tag.type=='password')){menu.AddSeparator();menu.AddItem('TextField',FCKLang.TextFieldProp,51);}}};case 'HiddenField':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckinputhidden')){menu.AddSeparator();menu.AddItem('HiddenField',FCKLang.HiddenFieldProp,56);}}};case 'ImageButton':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='image'){menu.AddSeparator();menu.AddItem('ImageButton',FCKLang.ImageButtonProp,55);}}};case 'Button':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='button'||tag.type=='submit'||tag.type=='reset')){menu.AddSeparator();menu.AddItem('Button',FCKLang.ButtonProp,54);}}};case 'Select':return {AddItems:function(menu,tag,tagName){if (tagName=='SELECT'){menu.AddSeparator();menu.AddItem('Select',FCKLang.SelectionFieldProp,53);}}};case 'Textarea':return {AddItems:function(menu,tag,tagName){if (tagName=='TEXTAREA'){menu.AddSeparator();menu.AddItem('Textarea',FCKLang.TextareaProp,52);}}};case 'BulletedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('UL')){menu.AddSeparator();menu.AddItem('BulletedList',FCKLang.BulletedListProp,27);}}};case 'NumberedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('OL')){menu.AddSeparator();menu.AddItem('NumberedList',FCKLang.NumberedListProp,26);}}};case 'DivContainer':return {AddItems:function(menu,tag,tagName){var J=FCKDomTools.GetSelectedDivContainers();if (J.length>0){menu.AddSeparator();menu.AddItem('EditDiv',FCKLang.EditDiv,75);menu.AddItem('DeleteDiv',FCKLang.DeleteDiv,76);}}};};return null;};function FCK_ContextMenu_OnBeforeOpen(){FCK.Events.FireEvent('OnSelectionChange');var A,sTagName;if ((A=FCKSelection.GetSelectedElement())) sTagName=A.tagName;var B=FCK.ContextMenu._InnerContextMenu;B.RemoveAllItems();var C=FCK.ContextMenu.Listeners;for (var i=0;i<C.length;i++) C[i].AddItems(B,A,sTagName);};function FCK_ContextMenu_OnItemClick(A){FCK.Focus();FCKCommands.GetCommand(A.Name).Execute(A.CustomData);};
+FCK.ContextMenu={};FCK.ContextMenu.Listeners=[];FCK.ContextMenu.RegisterListener=function(A){if (A) this.Listeners.push(A);};function FCK_ContextMenu_Init(){var A=FCK.ContextMenu._InnerContextMenu=new FCKContextMenu(FCKBrowserInfo.IsIE?window:window.parent,FCKLang.Dir);A.CtrlDisable=FCKConfig.BrowserContextMenuOnCtrl;A.OnBeforeOpen=FCK_ContextMenu_OnBeforeOpen;A.OnItemClick=FCK_ContextMenu_OnItemClick;var B=FCK.ContextMenu;for (var i=0;i<FCKConfig.ContextMenu.length;i++) B.RegisterListener(FCK_ContextMenu_GetListener(FCKConfig.ContextMenu[i]));};function FCK_ContextMenu_GetListener(A){switch (A){case 'Generic':return {AddItems:function(menu,tag,tagName){menu.AddItem('Cut',FCKLang.Cut,7,FCKCommands.GetCommand('Cut').GetState()==-1);menu.AddItem('Copy',FCKLang.Copy,8,FCKCommands.GetCommand('Copy').GetState()==-1);menu.AddItem('Paste',FCKLang.Paste,9,FCKCommands.GetCommand('Paste').GetState()==-1);}};case 'Table':return {AddItems:function(menu,tag,tagName){var B=(tagName=='TABLE');var C=(!B&&FCKSelection.HasAncestorNode('TABLE'));if (C){menu.AddSeparator();var D=menu.AddItem('Cell',FCKLang.CellCM);D.AddItem('TableInsertCellBefore',FCKLang.InsertCellBefore,69);D.AddItem('TableInsertCellAfter',FCKLang.InsertCellAfter,58);D.AddItem('TableDeleteCells',FCKLang.DeleteCells,59);if (FCKBrowserInfo.IsGecko) D.AddItem('TableMergeCells',FCKLang.MergeCells,60,FCKCommands.GetCommand('TableMergeCells').GetState()==-1);else{D.AddItem('TableMergeRight',FCKLang.MergeRight,60,FCKCommands.GetCommand('TableMergeRight').GetState()==-1);D.AddItem('TableMergeDown',FCKLang.MergeDown,60,FCKCommands.GetCommand('TableMergeDown').GetState()==-1);};D.AddItem('TableHorizontalSplitCell',FCKLang.HorizontalSplitCell,61,FCKCommands.GetCommand('TableHorizontalSplitCell').GetState()==-1);D.AddItem('TableVerticalSplitCell',FCKLang.VerticalSplitCell,61,FCKCommands.GetCommand('TableVerticalSplitCell').GetState()==-1);D.AddSeparator();D.AddItem('TableCellProp',FCKLang.CellProperties,57,FCKCommands.GetCommand('TableCellProp').GetState()==-1);menu.AddSeparator();D=menu.AddItem('Row',FCKLang.RowCM);D.AddItem('TableInsertRowBefore',FCKLang.InsertRowBefore,70);D.AddItem('TableInsertRowAfter',FCKLang.InsertRowAfter,62);D.AddItem('TableDeleteRows',FCKLang.DeleteRows,63);menu.AddSeparator();D=menu.AddItem('Column',FCKLang.ColumnCM);D.AddItem('TableInsertColumnBefore',FCKLang.InsertColumnBefore,71);D.AddItem('TableInsertColumnAfter',FCKLang.InsertColumnAfter,64);D.AddItem('TableDeleteColumns',FCKLang.DeleteColumns,65);};if (B||C){menu.AddSeparator();menu.AddItem('TableDelete',FCKLang.TableDelete);menu.AddItem('TableProp',FCKLang.TableProperties,39);}}};case 'Link':return {AddItems:function(menu,tag,tagName){var E=(tagName=='A'||FCKSelection.HasAncestorNode('A'));if (E||FCK.GetNamedCommandState('Unlink')!=-1){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0&&F.href.length==0);if (G) return;menu.AddSeparator();menu.AddItem('VisitLink',FCKLang.VisitLink);menu.AddSeparator();if (E) menu.AddItem('Link',FCKLang.EditLink,34);menu.AddItem('Unlink',FCKLang.RemoveLink,35);}}};case 'Image':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&!tag.getAttribute('_fckfakelement')){menu.AddSeparator();menu.AddItem('Image',FCKLang.ImageProperties,37);}}};case 'Anchor':return {AddItems:function(menu,tag,tagName){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0);if (G||(tagName=='IMG'&&tag.getAttribute('_fckanchor'))){menu.AddSeparator();menu.AddItem('Anchor',FCKLang.AnchorProp,36);menu.AddItem('AnchorDelete',FCKLang.AnchorDelete);}}};case 'Flash':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckflash')){menu.AddSeparator();menu.AddItem('Flash',FCKLang.FlashProperties,38);}}};case 'Form':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('FORM')){menu.AddSeparator();menu.AddItem('Form',FCKLang.FormProp,48);}}};case 'Checkbox':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='checkbox'){menu.AddSeparator();menu.AddItem('Checkbox',FCKLang.CheckboxProp,49);}}};case 'Radio':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='radio'){menu.AddSeparator();menu.AddItem('Radio',FCKLang.RadioButtonProp,50);}}};case 'TextField':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='text'||tag.type=='password')){menu.AddSeparator();menu.AddItem('TextField',FCKLang.TextFieldProp,51);}}};case 'HiddenField':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckinputhidden')){menu.AddSeparator();menu.AddItem('HiddenField',FCKLang.HiddenFieldProp,56);}}};case 'ImageButton':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='image'){menu.AddSeparator();menu.AddItem('ImageButton',FCKLang.ImageButtonProp,55);}}};case 'Button':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='button'||tag.type=='submit'||tag.type=='reset')){menu.AddSeparator();menu.AddItem('Button',FCKLang.ButtonProp,54);}}};case 'Select':return {AddItems:function(menu,tag,tagName){if (tagName=='SELECT'){menu.AddSeparator();menu.AddItem('Select',FCKLang.SelectionFieldProp,53);}}};case 'Textarea':return {AddItems:function(menu,tag,tagName){if (tagName=='TEXTAREA'){menu.AddSeparator();menu.AddItem('Textarea',FCKLang.TextareaProp,52);}}};case 'BulletedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('UL')){menu.AddSeparator();menu.AddItem('BulletedList',FCKLang.BulletedListProp,27);}}};case 'NumberedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('OL')){menu.AddSeparator();menu.AddItem('NumberedList',FCKLang.NumberedListProp,26);}}};case 'DivContainer':return {AddItems:function(menu,tag,tagName){var J=FCKDomTools.GetSelectedDivContainers();if (J.length>0){menu.AddSeparator();menu.AddItem('EditDiv',FCKLang.EditDiv,75);menu.AddItem('DeleteDiv',FCKLang.DeleteDiv,76);}}};};return null;};function FCK_ContextMenu_OnBeforeOpen(){FCK.Events.FireEvent('OnSelectionChange');var A,sTagName;if ((A=FCKSelection.GetSelectedElement())) sTagName=A.tagName;var B=FCK.ContextMenu._InnerContextMenu;B.RemoveAllItems();var C=FCK.ContextMenu.Listeners;for (var i=0;i<C.length;i++) C[i].AddItems(B,A,sTagName);};function FCK_ContextMenu_OnItemClick(A){if (!FCKBrowserInfo.IsIE) FCK.Focus();FCKCommands.GetCommand(A.Name).Execute(A.CustomData);};
 var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};
 var FCKPlugin=function(A,B,C){this.Name=A;this.BasePath=C?C:FCKConfig.PluginsPath;this.Path=this.BasePath+A+'/';if (!B||B.length==0) this.AvailableLangs=[];else this.AvailableLangs=B.split(',');};FCKPlugin.prototype.Load=function(){if (this.AvailableLangs.length>0){var A;if (this.AvailableLangs.IndexOf(FCKLanguageManager.ActiveLanguage.Code)>=0) A=FCKLanguageManager.ActiveLanguage.Code;else A=this.AvailableLangs[0];LoadScript(this.Path+'lang/'+A+'.js');};LoadScript(this.Path+'fckplugin.js');};
 var FCKPlugins=FCK.Plugins={};FCKPlugins.ItemsCount=0;FCKPlugins.Items={};FCKPlugins.Load=function(){var A=FCKPlugins.Items;for (var i=0;i<FCKConfig.Plugins.Items.length;i++){var B=FCKConfig.Plugins.Items[i];var C=A[B[0]]=new FCKPlugin(B[0],B[1],B[2]);FCKPlugins.ItemsCount++;};for (var s in A) A[s].Load();FCKPlugins.Load=null;};
diff --git a/phpgwapi/js/fckeditor/editor/lang/_translationstatus.txt b/phpgwapi/js/fckeditor/editor/lang/_translationstatus.txt
index 667826e59f..5eaae40890 100644
--- a/phpgwapi/js/fckeditor/editor/lang/_translationstatus.txt
+++ b/phpgwapi/js/fckeditor/editor/lang/_translationstatus.txt
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -21,58 +21,59 @@
  * Translations Status.
  */
 
-af.js      Found: 396   Missing: 24
-ar.js      Found: 411   Missing: 9
-bg.js      Found: 373   Missing: 47
-bn.js      Found: 380   Missing: 40
-bs.js      Found: 226   Missing: 194
-ca.js      Found: 420   Missing: 0
-cs.js      Found: 420   Missing: 0
-da.js      Found: 381   Missing: 39
-de.js      Found: 419   Missing: 1
-el.js      Found: 396   Missing: 24
-en-au.js   Found: 420   Missing: 0
-en-ca.js   Found: 420   Missing: 0
-en-uk.js   Found: 420   Missing: 0
-eo.js      Found: 346   Missing: 74
-es.js      Found: 420   Missing: 0
-et.js      Found: 411   Missing: 9
-eu.js      Found: 411   Missing: 9
-fa.js      Found: 413   Missing: 7
-fi.js      Found: 411   Missing: 9
-fo.js      Found: 420   Missing: 0
-fr-ca.js   Found: 419   Missing: 1
-fr.js      Found: 420   Missing: 0
-gl.js      Found: 381   Missing: 39
-gu.js      Found: 411   Missing: 9
-he.js      Found: 420   Missing: 0
-hi.js      Found: 420   Missing: 0
-hr.js      Found: 420   Missing: 0
-hu.js      Found: 411   Missing: 9
-it.js      Found: 410   Missing: 10
-ja.js      Found: 420   Missing: 0
-km.js      Found: 370   Missing: 50
-ko.js      Found: 390   Missing: 30
-lt.js      Found: 376   Missing: 44
-lv.js      Found: 381   Missing: 39
-mn.js      Found: 411   Missing: 9
-ms.js      Found: 352   Missing: 68
-nb.js      Found: 414   Missing: 6
-nl.js      Found: 420   Missing: 0
-no.js      Found: 414   Missing: 6
-pl.js      Found: 411   Missing: 9
-pt-br.js   Found: 411   Missing: 9
-pt.js      Found: 381   Missing: 39
-ro.js      Found: 410   Missing: 10
-ru.js      Found: 411   Missing: 9
-sk.js      Found: 396   Missing: 24
-sl.js      Found: 411   Missing: 9
-sr-latn.js Found: 368   Missing: 52
-sr.js      Found: 368   Missing: 52
-sv.js      Found: 409   Missing: 11
-th.js      Found: 393   Missing: 27
-tr.js      Found: 396   Missing: 24
-uk.js      Found: 397   Missing: 23
-vi.js      Found: 419   Missing: 1
-zh-cn.js   Found: 420   Missing: 0
-zh.js      Found: 420   Missing: 0
+af.js      Found: 396   Missing: 32
+ar.js      Found: 420   Missing: 8
+bg.js      Found: 373   Missing: 55
+bn.js      Found: 380   Missing: 48
+bs.js      Found: 226   Missing: 202
+ca.js      Found: 420   Missing: 8
+cs.js      Found: 420   Missing: 8
+da.js      Found: 419   Missing: 9
+de.js      Found: 420   Missing: 8
+el.js      Found: 396   Missing: 32
+en-au.js   Found: 423   Missing: 5
+en-ca.js   Found: 423   Missing: 5
+en-uk.js   Found: 423   Missing: 5
+eo.js      Found: 346   Missing: 82
+es.js      Found: 428   Missing: 0
+et.js      Found: 411   Missing: 17
+eu.js      Found: 420   Missing: 8
+fa.js      Found: 413   Missing: 15
+fi.js      Found: 411   Missing: 17
+fo.js      Found: 420   Missing: 8
+fr-ca.js   Found: 419   Missing: 9
+fr.js      Found: 428   Missing: 0
+gl.js      Found: 381   Missing: 47
+gu.js      Found: 411   Missing: 17
+he.js      Found: 428   Missing: 0
+hi.js      Found: 420   Missing: 8
+hr.js      Found: 420   Missing: 8
+hu.js      Found: 411   Missing: 17
+is.js      Found: 428   Missing: 0
+it.js      Found: 410   Missing: 18
+ja.js      Found: 420   Missing: 8
+km.js      Found: 370   Missing: 58
+ko.js      Found: 390   Missing: 38
+lt.js      Found: 376   Missing: 52
+lv.js      Found: 381   Missing: 47
+mn.js      Found: 411   Missing: 17
+ms.js      Found: 352   Missing: 76
+nb.js      Found: 414   Missing: 14
+nl.js      Found: 420   Missing: 8
+no.js      Found: 414   Missing: 14
+pl.js      Found: 411   Missing: 17
+pt-br.js   Found: 411   Missing: 17
+pt.js      Found: 381   Missing: 47
+ro.js      Found: 410   Missing: 18
+ru.js      Found: 427   Missing: 1
+sk.js      Found: 420   Missing: 8
+sl.js      Found: 411   Missing: 17
+sr-latn.js Found: 368   Missing: 60
+sr.js      Found: 368   Missing: 60
+sv.js      Found: 409   Missing: 19
+th.js      Found: 393   Missing: 35
+tr.js      Found: 428   Missing: 0
+uk.js      Found: 419   Missing: 9
+vi.js      Found: 419   Missing: 9
+zh-cn.js   Found: 428   Missing: 0
+zh.js      Found: 423   Missing: 5
diff --git a/phpgwapi/js/fckeditor/editor/lang/af.js b/phpgwapi/js/fckeditor/editor/lang/af.js
index 69d996f976..dba6ab5f3f 100644
--- a/phpgwapi/js/fckeditor/editor/lang/af.js
+++ b/phpgwapi/js/fckeditor/editor/lang/af.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cell spasieering",
 DlgTableCellPad		: "Cell buffer",
 DlgTableCaption		: "Beskreiwing",
 DlgTableSummary		: "Opsomming",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Cell eienskappe",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Bo",
 DlgCellVerAlignMiddle	: "Middel",
 DlgCellVerAlignBottom	: "Onder",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Rei strekking",
 DlgCellCollSpan		: "Kolom strekking",
 DlgCellBackColor	: "Agtergrond Kleur",
diff --git a/phpgwapi/js/fckeditor/editor/lang/ar.js b/phpgwapi/js/fckeditor/editor/lang/ar.js
index 79bacde49a..4edf4172d4 100644
--- a/phpgwapi/js/fckeditor/editor/lang/ar.js
+++ b/phpgwapi/js/fckeditor/editor/lang/ar.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -44,7 +44,7 @@ RemoveFormat		: "إزالة التنسيقات",
 InsertLinkLbl		: "رابط",
 InsertLink			: "إدراج/تحرير رابط",
 RemoveLink			: "إزالة رابط",
-VisitLink			: "Open Link",	//MISSING
+VisitLink			: "ا�تح الرابط",
 Anchor				: "إدراج/تحرير إشارة مرجعية",
 AnchorDelete		: "إزالة إشارة مرجعية",
 InsertImageLbl		: "صورة",
@@ -73,9 +73,9 @@ BlockJustify		: "ضبط",
 DecreaseIndent		: "إنقاص المسا�ة البادئة",
 IncreaseIndent		: "زيادة المسا�ة البادئة",
 Blockquote			: "اقتباس",
-CreateDiv			: "Create Div Container",	//MISSING
-EditDiv				: "Edit Div Container",	//MISSING
-DeleteDiv			: "Remove Div Container",	//MISSING
+CreateDiv			: "إنشاء حاوية Div",
+EditDiv				: "تعديل حاوية Div",
+DeleteDiv			: "إزالة حاوية Div",
 Undo				: "تراجع",
 Redo				: "إعادة",
 NumberedListLbl		: "تعداد رقمي",
@@ -161,7 +161,7 @@ UnknownToolbarSet	: "لم أتمكن من العثور على طقم الأدو
 NoActiveX			: "لتأمين متص�حك يجب أن تحدد بعض مميزات المحرر. يتوجب عليك تمكين الخيار \"Run ActiveX controls and plug-ins\". قد تواجة أخطاء وتلاحظ مميزات م�قودة",
 BrowseServerBlocked : "لايمكن �تح مصدر المتص�ح. �ضلا يجب التأكد بأن جميع موانع النوا�ذ المنبثقة معطلة",
 DialogBlocked		: "لايمكن �تح نا�ذة الحوار . �ضلا تأكد من أن  مانع النوا�ذ المنبثة معطل .",
-VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "لا يمكن �تح نا�ذة جديدة. تأكد من إيقا� كل مانعي �تح النوا�ذ من العمل.",
 
 // Dialogs
 DlgBtnOK			: "موا�ق",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "تباعد الخلايا",
 DlgTableCellPad		: "المسا�ة البادئة",
 DlgTableCaption		: "الوص�",
 DlgTableSummary		: "الخلاصة",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "خصائص الخلية",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "أعلى",
 DlgCellVerAlignMiddle	: "وسط",
 DlgCellVerAlignBottom	: "أس�ل",
 DlgCellVerAlignBaseline	: "على السطر",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "إمتداد الص�و�",
 DlgCellCollSpan		: "إمتداد الأعمدة",
 DlgCellBackColor	: "لون الخل�ية",
@@ -519,8 +527,8 @@ DlgAboutVersion		: "الإصدار",
 DlgAboutInfo		: "لمزيد من المعلومات ت�ضل بزيارة",
 
 // Div Dialog
-DlgDivGeneralTab	: "General",	//MISSING
-DlgDivAdvancedTab	: "Advanced",	//MISSING
-DlgDivStyle		: "Style",	//MISSING
-DlgDivInlineStyle	: "Inline Style"	//MISSING
+DlgDivGeneralTab	: "عام",
+DlgDivAdvancedTab	: "متقدم",
+DlgDivStyle		: "المظهر",
+DlgDivInlineStyle	: "المظهر المضمن"
 };
diff --git a/phpgwapi/js/fckeditor/editor/lang/bg.js b/phpgwapi/js/fckeditor/editor/lang/bg.js
index 1b4a8a1bec..b2cd453020 100644
--- a/phpgwapi/js/fckeditor/editor/lang/bg.js
+++ b/phpgwapi/js/fckeditor/editor/lang/bg.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Раз�то�ние между клетките",
 DlgTableCellPad		: "От�тъп на �ъдържанието в клетките",
 DlgTableCaption		: "Заглавие",
 DlgTableSummary		: "Резюме",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Параметри на клетката",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Горе",
 DlgCellVerAlignMiddle	: "По �редата",
 DlgCellVerAlignBottom	: "Долу",
 DlgCellVerAlignBaseline	: "По базовата лини�",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "повече от един ред",
 DlgCellCollSpan		: "повече от една колона",
 DlgCellBackColor	: "фонов цв�т",
diff --git a/phpgwapi/js/fckeditor/editor/lang/bn.js b/phpgwapi/js/fckeditor/editor/lang/bn.js
index 4f5a403adf..2aaa656591 100644
--- a/phpgwapi/js/fckeditor/editor/lang/bn.js
+++ b/phpgwapi/js/fckeditor/editor/lang/bn.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "সেল স�পেস",
 DlgTableCellPad		: "সেল প�যাডিং",
 DlgTableCaption		: "শীর�ষক",
 DlgTableSummary		: "সারাংশ",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "সেল প�রোপার�টি",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "উপর",
 DlgCellVerAlignMiddle	: "মধ�য",
 DlgCellVerAlignBottom	: "নীচে",
 DlgCellVerAlignBaseline	: "মূলরেখা",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "রো স�প�যান",
 DlgCellCollSpan		: "কলাম স�প�যান",
 DlgCellBackColor	: "ব�যাকগ�রাউন�ড রং",
diff --git a/phpgwapi/js/fckeditor/editor/lang/bs.js b/phpgwapi/js/fckeditor/editor/lang/bs.js
index 9f0c86898c..fa280ecd96 100644
--- a/phpgwapi/js/fckeditor/editor/lang/bs.js
+++ b/phpgwapi/js/fckeditor/editor/lang/bs.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Razmak æelija",
 DlgTableCellPad		: "Uvod æelija",
 DlgTableCaption		: "Naslov",
 DlgTableSummary		: "Summary",	//MISSING
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Svojstva æelije",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Gore",
 DlgCellVerAlignMiddle	: "Sredina",
 DlgCellVerAlignBottom	: "Dno",
 DlgCellVerAlignBaseline	: "Bazno",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Spajanje æelija",
 DlgCellCollSpan		: "Spajanje kolona",
 DlgCellBackColor	: "Boja pozadine",
diff --git a/phpgwapi/js/fckeditor/editor/lang/ca.js b/phpgwapi/js/fckeditor/editor/lang/ca.js
index 929c5ffd37..8edaada13d 100644
--- a/phpgwapi/js/fckeditor/editor/lang/ca.js
+++ b/phpgwapi/js/fckeditor/editor/lang/ca.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Espaiat de cel·les",
 DlgTableCellPad		: "Encoixinament de cel·les",
 DlgTableCaption		: "Títol",
 DlgTableSummary		: "Resum",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Propietats de la cel·la",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Top",
 DlgCellVerAlignMiddle	: "Middle",
 DlgCellVerAlignBottom	: "Bottom",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Rows Span",
 DlgCellCollSpan		: "Columns Span",
 DlgCellBackColor	: "Color de fons",
diff --git a/phpgwapi/js/fckeditor/editor/lang/cs.js b/phpgwapi/js/fckeditor/editor/lang/cs.js
index 7ef1f41775..9fb60f1395 100644
--- a/phpgwapi/js/fckeditor/editor/lang/cs.js
+++ b/phpgwapi/js/fckeditor/editor/lang/cs.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Vzdálenost buněk",
 DlgTableCellPad		: "Odsazení obsahu",
 DlgTableCaption		: "Popis",
 DlgTableSummary		: "Souhrn",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Vlastnosti buňky",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Nahoru",
 DlgCellVerAlignMiddle	: "Doprostřed",
 DlgCellVerAlignBottom	: "Dolů",
 DlgCellVerAlignBaseline	: "Na ú�aří",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Slou�ené řádky",
 DlgCellCollSpan		: "Slou�ené sloupce",
 DlgCellBackColor	: "Barva pozadí",
diff --git a/phpgwapi/js/fckeditor/editor/lang/da.js b/phpgwapi/js/fckeditor/editor/lang/da.js
index f4d773abd8..2d6e0a8d19 100644
--- a/phpgwapi/js/fckeditor/editor/lang/da.js
+++ b/phpgwapi/js/fckeditor/editor/lang/da.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -44,9 +44,9 @@ RemoveFormat		: "Fjern formatering",
 InsertLinkLbl		: "Hyperlink",
 InsertLink			: "Indsæt/rediger hyperlink",
 RemoveLink			: "Fjern hyperlink",
-VisitLink			: "Open Link",	//MISSING
+VisitLink			: "Ã…bn hyperlink",
 Anchor				: "Indsæt/rediger bogmærke",
-AnchorDelete		: "Remove Anchor",	//MISSING
+AnchorDelete		: "Fjern bogmærke",
 InsertImageLbl		: "Indsæt billede",
 InsertImage			: "Indsæt/rediger billede",
 InsertFlashLbl		: "Flash",
@@ -72,10 +72,10 @@ RightJustify		: "Højrestillet",
 BlockJustify		: "Lige margener",
 DecreaseIndent		: "Formindsk indrykning",
 IncreaseIndent		: "Forøg indrykning",
-Blockquote			: "Blockquote",	//MISSING
-CreateDiv			: "Create Div Container",	//MISSING
-EditDiv				: "Edit Div Container",	//MISSING
-DeleteDiv			: "Remove Div Container",	//MISSING
+Blockquote			: "Blokcitat",
+CreateDiv			: "Opret div container",
+EditDiv				: "Rediger div container",
+DeleteDiv			: "Fjern div container",
 Undo				: "Fortryd",
 Redo				: "Annuller fortryd",
 NumberedListLbl		: "Talopstilling",
@@ -116,20 +116,20 @@ EditLink			: "Rediger hyperlink",
 CellCM				: "Celle",
 RowCM				: "Række",
 ColumnCM			: "Kolonne",
-InsertRowAfter		: "Insert Row After",	//MISSING
-InsertRowBefore		: "Insert Row Before",	//MISSING
+InsertRowAfter		: "Indsæt række efter",
+InsertRowBefore		: "Indsæt række før",
 DeleteRows			: "Slet række",
-InsertColumnAfter	: "Insert Column After",	//MISSING
-InsertColumnBefore	: "Insert Column Before",	//MISSING
+InsertColumnAfter	: "Indsæt kolonne efter",
+InsertColumnBefore	: "Indsæt kolonne før",
 DeleteColumns		: "Slet kolonne",
-InsertCellAfter		: "Insert Cell After",	//MISSING
-InsertCellBefore	: "Insert Cell Before",	//MISSING
+InsertCellAfter		: "Indsæt celle efter",
+InsertCellBefore	: "Indsæt celle før",
 DeleteCells			: "Slet celle",
 MergeCells			: "Flet celler",
-MergeRight			: "Merge Right",	//MISSING
-MergeDown			: "Merge Down",	//MISSING
-HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
-VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+MergeRight			: "Flet til højre",
+MergeDown			: "Flet nedad",
+HorizontalSplitCell	: "Del celle vandret",
+VerticalSplitCell	: "Del celle lodret",
 TableDelete			: "Slet tabel",
 CellProperties		: "Egenskaber for celle",
 TableProperties		: "Egenskaber for tabel",
@@ -161,7 +161,7 @@ UnknownToolbarSet	: "Værktøjslinjen \"%1\" eksisterer ikke!",
 NoActiveX			: "Din browsers sikkerhedsindstillinger begrænser nogle af editorens muligheder.<br>Slå \"Kør ActiveX-objekter og plug-ins\" til, ellers vil du opleve fejl og manglende muligheder.",
 BrowseServerBlocked : "Browseren kunne ikke åbne de nødvendige ressourcer!<br>Slå pop-up blokering fra.",
 DialogBlocked		: "Dialogvinduet kunne ikke åbnes!<br>Slå pop-up blokering fra.",
-VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "Det var ikke muligt at åbne et nyt vindue. Tjek, at ingen popup-blokkere er aktive.",
 
 // Dialogs
 DlgBtnOK			: "OK",
@@ -276,7 +276,7 @@ DlgLnkPopTop		: "Position fra toppen",
 DlnLnkMsgNoUrl		: "Indtast hyperlink URL!",
 DlnLnkMsgNoEMail	: "Indtast e-mailaddresse!",
 DlnLnkMsgNoAnchor	: "Vælg bogmærke!",
-DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+DlnLnkMsgInvPopName	: "Navnet på popup'en skal starte med et bogstav og må ikke indeholde mellemrum",
 
 // Color Dialog
 DlgColorTitle		: "Vælg farve",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Celleafstand",
 DlgTableCellPad		: "Cellemargen",
 DlgTableCaption		: "Titel",
 DlgTableSummary		: "Resume",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Egenskaber for celle",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Øverst",
 DlgCellVerAlignMiddle	: "Centreret",
 DlgCellVerAlignBottom	: "Nederst",
 DlgCellVerAlignBaseline	: "Grundlinje",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Højde i antal rækker",
 DlgCellCollSpan		: "Bredde i antal kolonner",
 DlgCellBackColor	: "Baggrundsfarve",
@@ -337,7 +345,7 @@ DlgCellBorderColor	: "Rammefarve",
 DlgCellBtnSelect	: "Vælg...",
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+DlgFindAndReplaceTitle	: "Søg og erstat",
 
 // Find Dialog
 DlgFindTitle		: "Find",
@@ -361,7 +369,7 @@ PasteAsText		: "Indsæt som ikke-formateret tekst",
 PasteFromWord	: "Indsæt fra Word",
 
 DlgPasteMsg2	: "Indsæt i feltet herunder (<STRONG>Ctrl+V</STRONG>) og klik <STRONG>OK</STRONG>.",
-DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteSec		: "På grund af browserens sikkerhedsindstillinger kan editoren ikke tilgå udklipsholderen direkte. Du skal indsætte udklipsholderens indhold i dette vindue igen.",
 DlgPasteIgnoreFont		: "Ignorer font definitioner",
 DlgPasteRemoveStyles	: "Ignorer typografi",
 
@@ -397,9 +405,9 @@ IeSpellDownload			: "Stavekontrol ikke installeret.<br>Vil du hente den nu?",
 // Button Dialog
 DlgButtonText		: "Tekst",
 DlgButtonType		: "Type",
-DlgButtonTypeBtn	: "Button",	//MISSING
-DlgButtonTypeSbm	: "Submit",	//MISSING
-DlgButtonTypeRst	: "Reset",	//MISSING
+DlgButtonTypeBtn	: "Knap",
+DlgButtonTypeSbm	: "Send",
+DlgButtonTypeRst	: "Nulstil",
 
 // Checkbox and Radio Button Dialogs
 DlgCheckboxName		: "Navn",
@@ -448,7 +456,7 @@ DlgHiddenValue	: "Værdi",
 // Bulleted List Dialog
 BulletedListProp	: "Egenskaber for punktopstilling",
 NumberedListProp	: "Egenskaber for talopstilling",
-DlgLstStart			: "Start",	//MISSING
+DlgLstStart			: "Start",
 DlgLstType			: "Type",
 DlgLstTypeCircle	: "Cirkel",
 DlgLstTypeDisc		: "Udfyldt cirkel",
@@ -471,15 +479,15 @@ DlgDocLangDirLTR	: "Fra venstre mod højre (LTR)",
 DlgDocLangDirRTL	: "Fra højre mod venstre (RTL)",
 DlgDocLangCode		: "Landekode",
 DlgDocCharSet		: "Tegnsæt kode",
-DlgDocCharSetCE		: "Central European",	//MISSING
-DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
-DlgDocCharSetCR		: "Cyrillic",	//MISSING
-DlgDocCharSetGR		: "Greek",	//MISSING
-DlgDocCharSetJP		: "Japanese",	//MISSING
-DlgDocCharSetKR		: "Korean",	//MISSING
-DlgDocCharSetTR		: "Turkish",	//MISSING
-DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
-DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetCE		: "Centraleuropæisk",
+DlgDocCharSetCT		: "Traditionel kinesisk (Big5)",
+DlgDocCharSetCR		: "Kyrillisk",
+DlgDocCharSetGR		: "Græsk",
+DlgDocCharSetJP		: "Japansk",
+DlgDocCharSetKR		: "Koreansk",
+DlgDocCharSetTR		: "Tyrkisk",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Vesteuropæisk",
 DlgDocCharSetOther	: "Anden tegnsæt kode",
 
 DlgDocDocType		: "Dokumenttype kategori",
@@ -509,7 +517,7 @@ DlgTemplatesTitle	: "Indholdsskabeloner",
 DlgTemplatesSelMsg	: "Vælg den skabelon, som skal åbnes i editoren.<br>(Nuværende indhold vil blive overskrevet!):",
 DlgTemplatesLoading	: "Henter liste over skabeloner...",
 DlgTemplatesNoTpl	: "(Der er ikke defineret nogen skabelon!)",
-DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+DlgTemplatesReplace	: "Erstat det faktiske indhold",
 
 // About Dialog
 DlgAboutAboutTab	: "Om",
@@ -519,8 +527,8 @@ DlgAboutVersion		: "version",
 DlgAboutInfo		: "For yderlig information gå til",
 
 // Div Dialog
-DlgDivGeneralTab	: "General",	//MISSING
-DlgDivAdvancedTab	: "Advanced",	//MISSING
-DlgDivStyle		: "Style",	//MISSING
-DlgDivInlineStyle	: "Inline Style"	//MISSING
+DlgDivGeneralTab	: "Generelt",
+DlgDivAdvancedTab	: "Avanceret",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Inline style"
 };
diff --git a/phpgwapi/js/fckeditor/editor/lang/de.js b/phpgwapi/js/fckeditor/editor/lang/de.js
index f1cf277bac..2d47afaa9c 100644
--- a/phpgwapi/js/fckeditor/editor/lang/de.js
+++ b/phpgwapi/js/fckeditor/editor/lang/de.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -161,7 +161,7 @@ UnknownToolbarSet	: "Menüleiste \"%1\" existiert nicht",
 NoActiveX			: "Die Sicherheitseinstellungen Ihres Browsers beschränken evtl. einige Funktionen des Editors. Aktivieren Sie die Option \"ActiveX-Steuerelemente und Plugins ausführen\" in den Sicherheitseinstellungen, um diese Funktionen nutzen zu können",
 BrowseServerBlocked : "Ein Auswahlfenster konnte nicht geöffnet werden. Stellen Sie sicher, das alle Popup-Blocker ausgeschaltet sind.",
 DialogBlocked		: "Das Dialog-Fenster konnte nicht geöffnet werden. Stellen Sie sicher, das alle Popup-Blocker ausgeschaltet sind.",
-VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "Es war leider nicht möglich ein neues Fenster zu öffnen. Bitte versichern Sie sich das der Popup-Blocker ausgeschaltet ist.",
 
 // Dialogs
 DlgBtnOK			: "OK",
@@ -202,8 +202,8 @@ DlgImgHeight		: "Höhe",
 DlgImgLockRatio		: "Größenverhältniss beibehalten",
 DlgBtnResetSize		: "Größe zurücksetzen",
 DlgImgBorder		: "Rahmen",
-DlgImgHSpace		: "H-Abstand",
-DlgImgVSpace		: "V-Abstand",
+DlgImgHSpace		: "Horizontal-Abstand",
+DlgImgVSpace		: "Vertikal-Abstand",
 DlgImgAlign			: "Ausrichtung",
 DlgImgAlignLeft		: "Links",
 DlgImgAlignAbsBottom: "Abs Unten",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Zellenabstand außen",
 DlgTableCellPad		: "Zellenabstand innen",
 DlgTableCaption		: "Ãœberschrift",
 DlgTableSummary		: "Inhaltsübersicht",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Zellen-Eigenschaften",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Oben",
 DlgCellVerAlignMiddle	: "Mitte",
 DlgCellVerAlignBottom	: "Unten",
 DlgCellVerAlignBaseline	: "Grundlinie",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Zeilen zusammenfassen",
 DlgCellCollSpan		: "Spalten zusammenfassen",
 DlgCellBackColor	: "Hintergrundfarbe",
diff --git a/phpgwapi/js/fckeditor/editor/lang/el.js b/phpgwapi/js/fckeditor/editor/lang/el.js
index 19c109fcec..286ca0cfac 100644
--- a/phpgwapi/js/fckeditor/editor/lang/el.js
+++ b/phpgwapi/js/fckeditor/editor/lang/el.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Απόσταση κελιών",
 DlgTableCellPad		: "Γέμισμα κελιών",
 DlgTableCaption		: "Υπέ�τιτλος",
 DlgTableSummary		: "Πε�ίληψη",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Ιδιότητες Κελιο�",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Πάνω (Top)",
 DlgCellVerAlignMiddle	: "Μέση (Middle)",
 DlgCellVerAlignBottom	: "Κάτω (Bottom)",
 DlgCellVerAlignBaseline	: "Γ�αμμή Βάσης (Baseline)",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Α�ιθμός Γ�αμμών (Rows Span)",
 DlgCellCollSpan		: "Α�ιθμός Κολωνών (Columns Span)",
 DlgCellBackColor	: "Χ�ώμα Υποβάθ�ου",
diff --git a/phpgwapi/js/fckeditor/editor/lang/en-au.js b/phpgwapi/js/fckeditor/editor/lang/en-au.js
index 7717736491..88b39db613 100644
--- a/phpgwapi/js/fckeditor/editor/lang/en-au.js
+++ b/phpgwapi/js/fckeditor/editor/lang/en-au.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cell spacing",
 DlgTableCellPad		: "Cell padding",
 DlgTableCaption		: "Caption",
 DlgTableSummary		: "Summary",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Cell Properties",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Top",
 DlgCellVerAlignMiddle	: "Middle",
 DlgCellVerAlignBottom	: "Bottom",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",
+DlgCellTypeData		: "Data",
+DlgCellTypeHeader	: "Header",
 DlgCellRowSpan		: "Rows Span",
 DlgCellCollSpan		: "Columns Span",
 DlgCellBackColor	: "Background Colour",
diff --git a/phpgwapi/js/fckeditor/editor/lang/en-ca.js b/phpgwapi/js/fckeditor/editor/lang/en-ca.js
index 39158e062f..3476dcb991 100644
--- a/phpgwapi/js/fckeditor/editor/lang/en-ca.js
+++ b/phpgwapi/js/fckeditor/editor/lang/en-ca.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cell spacing",
 DlgTableCellPad		: "Cell padding",
 DlgTableCaption		: "Caption",
 DlgTableSummary		: "Summary",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Cell Properties",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Top",
 DlgCellVerAlignMiddle	: "Middle",
 DlgCellVerAlignBottom	: "Bottom",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",
+DlgCellTypeData		: "Data",
+DlgCellTypeHeader	: "Header",
 DlgCellRowSpan		: "Rows Span",
 DlgCellCollSpan		: "Columns Span",
 DlgCellBackColor	: "Background Colour",
diff --git a/phpgwapi/js/fckeditor/editor/lang/en-uk.js b/phpgwapi/js/fckeditor/editor/lang/en-uk.js
index 3b45340d60..86aeca8098 100644
--- a/phpgwapi/js/fckeditor/editor/lang/en-uk.js
+++ b/phpgwapi/js/fckeditor/editor/lang/en-uk.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cell spacing",
 DlgTableCellPad		: "Cell padding",
 DlgTableCaption		: "Caption",
 DlgTableSummary		: "Summary",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Cell Properties",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Top",
 DlgCellVerAlignMiddle	: "Middle",
 DlgCellVerAlignBottom	: "Bottom",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",
+DlgCellTypeData		: "Data",
+DlgCellTypeHeader	: "Header",
 DlgCellRowSpan		: "Rows Span",
 DlgCellCollSpan		: "Columns Span",
 DlgCellBackColor	: "Background Colour",
diff --git a/phpgwapi/js/fckeditor/editor/lang/en.js b/phpgwapi/js/fckeditor/editor/lang/en.js
index 5f9d66a57a..37c5b9c9e0 100644
--- a/phpgwapi/js/fckeditor/editor/lang/en.js
+++ b/phpgwapi/js/fckeditor/editor/lang/en.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cell spacing",
 DlgTableCellPad		: "Cell padding",
 DlgTableCaption		: "Caption",
 DlgTableSummary		: "Summary",
+DlgTableHeaders		: "Headers",
+DlgTableHeadersNone		: "None",
+DlgTableHeadersColumn	: "First column",
+DlgTableHeadersRow		: "First Row",
+DlgTableHeadersBoth		: "Both",
 
 // Table Cell Dialog
 DlgCellTitle		: "Cell Properties",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Top",
 DlgCellVerAlignMiddle	: "Middle",
 DlgCellVerAlignBottom	: "Bottom",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",
+DlgCellTypeData		: "Data",
+DlgCellTypeHeader	: "Header",
 DlgCellRowSpan		: "Rows Span",
 DlgCellCollSpan		: "Columns Span",
 DlgCellBackColor	: "Background Color",
diff --git a/phpgwapi/js/fckeditor/editor/lang/eo.js b/phpgwapi/js/fckeditor/editor/lang/eo.js
index 44c5cba2fb..f0cd051384 100644
--- a/phpgwapi/js/fckeditor/editor/lang/eo.js
+++ b/phpgwapi/js/fckeditor/editor/lang/eo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Interspacigo de Ĉeloj",
 DlgTableCellPad		: "Ĉirkaŭenhava Plenigado",
 DlgTableCaption		: "Titolo",
 DlgTableSummary		: "Summary",	//MISSING
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Atributoj de Celo",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Supre",
 DlgCellVerAlignMiddle	: "Centre",
 DlgCellVerAlignBottom	: "Malsupre",
 DlgCellVerAlignBaseline	: "Je Malsupro de Teksto",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Linioj Kunfanditaj",
 DlgCellCollSpan		: "Kolumnoj Kunfanditaj",
 DlgCellBackColor	: "Fono",
diff --git a/phpgwapi/js/fckeditor/editor/lang/es.js b/phpgwapi/js/fckeditor/editor/lang/es.js
index eca234faca..dc4f1ac41c 100644
--- a/phpgwapi/js/fckeditor/editor/lang/es.js
+++ b/phpgwapi/js/fckeditor/editor/lang/es.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Esp. e/celdas",
 DlgTableCellPad		: "Esp. interior",
 DlgTableCaption		: "Título",
 DlgTableSummary		: "Síntesis",
+DlgTableHeaders		: "Encabezados",
+DlgTableHeadersNone		: "Ninguno",
+DlgTableHeadersColumn	: "Primera columna",
+DlgTableHeadersRow		: "Primera fila",
+DlgTableHeadersBoth		: "Ambas",
 
 // Table Cell Dialog
 DlgCellTitle		: "Propiedades de Celda",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Tope",
 DlgCellVerAlignMiddle	: "Medio",
 DlgCellVerAlignBottom	: "ie",
 DlgCellVerAlignBaseline	: "Línea de Base",
+DlgCellType		: "Tipo de celda",
+DlgCellTypeData		: "Datos",
+DlgCellTypeHeader	: "Encabezado",
 DlgCellRowSpan		: "Abarcar Filas",
 DlgCellCollSpan		: "Abarcar Columnas",
 DlgCellBackColor	: "Color de Fondo",
diff --git a/phpgwapi/js/fckeditor/editor/lang/et.js b/phpgwapi/js/fckeditor/editor/lang/et.js
index 7dfcdb608b..e42ad7987c 100644
--- a/phpgwapi/js/fckeditor/editor/lang/et.js
+++ b/phpgwapi/js/fckeditor/editor/lang/et.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Lahtri vahe",
 DlgTableCellPad		: "Lahtri täidis",
 DlgTableCaption		: "Tabeli tiitel",
 DlgTableSummary		: "Kokkuvõte",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Lahtri atribuudid",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Ãœles",
 DlgCellVerAlignMiddle	: "Keskele",
 DlgCellVerAlignBottom	: "Alla",
 DlgCellVerAlignBaseline	: "Baasjoonele",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Reaulatus",
 DlgCellCollSpan		: "Veeruulatus",
 DlgCellBackColor	: "Tausta värv",
diff --git a/phpgwapi/js/fckeditor/editor/lang/eu.js b/phpgwapi/js/fckeditor/editor/lang/eu.js
index 4c36e8f4b0..46dffd02e7 100644
--- a/phpgwapi/js/fckeditor/editor/lang/eu.js
+++ b/phpgwapi/js/fckeditor/editor/lang/eu.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -41,11 +41,11 @@ PasteText			: "Itsatsi testu bezala",
 PasteWord			: "Itsatsi Word-etik",
 Print				: "Inprimatu",
 SelectAll			: "Hautatu dena",
-RemoveFormat		: "Kendu Formatoa",
+RemoveFormat		: "Kendu Formatua",
 InsertLinkLbl		: "Esteka",
 InsertLink			: "Txertatu/Editatu Esteka",
 RemoveLink			: "Kendu Esteka",
-VisitLink			: "Open Link",	//MISSING
+VisitLink			: "Ireki Esteka",
 Anchor				: "Aingura",
 AnchorDelete		: "Ezabatu Aingura",
 InsertImageLbl		: "Irudia",
@@ -74,9 +74,9 @@ BlockJustify		: "Justifikatu",
 DecreaseIndent		: "Txikitu Koska",
 IncreaseIndent		: "Handitu Koska",
 Blockquote			: "Aipamen blokea",
-CreateDiv			: "Create Div Container",	//MISSING
-EditDiv				: "Edit Div Container",	//MISSING
-DeleteDiv			: "Remove Div Container",	//MISSING
+CreateDiv			: "Sortu Div Edukitzailea",
+EditDiv				: "Editatu Div Edukitzailea",
+DeleteDiv			: "Ezabatu Div Edukitzailea",
 Undo				: "Desegin",
 Redo				: "Berregin",
 NumberedListLbl		: "Zenbakidun Zerrenda",
@@ -86,7 +86,7 @@ BulletedList		: "Txertatu/Kendu Buletdun zerrenda",
 ShowTableBorders	: "Erakutsi Taularen Ertzak",
 ShowDetails			: "Erakutsi Xehetasunak",
 Style				: "Estiloa",
-FontFormat			: "Formatoa",
+FontFormat			: "Formatua",
 Font				: "Letra-tipoa",
 FontSize			: "Tamaina",
 TextColor			: "Testu Kolorea",
@@ -153,16 +153,16 @@ FontFormats			: "Arrunta;Formateatua;Helbidea;Izenburua 1;Izenburua 2;Izenburua
 // Alerts and Messages
 ProcessingXHTML		: "XHTML Prozesatzen. Itxaron mesedez...",
 Done				: "Eginda",
-PasteWordConfirm	: "Itsatsi nahi duzun textua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?",
+PasteWordConfirm	: "Itsatsi nahi duzun testua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?",
 NotCompatiblePaste	: "Komando hau Internet Explorer 5.5 bertsiorako edo ondorengoentzako erabilgarria dago. Garbitu gabe itsatsi nahi duzu?",
 UnknownToolbarItem	: "Ataza barrako elementu ezezaguna \"%1\"",
 UnknownCommand		: "Komando izen ezezaguna \"%1\"",
 NotImplemented		: "Komando ez inplementatua",
 UnknownToolbarSet	: "Ataza barra \"%1\" taldea ez da existitzen",
-NoActiveX			: "Zure nabigatzailearen segustasun hobespenak editore honen zenbait ezaugarri mugatu ditzake. \"ActiveX kontrolak eta plug-inak\" aktibatu beharko zenituzke, bestela erroreak eta ezaugarrietan mugak egon daitezke.",
+NoActiveX			: "Zure nabigatzailearen segurtasun hobespenak editore honen zenbait ezaugarri mugatu ditzake. \"ActiveX kontrolak eta pluginak\" aktibatu beharko zenituzke, bestela erroreak eta ezaugarrietan mugak egon daitezke.",
 BrowseServerBlocked : "Baliabideen arakatzailea ezin da ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.",
 DialogBlocked		: "Ezin da elkarrizketa-leihoa ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.",
-VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "Ezin da leiho berri bat ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.",
 
 // Dialogs
 DlgBtnOK			: "Ados",
@@ -197,7 +197,7 @@ DlgImgInfoTab		: "Irudi informazioa",
 DlgImgBtnUpload		: "Zerbitzarira bidalia",
 DlgImgURL			: "URL",
 DlgImgUpload		: "Gora Kargatu",
-DlgImgAlt			: "Textu Alternatiboa",
+DlgImgAlt			: "Ordezko Testua",
 DlgImgWidth			: "Zabalera",
 DlgImgHeight		: "Altuera",
 DlgImgLockRatio		: "Erlazioa Blokeatu",
@@ -226,7 +226,7 @@ DlgFlashChkLoop		: "Begizta",
 DlgFlashChkMenu		: "Flasharen Menua Gaitu",
 DlgFlashScale		: "Eskalatu",
 DlgFlashScaleAll	: "Dena erakutsi",
-DlgFlashScaleNoBorder	: "Ertzarik gabe",
+DlgFlashScaleNoBorder	: "Ertzik gabe",
 DlgFlashScaleFit	: "Doitu",
 
 // Link Dialog
@@ -236,7 +236,7 @@ DlgLnkTargetTab		: "Helburua",
 
 DlgLnkType			: "Esteka Mota",
 DlgLnkTypeURL		: "URL",
-DlgLnkTypeAnchor	: "Aingura horrialde honentan",
+DlgLnkTypeAnchor	: "Aingura orrialde honetan",
 DlgLnkTypeEMail		: "ePosta",
 DlgLnkProto			: "Protokoloa",
 DlgLnkProtoOther	: "<Beste batzuk>",
@@ -253,14 +253,14 @@ DlgLnkBtnUpload		: "Zerbitzarira bidali",
 
 DlgLnkTarget		: "Target (Helburua)",
 DlgLnkTargetFrame	: "<marko>",
-DlgLnkTargetPopup	: "<popup lehioa>",
-DlgLnkTargetBlank	: "Lehio Berria (_blank)",
-DlgLnkTargetParent	: "Lehio Gurasoa (_parent)",
-DlgLnkTargetSelf	: "Lehio Berdina (_self)",
-DlgLnkTargetTop		: "Goiko Lehioa (_top)",
+DlgLnkTargetPopup	: "<popup leihoa>",
+DlgLnkTargetBlank	: "Leiho Berria (_blank)",
+DlgLnkTargetParent	: "Leiho Gurasoa (_parent)",
+DlgLnkTargetSelf	: "Leiho Berdina (_self)",
+DlgLnkTargetTop		: "Goiko Leihoa (_top)",
 DlgLnkTargetFrameName	: "Marko Helburuaren Izena",
-DlgLnkPopWinName	: "Popup Lehioaren Izena",
-DlgLnkPopWinFeat	: "Popup Lehioaren Ezaugarriak",
+DlgLnkPopWinName	: "Popup Leihoaren Izena",
+DlgLnkPopWinFeat	: "Popup Leihoaren Ezaugarriak",
 DlgLnkPopResize		: "Tamaina Aldakorra",
 DlgLnkPopLocation	: "Kokaleku Barra",
 DlgLnkPopMenu		: "Menu Barra",
@@ -277,7 +277,7 @@ DlgLnkPopTop		: "Goiko Posizioa",
 DlnLnkMsgNoUrl		: "Mesedez URL esteka idatzi",
 DlnLnkMsgNoEMail	: "Mesedez ePosta helbidea idatzi",
 DlnLnkMsgNoAnchor	: "Mesedez aingura bat aukeratu",
-DlnLnkMsgInvPopName	: "Popup lehioaren izenak karaktere alfabetiko batekin hasi behar du eta eta ezin du zuriunerik izan",
+DlnLnkMsgInvPopName	: "Popup leihoaren izenak karaktere alfabetiko batekin hasi behar du eta eta ezin du zuriunerik izan",
 
 // Color Dialog
 DlgColorTitle		: "Kolore Aukeraketa",
@@ -309,6 +309,11 @@ DlgTableCellSpace	: "Gelaxka arteko tartea",
 DlgTableCellPad		: "Gelaxken betegarria",
 DlgTableCaption		: "Epigrafea",
 DlgTableSummary		: "Laburpena",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Gelaxken Ezaugarriak",
@@ -320,7 +325,7 @@ DlgCellWordWrap		: "Itzulbira",
 DlgCellWordWrapNotSet	: "<Ezarri gabe>",
 DlgCellWordWrapYes	: "Bai",
 DlgCellWordWrapNo	: "Ez",
-DlgCellHorAlign		: "Horizontal Alignment",
+DlgCellHorAlign		: "Lerrokatu Horizontalki",
 DlgCellHorAlignNotSet	: "<Ezarri gabe>",
 DlgCellHorAlignLeft	: "Ezkerrean",
 DlgCellHorAlignCenter	: "Erdian",
@@ -330,12 +335,15 @@ DlgCellVerAlignNotSet	: "<Ezarri gabe>",
 DlgCellVerAlignTop	: "Goian",
 DlgCellVerAlignMiddle	: "Erdian",
 DlgCellVerAlignBottom	: "Behean",
-DlgCellVerAlignBaseline	: "Oinan",
+DlgCellVerAlignBaseline	: "Oinean",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Lerroak Hedatu",
 DlgCellCollSpan		: "Zutabeak Hedatu",
 DlgCellBackColor	: "Atzeko Kolorea",
 DlgCellBorderColor	: "Ertzako Kolorea",
-DlgCellBtnSelect	: "Aukertau...",
+DlgCellBtnSelect	: "Aukeratu...",
 
 // Find and Replace Dialog
 DlgFindAndReplaceTitle	: "Bilatu eta Ordeztu",
@@ -410,7 +418,7 @@ DlgCheckboxSelected	: "Hautatuta",
 // Form Dialog
 DlgFormName		: "Izena",
 DlgFormAction	: "Ekintza",
-DlgFormMethod	: "Method",
+DlgFormMethod	: "Metodoa",
 
 // Select Field Dialog
 DlgSelectName		: "Izena",
@@ -462,7 +470,7 @@ DlgLstTypeLRoman	: "Erromatar zenbaki larriak (I, II, III)",
 
 // Document Properties Dialog
 DlgDocGeneralTab	: "Orokorra",
-DlgDocBackTab		: "Atzekaldea",
+DlgDocBackTab		: "Atzealdea",
 DlgDocColorsTab		: "Koloreak eta Marjinak",
 DlgDocMetaTab		: "Meta Informazioa",
 
@@ -488,7 +496,7 @@ DlgDocDocTypeOther	: "Beste Document Type Goiburua",
 DlgDocIncXHTML		: "XHTML Ezarpenak",
 DlgDocBgColor		: "Atzeko Kolorea",
 DlgDocBgImage		: "Atzeko Irudiaren URL-a",
-DlgDocBgNoScroll	: "Korritze gabeko Atzekaldea",
+DlgDocBgNoScroll	: "Korritze gabeko Atzealdea",
 DlgDocCText			: "Testua",
 DlgDocCLink			: "Estekak",
 DlgDocCVisited		: "Bisitatutako Estekak",
@@ -520,8 +528,8 @@ DlgAboutVersion		: "bertsioa",
 DlgAboutInfo		: "Informazio gehiago eskuratzeko hona joan",
 
 // Div Dialog
-DlgDivGeneralTab	: "General",	//MISSING
-DlgDivAdvancedTab	: "Advanced",	//MISSING
-DlgDivStyle		: "Style",	//MISSING
-DlgDivInlineStyle	: "Inline Style"	//MISSING
+DlgDivGeneralTab	: "Orokorra",
+DlgDivAdvancedTab	: "Aurreratua",
+DlgDivStyle		: "Estiloa",
+DlgDivInlineStyle	: "Inline Estiloa"
 };
diff --git a/phpgwapi/js/fckeditor/editor/lang/fa.js b/phpgwapi/js/fckeditor/editor/lang/fa.js
index e550a72a7f..2ed7487328 100644
--- a/phpgwapi/js/fckeditor/editor/lang/fa.js
+++ b/phpgwapi/js/fckeditor/editor/lang/fa.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "�اصلهٴ میان سلولها",
 DlgTableCellPad		: "�اصلهٴ پرشده در سلول",
 DlgTableCaption		: "عنوان",
 DlgTableSummary		: "خلاصه",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "ویژگیهای سلول",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "بالا",
 DlgCellVerAlignMiddle	: "میان",
 DlgCellVerAlignBottom	: "پائین",
 DlgCellVerAlignBaseline	: "خط‌پایه",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "گستردگی سطرها",
 DlgCellCollSpan		: "گستردگی ستونها",
 DlgCellBackColor	: "رنگ پس‌زمینه",
diff --git a/phpgwapi/js/fckeditor/editor/lang/fi.js b/phpgwapi/js/fckeditor/editor/lang/fi.js
index 1b02875468..25222cca28 100644
--- a/phpgwapi/js/fckeditor/editor/lang/fi.js
+++ b/phpgwapi/js/fckeditor/editor/lang/fi.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Solujen väli",
 DlgTableCellPad		: "Solujen sisennys",
 DlgTableCaption		: "Otsikko",
 DlgTableSummary		: "Yhteenveto",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Solun ominaisuudet",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Ylös",
 DlgCellVerAlignMiddle	: "Keskelle",
 DlgCellVerAlignBottom	: "Alas",
 DlgCellVerAlignBaseline	: "Tekstin alas",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Rivin jatkuvuus",
 DlgCellCollSpan		: "Sarakkeen jatkuvuus",
 DlgCellBackColor	: "Taustaväri",
diff --git a/phpgwapi/js/fckeditor/editor/lang/fo.js b/phpgwapi/js/fckeditor/editor/lang/fo.js
index 42fa8539ac..0a02a813b7 100644
--- a/phpgwapi/js/fckeditor/editor/lang/fo.js
+++ b/phpgwapi/js/fckeditor/editor/lang/fo.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Fjarstøða millum meskar",
 DlgTableCellPad		: "Meskubreddi",
 DlgTableCaption		: "Tabellfrágreiðing",
 DlgTableSummary		: "Samandráttur",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Mesku eginleikar",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Ovast",
 DlgCellVerAlignMiddle	: "Miðjan",
 DlgCellVerAlignBottom	: "Niðast",
 DlgCellVerAlignBaseline	: "Basislinja",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Røðir, meskin fevnir um",
 DlgCellCollSpan		: "Kolonnur, meskin fevnir um",
 DlgCellBackColor	: "Bakgrundslitur",
diff --git a/phpgwapi/js/fckeditor/editor/lang/fr-ca.js b/phpgwapi/js/fckeditor/editor/lang/fr-ca.js
index ace46b0d58..7ac69bb5b5 100644
--- a/phpgwapi/js/fckeditor/editor/lang/fr-ca.js
+++ b/phpgwapi/js/fckeditor/editor/lang/fr-ca.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Espacement",
 DlgTableCellPad		: "Contour",
 DlgTableCaption		: "Titre",
 DlgTableSummary		: "Résumé",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Propriétés de la cellule",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Haut",
 DlgCellVerAlignMiddle	: "Milieu",
 DlgCellVerAlignBottom	: "Bas",
 DlgCellVerAlignBaseline	: "Bas du texte",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Lignes fusionnées",
 DlgCellCollSpan		: "Colonnes fusionnées",
 DlgCellBackColor	: "Couleur de fond",
diff --git a/phpgwapi/js/fckeditor/editor/lang/fr.js b/phpgwapi/js/fckeditor/editor/lang/fr.js
index 5b229427a0..0f2641519c 100644
--- a/phpgwapi/js/fckeditor/editor/lang/fr.js
+++ b/phpgwapi/js/fckeditor/editor/lang/fr.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Espacement",
 DlgTableCellPad		: "Contour",
 DlgTableCaption		: "Titre",
 DlgTableSummary		: "Résumé",
+DlgTableHeaders		: "Entêtes",
+DlgTableHeadersNone		: "Sans",
+DlgTableHeadersColumn	: "Première colonne",
+DlgTableHeadersRow		: "Première Ligne",
+DlgTableHeadersBoth		: "Les 2",
 
 // Table Cell Dialog
 DlgCellTitle		: "Propriétés de la cellule",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Haut",
 DlgCellVerAlignMiddle	: "Milieu",
 DlgCellVerAlignBottom	: "Bas",
 DlgCellVerAlignBaseline	: "Bas du texte",
+DlgCellType		: "Type de Cellule",
+DlgCellTypeData		: "Données",
+DlgCellTypeHeader	: "Entête",
 DlgCellRowSpan		: "Lignes fusionnées",
 DlgCellCollSpan		: "Colonnes fusionnées",
 DlgCellBackColor	: "Fond",
diff --git a/phpgwapi/js/fckeditor/editor/lang/gl.js b/phpgwapi/js/fckeditor/editor/lang/gl.js
index 797ed46f7b..af74810e2a 100644
--- a/phpgwapi/js/fckeditor/editor/lang/gl.js
+++ b/phpgwapi/js/fckeditor/editor/lang/gl.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Marxe entre Celas",
 DlgTableCellPad		: "Marxe interior",
 DlgTableCaption		: "Título",
 DlgTableSummary		: "Sumario",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Propriedades da Cela",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Arriba",
 DlgCellVerAlignMiddle	: "Medio",
 DlgCellVerAlignBottom	: "Abaixo",
 DlgCellVerAlignBaseline	: "Liña de Base",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Ocupar Filas",
 DlgCellCollSpan		: "Ocupar Columnas",
 DlgCellBackColor	: "Color de Fondo",
diff --git a/phpgwapi/js/fckeditor/editor/lang/he.js b/phpgwapi/js/fckeditor/editor/lang/he.js
index 578c7b1f27..45c0a48432 100644
--- a/phpgwapi/js/fckeditor/editor/lang/he.js
+++ b/phpgwapi/js/fckeditor/editor/lang/he.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "מרווח ת�",
 DlgTableCellPad		: "ריפוד ת�",
 DlgTableCaption		: "כיתוב",
 DlgTableSummary		: "סיכו�",
+DlgTableHeaders		: "כותרות",
+DlgTableHeadersNone		: "�ין",
+DlgTableHeadersColumn	: "עמודה ר�שונה",
+DlgTableHeadersRow		: "שורה ר�שונה",
+DlgTableHeadersBoth		: "שניה�",
 
 // Table Cell Dialog
 DlgCellTitle		: "תכונות ת�",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "למעלה",
 DlgCellVerAlignMiddle	: "ל�מצע",
 DlgCellVerAlignBottom	: "לתחתית",
 DlgCellVerAlignBaseline	: "קו תחתית",
+DlgCellType		: "סוג ת�",
+DlgCellTypeData		: "סוג",
+DlgCellTypeHeader	: "כותרת",
 DlgCellRowSpan		: "טווח שורות",
 DlgCellCollSpan		: "טווח עמודות",
 DlgCellBackColor	: "צבע רקע",
diff --git a/phpgwapi/js/fckeditor/editor/lang/hi.js b/phpgwapi/js/fckeditor/editor/lang/hi.js
index 8ad6ebe80b..0a3aac7cb8 100644
--- a/phpgwapi/js/fckeditor/editor/lang/hi.js
+++ b/phpgwapi/js/fckeditor/editor/lang/hi.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "सैल अंतर",
 DlgTableCellPad		: "सैल पैडिंग",
 DlgTableCaption		: "शीर�षक",
 DlgTableSummary		: "सारांश",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "सैल प�रॉपर�टीज़",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "ऊपर",
 DlgCellVerAlignMiddle	: "मध�य",
 DlgCellVerAlignBottom	: "नीचे",
 DlgCellVerAlignBaseline	: "मूलरेखा",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "पंक�ति स�पैन",
 DlgCellCollSpan		: "कालम स�पैन",
 DlgCellBackColor	: "बैक�ग�राउन�ड रंग",
diff --git a/phpgwapi/js/fckeditor/editor/lang/hr.js b/phpgwapi/js/fckeditor/editor/lang/hr.js
index bfff02d633..f8d974e59b 100644
--- a/phpgwapi/js/fckeditor/editor/lang/hr.js
+++ b/phpgwapi/js/fckeditor/editor/lang/hr.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Prostornost ćelija",
 DlgTableCellPad		: "Razmak ćelija",
 DlgTableCaption		: "Naslov",
 DlgTableSummary		: "Sažetak",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Svojstva ćelije",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Gornje",
 DlgCellVerAlignMiddle	: "Srednišnje",
 DlgCellVerAlignBottom	: "Donje",
 DlgCellVerAlignBaseline	: "Bazno",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Spajanje redova",
 DlgCellCollSpan		: "Spajanje kolona",
 DlgCellBackColor	: "Boja pozadine",
diff --git a/phpgwapi/js/fckeditor/editor/lang/hu.js b/phpgwapi/js/fckeditor/editor/lang/hu.js
index f27ef3903a..56b86618b9 100644
--- a/phpgwapi/js/fckeditor/editor/lang/hu.js
+++ b/phpgwapi/js/fckeditor/editor/lang/hu.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cella térköz",
 DlgTableCellPad		: "Cella belső margó",
 DlgTableCaption		: "Felirat",
 DlgTableSummary		: "Leírás",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Cella tulajdonságai",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Tetejére",
 DlgCellVerAlignMiddle	: "Középre",
 DlgCellVerAlignBottom	: "Aljára",
 DlgCellVerAlignBaseline	: "Egyvonalba",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Sorok egyesítése",
 DlgCellCollSpan		: "Oszlopok egyesítése",
 DlgCellBackColor	: "Háttérszín",
diff --git a/phpgwapi/js/fckeditor/editor/lang/it.js b/phpgwapi/js/fckeditor/editor/lang/it.js
index e2e07fa968..764b346a67 100644
--- a/phpgwapi/js/fckeditor/editor/lang/it.js
+++ b/phpgwapi/js/fckeditor/editor/lang/it.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Spaziatura celle",
 DlgTableCellPad		: "Padding celle",
 DlgTableCaption		: "Intestazione",
 DlgTableSummary		: "Indice",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Proprietà cella",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "In Alto",
 DlgCellVerAlignMiddle	: "Centrato",
 DlgCellVerAlignBottom	: "In Basso",
 DlgCellVerAlignBaseline	: "Linea base",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Righe occupate",
 DlgCellCollSpan		: "Colonne occupate",
 DlgCellBackColor	: "Colore sfondo",
diff --git a/phpgwapi/js/fckeditor/editor/lang/ja.js b/phpgwapi/js/fckeditor/editor/lang/ja.js
index c8dd303e60..157f01cdfd 100644
--- a/phpgwapi/js/fckeditor/editor/lang/ja.js
+++ b/phpgwapi/js/fckeditor/editor/lang/ja.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "セル内余白",
 DlgTableCellPad		: "セル内間隔",
 DlgTableCaption		: "ｷｬﾌﾟｼｮ�",
 DlgTableSummary		: "テーブル目的/構造",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "セル プロパティ",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "上",
 DlgCellVerAlignMiddle	: "中央",
 DlgCellVerAlignBottom	: "下",
 DlgCellVerAlignBaseline	: "ベースライン",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "縦幅(行数)",
 DlgCellCollSpan		: "横幅(列数)",
 DlgCellBackColor	: "背景色",
diff --git a/phpgwapi/js/fckeditor/editor/lang/km.js b/phpgwapi/js/fckeditor/editor/lang/km.js
index 243f87e897..ad94b6c92f 100644
--- a/phpgwapi/js/fckeditor/editor/lang/km.js
+++ b/phpgwapi/js/fckeditor/editor/lang/km.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "គំលា�សែល",
 DlgTableCellPad		: "គែមសែល",
 DlgTableCaption		: "ចំណងជើង",
 DlgTableSummary		: "ស�ចក្�ីសង្��ប",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "ការកំណ�់ សែល",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "�ាងលើ",
 DlgCellVerAlignMiddle	: "កណ្�ាល",
 DlgCellVerAlignBottom	: "�ាងក្រោម",
 DlgCellVerAlignBaseline	: "បន្ទា�់ជាមូលដ្ឋាន",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "បញ្ជូលជួរផ្��ក",
 DlgCellCollSpan		: "បញ្ជូលជួរឈរ",
 DlgCellBackColor	: "ពណ៌ផ្នែក�ាងក្រោម",
diff --git a/phpgwapi/js/fckeditor/editor/lang/ko.js b/phpgwapi/js/fckeditor/editor/lang/ko.js
index 102b4cd945..cfedb23752 100644
--- a/phpgwapi/js/fckeditor/editor/lang/ko.js
+++ b/phpgwapi/js/fckeditor/editor/lang/ko.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "셀 간격",
 DlgTableCellPad		: "셀 여백",
 DlgTableCaption		: "캡션",
 DlgTableSummary		: "Summary",	//MISSING
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "셀 설정",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "위",
 DlgCellVerAlignMiddle	: "중간",
 DlgCellVerAlignBottom	: "아래",
 DlgCellVerAlignBaseline	: "기준선",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "세로 합치기",
 DlgCellCollSpan		: "가로 합치기",
 DlgCellBackColor	: "배경 색�",
diff --git a/phpgwapi/js/fckeditor/editor/lang/lt.js b/phpgwapi/js/fckeditor/editor/lang/lt.js
index 786a5ba42f..40d2f9d439 100644
--- a/phpgwapi/js/fckeditor/editor/lang/lt.js
+++ b/phpgwapi/js/fckeditor/editor/lang/lt.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Tarpas tarp langelių",
 DlgTableCellPad		: "Trapas nuo langelio rÄ—mo iki teksto",
 DlgTableCaption		: "Antraštė",
 DlgTableSummary		: "Santrauka",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Langelio savybÄ—s",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Viršų",
 DlgCellVerAlignMiddle	: "Vidurį",
 DlgCellVerAlignBottom	: "Apa�ią",
 DlgCellVerAlignBaseline	: "ApatinÄ™ linijÄ…",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Eilu�ių apjungimas",
 DlgCellCollSpan		: "Stulpelių apjungimas",
 DlgCellBackColor	: "Fono spalva",
diff --git a/phpgwapi/js/fckeditor/editor/lang/lv.js b/phpgwapi/js/fckeditor/editor/lang/lv.js
index f6d3ef2c3e..947be1020d 100644
--- a/phpgwapi/js/fckeditor/editor/lang/lv.js
+++ b/phpgwapi/js/fckeditor/editor/lang/lv.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Rūtiņu atstatums",
 DlgTableCellPad		: "Rūtiņu nobīde",
 DlgTableCaption		: "Leģenda",
 DlgTableSummary		: "Anot�cija",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Rūtiņas īpašības",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Augša",
 DlgCellVerAlignMiddle	: "Vidus",
 DlgCellVerAlignBottom	: "Apakša",
 DlgCellVerAlignBaseline	: "Pamatrind�",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Rindu p�rnese",
 DlgCellCollSpan		: "Kolonnu p�rnese",
 DlgCellBackColor	: "Fona kr�sa",
diff --git a/phpgwapi/js/fckeditor/editor/lang/mn.js b/phpgwapi/js/fckeditor/editor/lang/mn.js
index 913fe45b75..539708d030 100644
--- a/phpgwapi/js/fckeditor/editor/lang/mn.js
+++ b/phpgwapi/js/fckeditor/editor/lang/mn.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "�үх хоорондын зай (spacing)",
 DlgTableCellPad		: "�үх доторлох(padding)",
 DlgTableCaption		: "Тайлбар",
 DlgTableSummary		: "Тайлбар",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Хоо�он зайн шинж чанар",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Д��д тал",
 DlgCellVerAlignMiddle	: "Дунд",
 DlgCellVerAlignBottom	: "Доод тал",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "�ийт мөр (span)",
 DlgCellCollSpan		: "�ийт багана (span)",
 DlgCellBackColor	: "Фонны өнгө",
diff --git a/phpgwapi/js/fckeditor/editor/lang/ms.js b/phpgwapi/js/fckeditor/editor/lang/ms.js
index 31b1719f62..1412b0d09f 100644
--- a/phpgwapi/js/fckeditor/editor/lang/ms.js
+++ b/phpgwapi/js/fckeditor/editor/lang/ms.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Ruangan Antara Sel",
 DlgTableCellPad		: "Tambahan Ruang Sel",
 DlgTableCaption		: "Keterangan",
 DlgTableSummary		: "Summary",	//MISSING
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Ciri-ciri Sel",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Atas",
 DlgCellVerAlignMiddle	: "Tengah",
 DlgCellVerAlignBottom	: "Bawah",
 DlgCellVerAlignBaseline	: "Garis Dasar",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Penggunaan Baris",
 DlgCellCollSpan		: "Penggunaan Lajur",
 DlgCellBackColor	: "Warna Latarbelakang",
diff --git a/phpgwapi/js/fckeditor/editor/lang/nb.js b/phpgwapi/js/fckeditor/editor/lang/nb.js
index 7e598c1d2c..9304950cd2 100644
--- a/phpgwapi/js/fckeditor/editor/lang/nb.js
+++ b/phpgwapi/js/fckeditor/editor/lang/nb.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cellemarg",
 DlgTableCellPad		: "Cellepolstring",
 DlgTableCaption		: "Tittel",
 DlgTableSummary		: "Sammendrag",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Celleegenskaper",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Topp",
 DlgCellVerAlignMiddle	: "Midten",
 DlgCellVerAlignBottom	: "Bunn",
 DlgCellVerAlignBaseline	: "Bunnlinje",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Radspenn",
 DlgCellCollSpan		: "Kolonnespenn",
 DlgCellBackColor	: "Bakgrunnsfarge",
diff --git a/phpgwapi/js/fckeditor/editor/lang/nl.js b/phpgwapi/js/fckeditor/editor/lang/nl.js
index 38de5bca13..1589336d42 100644
--- a/phpgwapi/js/fckeditor/editor/lang/nl.js
+++ b/phpgwapi/js/fckeditor/editor/lang/nl.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -152,13 +152,13 @@ FontFormats			: "Normaal;Met opmaak;Adres;Kop 1;Kop 2;Kop 3;Kop 4;Kop 5;Kop 6;No
 // Alerts and Messages
 ProcessingXHTML		: "Bezig met verwerken XHTML. Even geduld aub...",
 Done				: "Klaar",
-PasteWordConfirm	: "De tekst die je plakte lijkt gekopieerd uit te zijn Word. Wil je de tekst opschonen voordat deze geplakt wordt?",
-NotCompatiblePaste	: "Deze opdracht is beschikbaar voor Internet Explorer versie 5.5 of hoger. Wil je plakken zonder op te schonen?",
+PasteWordConfirm	: "De tekst die u plakte lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?",
+NotCompatiblePaste	: "Deze opdracht is beschikbaar voor Internet Explorer versie 5.5 of hoger. Wilt u plakken zonder op te schonen?",
 UnknownToolbarItem	: "Onbekend item op menubalk \"%1\"",
 UnknownCommand		: "Onbekende opdrachtnaam: \"%1\"",
 NotImplemented		: "Opdracht niet geïmplementeerd.",
 UnknownToolbarSet	: "Menubalk \"%1\" bestaat niet.",
-NoActiveX			: "De beveilingsinstellingen van je browser zouden sommige functies van de editor kunnen beperken. De optie \"Activeer ActiveX-elementen en plug-ins\" dient ingeschakeld te worden. Het kan zijn dat er nu functies ontbreken of niet werken.",
+NoActiveX			: "De beveilingsinstellingen van uw browser zouden sommige functies van de editor kunnen beperken. De optie \"Activeer ActiveX-elementen en plug-ins\" dient ingeschakeld te worden. Het kan zijn dat er nu functies ontbreken of niet werken.",
 BrowseServerBlocked : "De bestandsbrowser kon niet geopend worden. Zorg ervoor dat pop-up-blokkeerders uit staan.",
 DialogBlocked		: "Kan het dialoogvenster niet weergeven. Zorg ervoor dat pop-up-blokkeerders uit staan.",
 VisitLinkBlocked	: "Het was niet mogelijk een nieuw venster te openen. Controleer of er geen pop-up-blocker aktief is.",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Afstand tussen cellen",
 DlgTableCellPad		: "Afstand vanaf rand cel",
 DlgTableCaption		: "Naam",
 DlgTableSummary		: "Samenvatting",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Eigenschappen cel",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Boven",
 DlgCellVerAlignMiddle	: "Midden",
 DlgCellVerAlignBottom	: "Beneden",
 DlgCellVerAlignBaseline	: "Basislijn",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Overkoepeling rijen",
 DlgCellCollSpan		: "Overkoepeling kolommen",
 DlgCellBackColor	: "Achtergrondkleur",
@@ -360,7 +368,7 @@ PasteErrorCopy	: "De beveiligingsinstelling van de browser verhinderen het autom
 PasteAsText		: "Plakken als platte tekst",
 PasteFromWord	: "Plakken als Word-gegevens",
 
-DlgPasteMsg2	: "Plak de tekst in het volgende vak gebruik makend van je toetstenbord (<strong>Ctrl+V</strong>) en klik op <strong>OK</strong>.",
+DlgPasteMsg2	: "Plak de tekst in het volgende vak gebruik makend van uw toetsenbord (<strong>Ctrl+V</strong>) en klik op <strong>OK</strong>.",
 DlgPasteSec		: "Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.",
 DlgPasteIgnoreFont		: "Negeer \"Font Face\"-definities",
 DlgPasteRemoveStyles	: "Verwijder \"Style\"-definities",
@@ -392,7 +400,7 @@ DlgSpellNoChanges		: "Klaar met spellingscontrole: geen woorden aangepast",
 DlgSpellOneChange		: "Klaar met spellingscontrole: één woord aangepast",
 DlgSpellManyChanges		: "Klaar met spellingscontrole: %1 woorden aangepast",
 
-IeSpellDownload			: "De spellingscontrole niet geïnstalleerd. Wil je deze nu downloaden?",
+IeSpellDownload			: "De spellingscontrole niet geïnstalleerd. Wilt u deze nu downloaden?",
 
 // Button Dialog
 DlgButtonText		: "Tekst (waarde)",
diff --git a/phpgwapi/js/fckeditor/editor/lang/no.js b/phpgwapi/js/fckeditor/editor/lang/no.js
index 04dd04b1ee..ba58002f3d 100644
--- a/phpgwapi/js/fckeditor/editor/lang/no.js
+++ b/phpgwapi/js/fckeditor/editor/lang/no.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cellemarg",
 DlgTableCellPad		: "Cellepolstring",
 DlgTableCaption		: "Tittel",
 DlgTableSummary		: "Sammendrag",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Celleegenskaper",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Topp",
 DlgCellVerAlignMiddle	: "Midten",
 DlgCellVerAlignBottom	: "Bunn",
 DlgCellVerAlignBaseline	: "Bunnlinje",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Radspenn",
 DlgCellCollSpan		: "Kolonnespenn",
 DlgCellBackColor	: "Bakgrunnsfarge",
diff --git a/phpgwapi/js/fckeditor/editor/lang/pl.js b/phpgwapi/js/fckeditor/editor/lang/pl.js
index 0f864800ce..ddd410cd07 100644
--- a/phpgwapi/js/fckeditor/editor/lang/pl.js
+++ b/phpgwapi/js/fckeditor/editor/lang/pl.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Odstęp pomiędzy komórkami",
 DlgTableCellPad		: "Margines wewnętrzny komórek",
 DlgTableCaption		: "Tytuł",
 DlgTableSummary		: "Podsumowanie",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Właściwości komórki",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Do góry",
 DlgCellVerAlignMiddle	: "Do środka",
 DlgCellVerAlignBottom	: "Do dołu",
 DlgCellVerAlignBaseline	: "Do linii bazowej",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Zajętość wierszy",
 DlgCellCollSpan		: "Zajętość kolumn",
 DlgCellBackColor	: "Kolor tła",
diff --git a/phpgwapi/js/fckeditor/editor/lang/pt-br.js b/phpgwapi/js/fckeditor/editor/lang/pt-br.js
index f15bb134ef..578abae88b 100644
--- a/phpgwapi/js/fckeditor/editor/lang/pt-br.js
+++ b/phpgwapi/js/fckeditor/editor/lang/pt-br.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Espaçamento",
 DlgTableCellPad		: "Enchimento",
 DlgTableCaption		: "Legenda",
 DlgTableSummary		: "Resumo",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Formatar célula",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Superior",
 DlgCellVerAlignMiddle	: "Centralizado",
 DlgCellVerAlignBottom	: "Inferior",
 DlgCellVerAlignBaseline	: "Baseline",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Transpor Linhas",
 DlgCellCollSpan		: "Transpor Colunas",
 DlgCellBackColor	: "Cor do Plano de Fundo",
diff --git a/phpgwapi/js/fckeditor/editor/lang/pt.js b/phpgwapi/js/fckeditor/editor/lang/pt.js
index e9d8260261..b7752d694c 100644
--- a/phpgwapi/js/fckeditor/editor/lang/pt.js
+++ b/phpgwapi/js/fckeditor/editor/lang/pt.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Esp. e/células",
 DlgTableCellPad		: "Esp. interior",
 DlgTableCaption		: "Título",
 DlgTableSummary		: "Sumário",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Propriedades da Célula",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Topo",
 DlgCellVerAlignMiddle	: "Médio",
 DlgCellVerAlignBottom	: "Fundi",
 DlgCellVerAlignBaseline	: "Linha de Base",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Unir Linhas",
 DlgCellCollSpan		: "Unir Colunas",
 DlgCellBackColor	: "Cor do Fundo",
diff --git a/phpgwapi/js/fckeditor/editor/lang/ro.js b/phpgwapi/js/fckeditor/editor/lang/ro.js
index 38caf6e3df..3ed0b326f1 100644
--- a/phpgwapi/js/fckeditor/editor/lang/ro.js
+++ b/phpgwapi/js/fckeditor/editor/lang/ro.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Spaţiu între celule",
 DlgTableCellPad		: "Spaţiu în cadrul celulei",
 DlgTableCaption		: "Titlu (Caption)",
 DlgTableSummary		: "Rezumat",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Proprietăţile celulei",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Sus",
 DlgCellVerAlignMiddle	: "Mijloc",
 DlgCellVerAlignBottom	: "Jos",
 DlgCellVerAlignBaseline	: "Linia de jos (Baseline)",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Lungimea în linii (Span)",
 DlgCellCollSpan		: "Lungimea în coloane (Span)",
 DlgCellBackColor	: "Culoarea fundalului",
diff --git a/phpgwapi/js/fckeditor/editor/lang/ru.js b/phpgwapi/js/fckeditor/editor/lang/ru.js
index 04c5186f9f..99d2bd3eb5 100644
--- a/phpgwapi/js/fckeditor/editor/lang/ru.js
+++ b/phpgwapi/js/fckeditor/editor/lang/ru.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -44,7 +44,7 @@ RemoveFormat		: "Убрать форматирование",
 InsertLinkLbl		: "С�ылка",
 InsertLink			: "В�тавить/Редактировать ��ылку",
 RemoveLink			: "Убрать ��ылку",
-VisitLink			: "Open Link",	//MISSING
+VisitLink			: "Перейти по ��ылке",
 Anchor				: "В�тавить/Редактировать �корь",
 AnchorDelete		: "Убрать �корь",
 InsertImageLbl		: "Изображение",
@@ -73,9 +73,9 @@ BlockJustify		: "По ширине",
 DecreaseIndent		: "Уменьшить от�туп",
 IncreaseIndent		: "Увеличить от�туп",
 Blockquote			: "Цитата",
-CreateDiv			: "Create Div Container",	//MISSING
-EditDiv				: "Edit Div Container",	//MISSING
-DeleteDiv			: "Remove Div Container",	//MISSING
+CreateDiv			: "Создать Div контейнер",
+EditDiv				: "Редактировать Div контейнер",
+DeleteDiv			: "Удалить Div контейнер",
 Undo				: "Отменить",
 Redo				: "Повторить",
 NumberedListLbl		: "�умерованный �пи�ок",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Промежуток (spacing)",
 DlgTableCellPad		: "От�туп (padding)",
 DlgTableCaption		: "Заголовок",
 DlgTableSummary		: "Резюме",
+DlgTableHeaders		: "Заголовки",
+DlgTableHeadersNone		: "�ет",
+DlgTableHeadersColumn	: "Первый �толбец",
+DlgTableHeadersRow		: "Перва� �трока",
+DlgTableHeadersBoth		: "Оба варианта",
 
 // Table Cell Dialog
 DlgCellTitle		: "Свой�тва �чейки",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Сверху",
 DlgCellVerAlignMiddle	: "По�ередине",
 DlgCellVerAlignBottom	: "Снизу",
 DlgCellVerAlignBaseline	: "По базовой линии",
+DlgCellType		: "Тип �чейки",
+DlgCellTypeData		: "Данные",
+DlgCellTypeHeader	: "Заголовок",
 DlgCellRowSpan		: "Диапазон �трок (span)",
 DlgCellCollSpan		: "Диапазон колонок (span)",
 DlgCellBackColor	: "Цвет фона",
@@ -519,8 +527,8 @@ DlgAboutVersion		: "Вер�и�",
 DlgAboutInfo		: "Дл� большей информации, по�етите",
 
 // Div Dialog
-DlgDivGeneralTab	: "General",	//MISSING
-DlgDivAdvancedTab	: "Advanced",	//MISSING
-DlgDivStyle		: "Style",	//MISSING
-DlgDivInlineStyle	: "Inline Style"	//MISSING
+DlgDivGeneralTab	: "Информаци�",
+DlgDivAdvancedTab	: "Ра�ширенные на�тройки",
+DlgDivStyle		: "Стиль",
+DlgDivInlineStyle	: "В�троенные �тили"
 };
diff --git a/phpgwapi/js/fckeditor/editor/lang/sk.js b/phpgwapi/js/fckeditor/editor/lang/sk.js
index f8c232eecb..63387af6f0 100644
--- a/phpgwapi/js/fckeditor/editor/lang/sk.js
+++ b/phpgwapi/js/fckeditor/editor/lang/sk.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -30,7 +30,7 @@ ToolbarCollapse		: "Skryť panel nástrojov",
 ToolbarExpand		: "Zobraziť panel nástrojov",
 
 // Toolbar Items and Context Menu
-Save				: "Uložit",
+Save				: "Uložiť",
 NewPage				: "Nová stránka",
 Preview				: "Náhľad",
 Cut					: "Vystrihnúť",
@@ -44,9 +44,9 @@ RemoveFormat		: "Odstrániť formátovanie",
 InsertLinkLbl		: "Odkaz",
 InsertLink			: "Vložiť/zmeniť odkaz",
 RemoveLink			: "Odstrániť odkaz",
-VisitLink			: "Open Link",	//MISSING
+VisitLink			: "�sť na odkaz",
 Anchor				: "Vložiť/zmeniť kotvu",
-AnchorDelete		: "Remove Anchor",	//MISSING
+AnchorDelete		: "Odstrániť kotvu",
 InsertImageLbl		: "Obrázok",
 InsertImage			: "Vložiť/zmeniť obrázok",
 InsertFlashLbl		: "Flash",
@@ -59,7 +59,7 @@ InsertSpecialCharLbl: "Špeciálne znaky",
 InsertSpecialChar	: "Vložiť špeciálne znaky",
 InsertSmileyLbl		: "Smajlíky",
 InsertSmiley		: "Vložiť smajlíka",
-About				: "O aplikáci FCKeditor",
+About				: "O aplikácii FCKeditor",
 Bold				: "Tu�né",
 Italic				: "Kurzíva",
 Underline			: "Pod�iarknuté",
@@ -72,14 +72,14 @@ RightJustify		: "Zarovnať vpravo",
 BlockJustify		: "Zarovnať do bloku",
 DecreaseIndent		: "Zmenšiť odsadenie",
 IncreaseIndent		: "Zvä�šiť odsadenie",
-Blockquote			: "Blockquote",	//MISSING
-CreateDiv			: "Create Div Container",	//MISSING
-EditDiv				: "Edit Div Container",	//MISSING
-DeleteDiv			: "Remove Div Container",	//MISSING
+Blockquote			: "Citácia",
+CreateDiv			: "Vytvoriť Div kontajner",
+EditDiv				: "Editovať Div kontajner",
+DeleteDiv			: "Odstrániť Div kontajner",
 Undo				: "Späť",
 Redo				: "Znovu",
 NumberedListLbl		: "Číslovanie",
-NumberedList		: "Vložiť/odstrániť �íslovaný zoznam",
+NumberedList		: "Vložiť/odstrániť �íslovanie",
 BulletedListLbl		: "Odrážky",
 BulletedList		: "Vložiť/odstraniť odrážky",
 ShowTableBorders	: "Zobraziť okraje tabuliek",
@@ -104,32 +104,32 @@ RadioButton		: "Prepína�",
 TextField		: "Textové pole",
 Textarea		: "Textová oblasť",
 HiddenField		: "Skryté pole",
-Button			: "Tla�íidlo",
+Button			: "Tla�idlo",
 SelectionField	: "Rozbaľovací zoznam",
 ImageButton		: "Obrázkové tla�idlo",
 
 FitWindow		: "Maximalizovať veľkosť okna editora",
-ShowBlocks		: "Show Blocks",	//MISSING
+ShowBlocks		: "Ukázať bloky",
 
 // Context Menu
 EditLink			: "Zmeniť odkaz",
 CellCM				: "Bunka",
 RowCM				: "Riadok",
 ColumnCM			: "Stĺpec",
-InsertRowAfter		: "Insert Row After",	//MISSING
-InsertRowBefore		: "Insert Row Before",	//MISSING
+InsertRowAfter		: "Vložiť riadok pred",
+InsertRowBefore		: "Vložiť riadok za",
 DeleteRows			: "Vymazať riadok",
-InsertColumnAfter	: "Insert Column After",	//MISSING
-InsertColumnBefore	: "Insert Column Before",	//MISSING
+InsertColumnAfter	: "Vložiť stĺpec pred",
+InsertColumnBefore	: "Vložiť stĺpec za",
 DeleteColumns		: "Zmazať stĺpec",
-InsertCellAfter		: "Insert Cell After",	//MISSING
-InsertCellBefore	: "Insert Cell Before",	//MISSING
+InsertCellAfter		: "Vložiť bunku za",
+InsertCellBefore	: "Vložiť bunku pred",
 DeleteCells			: "Vymazať bunky",
 MergeCells			: "Zlú�iť bunky",
-MergeRight			: "Merge Right",	//MISSING
-MergeDown			: "Merge Down",	//MISSING
-HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
-VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+MergeRight			: "Zlú�iť doprava",
+MergeDown			: "Zlú�iť dole",
+HorizontalSplitCell	: "Rozdeliť bunky horizontálne",
+VerticalSplitCell	: "Rozdeliť bunky vertikálne",
 TableDelete			: "Vymazať tabuľku",
 CellProperties		: "Vlastnosti bunky",
 TableProperties		: "Vlastnosti tabuľky",
@@ -159,9 +159,9 @@ UnknownCommand		: "Neznámy príkaz \"%1\"",
 NotImplemented		: "Príkaz nie je implementovaný",
 UnknownToolbarSet	: "Panel nástrojov \"%1\" neexistuje",
 NoActiveX			: "Bezpe�nostné nastavenia vášho prehliada�a môžu obmedzovať niektoré funkcie editora. Pre ich plnú funk�nosť musíte zapnúť voľbu \"Spúšťať ActiveX moduly a zásuvné moduly\", inak sa môžete stretnúť s chybami a nefunk�nosťou niektorých funkcií.",
-BrowseServerBlocked : "Prehliada� zdrojových prvkov nebolo možné otvoriť. Uistite sa, že máte vypnuté všetky blokova�e vyskakujúcich okien.",
-DialogBlocked		: "Dialógové okno nebolo možné otvoriť. Uistite sa, že máte vypnuté všetky blokova�e vyskakujúcich okien.",
-VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+BrowseServerBlocked : "Prehliada� zdrojových prvkov nebolo možné otvoriť. Uistite sa, že máte vypnutú službu blokovania popup okien.",
+DialogBlocked		: "Dialógové okno nebolo možné otvoriť. Uistite sa, že máte vypnutú službu blokovania popup okien.",
+VisitLinkBlocked	: "Nebolo možné otvoriť nové okno. Uistite sa, že máte vypnutú službu blokovania popup okien.",
 
 // Dialogs
 DlgBtnOK			: "OK",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Vzdialenosť buniek",
 DlgTableCellPad		: "Odsadenie obsahu",
 DlgTableCaption		: "Popis",
 DlgTableSummary		: "Prehľad",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Vlastnosti bunky",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Nahor",
 DlgCellVerAlignMiddle	: "Doprostred",
 DlgCellVerAlignBottom	: "Dole",
 DlgCellVerAlignBaseline	: "Na základňu",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Zlú�ené riadky",
 DlgCellCollSpan		: "Zlú�ené stĺpce",
 DlgCellBackColor	: "Farba pozadia",
@@ -337,7 +345,7 @@ DlgCellBorderColor	: "Farba ohrani�enia",
 DlgCellBtnSelect	: "Výber...",
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+DlgFindAndReplaceTitle	: "Nájsť a nahradiť",
 
 // Find Dialog
 DlgFindTitle		: "Hľadať",
@@ -354,14 +362,14 @@ DlgReplaceReplAllBtn	: "Nahradiť všetko",
 DlgReplaceWordChk		: "Len celé slová",
 
 // Paste Operations / Dialog
-PasteErrorCut	: "Bezpe�nostné nastavenie Vášho prehliada�a nedovoľujú editoru spustiť funkciu pre vystrihnutie zvoleného textu do schránky. Prosím vystrihnite zvolený text do schránky pomocou klávesnice (Ctrl+X).",
-PasteErrorCopy	: "Bezpe�nostné nastavenie Vášho prehliada�a nedovoľujú editoru spustiť funkciu pre kopírovanie zvoleného textu do schránky. Prosím skopírujte zvolený text do schránky pomocou klávesnice (Ctrl+C).",
+PasteErrorCut	: "Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru spustiť funkciu pre vystrihnutie zvoleného textu do schránky. Prosím vystrihnite zvolený text do schránky pomocou klávesnice (Ctrl+X).",
+PasteErrorCopy	: "Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru spustiť funkciu pre kopírovanie zvoleného textu do schránky. Prosím skopírujte zvolený text do schránky pomocou klávesnice (Ctrl+C).",
 
 PasteAsText		: "Vložiť ako �istý text",
 PasteFromWord	: "Vložiť text z Wordu",
 
 DlgPasteMsg2	: "Prosím vložte nasledovný rám�ek použitím klávesnice (<STRONG>Ctrl+V</STRONG>) a stla�te <STRONG>OK</STRONG>.",
-DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteSec		: "Bezpe�nostné nastavenia Vášho prehliada�a nedovoľujú editoru pristupovať priamo k datám v schránke. Musíte ich vložiť znovu do tohto okna.",
 DlgPasteIgnoreFont		: "Ignorovať nastavenia typu písma",
 DlgPasteRemoveStyles	: "Odstrániť formátovanie",
 
@@ -519,8 +527,8 @@ DlgAboutVersion		: "verzia",
 DlgAboutInfo		: "Viac informácií získate na",
 
 // Div Dialog
-DlgDivGeneralTab	: "General",	//MISSING
-DlgDivAdvancedTab	: "Advanced",	//MISSING
-DlgDivStyle		: "Style",	//MISSING
-DlgDivInlineStyle	: "Inline Style"	//MISSING
+DlgDivGeneralTab	: "Hlavné",
+DlgDivAdvancedTab	: "Rozšírené",
+DlgDivStyle		: "Štýl",
+DlgDivInlineStyle	: "Inline štýl"
 };
diff --git a/phpgwapi/js/fckeditor/editor/lang/sl.js b/phpgwapi/js/fckeditor/editor/lang/sl.js
index 473c90987f..ab125e8214 100644
--- a/phpgwapi/js/fckeditor/editor/lang/sl.js
+++ b/phpgwapi/js/fckeditor/editor/lang/sl.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Razmik med celicami",
 DlgTableCellPad		: "Polnilo med celicami",
 DlgTableCaption		: "Naslov",
 DlgTableSummary		: "Povzetek",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Lastnosti celice",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Na vrh",
 DlgCellVerAlignMiddle	: "V sredino",
 DlgCellVerAlignBottom	: "Na dno",
 DlgCellVerAlignBaseline	: "Na osnovno �rto",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Spojenih vrstic (row-span)",
 DlgCellCollSpan		: "Spojenih stolpcev (col-span)",
 DlgCellBackColor	: "Barva ozadja",
diff --git a/phpgwapi/js/fckeditor/editor/lang/sr-latn.js b/phpgwapi/js/fckeditor/editor/lang/sr-latn.js
index a51ab3b428..456897532a 100644
--- a/phpgwapi/js/fckeditor/editor/lang/sr-latn.js
+++ b/phpgwapi/js/fckeditor/editor/lang/sr-latn.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Ćelijski prostor",
 DlgTableCellPad		: "Razmak ćelija",
 DlgTableCaption		: "Naslov tabele",
 DlgTableSummary		: "Summary",	//MISSING
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Osobine ćelije",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Gornje",
 DlgCellVerAlignMiddle	: "Sredina",
 DlgCellVerAlignBottom	: "Donje",
 DlgCellVerAlignBaseline	: "Bazno",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Spajanje redova",
 DlgCellCollSpan		: "Spajanje kolona",
 DlgCellBackColor	: "Boja pozadine",
diff --git a/phpgwapi/js/fckeditor/editor/lang/sr.js b/phpgwapi/js/fckeditor/editor/lang/sr.js
index 7651010702..178b8f443b 100644
--- a/phpgwapi/js/fckeditor/editor/lang/sr.js
+++ b/phpgwapi/js/fckeditor/editor/lang/sr.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Ћелиј�ки про�тор",
 DlgTableCellPad		: "Размак ћелија",
 DlgTableCaption		: "�а�лов табеле",
 DlgTableSummary		: "Summary",	//MISSING
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "О�обине ћелије",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Горње",
 DlgCellVerAlignMiddle	: "Средина",
 DlgCellVerAlignBottom	: "Доње",
 DlgCellVerAlignBaseline	: "Базно",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Спајање редова",
 DlgCellCollSpan		: "Спајање колона",
 DlgCellBackColor	: "Боја позадине",
diff --git a/phpgwapi/js/fckeditor/editor/lang/sv.js b/phpgwapi/js/fckeditor/editor/lang/sv.js
index ce9bef38a8..fab5793f16 100644
--- a/phpgwapi/js/fckeditor/editor/lang/sv.js
+++ b/phpgwapi/js/fckeditor/editor/lang/sv.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Cellavstånd",
 DlgTableCellPad		: "Cellutfyllnad",
 DlgTableCaption		: "Rubrik",
 DlgTableSummary		: "Sammanfattning",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Cellegenskaper",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Topp",
 DlgCellVerAlignMiddle	: "Mitten",
 DlgCellVerAlignBottom	: "Nederkant",
 DlgCellVerAlignBaseline	: "Underst",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Radomfång",
 DlgCellCollSpan		: "Kolumnomfång",
 DlgCellBackColor	: "Bakgrundsfärg",
diff --git a/phpgwapi/js/fckeditor/editor/lang/th.js b/phpgwapi/js/fckeditor/editor/lang/th.js
index e54f76425d..63de1c20c4 100644
--- a/phpgwapi/js/fckeditor/editor/lang/th.js
+++ b/phpgwapi/js/fckeditor/editor/lang/th.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "ระยะ�นวนอนน",
 DlgTableCellPad		: "ระยะ�นวตั้ง",
 DlgTableCaption		: "หัวเรื่องของตาราง",
 DlgTableSummary		: "สรุปความ",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "คุณสมบัติของ ช่อง",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "บนสุด",
 DlgCellVerAlignMiddle	: "�ึ่ง�ลาง",
 DlgCellVerAlignBottom	: "ล่างสุด",
 DlgCellVerAlignBaseline	: "อิงบรรทัด",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "จำนวน�ถวที่คร่อม�ัน",
 DlgCellCollSpan		: "จำนวนสดมน์ที่คร่อม�ัน",
 DlgCellBackColor	: "สีพื้นหลัง",
diff --git a/phpgwapi/js/fckeditor/editor/lang/tr.js b/phpgwapi/js/fckeditor/editor/lang/tr.js
index d485760a98..cacc0d37f2 100644
--- a/phpgwapi/js/fckeditor/editor/lang/tr.js
+++ b/phpgwapi/js/fckeditor/editor/lang/tr.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -44,9 +44,9 @@ RemoveFormat		: "Biçimi Kaldır",
 InsertLinkLbl		: "Köprü",
 InsertLink			: "Köprü Ekle/Düzenle",
 RemoveLink			: "Köprü Kaldır",
-VisitLink			: "Open Link",	//MISSING
+VisitLink			: "Köprü Aç",
 Anchor				: "Çapa Ekle/Düzenle",
-AnchorDelete		: "Remove Anchor",	//MISSING
+AnchorDelete		: "Çapa Sil",
 InsertImageLbl		: "Resim",
 InsertImage			: "Resim Ekle/Düzenle",
 InsertFlashLbl		: "Flash",
@@ -72,10 +72,10 @@ RightJustify		: "Sağa Dayalı",
 BlockJustify		: "İki Kenara Yaslanmış",
 DecreaseIndent		: "Sekme Azalt",
 IncreaseIndent		: "Sekme Arttır",
-Blockquote			: "Blockquote",	//MISSING
-CreateDiv			: "Create Div Container",	//MISSING
-EditDiv				: "Edit Div Container",	//MISSING
-DeleteDiv			: "Remove Div Container",	//MISSING
+Blockquote			: "Blok OluÅŸtur",
+CreateDiv			: "Div Ekle",
+EditDiv				: "Div Düzenle",
+DeleteDiv			: "Div Sil",
 Undo				: "Geri Al",
 Redo				: "Tekrarla",
 NumberedListLbl		: "Numaralı Liste",
@@ -109,27 +109,27 @@ SelectionField	: "Seçim Menüsü",
 ImageButton		: "Resimli Düğme",
 
 FitWindow		: "Düzenleyici boyutunu büyüt",
-ShowBlocks		: "Show Blocks",	//MISSING
+ShowBlocks		: "Blokları Göster",
 
 // Context Menu
 EditLink			: "Köprü Düzenle",
 CellCM				: "Hücre",
 RowCM				: "Satır",
 ColumnCM			: "Sütun",
-InsertRowAfter		: "Insert Row After",	//MISSING
-InsertRowBefore		: "Insert Row Before",	//MISSING
+InsertRowAfter		: "Satır Ekle - Sonra",
+InsertRowBefore		: "Satır Ekle - Önce",
 DeleteRows			: "Satır Sil",
-InsertColumnAfter	: "Insert Column After",	//MISSING
-InsertColumnBefore	: "Insert Column Before",	//MISSING
+InsertColumnAfter	: "Kolon Ekle - Sonra",
+InsertColumnBefore	: "Kolon Ekle - Önce",
 DeleteColumns		: "Sütun Sil",
-InsertCellAfter		: "Insert Cell After",	//MISSING
-InsertCellBefore	: "Insert Cell Before",	//MISSING
+InsertCellAfter		: "Hücre Ekle - Sonra",
+InsertCellBefore	: "Hücre Ekle - Önce",
 DeleteCells			: "Hücre Sil",
 MergeCells			: "Hücreleri Birleştir",
-MergeRight			: "Merge Right",	//MISSING
-MergeDown			: "Merge Down",	//MISSING
-HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
-VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+MergeRight			: "BirleÅŸtir - SaÄŸdaki Ä°le ",
+MergeDown			: "Birleştir - Aşağıdaki İle ",
+HorizontalSplitCell	: "Hücreyi Yatay Böl",
+VerticalSplitCell	: "Hücreyi Dikey Böl",
 TableDelete			: "Tabloyu Sil",
 CellProperties		: "Hücre Özellikleri",
 TableProperties		: "Tablo Özellikleri",
@@ -161,7 +161,7 @@ UnknownToolbarSet	: "\"%1\" araç çubuğu öğesi mevcut değil",
 NoActiveX			: "Kullandığınız tarayıcının güvenlik ayarları bazı özelliklerin kullanılmasını engelliyor. Bu özelliklerin çalışması için \"Run ActiveX controls and plug-ins (Activex ve eklentileri çalıştır)\" seçeneğinin aktif yapılması gerekiyor. Kullanılamayan eklentiler ve hatalar konusunda daha fazla bilgi sahibi olun.",
 BrowseServerBlocked : "Kaynak tarayıcısı açılamadı. Tüm \"popup blocker\" programlarının devre dışı olduğundan emin olun. (Yahoo toolbar, Msn toolbar, Google toolbar gibi)",
 DialogBlocked		: "Diyalog açmak mümkün olmadı. Tüm \"Popup Blocker\" programlarının devre dışı olduğundan emin olun.",
-VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "Yeni pencere açmak mümkün olmadı. Tüm \"Popup Blocker\" programlarının devre dışı olduğundan emin olun",
 
 // Dialogs
 DlgBtnOK			: "Tamam",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Izgara kalınlığı",
 DlgTableCellPad		: "Izgara yazı arası",
 DlgTableCaption		: "Başlık",
 DlgTableSummary		: "Özet",
+DlgTableHeaders		: "Başlıklar",
+DlgTableHeadersNone		: "Yok",
+DlgTableHeadersColumn	: "İlk Sütun",
+DlgTableHeadersRow		: "İlk Satır",
+DlgTableHeadersBoth		: "Her Ä°kisi",
 
 // Table Cell Dialog
 DlgCellTitle		: "Hücre Özellikleri",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Tepe",
 DlgCellVerAlignMiddle	: "Orta",
 DlgCellVerAlignBottom	: "Alt",
 DlgCellVerAlignBaseline	: "Taban Çizgisi",
+DlgCellType		: "Hücre Tipi",
+DlgCellTypeData		: "Veri",
+DlgCellTypeHeader	: "Başlık",
 DlgCellRowSpan		: "Satır Kapla",
 DlgCellCollSpan		: "Sütun Kapla",
 DlgCellBackColor	: "Arka Plan Rengi",
@@ -337,7 +345,7 @@ DlgCellBorderColor	: "Kenar Rengi",
 DlgCellBtnSelect	: "Seç...",
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+DlgFindAndReplaceTitle	: "Bul ve DeÄŸiÅŸtir",
 
 // Find Dialog
 DlgFindTitle		: "Bul",
@@ -361,7 +369,7 @@ PasteAsText		: "Düz Metin Olarak Yapıştır",
 PasteFromWord	: "Word'den yapıştır",
 
 DlgPasteMsg2	: "Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.",
-DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteSec		: "Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..",
 DlgPasteIgnoreFont		: "Yazı Tipi tanımlarını yoksay",
 DlgPasteRemoveStyles	: "Biçem Tanımlarını çıkar",
 
@@ -519,8 +527,8 @@ DlgAboutVersion		: "sürüm",
 DlgAboutInfo		: "Daha fazla bilgi için:",
 
 // Div Dialog
-DlgDivGeneralTab	: "General",	//MISSING
-DlgDivAdvancedTab	: "Advanced",	//MISSING
-DlgDivStyle		: "Style",	//MISSING
-DlgDivInlineStyle	: "Inline Style"	//MISSING
+DlgDivGeneralTab	: "Genel",
+DlgDivAdvancedTab	: "GeliÅŸmiÅŸ",
+DlgDivStyle		: "Sitil",
+DlgDivInlineStyle	: "Satıriçi Sitil"
 };
diff --git a/phpgwapi/js/fckeditor/editor/lang/uk.js b/phpgwapi/js/fckeditor/editor/lang/uk.js
index 29311433a1..66da55a409 100644
--- a/phpgwapi/js/fckeditor/editor/lang/uk.js
+++ b/phpgwapi/js/fckeditor/editor/lang/uk.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -44,9 +44,9 @@ RemoveFormat		: "Прибрати форматуванн�",
 InsertLinkLbl		: "По�иланн�",
 InsertLink			: "В�тавити/Редагувати по�иланн�",
 RemoveLink			: "Знищити по�иланн�",
-VisitLink			: "Open Link",	//MISSING
+VisitLink			: "Відкрити по�иланн�",
 Anchor				: "В�тавити/Редагувати �кір",
-AnchorDelete		: "Remove Anchor",	//MISSING
+AnchorDelete		: "Видалити �кір",
 InsertImageLbl		: "Зображенн�",
 InsertImage			: "В�тавити/Редагувати зображенн�",
 InsertFlashLbl		: "Flash",
@@ -72,10 +72,10 @@ RightJustify		: "По правому краю",
 BlockJustify		: "По ширині",
 DecreaseIndent		: "Зменшити від�туп",
 IncreaseIndent		: "Збільшити від�туп",
-Blockquote			: "Blockquote",	//MISSING
-CreateDiv			: "Create Div Container",	//MISSING
-EditDiv				: "Edit Div Container",	//MISSING
-DeleteDiv			: "Remove Div Container",	//MISSING
+Blockquote			: "Цитата",
+CreateDiv			: "Створити Div контейнер",
+EditDiv				: "Редагувати Div контейнер",
+DeleteDiv			: "Видалити Div контейнер",
 Undo				: "Повернути",
 Redo				: "Повторити",
 NumberedListLbl		: "�умерований �пи�ок",
@@ -109,27 +109,27 @@ SelectionField	: "Спи�ок",
 ImageButton		: "Кнопка із зображенн�м",
 
 FitWindow		: "Розвернути вікно редактора",
-ShowBlocks		: "Show Blocks",	//MISSING
+ShowBlocks		: "Показувати блоки",
 
 // Context Menu
 EditLink			: "В�тавити по�иланн�",
 CellCM				: "О�ередок",
 RowCM				: "Р�док",
 ColumnCM			: "Колонка",
-InsertRowAfter		: "Insert Row After",	//MISSING
-InsertRowBefore		: "Insert Row Before",	//MISSING
+InsertRowAfter		: "В�тавити р�док пі�л�",
+InsertRowBefore		: "В�тавити р�док до",
 DeleteRows			: "Видалити �троки",
-InsertColumnAfter	: "Insert Column After",	//MISSING
-InsertColumnBefore	: "Insert Column Before",	//MISSING
+InsertColumnAfter	: "В�тавити колонку пі�л�",
+InsertColumnBefore	: "В�тавити колонку до",
 DeleteColumns		: "Видалити колонки",
-InsertCellAfter		: "Insert Cell After",	//MISSING
-InsertCellBefore	: "Insert Cell Before",	//MISSING
+InsertCellAfter		: "В�тавити комірку пі�л�",
+InsertCellBefore	: "В�тавити комірку до",
 DeleteCells			: "Видалити комірки",
 MergeCells			: "Об'єднати комірки",
-MergeRight			: "Merge Right",	//MISSING
-MergeDown			: "Merge Down",	//MISSING
-HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
-VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+MergeRight			: "Об'єднати зправа",
+MergeDown			: "Об'єднати до низу",
+HorizontalSplitCell	: "Розділити комірку по горизонталі",
+VerticalSplitCell	: "Розділити комірку по вертикалі",
 TableDelete			: "Видалити таблицю",
 CellProperties		: "Вла�тиво�ті комірки",
 TableProperties		: "Вла�тиво�ті таблиці",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Проміжок (spacing)",
 DlgTableCellPad		: "Від�туп (padding)",
 DlgTableCaption		: "Заголовок",
 DlgTableSummary		: "Резюме",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Вла�тиво�ті комірки",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Зверху",
 DlgCellVerAlignMiddle	: "По�ередині",
 DlgCellVerAlignBottom	: "Знизу",
 DlgCellVerAlignBaseline	: "По базовій лінії",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Діапазон �трок (span)",
 DlgCellCollSpan		: "Діапазон колонок (span)",
 DlgCellBackColor	: "Колір фона",
@@ -337,7 +345,7 @@ DlgCellBorderColor	: "Колір бордюра",
 DlgCellBtnSelect	: "Оберіть...",
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+DlgFindAndReplaceTitle	: "Знайти і замінити",
 
 // Find Dialog
 DlgFindTitle		: "Пошук",
@@ -519,8 +527,8 @@ DlgAboutVersion		: "Вер�і�",
 DlgAboutInfo		: "Додаткову інформацію дивіть�� на ",
 
 // Div Dialog
-DlgDivGeneralTab	: "General",	//MISSING
-DlgDivAdvancedTab	: "Advanced",	//MISSING
-DlgDivStyle		: "Style",	//MISSING
-DlgDivInlineStyle	: "Inline Style"	//MISSING
+DlgDivGeneralTab	: "Загальна",
+DlgDivAdvancedTab	: "Розширена",
+DlgDivStyle		: "Стиль",
+DlgDivInlineStyle	: "Inline �тиль"
 };
diff --git a/phpgwapi/js/fckeditor/editor/lang/vi.js b/phpgwapi/js/fckeditor/editor/lang/vi.js
index e527bdbcf1..a70179b268 100644
--- a/phpgwapi/js/fckeditor/editor/lang/vi.js
+++ b/phpgwapi/js/fckeditor/editor/lang/vi.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "Khoảng cách Ô",
 DlgTableCellPad		: "�ệm Ô",
 DlgTableCaption		: "�ầu đ�",
 DlgTableSummary		: "Tóm lược",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "Thuộc tính Ô",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "Trên",
 DlgCellVerAlignMiddle	: "Giữa",
 DlgCellVerAlignBottom	: "DÆ°á»›i",
 DlgCellVerAlignBaseline	: "�ư�ng cơ sở",
+DlgCellType		: "Cell Type",	//MISSING
+DlgCellTypeData		: "Data",	//MISSING
+DlgCellTypeHeader	: "Header",	//MISSING
 DlgCellRowSpan		: "Nối Hàng",
 DlgCellCollSpan		: "Nối Cột",
 DlgCellBackColor	: "Màu n�n",
diff --git a/phpgwapi/js/fckeditor/editor/lang/zh-cn.js b/phpgwapi/js/fckeditor/editor/lang/zh-cn.js
index fb1081289e..2b99d966ed 100644
--- a/phpgwapi/js/fckeditor/editor/lang/zh-cn.js
+++ b/phpgwapi/js/fckeditor/editor/lang/zh-cn.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -73,9 +73,9 @@ BlockJustify		: "两端对�",
 DecreaseIndent		: "�少缩进�",
 IncreaseIndent		: "增加缩进�",
 Blockquote			: "�引用",
-CreateDiv			: "新增 Div 标籤",
-EditDiv				: "更改 Div 标籤",
-DeleteDiv			: "删除 Div 标籤",
+CreateDiv			: "�入 Div 标签",
+EditDiv				: "编辑 Div 标签",
+DeleteDiv			: "删除 Div 标签",
 Undo				: "撤消",
 Redo				: "��",
 NumberedListLbl		: "编�列表",
@@ -116,20 +116,20 @@ EditLink			: "编辑超链接",
 CellCM				: "�元格",
 RowCM				: "行",
 ColumnCM			: "列",
-InsertRowAfter		: "下�入行",
-InsertRowBefore		: "上�入行",
+InsertRowAfter		: "在下方�入行",
+InsertRowBefore		: "在上方�入行",
 DeleteRows			: "删除行",
-InsertColumnAfter	: "��入列",
-InsertColumnBefore	: "左�入列",
+InsertColumnAfter	: "在�侧�入列",
+InsertColumnBefore	: "在左侧�入列",
 DeleteColumns		: "删除列",
-InsertCellAfter		: "��入�元格",
-InsertCellBefore	: "左�入�元格",
+InsertCellAfter		: "在�侧�入�元格",
+InsertCellBefore	: "在左侧�入�元格",
 DeleteCells			: "删除�元格",
 MergeCells			: "�并�元格",
-MergeRight			: "��并�元格",
-MergeDown			: "下�并�元格",
-HorizontalSplitCell	: "橫拆分�元格",
-VerticalSplitCell	: "縱拆分�元格",
+MergeRight			: "���并�元格",
+MergeDown			: "�下�并�元格",
+HorizontalSplitCell	: "水平拆分�元格",
+VerticalSplitCell	: "垂直拆分�元格",
 TableDelete			: "删除表格",
 CellProperties		: "�元格属性",
 TableProperties		: "表格属性",
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "é—´è·�",
 DlgTableCellPad		: "边�",
 DlgTableCaption		: "标题",
 DlgTableSummary		: "摘�",
+DlgTableHeaders		: "标题�元格",
+DlgTableHeadersNone		: "æ— ",
+DlgTableHeadersColumn	: "第一列",
+DlgTableHeadersRow		: "第一行",
+DlgTableHeadersBoth		: "第一列和第一行",
 
 // Table Cell Dialog
 DlgCellTitle		: "�元格属性",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "顶端",
 DlgCellVerAlignMiddle	: "居中",
 DlgCellVerAlignBottom	: "底部",
 DlgCellVerAlignBaseline	: "基线",
+DlgCellType		: "�元格类型",
+DlgCellTypeData		: "资料",
+DlgCellTypeHeader	: "标题",
 DlgCellRowSpan		: "纵跨行数",
 DlgCellCollSpan		: "横跨列数",
 DlgCellBackColor	: "背景颜色",
@@ -506,7 +514,7 @@ DlgDocPreview		: "预览",
 // Templates Dialog
 Templates			: "模�",
 DlgTemplatesTitle	: "内容模�",
-DlgTemplatesSelMsg	: "请选择编辑器内容模�<br>(当�内容将会被清除替�):",
+DlgTemplatesSelMsg	: "请选择编辑器内容模�:",
 DlgTemplatesLoading	: "正在加载模�列表，请�等...",
 DlgTemplatesNoTpl	: "(没有模�)",
 DlgTemplatesReplace	: "替�当�内容",
diff --git a/phpgwapi/js/fckeditor/editor/lang/zh.js b/phpgwapi/js/fckeditor/editor/lang/zh.js
index 9c945fc38f..eeef526ea2 100644
--- a/phpgwapi/js/fckeditor/editor/lang/zh.js
+++ b/phpgwapi/js/fckeditor/editor/lang/zh.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -308,6 +308,11 @@ DlgTableCellSpace	: "é–“è·�",
 DlgTableCellPad		: "內�",
 DlgTableCaption		: "標題",
 DlgTableSummary		: "摘�",
+DlgTableHeaders		: "Headers",	//MISSING
+DlgTableHeadersNone		: "None",	//MISSING
+DlgTableHeadersColumn	: "First column",	//MISSING
+DlgTableHeadersRow		: "First Row",	//MISSING
+DlgTableHeadersBoth		: "Both",	//MISSING
 
 // Table Cell Dialog
 DlgCellTitle		: "儲存格屬性",
@@ -330,6 +335,9 @@ DlgCellVerAlignTop	: "�上�齊",
 DlgCellVerAlignMiddle	: "置中",
 DlgCellVerAlignBottom	: "�下�齊",
 DlgCellVerAlignBaseline	: "基準線",
+DlgCellType		: "儲存格類型",
+DlgCellTypeData		: "資料",
+DlgCellTypeHeader	: "標題",
 DlgCellRowSpan		: "�併列數",
 DlgCellCollSpan		: "�併欄数",
 DlgCellBackColor	: "背景�色",
diff --git a/phpgwapi/js/fckeditor/editor/plugins/autogrow/fckplugin.js b/phpgwapi/js/fckeditor/editor/plugins/autogrow/fckplugin.js
index 17deefca43..291a51ec34 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/autogrow/fckplugin.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/autogrow/fckplugin.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -22,78 +22,90 @@
  * height (FCKConfig.AutoGrowMax), based on its contents.
  */
 
-var FCKAutoGrow_Min = window.frameElement.offsetHeight ;
+var FCKAutoGrow = {
+	MIN_HEIGHT : window.frameElement.offsetHeight,
 
-function FCKAutoGrow_Check()
-{
-	var oInnerDoc = FCK.EditorDocument ;
-
-	var iFrameHeight, iInnerHeight ;
-
-	if ( FCKBrowserInfo.IsIE )
+	Check : function()
 	{
-		iFrameHeight = FCK.EditorWindow.frameElement.offsetHeight ;
-		iInnerHeight = oInnerDoc.body.scrollHeight ;
-	}
-	else
-	{
-		iFrameHeight = FCK.EditorWindow.innerHeight ;
-		iInnerHeight = oInnerDoc.body.offsetHeight ;
-	}
-
-	var iDiff = iInnerHeight - iFrameHeight ;
-
-	if ( iDiff != 0 )
-	{
-		var iMainFrameSize = window.frameElement.offsetHeight ;
-
-		if ( iDiff > 0 && iMainFrameSize < FCKConfig.AutoGrowMax )
+		var delta = FCKAutoGrow.GetHeightDelta() ;
+		if ( delta != 0 )
 		{
-			iMainFrameSize += iDiff ;
-			if ( iMainFrameSize > FCKConfig.AutoGrowMax )
-				iMainFrameSize = FCKConfig.AutoGrowMax ;
+			var newHeight = window.frameElement.offsetHeight + delta ;
+
+			newHeight = FCKAutoGrow.GetEffectiveHeight( newHeight ) ;
+
+			if ( newHeight != window.frameElement.height )
+			{
+				window.frameElement.style.height = newHeight + "px" ;
+
+				// Gecko browsers use an onresize handler to update the innermost
+				// IFRAME's height. If the document is modified before the onresize
+				// is triggered, the plugin will miscalculate the new height. Thus,
+				// forcibly trigger onresize. #1336
+				if ( typeof window.onresize == 'function' )
+				{
+					window.onresize() ;
+				}
+			}
 		}
-		else if ( iDiff < 0 && iMainFrameSize > FCKAutoGrow_Min )
+	},
+
+	CheckEditorStatus : function( sender, status )
+	{
+		if ( status == FCK_STATUS_COMPLETE )
+			FCKAutoGrow.Check() ;
+	},
+
+	GetEffectiveHeight : function( height )
+	{
+		if ( height < FCKAutoGrow.MIN_HEIGHT )
+			height = FCKAutoGrow.MIN_HEIGHT;
+		else
 		{
-			iMainFrameSize += iDiff ;
-			if ( iMainFrameSize < FCKAutoGrow_Min )
-				iMainFrameSize = FCKAutoGrow_Min ;
+			var max = FCKConfig.AutoGrowMax;
+			if ( max && max > 0 && height > max )
+				height = max;
+		}
+
+		return height;
+	},
+
+	GetHeightDelta : function()
+	{
+		var oInnerDoc = FCK.EditorDocument ;
+
+		var iFrameHeight ;
+		var iInnerHeight ;
+
+		if ( FCKBrowserInfo.IsIE )
+		{
+			iFrameHeight = FCK.EditorWindow.frameElement.offsetHeight ;
+			iInnerHeight = oInnerDoc.body.scrollHeight ;
 		}
 		else
+		{
+			iFrameHeight = FCK.EditorWindow.innerHeight ;
+			iInnerHeight = oInnerDoc.body.offsetHeight +
+				( parseInt( FCKDomTools.GetCurrentElementStyle( oInnerDoc.body, 'margin-top' ), 10 ) || 0 ) +
+				( parseInt( FCKDomTools.GetCurrentElementStyle( oInnerDoc.body, 'margin-bottom' ), 10 ) || 0 ) ;
+		}
+
+		return iInnerHeight - iFrameHeight ;
+	},
+
+	SetListeners : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
 			return ;
 
-		window.frameElement.height = iMainFrameSize ;
-
-		// Gecko browsers use an onresize handler to update the innermost
-		// IFRAME's height. If the document is modified before the onresize
-		// is triggered, the plugin will miscalculate the new height. Thus,
-		// forcibly trigger onresize. #1336
-		if ( typeof window.onresize == 'function' )
-			window.onresize() ;
+		FCK.EditorWindow.attachEvent( 'onscroll', FCKAutoGrow.Check ) ;
+		FCK.EditorDocument.attachEvent( 'onkeyup', FCKAutoGrow.Check ) ;
 	}
-}
+};
 
-FCK.AttachToOnSelectionChange( FCKAutoGrow_Check ) ;
-
-function FCKAutoGrow_SetListeners()
-{
-	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
-		return ;
-
-	FCK.EditorWindow.attachEvent( 'onscroll', FCKAutoGrow_Check ) ;
-	FCK.EditorDocument.attachEvent( 'onkeyup', FCKAutoGrow_Check ) ;
-}
+FCK.AttachToOnSelectionChange( FCKAutoGrow.Check ) ;
 
 if ( FCKBrowserInfo.IsIE )
-{
-//	FCKAutoGrow_SetListeners() ;
-	FCK.Events.AttachEvent( 'OnAfterSetHTML', FCKAutoGrow_SetListeners ) ;
-}
+	FCK.Events.AttachEvent( 'OnAfterSetHTML', FCKAutoGrow.SetListeners ) ;
 
-function FCKAutoGrow_CheckEditorStatus( sender, status )
-{
-	if ( status == FCK_STATUS_COMPLETE )
-		FCKAutoGrow_Check() ;
-}
-
-FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow_CheckEditorStatus ) ;
+FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow.CheckEditorStatus ) ;
diff --git a/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.config.js b/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.config.js
index cbad4de924..6733d30763 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.config.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.config.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.html b/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.html
index 246f3a5174..75db189c8d 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.html
+++ b/phpgwapi/js/fckeditor/editor/plugins/bbcode/_sample/sample.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/bbcode/fckplugin.js b/phpgwapi/js/fckeditor/editor/plugins/bbcode/fckplugin.js
index faa7b95eb2..116d27ac38 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/bbcode/fckplugin.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/bbcode/fckplugin.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/dragresizetable/fckplugin.js b/phpgwapi/js/fckeditor/editor/plugins/dragresizetable/fckplugin.js
index b5e79bb50d..832162ae1e 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/dragresizetable/fckplugin.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/dragresizetable/fckplugin.js
@@ -517,8 +517,13 @@
 				backgroundImage	: 'none',
 				border		: '0'
 			} ) ;
+	},
+	"Reset" : function()
+	{
+		FCKDragTableHandler._LeftCell = FCKDragTableHandler._RightCell = FCKDragTableHandler._TableMap = null ;
 	}
 
 };
 
 FCK.Events.AttachEvent( "OnMouseMove", FCKDragTableHandler.MouseMoveListener ) ;
+FCK.Events.AttachEvent( "OnAfterSetHTML", FCKDragTableHandler.Reset ) ;
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/fck_placeholder.html b/phpgwapi/js/fckeditor/editor/plugins/placeholder/fck_placeholder.html
index 359a7a12eb..0f83984e06 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/fck_placeholder.html
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/fck_placeholder.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/fckplugin.js b/phpgwapi/js/fckeditor/editor/plugins/placeholder/fckplugin.js
index 05dfb76429..b9ca0b57d4 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/fckplugin.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/fckplugin.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/de.js b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/de.js
index f72c301006..3e00ec21fa 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/de.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/de.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/en.js b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/en.js
index af2177e147..31429eaa22 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/en.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/en.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/es.js b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/es.js
index 6d87fa8fe8..6f539fe4bf 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/es.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/es.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/fr.js b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/fr.js
index d94beb62d5..45cae26506 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/fr.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/fr.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/it.js b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/it.js
index 1181eff754..cdbe794389 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/it.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/it.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/pl.js b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/pl.js
index ae41c56b18..767d1a1000 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/pl.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/placeholder/lang/pl.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/simplecommands/fckplugin.js b/phpgwapi/js/fckeditor/editor/plugins/simplecommands/fckplugin.js
index 07ebef13fb..8db1043fae 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/simplecommands/fckplugin.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/simplecommands/fckplugin.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/plugins/tablecommands/fckplugin.js b/phpgwapi/js/fckeditor/editor/plugins/tablecommands/fckplugin.js
index bcd18d6c6b..f291f22668 100644
--- a/phpgwapi/js/fckeditor/editor/plugins/tablecommands/fckplugin.js
+++ b/phpgwapi/js/fckeditor/editor/plugins/tablecommands/fckplugin.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/_fckviewstrips.html b/phpgwapi/js/fckeditor/editor/skins/_fckviewstrips.html
index 620f00ea5f..e2337b755a 100644
--- a/phpgwapi/js/fckeditor/editor/skins/_fckviewstrips.html
+++ b/phpgwapi/js/fckeditor/editor/skins/_fckviewstrips.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog.css b/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog.css
index 3eb1aec5c9..6b149d75ed 100644
--- a/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog.css
+++ b/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog_ie6.js b/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog_ie6.js
index 2415bc2160..e874abfae0 100644
--- a/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog_ie6.js
+++ b/phpgwapi/js/fckeditor/editor/skins/default/fck_dialog_ie6.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/default/fck_editor.css b/phpgwapi/js/fckeditor/editor/skins/default/fck_editor.css
index e59e35ed43..436131e6d5 100644
--- a/phpgwapi/js/fckeditor/editor/skins/default/fck_editor.css
+++ b/phpgwapi/js/fckeditor/editor/skins/default/fck_editor.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog.css b/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog.css
index 70c734a776..8fb16161b7 100644
--- a/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog.css
+++ b/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog_ie6.js b/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog_ie6.js
index 2415bc2160..e874abfae0 100644
--- a/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog_ie6.js
+++ b/phpgwapi/js/fckeditor/editor/skins/office2003/fck_dialog_ie6.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/office2003/fck_editor.css b/phpgwapi/js/fckeditor/editor/skins/office2003/fck_editor.css
index 962908a9fa..9d582e5000 100644
--- a/phpgwapi/js/fckeditor/editor/skins/office2003/fck_editor.css
+++ b/phpgwapi/js/fckeditor/editor/skins/office2003/fck_editor.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog.css b/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog.css
index 53f16ef8d3..96be59356f 100644
--- a/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog.css
+++ b/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog_ie6.js b/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog_ie6.js
index 2415bc2160..e874abfae0 100644
--- a/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog_ie6.js
+++ b/phpgwapi/js/fckeditor/editor/skins/silver/fck_dialog_ie6.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/editor/skins/silver/fck_editor.css b/phpgwapi/js/fckeditor/editor/skins/silver/fck_editor.css
index 6286dfa014..f1a500730c 100644
--- a/phpgwapi/js/fckeditor/editor/skins/silver/fck_editor.css
+++ b/phpgwapi/js/fckeditor/editor/skins/silver/fck_editor.css
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/egw_integration.txt b/phpgwapi/js/fckeditor/egw_integration.txt
index 220bae1b43..9d24c1b189 100644
--- a/phpgwapi/js/fckeditor/egw_integration.txt
+++ b/phpgwapi/js/fckeditor/egw_integration.txt
@@ -1,3 +1,10 @@
+2009/07/09 (KlausLeithoff)
+after merging the vendor branch into the current release, remove _samples Directory, and unneeded connectors
+-change to phpgwapi/js/fckeditor
+svn remove --force _samples
+-change to phpgwapi/js/fckeditor/editor/filemanager/connectors
+svn remove --force asp aspx cfm lasso perl py
+
 2008/10/09 (KlausLeithoff)
 -To use Speller Pages just set the following configuration in fckconfig.js or in your own Configuration File:
  FCKConfig.SpellChecker = 'SpellerPages' ;
diff --git a/phpgwapi/js/fckeditor/fckconfig.js b/phpgwapi/js/fckeditor/fckconfig.js
index da2e29c3ed..fa9954e310 100644
--- a/phpgwapi/js/fckeditor/fckconfig.js
+++ b/phpgwapi/js/fckeditor/fckconfig.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -76,7 +76,7 @@ FCKConfig.FormatSource		= true ;
 FCKConfig.FormatOutput		= true ;
 FCKConfig.FormatIndentator	= '    ' ;
 
-FCKConfig.EMailProtection = 'encode' ; // none | encode | function
+FCKConfig.EMailProtection = 'none' ; // none | encode | function
 FCKConfig.EMailProtectionFunction = 'mt(NAME,DOMAIN,SUBJECT,BODY)' ;
 
 FCKConfig.StartupFocus	= false ;
@@ -160,7 +160,7 @@ FCKConfig.FontSizes		= 'smaller;larger;xx-small;x-small;small;medium;large;x-lar
 FCKConfig.StylesXmlPath		= FCKConfig.EditorPath + 'fckstyles.xml' ;
 FCKConfig.TemplatesXmlPath	= FCKConfig.EditorPath + 'fcktemplates.xml' ;
 
-FCKConfig.SpellChecker			= 'SpellerPages' ;	// 'ieSpell' | 'SpellerPages'
+FCKConfig.SpellChecker			= 'SpellerPages' ; // 'WSC' | 'SpellerPages' | 'ieSpell'	
 FCKConfig.IeSpellDownloadUrl	= 'http://www.iespell.com/download.php' ;
 FCKConfig.SpellerPagesServerScript = 'server-scripts/spellchecker.php' ;	// Available extension: .php .cfm .pl
 FCKConfig.FirefoxSpellChecker	= false ;
diff --git a/phpgwapi/js/fckeditor/fckeditor.afp b/phpgwapi/js/fckeditor/fckeditor.afp
index e5c35f4c89..349d90393b 100644
--- a/phpgwapi/js/fckeditor/fckeditor.afp
+++ b/phpgwapi/js/fckeditor/fckeditor.afp
@@ -1,6 +1,6 @@
 <%
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckeditor.asp b/phpgwapi/js/fckeditor/fckeditor.asp
index 547c01b8e9..e592e7986d 100644
--- a/phpgwapi/js/fckeditor/fckeditor.asp
+++ b/phpgwapi/js/fckeditor/fckeditor.asp
@@ -1,6 +1,6 @@
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckeditor.cfc b/phpgwapi/js/fckeditor/fckeditor.cfc
index 9fa40f67b0..86b66e3dc9 100644
--- a/phpgwapi/js/fckeditor/fckeditor.cfc
+++ b/phpgwapi/js/fckeditor/fckeditor.cfc
@@ -2,7 +2,7 @@
 
 <!---
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckeditor.cfm b/phpgwapi/js/fckeditor/fckeditor.cfm
index 22fa6ad967..7a1da36285 100644
--- a/phpgwapi/js/fckeditor/fckeditor.cfm
+++ b/phpgwapi/js/fckeditor/fckeditor.cfm
@@ -1,7 +1,7 @@
 <cfsetting enablecfoutputonly="Yes">
 <!---
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckeditor.js b/phpgwapi/js/fckeditor/fckeditor.js
index 8994edad97..78877afdee 100644
--- a/phpgwapi/js/fckeditor/fckeditor.js
+++ b/phpgwapi/js/fckeditor/fckeditor.js
@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -59,8 +59,8 @@ FCKeditor.MinHeight = 200 ;
  */
 FCKeditor.MinWidth = 750 ;
 
-FCKeditor.prototype.Version			= '2.6.3' ;
-FCKeditor.prototype.VersionBuild	= '19836' ;
+FCKeditor.prototype.Version			= '2.6.4.1' ;
+FCKeditor.prototype.VersionBuild	= '23187' ;
 
 FCKeditor.prototype.Create = function()
 {
@@ -106,6 +106,8 @@ FCKeditor.prototype.CreateHtml = function()
 
 FCKeditor.prototype.ReplaceTextarea = function()
 {
+	if ( document.getElementById( this.InstanceName + '___Frame' ) )
+		return ;
 	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
 	{
 		// We must check the elements firstly using the Id and then the name.
@@ -175,7 +177,7 @@ FCKeditor.prototype._GetIFrameHtml = function()
 	if (this.ToolbarSet)
 		sLink += '&amp;Toolbar=' + this.ToolbarSet ;
 
-	html = '<iframe id="' + this.InstanceName +
+	var html = '<iframe id="' + this.InstanceName +
 		'___Frame" src="' + sLink +
 		'" width="' + this.Width +
 		'" height="' + this.Height ;
diff --git a/phpgwapi/js/fckeditor/fckeditor.lasso b/phpgwapi/js/fckeditor/fckeditor.lasso
index f450a57c25..86cc792895 100644
--- a/phpgwapi/js/fckeditor/fckeditor.lasso
+++ b/phpgwapi/js/fckeditor/fckeditor.lasso
@@ -1,7 +1,7 @@
 [//lasso
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckeditor.php b/phpgwapi/js/fckeditor/fckeditor.php
index 002f267c6f..ca6245fe38 100644
--- a/phpgwapi/js/fckeditor/fckeditor.php
+++ b/phpgwapi/js/fckeditor/fckeditor.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckeditor.pl b/phpgwapi/js/fckeditor/fckeditor.pl
index 2427982d7e..a213dfbbff 100644
--- a/phpgwapi/js/fckeditor/fckeditor.pl
+++ b/phpgwapi/js/fckeditor/fckeditor.pl
@@ -1,143 +1,143 @@
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2008 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the integration file for Perl.
-#####
-
-#my $InstanceName;
-#my $BasePath;
-#my $Width;
-#my $Height;
-#my $ToolbarSet;
-#my $Value;
-#my %Config;
-
-sub FCKeditor
-{
-
-	local($instanceName) = @_;
-	$InstanceName	= $instanceName;
-	$BasePath		= '/fckeditor/';
-	$Width			= '100%';
-	$Height			= '200';
-	$ToolbarSet		= 'Default';
-	$Value			= '';
-}
-
-sub Create
-{
-	print &CreateHtml();
-}
-
-sub specialchar_cnv
-{
-
-	local($ch) = @_;
-
-	$ch =~ s/&/&amp;/g;		# &
-	$ch =~ s/\"/&quot;/g;	#"
-	$ch =~ s/\'/&#39;/g;	# '
-	$ch =~ s/</&lt;/g;		# <
-	$ch =~ s/>/&gt;/g;		# >
-	return($ch);
-}
-
-sub CreateHtml
-{
-
-	$HtmlValue = &specialchar_cnv($Value);
-	$Html = '' ;
-	if(&IsCompatible()) {
-		$Link = $BasePath . "editor/fckeditor.html?InstanceName=$InstanceName";
-		if($ToolbarSet ne '') {
-			$Link .= "&amp;Toolbar=$ToolbarSet";
-		}
-		#// Render the linked hidden field.
-		$Html .= "<input type=\"hidden\" id=\"$InstanceName\" name=\"$InstanceName\" value=\"$HtmlValue\" style=\"display:none\" />" ;
-
-		#// Render the configurations hidden field.
-		$cfgstr = &GetConfigFieldString();
-		$wk = $InstanceName."___Config";
-		$Html .= "<input type=\"hidden\" id=\"$wk\" value=\"$cfgstr\" style=\"display:none\" />" ;
-
-		#// Render the editor IFRAME.
-		$wk = $InstanceName."___Frame";
-		$Html .= "<iframe id=\"$wk\" src=\"$Link\" width=\"$Width\" height=\"$Height\" frameborder=\"0\" scrolling=\"no\"></iframe>";
-	} else {
-		if($Width =~ /\%/g){
-			$WidthCSS = $Width;
-		} else {
-			$WidthCSS = $Width . 'px';
-		}
-		if($Height =~ /\%/g){
-			$HeightCSS = $Height;
-		} else {
-			$HeightCSS = $Height . 'px';
-		}
-		$Html .= "<textarea name=\"$InstanceName\" rows=\"4\" cols=\"40\" style=\"width: $WidthCSS; height: $HeightCSS\">$HtmlValue</textarea>";
-	}
-	return($Html);
-}
-
-sub IsCompatible
-{
-
-	$sAgent = $ENV{'HTTP_USER_AGENT'};
-	if(($sAgent =~ /MSIE/i) && !($sAgent =~ /mac/i) && !($sAgent =~ /Opera/i)) {
-		$iVersion = substr($sAgent,index($sAgent,'MSIE') + 5,3);
-		return($iVersion >= 5.5) ;
-	} elsif($sAgent =~ /Gecko\//i) {
-		$iVersion = substr($sAgent,index($sAgent,'Gecko/') + 6,8);
-		return($iVersion >= 20030210) ;
-	} elsif($sAgent =~ /Opera\//i) {
-		$iVersion = substr($sAgent,index($sAgent,'Opera/') + 6,4);
-		return($iVersion >= 9.5) ;
-	} elsif($sAgent =~ /AppleWebKit\/(\d+)/i) {
-		return($1 >= 522) ;
-	} else {
-		return(0);		# 2.0 PR fix
-	}
-}
-
-sub GetConfigFieldString
-{
-	$sParams = '';
-	$bFirst = 0;
-	foreach $sKey (keys %Config) {
-		$sValue = $Config{$sKey};
-		if($bFirst == 1) {
-			$sParams .= '&amp;';
-		} else {
-			$bFirst = 1;
-		}
-		$k = &specialchar_cnv($sKey);
-		$v = &specialchar_cnv($sValue);
-		if($sValue eq "true") {
-			$sParams .= "$k=true";
-		} elsif($sValue eq "false") {
-			$sParams .= "$k=false";
-		} else {
-			$sParams .= "$k=$v";
-		}
-	}
-	return($sParams);
-}
-
-1;
+#####
+#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
+#  Copyright (C) 2003-2009 Frederico Caldeira Knabben
+#
+#  == BEGIN LICENSE ==
+#
+#  Licensed under the terms of any of the following licenses at your
+#  choice:
+#
+#   - GNU General Public License Version 2 or later (the "GPL")
+#     http://www.gnu.org/licenses/gpl.html
+#
+#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+#     http://www.gnu.org/licenses/lgpl.html
+#
+#   - Mozilla Public License Version 1.1 or later (the "MPL")
+#     http://www.mozilla.org/MPL/MPL-1.1.html
+#
+#  == END LICENSE ==
+#
+#  This is the integration file for Perl.
+#####
+
+#my $InstanceName;
+#my $BasePath;
+#my $Width;
+#my $Height;
+#my $ToolbarSet;
+#my $Value;
+#my %Config;
+
+sub FCKeditor
+{
+
+	local($instanceName) = @_;
+	$InstanceName	= $instanceName;
+	$BasePath		= '/fckeditor/';
+	$Width			= '100%';
+	$Height			= '200';
+	$ToolbarSet		= 'Default';
+	$Value			= '';
+}
+
+sub Create
+{
+	print &CreateHtml();
+}
+
+sub specialchar_cnv
+{
+
+	local($ch) = @_;
+
+	$ch =~ s/&/&amp;/g;		# &
+	$ch =~ s/\"/&quot;/g;	#"
+	$ch =~ s/\'/&#39;/g;	# '
+	$ch =~ s/</&lt;/g;		# <
+	$ch =~ s/>/&gt;/g;		# >
+	return($ch);
+}
+
+sub CreateHtml
+{
+
+	$HtmlValue = &specialchar_cnv($Value);
+	$Html = '' ;
+	if(&IsCompatible()) {
+		$Link = $BasePath . "editor/fckeditor.html?InstanceName=$InstanceName";
+		if($ToolbarSet ne '') {
+			$Link .= "&amp;Toolbar=$ToolbarSet";
+		}
+		#// Render the linked hidden field.
+		$Html .= "<input type=\"hidden\" id=\"$InstanceName\" name=\"$InstanceName\" value=\"$HtmlValue\" style=\"display:none\" />" ;
+
+		#// Render the configurations hidden field.
+		$cfgstr = &GetConfigFieldString();
+		$wk = $InstanceName."___Config";
+		$Html .= "<input type=\"hidden\" id=\"$wk\" value=\"$cfgstr\" style=\"display:none\" />" ;
+
+		#// Render the editor IFRAME.
+		$wk = $InstanceName."___Frame";
+		$Html .= "<iframe id=\"$wk\" src=\"$Link\" width=\"$Width\" height=\"$Height\" frameborder=\"0\" scrolling=\"no\"></iframe>";
+	} else {
+		if($Width =~ /\%/g){
+			$WidthCSS = $Width;
+		} else {
+			$WidthCSS = $Width . 'px';
+		}
+		if($Height =~ /\%/g){
+			$HeightCSS = $Height;
+		} else {
+			$HeightCSS = $Height . 'px';
+		}
+		$Html .= "<textarea name=\"$InstanceName\" rows=\"4\" cols=\"40\" style=\"width: $WidthCSS; height: $HeightCSS\">$HtmlValue</textarea>";
+	}
+	return($Html);
+}
+
+sub IsCompatible
+{
+
+	$sAgent = $ENV{'HTTP_USER_AGENT'};
+	if(($sAgent =~ /MSIE/i) && !($sAgent =~ /mac/i) && !($sAgent =~ /Opera/i)) {
+		$iVersion = substr($sAgent,index($sAgent,'MSIE') + 5,3);
+		return($iVersion >= 5.5) ;
+	} elsif($sAgent =~ /Gecko\//i) {
+		$iVersion = substr($sAgent,index($sAgent,'Gecko/') + 6,8);
+		return($iVersion >= 20030210) ;
+	} elsif($sAgent =~ /Opera\//i) {
+		$iVersion = substr($sAgent,index($sAgent,'Opera/') + 6,4);
+		return($iVersion >= 9.5) ;
+	} elsif($sAgent =~ /AppleWebKit\/(\d+)/i) {
+		return($1 >= 522) ;
+	} else {
+		return(0);		# 2.0 PR fix
+	}
+}
+
+sub GetConfigFieldString
+{
+	$sParams = '';
+	$bFirst = 0;
+	foreach $sKey (keys %Config) {
+		$sValue = $Config{$sKey};
+		if($bFirst == 1) {
+			$sParams .= '&amp;';
+		} else {
+			$bFirst = 1;
+		}
+		$k = &specialchar_cnv($sKey);
+		$v = &specialchar_cnv($sValue);
+		if($sValue eq "true") {
+			$sParams .= "$k=true";
+		} elsif($sValue eq "false") {
+			$sParams .= "$k=false";
+		} else {
+			$sParams .= "$k=$v";
+		}
+	}
+	return($sParams);
+}
+
+1;
diff --git a/phpgwapi/js/fckeditor/fckeditor.py b/phpgwapi/js/fckeditor/fckeditor.py
index d49013f914..2e72e7375b 100644
--- a/phpgwapi/js/fckeditor/fckeditor.py
+++ b/phpgwapi/js/fckeditor/fckeditor.py
@@ -1,6 +1,6 @@
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
+Copyright (C) 2003-2009 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
diff --git a/phpgwapi/js/fckeditor/fckeditor_php4.php b/phpgwapi/js/fckeditor/fckeditor_php4.php
index 09f865d119..0663d7c46b 100644
--- a/phpgwapi/js/fckeditor/fckeditor_php4.php
+++ b/phpgwapi/js/fckeditor/fckeditor_php4.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckeditor_php5.php b/phpgwapi/js/fckeditor/fckeditor_php5.php
index 4c7ada8df1..86375f5013 100644
--- a/phpgwapi/js/fckeditor/fckeditor_php5.php
+++ b/phpgwapi/js/fckeditor/fckeditor_php5.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckpackager.xml b/phpgwapi/js/fckeditor/fckpackager.xml
index 396106c9fc..145c912f2e 100644
--- a/phpgwapi/js/fckeditor/fckpackager.xml
+++ b/phpgwapi/js/fckeditor/fckpackager.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -27,7 +27,7 @@
 <Package>
 	<Header><![CDATA[/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckstyles.xml b/phpgwapi/js/fckeditor/fckstyles.xml
index 76ca2adc17..49718f9f85 100644
--- a/phpgwapi/js/fckeditor/fckstyles.xml
+++ b/phpgwapi/js/fckeditor/fckstyles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fcktemplates.xml b/phpgwapi/js/fckeditor/fcktemplates.xml
index 4c5b55a865..8d82fc48da 100644
--- a/phpgwapi/js/fckeditor/fcktemplates.xml
+++ b/phpgwapi/js/fckeditor/fcktemplates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/fckutils.cfm b/phpgwapi/js/fckeditor/fckutils.cfm
index fa40995f0a..99c57b143c 100644
--- a/phpgwapi/js/fckeditor/fckutils.cfm
+++ b/phpgwapi/js/fckeditor/fckutils.cfm
@@ -1,6 +1,6 @@
 <!---
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff --git a/phpgwapi/js/fckeditor/license.txt b/phpgwapi/js/fckeditor/license.txt
index 43ac59d82d..9d0fd6dd86 100644
--- a/phpgwapi/js/fckeditor/license.txt
+++ b/phpgwapi/js/fckeditor/license.txt
@@ -1,5 +1,5 @@
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2008 Frederico Caldeira Knabben
+Copyright (C) 2003-2009 Frederico Caldeira Knabben
 
 Licensed under the terms of any of the following licenses at your
 choice:

From b09f75d839b675c95fd18fe7b6bcec9ee2b8d2a2 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 7 Jul 2009 09:05:21 +0000
Subject: [PATCH 453/510] remove baseconfig for unneeded connectors

---
 phpgwapi/js/fckeditor/egw_integration.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpgwapi/js/fckeditor/egw_integration.txt b/phpgwapi/js/fckeditor/egw_integration.txt
index 9d24c1b189..78c28a7994 100644
--- a/phpgwapi/js/fckeditor/egw_integration.txt
+++ b/phpgwapi/js/fckeditor/egw_integration.txt
@@ -4,6 +4,8 @@ after merging the vendor branch into the current release, remove _samples Direct
 svn remove --force _samples
 -change to phpgwapi/js/fckeditor/editor/filemanager/connectors
 svn remove --force asp aspx cfm lasso perl py
+-remove baseconfigs for unneeded connectors
+svn delete fckeditor.afp fckeditor.asp fckeditor.cfc fckeditor.cfm fckeditor.lasso fckeditor.pl fckeditor.py
 
 2008/10/09 (KlausLeithoff)
 -To use Speller Pages just set the following configuration in fckconfig.js or in your own Configuration File:

From 6570199588edbcbb57bbdebe3e835052d45993b6 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 7 Jul 2009 09:06:11 +0000
Subject: [PATCH 454/510] remove baseconfig for unneeded connectors

---
 phpgwapi/js/fckeditor/fckeditor.afp   | 159 -----------------
 phpgwapi/js/fckeditor/fckeditor.asp   | 235 --------------------------
 phpgwapi/js/fckeditor/fckeditor.cfc   | 232 -------------------------
 phpgwapi/js/fckeditor/fckeditor.cfm   | 159 -----------------
 phpgwapi/js/fckeditor/fckeditor.lasso | 108 ------------
 phpgwapi/js/fckeditor/fckeditor.pl    | 143 ----------------
 phpgwapi/js/fckeditor/fckeditor.py    | 160 ------------------
 7 files changed, 1196 deletions(-)
 delete mode 100644 phpgwapi/js/fckeditor/fckeditor.afp
 delete mode 100644 phpgwapi/js/fckeditor/fckeditor.asp
 delete mode 100644 phpgwapi/js/fckeditor/fckeditor.cfc
 delete mode 100644 phpgwapi/js/fckeditor/fckeditor.cfm
 delete mode 100644 phpgwapi/js/fckeditor/fckeditor.lasso
 delete mode 100644 phpgwapi/js/fckeditor/fckeditor.pl
 delete mode 100644 phpgwapi/js/fckeditor/fckeditor.py

diff --git a/phpgwapi/js/fckeditor/fckeditor.afp b/phpgwapi/js/fckeditor/fckeditor.afp
deleted file mode 100644
index 349d90393b..0000000000
--- a/phpgwapi/js/fckeditor/fckeditor.afp
+++ /dev/null
@@ -1,159 +0,0 @@
-<%
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the integration file for Active FoxPro Pages.
- *
-
-DEFINE CLASS goFckeditor AS CONTAINER OLEPUBLIC
-
-	cInstanceName =""
-	BasePath =""
-	cWIDTH =""
-	cHEIGHT =""
-	ToolbarSet =""
-	cValue=""
-	DIMENSION aConfig(10,2)
-
-&& -----------------------------------------------------------------------
-	FUNCTION fckeditor( tcInstanceName )
-		LOCAL lnLoop,lnLoop2
-		THIS.cInstanceName	= tcInstanceName
-		THIS.BasePath	= '/fckeditor/'
-		THIS.cWIDTH		= '100%'
-		THIS.cHEIGHT	= '200'
-		THIS.ToolbarSet	= 'Default'
-		THIS.cValue		= ''
-		FOR lnLoop=1 TO 10
-			FOR lnLoop2=1 TO 2
-				THIS.aConfig(lnLoop,lnLoop2)	= ""
-			NEXT
-		NEXT
-		RETURN
-	ENDFUNC
-
-
-&& -----------------------------------------------------------------------
-	FUNCTION CREATE()
-		? THIS.CreateHtml()
-		RETURN
-	ENDFUNC
-
-&& -----------------------------------------------------------------------
-	FUNCTION CreateHtml()
-		LOCAL html
-		LOCAL lcLink
-
-		HtmlValue = THIS.cValue		&& HTMLSPECIALCHARS()
-
-		html = []
-		IF THIS.IsCompatible()
-			lcLink = THIS.BasePath+[editor/fckeditor.html?InstanceName=]+THIS.cInstanceName
-
-			IF ( !THIS.ToolbarSet == '' )
-				lcLink = lcLink + [&Toolbar=]+THIS.ToolbarSet
-			ENDIF
-
-			&& Render the LINKED HIDDEN FIELD.
-			html = html + [<input type="hidden" id="]+THIS.cInstanceName +[" name="]+THIS.cInstanceName +[" value="]+HtmlValue+[" style="display:none" />]
-
-			&& Render the configurations HIDDEN FIELD.
-			html = html + [<input type="hidden" id="]+THIS.cInstanceName +[___Config" value="]+THIS.GetConfigFieldString() + [" style="display:none" />] +CHR(13)+CHR(10)
-
-			&& Render the EDITOR IFRAME.
-			html = html + [<iframe id="]+THIS.cInstanceName +[___Frame" src="Link" width="]+THIS.cWIDTH+[" height="]+THIS.cHEIGHT+[" frameborder="0" scrolling="no"></iframe>]
-		ELSE
-			IF ( AT("%", THIS.cWIDTH)=0 )
-				WidthCSS = THIS.cWIDTH + 'px'
-			ELSE
-				WidthCSS = THIS.cWIDTH
-			ENDIF
-
-			IF ( AT("%",THIS.cHEIGHT)=0  )
-				HeightCSS = THIS.cHEIGHT + 'px'
-			ELSE
-				HeightCSS = THIS.cHEIGHT
-			ENDIF
-
-			html = html + [<textarea name="]+THIS.cInstanceName +[" rows="4" cols="40" style="width: ]+WidthCSS+[ height: ]+HeightCSS+[">]+HtmlValue+[</textarea>]
-		ENDIF
-
-		RETURN (html)
-	ENDFUNC
-
-
-&& -----------------------------------------------------------------------
-	FUNCTION IsCompatible()
-		LOCAL llRetval
-		LOCAL sAgent
-
-		llRetval=.F.
-
-		SET POINT TO "."
-
-		sAgent = LOWER(ALLTRIM(request.servervariables("HTTP_USER_AGENT")))
-
-		IF AT("msie",sAgent) >0 .AND. AT("mac",sAgent)=0 .AND. AT("opera",sAgent)=0
-			iVersion=VAL(SUBSTR(sAgent,AT("msie",sAgent)+5,3))
-			llRetval= iVersion > 5.5
-		ELSE
-			IF AT("gecko/",sAgent)>0
-				iVersion=VAL(SUBSTR(sAgent,AT("gecko/",sAgent)+6,8))
-				llRetval =iVersion > 20030210
-			ENDIF
-		ELSE
-			IF AT("opera/",sAgent)>0
-				iVersion=VAL(SUBSTR(sAgent,AT("opera/",sAgent)+6,4))
-				llRetval =iVersion >= 9.5
-			ENDIF
-		ELSE
-			IF AT("applewebkit/",sAgent)>0
-				iVersion=VAL(SUBSTR(sAgent,AT("applewebkit/",sAgent)+12,3))
-				llRetval =iVersion >= 522
-			ENDIF
-		ENDIF
-
-		SET POINT TO
-
-		RETURN (llRetval)
-	ENDFUNC
-
-&& -----------------------------------------------------------------------
-	FUNCTION GetConfigFieldString()
-		LOCAL sParams
-		LOCAL bFirst
-		LOCAL sKey
-		sParams = ""
-		bFirst = .T.
-		FOR lnLoop=1 TO 10 && ALEN(this.aconfig)
-			IF !EMPTY(THIS.aConfig(lnLoop,1))
-				IF bFirst = .F.
-					sParams = sParams + "&"
-				ELSE
-					bFirst = .F.
-				ENDIF
-				sParams = sParams +THIS.aConfig(lnLoop,1)+[=]+THIS.aConfig(lnLoop,2)
-			ELSE
-				EXIT
-			ENDIF
-		NEXT
-		RETURN(sParams)
-	ENDFUNC
-ENDDEFINE
-%>
diff --git a/phpgwapi/js/fckeditor/fckeditor.asp b/phpgwapi/js/fckeditor/fckeditor.asp
deleted file mode 100644
index e592e7986d..0000000000
--- a/phpgwapi/js/fckeditor/fckeditor.asp
+++ /dev/null
@@ -1,235 +0,0 @@
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the integration file for ASP.
- *
- * It defines the FCKeditor class that can be used to create editor
- * instances in ASP pages on server side.
--->
-<%
-Class FCKeditor
-
-	private sBasePath
-	private sInstanceName
-	private sWidth
-	private sHeight
-	private sToolbarSet
-	private sValue
-
-	private oConfig
-
-	Private Sub Class_Initialize()
-		sBasePath		= "/fckeditor/"
-		sWidth			= "100%"
-		sHeight			= "200"
-		sToolbarSet		= "Default"
-		sValue			= ""
-
-		Set oConfig = CreateObject("Scripting.Dictionary")
-	End Sub
-
-	Public Property Let BasePath( basePathValue )
-		sBasePath = basePathValue
-	End Property
-
-	Public Property Let InstanceName( instanceNameValue )
-		sInstanceName = instanceNameValue
-	End Property
-
-	Public Property Let Width( widthValue )
-		sWidth = widthValue
-	End Property
-
-	Public Property Let Height( heightValue )
-		sHeight = heightValue
-	End Property
-
-	Public Property Let ToolbarSet( toolbarSetValue )
-		sToolbarSet = toolbarSetValue
-	End Property
-
-	Public Property Let Value( newValue )
-		If ( IsNull( newValue ) OR IsEmpty( newValue ) ) Then
-			sValue = ""
-		Else
-			sValue = newValue
-		End If
-	End Property
-
-	Public Property Let Config( configKey, configValue )
-		oConfig.Add configKey, configValue
-	End Property
-
-	' Generates the instace of the editor in the HTML output of the page.
-	Public Sub Create( instanceName )
-		response.write CreateHtml( instanceName )
-	end Sub
-
-	' Returns the html code that must be used to generate an instance of FCKeditor.
-	Public Function CreateHtml( instanceName )
-		dim html
-
-		If IsCompatible() Then
-
-			Dim sFile, sLink
-			If Request.QueryString( "fcksource" ) = "true" Then
-				sFile = "fckeditor.original.html"
-			Else
-				sFile = "fckeditor.html"
-			End If
-
-			sLink = sBasePath & "editor/" & sFile & "?InstanceName=" + instanceName
-
-			If (sToolbarSet & "") <> "" Then
-				sLink = sLink + "&amp;Toolbar=" & sToolbarSet
-			End If
-
-			html = ""
-			' Render the linked hidden field.
-			html = html & "<input type=""hidden"" id=""" & instanceName & """ name=""" & instanceName & """ value=""" & Server.HTMLEncode( sValue ) & """ style=""display:none"" />"
-
-			' Render the configurations hidden field.
-			html = html & "<input type=""hidden"" id=""" & instanceName & "___Config"" value=""" & GetConfigFieldString() & """ style=""display:none"" />"
-
-			' Render the editor IFRAME.
-			html = html & "<iframe id=""" & instanceName & "___Frame"" src=""" & sLink & """ width=""" & sWidth & """ height=""" & sHeight & """ frameborder=""0"" scrolling=""no""></iframe>"
-
-		Else
-
-			Dim sWidthCSS, sHeightCSS
-
-			If InStr( sWidth, "%" ) > 0  Then
-				sWidthCSS = sWidth
-			Else
-				sWidthCSS = sWidth & "px"
-			End If
-
-			If InStr( sHeight, "%" ) > 0  Then
-				sHeightCSS = sHeight
-			Else
-				sHeightCSS = sHeight & "px"
-			End If
-
-			html = "<textarea name=""" & instanceName & """ rows=""4"" cols=""40"" style=""width: " & sWidthCSS & "; height: " & sHeightCSS & """>" & Server.HTMLEncode( sValue ) & "</textarea>"
-
-		End If
-
-		CreateHtml = html
-
-	End Function
-
-	Private Function IsCompatible()
-
-		IsCompatible = FCKeditor_IsCompatibleBrowser()
-
-	End Function
-
-	Private Function GetConfigFieldString()
-
-		Dim sParams
-
-		Dim bFirst
-		bFirst = True
-
-		Dim sKey
-		For Each sKey in oConfig
-
-			If bFirst = False Then
-				sParams = sParams & "&amp;"
-			Else
-				bFirst = False
-			End If
-
-			sParams = sParams & EncodeConfig( sKey ) & "=" & EncodeConfig( oConfig(sKey) )
-
-		Next
-
-		GetConfigFieldString = sParams
-
-	End Function
-
-	Private Function EncodeConfig( valueToEncode )
-		' The locale of the asp server makes the conversion of a boolean to string different to "true" or "false"
-		' so we must do it manually
-    If vartype(valueToEncode) = vbBoolean then
-			If valueToEncode=True Then
-				EncodeConfig="True"
-			Else
-				EncodeConfig="False"
-			End If
-		Else
-			EncodeConfig = Replace( valueToEncode, "&", "%26" )
-			EncodeConfig = Replace( EncodeConfig , "=", "%3D" )
-			EncodeConfig = Replace( EncodeConfig , """", "%22" )
-		End if
-
-	End Function
-
-End Class
-
-
-' A function that can be used to check if the current browser is compatible with FCKeditor
-' without the need to create an instance of the class.
-Function FCKeditor_IsCompatibleBrowser()
-
-
-	Dim sAgent
-	sAgent = Request.ServerVariables("HTTP_USER_AGENT")
-
-	Dim iVersion
-	Dim re, Matches
-
-	If InStr(sAgent, "MSIE") > 0 AND InStr(sAgent, "mac") <= 0  AND InStr(sAgent, "Opera") <= 0 Then
-		iVersion = CInt( FCKeditor_ToNumericFormat( Mid(sAgent, InStr(sAgent, "MSIE") + 5, 3) ) )
-		FCKeditor_IsCompatibleBrowser = ( iVersion >= 5.5 )
-	ElseIf InStr(sAgent, "Gecko/") > 0 Then
-		iVersion = CLng( Mid( sAgent, InStr( sAgent, "Gecko/" ) + 6, 8 ) )
-		FCKeditor_IsCompatibleBrowser = ( iVersion >= 20030210 )
-	ElseIf InStr(sAgent, "Opera/") > 0 Then
-		iVersion = CSng( FCKeditor_ToNumericFormat( Mid( sAgent, InStr( sAgent, "Opera/" ) + 6, 4 ) ) )
-		FCKeditor_IsCompatibleBrowser = ( iVersion >= 9.5 )
-	ElseIf InStr(sAgent, "AppleWebKit/") > 0 Then
-		Set re = new RegExp
-		re.IgnoreCase = true
-		re.global = false
-		re.Pattern = "AppleWebKit/(\d+)"
-		Set Matches = re.Execute(sAgent)
-		FCKeditor_IsCompatibleBrowser = ( re.Replace(Matches.Item(0).Value, "$1") >= 522 )
-	Else
-		FCKeditor_IsCompatibleBrowser = False
-	End If
-
-End Function
-
-
-' By Agrotic
-' On ASP, when converting string to numbers, the number decimal separator is localized
-' so 5.5 will not work on systems were the separator is "," and vice versa.
-Private Function FCKeditor_ToNumericFormat( numberStr )
-
-	If IsNumeric( "5.5" ) Then
-		FCKeditor_ToNumericFormat = Replace( numberStr, ",", ".")
-	Else
-		FCKeditor_ToNumericFormat = Replace( numberStr, ".", ",")
-	End If
-
-End Function
-
-%>
diff --git a/phpgwapi/js/fckeditor/fckeditor.cfc b/phpgwapi/js/fckeditor/fckeditor.cfc
deleted file mode 100644
index 86b66e3dc9..0000000000
--- a/phpgwapi/js/fckeditor/fckeditor.cfc
+++ /dev/null
@@ -1,232 +0,0 @@
-<cfcomponent output="false" displayname="FCKeditor" hint="Create an instance of the FCKeditor.">
-
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * ColdFusion MX integration.
- * Note this CFC is created for use only with Coldfusion MX and above.
- * For older version, check the fckeditor.cfm.
- *
- * Syntax:
- *
- * <cfscript>
- * 		fckEditor = createObject("component", "fckeditor.fckeditor");
- * 		fckEditor.instanceName="myEditor";
- * 		fckEditor.basePath="/fckeditor/";
- * 		fckEditor.value="<p>This is my <strong>initial</strong> html text.</p>";
- * 		fckEditor.width="100%";
- * 		fckEditor.height="200";
- * 	 	// ... additional parameters ...
- * 		fckEditor.create(); // create instance now.
- * </cfscript>
- *
- * See your macromedia coldfusion mx documentation for more info.
- *
- * *** Note:
- * Do not use path names with a "." (dot) in the name. This is a coldfusion
- * limitation with the cfc invocation.
---->
-
-<cfinclude template="fckutils.cfm">
-
-<cffunction
-	name="Create"
-	access="public"
-	output="true"
-	returntype="void"
-	hint="Outputs the editor HTML in the place where the function is called"
->
-	<cfoutput>#CreateHtml()#</cfoutput>
-</cffunction>
-
-<cffunction
-	name="CreateHtml"
-	access="public"
-	output="false"
-	returntype="string"
-	hint="Retrieves the editor HTML"
->
-
-	<cfparam name="this.instanceName" type="string" />
-	<cfparam name="this.width" type="string" default="100%" />
-	<cfparam name="this.height" type="string" default="200" />
-	<cfparam name="this.toolbarSet" type="string" default="Default" />
-	<cfparam name="this.value" type="string" default="" />
-	<cfparam name="this.basePath" type="string" default="/fckeditor/" />
-	<cfparam name="this.checkBrowser" type="boolean" default="true" />
-	<cfparam name="this.config" type="struct" default="#structNew()#" />
-
-	<cfscript>
-	// display the html editor or a plain textarea?
-	if( isCompatible() )
-		return getHtmlEditor();
-	else
-		return getTextArea();
-	</cfscript>
-
-</cffunction>
-
-<cffunction
-	name="isCompatible"
-	access="private"
-	output="false"
-	returnType="boolean"
-	hint="Check browser compatibility via HTTP_USER_AGENT, if checkBrowser is true"
->
-
-	<cfscript>
-	var sAgent = lCase( cgi.HTTP_USER_AGENT );
-	var stResult = "";
-	var sBrowserVersion = "";
-
-	// do not check if argument "checkBrowser" is false
-	if( not this.checkBrowser )
-		return true;
-
-	return FCKeditor_IsCompatibleBrowser();
-	</cfscript>
-</cffunction>
-
-<cffunction
-	name="getTextArea"
-	access="private"
-	output="false"
-	returnType="string"
-	hint="Create a textarea field for non-compatible browsers."
->
-	<cfset var result = "" />
-	<cfset var sWidthCSS = "" />
-	<cfset var sHeightCSS = "" />
-
-	<cfscript>
-	if( Find( "%", this.width ) gt 0)
-		sWidthCSS = this.width;
-	else
-		sWidthCSS = this.width & "px";
-
-	if( Find( "%", this.width ) gt 0)
-		sHeightCSS = this.height;
-	else
-		sHeightCSS = this.height & "px";
-
-	result = "<textarea name=""#this.instanceName#"" rows=""4"" cols=""40"" style=""width: #sWidthCSS#; height: #sHeightCSS#"">#HTMLEditFormat(this.value)#</textarea>" & chr(13) & chr(10);
-	</cfscript>
-	<cfreturn result />
-</cffunction>
-
-<cffunction
-	name="getHtmlEditor"
-	access="private"
-	output="false"
-	returnType="string"
-	hint="Create the html editor instance for compatible browsers."
->
-	<cfset var sURL = "" />
-	<cfset var result = "" />
-
-	<cfscript>
-	// try to fix the basePath, if ending slash is missing
-	if( len( this.basePath) and right( this.basePath, 1 ) is not "/" )
-		this.basePath = this.basePath & "/";
-
-	// construct the url
-	sURL = this.basePath & "editor/fckeditor.html?InstanceName=" & this.instanceName;
-
-	// append toolbarset name to the url
-	if( len( this.toolbarSet ) )
-		sURL = sURL & "&amp;Toolbar=" & this.toolbarSet;
-	</cfscript>
-
-	<cfscript>
-	result = result & "<input type=""hidden"" id=""#this.instanceName#"" name=""#this.instanceName#"" value=""#HTMLEditFormat(this.value)#"" style=""display:none"" />" & chr(13) & chr(10);
-	result = result & "<input type=""hidden"" id=""#this.instanceName#___Config"" value=""#GetConfigFieldString()#"" style=""display:none"" />" & chr(13) & chr(10);
-	result = result & "<iframe id=""#this.instanceName#___Frame"" src=""#sURL#"" width=""#this.width#"" height=""#this.height#"" frameborder=""0"" scrolling=""no""></iframe>" & chr(13) & chr(10);
-	</cfscript>
-	<cfreturn result />
-</cffunction>
-
-<cffunction
-	name="GetConfigFieldString"
-	access="private"
-	output="false"
-	returnType="string"
-	hint="Create configuration string: Key1=Value1&Key2=Value2&... (Key/Value:HTML encoded)"
->
-	<cfset var sParams = "" />
-	<cfset var key = "" />
-	<cfset var fieldValue = "" />
-	<cfset var fieldLabel = "" />
-	<cfset var lConfigKeys = "" />
-	<cfset var iPos = "" />
-
-	<cfscript>
-	/**
-	 * CFML doesn't store casesensitive names for structure keys, but the configuration names must be casesensitive for js.
-	 * So we need to find out the correct case for the configuration keys.
-	 * We "fix" this by comparing the caseless configuration keys to a list of all available configuration options in the correct case.
-	 * changed 20041206 hk@lwd.de (improvements are welcome!)
-	 */
-	lConfigKeys = lConfigKeys & "CustomConfigurationsPath,EditorAreaCSS,ToolbarComboPreviewCSS,DocType";
-	lConfigKeys = lConfigKeys & ",BaseHref,FullPage,Debug,AllowQueryStringDebug,SkinPath";
-	lConfigKeys = lConfigKeys & ",PreloadImages,PluginsPath,AutoDetectLanguage,DefaultLanguage,ContentLangDirection";
-	lConfigKeys = lConfigKeys & ",ProcessHTMLEntities,IncludeLatinEntities,IncludeGreekEntities,ProcessNumericEntities,AdditionalNumericEntities";
-	lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
-	lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
-	lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
-	lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
-	lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";
-	lConfigKeys = lConfigKeys & ",ContextMenu,BrowserContextMenuOnCtrl,FontColors,FontNames,FontSizes";
-	lConfigKeys = lConfigKeys & ",FontFormats,StylesXmlPath,TemplatesXmlPath,SpellChecker,IeSpellDownloadUrl";
-	lConfigKeys = lConfigKeys & ",SpellerPagesServerScript,FirefoxSpellChecker,MaxUndoLevels,DisableObjectResizing,DisableFFTableHandles";
-	lConfigKeys = lConfigKeys & ",LinkDlgHideTarget,LinkDlgHideAdvanced,ImageDlgHideLink,ImageDlgHideAdvanced,FlashDlgHideAdvanced";
-	lConfigKeys = lConfigKeys & ",ProtectedTags,BodyId,BodyClass,DefaultLinkTarget,CleanWordKeepsStructure";
-	lConfigKeys = lConfigKeys & ",LinkBrowser,LinkBrowserURL,LinkBrowserWindowWidth,LinkBrowserWindowHeight,ImageBrowser";
-	lConfigKeys = lConfigKeys & ",ImageBrowserURL,ImageBrowserWindowWidth,ImageBrowserWindowHeight,FlashBrowser,FlashBrowserURL";
-	lConfigKeys = lConfigKeys & ",FlashBrowserWindowWidth,FlashBrowserWindowHeight,LinkUpload,LinkUploadURL,LinkUploadWindowWidth";
-	lConfigKeys = lConfigKeys & ",LinkUploadWindowHeight,LinkUploadAllowedExtensions,LinkUploadDeniedExtensions,ImageUpload,ImageUploadURL";
-	lConfigKeys = lConfigKeys & ",ImageUploadAllowedExtensions,ImageUploadDeniedExtensions,FlashUpload,FlashUploadURL,FlashUploadAllowedExtensions";
-	lConfigKeys = lConfigKeys & ",FlashUploadDeniedExtensions,SmileyPath,SmileyImages,SmileyColumns,SmileyWindowWidth,SmileyWindowHeight";
-
-	for( key in this.config )
-	{
-		iPos = listFindNoCase( lConfigKeys, key );
-		if( iPos GT 0 )
-		{
-			if( len( sParams ) )
-				sParams = sParams & "&amp;";
-
-			fieldValue = this.config[key];
-			fieldName = listGetAt( lConfigKeys, iPos );
-
-			// set all boolean possibilities in CFML to true/false values
-			if( isBoolean( fieldValue) and fieldValue )
-				fieldValue = "true";
-			else if( isBoolean( fieldValue) )
-				fieldValue = "false";
-
-			sParams = sParams & HTMLEditFormat( fieldName ) & '=' & HTMLEditFormat( fieldValue );
-		}
-	}
-	return sParams;
-	</cfscript>
-
-</cffunction>
-
-</cfcomponent>
diff --git a/phpgwapi/js/fckeditor/fckeditor.cfm b/phpgwapi/js/fckeditor/fckeditor.cfm
deleted file mode 100644
index 7a1da36285..0000000000
--- a/phpgwapi/js/fckeditor/fckeditor.cfm
+++ /dev/null
@@ -1,159 +0,0 @@
-<cfsetting enablecfoutputonly="Yes">
-<!---
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * ColdFusion integration.
- * Note this module is created for use with Coldfusion 4.52 and above.
- * For a cfc version for coldfusion mx check the fckeditor.cfc.
- *
- * Syntax:
- *
- * <cfmodule name="path/to/cfc/fckeditor"
- * 	instanceName="myEditor"
- * 	toolbarSet="..."
- * 	width="..."
- * 	height="..:"
- * 	value="..."
- * 	config="..."
- * >
---->
-<!--- ::
-	 * 	Attribute validation
-	:: --->
-<cfparam name="attributes.instanceName" type="string">
-<cfparam name="attributes.width" 		type="string" default="100%">
-<cfparam name="attributes.height" 		type="string" default="200">
-<cfparam name="attributes.toolbarSet" 	type="string" default="Default">
-<cfparam name="attributes.value" 		type="string" default="">
-<cfparam name="attributes.basePath" 	type="string" default="/fckeditor/">
-<cfparam name="attributes.checkBrowser" type="boolean" default="true">
-<cfparam name="attributes.config" 		type="struct" default="#structNew()#">
-<cfinclude template="fckutils.cfm">
-
-<!--- ::
-	 * check browser compatibility via HTTP_USER_AGENT, if checkBrowser is true
-	:: --->
-
-<cfscript>
-if( attributes.checkBrowser )
-{
-	isCompatibleBrowser = FCKeditor_IsCompatibleBrowser();
-}
-else
-{
-	// If we should not check browser compatibility, assume true
-	isCompatibleBrowser = true;
-}
-</cfscript>
-
-<cfif isCompatibleBrowser>
-
-	<!--- ::
-		 * show html editor area for compatible browser
-		:: --->
-
-	<cfscript>
-		// try to fix the basePath, if ending slash is missing
-		if( len( attributes.basePath) and right( attributes.basePath, 1 ) is not "/" )
-			attributes.basePath = attributes.basePath & "/";
-
-		// construct the url
-		sURL = attributes.basePath & "editor/fckeditor.html?InstanceName=" & attributes.instanceName;
-
-		// append toolbarset name to the url
-		if( len( attributes.toolbarSet ) )
-			sURL = sURL & "&amp;Toolbar=" & attributes.toolbarSet;
-
-		// create configuration string: Key1=Value1&Key2=Value2&... (Key/Value:HTML encoded)
-
-		/**
-		 * CFML doesn't store casesensitive names for structure keys, but the configuration names must be casesensitive for js.
-		 * So we need to find out the correct case for the configuration keys.
-		 * We "fix" this by comparing the caseless configuration keys to a list of all available configuration options in the correct case.
-		 * changed 20041206 hk@lwd.de (improvements are welcome!)
-		 */
-		lConfigKeys = "";
-		lConfigKeys = lConfigKeys & "CustomConfigurationsPath,EditorAreaCSS,ToolbarComboPreviewCSS,DocType";
-		lConfigKeys = lConfigKeys & ",BaseHref,FullPage,Debug,AllowQueryStringDebug,SkinPath";
-		lConfigKeys = lConfigKeys & ",PreloadImages,PluginsPath,AutoDetectLanguage,DefaultLanguage,ContentLangDirection";
-		lConfigKeys = lConfigKeys & ",ProcessHTMLEntities,IncludeLatinEntities,IncludeGreekEntities,ProcessNumericEntities,AdditionalNumericEntities";
-		lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
-		lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
-		lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
-		lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
-		lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";
-		lConfigKeys = lConfigKeys & ",ContextMenu,BrowserContextMenuOnCtrl,FontColors,FontNames,FontSizes";
-		lConfigKeys = lConfigKeys & ",FontFormats,StylesXmlPath,TemplatesXmlPath,SpellChecker,IeSpellDownloadUrl";
-		lConfigKeys = lConfigKeys & ",SpellerPagesServerScript,FirefoxSpellChecker,MaxUndoLevels,DisableObjectResizing,DisableFFTableHandles";
-		lConfigKeys = lConfigKeys & ",LinkDlgHideTarget	,LinkDlgHideAdvanced,ImageDlgHideLink	,ImageDlgHideAdvanced,FlashDlgHideAdvanced";
-		lConfigKeys = lConfigKeys & ",ProtectedTags,BodyId,BodyClass,DefaultLinkTarget,CleanWordKeepsStructure";
-		lConfigKeys = lConfigKeys & ",LinkBrowser,LinkBrowserURL,LinkBrowserWindowWidth,LinkBrowserWindowHeight,ImageBrowser";
-		lConfigKeys = lConfigKeys & ",ImageBrowserURL,ImageBrowserWindowWidth,ImageBrowserWindowHeight,FlashBrowser,FlashBrowserURL";
-		lConfigKeys = lConfigKeys & ",FlashBrowserWindowWidth ,FlashBrowserWindowHeight,LinkUpload,LinkUploadURL,LinkUploadWindowWidth";
-		lConfigKeys = lConfigKeys & ",LinkUploadWindowHeight,LinkUploadAllowedExtensions,LinkUploadDeniedExtensions,ImageUpload,ImageUploadURL";
-		lConfigKeys = lConfigKeys & ",ImageUploadAllowedExtensions,ImageUploadDeniedExtensions,FlashUpload,FlashUploadURL,FlashUploadAllowedExtensions";
-		lConfigKeys = lConfigKeys & ",FlashUploadDeniedExtensions,SmileyPath,SmileyImages,SmileyColumns,SmileyWindowWidth,SmileyWindowHeight";
-
-		sConfig = "";
-
-		for( key in attributes.config )
-		{
-			iPos = listFindNoCase( lConfigKeys, key );
-			if( iPos GT 0 )
-			{
-				if( len( sConfig ) )
-					sConfig = sConfig & "&amp;";
-
-				fieldValue = attributes.config[key];
-				fieldName = listGetAt( lConfigKeys, iPos );
-
-				sConfig = sConfig & urlEncodedFormat( fieldName ) & '=' & urlEncodedFormat( fieldValue );
-			}
-		}
-	</cfscript>
-
-	<cfoutput>
-	<input type="hidden" id="#attributes.instanceName#" name="#attributes.instanceName#" value="#HTMLEditFormat(attributes.value)#" style="display:none" />
-	<input type="hidden" id="#attributes.instanceName#___Config" value="#sConfig#" style="display:none" />
-	<iframe id="#attributes.instanceName#___Frame" src="#sURL#" width="#attributes.width#" height="#attributes.height#" frameborder="0" scrolling="no"></iframe>
-	</cfoutput>
-
-<cfelse>
-
-	<!--- ::
-		 * show	plain textarea for non compatible browser
-		:: --->
-
-	<cfscript>
-		// append unit "px" for numeric width and/or height values
-		if( isNumeric( attributes.width ) )
-			attributes.width = attributes.width & "px";
-		if( isNumeric( attributes.height ) )
-			attributes.height = attributes.height & "px";
-	</cfscript>
-
-	<!--- Fixed Bug ##1075166. hk@lwd.de 20041206 --->
-	<cfoutput>
-	<textarea name="#attributes.instanceName#" rows="4" cols="40" style="WIDTH: #attributes.width#; HEIGHT: #attributes.height#">#HTMLEditFormat(attributes.value)#</textarea>
-	</cfoutput>
-
-</cfif>
-
-<cfsetting enablecfoutputonly="No"><cfexit method="exittag">
diff --git a/phpgwapi/js/fckeditor/fckeditor.lasso b/phpgwapi/js/fckeditor/fckeditor.lasso
deleted file mode 100644
index 86cc792895..0000000000
--- a/phpgwapi/js/fckeditor/fckeditor.lasso
+++ /dev/null
@@ -1,108 +0,0 @@
-[//lasso
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the integration file for Lasso.
- *
- * It defines the FCKeditor class ("custom type" in Lasso terms) that can
- * be used to create editor instances in Lasso pages on server side.
- */
-
-	define_type(
-		'editor',
-		-namespace='fck_',
-		-description='Creates an instance of FCKEditor.'
-	);
-		local(
-			'instancename'	=	'FCKEditor1',
-			'width'			=	'100%',
-			'height'		=	'200',
-			'toolbarset'	=	'Default',
-			'initialvalue'	=	string,
-			'basepath'		=	'/fckeditor/',
-			'config'		=	array,
-			'checkbrowser'	=	true,
-			'displayerrors'	=	false
-		);
-
-		define_tag(
-			'onCreate',
-			-required='instancename', -type='string',
-			-optional='width', -type='string',
-			-optional='height', -type='string',
-			-optional='toolbarset', -type='string',
-			-optional='initialvalue', -type='string',
-			-optional='basepath', -type='string',
-			-optional='config', -type='array'
-		);
-			self->instancename = #instancename;
-			local_defined('width') ? self->width = #width;
-			local_defined('height') ? self->height = #height;
-			local_defined('toolbarset') ? self->toolbarset = #toolbarset;
-			local_defined('initialvalue') ? self->initialvalue = #initialvalue;
-			local_defined('basepath') ? self->basepath = #basepath;
-			local_defined('config') ? self->config = #config;
-		/define_tag;
-
-		define_tag('create');
-			if(self->isCompatibleBrowser);
-				local('out' = '
-						<input type="hidden" id="' + self->instancename + '" name="' + self->instancename + '" value="' + encode_html(self->initialvalue) + '" style="display:none" />
-						' + self->parseConfig + '
-						<iframe id="' + self->instancename + '___Frame" src="' + self->basepath + 'editor/fckeditor.html?InstanceName=' + self->instancename + '&Toolbar=' + self->toolbarset + '" width="' + self->width + '" height="' + self->height + '" frameborder="0" scrolling="no"></iframe>
-				');
-			else;
-				local('out' = '
-						<textarea name="' + self->instancename + '" rows="4" cols="40" style="width: ' + self->width + '; height: ' + self->height + '">' + encode_html(self->initialvalue) + '</textarea>
-				');
-			/if;
-			return(@#out);
-		/define_tag;
-
-		define_tag('isCompatibleBrowser');
-			local('result' = false);
-			if (client_browser->Find("MSIE") && !client_browser->Find("mac") && !client_browser->Find("Opera"));
-				#result = client_browser->Substring(client_browser->Find("MSIE")+5,3)>=5.5;
-			/if;
-			if (client_browser->Find("Gecko/"));
-				#result = client_browser->Substring(client_browser->Find("Gecko/")+6,8)>=20030210;
-			/if;
-			if (client_browser->Find("Opera/"));
-				#result = client_browser->Substring(client_browser->Find("Opera/")+6,4)>=9.5;
-			/if;
-			if (client_browser->Find("AppleWebKit/"));
-				#result = client_browser->Substring(client_browser->Find("AppleWebKit/")+12,3)>=522;
-			/if;
-			return(#result);
-		/define_tag;
-
-		define_tag('parseConfig');
-			if(self->config->size);
-				local('out' = '<input type="hidden" id="' + self->instancename + '___Config" value="');
-				iterate(self->config, local('this'));
-					loop_count > 1 ? #out += '&amp;';
-					#out += encode_html(#this->first) + '=' + encode_html(#this->second);
-				/iterate;
-				#out += '" style="display:none" />\n';
-				return(@#out);
-			/if;
-		/define_tag;
-	/define_type;
-]
diff --git a/phpgwapi/js/fckeditor/fckeditor.pl b/phpgwapi/js/fckeditor/fckeditor.pl
deleted file mode 100644
index a213dfbbff..0000000000
--- a/phpgwapi/js/fckeditor/fckeditor.pl
+++ /dev/null
@@ -1,143 +0,0 @@
-#####
-#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
-#  Copyright (C) 2003-2009 Frederico Caldeira Knabben
-#
-#  == BEGIN LICENSE ==
-#
-#  Licensed under the terms of any of the following licenses at your
-#  choice:
-#
-#   - GNU General Public License Version 2 or later (the "GPL")
-#     http://www.gnu.org/licenses/gpl.html
-#
-#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-#     http://www.gnu.org/licenses/lgpl.html
-#
-#   - Mozilla Public License Version 1.1 or later (the "MPL")
-#     http://www.mozilla.org/MPL/MPL-1.1.html
-#
-#  == END LICENSE ==
-#
-#  This is the integration file for Perl.
-#####
-
-#my $InstanceName;
-#my $BasePath;
-#my $Width;
-#my $Height;
-#my $ToolbarSet;
-#my $Value;
-#my %Config;
-
-sub FCKeditor
-{
-
-	local($instanceName) = @_;
-	$InstanceName	= $instanceName;
-	$BasePath		= '/fckeditor/';
-	$Width			= '100%';
-	$Height			= '200';
-	$ToolbarSet		= 'Default';
-	$Value			= '';
-}
-
-sub Create
-{
-	print &CreateHtml();
-}
-
-sub specialchar_cnv
-{
-
-	local($ch) = @_;
-
-	$ch =~ s/&/&amp;/g;		# &
-	$ch =~ s/\"/&quot;/g;	#"
-	$ch =~ s/\'/&#39;/g;	# '
-	$ch =~ s/</&lt;/g;		# <
-	$ch =~ s/>/&gt;/g;		# >
-	return($ch);
-}
-
-sub CreateHtml
-{
-
-	$HtmlValue = &specialchar_cnv($Value);
-	$Html = '' ;
-	if(&IsCompatible()) {
-		$Link = $BasePath . "editor/fckeditor.html?InstanceName=$InstanceName";
-		if($ToolbarSet ne '') {
-			$Link .= "&amp;Toolbar=$ToolbarSet";
-		}
-		#// Render the linked hidden field.
-		$Html .= "<input type=\"hidden\" id=\"$InstanceName\" name=\"$InstanceName\" value=\"$HtmlValue\" style=\"display:none\" />" ;
-
-		#// Render the configurations hidden field.
-		$cfgstr = &GetConfigFieldString();
-		$wk = $InstanceName."___Config";
-		$Html .= "<input type=\"hidden\" id=\"$wk\" value=\"$cfgstr\" style=\"display:none\" />" ;
-
-		#// Render the editor IFRAME.
-		$wk = $InstanceName."___Frame";
-		$Html .= "<iframe id=\"$wk\" src=\"$Link\" width=\"$Width\" height=\"$Height\" frameborder=\"0\" scrolling=\"no\"></iframe>";
-	} else {
-		if($Width =~ /\%/g){
-			$WidthCSS = $Width;
-		} else {
-			$WidthCSS = $Width . 'px';
-		}
-		if($Height =~ /\%/g){
-			$HeightCSS = $Height;
-		} else {
-			$HeightCSS = $Height . 'px';
-		}
-		$Html .= "<textarea name=\"$InstanceName\" rows=\"4\" cols=\"40\" style=\"width: $WidthCSS; height: $HeightCSS\">$HtmlValue</textarea>";
-	}
-	return($Html);
-}
-
-sub IsCompatible
-{
-
-	$sAgent = $ENV{'HTTP_USER_AGENT'};
-	if(($sAgent =~ /MSIE/i) && !($sAgent =~ /mac/i) && !($sAgent =~ /Opera/i)) {
-		$iVersion = substr($sAgent,index($sAgent,'MSIE') + 5,3);
-		return($iVersion >= 5.5) ;
-	} elsif($sAgent =~ /Gecko\//i) {
-		$iVersion = substr($sAgent,index($sAgent,'Gecko/') + 6,8);
-		return($iVersion >= 20030210) ;
-	} elsif($sAgent =~ /Opera\//i) {
-		$iVersion = substr($sAgent,index($sAgent,'Opera/') + 6,4);
-		return($iVersion >= 9.5) ;
-	} elsif($sAgent =~ /AppleWebKit\/(\d+)/i) {
-		return($1 >= 522) ;
-	} else {
-		return(0);		# 2.0 PR fix
-	}
-}
-
-sub GetConfigFieldString
-{
-	$sParams = '';
-	$bFirst = 0;
-	foreach $sKey (keys %Config) {
-		$sValue = $Config{$sKey};
-		if($bFirst == 1) {
-			$sParams .= '&amp;';
-		} else {
-			$bFirst = 1;
-		}
-		$k = &specialchar_cnv($sKey);
-		$v = &specialchar_cnv($sValue);
-		if($sValue eq "true") {
-			$sParams .= "$k=true";
-		} elsif($sValue eq "false") {
-			$sParams .= "$k=false";
-		} else {
-			$sParams .= "$k=$v";
-		}
-	}
-	return($sParams);
-}
-
-1;
diff --git a/phpgwapi/js/fckeditor/fckeditor.py b/phpgwapi/js/fckeditor/fckeditor.py
deleted file mode 100644
index 2e72e7375b..0000000000
--- a/phpgwapi/js/fckeditor/fckeditor.py
+++ /dev/null
@@ -1,160 +0,0 @@
-"""
-FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2009 Frederico Caldeira Knabben
-
-== BEGIN LICENSE ==
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-
-== END LICENSE ==
-
-This is the integration file for Python.
-"""
-
-import cgi
-import os
-import re
-import string
-
-def escape(text, replace=string.replace):
-    """Converts the special characters '<', '>', and '&'.
-
-    RFC 1866 specifies that these characters be represented
-    in HTML as &lt; &gt; and &amp; respectively. In Python
-    1.5 we use the new string.replace() function for speed.
-    """
-    text = replace(text, '&', '&amp;') # must be done 1st
-    text = replace(text, '<', '&lt;')
-    text = replace(text, '>', '&gt;')
-    text = replace(text, '"', '&quot;')
-    text = replace(text, "'", '&#39;')
-    return text
-
-# The FCKeditor class
-class FCKeditor(object):
-	def __init__(self, instanceName):
-		self.InstanceName = instanceName
-		self.BasePath = '/fckeditor/'
-		self.Width = '100%'
-		self.Height = '200'
-		self.ToolbarSet = 'Default'
-		self.Value = '';
-
-		self.Config = {}
-
-	def Create(self):
-		return self.CreateHtml()
-
-	def CreateHtml(self):
-		HtmlValue = escape(self.Value)
-		Html = ""
-
-		if (self.IsCompatible()):
-			File = "fckeditor.html"
-			Link = "%seditor/%s?InstanceName=%s" % (
-					self.BasePath,
-					File,
-					self.InstanceName
-					)
-			if (self.ToolbarSet is not None):
-				Link += "&amp;Toolbar=%s" % self.ToolbarSet
-
-			# Render the linked hidden field
-			Html += "<input type=\"hidden\" id=\"%s\" name=\"%s\" value=\"%s\" style=\"display:none\" />" % (
-					self.InstanceName,
-					self.InstanceName,
-					HtmlValue
-					)
-
-			# Render the configurations hidden field
-			Html += "<input type=\"hidden\" id=\"%s___Config\" value=\"%s\" style=\"display:none\" />" % (
-					self.InstanceName,
-					self.GetConfigFieldString()
-					)
-
-			# Render the editor iframe
-			Html += "<iframe id=\"%s\__Frame\" src=\"%s\" width=\"%s\" height=\"%s\" frameborder=\"0\" scrolling=\"no\"></iframe>" % (
-					self.InstanceName,
-					Link,
-					self.Width,
-					self.Height
-					)
-		else:
-			if (self.Width.find("%%") < 0):
-				WidthCSS = "%spx" % self.Width
-			else:
-				WidthCSS = self.Width
-			if (self.Height.find("%%") < 0):
-				HeightCSS = "%spx" % self.Height
-			else:
-				HeightCSS = self.Height
-
-			Html += "<textarea name=\"%s\" rows=\"4\" cols=\"40\" style=\"width: %s; height: %s;\" wrap=\"virtual\">%s</textarea>" % (
-					self.InstanceName,
-					WidthCSS,
-					HeightCSS,
-					HtmlValue
-					)
-		return Html
-
-	def IsCompatible(self):
-		if (os.environ.has_key("HTTP_USER_AGENT")):
-			sAgent = os.environ.get("HTTP_USER_AGENT", "")
-		else:
-			sAgent = ""
-		if (sAgent.find("MSIE") >= 0) and (sAgent.find("mac") < 0) and (sAgent.find("Opera") < 0):
-			i = sAgent.find("MSIE")
-			iVersion = float(sAgent[i+5:i+5+3])
-			if (iVersion >= 5.5):
-				return True
-			return False
-		elif (sAgent.find("Gecko/") >= 0):
-			i = sAgent.find("Gecko/")
-			iVersion = int(sAgent[i+6:i+6+8])
-			if (iVersion >= 20030210):
-				return True
-			return False
-		elif (sAgent.find("Opera/") >= 0):
-			i = sAgent.find("Opera/")
-			iVersion = float(sAgent[i+6:i+6+4])
-			if (iVersion >= 9.5):
-				return True
-			return False
-		elif (sAgent.find("AppleWebKit/") >= 0):
-			p = re.compile('AppleWebKit\/(\d+)', re.IGNORECASE)
-			m = p.search(sAgent)
-			if (m.group(1) >= 522):
-				return True
-			return False
-		else:
-			return False
-
-	def GetConfigFieldString(self):
-		sParams = ""
-		bFirst = True
-		for sKey in self.Config.keys():
-			sValue = self.Config[sKey]
-			if (not bFirst):
-				sParams += "&amp;"
-			else:
-				bFirst = False
-			if (sValue):
-				k = escape(sKey)
-				v = escape(sValue)
-				if (sValue == "true"):
-					sParams += "%s=true" % k
-				elif (sValue == "false"):
-					sParams += "%s=false" % k
-				else:
-					sParams += "%s=%s" % (k, v)
-		return sParams

From a81931ca0844edf111f074ecd2ebc6bb675538be Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Jul 2009 09:58:20 +0000
Subject: [PATCH 455/510] removed not used javascript files

---
 phpgwapi/js/connector/connector.js            | 334 -------
 phpgwapi/js/dJSWin/dJSWin.css                 |  26 -
 phpgwapi/js/dJSWin/dJSWin.js                  | 318 -------
 phpgwapi/js/dJSWin/ie/dJSWin.js               | 321 -------
 phpgwapi/js/dTabs/dTabs.css                   |  54 --
 phpgwapi/js/dTabs/dTabs.js                    | 302 ------
 phpgwapi/js/dTabs/ie/dTabs.js                 | 234 -----
 phpgwapi/js/dynapi/api/dyndocument.js         | 288 ------
 phpgwapi/js/dynapi/api/dynlayer_base.js       | 397 --------
 phpgwapi/js/dynapi/api/dynlayer_dom.js        | 151 ---
 phpgwapi/js/dynapi/api/dynlayer_ie.js         | 193 ----
 phpgwapi/js/dynapi/api/dynlayer_ns4.js        | 310 ------
 phpgwapi/js/dynapi/api/dynlayer_opera.js      | 147 ---
 phpgwapi/js/dynapi/api/event.js               | 369 --------
 phpgwapi/js/dynapi/api/ext/dragevent.js       | 306 ------
 phpgwapi/js/dynapi/api/ext/dynkeyevent.js     | 248 -----
 phpgwapi/js/dynapi/api/ext/dynlayer.inline.js | 124 ---
 phpgwapi/js/dynapi/api/mouse_dom.js           | 148 ---
 phpgwapi/js/dynapi/api/mouse_ie.js            | 124 ---
 phpgwapi/js/dynapi/api/mouse_ns4.js           | 214 -----
 phpgwapi/js/dynapi/dynapi.js                  | 440 ---------
 phpgwapi/js/dynapi/ext/blueprint.html         |  27 -
 phpgwapi/js/dynapi/ext/debug.html             | 136 ---
 phpgwapi/js/dynapi/ext/debug.js               | 256 -----
 phpgwapi/js/dynapi/ext/functions.color.js     |  94 --
 phpgwapi/js/dynapi/ext/functions.date.js      | 126 ---
 phpgwapi/js/dynapi/ext/functions.image.js     | 124 ---
 phpgwapi/js/dynapi/ext/functions.math.js      |  85 --
 phpgwapi/js/dynapi/ext/functions.numeric.js   |  83 --
 phpgwapi/js/dynapi/ext/functions.string.js    | 115 ---
 phpgwapi/js/dynapi/ext/functions.system.js    |  87 --
 phpgwapi/js/dynapi/ext/images/debug_icon.gif  | Bin 267 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgclear.gif   | Bin 489 -> 0 bytes
 .../dynapi/ext/images/debug_imgclear_on.gif   | Bin 514 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgeval.gif    | Bin 714 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgeval_on.gif | Bin 795 -> 0 bytes
 .../js/dynapi/ext/images/debug_imghelp.gif    | Bin 1043 -> 0 bytes
 .../dynapi/ext/images/debug_imghelp_down.gif  | Bin 950 -> 0 bytes
 .../js/dynapi/ext/images/debug_imghelp_on.gif | Bin 1070 -> 0 bytes
 .../js/dynapi/ext/images/debug_imginspect.gif | Bin 615 -> 0 bytes
 .../dynapi/ext/images/debug_imginspect_on.gif | Bin 667 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgnext.gif    | Bin 406 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgnext_on.gif | Bin 421 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgnormal.gif  | Bin 1032 -> 0 bytes
 .../ext/images/debug_imgnormal_down.gif       | Bin 940 -> 0 bytes
 .../dynapi/ext/images/debug_imgnormal_on.gif  | Bin 1054 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgprev.gif    | Bin 408 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgprev_on.gif | Bin 426 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgreload.gif  | Bin 444 -> 0 bytes
 .../dynapi/ext/images/debug_imgreload_on.gif  | Bin 454 -> 0 bytes
 .../js/dynapi/ext/images/debug_imgwatch.gif   | Bin 1052 -> 0 bytes
 .../dynapi/ext/images/debug_imgwatch_down.gif | Bin 962 -> 0 bytes
 .../dynapi/ext/images/debug_imgwatch_on.gif   | Bin 1076 -> 0 bytes
 phpgwapi/js/dynapi/ext/library.html           |   3 -
 phpgwapi/js/dynapi/ext/library.js             | 232 -----
 phpgwapi/js/dynapi/ext/packages.js            | 126 ---
 phpgwapi/js/dynapi/fx/bezier.js               |  75 --
 phpgwapi/js/dynapi/fx/circleanim.js           |  91 --
 phpgwapi/js/dynapi/fx/fader.js                |  69 --
 phpgwapi/js/dynapi/fx/fsound.js               | 300 ------
 phpgwapi/js/dynapi/fx/glideanim.js            |  82 --
 phpgwapi/js/dynapi/fx/hoveranim.js            |  63 --
 phpgwapi/js/dynapi/fx/imganim.js              | 102 --
 phpgwapi/js/dynapi/fx/motionx.js              | 113 ---
 phpgwapi/js/dynapi/fx/pathanim.js             |  96 --
 phpgwapi/js/dynapi/fx/slideanim.js            |  42 -
 phpgwapi/js/dynapi/fx/snapx.js                | 780 ---------------
 phpgwapi/js/dynapi/fx/swiper.js               | 182 ----
 phpgwapi/js/dynapi/fx/textanim.js             | 293 ------
 phpgwapi/js/dynapi/fx/thread.js               |  64 --
 phpgwapi/js/dynapi/fx/timerx.js               |  44 -
 phpgwapi/js/dynapi/version.xml                |   5 -
 phpgwapi/js/foldertree/foldertree.README      |  28 -
 phpgwapi/js/foldertree/foldertree.js          | 368 -------
 phpgwapi/js/jsapi/egwCategories-plugin.js     | 164 ----
 phpgwapi/js/jsapi/jsapi.js                    | 895 +-----------------
 phpgwapi/js/jsolait/copying.txt               | 504 ----------
 phpgwapi/js/jsolait/doc/codecs.xhtml          |  67 --
 phpgwapi/js/jsolait/doc/crypto.xhtml          |  72 --
 phpgwapi/js/jsolait/doc/highlight.css         |  88 --
 phpgwapi/js/jsolait/doc/html.css              | 293 ------
 phpgwapi/js/jsolait/doc/index.xhtml           |  93 --
 phpgwapi/js/jsolait/doc/jsolait.xhtml         | 139 ---
 phpgwapi/js/jsolait/doc/jsonrpc.xhtml         |  58 --
 phpgwapi/js/jsolait/doc/lang.xhtml            |  98 --
 phpgwapi/js/jsolait/doc/stringformat.xhtml    |  95 --
 phpgwapi/js/jsolait/doc/tutorial.xhtml        | 295 ------
 phpgwapi/js/jsolait/doc/urllib.xhtml          | 101 --
 phpgwapi/js/jsolait/doc/xml.xhtml             |  60 --
 phpgwapi/js/jsolait/doc/xmlrpc.xhtml          | 175 ----
 phpgwapi/js/jsolait/init.js                   | 719 --------------
 phpgwapi/js/jsolait/lib/codecs.js             | 168 ----
 phpgwapi/js/jsolait/lib/crypto.js             | 149 ---
 phpgwapi/js/jsolait/lib/jsonrpc.js            | 383 --------
 phpgwapi/js/jsolait/lib/lang.js               | 461 ---------
 phpgwapi/js/jsolait/lib/urllib.js             | 306 ------
 phpgwapi/js/jsolait/lib/xml.js                | 247 -----
 phpgwapi/js/jsolait/lib/xmlrpc.js             | 828 ----------------
 phpgwapi/js/jsolait/missingmixin.js           | 151 ---
 phpgwapi/js/tablesort/tablesort.js            | 157 ---
 phpgwapi/js/xmlrpcMsgCreator/index.html       | 306 ------
 phpgwapi/js/xmlrpcMsgCreator/xmlrpc.js        | 177 ----
 102 files changed, 15 insertions(+), 16573 deletions(-)
 delete mode 100644 phpgwapi/js/connector/connector.js
 delete mode 100644 phpgwapi/js/dJSWin/dJSWin.css
 delete mode 100644 phpgwapi/js/dJSWin/dJSWin.js
 delete mode 100644 phpgwapi/js/dJSWin/ie/dJSWin.js
 delete mode 100644 phpgwapi/js/dTabs/dTabs.css
 delete mode 100644 phpgwapi/js/dTabs/dTabs.js
 delete mode 100644 phpgwapi/js/dTabs/ie/dTabs.js
 delete mode 100644 phpgwapi/js/dynapi/api/dyndocument.js
 delete mode 100644 phpgwapi/js/dynapi/api/dynlayer_base.js
 delete mode 100644 phpgwapi/js/dynapi/api/dynlayer_dom.js
 delete mode 100644 phpgwapi/js/dynapi/api/dynlayer_ie.js
 delete mode 100644 phpgwapi/js/dynapi/api/dynlayer_ns4.js
 delete mode 100644 phpgwapi/js/dynapi/api/dynlayer_opera.js
 delete mode 100644 phpgwapi/js/dynapi/api/event.js
 delete mode 100644 phpgwapi/js/dynapi/api/ext/dragevent.js
 delete mode 100644 phpgwapi/js/dynapi/api/ext/dynkeyevent.js
 delete mode 100644 phpgwapi/js/dynapi/api/ext/dynlayer.inline.js
 delete mode 100644 phpgwapi/js/dynapi/api/mouse_dom.js
 delete mode 100644 phpgwapi/js/dynapi/api/mouse_ie.js
 delete mode 100644 phpgwapi/js/dynapi/api/mouse_ns4.js
 delete mode 100644 phpgwapi/js/dynapi/dynapi.js
 delete mode 100644 phpgwapi/js/dynapi/ext/blueprint.html
 delete mode 100644 phpgwapi/js/dynapi/ext/debug.html
 delete mode 100644 phpgwapi/js/dynapi/ext/debug.js
 delete mode 100644 phpgwapi/js/dynapi/ext/functions.color.js
 delete mode 100644 phpgwapi/js/dynapi/ext/functions.date.js
 delete mode 100644 phpgwapi/js/dynapi/ext/functions.image.js
 delete mode 100644 phpgwapi/js/dynapi/ext/functions.math.js
 delete mode 100644 phpgwapi/js/dynapi/ext/functions.numeric.js
 delete mode 100644 phpgwapi/js/dynapi/ext/functions.string.js
 delete mode 100644 phpgwapi/js/dynapi/ext/functions.system.js
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_icon.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgclear.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgclear_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgeval.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgeval_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imghelp.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imghelp_down.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imghelp_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imginspect.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imginspect_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgnext.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgnext_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgnormal.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgnormal_down.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgnormal_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgprev.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgprev_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgreload.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgreload_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgwatch.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgwatch_down.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/images/debug_imgwatch_on.gif
 delete mode 100644 phpgwapi/js/dynapi/ext/library.html
 delete mode 100644 phpgwapi/js/dynapi/ext/library.js
 delete mode 100644 phpgwapi/js/dynapi/ext/packages.js
 delete mode 100644 phpgwapi/js/dynapi/fx/bezier.js
 delete mode 100644 phpgwapi/js/dynapi/fx/circleanim.js
 delete mode 100644 phpgwapi/js/dynapi/fx/fader.js
 delete mode 100644 phpgwapi/js/dynapi/fx/fsound.js
 delete mode 100644 phpgwapi/js/dynapi/fx/glideanim.js
 delete mode 100644 phpgwapi/js/dynapi/fx/hoveranim.js
 delete mode 100644 phpgwapi/js/dynapi/fx/imganim.js
 delete mode 100644 phpgwapi/js/dynapi/fx/motionx.js
 delete mode 100644 phpgwapi/js/dynapi/fx/pathanim.js
 delete mode 100644 phpgwapi/js/dynapi/fx/slideanim.js
 delete mode 100644 phpgwapi/js/dynapi/fx/snapx.js
 delete mode 100644 phpgwapi/js/dynapi/fx/swiper.js
 delete mode 100644 phpgwapi/js/dynapi/fx/textanim.js
 delete mode 100644 phpgwapi/js/dynapi/fx/thread.js
 delete mode 100644 phpgwapi/js/dynapi/fx/timerx.js
 delete mode 100644 phpgwapi/js/dynapi/version.xml
 delete mode 100644 phpgwapi/js/foldertree/foldertree.README
 delete mode 100644 phpgwapi/js/foldertree/foldertree.js
 delete mode 100644 phpgwapi/js/jsapi/egwCategories-plugin.js
 delete mode 100644 phpgwapi/js/jsolait/copying.txt
 delete mode 100644 phpgwapi/js/jsolait/doc/codecs.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/crypto.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/highlight.css
 delete mode 100644 phpgwapi/js/jsolait/doc/html.css
 delete mode 100644 phpgwapi/js/jsolait/doc/index.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/jsolait.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/jsonrpc.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/lang.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/stringformat.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/tutorial.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/urllib.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/xml.xhtml
 delete mode 100644 phpgwapi/js/jsolait/doc/xmlrpc.xhtml
 delete mode 100644 phpgwapi/js/jsolait/init.js
 delete mode 100644 phpgwapi/js/jsolait/lib/codecs.js
 delete mode 100644 phpgwapi/js/jsolait/lib/crypto.js
 delete mode 100644 phpgwapi/js/jsolait/lib/jsonrpc.js
 delete mode 100644 phpgwapi/js/jsolait/lib/lang.js
 delete mode 100644 phpgwapi/js/jsolait/lib/urllib.js
 delete mode 100644 phpgwapi/js/jsolait/lib/xml.js
 delete mode 100644 phpgwapi/js/jsolait/lib/xmlrpc.js
 delete mode 100644 phpgwapi/js/jsolait/missingmixin.js
 delete mode 100644 phpgwapi/js/tablesort/tablesort.js
 delete mode 100644 phpgwapi/js/xmlrpcMsgCreator/index.html
 delete mode 100644 phpgwapi/js/xmlrpcMsgCreator/xmlrpc.js

diff --git a/phpgwapi/js/connector/connector.js b/phpgwapi/js/connector/connector.js
deleted file mode 100644
index 98da0d9e10..0000000000
--- a/phpgwapi/js/connector/connector.js
+++ /dev/null
@@ -1,334 +0,0 @@
-  /***************************************************************************\
-  * eGroupWare - API                                                          *
-  * http://www.egroupware.org                                                 *
-  * Written by:                                                               *
-  *  - Raphael Derosso Pereira <raphaelpereira@users.sourceforge.net>         *
-  *  sponsored by Thyamad - http://www.thyamad.com                            *
-  * ------------------------------------------------------------------------- *
-  * Javascript connector (XMLHTTP object interfacing)                         *
-  * ------------------------------------------------------------------------- *
-  *  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.                                               *
-  \***************************************************************************/
-
-	function cConnector()
-	{
-		/* Public Attributes */
-		this.requests = new Array();
-		this.progressContents = new Array();
-		this.visible = false;
-
-		var _this = this;
-		this.nReqs = 0;
-
-		/* Private Attributes */
-		this._progressBox = null;
-		this._progressHolder = document.createElement('span');
-		
-		/* Removed display of connecting status
-		this.setProgressBox('loading_box',true);
-		this.setProgressContent(1,GLOBALS['messages']['jsapi']['connector_1']);
-		this.setProgressContent(2,GLOBALS['messages']['jsapi']['connector_2']);
-		this.setProgressContent(3,GLOBALS['messages']['jsapi']['connector_3']);*/
-
-		this._progressHolder.style.visibility = 'hidden';
-//		this._progressHolder.style.backgroundColor = '#db7e22';
-	}
-
-	cConnector.prototype.newRequest = function (id, target, method, handler, data)
-	{
-		var _this = this;
-		
-		if (this.requests[id] && this.requests[id] != null)
-		{
-			// TODO: Study better ways to do this...
-			return;
-
-			this.requests[id].abort();
-			delete this.requests[id];
-			
-			setTimeout(function() { _this.newRequest(id, target, method, handler, data); }, 100);
-
-			return;
-		}
-		
-		this.nReqs++;
-		document.body.style.cursor = 'progress';
-
-		var oxmlhttp = null;
-		
-		try
-		{ 
-			oxmlhttp = new XMLHttpRequest();
-			oxmlhttp.overrideMimeType('text/xml');
-		}
-		catch (e)
-		{ 
-			try
-			{
-				oxmlhttp = new ActiveXObject('Msxml2.XMLHTTP');
-			}
-			catch (e1)
-			{ 
-				try
-				{
-					oxmlhttp = new ActiveXObject('Microsoft.XMLHTTP');
-				}
-				catch (e2)
-				{
-					oxmlhttp = null;
-				}
-			}
-		}
-		
-		if (!oxmlhttp)
-		{
-			return false;
-		}
-		
-		this.requests[id] = oxmlhttp;
-
-		var _this = this;
-		
-		var sub_handler = function ()
-		{
-			try
-			{
-				_this._setProgressState(oxmlhttp.readyState);
-				
-				if (oxmlhttp.readyState == 4 )//&& oxmlhttp.channel.status == 0)
-				{
-					if (!oxmlhttp || !oxmlhttp.status)
-					{
-						return;
-					}
-					
-					if (dynapi.debug)
-					{
-						dynapi.debug.print('\nServer Message Arrived:\n\n'+oxmlhttp.responseText+'\n\n');
-					}
-					switch (oxmlhttp.status)
-					{
-						case 200:
-							if (typeof(handler) == 'function')
-							{
-								handler(oxmlhttp.responseText);
-							}
-							delete _this.requests[id];
-							_this.nReqs--;
-							if (!_this.nReqs) document.body.style.cursor = '';
-							break;
-
-						case 404:
-							alert('Page Not Found!');
-							break;
-
-						default:
-							//alert('Some problem while accessing the server. The status is '+oxmlhttp.status);
-					}
-				}
-			}
-			catch (e)
-			{
-				_this.nReqs--;
-				if (!_this.nReqs) document.body.style.cursor = '';
-				delete _this.requests[id];
-
-				// TODO: Handle of special exceptions must be made by API
-				
-				// Exception 0x80040111 => trying to access a component without permission to do so
-				if (e && typeof(e) == 'object' && e.result && e.result == 0x80040111)
-				{
-					return;
-				}
-
-				showMessage(e);
-			}
-		}
-
-		try
-		{ 
-			if (method == '' || method == 'GET')
-			{
-				if (typeof(handler) == 'function')
-				{
-					oxmlhttp.onreadystatechange = sub_handler;
-				}
-				oxmlhttp.open("GET",target,true);
-				oxmlhttp.send(null);
-			}
-			else if (method == 'POST')
-			{
-				if (typeof(handler) == 'function')
-				{
-					oxmlhttp.onreadystatechange = sub_handler;
-				}
-				oxmlhttp.open("POST",target, true);
-//				oxmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
-//				viniciuscb commented here, messages should be in xmlrpc
-				oxmlhttp.setRequestHeader('Content-Type','text/xml');
-				oxmlhttp.send(data);
-				//oxmlhttp.setRequestHeader('Content-Type','multipart/form-data; boundary=-----------------------------1156053686807595044986274307');
-				//oxmlhttp.setRequestHeader('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5');
-			}
-		}
-		catch(e)
-		{ 
-			showMessage(e);
-		}
-		
-		return true;
-	}
-
-	cConnector.prototype.cancelRequest = function (id)
-	{
-		if (!this.requests[id])
-		{
-			return false;
-		}
-
-		this.requests[id].abort();
-	}
-
-	cConnector.prototype.setProgressContent = function (state, content)
-	{
-		switch (state)
-		{
-			case 0:
-			case 'UNINITIALIZED':
-				this.progressContents[0] = content;
-				break;
-
-			case 1:
-			case 'LOADING':
-				this.progressContents[1] = content;
-				break;
-
-			case 2:
-			case 'LOADED':
-				this.progressContents[2] = content;
-				break;
-
-			case 3:
-			case 'INTERACTIVE':
-				this.progressContents[3] = content;
-				break;
-
-			case 4:
-			case 'COMPLETED':
-				this.progressContents[4] = content;
-				break;
-
-			default:
-				throw('INVALID STATE!');
-		}
-	}
-
-	cConnector.prototype.setProgressHolder = function (holder)
-	{
-		var objHolder;
-		
-		if (typeof(holder) == 'string')
-		{
-			objHolder = Element(holder);
-		}
-		else if (typeof(holder) == 'object')
-		{
-			objHolder = holder;
-		}
-		else
-		{
-			return false;
-		}
-
-		objHolder.appendChild(this._progressHolder);
-	}
-
-	cConnector.prototype.setProgressBox = function (box, auto)
-	{
-		var objBox;
-
-		if (typeof(box) == 'string')
-		{
-			objBox = Element(box);
-		}
-		else if (typeof(box) == 'object')
-		{
-			objBox = box;
-		}
-		else
-		{
-			return false;
-		}
-
-		this._progressBox = objBox;
-		this._progressBoxAuto = auto ? true : false;
-		objBox.appendChild(this._progressHolder);
-	}
-
-	cConnector.prototype.setVisible = function (visible)
-	{
-		this.visible = visible;
-		if (!visible)
-		{
-			this._progressHolder.style.visibility = 'hidden';
-		}
-	}
-
-	/****************************************************************************\
-	 *                          Private Methods                                 *
-	\****************************************************************************/
-	
-	cConnector.prototype._setProgressState = function (state)
-	{
-		switch (state)
-		{
-			case 0:
-			case 4:
-				if (this._progressBox != null)
-				{
-					this._progressBox.style.visibility = 'hidden';
-					this._progressBox.style.zIndex = '-1';
-				}
-				
-				this._progressHolder.style.visibility = 'hidden';
-				this._progressHolder.style.zIndex = '-1';
-				break;
-
-			default:
-				if (this.visible)
-				{
-					if (this._progressBox != null)
-					{
-						if (this._progressBoxAuto)
-						{
-							if (is_ie)
-							{
-								this._progressBox.style.top = parseInt(document.body.offsetHeight)/2 + 'px';
-								this._progressBox.style.left = parseInt(document.body.offsetWidth)/2 + 'px';
-							}
-							else
-							{
-								this._progressBox.style.top = parseInt(window.innerHeight)/2 + parseInt(window.pageYOffset) - this._progressBox.style.height/2 + 'px';
-								this._progressBox.style.left = parseInt(window.innerWidth)/2 + parseInt(window.pageXOffset) - this._progressBox.style.width/2 + 'px';
-							}
-						}
-						this._progressBox.style.visibility = 'inherit';
-						this._progressBox.style.zIndex = 1000000;
-					}
-					
-					this._progressHolder.style.visibility = 'inherit';
-					this._progressHolder.style.zIndex = '100';
-					
-					this._progressHolder.innerHTML = this.progressContents[state] ? this.progressContents[state] : '';
-				}
-		}
-	}
-
-	var Connector;
-	dynapi.onLoad(function(){
-		Connector = new cConnector();
-		Connector.setVisible(true);
-	});
diff --git a/phpgwapi/js/dJSWin/dJSWin.css b/phpgwapi/js/dJSWin/dJSWin.css
deleted file mode 100644
index e61dd419a4..0000000000
--- a/phpgwapi/js/dJSWin/dJSWin.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.dJSWin_main
-{
-	background-color: #e3e3e3;
-}
-
-.dJSWin_title_text
-{
-	background-color: #3978d6;
-	color: white;
-	font-weight: bold;
-}
-
-.dJSWin_title
-{
-	background-color: #3978d6;
-}
-
-.dJSWin_high
-{
-	background-color: #e3e3e3;
-}
-
-.dJSWin_low
-{
-	background-color: #c9c9c9;
-}
diff --git a/phpgwapi/js/dJSWin/dJSWin.js b/phpgwapi/js/dJSWin/dJSWin.js
deleted file mode 100644
index 24813efc1d..0000000000
--- a/phpgwapi/js/dJSWin/dJSWin.js
+++ /dev/null
@@ -1,318 +0,0 @@
-  /****************************************************************************\
-   * Dynamic JS Win - Javascript Object                                       *
-   *                                                                          *
-   * Written by:                                                              *
-   *  - Raphael Derosso Pereira <raphaelpereira@users.sourceforge.net>        *
-   * ------------------------------------------------------------------------ *
-   *  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.                                              *
-  \****************************************************************************/
-	
-	if (!window.dd)
-	{
-		throw("wz_dragdrop lib must be loaded!");
-	}
-		
-	function dJSWin(params)
-	{
-		this.init(params);
-	}
-
-	dJSWin.prototype.init = function(params)
-	{
-		if (!params || typeof(params) != 'object' || !params.id || !params.width || !params.height || !params.content_id)
-		{
-			throw("Can't create empty window or window without width, height or ID");
-		}
-
-		/* Internal Variables */
-		this.clientArea = document.createElement('div');
-		this.title = document.createElement('div');
-		this.title_text = document.createElement('span');
-		this.buttons = new Array();
-		this.shadows = new Array();
-		this.border = new Array();
-		this.content = Element(params.content_id);
-		this.includedContents = params['include_contents'];
-		var _this = this;
-		var style;
-
-		style = document.createElement('link');
-		style.href = GLOBALS['serverRoot'] + "phpgwapi/js/dJSWin/dJSWin.css";
-		style.rel = "stylesheet";
-		style.type = "text/css";
-		document.body.appendChild(style);
-
-		if (is_moz1_6)
-		{
-			var content_ = this.content;
-			this.content = this.content.cloneNode(true);
-
-			content_.id = content_.id+'CLONE';
-			content_.style.display = 'none';
-		}
-
-		this.border['t'] = document.createElement('div');
-		this.border['b'] = document.createElement('div');
-		this.border['l'] = document.createElement('div');
-		this.border['r'] = document.createElement('div');
-
-		this.shadows['r'] = document.createElement('div');
-		this.shadows['b'] = document.createElement('div');
-
-		this.buttons['xDIV'] = document.createElement('div');
-
-		if (params['button_x_img'])
-		{
-			this.buttons['xIMG'] = document.createElement('IMG');
-			this.buttons['xIMG'].src = params['button_x_img'];
-			this.buttons['xIMG'].style.cursor = 'hand';
-			this.buttons['xDIV'].appendChild(this.buttons['xIMG']);
-		}
-		else
-		{
-			this.buttons.xDIV.innerHTML = 'X';
-		}
-		
-		/* Inicialization */
-		this.title.id = params['id'];
-		this.title.style.position = 'absolute';
-		this.title.style.visibility = 'hidden';
-		this.title.style.width = parseInt(params['width']) + 2 + 'px';
-		this.title.style.height = params['title_height'] ? params['title_height'] : '18px';
-		this.title.style.backgroundColor = '#3978d6';
-	//	this.title.className = 'dJSWin_title';
-		this.title.style.top = '0px';
-		this.title.style.left = '0px';
-		this.title.style.zIndex = '1';
-		
-		this.title_text.style.position = 'relative';
-		this.title_text.className = 'dJSWin_title_text';
-//		this.title_text.style.cursor = 'move';
-		this.title_text.innerHTML = params['title'];
-		this.title_text.style.zIndex = '1';
-
-		this.clientArea.id = params['id']+'_clientArea';
-		this.clientArea.style.position = 'absolute';
-		this.clientArea.style.visibility = 'hidden';
-		this.clientArea.style.width  = parseInt(params['width']) + 2 + 'px';
-		this.clientArea.style.height = params['height'];
-		this.clientArea.style.top = parseInt(this.title.style.height) + 'px';
-		this.clientArea.style.left = '0px';
-	//	this.clientArea.style.backgroundColor = params['bg_color'];
-//		this.clientArea.style.overflow = 'auto';
-		this.clientArea.className = 'dJSWin_main';
-		
-		this.buttons.xDIV.id = params['id']+'_button';
-		this.buttons.xDIV.style.position = 'absolute';
-		this.buttons.xDIV.style.visibility = 'hidden';
-		this.buttons.xDIV.style.cursor = 'hand';
-		this.buttons.xDIV.style.top = '1px';
-		this.buttons.xDIV.style.left = parseInt(params['width']) - 13 + 'px';
-		this.buttons.xDIV.style.zIndex = '1';
-		this.buttons.xDIV.onclick = function() {_this.close();};
-		
-		this.content.style.visibility = 'hidden';
-		//this.content.style.top = parseInt(this.title.style.height) + 'px';
-		this.content.style.top = '0px';
-		this.content.style.left = '0px';
-		
-		this.shadows.b.id = params['id']+'_shadowb';
-		this.shadows.b.style.position = 'absolute';
-		this.shadows.b.style.visibility = 'hidden';
-		this.shadows.b.style.backgroundColor = '#666';
-		this.shadows.b.style.width = params['width'];
-		this.shadows.b.style.height = '4px';
-		this.shadows.b.style.top = parseInt(this.title.style.height) + parseInt(params['height']) + 'px';
-		this.shadows.b.style.left = '4px';
-		
-		this.shadows.r.id = params['id']+'_shadowr';
-		this.shadows.r.style.position = 'absolute';
-		this.shadows.r.style.visibility = 'hidden';
-		this.shadows.r.style.backgroundColor = '#666';
-		this.shadows.r.style.width = '4px';
-		this.shadows.r.style.height = parseInt(params['height']) + parseInt(this.title.style.height) + 'px';
-		this.shadows.r.style.top  = '4px';
-		this.shadows.r.style.left = params['width'];
-
-		this.border.t.id = params['id']+'_border_t';
-		this.border.b.id = params['id']+'_border_b';
-		this.border.l.id = params['id']+'_border_l';
-		this.border.r.id = params['id']+'_border_r';
-		
-		this.border.t.style.position = 'absolute';
-		this.border.b.style.position = 'absolute';
-		this.border.l.style.position = 'absolute';
-		this.border.r.style.position = 'absolute';
-
-		this.border.t.style.visibility = 'hidden';
-		this.border.b.style.visibility = 'hidden';
-		this.border.l.style.visibility = 'hidden';
-		this.border.r.style.visibility = 'hidden';
-
-		this.border.t.className = 'dJSWin_title';
-		this.border.b.className = 'dJSWin_title';
-		this.border.l.className = 'dJSWin_title';
-		this.border.r.className = 'dJSWin_title';
-		
-		this.border.t.style.border = '0px';
-		this.border.b.style.border = '0px';
-		this.border.l.style.border = '0px';
-		this.border.r.style.border = '0px';
-
-		if (params['border'])
-		{
-			this.border.t.style.width = parseInt(params['width']) + 2 + 'px';
-			this.border.b.style.width = parseInt(params['width']) + 2 + 'px';
-			this.border.l.style.width = '2px';
-			this.border.r.style.width = '2px';
-
-			this.border.t.style.height = '2px';
-			this.border.b.style.height = '2px';
-			this.border.l.style.height = parseInt(params['height']) + parseInt(this.title.style.height) + 4 + 'px';
-			this.border.r.style.height = parseInt(params['height']) + parseInt(this.title.style.height) + 4 + 'px';
-
-			this.border.t.style.top = '-2px';
-			this.border.b.style.top = parseInt(params['height']) + parseInt(this.title.style.height) + 'px';
-			this.border.l.style.top = '-2px'; 
-			this.border.r.style.top = '-2px';
-
-			this.border.t.style.left = '-2px';
-			this.border.b.style.left = '-2px';
-			this.border.l.style.left = '-2px';
-			this.border.r.style.left = params['width'];
-
-			this.shadows.b.style.top = parseInt(this.shadows.b.style.top) + 2 + 'px';
-			this.shadows.r.style.top = parseInt(this.shadows.r.style.top) + 2 + 'px';
-			this.shadows.b.style.left = parseInt(this.shadows.b.style.left) + 2 + 'px';
-			this.shadows.r.style.left = parseInt(this.shadows.r.style.left) + 2 + 'px';
-		}
-		else
-		{
-			this.border.t.style.width = '0px';
-			this.border.b.style.width = '0px';
-			this.border.l.style.width = '0px';
-			this.border.r.style.width = '0px';
-		}
-		
-		if (!is_moz1_6)
-		{
-			this.content.parentNode.removeChild(this.content);
-		}
-		
-		this.title.appendChild(this.title_text);
-		this.title.appendChild(this.clientArea);
-		this.title.appendChild(this.buttons.xDIV);
-		this.title.appendChild(this.border.t);
-		this.title.appendChild(this.border.b);
-		this.title.appendChild(this.border.l);
-		this.title.appendChild(this.border.r);
-		this.title.appendChild(this.shadows.r);
-		this.title.appendChild(this.shadows.b);
-		this.clientArea.appendChild(this.content);
-		
-		document.body.appendChild(this.title);
-		this.draw();
-	}
-
-	dJSWin.prototype.close = function()
-	{
-		dd.elements[this.title.id].hide();
-	}
-
-	dJSWin.prototype.open = function()
-	{
-		this.moveTo(window.innerWidth/2 + window.pageXOffset - dd.elements[this.title.id].w/2,
-		            window.innerHeight/2 + window.pageYOffset - dd.elements[this.clientArea.id].h/2);
-		
-		dd.elements[this.title.id].maximizeZ();
-		dd.elements[this.title.id].show();
-	}
-
-	dJSWin.prototype.show = function()
-	{
-		this.open();
-	}
-
-	dJSWin.prototype.hide = function()
-	{
-		this.close();
-	}
-
-	dJSWin.prototype.moveTo = function(x,y)
-	{
-		dd.elements[this.title.id].moveTo(x,y);
-	}
-
-	dJSWin.prototype.x = function()
-	{
-		return dd.elements[this.title.id].x;
-	}
-
-	dJSWin.prototype.y = function()
-	{
-		return dd.elements[this.title.id].y;
-	}
-
-	dJSWin.prototype.draw = function()
-	{
-		if (dd.elements && dd.elements[this.title.id])
-		{
-			return;
-		}
-
-		if (this.drawn)
-		{
-			return;
-		}
-
-		this.drawn = true;
-
-		ADD_DHTML(this.title.id+CURSOR_MOVE);
-		ADD_DHTML(this.clientArea.id+NO_DRAG);
-		ADD_DHTML(this.buttons.xDIV.id+NO_DRAG);
-		ADD_DHTML(this.content.id+NO_DRAG);
-		ADD_DHTML(this.shadows.r.id+NO_DRAG);
-		ADD_DHTML(this.shadows.b.id+NO_DRAG);
-		ADD_DHTML(this.border.t.id+NO_DRAG);
-		ADD_DHTML(this.border.b.id+NO_DRAG);
-		ADD_DHTML(this.border.l.id+NO_DRAG);
-		ADD_DHTML(this.border.r.id+NO_DRAG);
-		
-		dd.elements[this.title.id].addChild(dd.elements[this.border.t.id]);
-
-		dd.elements[this.title.id].addChild(dd.elements[this.clientArea.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.buttons.xDIV.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.content.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.shadows.r.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.shadows.b.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.border.b.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.border.l.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.border.r.id]);
-
-
-		if (typeof(this.includedContents) == 'object')
-		{
-			for (var i in this.includedContents)
-			{
-				ADD_DHTML(this.includedContents[i]+NO_DRAG);
-				dd.elements[this.title.id].addChild(dd.elements[this.includedContents[i]]);
-			}
-		}
-
-		dd.elements[this.title.id].hide();
-		dd.elements[this.title.id].moveTo(window.innerWidth/2 - dd.elements[this.clientArea.id].w/2,
-		                                  window.innerHeight/2 - dd.elements[this.clientArea.id].h/2);
-		
-	}
-
-	if (!dd.elements)
-	{
-		var div = document.createElement('div');
-		div.id = '__NONE__#';
-		div.style.position = 'absolute';
-		
-		SET_DHTML(div.id);
-	}
diff --git a/phpgwapi/js/dJSWin/ie/dJSWin.js b/phpgwapi/js/dJSWin/ie/dJSWin.js
deleted file mode 100644
index ed50aeca3c..0000000000
--- a/phpgwapi/js/dJSWin/ie/dJSWin.js
+++ /dev/null
@@ -1,321 +0,0 @@
-  /****************************************************************************\
-   * Dynamic JS Win - Javascript Object                                       *
-   *                                                                          *
-   * Written by:                                                              *
-   *  - Raphael Derosso Pereira <raphaelpereira@users.sourceforge.net>        *
-   * ------------------------------------------------------------------------ *
-   *  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.                                              *
-  \****************************************************************************/
-
-	dJSWin.prototype.init = function(params)
-	{
-		if (!params || typeof(params) != 'object' || !params.id || !params.width || !params.height || !params.content_id)
-		{
-			throw("Can't create empty window or window without width, height or ID");
-		}
-
-		/* Internal Variables */
-		this.winContainer = document.createElement('iframe');
-		this.clientArea = document.createElement('div');
-		this.title = document.createElement('div');
-		this.title_text = null; //document.createElement('');
-		this.buttons = new Array();
-		this.shadows = new Array();
-		this.border = new Array();
-		this.content_id = params.content_id;
-		this.includedContents = params['include_contents'];
-		var pixelTABLE, pixelTBODY, pixelTR, pixelTD;
-		var _this = this;
-		var style;
-
-		/* Create 1 pixel table to be able to create freely
-		 * sizeble DIVs on IE
-		 */
-		pixelTABLE = document.createElement('table');
-		pixelTBODY = document.createElement('tbody');
-		pixelTR = document.createElement('tR');
-		pixelTD = document.createElement('td');
-
-		pixelTABLE.appendChild(pixelTBODY);
-		pixelTBODY.appendChild(pixelTR);
-		pixelTR.appendChild(pixelTD);
-	
-		this.title_text_cont = pixelTABLE.cloneNode(true);
-		this.title_text = this.title_text_cont.firstChild.firstChild.firstChild;
-	
-		pixelTABLE.style.width  = '1px';
-		pixelTABLE.style.height = '1px';
-		
-		pixelTD.style.width  = '1px';
-		pixelTD.style.height = '1px';
-
-		this.border['t'] = document.createElement('div');
-		this.border['b'] = document.createElement('div');
-		this.border['l'] = document.createElement('div');
-		this.border['r'] = document.createElement('div');
-
-		this.shadows['r'] = document.createElement('div');
-		this.shadows['b'] = document.createElement('div');
-
-		this.buttons['xDIV'] = document.createElement('div');
-
-		if (params['button_x_img'])
-		{
-			this.buttons['xIMG'] = document.createElement('IMG');
-			this.buttons['xIMG'].src = params['button_x_img'];
-			this.buttons['xIMG'].style.cursor = 'hand';
-			this.buttons['xDIV'].appendChild(this.buttons['xIMG']);
-		}
-		else
-		{
-			this.buttons.xDIV.innerHTML = 'X';
-		}
-		
-		/* Inicialization */
-		this.title.id = params['id'];
-		this.title.style.position = 'absolute';
-		this.title.style.visibility = 'hidden';
-		this.title.style.width = parseInt(params['width']) + 2 + 'px';
-		this.title.style.height = params['title_height'] ? params['title_height'] : '18px';
-		this.title.style.backgroundColor = '#3978d6';
-	//	this.title.className = 'dJSWin_title';
-		this.title.style.top = '0px';
-		this.title.style.left = '0px';
-		this.title.style.zIndex = '1';
-		
-		this.title_text_cont.id = params['id'] + '_text';
-		this.title_text_cont.style.position = 'relative';
-//		this.title_text_cont.border = '0';
-		this.title_text_cont.style.width = '100%';
-		this.title_text_cont.style.height = '100%';
-		this.title_text.style.cursor = 'move';
-		this.title_text_cont.className = 'dJSWin_title_text';
-		this.title_text.className = 'dJSWin_title_text';
-//		this.title_text.style.cursor = 'move';
-		this.title_text.innerHTML = params['title'];
-		this.title_text_cont.style.zIndex = '1';
-
-		this.winContainer.id = params['id']+'_winContainer';
-		this.winContainer.style.position = 'absolute';
-		this.winContainer.style.visibility = 'hidden';
-		this.winContainer.style.width  = params['width'];
-		this.winContainer.style.height = parseInt(params['height']) + parseInt(this.title.style.height) + 'px';
-//		this.winContainer.style.top = '0px';
-		this.winContainer.style.top = '0px'; //this.title.style.height;
-		this.winContainer.style.left = '0px';
-		this.winContainer.style.zIndex = '-1';
-//		this.winContainer.style.backgroundColor = params['bg_color'];
-//		this.winContainer.className = params['win_class'];
-		this.winContainer.src = '';
-		
-		this.clientArea.id = params['id']+'_clientArea';
-		this.clientArea.style.position = 'absolute';
-		this.clientArea.style.visibility = 'hidden';
-		this.clientArea.style.width  = parseInt(params['width']) + 2 + 'px';
-		this.clientArea.style.height = params['height'];
-		this.clientArea.style.top = parseInt(this.title.style.height) + 'px';
-		this.clientArea.style.left = '0px';
-	//	this.clientArea.style.backgroundColor = params['bg_color'];
-//		this.clientArea.style.overflow = 'auto';
-		this.clientArea.className = 'dJSWin_main';
-		
-		this.buttons.xDIV.id = params['id']+'_button';
-		this.buttons.xDIV.style.position = 'absolute';
-		this.buttons.xDIV.style.visibility = 'hidden';
-		this.buttons.xDIV.style.cursor = 'hand';
-		this.buttons.xDIV.style.top = '1px';
-		this.buttons.xDIV.style.left = parseInt(params['width']) - 13 + 'px';
-		this.buttons.xDIV.style.zIndex = '1';
-		this.buttons.xDIV.onclick = function() {_this.close();};
-		
-		this.shadows.b.id = params['id']+'_shadowb';
-		this.shadows.b.style.position = 'absolute';
-		this.shadows.b.style.visibility = 'hidden';
-		this.shadows.b.style.backgroundColor = '#666';
-		this.shadows.b.style.width = params['width'];
-		this.shadows.b.style.height = '4px';
-		this.shadows.b.style.top = parseInt(this.title.style.height) + parseInt(params['height']) + 2 + 'px';
-		this.shadows.b.style.left = '4px';
-		this.shadows.b.appendChild(pixelTABLE.cloneNode(true));
-		
-		this.shadows.r.id = params['id']+'_shadowr';
-		this.shadows.r.style.position = 'absolute';
-		this.shadows.r.style.visibility = 'hidden';
-		this.shadows.r.style.backgroundColor = '#666';
-		this.shadows.r.style.width = '4px';
-		this.shadows.r.style.height = parseInt(params['height']) + parseInt(this.title.style.height) + 'px';
-		this.shadows.r.style.top  = '4px';
-		this.shadows.r.style.left = params['width'];
-
-		this.border.t.id = params['id']+'_border_t';
-		this.border.b.id = params['id']+'_border_b';
-		this.border.l.id = params['id']+'_border_l';
-		this.border.r.id = params['id']+'_border_r';
-		
-		this.border.t.style.position = 'absolute';
-		this.border.b.style.position = 'absolute';
-		this.border.l.style.position = 'absolute';
-		this.border.r.style.position = 'absolute';
-
-		this.border.t.style.visibility = 'hidden';
-		this.border.b.style.visibility = 'hidden';
-		this.border.l.style.visibility = 'hidden';
-		this.border.r.style.visibility = 'hidden';
-
-		this.border.t.className = 'dJSWin_title';
-		this.border.b.className = 'dJSWin_title';
-		this.border.l.className = 'dJSWin_title';
-		this.border.r.className = 'dJSWin_title';
-		
-		this.border.t.style.border = '0px';
-		this.border.b.style.border = '0px';
-		this.border.l.style.border = '0px';
-		this.border.r.style.border = '0px';
-
-		this.border.t.appendChild(pixelTABLE.cloneNode(true));
-		this.border.b.appendChild(pixelTABLE.cloneNode(true));
-		
-		if (params['border'])
-		{
-			this.border.t.style.width = parseInt(params['width']) + 2 + 'px';
-			this.border.b.style.width = parseInt(params['width']) + 4 + 'px';
-			this.border.l.style.width = '2px';
-			this.border.r.style.width = '2px';
-
-			this.border.t.style.height = '2px';
-			this.border.b.style.height = '2px';
-			this.border.l.style.height = parseInt(params['height']) + parseInt(this.title.style.height) + 4 + 'px';
-			this.border.r.style.height = parseInt(params['height']) + parseInt(this.title.style.height) + 4 + 'px';
-
-			this.border.t.style.top = '-2px';
-			this.border.b.style.top = parseInt(params['height']) + parseInt(this.title.style.height) + 'px';
-			this.border.l.style.top = '-2px'; 
-			this.border.r.style.top = '-2px';
-
-			this.border.t.style.left = '-2px';
-			this.border.b.style.left = '-2px';
-			this.border.l.style.left = '-2px';
-			this.border.r.style.left = params['width'];
-
-			this.shadows.b.style.top = parseInt(this.shadows.b.style.top) + 2 + 'px';
-			this.shadows.r.style.top = parseInt(this.shadows.r.style.top) + 2 + 'px';
-			this.shadows.b.style.left = parseInt(this.shadows.b.style.left) + 2 + 'px';
-			this.shadows.r.style.left = parseInt(this.shadows.r.style.left) + 2 + 'px';
-		
-			this.winContainer.style.top = '-3px';
-			this.winContainer.style.left = '-2px';
-			this.winContainer.style.width = parseInt(this.winContainer.style.width) + 8 + 'px';
-			this.winContainer.style.height = parseInt(this.winContainer.style.height) + 10 + 'px';
-		}
-		else
-		{
-			this.border.t.style.width = '0px';
-			this.border.b.style.width = '0px';
-			this.border.l.style.width = '0px';
-			this.border.r.style.width = '0px';
-		}
-		
-		//JsLib.postponeFunction(function(){_this._createWin();});
-		this._createWin();
-	}
-
-	dJSWin.prototype.open = function()
-	{
-		this.moveTo(document.body.offsetWidth/2 + document.body.scrollLeft - dd.elements[this.title.id].w/2,
-					document.body.offsetHeight/2 + document.body.scrollTop - dd.elements[this.winContainer.id].h/2);
-		
-		dd.elements[this.title.id].maximizeZ();
-		dd.elements[this.title.id].show();
-	}
-
-	dJSWin.prototype.draw = function()
-	{
-		if (this.drawn)
-		{
-			return;
-		}
-
-		this.drawn = true;
-		
-		if (dd.elements && dd.elements[this.title.id])
-		{
-			return;
-		}
-
-		ADD_DHTML(this.title.id+CURSOR_MOVE);
-		ADD_DHTML(this.title_text_cont.id+NO_DRAG);
-		ADD_DHTML(this.winContainer.id+NO_DRAG);
-		ADD_DHTML(this.clientArea.id+NO_DRAG);
-		ADD_DHTML(this.buttons.xDIV.id+NO_DRAG);
-		ADD_DHTML(this.content.id+NO_DRAG);
-		ADD_DHTML(this.shadows.r.id+NO_DRAG);
-		ADD_DHTML(this.shadows.b.id+NO_DRAG);
-		ADD_DHTML(this.border.t.id+NO_DRAG);
-		ADD_DHTML(this.border.b.id+NO_DRAG);
-		ADD_DHTML(this.border.l.id+NO_DRAG);
-		ADD_DHTML(this.border.r.id+NO_DRAG);
-		
-
-		dd.elements[this.winContainer.id].setZ(-1);
-		dd.elements[this.title.id].setZ(0);
-		dd.elements[this.title.id].addChild(dd.elements[this.title_text_cont.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.winContainer.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.clientArea.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.buttons.xDIV.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.content.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.shadows.r.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.shadows.b.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.border.t.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.border.b.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.border.l.id]);
-		dd.elements[this.title.id].addChild(dd.elements[this.border.r.id]);
-
-
-		if (typeof(this.includedContents) == 'object')
-		{
-			for (var i in this.includedContents)
-			{
-				ADD_DHTML(this.includedContents[i]+NO_DRAG);
-				dd.elements[this.title.id].addChild(dd.elements[this.includedContents[i]]);
-			}
-		}
-
-		dd.elements[this.title.id].moveTo(document.body.offsetWidth/2 - dd.elements[this.winContainer.id].w/2,
-		                                  document.body.offsetHeight/2 - dd.elements[this.winContainer.id].h/2)
-		
-		dd.elements[this.title.id].hide();
-	}
-
-	dJSWin.prototype._createWin = function()
-	{		
-		style = document.createElement('link');
-		style.href = GLOBALS['serverRoot'] + "phpgwapi/js/dJSWin/dJSWin.css";
-		style.rel = "stylesheet";
-		style.type = "text/css";
-		document.body.appendChild(style);
-
-		this.content = Element(this.content_id);
-		this.content.style.visibility = 'hidden';
-		//this.content.style.top = parseInt(this.title.style.height) + 'px';
-		this.content.style.top = '0px';
-		this.content.style.left = '0px';
-		
-		this.title.appendChild(this.title_text_cont);
-		this.title.appendChild(this.winContainer);
-		this.title.appendChild(this.clientArea);
-		this.title.appendChild(this.buttons.xDIV);
-		this.title.appendChild(this.border.t);
-		this.title.appendChild(this.border.b);
-		this.title.appendChild(this.border.l);
-		this.title.appendChild(this.border.r);
-		this.title.appendChild(this.shadows.r);
-		this.title.appendChild(this.shadows.b);
-		this.clientArea.appendChild(this.content);
-		
-		document.body.appendChild(this.title);
-
-		this.draw();
-	}
diff --git a/phpgwapi/js/dTabs/dTabs.css b/phpgwapi/js/dTabs/dTabs.css
deleted file mode 100644
index 5eba21848e..0000000000
--- a/phpgwapi/js/dTabs/dTabs.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.dTabs_noTabs 
-{
-	background-color: #a3a3a3;
-	width: '100%';
-}
-
-.dTabs_selected
-{
-	background-color: #e3e3e3;
-	color: black;
-	font-weight: bold;
-	text-align: center;
-	width: 2px;
-	cursor: pointer;
-}
-
-.dTabs_unselected
-{
-	background-color: #c9c9c9;
-	color: black;
-	font-weight: 0;
-	text-align: center;
-	width: 2px;
-	cursor: pointer;
-	cursor: hand;
-}
-
-.dTabs_unselected:hover
-{
-	background-color: #c9c9c9;
-	color: red;
-	font-weight: 0;
-	text-align: center;
-	width: 2px;
-	cursor: pointer;
-	cursor: hand;
-}
-
-.dTabs_disabled
-{
-	background-color: #c9c9c9;
-	color: #a3a3a3;
-	font-weight: 0;
-	text-align: center;
-	width: 2px;
-	cursor: hand;
-	cursor: pointer;
-}
-
-.dTabs_tr_index
-{
-	border-spacing: 0px;
-	padding: 5px;
-}
diff --git a/phpgwapi/js/dTabs/dTabs.js b/phpgwapi/js/dTabs/dTabs.js
deleted file mode 100644
index 77ba15bbb2..0000000000
--- a/phpgwapi/js/dTabs/dTabs.js
+++ /dev/null
@@ -1,302 +0,0 @@
-  /****************************************************************************\
-   * Dynamic Tabs - Javascript Object                                         *
-   *                                                                          *
-   * Written by:                                                              *
-   *  - Raphael Derosso Pereira <raphaelpereira@users.sourceforge.net>        *
-   * ------------------------------------------------------------------------ *
-   *  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.                                              *
-  \****************************************************************************/
-
-	/*
-	 * Dynamic Tabs - On-The-Fly Tabs in Javascript
-	 *
-	 * Usage:
-	 *		var tabs = new dTabsManager({'id': <DIV id to be used>, 'width': '498px'});
-	 *
-	 *		tabs.addTab({'id': <ID of the Contents DIV (must be absolute)>,
-	 *		             'name': <text to be shown on tab selector>,
-	 *                   'selectedClass': <name of the class to be used when Tab is selected>,
-	 *                   'unselectedClass': <name of the class to be used when Tab is not selected>});
-	 */
-	 
-	/* Mozilla 1.6 has a bug which impossibilitates it to manage DOM contents that are defined in the
-	 * original document. So we have to workaround it.
-	 */
-	navigator.userAgent.toLowerCase().match('mozilla.*rv[:]1\.6.*gecko') ? is_moz1_6 = true : is_moz1_6 = false;
-		
-	function dTabsManager(params)
-	{
-		this._tabEvents = { show: {}, hide: {}};
-		this.init(params);
-	}
-
-	dTabsManager.prototype.init = function(params)
-	{
-		/* Attributes definition */
-		this._Tabs = new Array();
-		this._Tabs['root'] = null;
-		this._Tabs['tabIndexTR'] = null;
-		this._Tabs['tabIndexTDs'] = new Array();
-		this._Tabs['contents'] = null;
-		this._Tabs['contentsDIV'] = null;
-		this._selectedIndex = null;
-		
-		this._nTabs   = params['nTabs'] ? params['nTabs'] : 0;
-		this._maxTabs = params['maxTabs'] ? params['maxTabs'] : 0;
-
-
-		/* Create and insert the container */
-		var table, tbody, tr, td, style;
-
-		style = document.createElement('link');
-		style.href = GLOBALS['serverRoot'] + "phpgwapi/js/dTabs/dTabs.css";
-		style.rel = "stylesheet";
-		style.type = "text/css";
-		document.body.appendChild(style);
-
-		this._Tabs['root'] = document.createElement('div');
-		this._Tabs['root'].id = params['id'];
-		this._Tabs['root'].style.position = 'absolute';
-		//this._Tabs['root'].style.visibility = 'hidden';
-		this._Tabs['root'].style.top = '150px';
-		this._Tabs['root'].style.left = '0px';
-		this._Tabs['root'].style.width = params['width'] ? params['width'] : 0;
-		
-		table = document.createElement('table');
-		tbody = document.createElement('tbody');
-		table.style.border = '0px solid black';
-		table.style.width  = '100%';
-		table.style.height = '100%';
-		table.cellpadding = '10px';
-
-		this._Tabs['tabIndexTR'] = document.createElement('tr');
-		this._Tabs['tabIndexTR'].style.height = '30px';
-		this._Tabs['tabIndexTR'].className = 'dTabs_tr_index';
-		//this._Tabs['tabIndexTR'].style.width  = '100%';
-		
-		this._Tabs['emptyTab'] = document.createElement('td');
-		this._Tabs['emptyTab'].className = 'dTabs_noTabs';
-		this._Tabs['emptyTab'].innerHTML = '&nbsp;';
-		this._Tabs['tabIndexTR'].appendChild(this._Tabs['emptyTab']);
-		
-		tr = document.createElement('tr');
-		td = document.createElement('td');
-
-		tr.style.width  = '100%';
-		tr.style.height = '100%';
-
-		//this._Tabs['contentsDIV'] = document.createElement('div');
-		//this._Tabs['contentsDIV'].style.position = 'relative';
-		this._Tabs['contentsDIV'] = td;
-
-		this._Tabs['root'].appendChild(table);
-		table.appendChild(tbody);
-		tbody.appendChild(this._Tabs['tabIndexTR']);
-		tbody.appendChild(tr);
-		tr.appendChild(td);
-		//td.appendChild(this._Tabs['contentsDIV']);
-		tr.appendChild(this._Tabs['contentsDIV']);
-		
-		this._Tabs['contents'] = new Array();
-
-		document.body.appendChild(this._Tabs['root']);
-	}
-
-	/*
-		@method addTab
-		@abstract Inserts a tab
-	*/
-	dTabsManager.prototype.addTab = function (params)
-	{
-		if (typeof(params) != 'object')
-		{
-			return false;
-		}
-
-		if (!params['id'] || !Element(params['id']) || 
-		    Element(params['id']).tagName.toLowerCase() != 'div' ||
-			Element(params['id']).style.position.toLowerCase() != 'absolute')
-		{
-			return false;
-		}
-		
-		if (this._Tabs['contents'][params['id']])
-		{
-			this.replaceTab(params);
-			return;
-		}
-
-		//var contents, tdIndex;
-		var element = Element(params['id']);
-		
-		if (is_moz1_6)
-		{/*
-			var element_ = element;
-			element = element.cloneNode(true);
-			//element_.parentNode.replaceChild(element, element_);
-			element_.id = element_.id+'CLONED';
-			element_.style.display = 'none';*/
-			element.style.position = 'absolute';
-		}
-		else
-		{
-			element.parentNode.removeChild(element);
-		}
-		element.style.top = parseInt(this._Tabs['tabIndexTR'].style.height) + 5 + 'px';
-		element.style.left = this._Tabs['root'].style.left;
-		element.style.zIndex = '-1';
-		
-		this._Tabs['contents'][params['id']] = element;
-		
-		this._Tabs.tabIndexTDs[params['id']] = document.createElement('td');
-		
-		var _this = this;
-		this._Tabs.tabIndexTDs[params['id']].innerHTML           = '&nbsp;&nbsp;'+(params['name'] ? params['name'] : 'undefined')+'&nbsp;&nbsp;';
-		this._Tabs.tabIndexTDs[params['id']].selectedClassName   = 'dTabs_selected';
-		this._Tabs.tabIndexTDs[params['id']].unselectedClassName = 'dTabs_unselected';
-		this._Tabs.tabIndexTDs[params['id']].className           = 'dTabs_unselected';
-		this._Tabs.tabIndexTDs[params['id']].onclick             = function() {_this._showTab(params['id']);};
-
-		/* Old Version
-		this._Tabs.tabIndexTDs[params['id']].innerHTML           = params['name'] ? params['name'] : 'undefined';
-		this._Tabs.tabIndexTDs[params['id']].selectedClassName   = params['selectedClass'];
-		this._Tabs.tabIndexTDs[params['id']].unselectedClassName = params['unselectedClass'];
-		this._Tabs.tabIndexTDs[params['id']].className           = params['unselectedClass'];
-		this._Tabs.tabIndexTDs[params['id']].onclick             = function() {_this._showTab(params['id']);};
-		*/
-
-		this._Tabs.tabIndexTR.removeChild(this._Tabs['emptyTab']);
-		this._Tabs.tabIndexTR.appendChild(this._Tabs.tabIndexTDs[params['id']]);
-		this._Tabs.tabIndexTR.appendChild(this._Tabs['emptyTab']);
-
-		if (!is_moz1_6)
-		{
-			this._Tabs.contentsDIV.appendChild(this._Tabs['contents'][params['id']]);
-		}
-
-		this._nTabs++;
-
-		if (this._nTabs == 1)
-		{
-			this._showTab(params['id']);
-		}
-		
-		return;
-	}
-
-	dTabsManager.prototype.removeTab = function (id)
-	{
-		if (!this._Tabs.contents[params['id']])
-		{
-			return false;
-		}
-		
-		this._Tabs.tabIndexTR.removeChild(this._Tabs.tabIndexTDs[params['id']]);
-		this._Tabs.contentsDIV.removeChild(this._Tabs.contents[params['id']]);
-		this._Tabs.contents[params['id']] = null;
-		this._Tabs.tabIndexTDs[params['id']] = null;
-
-		return true;
-	}
-	
-	dTabsManager.prototype.getTabObject = function()
-	{
-		return this._Tabs.root;
-	}
-	
-	dTabsManager.prototype.enableTab = function(id)
-	{
-		if (this._Tabs.contents[id])
-		{
-			var _this = this;
-			this._Tabs.tabIndexTDs[id].className = 'dTabs_unselected';
-			this._Tabs.tabIndexTDs[id].onclick = function() {_this._showTab(id);};
-		}
-	}
-
-	dTabsManager.prototype.disableTab = function(id)
-	{
-		if (this._Tabs.contents[id])
-		{
-			this._Tabs.tabIndexTDs[id].className = 'dTabs_disabled';
-			this._Tabs.tabIndexTDs[id].onclick = false;
-		}
-	}
-
-	/****************************************************************************\
-	 *                         Private Methods                                  *
-	\****************************************************************************/
-
-	dTabsManager.prototype._showTab = function (id)
-	{
-		if (!this._Tabs.contents[id])
-		{
-			return false;
-		}
-
-		/* Ajust the tabIndexTR width to be the same as the contents width*/
-		if (this._Tabs.contents[id].style.width)
-		{
-			this._Tabs['root'].style.width = this._Tabs.contents[id].style.width;
-			this._Tabs['root'].style.height = this._Tabs.contents[id].style.height;
-		}
-		/*
-		else 
-		{
-			this._Tabs['root'].style.width = '0px';
-		}*/
-
-		this._Tabs.tabIndexTDs[id].className = this._Tabs.tabIndexTDs[id].selectedClassName;
-
-		for (var i in this._Tabs.contents)
-		{
-			if (i == 'length')
-			{
-				continue;
-			}
-			
-			//viniciuscb: mystery
-			if (this._Tabs.contents[i].style != null)
-			{
-				this._Tabs.contents[i].style.visibility = 'hidden';
-				this._Tabs.contents[i].style.display = 'none';
-				this._Tabs.contents[i].style.zIndex = '-1';
-				if (this._tabEvents['hide'][i]) this._tabEvents['hide'][i]();
-			}
-		}
-		
-		this._Tabs.contents[id].style.visibility = 'visible';
-		this._Tabs.contents[id].style.display = '';
-		this._Tabs.contents[id].style.zIndex = '10';
-		if (this._tabEvents['show'][id]) this._tabEvents['show'][id]();
-
-		if (this._selectedIndex && this._selectedIndex != id)
-		{
-			this._Tabs.tabIndexTDs[this._selectedIndex].className = this._Tabs.tabIndexTDs[this._selectedIndex].unselectedClassName;
-			this._focus(this._Tabs.contents[id]);
-		}
-		
-		this._selectedIndex = id;
-	}
-
-	dTabsManager.prototype._focus = function(obj)
-	{
-		for (var i in obj.childNodes)
-		{
-			if (obj.childNodes[i].focus)
-			{
-				obj.childNodes[i].focus();
-				return true;
-			}
-			else
-			{
-				if (this._focus(obj.childNodes[i]))
-				{
-					return true;
-				}
-			}
-		}
-	}
diff --git a/phpgwapi/js/dTabs/ie/dTabs.js b/phpgwapi/js/dTabs/ie/dTabs.js
deleted file mode 100644
index 4bf4e6f083..0000000000
--- a/phpgwapi/js/dTabs/ie/dTabs.js
+++ /dev/null
@@ -1,234 +0,0 @@
-  /****************************************************************************\
-   * Dynamic Tabs - Javascript Object                                         *
-   *                                                                          *
-   * Written by:                                                              *
-   *  - Raphael Derosso Pereira <raphaelpereira@users.sourceforge.net>        *
-   * ------------------------------------------------------------------------ *
-   *  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.                                              *
-  \****************************************************************************/
-
-	/*
-	 * Dynamic Tabs - On-The-Fly Tabs in Javascript
-	 *
-	 * Usage:
-	 *		var tabs = new dTabsManager({'id': <DIV id to be used>, 'width': '498px'});
-	 *
-	 *		tabs.addTab({'id': <ID of the Contents DIV (must be absolute)>,
-	 *		             'name': <text to be shown on tab selector>,
-	 *                   'selectedClass': <name of the class to be used when Tab is selected>,
-	 *                   'unselectedClass': <name of the class to be used when Tab is not selected>});
-	 */
-	 
-	dTabsManager.prototype.init = function(params)
-	{
-		/* Attributes definition */
-		this._Tabs = new Array();
-		this._Tabs['root'] = null;
-		this._Tabs['tabIndexTR'] = null;
-		this._Tabs['tabIndexTDs'] = new Array();
-		this._Tabs['contents'] = null;
-		this._Tabs['contentsDIV'] = null;
-		this._selectedIndex = null;
-		
-		this._nTabs   = params['nTabs'] ? params['nTabs'] : 0;
-		this._maxTabs = params['maxTabs'] ? params['maxTabs'] : 0;
-
-
-		/* Create and insert the container */
-		var table, tbody, tr, td, style;
-		var _this = this;
-
-		style = document.createElement('link');
-		style.href = GLOBALS['serverRoot'] + "phpgwapi/js/dTabs/dTabs.css";
-		style.rel = "stylesheet";
-		style.type = "text/css";
-
-		this._Tabs['root'] = document.createElement('div');
-		this._Tabs['root'].id = params['id'];
-		this._Tabs['root'].style.position = 'absolute';
-		//this._Tabs['root'].style.visibility = 'hidden';
-		this._Tabs['root'].style.top = '150px';
-		this._Tabs['root'].style.left = '0px';
-		this._Tabs['root'].style.width = params['width'] ? params['width'] : 0;
-		
-		table = document.createElement('table');
-		tbody = document.createElement('tbody');
-		table.style.border = '0px solid black';
-		table.style.width  = '100%';
-		table.style.height = '100%';
-		table.cellpadding = '10px';
-
-		this._Tabs['tabIndexTR'] = document.createElement('tr');
-		this._Tabs['tabIndexTR'].style.height = '30px';
-		this._Tabs['tabIndexTR'].className = 'dTabs_tr_index';
-		//this._Tabs['tabIndexTR'].style.width  = '100%';
-		
-		this._Tabs['emptyTab'] = document.createElement('td');
-		this._Tabs['emptyTab'].className = 'dTabs_noTabs';
-		this._Tabs['emptyTab'].innerHTML = '&nbsp;';
-		this._Tabs['tabIndexTR'].appendChild(this._Tabs['emptyTab']);
-		
-		tr = document.createElement('tr');
-		td = document.createElement('td');
-
-		tr.style.width  = '100%';
-		tr.style.height = '100%';
-
-		//this._Tabs['contentsDIV'] = document.createElement('div');
-		//this._Tabs['contentsDIV'].style.position = 'relative';
-		this._Tabs['contentsDIV'] = td;
-
-		this._Tabs['root'].appendChild(table);
-		table.appendChild(tbody);
-		tbody.appendChild(this._Tabs['tabIndexTR']);
-		tbody.appendChild(tr);
-		tr.appendChild(td);
-		//td.appendChild(this._Tabs['contentsDIV']);
-		tr.appendChild(this._Tabs['contentsDIV']);
-		
-		this._Tabs['contents'] = new Array();
-
-		var create = function ()
-		{
-			document.body.appendChild(style);
-			document.body.appendChild(_this._Tabs['root']);
-			_this.created = true;
-		}
-
-		this.created = false;
-		//JsLib.postponeFunction(create);
-		create();
-	}
-
-	/*
-		@method addTab
-		@abstract Inserts a tab
-	*/
-	dTabsManager.prototype.addTab = function (params)
-	{
-		var _this = this;
-
-		if (this.created)
-		{
-			return this.addTabIE(params);
-		}
-
-		//JsLib.postponeFunction(function(){ _this.addTabIE(params);});
-	}
-
-	dTabsManager.prototype.addTabIE = function (params)
-	{
-		if (typeof(params) != 'object')
-		{
-			return false;
-		}
-
-		if (!params['id'] || !Element(params['id']) || 
-		    Element(params['id']).tagName.toLowerCase() != 'div' ||
-			Element(params['id']).style.position.toLowerCase() != 'absolute')
-		{
-			return false;
-		}
-		
-		if (this._Tabs['contents'][params['id']])
-		{
-			this.replaceTab(params);
-			return;
-		}
-
-		//var contents, tdIndex;
-		var element = Element(params['id']);
-		
-	//	element.parentNode.removeChild(element);
-		element.style.top = parseInt(this._Tabs['tabIndexTR'].style.height) + 5 + 'px';
-		element.style.left = this._Tabs['root'].style.left;
-		element.style.zIndex = '-1';
-		
-		this._Tabs['contents'][params['id']] = element;
-		
-		this._Tabs.tabIndexTDs[params['id']] = document.createElement('td');
-		
-		var _this = this;
-		this._Tabs.tabIndexTDs[params['id']].innerHTML           = '&nbsp;&nbsp;'+(params['name'] ? params['name'] : 'undefined')+'&nbsp;&nbsp;';
-		this._Tabs.tabIndexTDs[params['id']].selectedClassName   = 'dTabs_selected';
-		this._Tabs.tabIndexTDs[params['id']].unselectedClassName = 'dTabs_unselected';
-		this._Tabs.tabIndexTDs[params['id']].className           = 'dTabs_unselected';
-		this._Tabs.tabIndexTDs[params['id']].onclick             = function() {_this._showTab(params['id']);};
-
-		/* Old Version
-		this._Tabs.tabIndexTDs[params['id']].innerHTML           = params['name'] ? params['name'] : 'undefined';
-		this._Tabs.tabIndexTDs[params['id']].selectedClassName   = params['selectedClass'];
-		this._Tabs.tabIndexTDs[params['id']].unselectedClassName = params['unselectedClass'];
-		this._Tabs.tabIndexTDs[params['id']].className           = params['unselectedClass'];
-		this._Tabs.tabIndexTDs[params['id']].onclick             = function() {_this._showTab(params['id']);};
-		*/
-
-		this._Tabs.tabIndexTR.removeChild(this._Tabs['emptyTab']);
-		this._Tabs.tabIndexTR.appendChild(this._Tabs.tabIndexTDs[params['id']]);
-		this._Tabs.tabIndexTR.appendChild(this._Tabs['emptyTab']);
-
-		this._Tabs.contentsDIV.appendChild(this._Tabs['contents'][params['id']]);
-
-		this._nTabs++;
-
-		if (this._nTabs == 1)
-		{
-			this._showTab(params['id']);
-		}
-		
-		return;
-	}
-
-	dTabsManager.prototype.enableTab = function(id)
-	{
-		var _this = this;
-
-		var enable = function()
-		{
-			if (_this._Tabs.contents[id])
-			{
-				_this._Tabs.tabIndexTDs[id].className = 'dTabs_unselected';
-				_this._Tabs.tabIndexTDs[id].onclick = function() {_this._showTab(id);};
-			}
-		}
-		
-		if (!this.created)
-		{
-			JsLib.postponeFunction(enable);
-		}
-		else
-		{
-			enable();
-		}
-	}
-
-	dTabsManager.prototype.disableTab = function(id)
-	{
-		var _this = this;
-
-		var disable = function ()
-		{
-			if (_this._Tabs.contents[id])
-			{
-				_this._Tabs.tabIndexTDs[id].className = 'dTabs_disabled';
-				_this._Tabs.tabIndexTDs[id].onclick = null;
-			}
-		}
-		
-		if (!this.created)
-		{
-			JsLib.postponeFunction(disable);
-		}
-		else
-		{
-			disable();
-		}
-	}
-
-	/****************************************************************************\
-	 *                         Private Methods                                  *
-	\****************************************************************************/
-
diff --git a/phpgwapi/js/dynapi/api/dyndocument.js b/phpgwapi/js/dynapi/api/dyndocument.js
deleted file mode 100644
index 95b91ff3f2..0000000000
--- a/phpgwapi/js/dynapi/api/dyndocument.js
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-	DynAPI Distribution
-	DynDocument Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynElement
-*/
-
-function DynDocument(frame) {
-	this.DynElement = DynElement;
-	this.DynElement();
-	this.frame = frame;
-	this.doc = this.frame.document;
-	this._dyndoc = this;
-	this.x = 0;
-	this.y = 0;
-	this.w = 0;
-	this.h = 0;
-	this._topZIndex = 10000;
-	var o = this;
-	this.frame.onresize = function() {o._handleResize()};
-	this.onResizeNS4 = "reload"; // or "redraw"
-	this._created = false;
-};
-var p = dynapi.setPrototype('DynDocument','DynElement');
-p._remove = function() {
-	this.elm=null;
-	this.doc=null;
-	this.frame=null;
-};
-p.getBgColor = function() {
-	return this.bgColor;
-};
-p.getX = p.getY = p.getPageX = p.getPageY = dynapi.functions.Zero;
-p.getWidth = function() {
-	if (!this.w) this.findDimensions();
-	return this.w;
-};
-p.getHeight = function() {
-	if (!this.h) this.findDimensions();
-	return this.h;
-};
-p.getXScroll = function ()
-{
-	return (dynapi.ua.ns)? this.frame.pageXOffset : this.elm.scrollLeft;
-}
-p.getYScroll = function ()
-{
-	return (dynapi.ua.ns)? this.frame.pageYOffset : this.elm.scrollTop;
-}
-p.findDimensions = function() {
-	this.w=(dynapi.ua.ns||dynapi.ua.opera)? this.frame.innerWidth : (dynapi.ua.ie6) ? 
-		this.doc.documentElement.clientWidth : this.elm.clientWidth;
-	this.h=(dynapi.ua.ns||dynapi.ua.opera)? this.frame.innerHeight : (dynapi.ua.ie6) ? 
-		this.doc.documentElement.clientHeight : this.elm.clientHeight;
-};
-p.setBgColor = function(color) {
-	if (color == null) color='';
-	if (dynapi.ua.ns4 && color == '') color = '#ffffff';
-	this.bgColor = color;
-	this.doc.bgColor = color;
-};
-p.setFgColor = function(color) {
-	if (color == null) color='';
-	if (dynapi.ua.ns4 && color == '') color='#ffffff';
-	this.fgColor = color;
-	this.doc.fgColor = color;
-};
-p.insertChild = function(c,pos,usebp) { // Blueprint Enabled
-	if (c && !c.isInline && c.parent == this) {
-		if(pos) c.setPosition(pos);
-		DynElement._flagPreCreate(c);
-		if(usebp)
-			c.isInline=c._noInlineValues=true;
-		else {
-			this.doc.write(c.getOuterHTML());
-			c._inserted = true;
-		}
-	}
-};
-p.insertAllChildren = function(usebp,bpSrc) { // Blueprint Enabled
-	var i,c,str =[''];
-	var ch=this.children;
-	for(i=0;i<ch.length;i++) {
-		c = ch[i];
-		if(!c.isInline && !c._inserted){
-			DynElement._flagPreCreate(c);
-			if(usebp) 
-				c.isInline=c._noInlineValues=true;
-			else {
-				str[i]=c.getOuterHTML();
-				c._inserted = true;
-			}
-		}
-	}
-	if(this._hBuffer.length) this.doc.write(this._hBuffer.join('')); // used by addHTML()
-	if(usebp){
-		if(bpSrc) dynapi.frame.document.write('<script type="text/javascript" language="JavaScript" src="'+bpSrc+'"><\/script>');	
-	}
-	else {
-		this.doc.write(str.join('\n'));
-		this.doc.close();
-	}
-};
-
-p._create = function() {
-	var ua=dynapi.ua;
-	this._created = true;
-	if (ua.ns4) {
-		this.css = this.doc;
-		this.elm = this.doc;
-	}
-	else {
-		this.elm = this.frame.document.body;
-		this.css = this.frame.document.body.style;
-		if (ua.ie) {
-			this._overflow = this.css.overflow || '';
-		}
-		if (this._cursor) this.css.cursor = this._cursor;
-	}
-	this.elm._dynobj = this;
-	this.doc._dynobj = this; // DynKeyEvent needs this!
-	this.findDimensions();
-
-	this.fgColor = this.doc.fgColor||'';
-	this.bgColor = this.doc.bgColor||'';
-
-	var divs;
-	// create divs object - speeds up DOM browsers on Win32. Linux & Mac?
-	if (ua.ie||ua.dom) {
-		divs={};
-		var dv,all=(ua.ie||ua.opera)? document.all.tags('div') : document.getElementsByTagName('div');
-		var i=0,l=all.length; // very important!
-		while (i<l){
-			dv=all[i];
-			divs[dv.id]=dv;
-			i++;
-		}
-	}
-	
-	var c,ch=this.children;
-	for(i=0;i<ch.length;i++){
-		c=ch[i];
-		if (c._inserted) c._createInserted(divs);
-		else if(c.isInline) c._createInline(divs);
-		else c._create();
-	};
-	this._updateAnchors();	
-
-	if(ua.ie && this._textSelectable==false) this.doc.onselectstart = dynapi.functions.Deny;
-	
-	if (this.captureMouseEvents) this.captureMouseEvents();
-	if (this.captureKeyEvents) this.captureKeyEvents();
-	this.invokeEvent('load');
-};
-p.destroyAllChildren = function() {
-	for (var i=0;i<this.children.length;i++) {
-		this.children[i]._destroy();
-		delete this.children[i];
-	}
-	this.children = [];
-};
-p._destroy = function() {
-	this.destroyAllChildren();
-	delete DynObject.all;
-	this.elm = null;
-	this.css = null;
-	this.frame = null;
-};
-
-p._handleResize = function() {
-	var w = this.w;
-	var h = this.h;
-	this.findDimensions();
-	if (this.w!=w || this.h!=h) {
-		if (dynapi.ua.ns4) {
-			if (this.onResizeNS4=="redraw") {
-				for (var i=0;i<this.children.length;i++) {
-					this.children[i].elm = null;
-					if (this.children[i]._created) {
-						this.children[i]._created = false;
-						this.children[i]._create();
-					}
-				}
-				this.invokeEvent('resize');
-			}
-			else if (this.onResizeNS4=="reload") {
-				this.doc.location.href = this.doc.location.href;
-			}
-		}
-		else {
-			this.invokeEvent('resize');
-			this._updateAnchors();
-		}
-	}
-};
-p.getCursor = function() {return (this._cursor=='pointer')? 'hand':this._cursor};
-p.setCursor = function(c) {
-	if (!c) c = 'default';
-	else c=(c+'').toLowerCase();
-	if (!dynapi.ua.ie && c=='hand') c='pointer';
-	if (this._cursor!=c) {
-		this._cursor = c;
-		if (this.css) this.css.cursor = c;
-	}
-};
-p.setTextSelectable = function(b){
-	this._textSelectable = b;	
-	if(!dynapi.ua.ie) this.captureMouseEvents();
-	else{
-		if (this.doc) this.doc.onselectstart = b? dynapi.functions.Allow : dynapi.functions.Deny;
-	}
-	if (!b) this.setCursor('default');
-};
-p.showScrollBars = function(b){
-	if(b==this._showScroll) return;
-	else this._showScroll=b;
-	if(dynapi.ua.ie){
-		window.setTimeout('document.body.scroll="'+((b)? 'yes':'no')+'"',100);
-	}else if(dynapi.ua.ns||dynapi.ua.opera){
-		if(b){
-			this._docSize=[document.width,document.height];
-			document.width = this.frame.innerWidth;
-			document.height = this.frame.innerHeight;
-		}else if(this._docSize){
-			document.width = this._docSize[0];
-			document.height = this._docSize[1];
-		}
-	}
-};
-p.writeStyle = function(s){
-	// note: don't ever add \n to the end of the following strings or ns4 will choke!
-	if(!s) return;
-	var css ='<style><!-- ';
-	for(var i in s)	css +='.'+i+' {'+s[i]+';} ';
-	css += ' --></style>';
-	document.write(css);
-};
-
-p._hBuffer = [];
-p.addHTML = function(html){
-	var elm,ua = dynapi.ua;
-	var hbuf=this._hBuffer;
-	var cnt=(this._hblc)? this._hblc++:(this._hblc=1);
-	if (ua.ns4) {
-		html='<nobr>'+html+'<nobr>';
-		if(!this._created) hbuf[cnt]=html;
-		else {
-			elm=new Layer(0,this.frame);
-			elm.left=elm.top=0;
-			var doc=elm.document;
-			elm.clip.width=dynapi.document.w;
-			elm.clip.height=dynapi.document.h;
-			doc.open();doc.write(html);doc.close();
-			elm.visibility = 'inherit';
-		}
-	}
-	else {
-		var pelm=this.elm;
-		if(!this._created) hbuf[cnt]=html;
-		else {
-			if(ua.ie){
-				pelm.insertAdjacentHTML("beforeEnd",html);
-				elm = pelm.children[pelm.children.length-1];				
-			}
-			else{
-				var r = pelm.ownerDocument.createRange();
-				r.setStartBefore(pelm);
-				var ptxt = r.createContextualFragment(html);
-				pelm.appendChild(ptxt);
-				elm = pelm.lastChild;				
-			}
-		}
-	}
-};
-
-function main() {
-	if (dynapi.document==null) {
-		dynapi.document = new DynDocument(dynapi.frame);
-		if (dynapi.loaded) dynapi.document._create();
-		else dynapi.onLoad(function() {
-			dynapi.document._create();
-		});
-	}
-};
-if (!dynapi.loaded) main();
-
diff --git a/phpgwapi/js/dynapi/api/dynlayer_base.js b/phpgwapi/js/dynapi/api/dynlayer_base.js
deleted file mode 100644
index 34cda4d4d9..0000000000
--- a/phpgwapi/js/dynapi/api/dynlayer_base.js
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
-	DynAPI Distribution
-	DynLayer Base/Common Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynDocument
-*/
-
-var DynLayerBase = {};	// used by library
-function DynLayer(html,x,y,w,h,color,image) {
-	this.DynElement = DynElement;
-	this.DynElement();
-
-	if (html && typeof(html)=='object'){ // typeof more stable than constructor when creating layers from another frame
-		var args=html; // dictionary input
-		html=args.html;
-		x = args.x;
-		y = args.y;
-		w = args.w;
-		h = args.h;
-		color = args.color;
-		image = args.image;
-		this.z = (args.zIndex||1);
-		this._saveAnchor = args.anchor;
-		this.visible = (args.visible==false)? false:true;
-		this._textSelectable = (args.textSelectable==false)?false:true;
-		if (args.id)
-			this.setID(args.id,true);
-	}
-	else {
-		this.visible = true;
-		this.z = 1;
-		this._saveAnchor = false;
-		this._textSelectable = true;
-	}
-	
-	this.x = x||0;
-	this.y = y||0;
-	this.w = w;
-	this.h = h;
-	this.bgColor = color;
-	this.bgImage = image;
-	this.html = (html!=null)? html+'':null; // convert html to string
-	this.elm = null;
-	this.doc = null;
-	this.css = null; 
-};
-var p = dynapi.setPrototype('DynLayer','DynElement');
-p._cssBorder = '';
-p._fixBw = 0;
-p._fixBh = 0;
-p._adjustSize=function(){
-	var aw=this._aSzW;
-	var ah=this._aSzH;
-	if(this._created && (aw||ah)) {
-		var i,c,w=0,h=0;
-		// get furthest child
-		for (i=0;i<this.children.length;i++){
-			c=this.children[i];
-			if(c && w<(c.x+c.w)) w=c.x+c.w;
-			if(c && h<(c.y+c.h)) h=c.y+c.h;
-		}
-						
-		if(aw) {
-			i = this.getContentWidth();
-			if(w<i) w=i;
-			if(w!=this.w) this.setWidth(w); 	// set width first
-		}
-		if(ah) {
-			i = this.getContentHeight();
-			if(h<i) h=i;
-			if(h!=this.h) this.setHeight(h);	// set height after width
-		}
-	}
-};
-p._destroy = function() {
-	this._destroyAllChildren();
-	this.removeAllEventListeners();
-	if (this.elm) this._remove();
-	this.setAnchor(null); // remove anchor
-	this.frame = null;
-	this.bgImage = null;
-	this.bgColor = null;
-	this.html = null;
-	this.x = null;
-	this.y = null;
-	this.w = null;
-	this.h = null;
-	this.z = null;
-	this.doc = null;
-	this.css = null;
-	this._dyndoc = null;
-	this.parent = null;
-	this._blkBoardElm = null;
-	DynObject.all[this.id] = null;
-};
-p._destroyAllChildren = function() {
-	var aSz = this._aSz;
-	this._aSz = false; // prevent children from adjusting parent's size when removed
-	for (var i=0;i<this.children.length;i++) {
-		this.children[i]._destroy();
-		delete this.children[i];
-	}
-	this.children.length=0;
-	this._aSz = aSz;
-};
-p._remove = function() {	//! Overwritten by NS4
-	var p = this.parent;
-	if (p && this._alias) p[this._alias]=null;
-	if (p && this.elm) {
-		//this.elm.style.visibility = "hidden";
-		//this.elm.innerHTML = "";
-		//this.elm.outerHTML = "";
-		var pref=p.elm;
-		if(document.getElementById && document.childNodes){
-			if(this.elm.parentNode) pref = this.elm.parentNode; // used with relative layers
-			pref.removeChild(this.elm);
-		}
-		else if (pref && pref.children){
-			this.elm.outerHTML='';
-		}
-		this.elm = null;
-		if (this.releaseMouseEvents) this.releaseMouseEvents();
-		if (this.releaseKeyEvents) this.releaseKeyEvents();
-	}
-	/*
-	this.frame = null;
-	this.bgImage = null;
-	this.bgColor = null;
-	this.html = null;
-	this.z = null;
-	this.w = null;
-	this.h = null;
-	this.elm = this.css = this.doc = null;
-	*/
-};
-p._createInserted = function(divs){
-	DynLayer._assignElement(this,null,divs); //! NS4 will ignore divs
-	DynElement._flagCreate(this);
-};
-p.getOuterHTML=function() {	//! Overwritten by NS4
-	// get box fix values
-	var fixBw = (this._fixBw)? this._fixBw:0;
-	var fixBh = (this._fixBh)? this._fixBh:0;
-	if (fixBw||fixBh) this._fixBoxModel = true;
-	if (this._noStyle) return '<div '+this._cssClass+' id="'+this.id+'">'+this.getInnerHTML()+'</div>';
-	else {
-		var s,clip='',bgimage=' background-image:none;';
-		if(this.bgImage!=null) bgimage=' background-image:url('+this.bgImage+');';
-		if (this.clip) clip=' clip:rect('+this.clip[0]+'px '+this.clip[1]+'px '+this.clip[2]+'px '+this.clip[3]+'px);';
-		else if (this.w!=null && this.h!=null) clip=' clip:rect(0px '+(this.w+fixBw)+'px '+(this.h+fixBh)+'px 0px);';
-		// modify box fix values
-		if (!dynapi.ua.ie && !dynapi.ua.opera) fixBw = 0;
-		if (!dynapi.ua.ie) fixBh = 0;
-		return [
-			'\n<div '+this._cssClass+' id="'+this.id+'" style="',
-			' left:',(this.x!=null? this.x : 0),'px;',
-			' top:',(this.y!=null? this.y : 0),'px;',		
-			((this.w!=null)? ' width:'+(this.w+fixBw)+'px;':''),
-			((this.h!=null)? ' height:'+(this.h+fixBh)+'px;':''),
-			((this.z)? ' z-index:'+this.z+';':''),
-			((this._cursor!=null)? ' cursor:'+this._cursor+';':'cursor:auto;'),
-			((this.bgColor!=null)? ' background-color:'+this.bgColor+';':''),
-			((this.visible==false)? ' visibility:hidden;':' visibility:inherit;'),
-			bgimage,
-			clip,
-			this._cssBorder,
-			this._cssOverflow,
-			this._cssPosition,
-			';">',
-			this.getInnerHTML(),
-			'</div>'
-		].join('');	
-	}
-};
-p.getInnerHTML=function() {	//! Overwritten by NS4
-	var s = '';
-	var i,ch=this.children;
-	if (this.html!=null) s+=this.html;
-	if (this._blkBoardElm) s=('<div id="'+this.id+'_blkboard">'+s+'</div>');	
-	if (ch.length<50) for (i=0;i<ch.length;i++) s+=ch[i].getOuterHTML(); 
-	else if(ch.length){
-		var ar=['']; // speed improvement for layers with nested children
-		for (i=0;i<ch.length;i++) ar[i]=ch[i].getOuterHTML();
-		s=s+ar.join('');
-	}
-	return s;
-};
-
-p.getPageX = function() {return (this.isChild)? this.parent.getPageX()+(this.x||0) : this.x||0}; //! Overwritten by NS4
-p.getPageY = function() {return (this.isChild)? this.parent.getPageY()+(this.y||0) : this.y||0}; //! Overwritten by NS4
-
-p.setAutoSize = function(w,h){	
-	this._aSzW = w; // automatically adjust the size of layer to the size of its content
-	this._aSzH = h;
-	this._aSz = w||h;
-	if(this._aSz) this._adjustSize();
-}; 
-
-p._cssClass = '';
-p.setClass = function(c,noInlineStyle){
-	this._class=c;
-	if(this.elm) this.elm.className=c;
-	else {
-		this._cssClass=(c)? 'class="'+c+'"':'';
-		this._noStyle=noInlineStyle;
-	}
-};
-
-p.setVisible = function(b) { //! Overwritten by NS4
-	//if (b!=this.visible) {
-		this.visible = b;
-		if (this.css) this.css.visibility = b? "inherit" : "hidden";
-	//}
-};
-p.setSize = function(w,h) { //! Overwritten by NS4
-	if (this._useMinSize||this._useMaxSize){
-		if (this._minW && w<this._minW) w=this._minW;
-		if (this._minH && h<this._minH) h=this._minH;
-		if (this._maxW && w>this._maxW) w=this._maxW;
-		if (this._maxH && h>this._maxH) h=this._maxH;
-	}
-	var cw = (w!=null && w!=this.w);
-	var ch = (h!=null && h!=this.h);
-	if (cw) this.w = w<0? 0 : w;
-	if (ch) this.h = h<0? 0 : h;
-	if (cw||ch) {
-		if (this._hasAnchor) this.updateAnchor(); // update this anchor
-		if (this._hasChildAnchors) this._updateAnchors(); // update child anchors
-		if (this.css) {
-			if (cw) this.css.width = this.w||0;
-			if (ch) this.css.height = this.h||0;
-			if (cw || ch) {				
-				if(this._needBoxFix) BorderManager.FixBoxModel(this,true);
-				else this.css.clip = 'rect(0px '+(this.w||0)+'px '+(this.h||0)+'px 0px)';
-				// adjust parent size after being sized
-				if(this.parent._aSz) this.parent._adjustSize();
-			}
-			if (this.updateLayout) this.updateLayout(); // what's this?
-		}
-	}
-	if(this._hasResizeEvents) this.invokeEvent('resize');
-	return (cw||ch);
-};
-p.setMaximumSize = function(w,h){
-	this._maxW=w; this._maxH=h;
-	this._useMaxSize=(w!=h!=null);
-	w=(this.w>w)?w:this.w;
-	h=(this.h>h)? h:this.h;
-	this.setSize(this.w,this.h);
-};
-p.setMinimumSize = function(w,h){
-	this._minW=w; this._minH=h;
-	this._useMinSize=(w!=h!=null);
-	this.setSize(this.w,this.h);
-};
-
-p._position  = 'absolute';
-p._cssPosition = ' position:absolute';
-p.setPosition = function(p){
-	if(p!='static' && p!='relative' && p!='fixed' && p!='absolute') p='absolute';
-	this._position=p;
-	if (this.css) this.css.position=p;
-	else this._cssPosition = ' position:'+p;
-};
-
-p._overflow='hidden';
-p._cssOverflow =' overflow:hidden;';
-p.getOverflow = function(){return this._overflow};
-p.setOverflow = function(s){
-//	if(!s) s='default';
-	this._overflow=s;
-	if(this.css) this.css.overflow=s;
-	else this._cssOverflow=' overflow:'+s+';';
-};
-
-p.getAnchor = function(){
-	if(!this.parent) return this._saveAnchors;
-	else if (this.parent._childAnchors) {
-		return this.parent._childAnchors[this.id];
-	}
-};
-p.setAnchor = function(anchor) {
-	if (anchor == null) {
-		delete this._saveAnchor;
-		if (this.parent && this.parent._childAnchors && this.parent._childAnchors[this.id]) delete this.parent._childAnchors[this.id];
-		this._hasAnchor = false;
-	}
-	else if (this.parent) {
-		if (!this.parent._childAnchors) this.parent._childAnchors = {};
-		var a = this.parent._childAnchors;
-		a[this.id] = anchor;
-		this.parent._updateAnchor(this.id);
-		this._hasAnchor = this.parent._hasChildAnchors = true;
-	}
-	else this._saveAnchor = anchor;
-};
-p.setX=function(x) {this.setLocation(x,null)};
-p.setY=function(y) {this.setLocation(null,y)};
-p.getX=function() {return this.x||0};
-p.getY=function() {return this.y||0};
-p.setPageX = function(x) {this.setPageLocation(x,null)};
-p.setPageY = function(y) {this.setPageLocation(null,y)};
-p.getVisible=function() {return this.visible};
-p.getZIndex=function() {return this.z};
-p.setZIndex=function(z) {
-	if (typeof(z)=="object") {
-		if (z.above) this.z = z.above.z + 1;
-		else if (z.below) this.z = z.below.z - 1;
-		else if (z.topmost && !this.parent) this.z = (DynLayer._z)? (DynLayer._z++):(DynLayer._z=1000);
-		else if (z.topmost) {
-			var topZ=10000,ch=this.parent.children;
-			for(var i=0;i<ch.length;i++) if (ch[i].z>topZ) topZ=ch[i].z;
-			this.parent._topZ = topZ+2;
-			this.z = this.parent._topZ;
-		}
-	}
-	else this.z = z;
-	if (this.css) this.css.zIndex = this.z;
-};
-p.getHTML = function() {return this.html};
-p.setWidth=function(w) {this.setSize(w,null)};
-p.setHeight=function(h) {this.setSize(null,h)};
-p.getWidth=function() {return this.w||0};
-p.getHeight=function() {return this.h||0};
-p.getBgImage=function() {return this.bgImage};
-p.getBgColor=function() {return this.bgColor};
-p.setBgColor=function(c) {	//! Overwritten by NS4
-	if (c==null) c = 'transparent';
-	this.bgColor = c;
-	if (this.css) this.css.backgroundColor = c;
-};
-p.setBgImage=function(path) {	//! Overwritten by NS4
-	this.bgImage=path;
-	if (this.css) this.css.backgroundImage='url('+path+')';
-};
-p.setClip=function(clip) {	//! Overwritten by NS4
-	var cc=this.getClip();
-	for (var i=0;i<clip.length;i++) if (clip[i]==null) clip[i]=cc[i];
-	this.clip=clip;
-	if (this.css==null) return;
-	var c=this.css.clip;
-	this.css.clip="rect("+clip[0]+"px "+clip[1]+"px "+clip[2]+"px "+clip[3]+"px)";
-};
-p.getClip=function() {	//! Overwritten by NS4
-	if (this.css==null || !this.css.clip) return [0,0,0,0];
-	var c = this.css.clip;
-	if (c) {
-		if (c.indexOf("rect(")>-1) {
-			c=c.split("rect(")[1].split(")")[0];
-			c=c.replace(/(\D+)/g,',').split(",");
-			for (var i=0;i<c.length;i++) c[i]=parseInt(c[i]);
-			return [c[0],c[1],c[2],c[3]];
-		}
-		else return [0,this.w,this.h,0];
-	}
-};
-p.slideTo = function(endx,endy,inc,speed) {
-	if (!this._slideActive) {
-		var x = this.x||0;
-		var y = this.y||0;
-		if (endx==null) endx = x;
-		if (endy==null) endy = y;
-		var distx = endx-x;
-		var disty = endy-y;
-		if (x==endx && y==endy) return;
-		var num = Math.sqrt(Math.pow(distx,2) + Math.pow(disty,2))/(inc||10)-1;
-		var dx = distx/num;
-		var dy = disty/num;
-		this._slideActive = true;
-		this._slide(dx,dy,endx,endy,num,this.x,this.y,1,(speed||20));
-	}
-};
-p.slideStop = function() {
-	this._slideActive = false;
-	//this.invokeEvent('pathcancel');
-};
-p._slide = function(dx,dy,endx,endy,num,x,y,i,speed) {
-	if (!this._slideActive) this.slideStop();
-	else if (i++ < num) {
-		this.invokeEvent('pathrun');
-		if (this._slideActive) {
-			x += dx;
-			y += dy;
-			this.setLocation(Math.round(x),Math.round(y));
-			setTimeout(this+'._slide('+dx+','+dy+','+endx+','+endy+','+num+','+x+','+y+','+i+','+speed+')',speed);
-		}
-		//else this.slideStop();
-	}
-	else {
-		this._slideActive = false;
-		this.invokeEvent('pathrun');
-		this.setLocation(endx,endy);
-		this.invokeEvent('pathfinish');
-	}
-};
diff --git a/phpgwapi/js/dynapi/api/dynlayer_dom.js b/phpgwapi/js/dynapi/api/dynlayer_dom.js
deleted file mode 100644
index d66da5bea0..0000000000
--- a/phpgwapi/js/dynapi/api/dynlayer_dom.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-	DynAPI Distribution
-	DynLayer DOM Specific Functions
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynLayerBase
-*/
-
-p = DynLayer.prototype;
-p._create = function() {
-	if (this.parent && !this.elm) {
-		DynElement._flagPreCreate(this);
-		var elm, parentElement;
-		parentElement = this.parent.elm;
-		
-		// this method seems faster for most dom browsers
-		var r = parentElement.ownerDocument.createRange();
-		r.setStartBefore(parentElement);
-		var ptxt = r.createContextualFragment(this.getOuterHTML());
-		parentElement.appendChild(ptxt);
-		elm = parentElement.lastChild;
-
-		DynLayer._assignElement(this,elm);
-		DynElement._flagCreate(this);
-	}
-};
-DynLayer._assignElement = function(dlyr,elm,divs) {
-	if (!elm ) {
-		elm = (divs)? divs[dlyr.id] : dlyr.parent.doc.getElementById(dlyr.id);
-		if (!elm){
-			if(dlyr.isInline) dlyr._create();  // force create() for missing inline layer
-			return;
-		}
-	}
-	dlyr.elm = elm;
-	dlyr.css = elm.style;
-	dlyr.doc = dlyr.parent.doc;
-	dlyr.elm._dynobj = dlyr;
-	dlyr._dyndoc = dlyr.parent._dyndoc;
-	if(dlyr._blkBoardElm) dlyr._blkBoardElm = (divs)? divs[dlyr.id+'_blkboard'] : dlyr.parent.doc.getElementById(dlyr.id+'_blkboard');
-
-	if (dlyr.z) dlyr.css.zIndex = dlyr.z;
-
-	// COMMENTED OUT TO PERMIT CSS PRIORITY
-	// by Raphael Pereira <raphaelpereira@users.sourceforge.net>
-	if (0 && dlyr.html!=null && dlyr.html!='' && (dlyr.w==null || dlyr.h==null)) {
-		var cw = (dlyr.w==null)? dlyr.getContentWidth() : null;
-		var ch = (dlyr.h==null)? dlyr.getContentHeight() : null;
-		//var cw = (dlyr.w==null)? dlyr.getElmWidth() : null;
-		//var ch = (dlyr.h==null)? dlyr.getElmHeight() : null;
-		dlyr.setSize(cw,ch);
-	}
-
-	var i,ch=dlyr.children; 
-	for (i=0;i<ch.length;i++) DynLayer._assignElement(ch[i],null,divs);
-
-	// Box Fix - for Border Manager
-	if (dlyr._needBoxFix) BorderManager.FixBoxModel(dlyr);
-
-	if (dlyr._hasKeyEvents) dlyr.captureKeyEvents();
-	if (dlyr._hasMouseEvents) dlyr.captureMouseEvents();
-};
-p.enableBlackboard = function(){
-	if (!this._created) this._blkBoardElm=true;
-	else if(!this._blkBoardElm){
-		var r,ptxt;
-		var h='',elm = this.elm;
-		if(this.html!=null) h=this.html;
-		r = elm.ownerDocument.createRange();
-		r.setStartBefore(elm);
-		ptxt = r.createContextualFragment('<div id="'+this.id+'_blkboard">'+h+'</div>');
-		elm.appendChild(ptxt);
-		this._blkBoardElm = elm.lastChild;		
-	}
-};
-p.setLocation=function(x,y) {
-	var cx = (x!=null && x!=this.x);
-	var cy = (y!=null && y!=this.y);
-	if (cx) this.x = x||0;
-	if (cy) this.y = y||0;
-	if (this.css!=null) {
-		if (cx) this.css.left = this.x+"px";
-		if (cy) this.css.top = this.y+"px";
-		// adjust parent size after being moved
-		if((cx||cy) && this.parent._aSz) this.parent._adjustSize();
-	}
-	if(this._hasLocationEvents) this.invokeEvent('locationchange');
-	return (cx||cy);
-};
-p.setPageLocation = function(x,y) {
-	if (this.isChild) {
-		if (x!=null) x = x - this.parent.getPageX();
-		if (y!=null) y = y - this.parent.getPageY();
-	}
-	return this.setLocation(x,y);
-};
-p.setHTML = function(html) {
-	if (html!=this.html) {
-		this.html = html;
-		if (this.css) {
-			var elm = (this._blkBoardElm)? this._blkBoardElm:this.elm;
-			elm.innerHTML = html;		
-			var sTmp=(this.w==null)?'<NOBR>'+this.html+'</NOBR>':this.html;
-			while (elm.hasChildNodes()) elm.removeChild(elm.firstChild);
-			var r=elm.ownerDocument.createRange();
-			r.selectNodeContents(elm);
-			r.collapse(true);
-			var df=r.createContextualFragment(sTmp);
-			elm.appendChild(df);
-			this._adjustSize();
-		}
-	}
-	if(this._hasContentEvents) this.invokeEvent('contentchange');	
-};
-p.setTextSelectable=function(b) {
-	this._textSelectable = b;
-	if(!this._hasMouseEvents) this.captureMouseEvents();
-	if (!b) this.setCursor('default');
-};
-p.getCursor = function() {return (this._cursor=='pointer')? 'hand':this._cursor};
-p.setCursor = function(c) {
-	if (!c) c = 'default';
-	else c=(c+'').toLowerCase();
-	if (c=='hand') c='pointer';
-	if (this._cursor!=c) {
-		this._cursor = c;
-		if (this.css) this.css.cursor = c;
-	}		
-};
-p.getContentWidth=function() {
-	if (this.elm==null) return 0;
-	else {
-		var p = this.parent;		
-		var tw = this.elm.style.width;
-		this.css.width = "auto";		
-		var w = this.elm.offsetWidth;
-		this.css.width = tw;
-		return w;
-	};
-};
-p.getContentHeight=function() {
-	if (this.elm==null) return 0;
-	else {
-		var th = this.css.height;
-		this.elm.style.height = "auto";
-		var h = this.elm.offsetHeight;
-		this.css.height = th;
-		return h;
-	}
-};
diff --git a/phpgwapi/js/dynapi/api/dynlayer_ie.js b/phpgwapi/js/dynapi/api/dynlayer_ie.js
deleted file mode 100644
index 0dfe3fd0a2..0000000000
--- a/phpgwapi/js/dynapi/api/dynlayer_ie.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-	DynAPI Distribution
-	DynLayer IE Specific Functions
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynLayerBase
-*/
-
-p = DynLayer.prototype;
-p._create = function() {
-	if (this.parent && !this.elm) {			
-		DynElement._flagPreCreate(this);		
-		var elm, parentElement;
-		parentElement = this.parent.elm;
-//		if(dynapi.ua.v<5){
-			parentElement.insertAdjacentHTML("beforeEnd",this.getOuterHTML());
-			elm = parentElement.children[parentElement.children.length-1];
-/*		}
-		else {
-			// this method is more efficient for ie5+. any comment?
-			//elm=document.createElement('DIV');
-			elm=this._getDOMObject();
-			elm.id=this.id;
-			if(this._className) elm.className=this._class;
-			if(!this._noStyle) {
-				var css = elm.style;
-				css.position=(this._position||'absolute');
-				if (this.x) css.pixelLeft = this.x;
-				if (this.y) css.pixelTop = this.y;
-				if (this.w) css.width = this.w;
-				if (this.h) css.height = this.h;
-				if (this.bgColor) css.backgroundColor = this.bgColor;
-				if (this.z) css.zIndex = this.z;
-				if (this._cursor) css.cursor = this._cursor;
-				if (this._overflow) css.overflow = this._overflow;			
-				if (this.bgImage!=null) css.backgroundImage='url('+this.bgImage+')';
-				//if (this.bgImage==null && this.html==null) css.backgroundImage='';
-				if (this.clip) css.clip='rect('+this.clip[0]+'px '+this.clip[1]+'px '+this.clip[2]+'px '+this.clip[3]+'px)';
-				else if (this.w!=null && this.h!=null) css.clip='rect(0px '+this.w+'px '+this.h+'px 0px)';		
-				css.visibility=(this.visible==false)? 'hidden':'inherit';
-				// border - set by BorderManager
-				if(this._cssBorTop){
-					css.borderTop = this._cssBorTop||'';
-					css.borderRight = this._cssBorRight||''; 
-					css.borderBottom = this._cssBorBottom||'';
-					css.borderLeft = this._cssBorLeft||'';
-				}
-			}
-			try {
-				elm.innerHTML = this.getInnerHTML();
-			}
-			catch (e)
-			{
-			}
-			//alert(elm.outerHTML);
-			parentElement.appendChild(elm);
-		}
-*/		DynLayer._assignElement(this,elm);
-		DynElement._flagCreate(this);
-	}
-};
-p._getDOMObject = function()
-{
-	return document.createElement('DIV');
-}
-
-DynLayer._assignElement = function(dlyr,elm,divs) {
-	if (!elm ) {
-		elm = (divs)? divs[dlyr.id] : dlyr.parent.elm.all[dlyr.id];
-		if (!elm){
-			if(dlyr.isInline) dlyr._create();  // force create() for missing inline layer
-			return;
-		}
-	}
-	dlyr.elm = elm;
-	dlyr.css = elm.style;
-	dlyr.doc = dlyr.parent.doc;
-	dlyr.elm._dynobj = dlyr;
-	dlyr._dyndoc = dlyr.parent._dyndoc;
-	if(dlyr._blkBoardElm) dlyr._blkBoardElm = (divs)? divs[dlyr.id+'_blkboard'] : dlyr.parent.elm.all[dlyr.id+'_blkboard'];
-
-	// COMMENTED OUT TO PERMIT CSS PRIORITY
-	// by Raphael Pereira <raphael@think-e.com.br>
-	if (0 && dlyr.html!=null && dlyr.html!='' && (dlyr.w==null || dlyr.h==null)) {
-		var cw = (dlyr.w==null)? dlyr.getContentWidth() : null;
-		var ch = (dlyr.h==null)? dlyr.getContentHeight() : null;
-		dlyr.setSize(cw,ch);
-	}
-	
-	var i,ch=dlyr.children; 
-	for (i=0;i<ch.length;i++) DynLayer._assignElement(ch[i],null,divs);
-
-	if (dlyr._textSelectable==false) elm.onselectstart = dynapi.functions.Deny;
-
-	// prevent dragging of images
-	//if (elm.all.tags("img").length) elm.ondragstart = dynapi.functions.False;
-
-	// Box Fix - for Border Manager
-	if (dlyr._needBoxFix) BorderManager.FixBoxModel(dlyr);
-
-	if (dlyr._hasKeyEvents) dlyr.captureKeyEvents();
-	if (dlyr._hasMouseEvents) dlyr.captureMouseEvents();
-	
-};
-p.enableBlackboard = function(){
-	if (!this._created) this._blkBoardElm=true;
-	else if(!this._blkBoardElm){
-		var h='',elm = this.elm;
-		if(this.html!=null) h=this.html;
-		elm.insertAdjacentHTML("beforeEnd",'<div id="'+this.id+'_blkboard">'+h+'</div>');
-		this._blkBoardElm = elm.children[elm.children.length-1];
-	}
-};
-p.setLocation=function(x,y) {
-	var cx = (x!=null && x!=this.x);
-	var cy = (y!=null && y!=this.y);
-	if (cx) this.x = x||0;
-	if (cy) this.y = y||0;
-	if (this.css!=null) {
-		if (cx) this.css.pixelLeft = this.x;
-		if (cy) this.css.pixelTop = this.y;
-		// adjust parent size after being moved
-		if((cx||cy) && this.parent._aSz) this.parent._adjustSize();		
-	}
-	if(this._hasLocationEvents) this.invokeEvent('locationchange');
-	return (cx||cy);
-};
-p.setPageLocation = function(x,y) {
-	if (this.isChild) {
-		if (dynapi.ua.v>=5) {
-			if (cx) this.css.pixelLeft = this.x;
-			if (cy) this.css.pixelTop = this.y;
-		}
-		else {
-			if (cx) this.css.left = this.x+"px";
-			if (cy) this.css.top = this.y+"px";
-		}
-	}
-	return this.setLocation(x,y);
-};
-p.setHTML = function(html) {
-	if (html!=this.html) {
-		this.html = html;
-		if (this.css) {
-			var elm = (this._blkBoardElm)? this._blkBoardElm:this.elm;
-			elm.innerHTML = html;
-			this._adjustSize();
-		}
-	}
-	if(this._hasContentEvents) this.invokeEvent('contentchange');	
-};
-p.setTextSelectable=function(b) {
-	this._textSelectable = b;
-	if (this.elm) this.elm.onselectstart = b? dynapi.functions.Allow : dynapi.functions.Deny;
-	if (!b) this.setCursor('default');
-	// && this.captureMouseEvents && !this._hasMouseEvents) this.captureMouseEvents();
-};
-p.getCursor = function() {return this._cursor};
-p.setCursor = function(c) {
-	if (!c) c = 'default';
-	else c=(c+'').toLowerCase();
-	if (this._cursor!=c) {
-		this._cursor = c;
-		if (this.css) this.css.cursor = c;
-	}
-};
-p.getContentWidth=function() {
-	if (this.elm==null) return 0;
-	else {
-		var w,tw = this.css.width;
-		this.css.width='auto'; // force ie to get width
-		if (dynapi.ua.platform=="mac") w = this.elm.offsetWidth;
-		else w = parseInt(this.elm.scrollWidth);
-		this.css.width=tw;
-		return w;
-	};
-};
-p.getContentHeight=function() {
-	if (this.elm==null) return 0;
-	else {
-		if (dynapi.ua.platform=="mac") return this.elm.offsetHeight;
-		return parseInt(this.elm.scrollHeight);
-		
-	}
-};
-p.setOverflow = function(s)
-{
-	if(!s) s='';
-	this._overflow=s;
-	if(this.css) this.css.overflow=s;
-	else this._cssOverflow=' overflow:'+s+';';
-}
diff --git a/phpgwapi/js/dynapi/api/dynlayer_ns4.js b/phpgwapi/js/dynapi/api/dynlayer_ns4.js
deleted file mode 100644
index 1bb8eb5cde..0000000000
--- a/phpgwapi/js/dynapi/api/dynlayer_ns4.js
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-	DynAPI Distribution
-	DynLayer NS4 Specific Functions
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynLayerBase
-*/
-
-p = DynLayer.prototype;
-p._ns4IPad = '<img src="'+dynapi.library.path+'gui/images/pixel.gif" width="0" height="0">'; // used with blackboard
-p._remove = function() {
-	if (this.elm) {
-		var p = this.parent;
-		if (p && this._alias) p[this._alias]=null;
-		if (!p.doc.recycled) p.doc.recycled=[];
-		p.doc.recycled[p.doc.recycled.length]=this.elm;
-		this.elm.visibility="hide";
-		this.elm = null;
-		if (this.releaseMouseEvents) this.releaseMouseEvents();
-		if (this.releaseKeyEvents) this.releaseKeyEvents();
-	}
-	/*this.frame = null;
-	this.bgImage = null;
-	this.bgColor = null;
-	this.html = null;
-	this.z = null;
-	this.w = null;
-	this.h = null;
-	this.elm = null;
-	this.doc = null;
-	this.css = null;*/
-};
-p._create = function() {
-	if (this.parent && !this.elm) {
-		DynElement._flagPreCreate(this);
-		var parentElement = this.parent.isClass('DynLayer')? this.parent.elm : this.parent.frame;
-		var elm = new Layer(this.w||0, parentElement);
-		if(this._className) elm.className=this._className; // does this work in ns4?
-		if(!this._noStyle) {
-			if (this.w) elm.clip.width = this.w+this._fixBw;
-			if (this.h) elm.clip.height = this.h+this._fixBh;
-			if (this.x && this.y) elm.moveTo(this.x,this.y);
-			else if (this.x) elm.left = this.x;
-			else if (this.y) elm.top = this.y;
-			if (this.bgColor!=null) elm.document.bgColor = this.bgColor;
-			if (this.clip) {
-				var c = elm.clip, cl = this.clip;
-				c.top=cl[0], c.right=cl[1], c.bottom=cl[2], c.left=cl[3];
-			}
-			if (this.z) elm.zIndex = this.z;
-			if (this.visible) elm.visibility = 'inherit';
-		}
-		if (this.children.length || (this.html!=null && this.html!='')) {
-			elm.document.write(this.getInnerHTML());
-			elm.document.close();
-		}
-		DynLayer._assignElement(this,elm);
-		DynElement._flagCreate(this);
-	}
-};
-DynLayer._getLayerById = function(id,pElm){
-	var i,lyrs,elm;
-	pElm = (pElm)? pElm:document;
-	lyrs = pElm.layers;
-	for (i=0;i<lyrs.length;i++){
-		elm=lyrs[i];
-		if (elm.id==id) return elm;
-		else if (elm.layers.length){
-			elm = this._getLayerById(id,elm);
-			if (elm) return elm;
-		}				
-	}
-};
-DynLayer._assignElement = function(dlyr,elm) {
-	if (!elm) {
-		elm = dlyr.parent.doc.layers[dlyr.id];
-		if (!elm) elm=DynLayer._getLayerById(dlyr.id,dlyr.parent.elm);
-		if (!elm){
-			if(dlyr.isInline) dlyr._create();  // force create() for missing inline layer
-			return;
-		}
-	}
-	dlyr.elm = elm;
-	dlyr.css = elm;
-	dlyr.doc = elm.document;
-	if(dlyr._blkBoardElm) {
-		dlyr._blkBoardElm = elm.document.layers[dlyr.id+'blkboard'];
-		dlyr.doc = dlyr._blkBoardElm.document; // useful for <forms>, images, links, etc
-	}
-	dlyr.elm._dynobj = dlyr.doc._dynobj = dlyr;
-	dlyr._dyndoc = dlyr.parent._dyndoc;
-
-	// COMMENTED OUT TO PERMIT CSS PRIORITY
-	// by Raphael Pereira <raphael@think-e.com.br>
-	if (0 && dlyr.html!=null && dlyr.html!='' && (dlyr.w==null || dlyr.h==null)) {
-		var cw = (dlyr.w==null)? dlyr.getContentWidth() : null;
-		var ch = (dlyr.h==null)? dlyr.getContentHeight() : null;
-		//var cw = (dlyr.w==null)? dlyr.getElmWidth() : null;
-		//var ch = (dlyr.h==null)? dlyr.getElmHeight() : null;
-		dlyr.setSize(cw,ch);
-	}
-	if (dlyr.bgImage!=null) dlyr.setBgImage(dlyr.bgImage);
-	
-	var i,ch=dlyr.children; 
-	for (i=0;i<ch.length;i++) DynLayer._assignElement(ch[i],null);
-
-
-	if (dlyr._hasKeyEvents) dlyr.captureKeyEvents();
-	if (dlyr._hasMouseEvents) dlyr.captureMouseEvents();
-	else {
-		// assign ._dynobj to images and links
-		for (var i=0;i<dlyr.doc.images.length;i++) dlyr.doc.images[i]._dynobj=dlyr; // was _dynobji
-		for (var i=0;i<dlyr.doc.links.length;i++) dlyr.doc.links[i]._dynobj=dlyr;
-	}
-};
-
-p.getOuterHTML = function() {
-	// get box fix values
-	var fixBw = (this._fixBw)? this._fixBw:0;
-	var fixBh = (this._fixBh)? this._fixBh:0;
-	var tag='layer',clip='';
-	if (fixBw||fixBh) this._fixBoxModel = true;
-	if(this._position=='relative') tag='ilayer';
-	if(this._noStyle) return '\n<'+tag+' '+this._cssClass+' id="'+this.id+'">'+this.getInnerHTML()+'</'+tag+'>';
-	else {
-		if (this.clip) clip=' clip="'+this.clip[3]+','+this.clip[0]+','+this.clip[1]+','+this.clip[2]+'"';
-		else clip=' clip="0,0,'+((this.w>=0)? this.w+fixBw:0)+','+((this.h>=0)? this.h+fixBh:0)+'"';
-		return [
-			'\n<'+tag+' ',this._cssClass,' id="'+this.id+'"',
-			' left=',(this.x!=null? this.x : 0),
-			' top=',(this.y!=null? this.y : 0),
-			((this.visible)? ' visibility="inherit"':' visibility="hide"'),
-			((this.w!=null)? ' width='+(this.w+fixBw):''),
-			((this.h!=null)? ' height='+(this.h+fixBw):''),
-			((this.z)? ' zindex='+this.z:''), 
-			((this.bgColor!=null)? ' bgcolor="'+this.bgColor+'"':''),
-			((this.bgImage!=null)? ' background="'+this.bgImage+'"':''),			
-			clip,'>',this.getInnerHTML(),'</'+tag+'>'
-		].join('');
-	}
-};
-p.getInnerHTML = function() {
-	var i,s = '',ch=this.children;
-	if (this.html!=null) {
-		if (this.w==null) s += '<nobr>'+this.html+'</nobr>';
-		else s+=this.html;
-	}
-	if (this._blkBoardElm) s='<layer id="'+this.id+'blkboard">'+this._ns4IPad+s+'</layer>';	
-	if(ch.length<50) for (i=0;i<ch.length;i++) s+=ch[i].getOuterHTML(); 
-	else if(ch.length){
-		var ar=['']; // speed improvement for layers with nested children
-		for (i=0;i<ch.length;i++) ar[i]=ch[i].getOuterHTML();
-		s=s+ar.join('');	
-	}
-	return s;
-};
-p.enableBlackboard = function(){
-	if (!this._created) this._blkBoardElm=true;
-	else if(!this._blkBoardElm){
-		var c,i,h='',elm = this.elm;
-		if(this.html!=null) h=this.html;		
-		var parentElement = this.parent.isClass('DynLayer')? this.parent.elm : this.parent.frame;
-		var belm = this._blkBoardElm = new Layer(0, elm);
-		this.doc = belm.document;
-		this.doc.write(h); this.doc.close();
-		belm.visibility = 'inherit';
-		for (i=0;i<this.children.length;i++){
-			c=this.children[i];
-			c.css.zIndex=c.css.zIndex; // reset zindex
-		}		
-	}
-};
-p.setLocation = function(x,y) {
-	var cx = (x!=null && x!=this.x);
-	var cy = (y!=null && y!=this.y);
-	if (cx) this.x = x||0;
-	if (cy) this.y = y||0;
-	if (this.css!=null) {
-		if (cx && cy) this.elm.moveTo(this.x, this.y);
-		else if (cx) this.css.left = this.x;
-		else if (cy) this.css.top = this.y;
-		// adjust parent size after being moved
-		if((cx||cy) && this.parent._aSz) this.parent._adjustSize();			
-	}
-	if(this._hasLocationEvents) this.invokeEvent('locationchange');	
-	return (cx||cy);
-};
-p.setPageLocation = function(x,y) {
-	if (this.css) {
-		if (x!=null) {
-			this.css.pageX = x;
-			this.x = this.css.left;
-		}
-		if (y!=null) {
-			this.css.pageY = y;
-			this.y = this.css.top;
-		}
-		return true;
-	}
-	else {
-		if (this.isChild) {
-			if (x!=null) x = x - this.parent.getPageX();
-			if (y!=null) y = y - this.parent.getPageY();
-		}
-		return this.setLocation(x,y);
-	}
-};
-p.getPageX = function() {return this.css? this.css.pageX : null};
-p.getPageY = function() {return this.css? this.css.pageY : null};
-p.setVisible = function(b) {
-	if (b!=this.visible) {
-		this.visible = b;
-		if (this.css) this.css.visibility = b? "inherit" : "hide";
-	}
-};
-p.setSize = function(w,h) {
-	if (this._useMinSize||this._useMaxSize){
-		if (this._minW && w<this._minW) w=this._minW;
-		if (this._minH && h<this._minH) h=this._minH;
-		if (this._maxW && w>this._maxW) w=this._maxW;
-		if (this._maxH && h>this._maxH) h=this._maxH;
-	}
-	var cw = (w!=null && w!=this.w);
-	var ch = (h!=null && h!=this.h);
-	if (cw) this.w = w<0? 0 : w;
-	if (ch) this.h = h<0? 0 : h;
-	if (cw||ch) {
-		if (this._hasAnchor) this.updateAnchor(); // update this anchor
-		if (this._hasChildAnchors) this._updateAnchors(); // update child anchors
-		if (this.css) {
-			if (cw) this.css.clip.width = (this.w || 0)+this._fixBw;
-			if (ch) this.css.clip.height = (this.h || 0)+this._fixBh;
-			// adjust parent size after being sized
-			if((cw||ch) && this.parent._aSz) this.parent._adjustSize();
-			if (this.updateLayout) this.updateLayout();			
-		}
-	}
-	if(this._hasResizeEvents) this.invokeEvent('resize');
-	return (cw||ch);
-};
-p.setHTML=function(html) {
-	var ch = (html!=null && html!=this.html);
-	if (ch) {
-		this.html = html;
-		if (this.css) {
-			var i, doc = this.doc;
-			var html=(!this._blkBoardElm)? this.html:this._ns4IPad+this.html; // don't ask why! See HTMLContainer
-			doc.open();	doc.write(html); doc.close();
-			for (i=0;i<doc.images.length;i++) doc.images[i]._dynobj = this;
-			for (i=0;i<doc.links.length;i++) doc.links[i]._dynobj = this;
-			this._adjustSize();
-		}
-	}
-	if(this._hasContentEvents) this.invokeEvent('contentchange');
-};
-p.setTextSelectable=function(b) {
-	this._textSelectable = b;
-	this.addEventListener({
-		onmousemove : function(e) {
-			e.preventDefault();
-		}
-	});
-	// && this.captureMouseEvents && !this._hasMouseEvents) this.captureMouseEvents();
-};
-p.getCursor = function() {return this._cursor};
-p.setCursor = function(c) {
-	if (!c) c = 'default';
-	if (this._cursor!=c) this._cursor = c;	
-	// Note: not supported in ns4
-};
-p.setBgColor=function(c) {
-	this.bgColor = c;
-	if (this.css) this.elm.document.bgColor = c;
-};
-p.setBgImage=function(path) {
-	this.bgImage=path||'none';
-	if (this.css) {
-		//if (!path) this.setBgColor(this.getBgColor());
-		setTimeout(this+'.elm.background.src="'+this.bgImage+'"',1);
-	}
-};
-p.getContentWidth=function() {
-	if (this.elm==null) return 0;
-	else {
-		return this.doc.width;
-	};
-};
-p.getContentHeight=function() {
-	if (this.elm==null) return 0;
-	else {
-		return this.doc.height;
-	}
-};
-p.setClip=function(clip) {
-	var cc=this.getClip();
-	for (var i=0;i<clip.length;i++) if (clip[i]==null) clip[i]=cc[i];
-	this.clip=clip;
-	if (this.css==null) return;
-	var c=this.css.clip;
-	c.top=clip[0], c.right=clip[1], c.bottom=clip[2], c.left=clip[3];
-};
-p.getClip=function() {
-	if (this.css==null || !this.css.clip) return [0,0,0,0];
-	var c = this.css.clip;
-	if (c) {
-		return [c.top,c.right,c.bottom,c.left];
-	}
-};
-
diff --git a/phpgwapi/js/dynapi/api/dynlayer_opera.js b/phpgwapi/js/dynapi/api/dynlayer_opera.js
deleted file mode 100644
index 92d223534f..0000000000
--- a/phpgwapi/js/dynapi/api/dynlayer_opera.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-	DynAPI Distribution
-	DynLayer Opera Specific Functions
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynLayerBase
-*/
-
-// Warning: Avoid using document.all collection as it has been reported 
-// that on some platforms when opera is set to an identity other than IE 
-// the all[] collection is not available 
-
-p = DynLayer.prototype;
-p._create = function() {
-	if (this.parent && !this.elm) {
-		DynElement._flagPreCreate(this);
-		var elm, parentElement;
-		parentElement = this.parent.elm;
-		
-		// this method is more efficient for opera7+
-		parentElement.insertAdjacentHTML("beforeEnd",this.getOuterHTML());
-		elm = parentElement.children[parentElement.children.length-1];
-		
-		DynLayer._assignElement(this,elm);
-		DynElement._flagCreate(this);
-	}
-};
-DynLayer._assignElement = function(dlyr,elm,divs) {
-	if (!elm ) {
-		elm = (divs)? divs[dlyr.id] : dlyr.parent.doc.getElementById(dlyr.id);
-		if (!elm){
-			if(dlyr.isInline) dlyr._create();  // force create() for missing inline layer
-			return;
-		}
-	}
-	dlyr.elm = elm;
-	dlyr.css = elm.style;
-	dlyr.doc = dlyr.parent.doc;
-	dlyr.elm._dynobj = dlyr;
-	dlyr._dyndoc = dlyr.parent._dyndoc;
-	if(dlyr._blkBoardElm) dlyr._blkBoardElm = (divs)? divs[dlyr.id+'_blkboard'] : dlyr.parent.doc.getElementById(dlyr.id+'_blkboard');
-
-	// COMMENTED OUT TO PERMIT CSS PRIORITY
-	// by Raphael Pereira <raphael@think-e.com.br>
-	if (0 && dlyr.html!=null && dlyr.html!='' && (dlyr.w==null || dlyr.h==null)) {
-		var cw = (dlyr.w==null)? dlyr.getContentWidth() : null;
-		var ch = (dlyr.h==null)? dlyr.getContentHeight() : null;
-		//var cw = (dlyr.w==null)? dlyr.getElmWidth() : null;
-		//var ch = (dlyr.h==null)? dlyr.getElmHeight() : null;
-		dlyr.setSize(cw,ch);
-	}
-
-	var i,ch=dlyr.children; 
-	for (i=0;i<ch.length;i++) DynLayer._assignElement(ch[i],null,divs);
-
-	if (this._textSelectable==false) elm.onselectstart = dynapi.functions.Disallow;
-
-	// Box Fix - for Border Manager
-	if (dlyr._needBoxFix) BorderManager.FixBoxModel(dlyr);
-
-	if (dlyr._hasKeyEvents) dlyr.captureKeyEvents();
-	if (dlyr._hasMouseEvents) dlyr.captureMouseEvents();	
-};
-p.enableBlackboard = function(){
-	if (!this._created) this._blkBoardElm=true;
-	else if(!this._blkBoardElm){
-		var h='',elm = this.elm;
-		if(this.html!=null) h=this.html;
-		elm.insertAdjacentHTML("beforeEnd",'<div id="'+this.id+'_blkboard">'+h+'</div>');
-		this._blkBoardElm = elm.children[elm.children.length-1];
-	}
-};
-p.setLocation=function(x,y) {
-	var cx = (x!=null && x!=this.x);
-	var cy = (y!=null && y!=this.y);
-	if (cx) this.x = x||0;
-	if (cy) this.y = y||0;
-	if (this.css!=null) {
-		if (cx) this.css.pixelLeft = this.x;
-		if (cy) this.css.pixelTop = this.y;
-		// adjust parent size after being sized
-		if((cx||cy) && this.parent._aSz) this.parent._adjustSize();		
-	}
-	if(this._hasLocationEvents) this.invokeEvent('locationchange');		
-	return (cx||cy);
-};
-p.setPageLocation = function(x,y) {
-	if (this.isChild) {
-		if (dynapi.ua.v>=5) {
-			if (cx) this.css.pixelLeft = this.x;
-			if (cy) this.css.pixelTop = this.y;
-		}
-		else {
-			if (cx) this.css.left = this.x+"px";
-			if (cy) this.css.top = this.y+"px";
-		}
-	}
-	return this.setLocation(x,y);
-};
-p.setHTML = function(html) {
-	if (html!=this.html) {
-		this.html = html;
-		if (this.css) {
-			var elm = (this._blkBoardElm)? this._blkBoardElm:this.elm;
-			elm.innerHTML = html;
-			this._adjustSize();
-		}
-	}
-	if(this._hasContentEvents) this.invokeEvent('contentchange');
-};
-p.setTextSelectable=function(b) {
-	this._textSelectable = b;
-	if (this.elm) this.elm.onselectstart = b? dynapi.functions.Allow : dynapi.functions.Deny;
-	if (!b) this.setCursor('default');
-	// && this.captureMouseEvents && !this._hasMouseEvents) this.captureMouseEvents();
-};
-p.getCursor = function() {return this._cursor};
-p.setCursor = function(c) {
-	if (!c) c = 'default';
-	else c=(c+'').toLowerCase();
-	if (this._cursor!=c) {
-		this._cursor = c;
-		if (this.css) this.css.cursor = c;
-	}		
-};
-p.getContentWidth=function() {
-	if (this.elm==null) return 0;
-	else {
-		var tw=this.css.width;
-		var w,to = this.css.overflow;
-		this.css.width='auto';
-		this.css.overflow='auto';
-		w = parseInt(this.elm.scrollWidth);
-		this.css.width=tw;
-		this.css.overflow=to;
-		return w;
-		
-	};
-};
-p.getContentHeight=function() {
-	if (this.elm==null) return 0;
-	else {
-		if (dynapi.ua.platform=="mac") return this.elm.offsetHeight;
-		return parseInt(this.elm.scrollHeight);
-	}
-};
diff --git a/phpgwapi/js/dynapi/api/event.js b/phpgwapi/js/dynapi/api/event.js
deleted file mode 100644
index 36cd9b5828..0000000000
--- a/phpgwapi/js/dynapi/api/event.js
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
-	DynAPI Distribution
-	DynEvent, EventObject, DynElement Classes
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-*/
-
-function DynEvent(type,src) {
-	this.type = type;
-	this.src = src;
-	this.origin = src;
-	this.propagate = true;
-	this.bubble = false;
-	this.bubbleChild = null;
-	this.defaultValue = true;
-};
-var p = DynEvent.prototype; 
-p.getType = function() {return this.type};
-p.getSource = function() {return this.src};
-p.getOrigin=function() {return this.origin};
-p.stopPropagation = function() {this.propagate = false};
-p.preventBubble = function() {this.bubble = false};
-p.preventDefault = function() {this.defaultValue = false};
-p.getBubbleChild = function() {return this.bubbleChild};
-
-function EventObject() {
-	this.DynObject = DynObject;
-	this.DynObject();
-	this._listeners = [];
-};
-EventObject._SubClass={};
-
-p = dynapi.setPrototype('EventObject','DynObject');
-p.addEventListener = function(el) {
-	if (el) {
-		for (var i=0;i<this._listeners.length;i++) if (this._listeners[i]==el) return;
-		this._listeners[this._listeners.length] = el;		
-		// Use onCreate() and onPrecreate() function for create events
-		this._hasContentEvents=(el['oncontentchange'])? true:this._hasContentEvents;
-		this._hasLocationEvents=(el['onlocationchange'])? true:this._hasLocationEvents;
-		this._hasResizeEvents=(el['onresize'])? true:this._hasResizeEvents;
-		this._hasDragEvents=(el['ondragstart']||el['ondragmove']||
-							el['ondragend']||el['ondragdrop']||el['ondrop']||
-							el['ondragover']||el['ondragout'])? true:this._hasDragEvents;
-
-		if (this.captureMouseEvents) {
-			this._hasMouseEvents = this._hasMouseEvents||(el.onmousedown || el.onmouseup || el.onmouseover || el.onmouseout || el.onclick || el.ondblclick);
-			if (this._created && !this._hasMouseEvents) this.captureMouseEvents();
-		}
-		if (this.captureKeyEvents) {
-			this._hasKeyEvents = this._hasKeyEvents || (el.onkeyup || el.onkeydown || el.onkeypress);
-			if (this._created && !this._hasKeyEvents && (el.onkeydown || el.onkeyup || el.onkeypress)) this.captureKeyEvents();
-		}
-	}
-};
-p.removeEventListener = function(el) {
-	if (el) {
-		DynAPI.functions.removeFromArray(this._listeners, el, false);
-		if (!this._listeners.length && this.releaseMouseEvents && this.getClassName()!='DynDocument') this.releaseMouseEvents();
-		if (!this._listeners.length && this.releaseKeyEvents && this.getClassName()!='DynDocument') this.releaseKeyEvents();
-	}
-};
-p.removeAllEventListeners = function() {
-	delete this._listeners;
-	this._listeners = [];
-};
-p.invokeEvent = function(type,e,args) {
-	if (!e) e = new DynEvent(type,this);
-	e.src = this;
-	e.type = type;
-	
-	// Check for subclassing
-	var clsFn=EventObject._SubClass[this+'_'+type];
-	if(clsFn) {
-		if (clsFn(e,args)==false) return;
-	};
-	
-	if (this._listeners.length) for (var i=0;i<this._listeners.length;i++) {
-		if (this._listeners[i]["on"+type]) this._listeners[i]["on"+type](e,args);
-		if (!e.propagate) break;
-	}
-	if (this["on"+type]) this["on"+type](e,args);
-	if (e.bubble && this.parent) {
-		//if ((type=="mouseover" || type=="mouseout") && e._relative==this.parent) return;
-		e.x += this.x;
-		e.y += this.y;
-		e.bubbleChild = this;
-		this.parent.invokeEvent(type,e,args);
-	}
-};
-
-// Add subClassEvent() function to dynapi.functions
-dynapi.functions.subClassEvent = function(type,eobj,fn){
-	var ek=eobj+'_'+type;
-	var cls=EventObject._SubClass;
-	if(typeof(fn)=='function') cls[ek]=fn;
-	else if(!fn && cls[ek]) delete cls[ek];
-};
-
-function DynElement() {
-	this.EventObject = EventObject;
-	this.EventObject();
-	this.isChild = false;
-	this._created = false;
-	this.parent = null;
-	this._dyndoc = null;
-	this.children = [];
-	this._childAnchors = {};
-	//raphaelpereira
-	this._cfn = {};
-	this._fn = 0;
-};
-DynElement._flagCreate = function(c){ // much faster than using DynElemnt._flagEvent
-	var ch=c.children;
-	c._created = true;
-	if (c._hasCreateFn) c._flagCreateEvent('create');		
-	for (var i=0; i<ch.length; i++) this._flagCreate(ch[i]);
-};
-DynElement._flagPreCreate = function(c){
-	var ch=c.children;
-	if (c._hasPCreateFn) c._flagCreateEvent('precreate');		
-	for (var i=0; i<ch.length; i++) this._flagPreCreate(ch[i]);
-};
-DynElement._flagEvent = function(c,type) {
-	var ch=c.children;
-	c.invokeEvent(type);
-	for (var i=0; i<ch.length; i++) this._flagEvent(ch[i],type);
-};
-p = dynapi.setPrototype('DynElement','EventObject');
-p._adjustSize = dynapi.functions.Null;
-p.addChild = function(c,alias,inlineID) {
-	if (!c) return dynapi.debug.print("Error: no object sent to [DynLayer].addChild()");
-	if (c.isChild) c.removeFromParent();
-	c.isChild = true;
-	c.parent = this;
-	if (c._saveAnchor) {
-		c.setAnchor(c._saveAnchor);
-		c._saveAnchor = null;
-		delete c._saveAnchor;
-	}
-	c._alias = alias;
-	if(alias) this[alias]=c;
-	if(inlineID)
-		c.setID(inlineID,true);
-	if (this._created)	{
-		if (c.isInline) c._createInline();
-		else c._create();
-	}
-	this.children[this.children.length] = c;
-	if(this._aSz) this._adjustSize(); // adjust size if necessary
-	return c;
-};
-p.deleteAllChildren = function() {	// removes & destroy all children
-	var i=0;
-	var ch =this.children;
-	var aSz = this._aSz;
-	this._aSz = false; // prevent children from adjusting parent's size when removed
-	while(ch.length) {
-		c=ch[0];
-		if(c) c.deleteFromParent();
-		else {
-			i++; // fail safe method
-			if(i>=ch.length) break;
-		}
-	};	
-	ch.length = 0;
-	this._aSz = aSz;
-	if(this._aSz) this._adjustSize(); // adjust size if necessary
-};
-p.deleteChild = function(c) { // removes & destroy child
-	var l = this.children.length;
-	for (var i=0;i<l && this.children[i]!=c;i++);
-	if (i!=l) {
-		c._destroy();
-		this.dropChildIndex(i);
-	}
-};
-p.deleteFromParent = function () { // removes & destroy child
-	if (this.parent) this.parent.deleteChild(this);
-};
-p.dropChildIndex = function(i){
-	var ch = this.children;
-	var l = ch.length;
-	delete ch[i];
-	ch[i] = ch[l-1];
-	ch[l-1] = null;
-	ch.length--;
-	// adjust parent size if necessary
-	if(this._aSz) this._adjustSize();
-};
-p.removeChild = function(c) {
-	var l = this.children.length;
-	for (var i=0;i<l && this.children[i]!=c;i++);
-	if (i!=l) {
-		c._remove();
-		c._created = c.isChild = false;
-		c.parent = c.dyndoc = null;
-		c.elm = c._blkBoardElm = c.css = c.doc = null;
-		this.dropChildIndex(i);
-	}
-};
-p.removeFromParent = function () {
-	if (this.parent) this.parent.removeChild(this);
-};
-p._create = p._createInLine = p._createInserted = p._remove = p._delete = p._destroy = dynapi.functions.Null;
-
-p.getChildren = function() {return this.children};
-p.getAllChildren = function() {
-	var temp;
-	var ret = [];
-	var ch = this.children;
-	var l = ch.length;
-	for(var i=0;i<l;i++) {
-		ret[ch[i].id] = ch[i];
-		temp = ch[i].getAll();
-		for(var j in temp) ret[j] = temp[j];
-	}
-	return ret;
-};
-p.getParents = function(l) {
-	if (l==null) l = [];
-	if (this.parent) {
-		l[l.length] = this.parent;
-		l = this.parent.getParents(l);
-	}
-	return l;
-};
-p.isParentOf = function(c) {
-	if (c) {
-		var p = c.getParents();
-		for (var i=0;i<p.length;i++) {
-			if (p[i]==this) return true;
-		}
-	}
-	return false;
-};
-p.isChildOf = function(p) {
-	if (!p) return false;
-	return p.isParentOf(this);
-};
-
-// New onPreCreate() and onCreate() callback functions
-p.onCreate = function(fn){
-	if(!fn) return;
-	if(!this._cfn){this._fn=0;this._cfn=[];}
-	var s='create'+this._fn++;
-	this._cfn[s]='create';
-	this._hasCreateFn=true;
-	this[s]=fn;
-};
-p.onPreCreate = function(fn){
-	if(!fn) return;
-	if(!this._cfn){this._fn=0;this._cfn=[];}
-	var s='precreate'+this._fn++;
-	this._cfn[s]='precreate';
-	this._hasPCreateFn=true;
-	this[s]=fn;
-};
-p._flagCreateEvent = function(t){
-	for(var i in this._cfn){ 
-		if(this._cfn[i]==t) 
-		try{this[i]();}
-		catch(e){return}
-	};
-};
-
-p.updateAnchor = function() {
-	this.parent._updateAnchor(this.id);
-};
-p._updateAnchor = function(id) {
-	if (!id) return;
-	var dlyr = DynObject.all[id];
-	var a = this._childAnchors[id];
-	var tw = this.w;
-	var th = this.h;
-	if (a==null || (tw==null && th==null)) return;
-	
-	// anchoring/docking
-	var fn=dynapi.functions;
-	var padX=0,padY=0;
-	if(a.topA) {
-		anc=fn.getAnchorLocation(a.topA,this);
-		if(anc){padY=anc.y; th=th-padY;}
-	}
-	if(a.leftA) {
-		anc=(a.leftA==a.topA && anc)? anc:fn.getAnchorLocation(a.leftA,this);
-		if(anc) {padX=anc.x; tw=tw-padX;}
-	}
-	if(a.bottomA) {
-		anc=fn.getAnchorLocation(a.bottomA,this);
-		th=th-(this.h-anc.y);
-	}
-	if(a.rightA) {
-		anc=(a.bottomA==a.rightA && anc)? anc:fn.getAnchorLocation(a.rightA,this);
-		if(anc) tw=tw-(this.w-anc.x);				
-	}
-	
-	var aleft=(tw>0 && a.left && typeof(a.left)=='string')? tw*(parseInt(a.left)/100):a.left;
-	var aright=(tw>0 && a.right && typeof(a.right)=='string')? tw*(parseInt(a.right)/100):a.right;
-	var atop=(th>0 && a.top && typeof(a.top)=='string')? th*(parseInt(a.top)/100):a.top;
-	var abottom=(th>0 && a.bottom && typeof(a.bottom)=='string')? th*(parseInt(a.bottom)/100):a.bottom;
-	var x = aleft;
-	var y = atop;
-	
-
-	var w = null;
-	var h = null;
-	var dlyrWidth=dlyr.getWidth();
-	var dlyrHeight=dlyr.getHeight();
-	if (a.stretchH!=null) {
-		if(typeof(a.stretchH)!='string') w=a.stretchH;
-		else {
-			if(a.stretchH=='*') w = tw - ((aleft!=null)? aleft:0);
-			else w = tw*(parseInt(a.stretchH)/100);
-		}
-		dlyrWidth=w;
-	}
-	if (a.centerH!=null) {
-		x = Math.ceil(tw/2 - dlyrWidth/2 + a.centerH);
-	}else if (aright!=null) {
-		if (aleft!=null) w = (tw - aright) - aleft;
-		else x = (tw - dlyrWidth) - aright;
-		if(tw<=0 && x<0) x=null; // ns4 needs x>=0
-	}	
-	if (a.stretchV!=null) {
-		if(typeof(a.stretchV)!='string') h=a.stretchV;
-		else {
-			if(a.stretchV=='*') h = th - ((atop!=null)? atop:0);
-			else h = th*(parseInt(a.stretchV)/100);
-		}
-		dlyrHeight=h;
-	}	
-	if (a.centerV!=null) {
-		y = Math.ceil(th/2 - dlyrHeight/2 + a.centerV);
-	}else if (abottom!=null) {
-		if (atop!=null) h = (th - abottom) - atop;
-		else y = (th - dlyrHeight) - abottom;
-		if(th<=0 && y<0) y=null; // ns4 needs y>=0
-	}
-	if(padX) {x=(x)? x:0;x+=padX}
-	if(padY) {y=(y)? y:0;y+=padY}
-
-	// IE seems to be getting wrong position
-	if (dynapi.ua.ie)
-	{
-/*		aleft += 10;
-		aright += 10;
-		atop += 10;
-		abottom += 10;*/
-		x += 7;
-		y += 14;
-	}
-		var tmp=dlyr._hasAnchor;	
-	dlyr._hasAnchor=false; // ignore anchor updates of this layer
-	if(x!=null||y!=null) dlyr.setLocation(x,y);
-	if(w!=null||h!=null) dlyr.setSize(w,h);
-	dlyr._hasAnchor = tmp; // useful for preventing stack overflow
-};
-p._updateAnchors = function() {
-	var tw = this.w;
-	var th = this.h;
-	if (tw==null && th==null) return;
-	for (id in this._childAnchors) this._updateAnchor(id);
-};
-
-
-// Bandwidth timer stop
-var ua=dynapi.ua; ua._bwe=new Date;
-ua.broadband=((ua._bwe-ua._bws)<=1500)? true:false;
diff --git a/phpgwapi/js/dynapi/api/ext/dragevent.js b/phpgwapi/js/dynapi/api/ext/dragevent.js
deleted file mode 100644
index 7f3f2cb14e..0000000000
--- a/phpgwapi/js/dynapi/api/ext/dragevent.js
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-   DynAPI Distribution
-   DragEvent Class
-
-   The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-*/
-
-// DragEvent object
-function DragEvent(type,src) {
-	this.MouseEvent = MouseEvent;
-	this.MouseEvent();
-	this.DynEvent();
-	this.isDragging = false;
-};
-var p = dynapi.setPrototype('DragEvent','MouseEvent');
-p.getX=function() {return this.x};
-p.getY=function() {return this.y};
-p.getPageX=function() {return this.pageX};
-p.getPageY=function() {return this.pageY};
-p.cancelDrag=function() {this.isDragging=false};
-
-//DragEvent.dragPlay=0;
-
-DragEvent.dragevent = new DragEvent();
-
-DragEvent.lyrListener = {
-	onmousedown : function(e) {
-		var ic,o = e.getSource();
-		//setup drag icon
-		if(o._useDragIcon && o._dragIcon) {
-			ic=o._dragIcon;
-			ic._dragOrg = o;
-			ic.setLocation(o.getPageX(),o.getPageY());
-			ic.setSize(o.w,o.h);
-			// if icon is fixed width then center at pointer
-			if(ic.w!=o.w||ic.h!=o.h) ic.setLocation(e.getPageX()-(ic.w/2),e.getPageY()-(ic.h/2));
-		}
-		DragEvent.startDrag(e,ic);
-		//e.preventDefault();
-	}
-};
-
-DragEvent.startDrag = function(e,dlyr) {
-	var origdlyr = dlyr;
-	if (!dlyr) dlyr = e.getSource();
-	
-	if (dynapi.ua.dom) {
-		dlyr.elm.ondragstart = function() { return false; };
-		dlyr.elm.onselectstart = function() { return false; };
-	}
-	
-	// Initialize dragEvent object
-	var de=DragEvent.dragevent;
-	//de.bubble = true;
-	de.src = dlyr;
-	de.origin = (origdlyr)? e.origin : dlyr;
-	de.x = e.getPageX()-dlyr.getPageX();
-	de.y = e.getPageY()-dlyr.getPageY();
-	de.pageX = e.getPageX();
-	de.pageY = e.getPageY();
-	de.parentPageX = dlyr.parent.getPageX();
-	de.parentPageY = dlyr.parent.getPageY();
-	de._mouseEvent = e._mouseEvent;
-	de._browserEvent = e._browserEvent; // ns4 only
-
-	de.isDragging = true;
-
-	e.preventDefault();
-	e.preventBubble();
-
-	//dlyr._dyndoc.addEventListener(DragEvent.docListener);
-	
-	dlyr.invokeEvent("dragstart",de);
-	if(dlyr._dragOrg) {
-		dlyr.setVisible(true);
-		dlyr._dragOrg.invokeEvent("dragstart",e);
-	}
-};
-
-DragEvent.docListener = {
-	onmousemove : function(e) {
-		//var x = e.getPageX();
-		//var y = e.getPageY();
-		//dynapi.debug.status('drag move '+e.x+' '+e.y);
-		
-		var de = DragEvent.dragevent;
-		if (de && de.isDragging) {
-			
-			
-			var lyr = de.src;
-			if (!lyr) return;
-		
-			// DS: what is this?
-			// Detect if we should start the drag
-			/*if(DragEvent.dragPlay==0 || (Math.abs(de.pageX-e.getPageX())-DragEvent.dragPlay>0) || (Math.abs(de.pageY-e.getPageY())-DragEvent.dragPlay>0)) {
-				de.isDragging=true;
-				de.src.invokeEvent("dragstart",de);
-				e.setBubble(de.bubble);
-			}
-			*/
-			/*else if (!de.dragEnabled) {
-				// This allows 'cancelDrag' method to fire the mouseUp as if had been released by the user
-				lyr.invokeEvent("mouseup");
-				return;
-			}*/
-		
-			// Properties
-			de.type="dragmove";
-			de.pageX=e.getPageX();
-			de.pageY=e.getPageY();
-			de._mouseEvent = e._mouseEvent;
-			de._browserEvent = e._browserEvent; // ns4 only
-		
-			/*if (DragEvent.stopAtDocumentEdge) {
-				if (de.pageX<0) de.pageX = 0;
-				if (de.pageY<0) de.pageY = 0;
-				if (de.pageX>DynAPI.document.w) de.pageX = DynAPI.document.w;
-				if (de.pageY>DynAPI.document.h) de.pageY = DynAPI.document.h;
-			}*/
-			
-			var x=de.pageX-de.parentPageX-de.x;
-			var y=de.pageY-de.parentPageY-de.y;
-		
-			// Respect boundary, if any
-			if (lyr._dragBoundary) {
-				var dB = lyr._dragBoundary;
-				var t = dB.top;
-				var r = dB.right;
-				var b = dB.bottom;
-				var l = dB.left;
-				// prevent choppy dragging if child is greater than parent
-				var pw = (lyr.parent.w>lyr.w)? lyr.parent.w-lyr.w:lyr.x;
-				var ph = (lyr.parent.h>lyr.h)? lyr.parent.h-lyr.h:lyr.y;
-				if (x<l) x = l;
-				else if (x>pw-r) x = pw-r;
-				if (y<t) y = t;
-				else if (y>ph-b) y = ph-b;
-			}
-			else if (lyr._dragBoundaryA) {
-				var dB = lyr._dragBoundaryA;
-				var b=dB[2];
-				var r=dB[1];
-				var l=dB[3];
-				var t=dB[0];
-				var w=lyr.w;
-				var h=lyr.h;
-				if (x<l) x=l;
-				else if (x+w>r) x=r-w;
-				if (y<t) y=t;
-				else if (y+h>b) y=b-h;
-			}
-			// Move dragged layer
-			lyr.setLocation(x,y);
-			lyr.invokeEvent("dragmove",de);
-			// drag icon
-			if(lyr._dragOrg) {
-				lyr._dragOrg.invokeEvent("dragmove",e);
-			}
-
-			
-			if (lyr._dragStealth==false && lyr.parent.DragOver) {
-				lyr.parent.DragOver(lyr,e.getPageX(),e.getPageY());
-			}
-			
-			e.preventDefault();
-			e.preventBubble();
-		}
-	},
-	onmouseup : function(e) {
-		// Get, if any, the currently drag in process and the layer. If none, return
-		var de=DragEvent.dragevent;
-		//de.bubble = true;
-		if (!de) return;
-		var lyr=de.src;
-		if (!lyr) return;
-	
-		if (!de.isDragging) {
-	    	de.type="dragend";
-    		de.src=null;
-    		//e.setBubble(true);
-			return;
-		}
-		if (dynapi.ua.ie) lyr.doc.body.onselectstart = null;
-	
-		// Avoid click for the dragged layer ( with MouseEvent addition )
-		if (dynapi.ua.def) dynapi.wasDragging=true;
-		if (lyr.parent.DragDrop) lyr.parent.DragDrop(lyr,e.getPageX(),e.getPageY()); 
-		
-		// Properties for the event
-		de.type="dragend";
-		de.isDragging=false;
-		lyr.invokeEvent("dragend",de);
-		// drag icon
-		if(lyr._dragOrg) {
-			lyr.setVisible(false);
-			lyr._dragOrg.invokeEvent("dragend",de);
-		}
-
-	
-		// Clean drag stuff
-		de.src=null;
-		//e.preventDefault();
-		e.preventBubble();
-		
-		//lyr._dyndoc.removeEventListener(DragEvent.docListener);
-	}
-};
-DragEvent.stopAtDocumentEdge = true;
-DragEvent.setDragBoundary=function(lyr,t,r,b,l) {
-	if (!lyr) {dynapi.debug.print("Error: no object passed to DragEvent.setDragBoundary()"); return;}
-	var a=arguments;
-	if (a.length==0) return;
-	if (a.length==1) {
-		lyr._dragBoundary = {left:0,right:0,top:0,bottom:0};
-	}
-	if (a.length==2) {
-		lyr._dragBoundary = arguments[1];
-	}
-	else if (a.length==5) lyr._dragBoundaryA = [t,r,b,l];
-};
-DragEvent.enableDragEvents=function() {
-	for (var i=0;i<arguments.length;i++) {
-		var lyr=arguments[i];
-		if (!lyr) {dynapi.debug.print("Error: no object passed to DragEvent.enableDragEvents()"); return;}
-		if (lyr.isClass('DynLayer')) lyr.addEventListener(DragEvent.lyrListener);
-	}
-	dynapi.document.addEventListener(DragEvent.docListener);
-	dynapi.document.captureMouseEvents();
-};
-DragEvent.disableDragEvents=function() {
-	for (var i=0;i<arguments.length;i++) {
-		var lyr=arguments[i];
-		lyr.removeEventListener(DragEvent.lyrListener);
-	}
-};
-
-// used mainly inside ondrop and ondragover
-DynLayer.prototype.getDragSource = function(){
-	return this._dragOrg||this;
-};
-DynLayer.prototype.setDragEnabled = function(b,boundry,useIcon){
-	if(!self.DragEvent) return false;
-	if(boundry)DragEvent.setDragBoundary(this,boundry);
-	if (b) DragEvent.enableDragEvents(this);
-	else DragEvent.disableDragEvents(this);
-	this._useDragIcon = useIcon;
-	return true;	
-};
-DynLayer.prototype.setDragIcon = function(icon){
-	if(!icon) return;
-	this._dragIcon = icon;
-	icon.setZIndex({topmost:true});
-	icon.setVisible(false);
-	dynapi.document.addChild(icon);
-};
-DynLayer.prototype.setDragOverStealthMode = function(b){
-	this._dragStealth=(b)? true:false;
-};
-
-// Enable ondrop event
-DynElement.prototype.DragDrop=function(s,mX,mY){ 
-	if (!this.children.length) return false;
-	var ch,chX,sX,sY;
-	for (var i in this.children) { 
-		ch=this.children[i]; 		
-		if(!ch._hasDragEvents) ch.DragDrop(s,mX,mY);
-		else {
-			chX=ch.getPageX();
-			chY=ch.getPageY(); 
-			//sX=s.getPageX();
-			//sY=s.getPageY(); 
-			//if (chX<sX && chX+ch.w>sX+s.w && chY<sY && chY+ch.h>sY+s.h) { 
-			if ((mX>=chX && mX<=chX+ch.w) && (mY>=chY && mY<=chY+ch.h)) { 
-				if (ch.DragDrop(s,mX,mY)) return true; 
-				ch.invokeEvent("drop",null,s); 
-				return true; 
-			}
-		}
-	}
-	return false; 
-};
-
-// Enable ondragover event
-DynElement.prototype.DragOver=function(s,mX,mY){ 
-	if (!this.children.length) return false;
-	var ch,chX,sX,sY;
-	for (var i in this.children) { 
-		ch=this.children[i];		
-		if (!ch._hasDragEvents) ch.DragOver(s,mX,mY);
-		else {
-			chX=ch.getPageX();
-			chY=ch.getPageY(); 
-			if ((mX>=chX && mX<=chX+ch.w) && (mY>=chY && mY<=chY+ch.h)) { 
-				if (ch.DragOver(s,mX,mY)) return true;
-				ch._isDragOver=true;
-				ch.invokeEvent("dragover",null,s); 			
-				return true; 
-			}else if (ch._isDragOver) {
-				ch._isDragOver=false;
-				ch.invokeEvent("dragout",null,s); 			
-			}
-		}
-	}
-	return false; 
-};
-
diff --git a/phpgwapi/js/dynapi/api/ext/dynkeyevent.js b/phpgwapi/js/dynapi/api/ext/dynkeyevent.js
deleted file mode 100644
index 3a7161b1cc..0000000000
--- a/phpgwapi/js/dynapi/api/ext/dynkeyevent.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-   DynAPI Distribution
-   DynKeyEvent Extensions
-
-   The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-   Requirements:
-	dynapi.api
-*/
-function DynKeyEvent(type,src) {
-	this.DynEvent = DynEvent;
-	this.DynEvent(type,src);
-	this.charKey=null;
-};
-var p=dynapi.setPrototype('DynKeyEvent','DynEvent');
-p.getKey=function() {
-	return this.charKey;
-};
-DynKeyEvent._keyEventListener=function(e) {
-	var dynobj=this._dynobj;
-	if(!dynobj) 
-		return true;
-	var dyndoc=dynobj.doc._dynobj;
-	if(!dyndoc) return true;
-	if(!e) var e=dyndoc.frame.event;
-
-	var evt=new DynKeyEvent(e.type,dynobj);
-	evt.which=(e.keyCode)?e.keyCode:e.which;
-	var key=String.fromCharCode(evt.which).toLowerCase();
-	if((key>='a'&&key<='z')||(key>='0'&&key<='9')) evt.charKey=key;
-	evt.spaceKey=(evt.which==32);
-	evt.enterKey=(evt.which==13);
-	evt.tabKey=(evt.which==9||evt.which==65289);
-	evt.leftKey=(evt.which==37||evt.which==52||evt.which==100||evt.which==65460);
-	evt.rightKey=(evt.which==39||evt.which==54||evt.which==102||evt.which==65462);
-	evt.upKey=(evt.which==38||evt.which==56||evt.which==104||evt.which==65464);
-	evt.downKey=(evt.which==40||evt.which==50||evt.which==98||evt.which==65458);
-	evt.altKey=(e.modifiers)?false:(e.altKey||e.altLeft||evt.which==18||evt.which==57388);
-	evt.ctrlKey=(e.modifiers)?(e.modifiers&Event.CONTROL_MASK):(e.ctrlKey||e.ctrlLeft||evt.which==17||evt.which==57391);
-	evt.shiftKey=(e.modifiers)?(e.modifiers&Event.SHIFT_MASK):(e.shiftKey||e.shiftLeft||evt.which==16||evt.which==57390);
-
-	dynobj.invokeEvent(evt.type,evt);
-	if(evt.defaultValue==false) {
-		if(e.cancelBubble) e.cancelBubble=true;
-		if(e.stopPropagation) e.stopPropagation();
-	}
-	return evt.defaultValue;
-};
-
-TabManager={};
-TabManager._c=0; // Current tab manager index.
-TabManager._all=[];
-TabManager._active=false;
-TabManager._activeTimeout=function() { // Prevent duplcate keydown events in NS4.
-	TabManager._active=true;
-	setTimeout('TabManager._active=false;',25);
-};
-TabManager._getForm=null;
-TabManager.getForm=function(p) { // Prevent default tab focus in Mozilla.
-	if(TabManager._getForm) return;
-        TabManager._getForm=p;
-	var html='<form name="__frm" onsubmit="return false;"><input name="__tab" size=1></form>';
-	return p.addChild(new DynLayer(html),'__lyr');
-};
-TabManager._grabFocus=function() {
-	var form=TabManager._getForm.__lyr;
-	setTimeout(form+'.doc.forms.__frm.__tab.focus();',0);
-};
-TabManager._el={};
-TabManager._el.onkeydown=function(e) {
-	if(TabManager._getForm) { // User must have inserted TabManager form.
-		if(TabManager._active) return;
-		TabManager._activeTimeout();
-	}
-	var i1,o1,l1,i2,o2,l2;
-	var nextKey=(e.tabKey||e.rightKey);
-	var prevKey=((e.shiftKey&&e.tabKey)||e.leftKey);
-	var submitKey=(e.enterKey||e.spaceKey);
-	i1=TabManager._c; o1=TabManager._all[i1]; l1=TabManager._all.length;
-	i2=o1._tabGroup._c; o2=o1._tabGroup._all[i2]; l2=o1._tabGroup._all.length;
-	if(nextKey||prevKey) { // Cycle group.
-		if(o2._hasFocusEvents) o2.setFocus(false,o2._focusBubble);
-		else o2.invokeEvent('blur');
-		if(prevKey) i2=(i2==0)?l2-1:i2-1;
-		else i2=(i2==l2-1)?0:i2+1;
-		o2=o1._tabGroup._all[i2]; o1._tabGroup._c=i2;
-		if(o2._hasFocusEvents) o2.setFocus(true,o2._focusBubble);
-		else o2.invokeEvent('focus');
-	}		
-	else if(e.upKey||e.downKey) { // Cycle manager.
-		if(o2._hasFocusEvents) o2.setFocus(false,o2._focusBubble);
-		else o2.invokeEvent('blur');
-		if(e.upKey) i1=(i1==0)?l1-1:i1-1;
-		else i1=(i1==l1-1)?0:i1+1;
-		o1=TabManager._all[i1]; TabManager._c=i1;
-		i2=o1._tabGroup._c;
-		o2=o1._tabGroup._all[i2];
-		if(o2._hasFocusEvents) o2.setFocus(true,o2._focusBubble);
-		else o2.invokeEvent('focus');
-	} else if(submitKey) {
-		o2.invokeEvent('submit');
-	}
-	e.preventDefault();
-	if(TabManager._getForm) TabManager._grabFocus();
-};
-DynElement.prototype.createTabManager=function() {
-	var p=this, c=p.children; if(!c) return;
-	var args=(arguments.length)?arguments:c;
-	var l=args.length, s; if(!l) return;
-	if(p._tabGroup) delete p._tabGroup;
-	p._tabGroup={ _c:0, _all:[] };
-        for(var i=0;i<l;i++) {
-                c=args[i];
-		p._tabGroup._all[i]=c;
-		c._hasTabManager=true;
-		if(!c._submitFn) {
-			s=c.id.replace(/-/g,'.')+'()'; // Element id callback.
-			c._submitFn=s;
-		}
-        }
-	l=TabManager._all.length; TabManager._all[l]=p;
-	if(l==0) dynapi.onLoad(function() {
-			dynapi.document.addEventListener(TabManager._el);
-		});
-};
-DynElement.prototype.updateTabManager=function() {
-	var tm=TabManager, all=tm._all[TabManager._c]; if(!all) return;
-	var old=all._tabGroup; if(!old||old._all[old._c]==this) return;
-	var p=this.parent, l;
-	var tg=(p&&p._tabGroup)?p._tabGroup:null; if(!tg) return;
-	l=tg._all.length;
-	for(var i=0;i<l;i++) if(tg._all[i]==this) { tg._c=i; break; }
-	l=tm._all.length;
-	for(var i=0;i<l;i++) if(tm._all[i]==p) { tm._c=i; break; }
-};
-DynElement.prototype.addTabListeners=function(el) {
-	if(el&&this._tabGroup) {
-		var a=this._tabGroup._all;
-		for(var i in a) a[i].addEventListener(el);
-	}
-};
-DynElement.prototype.addSubmitFn=function(fn) {
-	if(fn) this._submitFn=fn;
-};
-DynElement.prototype.callSubmitFn=function() {
-	var f=this._submitFn;
-	if(typeof(f)=='function') f();
-	else if(typeof(f)=='string') eval(f);
-};
-
-DynElement.prototype.captureKeyEvents=function() {
-	// This impossibilitates Inheritance... changing to the same aproach as captureMouseEvents
-	//var elm=(this.getClassName()=='DynLayer')?this.elm:this.doc;
-	var elm;
-	
-	if (this.getKeyEventElement) elm = this.getKeyEventElement();
-	else elm=(this.getClassName()=='DynDocument')?this.doc:this.elm;
-
-	//if(!elm||this._hasKeyEvents) return true;
-	if (!elm) return true;
-	if(elm.addEventListener) {
-		elm.addEventListener("keydown",DynKeyEvent._keyEventListener,false);
-		elm.addEventListener("keypress",DynKeyEvent._keyEventListener,false);
-		elm.addEventListener("keyup",DynKeyEvent._keyEventListener,false);
-		elm.addEventListener("blur",DynKeyEvent._keyEventListener,false);
-		elm.addEventListener("focus",DynKeyEvent._keyEventListener,false);
-	}
-	else {
-		if(elm.captureEvents)
-			elm.captureEvents(Event.KEYPRESS|Event.KEYDOWN|Event.KEYUP);
-    		elm.onblur=elm.onfocus=elm.onkeydown=elm.onkeypress=elm.onkeyup=DynKeyEvent._keyEventListener;
-	}
-	this._hasKeyEvents=true;
-	return false;
-};
-DynElement.prototype.releaseKeyEvents=function() {
-	var elm=(this.getClassName()=='DynLayer')?this.elm:this.doc;
-	if(!elm||!this._hasKeyEvents) return true;
-	if(elm.removeEventListener) {
-		elm.removeEventListener("keydown",DynKeyEvent._keyEventListener,false);
-		elm.removeEventListener("keypress",DynKeyEvent._keyEventListener,false);
-		elm.removeEventListener("keyup",DynKeyEvent._keyEventListener,false);
-	}
-	else {
-		if(elm.releaseEvents)
-			elm.releaseEvents(Event.KEYPRESS|Event.KEYDOWN|Event.KEYUP);
-		elm.onkeydown=elm.onkeypress=elm.onkeyup=null;
-	}
-	this._hasKeyEvents=false;
-	return false;
-};
-
-DynDocument.prototype.captureHotKey = function(key,fn){
-	var klst=((key+'').toLowerCase()).split('+');
-	klst.sort();
-	key=klst.join('+');
-	if(!this._hotKeys){
-		this._hotKeys={};
-		this._keyDn={};
-		this._keyLst='';
-		this.captureKeyEvents();
-		this.addEventListener({
-			onkeydown:function(e){
-				var k = e.which;
-				var o = e.getSource();	
-				// to-do: add opera v7 key code (57xxx), e.g 57388
-				if (k==13) k="enter";
-				else if(k==27) k="esc";
-				else if(k==45) k="insert";
-				else if(k==46) k="delete";
-				else if(k==36) k="home";
-				else if(k==35) k="end";
-				else if(k==33) k="pgup";
-				else if(k==34) k="pgdn";
-				else if(k==38) k="up";
-				else if(k==40) k="down";
-				else if(k==37) k="left";
-				else if(k==39) k="right";				
-				else if(e.altKey && !o._keyDn['alt']) k="alt";
-				else if(e.ctrlKey && !o._keyDn['ctrl']) k="ctrl";
-				else if(e.shiftKey && !o._keyDn['shift']) k="shift";
-				else k=(String.fromCharCode(k)).toLowerCase();
-				if(!o._keyDn[k]) {
-					// store new key in keyDn array
-					o._keyLst+=(((o._keyLst)? '+':'')+k); // build key list
-					var ar=o._keyLst.split('+');
-					ar.sort();
-					o._keyLst=ar.join('+');
-					o._keyDn[k]=true;
-				}
-				k=o._hotKeys[o._keyLst];
-				if(k){
-					o._keyLst='';o._keyDn={};
-					if(typeof(k)=='string') return eval(k); else return k();
-				}
-			},
-			onkeyup:function(e){
-				var o=e.getSource();	
-				o._keyLst='';o._keyDn={};
-			}
-		});
-	}
-	this._hotKeys[key]=fn;
-};
-DynDocument.prototype.releaseHotKey = function(key){
-	if(this._hotKeys) delete this._hotKeys[key];
-};
-
diff --git a/phpgwapi/js/dynapi/api/ext/dynlayer.inline.js b/phpgwapi/js/dynapi/api/ext/dynlayer.inline.js
deleted file mode 100644
index af8261ce1a..0000000000
--- a/phpgwapi/js/dynapi/api/ext/dynlayer.inline.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	DynAPI Distribution
-	DynLayer Inline Extension
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynLayer
-*/
-
-var DynLayerInline = {};
-
-DynLayer.getInline = function (id, p) {
-	var elm;
-	var pobj;
-	if (!p) pobj = dynapi.document;
-	else if (p.isClass && p.isClass('DynElement')) pobj = p;
-	
-	if (pobj) {
-		if (dynapi.ua.ns4) elm = pobj.doc.layers[id];
-		else if (dynapi.ua.ie) elm = pobj.doc.all[id];
-		else if (dynapi.ua.dom) elm = pobj.doc.getElementById(id);
-	}
-	if (!elm) return alert("DynLayerInline Error: did not find element "+id);
-
-	var dlyr = new DynLayer();
-	dlyr.setID(id);
-	dlyr.parent = pobj;
-	dlyr.elm = elm;
-	if (dynapi.ua.ns4) dlyr.doc = elm.document;
-	DynLayer._importInlineValues(dlyr);
-	DynLayer._assignElement(dlyr,elm);
-	DynElement._flagCreate(dlyr);
-	return dlyr;
-};
-
-DynLayer.prototype._createInline = function (divs) {
-    if (this.parent && !this.elm) {
-		var ch=this.children;
-		DynLayer._assignElement(this,null,divs);
-		DynLayer._importInlineValues(this);
-		for (var i=0;i<ch.length;i++) DynLayer._importInlineValues(ch[i]);	
-		DynElement._flagCreate(this);
-    }
-};
-
-DynLayer._importInlineValues = function(dlyr) {
-	if(dlyr && dlyr._noInlineValues) return;
-	if (dynapi.ua.def) {
-		if (dynapi.ua.ie) {
-			var css = dlyr.elm.currentStyle;
-			dlyr.x = parseInt(css.left);
-			dlyr.y = parseInt(css.top);
-			dlyr.w = dynapi.ua.ie4? css.pixelWidth : dlyr.elm.offsetWidth;
-			dlyr.h = dynapi.ua.ie4? css.pixelHeight : dlyr.elm.offsetHeight;
-			dlyr.bgImage = css.backgroundImage;
-			dlyr.bgColor = css.backgroundColor;
-			dlyr.html = dlyr.elm.innerHTML;
-		}	
-		else if (dynapi.ua.dom) {
-			var css = dlyr.elm.style;
-			dlyr.x = parseInt(dlyr.elm.offsetLeft);
-			dlyr.y = parseInt(dlyr.elm.offsetTop);
-			dlyr.w=  dlyr.elm.offsetWidth;
-			dlyr.h= dlyr.elm.offsetHeight;
-			dlyr.bgImage = css.backgroundImage;
-			dlyr.bgColor = css.backgroundColor;
-			dlyr.html = dlyr.elm.innerHTML;
-		}
-
-	}
-	else if (dynapi.ua.ns4) {
-		var css = dlyr.elm;
-		dlyr.x = parseInt(css.left);
-		dlyr.y = parseInt(css.top);
-		dlyr.w = css.clip.width;
-		dlyr.h = css.clip.height;
-		dlyr.clip = [css.clip.top,css.clip.right,css.clip.bottom,css.clip.left];
-		dlyr.bgColor = dlyr.doc.bgColor!=''? dlyr.doc.bgColor : null;
-		dlyr.bgImage = css.background.src!=''? css.background.src : null;
-		dlyr.html = '';
-	}
-	dlyr.z = css.zIndex;
-	var b = css.visibility;
-	dlyr.visible = (b=="inherit" || b=="show" || b=="visible" || b=="");
-};
-
-// Generate Blueprint
-DynElement.prototype.getBlueprint = function(type) {
-	var i,c,ht,str =[];
-	var f,ch=this.children;
-	for(i=0;i<ch.length;i++) {
-		c = ch[i];
-		DynElement._flagPreCreate(c);
-		ht=c.getOuterHTML();
-		if(!type || type=='css') str[i]=ht;
-		else {
-			ht=ht.replace(/\'/g,'\\\'');
-			ht=ht.replace(/\r/g,'\\r');
-			ht=ht.replace(/\n/g,'\\n');
-			str[str.length]='_bw(\''+ht+'\');';
-		}
-	}
-	if(!type || type=='css') str=str.join('');
-	else str=str.join('\n');
-	if(type=='css') {	// generate style sheet from blueprints
-		var ar=str.split('<div');
-		for(i=0;i<ar.length;i++){
-			ar[i]=ar[i].replace(/(.+)id="(.+)" style="(.+)"(.+)/g,'#$2 {$3}');
-		}
-		str=ar.join('');
-	}
-	return str;
-};
-DynElement.prototype.generateBlueprint = function(type) {
-	var url=dynapi.library.path+'ext/blueprint.html';
-	var win=window.open(url,'blueprint','width=500,height=350,scrollbars=no,status=no,toolbar=no');
-	var f=win.document.forms['frm'];
-	f.txtout.value=this.getBlueprint(type);
-};
-
-// Blueprint Document write
-_bw = function(str){
-	document.write(str);
-};
\ No newline at end of file
diff --git a/phpgwapi/js/dynapi/api/mouse_dom.js b/phpgwapi/js/dynapi/api/mouse_dom.js
deleted file mode 100644
index 3023f65345..0000000000
--- a/phpgwapi/js/dynapi/api/mouse_dom.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-	DynAPI Distribution
-	MouseEvent Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynDocument
-*/
-
-function MouseEvent(dyndoc) {
-	this.DynEvent = DynEvent;
-	this.DynEvent();
-	this.bubble = true;
-	this._mouseEvent = null;
-	this._relative = null;
-	this._dyndoc = dyndoc;
-};
-var p = dynapi.setPrototype('MouseEvent','DynEvent');
-p.getX = function() {return this.x};
-p.getY = function() {return this.y};
-p.getPageX = function() {return this.pageX};
-p.getPageY = function() {return this.pageY};
-//p.trapMouseUp = dynapi.functions.Null;
-p.getRelative = function() {return this._relative};
-p.preventBubble = function() {
-	this.bubble = false;
-};
-p.getButton = function() {
-	if (!this._mouseEvent) return "left";
-	var b = this._mouseEvent.which;
-	if (b==2) return "middle";
-	if (b==3) return "right";
-	else return "left";
-};
-p._init = function(type,e,src) {
-	this.type = type;
-	this._mouseEvent = e;
-	this.origin = src;
-	this.bubbleChild = null;
-	this.defaultValue = true;
-	this.bubble = true;
-};
-p._invoke = function() {
-	var o = this.origin;
-	o.invokeEvent(this.type,this);
-};
-MouseEvent._getContainerLayerOf = function(element) {
-	try{
-		if (!element) return null;
-		while (!element._dynobj && element.parentNode && element.parentNode!=element) {
-			element = element.parentNode;
-		}
-		return element._dynobj;
-	}
-	catch(e)
-	{
-		//FIXME: For some wierd reason, a InputElement is parent of a DIV
-		// and then it falls here. For now, the error is ignored
-	}
-};
-MouseEvent._eventHandler = function(e) {
-	var dynobj = this._dynobj;
-	if (!dynobj) return true;
-	var dyndoc = dynobj._dyndoc;
-	var target = e.target;
-
-	var me = dyndoc._mouseEvent;
-	var src = MouseEvent._getContainerLayerOf(target);
-	me._init(e.type,e,src);
-	var rel = e.relatedTarget;
-	var r = me._relative = MouseEvent._getContainerLayerOf(rel);
-	if (e.type=="mouseout" || e.type=="mouseover") {
-		if(!r && dynapi.ua.opera) return; //fix for #15
-		if (r && (r==src||src.isParentOf(r))) return; // fix for #15
-		if (r && (r==src.parent||r.isChildOf(src.parent))) me.bubble=false;
-	}
-	me.pageX = e.clientX;
-	me.pageY = e.clientY;
-	if(!src) return;
-	me.x = (me.pageX+(window.pageXOffset||0)) - src.getPageX(); //offsetX;
-	me.y = (me.pageY+(window.pageYOffset||0)) - src.getPageY(); //offsetY;
-	
-	// NOTE: This is done because in Mozilla, when adding event listeners
-	// to document element, 'title' properties doesn't work anymore...
-	// raphaelpereira@users.sourceforge.net
-	if (src.getClassName() != 'DynDocument') e.cancelBubble = true;
-
-	me._invoke();
-
-	var tn=(target.tagName+'').toLowerCase();
-	
-	// fix for form elements inside drag-enabled layer #08
-	if(e.type=='mousedown' && tn=='input'||tn=='textarea'||tn=='button') {
-		var de=dynapi.frame.DragEvent;
-		de=(de && de.dragevent)? de.dragevent:null;
-		if(de && de.isDragging) de.cancelDrag();
-	}
-
-	// prevent image dragging
-	if(tn=='img' && typeof(target.onmousedown)!="function") {
-		target.onmousedown=dynapi.functions.False;
-	}
-	
-	// disable text select
-	if (e.type=='mousedown' && src._textSelectable==false) {
-		e.preventDefault();
-		return false;
-	}
-	
-};
-
-DynElement.prototype.disableContextMenu = function(){
-	this._noContextMenu = true;
-	if(this.elm) this.elm.addEventListener("contextmenu",MouseEvent._eventHandler,false);
-};
-DynElement.prototype.captureMouseEvents = function() {
-	this._hasMouseEvents = true;
-	var elm = (this.getClassName()=='DynDocument')? this.doc : this.elm;
-
-	if(elm) {
-		elm.addEventListener("mousemove",MouseEvent._eventHandler,false);
-		elm.addEventListener("mousedown",MouseEvent._eventHandler,false);
-		elm.addEventListener("mouseup",MouseEvent._eventHandler,false);
-		elm.addEventListener("mouseover",MouseEvent._eventHandler,false);
-		elm.addEventListener("mouseout",MouseEvent._eventHandler,false);
-		elm.addEventListener("click",MouseEvent._eventHandler,false);
-		elm.addEventListener("dblclick",MouseEvent._eventHandler,false);
-		if(this._noContextMenu) elm.addEventListener("contextmenu",MouseEvent._eventHandler,false);
-	}
-};
-DynElement.prototype.releaseMouseEvents=function() {
-	this._hasMouseEvents = false;
-	var elm = (this.getClassName()=='DynDocument')? this.doc : this.elm;
-	if (typeof(elm)=='object') {
-	/*	elm.removeEventListener("mousemove",MouseEvent._eventHandler,false);
-		elm.removeEventListener("mousedown",MouseEvent._eventHandler,false);
-		elm.removeEventListener("mouseup",MouseEvent._eventHandler,false);
-		elm.removeEventListener("mouseover",MouseEvent._eventHandler,false);
-		elm.removeEventListener("mouseout",MouseEvent._eventHandler,false);
-		elm.removeEventListener("click",MouseEvent._eventHandler,false);
-		elm.removeEventListener("dblclick",MouseEvent._eventHandler,false);*/
-	}
-};
-
-function main_mouse_dom() { 
-	dynapi.document._mouseEvent = new MouseEvent(dynapi.document);
-};
-if (!dynapi.loaded) main_mouse_dom();
diff --git a/phpgwapi/js/dynapi/api/mouse_ie.js b/phpgwapi/js/dynapi/api/mouse_ie.js
deleted file mode 100644
index a738a3a611..0000000000
--- a/phpgwapi/js/dynapi/api/mouse_ie.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	DynAPI Distribution
-	MouseEvent Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynDocument
-*/
-
-function MouseEvent(dyndoc) {
-	this.DynEvent = DynEvent;
-	this.DynEvent();
-	this.bubble = true;
-	this._mouseEvent = null;
-	this._relative = null;
-	this._dyndoc = dyndoc;
-};
-var p = dynapi.setPrototype('MouseEvent','DynEvent');
-p.getX = function() {return this.x};
-p.getY = function() {return this.y};
-p.getPageX = function() {return this.pageX};
-p.getPageY = function() {return this.pageY};
-p.getRelative = function() {return this._relative};
-p.preventBubble = function() {this.bubble = false;};
-p.getButton = function() {
-	if (!this._mouseEvent) return "left";
-	var b = this._mouseEvent.button;
-	if (b==4) return "middle";
-	if (b==2) return "right";
-	else return "left";
-};
-p._init = function(type,e,src) {
-	this.type = type;
-	this._mouseEvent = e;
-	this.origin = src;
-	this.bubbleChild = null;
-	this.defaultValue = true;
-	this.bubble = true;
-};
-p._invoke = function() {
-	var o = this.origin;
-	o.invokeEvent(this.type,this);
-};
-
-MouseEvent._getContainerLayerOf = function(element) {
-	if (!element) return null;
-	while (!element._dynobj && element.parentElement && element.parentElement!=element) {
-		element = element.parentElement;
-	}
-	return element._dynobj;
-};
-//MouseEvent.trapMouseUp = dynapi.functions.False; // or MouseEvent.trapMouseUp=null
-
-MouseEvent._eventHandler = function() {
-	var e = dynapi.frame.event;
-	var dynobj;
-	if (this._dynobj) dynobj = this._dynobj;
-	else if (e.srcElement._dynobj) dynobj = e.srcElement._dynobj;
-	else dynobj = dynapi.document;
-	
-	var dyndoc = dynobj._dyndoc;
-	var target = e.srcElement;
-
-	var me = dyndoc._mouseEvent;
-	var src = MouseEvent._getContainerLayerOf(target);
-	me._init(e.type,e,src);
-
-	var rel = e.type=="mouseout"? e.toElement : e.fromElement;
-	var r = me._relative = MouseEvent._getContainerLayerOf(rel);
-	if (e.type=="mouseout" || e.type=="mouseover") {
-		if (r && src && (r==src||src.isParentOf(r))) return; //fix for #15 (ie only)
-		if (r && src && (r==src.parent||r.isChildOf(src.parent))) me.bubble=false;
-	}
-	me.pageX = e.clientX;
-	me.pageY = e.clientY;
-	if(!src) return;
-	me.x = (me.pageX + (document.body.scrollLeft||0)) - src.getPageX(); //offsetX;
-	me.y = (me.pageY + (document.body.scrollTop||0)) - src.getPageY(); //offsetY;
-	e.cancelBubble = true;
-	me._invoke();
-
-	var tt=target.type;
-	var tn=(target.tagName+'').toLowerCase();
-	
-	// fix for form elements inside drag-enabled layer #08
-	if(tt=='textarea'||tt=='text' && target.onselectstart==null) target.onselectstart = dynapi.functions.Allow;
-	if(e.type=='mousedown' && tn=='input'||tn=='textarea'||tn=='button') {
-		var de=dynapi.frame.DragEvent;
-		de=(de && de.dragevent)? de.dragevent:null;
-		if(de && de.isDragging) de.cancelDrag();
-	}
-	
-	// prevent image dragging
-	if(target.tagName=='IMG' && typeof(target.ondragstart)!="function") {
-		target.ondragstart=dynapi.functions.False;
-	}
-	
-};
-
-DynElement.prototype.disableContextMenu = function(){
-	this._noContextMenu = true;
-	if(this.elm) this.elm.oncontextmenu = dynapi.functions.False;
-};
-DynElement.prototype.captureMouseEvents = function() {
-	this._hasMouseEvents = true;
-	if (this.elm) {
-		var elm = (this.getClassName()=='DynDocument')? this.doc : this.elm;
-		elm.onmouseover = elm.onmouseout = elm.onmousedown = elm.onmouseup = elm.onclick = elm.ondblclick = elm.onmousemove = MouseEvent._eventHandler;
-		if(this._noContextMenu) elm.oncontextmenu = dynapi.functions.False;
-	}
-};
-DynElement.prototype.releaseMouseEvents = function() {
-	this._hasMouseEvents = false;
-	if (this.elm) {
-		var elm = (this.getClassName()=='DynDocument')? this.doc : this.elm;
-		elm.onmousedown = elm.onmouseup = elm.onclick = elm.ondblclick = null;
-		elm.oncontextmenu = null;
-	}
-};
-
-function main_mouse_ie() { 
-	dynapi.document._mouseEvent = new MouseEvent(dynapi.document); 
-};
-if (!dynapi.loaded) main_mouse_ie();
diff --git a/phpgwapi/js/dynapi/api/mouse_ns4.js b/phpgwapi/js/dynapi/api/mouse_ns4.js
deleted file mode 100644
index 510182aa83..0000000000
--- a/phpgwapi/js/dynapi/api/mouse_ns4.js
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-	DynAPI Distribution
-	MouseEvent Class
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: dynapi.api.DynDocument
-*/
-function MouseEvent(dyndoc) {
-	this.DynEvent = DynEvent;
-	this.DynEvent();
-	this.bubble = true;
-	this._browserEvent = null;
-	this._relative = null;
-	this._dyndoc = dyndoc;
-};
-var p = dynapi.setPrototype('MouseEvent','DynEvent');
-p.getX = function() {return this.x};
-p.getY = function() {return this.y};
-p.getPageX = function() {return this.pageX};
-p.getPageY = function() {return this.pageY};
-//p.trapMouseUp = dynapi.functions.Null;
-p.getRelative = function() {return this._relative};
-p.getButton = function() {
-	if (!this._browserEvent) return "left";
-	var b = this._browserEvent.which;
-	if (b==2) return "middle";
-	if (b==3) return "right";
-	else return "left";
-};
-p._init = function(type,e,src) {
-	this.type = type;
-	this._browserEvent = e;
-	this.origin = src;
-	this.bubbleChild = null;
-	this.pageX = e.pageX-this._dyndoc.frame.pageXOffset;
-	this.pageY = e.pageY-this._dyndoc.frame.pageYOffset;
-	if (e.target._dynobj == src) {
-		this.x = e.layerX;
-		this.y = e.layerY;
-	}
-	else {
-		this.x = e.pageX - (src.pageX||0);
-		this.y = e.pageY - (src.pageY||0);
-	}
-	this.defaultValue = true;
-	this.bubble = true;
-};
-p._invoke = function() {
-	var o = this.origin;
-	o.invokeEvent(this.type,this);
-	// synthetic click event
-	if (this.type=='mouseup') {
-		this._init('click',this._browserEvent,o);
-		this._invoke();
-		
-		// synthetic dblclick event
-		if (dynapi.ua.other);
-	}
-};
-function main() {
-	dynapi.document._mouseEvent = new MouseEvent(dynapi.document);
-};
-if (!dynapi.loaded) main();
-MouseEvent._docMoveHandler = function(e) {
-	var dyndoc = this._dynobj;
-	var src = e.target;
-	var dynobj = src._dynobj || src._dynobji;
-	
-	if (!dynobj || !dynobj._hasMouseEvents) {
-		var rel=dyndoc._moveOver;
-		if(rel && dynobj && !dynobj.isChildOf(rel)) {
-			var me = dyndoc._mouseEvent;
-			me._init('mouseout',e,rel);
-			me._invoke();
-			dyndoc._moveOver = null;
-		}
-		if(dynobj){
-			dynobj=dynobj.parent;
-			while (dynobj && !dynobj._hasMouseEvents){
-				dynobj=dynobj.parent;
-			}
-		}
-		if(!dynobj) return true;
-	}
-	
-	var me = dyndoc._mouseEvent;
-	//dynapi.debug.status('move '+dynobj.name+' '+e.layerX+' '+e.layerY);
-	me._init('mousemove',e,dynobj);
-	me._invoke();
-	var defaultVal = me.defaultValue;
-	
-	// synthetic mouseover/out events
-	if (dyndoc._moveOver!=dynobj) {
-		var rel = dyndoc._moveOver;
-		//var bubble = true;
-		// mouse out
-		if (rel && !dynobj.isChildOf(rel)) {  //   && !rel.isChildOf(dynobj)
-			// during mouseout e.getRelated() is which elm it is moving to
-			//bubble = !dynobj.isChildOf(rel);
-			me._init('mouseout',e,rel);
-			//prevent bubbling from child to parent for mouseout
-			if (rel.isChildOf(dynobj)) me.bubble=false; 
-			me._relative = dynobj;
-			me._invoke();
-			//MouseEvent._generateEvent('mouseout',e,me,rel,dynobj,bubble);  // out occurs before over
-		}		
-		// mouse over
-		dyndoc._moveOver = dynobj;
-		//if (rel) var bubble = !rel.isChildOf(dynobj);
-		//var bubble = !dynobj.isChildOf(rel);
-		// during mouseover e.getRelated() is which elm it is moving to
-		if(!rel || !rel.isChildOf(dynobj)){
-			me._init('mouseover',e,dynobj);
-			//prevent bubbling from child to parent for mouseover
-			if(dynobj.isChildOf(rel)) me.bubble=false;
-			me._relative = rel;
-			me._invoke();
-		}
-		//MouseEvent._generateEvent('mouseover',e,me,dynobj,rel);
-	}
-	// prevent image dragging
-	if (e.type=="mousemove" && (e.target+'')=='[object Image]') {
-		me.defaultValue = defaultVal = false;
-	}
-	
-	return defaultVal;
-};
-MouseEvent._eventHandler = function(e) {
-	var src = e.target;
-	var dynobj = this._dynobj;
-	if (!dynobj) return true;
-	
-	var dyndoc = dynobj._dyndoc;
-	var me = dyndoc._mouseEvent;
-	me._wasHandled = false;
-	var r = routeEvent(e);
-	if (!me._wasHandled) {
-		//if (src._dynobji) {  // src._dynobji == dynlayer.doc.images[x]._dynobji
-		//	me._init(e.type,e,src._dynobji);
-		//	if (e.type=='mousedown') me.defaultValue = false;
-		//	me._invoke();
-		//}
-		// else 
-		if (src._dynobj) {  // src._dynobj == dynlayer.doc._dynobj,dynlayer.doc.images[x]._dynobj,dynlayer.doc.links[x]._dynobj
-			me._init(e.type,e,src._dynobj);
-			me._invoke();
-		}
-		else {  // dynobj == dynlayer.elm._dynobj
-			me._init(e.type,e,dynobj);
-			me._invoke();
-		}
-		me._wasHandled = true;
-	}
-	dynobj = (src._dynobj)? src._dynobj:dynobj;
-	if (e.type=='mousedown'){
-		// disable text select
-		if(dynobj._textSelectable==false) {
-			// ns4 will disable hyperlinks. this is my workaround
-			me.defaultValue =(e.target.href)? null:false;
-		}
-		
-		// allow images (<input type="image">) to be clicked
-		if ((e.target+'')=='[object Image]') {
-			me.defaultValue = true;
-		}
-		
-		// allow form elements to be selected
-		var t = (e.target.type+'').toLowerCase();
-		if (t=='button'||t=='checkbox'||t=='radio') {
-			me.defaultValue=true;
-		}
-	}
-	
-	return me.defaultValue;
-};
-DynElement.prototype.disableContextMenu = function(){
-	this._noContextMenu = true;
-	// can this be done in ns?
-};
-DynElement.prototype.captureMouseEvents = function() {
-	this._hasMouseEvents = true;
-	var elm = this.elm;
-	if (elm) {
-		elm.captureEvents(Event.MOUSEDOWN | Event.MOUSEUP | Event.DBLCLICK);
-		elm.onmousedown = elm.onmouseup = elm.ondblclick = MouseEvent._eventHandler;
-		
-		if (this.getClassName()=='DynDocument') {  // move/over/out events are generated from the document
-			this.doc.captureEvents(Event.MOUSEMOVE);
-			elm.onmousemove = MouseEvent._docMoveHandler;
-		}
-		elm._dynobj = this;
-		this.doc._dynobj = this;
-		if(this._blkBoardElm) this.elm.document._dynobj = this;
-		for (var i=0;i<this.doc.images.length;i++) this.doc.images[i]._dynobj=this; // was _dynobji
-		for (var i=0;i<this.doc.links.length;i++) this.doc.links[i]._dynobj=this;
-	}
-};
-DynElement.prototype.releaseMouseEvents = function() {
-	this._hasMouseEvents = false;
-	var elm = this.elm;
-	if (elm) {
-		elm.releaseEvents(Event.MOUSEDOWN | Event.MOUSEUP | Event.DBLCLICK);
-		elm.onmousedown = elm.onmouseup = elm.ondblclick = null;
-		
-		if (this.getClassName()=='DynDocument') {
-			elm.releaseEvents(Event.MOUSEMOVE);
-			elm.onmousemove = null;
-		}
-		elm._dynobj = null;
-		this.doc._dynobj = null;
-		for (var i=0;i<this.doc.images.length;i++) this.doc.images[i]._dynobji=null;
-		for (var i=0;i<this.doc.links.length;i++) this.doc.links[i]._dynobj=null;
-	}
-};
diff --git a/phpgwapi/js/dynapi/dynapi.js b/phpgwapi/js/dynapi/dynapi.js
deleted file mode 100644
index b1025981b2..0000000000
--- a/phpgwapi/js/dynapi/dynapi.js
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-	DynAPI Distribution
-	DynObject, DynAPI Object, UserAgent, Library, Functions
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-*/
-
-function DynObject() {
-	this.id = "DynObject"+DynObject._c++;
-	DynObject.all[this.id] = this;
-};
-var p = DynObject.prototype;
-p.getClassName = function() {return this._className};
-p.getClass = function() {return dynapi.frame[this._className]};
-p.isClass = function(n) {return DynObject.isClass(this._className,n)};
-p.addMethod = function(n,fn) {this[n] = fn};
-p.removeMethod = function(n) {this[n] = null};
-p.setID = function(id,isInline,noImports) {
-	if (this.id) delete DynObject.all[this.id];
-	this.id = id;
-	this.isInline=isInline;
-	this._noInlineValues=noImports;
-	DynObject.all[this.id] = this;
-};
-p.toString = function() {return "DynObject.all."+this.id};
-DynObject.all = {};
-DynObject._c = 0;
-DynObject.isClass = function(cn,n) {
-	if (cn == n) return true;
-	else {
-		var c = dynapi.frame[cn];
-		var p = c.prototype._pClassName;
-		if (p) return DynObject.isClass(p,n);
-		else return false;
-	}
-};
-
-function _UserAgent() {
-	var b = navigator.appName;
-	var v = this.version = navigator.appVersion;
-	var ua = navigator.userAgent.toLowerCase();	
-	this.v = parseInt(v);
-	this.safari = ua.indexOf("safari")>-1;	// always check for safari & opera 
-	this.opera = ua.indexOf("opera")>-1;	// before ns or ie
-	this.ns = !this.opera && !this.safari && (b=="Netscape");
-	this.ie = !this.opera && (b=="Microsoft Internet Explorer");
-	this.gecko = ua.indexOf('gecko')>-1; // check for gecko engine
-	if (this.ns) {
-		this.ns4 = (this.v==4);
-		this.ns6 = (this.v>=5);
-		this.b = "Netscape";
-	}else if (this.ie) {
-		this.ie4 = this.ie5 = this.ie55 = this.ie6 = false;
-		if (v.indexOf('MSIE 4')>0) {this.ie4 = true; this.v = 4;}
-		else if (v.indexOf('MSIE 5')>0) {this.ie5 = true; this.v = 5;}
-		else if (v.indexOf('MSIE 5.5')>0) {this.ie55 = true; this.v = 5.5;}
-		else if (v.indexOf('MSIE 6')>0) {this.ie6 = true; this.v = 6;}
-		this.b = "MSIE";
-	}else if (this.opera) {
-		this.v=parseInt(ua.substr(ua.indexOf("opera")+6,1)); // set opera version
-		this.opera6=(this.v>=6);
-		this.opera7=(this.v>=7);
-		this.b = "Opera";
-	}else if (this.safari) {
-		this.ns6 = (this.v>=5);	// ns6 compatible correct?
-		this.b = "Safari";
-	}
-	this.dom = (document.createElement && document.appendChild && document.getElementsByTagName)? true : false;
-	this.def = (this.ie||this.dom);
-	this.win32 = ua.indexOf("win")>-1;
-	this.mac = ua.indexOf("mac")>-1;
-	this.other = (!this.win32 && !this.mac);
-	this.supported = (this.def||this.ns4||this.ns6||this.opera)? true:false;
-	this.broadband=false;
-	this._bws=new Date; // bandwidth timer start 
-
-	// Extended by Raphael Derosso Pereira
-	this.ua = this.safari ? 'safari' : this.opera ? 'opera' : this.ie ? 'ie' : this.gecko ? 'gecko' : this.ns ? 'ns' : 'unknown';
-};
-
-function DynAPIObject() {
-	this.DynObject = DynObject;
-	this.DynObject();
-
-	this.version = '3.0.0 Beta 1';
-	this.loaded = false;
-
-	this.ua = new _UserAgent();
-
-	this._loadfn = [];
-	this._unloadfn = [];
-	var f = this.frame = window;
-
-	var url = f.document.location.href;
-	url = url.substring(0,url.lastIndexOf('/')+1);
-	this.documentPath = url;
-
-	var o = this;
-
-	this.library = {};
-	this.library.setPath = function(p) {o.library.path = p};
-
-	f.onload = function() {
-		o.loaded = true;
-		if (!o.ua.supported) return alert('Unsupported Browser. Exiting.');
-		if (o.library._create) o.library._create();  // calls dynapi._onLoad() after loading necessary files
-		else setTimeout(o+'._onLoad()',1);
-	};
-	f.onunload = function() {
-		for (var i=0;i<o._unloadfn.length;i++) o._unloadfn[i]();
-		if (o.document) {
-			o.document._destroy();
-			o.document = null;
-		}
-	};
-};
-p = DynAPIObject.prototype = new DynObject;
-
-p.onLoad = function(f) {
-	if (typeof(f)=="function") {
-		if (!this.loaded) this._loadfn[this._loadfn.length] = f;
-		else f();
-	}
-};
-p._onLoad = function(f) {
-	for (var i=0;i<this._loadfn.length;i++) this._loadfn[i]();
-};
-p.onUnload = function(f) {
-	if (typeof(f)=="function") this._unloadfn[this._unloadfn.length] = f;
-};
-p.setPrototype = function(sC,sP) {
-	var c = this.frame[sC];
-	var p = this.frame[sP];
-	if ((!c || !p) && this.ua.ns4 && this.library && this.library.elm) {
-		if (!c) c = this.library.elm[sC];
-		if (!p) p = this.library.elm[sP];
-	}
-	if (!c || !p) return alert('Prototype Error');
-	c.prototype = new p();
-	c.prototype._className = sC;
-	c.prototype._pClassName = sP;
-	c.toString = function() {return '['+sC+']'};
-	return c.prototype;
-};
-
-var dynapi = new DynAPIObject();
-
-dynapi.ximages={'__xCnTer__':0}; // eXtensible Images
-p._imageGetHTML=function(){
-	t= '<img src="'+this.src+'"'
-	+((this.width)? ' width="'+this.width+'"':'')
-	+((this.height)? ' height="'+this.height+'"':'')
-	+' border="0">';
-	return t;
-};
-
-dynapi.functions = {
-	removeFromArray : function(array, index, id) {
-		// This seems to be wrong!
-		// Commented out by Raphael Derosso Pereira
-		//var which=(typeof(index)=="object")?index:array[index];
-		var which = index;
-		if (id) delete array[which.id];
-        else for (var i=0; i<array.length; i++) {
-			if (array[i]==which) {
-				if(array.splice) array.splice(i,1);
-				else {	
-					for(var x=i; x<array.length-1; x++) array[x]=array[x+1];
-         			array.length -= 1; 
-         		}
-				break;
-			}
-		}
-		return array;
-	},
-	removeFromObject : function(object, id) {
-		if(!dynapi.ua.opera) delete object[id];
-		else {
-			var o={};
-			for (var i in object) if(id!=i) o[i]=object[i];
-			object=o;
-		}
-		return object;
-	},
-	True : function() {return true},
-	False : function() {return false},
-	Null : function() {},
-	Zero : function() {return 0;},
-	Allow : function() {
-		event.cancelBubble = true;
-		return true;
-	},
-	Deny : function() {
-		event.cancelBubble = false;
-		return false;
-	},
-	getImage : function(src,w,h) {
-		img=(w!=null&&h!=null)? new Image(w,h) : new Image();
-		img.src=src;
-		img.getHTML=dynapi._imageGetHTML;
-		return img;
-	},
-	getURLArguments : function(o) {  // pass a string or frame/layer object
-		var url,l={};
-		if (typeof(o)=="string") url = o;
-		else if (dynapi.ua.ns4 && o.src) url = o.src;
-		else if (o.document) url = o.document.location.href;
-		else return l;
-		var s = url.substring(url.indexOf('?')+1);
-		var a = s.split('&');
-		for (var i=0;i<a.length;i++) {
-			var b = a[i].split('=');
-			l[b[0]] = unescape(b[1]);
-		}
-		return l;
-	},
-	getAnchorLocation : function(a,lyr){
-		var o,x=0,y=0;
-		if(lyr && !lyr.doc) lyr=null;
-		lyr=(lyr)? lyr:{doc:document,elm:document};
-		if(typeof(a)=='string') {
-			if(lyr.doc.all) a=lyr.doc.all[a];
-			else if(lyr.doc.getElementById) a=lyr.doc.getElementById(a);
-			else if(lyr.doc.layers) a=lyr.doc.anchors[a];
-		}
-		if(a) o=a;
-		else return;
-		if(lyr.doc.layers) { y+=o.y; x+=o.x;}
-		else if(lyr.doc.getElementById || lyr.doc.all){
-			while (o.offsetParent && lyr.elm!=o){
-				x+= o.offsetLeft;y+= o.offsetTop;
-				o = o.offsetParent;
-			}
-		}
-		return {x:x,y:y,anchor:a};
-	}
-};
-
-dynapi.documentArgs = dynapi.functions.getURLArguments(dynapi.frame);
-
-dynapi.debug = {};
-dynapi._debugBuffer = '';
-dPrint=function(s){var d=dynapi.debug; d.print(s)};
-dynapi.debug.print = function(s) {
-	//@IF:DEBUG[
-		if(s==null) s='';
-		dynapi._debugBuffer += s + '\n';
-	//]:DEBUG
-};
-
-// The DynAPI library system is optional, this can be removed if you want to include other scripts manually
-function DynAPILibrary() {
-	this.DynObject = DynObject;
-	this.DynObject();
-
-	// list of js files: this.scripts['../src/api/dynlayer_ie.js'] = {dep, objects, pkg, fn};
-	this.scripts = {};
-
-	// list of package names: this.packages['dynapi.api'] = dynapi.api = {_objects,_path}
-	this.packages = {};
-
-	// list of object names: this.objects['DynLayer'] = this.scripts['../src/api/dynlayer_ie.js']
-	this.objects = {};
-
-	this._c = 0;
-	this.loadList = [];
-	this.loadIndex = -1;
-	this.path = null;
-	this.busy = true;
-};
-p = dynapi.setPrototype('DynAPILibrary','DynObject');
-
-// can return a path specific to a package, eg. dynapi.library.getPath('dynapi.api') returns '/src/dynapi/api/'
-p.getPath = function(pkg) {
-	if (!pkg) pkg = 'dynapi';
-	if (this.packages[pkg]) return this.packages[pkg]._path;
-	return null;
-};
-
-// set dynapi path
-p.setPath = function(p,pkgFile) {
-	this.path = p;
-
-	// to-do: rearrange so add()'s can be done before setPath
-	//        full paths will then be determined when queued
-	//        need an extra argument on addPackage to specify whether the path is relative to this.path or not
-	// OR:    add functionality so that these package definitions can be loaded/included on the fly
-	
-	// load pkgFile or 'ext/packages.js' file
-	var s='<script type="text/javascript" language="JavaScript" src="'
-	+((pkgFile)? pkgFile:p+'ext/packages.js')+'"><\/script>';
-	document.write(s);
-};
-
-// adds package(s) to the library
-p.addPackage = function(pkg, path) {
-	var ps;
-	if (pkg.indexOf('.')) ps = pkg.split('.');
-	else ps = [pkg];
-
-	var p = dynapi.frame;
-	for (var i=0;i<ps.length;i++) {  // returns the package object (eg. dynapi.api), or creates it if non-existant
-		if (!p[ps[i]]) p[ps[i]] = {};
-		p = p[ps[i]];
-	}
-	this.packages[pkg] = p;
-	p._objects = [];
-	p._path = path;
-	return p;
-};
-
-// add object(s) to the library
-p.add = function(name, src, dep, relSource) {
-	var objects = typeof(name)=="string"? [name] : name;
-	dep = (!dep)? [] : typeof(dep)=="string"? [dep] : dep;
-
-	var s,p,pkg;
-	if (objects[0].indexOf('.')) {
-		pkg = objects[0].substring(0,objects[0].lastIndexOf('.'));
-		if (pkg && this.packages[pkg]) {
-			p = this.packages[pkg];
-			if (relSource!=false) src = p._path + src;
-		}
-	}
-	if (!this.scripts[src]) s = this.scripts[src] = {};
-	else s = this.scripts[src];
-	s.objects = [];
-	s.dep = dep;
-	s.rdep = [];
-	s.src = src;
-	s.pkg = pkg;
-	s.loaded = false;
-	s.fn = null;
-
-	var n;
-	for (var i=0;i<objects.length;i++) {
-		n = objects[i];
-		if (pkg) n = n.substring(n.lastIndexOf('.')+1);
-		this.objects[n] = s;
-		s.objects[s.objects.length] = n;
-		if (p) p._objects[p._objects.length] = n;
-	}
-
-	return s;
-};
-// adds a dependency, whenever object "n" is loaded it will load object "d" beforehand
-p.addBefore = function(n, d) {
-	var s = this.objects[n];
-	if (s && this.objects[d]) s.dep[s.dep.length] = d;
-};
-// adds a reverse dependency, whenever object "n" is loaded it will load object "r" afterword
-p.addAfter = function(n, r) {
-	var s = this.objects[n];
-	if (s && this.objects[r]) s.rdep[s.rdep.length] = r;
-};
-
-// returns a list of js source filenames to load
-p._queue = function(n, list, force) {
-	var na=[], names=[],o;
-	if (list==null) list = [];
-	if (typeof(n)=="string") na = [n];
-	else na = n;
-
-	for (var i=0;i<na.length;i++) {
-		o = na[i];
-		if (typeof(o)=="string") {
-			if (this.packages[o])
-				for (var j in this.packages[o]._objects)
-					names[names.length] = this.packages[o]._objects[j];
-			else names[names.length] = o;
-		}
-		else if (typeof(o)=="object" && o.length) {
-			list = this._queue(o, list, force);
-		}
-	}
-
-	var s;
-	for (var j=0;j<names.length;j++) {
-		s = this._queueObject(names[j], force);
-		if (s) {
-			if (s.dep)
-				for (var i=0;i<s.dep.length;i++)
-					list = this._queue(s.dep[i], list, force);
-			list[list.length] = s.src;
-			// also include reverse deps
-			if (s.rdep.length) list = this._queue(s.rdep, list, force);
-		}
-	}
-	return list;
-};
-
-// determines whether to queue the script this object is in
-p._queueObject = function(n, f) {
-	if (n.indexOf('.')) {
-		var pkg = n.substring(0,n.lastIndexOf('.'));
-		if (this.packages[pkg]) n = n.substring(n.lastIndexOf('.')+1);
-	}
-	var s = this.objects[n];
-	if (s) {
-		if (!s.queued) {
-			if (f!=true && s.loaded) dynapi.debug.print('Library Warning: '+n+' is already loaded');
-			else {
-				s.queued = true;
-				s.loaded = false;
-				return s;
-			}
-		}
-	}
-	else dynapi.debug.print('Library Error: no library map for '+n);
-	return false;
-};
-
-// writes the <script> tag for the object
-p.include = function() { 
-	var a = arguments;
-	if (a[0]==true) a=a[1]; // arguments used ONLY by packages.js
-	// buffer includes until packages(.js) are loaded
-	if (!this._pakLoaded) { 
-		if(!this._buffer) this._buffer=[];
-		this._buffer[this._buffer.length]=a;
-		return;
-	}
-	if (dynapi.loaded) this.load(a);
-	else {
-		var list = this._queue(a);
-		var src;
-		for (var i=0;i<list.length;i++) {
-			src = list[i];
-			this.scripts[src].loaded = true;
-			dynapi.frame.document.write('<script type="text/javascript" language="JavaScript" src="'+src+'"><\/script>');
-		}
-	}
-};
-p.load = p.reload = p.loadScript = p.reloadScript = function(n) {
-	dynapi.debug.print('Warning: dynapi.library load extensions not included');
-};
-dynapi.library = new DynAPILibrary();
-
-// deprecated
-var DynAPI = dynapi;
diff --git a/phpgwapi/js/dynapi/ext/blueprint.html b/phpgwapi/js/dynapi/ext/blueprint.html
deleted file mode 100644
index 005a416bfe..0000000000
--- a/phpgwapi/js/dynapi/ext/blueprint.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-<title>Blueprint Output</title>
-</head>
-<body>
-<!-- Used by the generateBluePrint() function -->
-<form method="POST" action="--WEBBOT-SELF--" name="frm">
-  <div align="center">
-    <center>
-  <table border="0">
-    <tr>
-      <td align="center"><font color="#000080" size="5"><b>DynAPI
-        Blueprint</b></font></td>
-    </tr>
-    <tr>
-      <td align="center"><textarea rows="14" name="txtout" cols="54" wrap="off">Loading... Pleas wait</textarea></td>
-    </tr>
-    <tr>
-      <td align="center"><input type="button" value="Close window" name="cmdclose" onclick="window.close()"></td>
-    </tr>
-  </table>
-    </center>
-  </div>
-</form>
-</body>
-
-</html>
diff --git a/phpgwapi/js/dynapi/ext/debug.html b/phpgwapi/js/dynapi/ext/debug.html
deleted file mode 100644
index 0aa5387cb2..0000000000
--- a/phpgwapi/js/dynapi/ext/debug.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<html>
-<title>DynAPI Debugger</title>
-<head>
-<script>
-	function handleError(msg, url, lno) {
-		if (!(dynapi && dynapi.debug)) alert(msg);
-		else dynapi.debug.error(msg, "Debugger", lno);
-	};
-
-	var dynapi
-	var dform
-	var win = this;
-	var lastCaller=window.opener;
-	var imgwatch,imgnormal,imghelp,imginspect,imgreload;
-	var imgclear,imgeval,imgnext,imgprev;
-
-	win.onload = function() {
-		// move the debug window to the right edge?
-		//dynapi.debug.win.clientWidth = 200;
-		//win.document.body.style.width = 200; //clientWidth=200
-		//alert(win.setSize)
-		//alert(win.document.body.clientWidth)
-
-		var w = dynapi.ua.mac? (dynapi.ua.ie?330:300) : 360;
-		if (dynapi.ua.ie) {
-			var f = dynapi.frame;
-			var b = f.document.body;
-			var x = Math.min(f.screenLeft+b.clientWidth+20,screen.width-w-10);
-			dynapi.debug.win.moveTo(x,f.screenTop-50);
-		}
-		else if (dynapi.ua.ns4) {
-			var f = dynapi.frame;
-			var x=f.screenX+f.outerWidth;
-			var y=f.screenY+50;
-			dynapi.debug.win.moveTo(x,y);
-		}else{
-			dynapi.debug.win.moveTo(100,100)
-		}
-
-		dform=document.forms['debugform'];
-		dynapi.debug.print();
-		dynapi.debug.setEvaluate();
-
-		window.setTimeout('window.onfocus = setFocus;',500);
-	}
-
-	function NullFn(){}; // null function
-	function setFocus(){
-		dynapi={'_imageHook':NullFn};
-		if(window.opener) dynapi = window.opener.dynapi;
-		if(dynapi && dynapi.debug) {
-			if(!dynapi.debug.win) dynapi.debug.win=win;
-			var url = dynapi.documentPath+dynapi.library.path+'ext/';
-			var f=dynapi.functions;
-			imgwatch=f.getImage(url+'images/debug_imgwatch.gif',25,22,{alias:"DebugIMGWatch",name:"DebugIMGWatch",downsrc:url+"images/debug_imgwatch_down.gif",oversrc:url+"images/debug_imgwatch_on.gif",onclick:"dynapi.functions.False(dynapi.debug.switchMode('watch'))",tooltip:"Show Watch Mode"}).getHTML();
-			imgnormal=f.getImage(url+'images/debug_imgnormal.gif',25,22,{alias:"DebugIMGNormal",name:"DebugIMGNormal",downsrc:url+"images/debug_imgnormal_down.gif",oversrc:url+"images/debug_imgnormal_on.gif",onclick:"dynapi.functions.False(dynapi.debug.switchMode('normal'))",tooltip:"Show Normal Mode"}).getHTML();
-			imginspect=f.getImage(url+'images/debug_imginspect.gif',80,22,{alias:"DebugIMGInspect",name:"DebugIMGInspect",oversrc:url+"images/debug_imginspect_on.gif",onclick:"dynapi.functions.False(dynapi.debug.inspect(dynapi.debug.win.document.debugform.inspect.value))",tooltip:"Inspect Variable/Object",hspace:1}).getHTML();
-			imgreload=f.getImage(url+'images/debug_imgreload.gif',25,22,{alias:"DebugIMGReload",name:"DebugIMGReload",oversrc:url+"images/debug_imgreload_on.gif",onclick:"dynapi.functions.False(dynapi.debug.reload(dynapi.debug.win.document.debugform.reload.value))",tooltip:"Load/Reload DynAPI Packages, HTML Pages and JavaScript (.js) files",hspace:1}).getHTML();
-			imgclear=f.getImage(url+'images/debug_imgclear.gif',46,22,{alias:"DebugIMGClear",name:"DebugIMGClear",oversrc:url+"images/debug_imgclear_on.gif",onclick:"dynapi.functions.False(dynapi.debug.reset());",tooltip:"Clear debug window",hspace:1}).getHTML();
-			imgeval=f.getImage(url+'images/debug_imgeval.gif',100,22,{alias:"DebugIMGEval",name:"DebugIMGEval",oversrc:url+"images/debug_imgeval_on.gif",onclick:"dynapi.functions.False(dynapi.debug.evaluate(dynapi.debug.win.document.debugform.eval.value));",tooltip:"Evalute JavaScript",hspace:2}).getHTML();
-			imgnext=f.getImage(url+'images/debug_imgnext.gif',25,22,{alias:"DebugIMGNext",name:"DebugIMGNext",oversrc:url+"images/debug_imgnext_on.gif",onclick:"dynapi.functions.False(dynapi.debug.getEvalHistory(1))",tooltip:"Forward",hspace:1}).getHTML();
-			imgprev=f.getImage(url+'images/debug_imgprev.gif',25,22,{alias:"DebugIMGPrev",name:"DebugIMGPrev",oversrc:url+"images/debug_imgprev_on.gif",onclick:"dynapi.functions.False(dynapi.debug.getEvalHistory(-1))",tooltip:"Backward",hspace:1}).getHTML();
-			imghelp=f.getImage(url+'images/debug_imghelp.gif',25,22,{alias:"DebugIMGHelp",name:"DebugIMGHelp",downsrc:url+"images/debug_imghelp_down.gif",oversrc:url+"images/debug_imghelp_on.gif",onclick:"dynapi.functions.False(dynapi.debug.showHelp())",tooltip:"Quick Help",hspace:1}).getHTML();
-		}
-		// if main window was closed then create a dynapi._imageHook() function
-		// this will disable image roller and clicks
-		if(!dynapi) dynapi={'_imageHook':NullFn};
-	}
-
-	// set focus to debug window
-	setFocus();
-
-	if (!dynapi.ua.ns6) self.onerror = handleError;
-
-	// write out debug style
-	if(!dynapi.ua.ns4){
-		document.write('<style type="text/css">\n'
-		+'BODY {\n'
-		+'	border-width:1px;\n'
-		+'	border-style:solid;\n'
-		+'	border-color:#000000;\n'
-		+'}\n'
-		+'.debugtextbox {\n'
-		+'	border-width:1;\n'
-		+'	border-style:solid;\n'
-		+'	border-color:#3399CC;\n'
-		+'}\n'
-		+'.textinspect{width:90px;}'
-		+'.textreload{width:130px;}'
-		+'.textprint{width:100%; height:100%;}'
-		+'.textstat{width:100%;}'
-		+'.texteval{width:100%;height:132px;}'
-		+'.cboprev{width:100%;}'
-		+'</style>');
-	}
-</script>
-</head>
-<body bgcolor="#0033CC" leftmargin="0" topmargin="0" rightmargin="0" bottommargin="0" marginwidth="0" marginheight="0" scrolling=no style="overflow:hidden">
-<!--D4D0C8-->
-<script>
-	var ua=dynapi.ua;
-	var url = dynapi.documentPath+dynapi.library.path+'ext/';
-	var str = ua.ie?"Internet Explorer":(ua.ns?"Netscape":(ua.moz?"Mozilla":ua.b));
-	var status = 'DynAPI '+dynapi.version+' ['+str+' '+dynapi.ua.v+']';
-
-	var s=0;h=[];
-	h[s++]='<form name="debugform"><div align="center"><center><font face="'+(dynapi.ua.mac?'Monaco':'Courier')+'" size="1">\n';
-	h[s++]='<table border="0" bgcolor="#EFEBDE" cellpadding="0" cellspacing="0" width="100%" height="100%">\n';
-	h[s++]='<tr><td colspan="2" bgcolor="#0033CC"><table border="0" width="100%" cellspacing="0" cellpadding="0">\n';
-	h[s++]='<tr><td width="50%" nowrap><b><font size="2" color="#FFFFFF" face="Arial"><span style="cursor:default"><img border="0" src="'+url+'images/debug_icon.gif" align="absmiddle" width="32" height="32">&nbsp;DynAPI Debugger</span></font></b></td>\n';
-	h[s++]='<td width="50%" bgcolor="#0033CC"><table border="0" width="100%"><tr><td width="100%" align="right">\n';
-	h[s++]='<font face="'+(dynapi.ua.mac?'Monaco':'Courier')+'" size="1">'+imgwatch+' '+imgnormal+' '+imghelp+'</font></td></tr>\n';
-	h[s++]='</table></td></tr></table></td></tr>\n';
-	h[s++]='<tr><td colspan="2"><table border="0" cellspacing="0"><tr><td valign="middle">\n';
-	h[s++]='<input type="text" name="inspect" size="10" class="debugtextbox textinspect"></td><td>'+imginspect+'</td><td>\n';
-	h[s++]='<input type="text" name="reload" size="15" class="debugtextbox textreload"></td><td>'+imgreload+'</td></tr></table></td></tr><tr><td align="center" colspan="2">\n';
-	h[s++]='<textarea name="print" rows="11" cols="40" class="debugtextbox textprint"  wrap="off"></textarea></td></tr>\n';
-	h[s++]='<tr><td nowrap><table border="0" cellspacing="0"><tr><td>\n';
-	h[s++]='<font face="'+(dynapi.ua.mac?'Monaco':'Courier')+'" size="1">'+imgclear+'</font></td><td>\n';
-	h[s++]='<font face="'+(dynapi.ua.mac?'Monaco':'Courier')+'" size="1">'+imgeval+'</font></td><td align="right">\n';
-	h[s++]='<font face="'+(dynapi.ua.mac?'Monaco':'Courier')+'" size="1">'+imgprev+'</font></td><td align="right">\n';
-	h[s++]='<font face="'+(dynapi.ua.mac?'Monaco':'Courier')+'" size="1">'+imgnext+'</font></td></tr></table>\n';
-	h[s++]='</td><td nowrap align="center"><font size="2" face="'+(dynapi.ua.mac?'Monaco':'Courier')+'" color="#000000">JavaScript&nbsp;</font>\n';
-	h[s++]='</td></tr><tr><td align="center" colspan="2">\n';
-	h[s++]='<textarea name="eval" rows="7" cols="40" class="debugtextbox texteval" wrap="off"></textarea></td></tr>\n';
-	h[s++]='<tr><td align="center" colspan="2">\n';
-	h[s++]='<input type="text" name="stat" size="42" '+(dynapi.ua.mac? 'style="font-family:Monaco"':'')+' value="'+status+'" class="debugtextbox textstat"></td>\n';
-	h[s++]='</tr></table></font></center></div></form>\n';
-
-	document.open();
-	document.write(h.join(''));
-	document.close();
-</script>
-
-</body>
-</html>
diff --git a/phpgwapi/js/dynapi/ext/debug.js b/phpgwapi/js/dynapi/ext/debug.js
deleted file mode 100644
index cc65c59cc1..0000000000
--- a/phpgwapi/js/dynapi/ext/debug.js
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-	DynAPI Distribution
-	Debugger
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-*/
-// Note: Debugger does not have to be a DynObject - very important for blueprinted layers
-function Debugger() {
-	this._mode='normal';
-	this.win = null;
-	this._watch={};
-	this._evalBuffer='';
-	this._buffer = dynapi._debugBuffer;
-	dynapi._debugBuffer = '';
-	// close the debug window on unload
-	this.closeOnUnLoad = false;
-	dynapi.onUnload(function() {
-		if (dynapi.debug.closeOnUnLoad) dynapi.debug.close();
-	});
-	this.open();
-}
-var p = Debugger.prototype; //dynapi.setPrototype('Debugger','DynObject');
-p.close = function() {
-	if (this.isLoaded()) {
-		this.win.close();
-		this.win = null;
-	}
-};
-// error - output a browser generated error to the debug window
-p.error = function(msg, url, lno) {
-	if (url && url.indexOf(dynapi.documentPath)==0) {
-		url = url.substring(dynapi.documentPath.length);
-	}
-	this.print('Error:'+ (lno? ' Line '+lno : '') +' ['+url+']\n       '+msg);
-};
-// evaluates an expression in the scope of the main dynapi window
-p.evaluate = function(str) {
-	dynapi.frame.eval(str);
-	this.setEvalHistory(str);
-};
-// get evaluation history
-p.getEvalHistory=function(n){
-	if(!this.isLoaded()) return;
-	var t,f=this.win.document.debugform;
-	if(n>=1) {
-		var lim=this.win.evalHistory.length-1;
-		this.win.evalIndex++;
-		if (this.win.evalIndex>lim) this.win.evalIndex=(lim<0)?0:lim;
-		t=this.win.evalHistory[this.win.evalIndex];
-		if(t)f.eval.value=t;
-	}else if(n<=0){
-		this.win.evalIndex--;
-		if(this.win.evalIndex<0) this.win.evalIndex=0;
-		t=this.win.evalHistory[this.win.evalIndex];
-		if(t)f.eval.value=t;	
-	}
-};
-// lists all known properties of an object
-p.inspect = function(obj,showFunctions) {
-	this.print('Inspecting:');
-	var v;
-	if (typeof(obj)=='string') obj=eval(obj);
-	if (typeof(obj)=='object') {
-		for (var i in obj) {
-			if (obj[i]==null) v = 'null'
-			else if (typeof(obj[i])=='undefined') v = 'null';
-			else if (typeof(obj[i])=='function') {
-				if (showFunctions==false) continue;
-				else v = '[Function]';
-			}
-			else if (typeof(obj[i])=='object' && typeof(obj[i].length)!='undefined') v = 'Array';// ['+obj[i]+']';
-			else if (typeof(obj[i])=='object') v = '[Object]';
-			else v = obj[i];
-			this.print('    '+i+' = '+v);
-		}
-	}
-	else this.print('    undefined');
-};
-p.isLoaded = function() {
-	return (this.win!=null && this.win.document && typeof(this.win.document.debugform)=="object");
-};
-// opens the debugger window
-p.open = function() {
-	var p = dynapi.library.path;
-	if (!this.isLoaded() && p) {
-		// Modified by Raphael Pereira
-		//var url = dynapi.documentPath+p+'ext/debug.html#';
-		var url = p+'ext/debug.html#';
-		var w = (dynapi.ua.def||dynapi.ua.dom)? 350:355 //dynapi.ua.mac? (dynapi.ua.ie?330:300) : 350;
-		var h = (dynapi.ua.def||dynapi.ua.dom)? 432:485 //dynapi.ua.mac? (dynapi.ua.ie?405:365) : (dynapi.ua.def||dynapi.ua.dom)? 420:476;
-		this.win = window.open(url,'debugwin','width='+w+',height='+h+',scrollbars=no,status=no,toolbar=no');  //,resizable=no
-		this.win.opener=window;
-		this.win.evalHistory=[];
-		this.win.evalIndex=0;
-		this.print();
-	/*	dynapi.frame.onerror = function(msg, url, lno) {			
-			dynapi.debug.error(msg, url, lno);
-		};
-		*/
-	}
-};
-// output text to the debug window
-p.print = function(s) {
-	if (s==null) s = '';
-	else s = s + '\n';
-	if (this.isLoaded()) {
-		this.switchMode('normal');
-		if (this._buffer != '') {  // dump buffer
-			s = this._buffer + s;
-			this._buffer = '';
-		}
-		this.win.document.debugform.print.value += s;
-		this._normalModeData = this.win.document.debugform.print.value;
-		
-		// Does mozilla has something like this?
-		if (dynapi.ua.ie) {
-			var po = this.win.document.debugform.print;
-			po.scrollTop = po.scrollHeight;
-			var range = po.createTextRange();
-			range.collapse(false);
-			range.select();
-		}
-	}
-	else this._buffer += s;
-};
-// reloads selected javascripts, packages or html pages
-p.reload=function(t){
-	if (!this.isLoaded) return;	
-	t=t+'';
-	if(t.substr(0,3).toLowerCase()=='go:') {
-		t=t.substr(3).replace(/\\/g,'/');
-		dynapi.frame.location.href=t;
-		return;
-	}
-	var i,f=t.split(';');
-	for(i=0;i<f.length;i++){
-		t=f[i];
-		if(t.indexOf('.js')<0) dynapi.library.load(t,null,true);
-		else {
-			var lib=dynapi.library;
-			if (!lib.scripts[t]) lib.loadScript(t);
-			else lib.reloadScript(t,null,true);
-		}
-	}
-	if(this.win.focus) this.win.focus();
-	else this.win.setZIndex({topmost:true});
-};
-p.reset=function(section){
-	if (!this.isLoaded) return;	
-	this._oldWatchSrc='';
-	if(!section) {
-		this.win.document.debugform.reset();
-		this._normalModeData='';
-		this.switchMode('normal');
-	}else{
-		var t=this.win.document.debugform[section];
-		if(t) t.value='';
-	}
-};
-p.status = function(str) {
-	if (this.isLoaded()) {
-		for (var i=1;i<arguments.length;i++) {
-			str += ', '+arguments[i];
-		}
-		this.win.document.debugform.stat.value = str;
-	};
-};
-// Set Mode
-p.switchMode=function(m){
-	if (!this.isLoaded) return;	
-	if(m=='watch'||(this._mode=='normal' && m!='normal')) {	
-		this._normalModeData = this.win.document.debugform.print.value;
-		this._mode='watch';
-		this._enableWatch();
-	}else if(m=='normal'||(this._mode=='watch' && m!='watch')){
-		this.win.document.debugform.print.value=(this._normalModeData)?this._normalModeData:'';
-		this._mode='normal';	
-		this._disableWatch();
-	}
-};
-// enters text to the evaluate field in the debugger widnow
-p.setEvaluate = function(str) {
-	if (!this.isLoaded()) this._evalBuffer=str;
-	else {
-		if (!str) str = '';
-		if(this._evalBuffer!='') {
-			str =this._evalBuffer+str;
-			this._evalBuffer='';
-		}
-		this.win.document.debugform.eval.value = str;
-		this.setEvalHistory(str);
-	}
-};
-// Set previous evaluation information
-p.setEvalHistory=function(s){
-	if(!this.isLoaded()) return;
-	var i,found;
-	if(s){
-		for(i=0;i<this.win.evalHistory.length;i++){
-			if(this.win.evalHistory[i]==s) {found=i;break;}
-		}
-		if(found!=null) this.win.evalHistory=dynapi.functions.removeFromArray(this.win.evalHistory,found);
-		this.win.evalHistory[this.win.evalHistory.length]=s;
-		this.win.evalIndex=this.win.evalHistory.length-1;
-	}
-};
-p.showHelp=function(){
-	var t=''
-	+'-----------------------\n'
-	+'Quick Help\n'
-	+'-----------------------\n'
-	+'1) To inspect an Object enter the name\n'
-	+'of the object in the "Inspect Variable/Object"\n'
-	+'textbox and then click on the "Inspect" button\n\n'
-	+'2) To Load/Reload a DynAPI Package,\n'
-	+'javascript or html page enter the name\n'
-	+'of the package or javascript in the reload\n'
-	+'text. For HTML pages type the prefix Go:\n'
-	+'before the page name.\n'
-	+'------------------------------------------------';
-	this.print(t);
-};
-// watch object variables;
-p.watch = function(name,value){
-	if(arguments.length>1) this._watch[name]=value;
-	else if(dynapi.frame.eval(name)) this._watch[name]='_watch object_';
-	else this._watch[name]='_watch object_';
-};
-p._disableWatch = function(){
-	this._oldWatchSrc='';
-	if(this._timerWatch) {
-		window.clearTimeout(this._timerWatch);
-		this._timerWatch=0;
-	}
-};
-p._enableWatch = function(){
-	if(this._mode!='watch') return;
-	var src,row,v;
-	src='Name\t \t \t Value\n---------------------------------------\n';
-	for(i in this._watch){
-		if(this._watch[i]=='_watch object_') v=dynapi.frame.eval(i);
-		else v=this._watch[i];
-		if(v==null) v='null';
-		if(typeof(v)=='string') v=v.replace(/\n/g,' ');
-		src+=(i+'                      ').substr(0,22)+'\t '+v+'\n';
-	}
-	if(src!=this._oldWatchSrc){
-		this.win.document.debugform.print.value=this._oldWatchSrc=src;
-	}
-	if(this._timerWatch) window.clearTimeout(this._timerWatch);
-	this._timerWatch=window.setTimeout(this+'._enableWatch()',200);
-};
-dynapi.debug = new Debugger();
-var t='------------------------------\n'
-+'Click "?" for help\n'
-+'------------------------------\n';
-dynapi.debug.print(t);
diff --git a/phpgwapi/js/dynapi/ext/functions.color.js b/phpgwapi/js/dynapi/ext/functions.color.js
deleted file mode 100644
index 15926d6336..0000000000
--- a/phpgwapi/js/dynapi/ext/functions.color.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-	DynAPI Distribution
-	dynapi.functions.Color extension	
-*/
-
-var f = dynapi.functions;
-f.Color = Color = {}; // used by dynapi.library
-
-// Color Functions ---------------------------
-
-f.DecToHex = function(val){
-	lo=val%16;
-	val-=lo;
-	lo+=48;
-	if (lo>57) lo+=7;
-	hi=val/16;
-	hi+=48;
-	if (hi>57) hi+=7;
-	return String.fromCharCode(hi,lo);
-};
-f.getColor = function(r,g,b) { 
-	return '#'+dynapi.functions.DecToHex(r)+dynapi.functions.DecToHex(g)+dynapi.functions.DecToHex(b);
-};
-f.getRandomColor = function() {
-	var s = '';
-	for (var i=0;i<3;i++) s += dynapi.functions.DecToHex(Math.floor(255*Math.random()));
-	return s;
-};
-f.createRedPal = function(pal) {
-	var r=g=b=0;
-	for (var i=0; i<256; i++){
-		pal[i]=dynapi.functions.getColor(r,g,b);
-		r+=8;
-		if (r>255) { r=255; g+=6; b+=2; }
-		if (g>255) { g=255; b+=2; }
-		if (b>255) { b=255; }
-	}
-};
-f.createGrayPal = function(pal) {
-	var r=0;
-	for (var i=0; i<256; i++){
-		pal[i]=dynapi.functions.getColor(r,r,r);
-		r+=4;
-		if (r>255) { r=255; }
-	}
-};
-f.createBluePal = function(pal){
-	var r=g=b=0;
-	for (var i=0; i<256; i++){
-		pal[i]=dynapi.functions.getColor(r,g,b);
-		b+=6;
-		if (b>255) { b=255; g+=2; }
-		if (g>255) { g=255; r+=2; }
-	}
-};
-f.createGreenPal = function(pal) {
-	var r=g=b=0;
-	for (var i=0; i<256; i++){
-		pal[i]=dynapi.functions.getColor(r,g,b);
-		g+=6;
-		if (g>255) { g=255; b+=2; }
-		if (b>255) { b=255; r+=2; }
-	}
-};
-f.fadeColor = function(from, to, percent){
-	if(!from || !to) return;
-	if(percent<0) return from;
-	else if(percent>100) to;
-	
-	if(from.substring(0,1)!='#') from='#'+from;
-	if(to.substring(0,1)!='#') to='#'+to;
-
-	from = {
-		red:parseInt(from.substring(1,3),16),
-		green:parseInt(from.substring(3,5),16),
-		blue:parseInt(from.substring(5,7),16)
-	}
-
-	to = {
-		red:parseInt(to.substring(1,3),16),
-		green:parseInt(to.substring(3,5),16),
-		blue:parseInt(to.substring(5,7),16)
-	}
-
-	var r=from.red+Math.round((percent/100)*(to.red-from.red));
-	var g=from.green+Math.round((percent/100)*(to.green-from.green));
-	var b=from.blue+Math.round((percent/100)*(to.blue-from.blue));
-
-	r = (r < 16 ? '0' : '') + r.toString(16);
-	g = (g < 16 ? '0' : '') + g.toString(16);
-	b = (b < 16 ? '0' : '') + b.toString(16);
-
-	return '#' + r + g + b;
-};
diff --git a/phpgwapi/js/dynapi/ext/functions.date.js b/phpgwapi/js/dynapi/ext/functions.date.js
deleted file mode 100644
index 7a25a4537a..0000000000
--- a/phpgwapi/js/dynapi/ext/functions.date.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-	DynAPI Distribution
-	dynapi.functions.Date extension	
-*/
-
-var f = dynapi.functions;
-f.Date = {}; // used by dynapi.library
-
-// Date Functions --------------------------------------
-
-f.dateAdd = function(interval,n,dt){
-	if(!interval||!n||!dt) return;	
-	var s=1,m=1,h=1,dd=1,i=interval;
-	if(i=='month'||i=='year'){
-		dt=new Date(dt);
-		if(i=='month') dt.setMonth(dt.getMonth()+n);
-		if(i=='year') dt.setFullYear(dt.getFullYear()+n);		
-	}else if (i=='second'||i=='minute'||i=='hour'||i=='day'){
-		dt=Date.parse(dt);
-		if(isNaN(dt)) return;
-		if(i=='second') s=n;
-		if(i=='minute'){s=60;m=n}
-		if(i=='hour'){s=60;m=60;h=n};
-		if(i=='day'){s=60;m=60;h=24;dd=n};
-		dt+=((((1000*s)*m)*h)*dd);
-		dt=new Date(dt);
-	}
-	return dt;
-};
-f.dateDiff=function(interval,dt1,dt2){
-	if(!interval||!dt1||!dt2) return;	
-	var v,s=1,m=1,h=1,dd=1,i=interval;	
-	if(i=='month'||i=='year'){
-		dt1=new Date(dt1);
-		dt2=new Date(dt2);
-		years=dt2.getFullYear()-dt1.getFullYear();
-		if (i=='year') v=years;
-		else if(i=='month') {
-			v=(dt2.getMonth()+1)-(dt1.getMonth()+1);
-			if(years!=0) v+=(years*12);			
-		}
-	}else if (i=='second'||i=='minute'||i=='hour'||i=='day'){
-		dt1=Date.parse(dt1);
-		dt2=Date.parse(dt2);
-		if(isNaN(dt1)||isNaN(dt2)) return;
-		v=dt2-dt1;
-		if(i=='second') s=1000;
-		if(i=='minute') s=60000;
-		if(i=='hour'){s=60000;m=60};
-		if(i=='day'){s=60000;m=60;h=24;};
-		v=((((v/s)/m)/h)/dd);
-	}
-	return v;
-};
-f.formatDate = function(date,format){
-	if(!date) return '';
-	var dt=new Date(date);
-	var mm=dt.getMonth();
-	var dd=dt.getDate();
-	var day=dt.getDay();
-	var yyyy=dt.getFullYear();
-	var hh=dt.getHours();
-	var nn=dt.getMinutes();
-	var ss=dt.getSeconds();
-	var ampm;
-
-	var days=['Sunday','Monday','Teusday','Wednesday','Thursday','Friday','Saturday'];
-	var months=['January','February','March','April','May','June','July','August','September','October','November','December'];
-
-	format=(format)? (format+'').toLowerCase():'dddd, mmmm dd, yyyy hh:nn:ss ampm';
-	format=format.replace('mmmm',months[mm]);
-	format=format.replace('mmm',months[mm].substr(0,3));
-	format=format.replace('mm',mm+1);
-	format=format.replace('dddd',days[day]);
-	format=format.replace('ddd',days[day].substr(0,3));
-	format=format.replace('dd',dd);
-	format=format.replace('yyyy',yyyy);
-	if(format.indexOf('ampm')>0){
-		if(hh>12) hh=hh-12;
-		if(hh<12) ampm='AM';
-		else ampm='PM';
-		format=format.replace('ampm',ampm);
-	}
-	format=format.replace('hh',hh);
-	format=format.replace('nn',nn);
-	format=format.replace('ss',ss);
-
-	return format;
-};
-f.getDayOfYear = function(dt){
-	dt = new Date(dt);
-	if(isNaN(dt)) dt = new Date();
-	var yr = new Date(dt.getFullYear(),0,1);
-	yr = yr.getTime() - (yr.getDay()-1)*(24*60*60*1000);
-	return(Math.ceil((dt.getTime() - yr)/(24*60*60*1000)));
-};
-f.isDate = function(dt,format){
-	if (!dt) return false;
-	var dd,mm,yyyy;
-	var isLeapYear,st=true,delim='/';
-	dt+='';format=(format)? format+'':'';
-	if(dt.indexOf('/')>=0) delim='/';
-	else if(dt.indexOf('-')>=0) delim='-';
-	else if(dt.indexOf(' ')>=0) delim=' ';
-	dt=dt.split(delim);
-	if(format) format=format.replace(/\W/g,'/');
-	else {
-		if (dt[0]>=1000) format='yyyy/mm/dd';
-		else if (dt[0]>=12 && dt[1]<=12) format='dd/mm/yyyy';
-		else if (dt[0]<=12 && dt[1]>=12) format='mm/dd/yyyy';
-	};
-	if(format=='yyyy/mm/dd'){yyyy=dt[0];mm=dt[1];dd=dt[2];}
-	else if(format=='mm/dd/yyyy'){mm=dt[0];dd=dt[1];yyyy=dt[2];}
-	else if(format=='dd/mm/yyyy'){dd=dt[0];mm=dt[1];yyyy=dt[2];}
-	if(isNaN(dd)||isNaN(mm)||isNaN(yyyy)) st=false;
-	else if(dd<1 || dd>31) st=false;
-	else if(yyyy>9999) st=false;
-	else if (mm < 1 || mm > 12) st=false;
-	else if((mm==4 || mm==6 || mm==9 || mm==11) && dd==31) st=false;
-	else if(mm==2) { // check for leap year and february 29th
-		isLeapYear = (yyyy % 4 == 0 && (yyyy % 100 != 0 || yyyy % 400 == 0));
-		if (dd > 29 || (dd==29 && !isLeapYear)) st=false;
-	}
-	return st;
-};
-
diff --git a/phpgwapi/js/dynapi/ext/functions.image.js b/phpgwapi/js/dynapi/ext/functions.image.js
deleted file mode 100644
index 9eece6080d..0000000000
--- a/phpgwapi/js/dynapi/ext/functions.image.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	DynAPI Distribution
-	dynapi.functions.Image extension	
-*/
-
-var f = dynapi.functions;
-f.Image = {}; // used by dynapi.library
-
-// Image Functions ---------------------------
-
-f._imgTTL = 30000; // Image Time To Load (ms)
-f.getImage = function(src,w,h,params) {
-	var img,name,p=params;
-	if(!p) name=src;
-	else name=(!p.alias)? src:p.alias;
-	img = dynapi.ximages[name];
-	if(!img || (img && img.params!=params)){ // if user enters a new set of params then create a new image object
-		img=dynapi.ximages[name] = (w!=null&&h!=null)? new Image(w,h) : new Image();
-		img.w=w||null;
-		img.h=h||null;
-		img.src=src;img.params=p;
-		img.getHTML=dynapi._imageGetHTML;
-		img.reload=dynapi._imageReload;
-		img.dtStart=new Date();
-		if(p) {
-			var f=dynapi.functions;
-			if(p.oversrc) f.getImage(p.oversrc);
-			if(p.downsrc) f.getImage(p.downsrc);
-		}
-		if(!this._imgTmr && this._imgProgFn) this._imageProgress();
-	}
-	return img;
-};
-f.getFailedImages = function(){
-	var ar=[];
-	for(i in dynapi.ximages){
-		img=dynapi.ximages[i];
-		if(img && img.failed) ar[ar.length]=img;
-	}
-	return ar;
-};
-f.captureImageProgress=function(fn){ //fn = fn(completed,failed,total);
-	this._imgProgFn=fn;
-	this._imageProgress();
-};
-f._imageProgress = function(){
-	var i,c=0,f=0,t=0;
-	var img,dtEnd = new Date;
-	var fn=this._imgProgFn;
-	for(i in dynapi.ximages){
-		img=dynapi.ximages[i];
-		if(img && img.complete!=null){
-			t++;
-			img.failed=(!img.complete && (dtEnd-img.dtStart)>this._imgTTL)? true:false;
-			if (img.complete) c++;
-			else if(img.failed) f++;
-		}
-	}
-	if(fn) fn(c,f,t);
-	if(c+f<t) this._imgTmr=window.setTimeout('dynapi.functions._imageProgress()',100);
-	else this._imgTmr=0;
-};
-f.setImageTTL = function(ms){ 
-	this._imgTTL=ms;
-};
-
-
-dynapi._imageReload = function(){
-	var t=this.src;
-	this.src='';
-	this.src=t;	
-	this.dtStart=new Date();
-	this.failed=false;
-	dynapi.functions._imageProgress();
-};
-dynapi._imageHookArray={};
-dynapi._imageHook=function(anc,id,img,act,iSrc){
-	var rt,f,tf,p=dynapi._imageHookArray[id];
- 	if(img && iSrc) img.src = iSrc;
- 	if(p) { 		
-		f=p['on'+((act!='click')?'mouse':'')+act];tf=typeof(f);
-		if(f) rt=((tf=='string')? eval(f):f(act,anc,img,iSrc));
-		if(anc && !dynapi.ua.ns4) anc.blur();
-	}
-	return (!rt)? false:rt;
-};
-dynapi._imageGetHTML=function(params){
-	var c,i,t,text,dir,xtags='';
-	var p=(params)? params:{};
-	var lparams=(this.params)? this.params:{}; // opera can't do a for(i in object) on a null variable?
-	var forbid =',width,height,alias,src,tooltip,link,text,textdir,'
-	+'oversrc,downsrc,onclick,onmouseover,onmouseout,onmouseup,onmousedown,';
-	for(i in lparams) {if(p[i]==null) p[i]=lparams[i]};
-	if(!p.name) p.name='XImage'+dynapi.ximages['__xCnTer__']++;
-	if(p.border==null) p.border=0;
-	// setup width & height
-	if(this.width && this.w==null) this.w=this.width;
-	if(this.height && this.h==null) this.h=this.height;
-	text=p['text'];	dir=p['textdir'];
-	t= '<img src="'+this.src+'"'
-	+((this.w)? ' width="'+this.w+'"':'')
-	+((this.h)? ' height="'+this.h+'"':'')
-	+((p['tooltip'])?' alt="'+p['tooltip']+'"':'');
-	c='return dynapi._imageHook(this,\''+p.name+'\','+((dynapi.ua.ns4)? '((this._dynobj)? this._dynobj.doc:document)':'document')+'.images[\'';
-	if(p.onclick) xtags=' onclick="'+c+p.name+'\'],\'click\');"';
-	if(p.onmouseover||p.oversrc) xtags+=' onmouseover="'+c+p.name+'\'],\'over\',\''+((p.oversrc)?p.oversrc:'')+'\');"';
-	if(p.onmouseout||p.oversrc) xtags+=' onmouseout="'+c+p.name+'\'],\'out\',\''+((p.oversrc)?this.src:'')+'\');"';
-	if(p.onmousedown||p.downsrc) xtags+=' onmousedown="'+c+p.name+'\'],\'down\',\''+((p.downsrc)?p.downsrc:'')+'\');"';
-	if(p.onmouseup||p.downsrc) xtags+=' onmouseup="'+c+p.name+'\'],\'up\',\''+((p.downsrc)?((p.oversrc)?p.oversrc:this.src):'')+'\');"';
-	if(!p.link && (p.onclick||p.oversrc||p.downsrc)) p.link='javascript:;';
-	if(!xtags && p.name.indexOf('XImage')==0) p.name=null; // remove name if not needed
-	for(i in p){if(forbid.indexOf(','+i+',')<0 && p[i]!=null) t+=' '+i+'="'+p[i]+'"';}	
-	t+='>';
-	if (text){
-		dir=(dir)?(dir+'').toUpperCase():'E';
-		if (dir=='N') t=text+'<br>'+t;
-		else if (dir=='S') t=t+'<br>'+text;
-		else if (dir=='E') t=t+text;
-		else if (dir=='W') t=text+t;
-	}
-	if(p.link) t='<a title="'+((p.tooltip)? p.tooltip:'')+'" href="'+p['link']+'"'+xtags+'>'+t+'</a>';
-	if(xtags && p.name) dynapi._imageHookArray[p.name]=p;
-	return t;
-};
diff --git a/phpgwapi/js/dynapi/ext/functions.math.js b/phpgwapi/js/dynapi/ext/functions.math.js
deleted file mode 100644
index a58cd9f4b8..0000000000
--- a/phpgwapi/js/dynapi/ext/functions.math.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-	DynAPI Distribution
-	dynapi.functions.Math extension	
-	
-	Math and Path functions
-*/
-
-var f = dynapi.functions;
-f.Math = {}; // used by dynapi.library
-
-// Math Functions --------------------------
-
-f.radianToDegree = function(radian) {
-	return radian*180/Math.PI;
-};
-f.degreeToRadian = function(degree) {
-	return degree*Math.PI/180;
-};
-f.sintable = function(lsin) {
-	for (var i=0; i<361; i+=1) lsin[i]=Math.sin((i/180)*Math.PI);
-};
-f.costable = function(lcos) {
-	for (var i=0; i<361; i+=1) lcos[i]=Math.cos((i/180)*Math.PI);
-};
-f.getRandomNumber = function(n) {
-	var t=new Date();
-	n=(n)? n: parseInt(Math.random()*10000);
-	return Math.round((Math.abs(Math.sin(t.getTime()))*(Math.random()*1000)))%n+1;
-};
-f.getGUID = function() { // Globally Unique ID
-	var n1,n2,n3,n4;
-	var l,r,m,c=Math.random()+'';
-	c=c.substr(c.indexOf('.')+1);
-	m=(c.length-1)/2;
-	l=c.substr(0,m); r=c.substr(m);
-	n1=this.getRandomNumber(1000);
-	n2=this.getRandomNumber(255);n3=this.getRandomNumber(255);n4=this.getRandomNumber(255);
-	n2 = (n2 < 16 ? '0' : '') + n2.toString(16);
-	n3 = (n3 < 16 ? '0' : '') + n3.toString(16);
-	n4 = (n4 < 16 ? '0' : '') + n4.toString(16);	
-	return (n1+n2+'-'+l+'-'+n3+n4+'-'+r).toUpperCase();
-};
-
-// Path Functions ------------------------
-
-// Combines separate [x1,x2],[y1,y2] arrays into a path array [x1,y1,x2,y2]
-f.interlacePaths = function (x,y) {
-	var l = Math.max(x.length,y.length);
-	var a = new Array(l*2);
-	for (var i=0; i<l; i++) {
-		a[i*2] = x[i];
-		a[i*2+1] = y[i];
-	}
-	return a;
-};
-
-// Returns correct angle in radians between 2 points
-f.getNormalizedAngle = function (x1,y1,x2,y2) {
-	var distx = Math.abs(x1-x2);
-	var disty = Math.abs(y1-y2);
-	if (distx==0 && disty==0) angle = 0;
-	else if (distx==0) angle = Math.PI/2;
-	else angle = Math.atan(disty/distx);
-	if (x1<x2) {
-		if (y1<y2) angle = Math.PI*2-angle;
-	}
-	else {
-		if (y1<y2) angle = Math.PI+angle;
-		else angle = Math.PI-angle;
-	}
-	return angle;
-};
-
-// Generates a path between 2 points in N steps
-f.generateLinePath = function(x1,y1,x2,y2,N) {
-	if (N==0) return [];
-	var dx = (x2 == x1)? 0 : (x2 - x1)/N;
-	var dy = (y2 == y1)? 0 : (y2 - y1)/N;
-	var path = new Array();
-	for (var i=0;i<=N;i++) {
-		path[i*2] = Math.round(x1 + i*dx);
-		path[i*2+1] = Math.round(y1 + i*dy);
-	}
-	return path;
-};
diff --git a/phpgwapi/js/dynapi/ext/functions.numeric.js b/phpgwapi/js/dynapi/ext/functions.numeric.js
deleted file mode 100644
index ec4948f7f6..0000000000
--- a/phpgwapi/js/dynapi/ext/functions.numeric.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-	DynAPI Distribution
-	dynapi.functions.Numeric extension	
-*/
-
-var f = dynapi.functions;
-f.Numeric = Numeric = {}; // used by dynapi.library
-
-// Numeric Function ---------------------------------
-
-f.formatNumber = function(n,format){
-	if(isNaN(n)) return;
-	var i,c,f,comma,symbol='',sign='',decimals='',integers='';
-	var fInt,fDec,nInt,nDec,len=0,cnt=0;
-	if(n<0) sign='-';
-	n+='';if(sign) n=n.replace('-','');
-	format=(format)? format+'':'#,##0.00';
-	if(format.indexOf(',')>=0) comma=',';
-	if(format.indexOf('$')>=0) symbol='$';
-	else if(format.indexOf('%')>=0)	symbol='%';
-	s=format.split('.');
-	fInt=((s[0]==''||s[0]==null||s[0]=='undefinded')? '':s[0]);
-	fInt=fInt.split('').reverse().join('');
-	fDec=(s[1]==''||s[1]==null||s[1]=='undefinded')? '':s[1];
-	s=n.split('.');
-	nInt=((s[0]==''||s[0]==null||s[0]=='undefinded')? '':s[0]);
-	nInt=nInt.split('').reverse().join('');;
-	nDec=(s[1]==''||s[1]==null||s[1]=='undefinded')? '':s[1];
-	if (nInt) len=nInt.length;
-	if (fInt.length>len) len=fInt.length;	
-	for(i=0;i<len;i++){
-		c=nInt.charAt(i);
-		f=fInt.charAt(i);
-		cnt++;
-		if (cnt==4 && comma && (c||f=='0')) integers+=comma;
-		if(f=='0' && !c) integers+='0';
-		else if(c) integers+=c;
-		if (cnt==4) cnt=1;
-	}
-	if(fDec) len=fDec.length;
-	for(i=0;i<len;i++){
-		c=nDec.charAt(i);
-		f=fDec.charAt(i);
-		if(f=='0' && !c) decimals+='0';
-		else if((f=='#' || f=='0') && c) decimals+=c;
-	}
-	f=((integers+'').split('').reverse().join(''))+((decimals)? '.'+decimals:'');
-	if(symbol=='%') f+=symbol;
-	else f=symbol+f;
-	return sign+f;
-};
-f.isFloat=function(n){
-	if(typeof(n)=='number' && (n+'').indexOf('.')>=0) return true;
-	else return false;
-};
-f.isInteger=function(n){
-	if(typeof(n)=='number' && (n+'').indexOf('.')<0) return true;
-	else return false;;
-};
-f.toInteger=function(dt){
-	var vl;
-	if(!dt) return 0;
-	if(isNaN(dt)) vl=parseInt((dt+'').replace(/\,/g,''));
-	else vl= parseInt(dt);
-	if (isNaN(vl)) vl = 0;
-	return vl;
-};
-f.toFloat=function(dt){
-	var vl;
-	if(!dt) return 0;
-	if(isNaN(dt)) vl=parseFloat((dt+'').replace(/\,/g,''));
-	else vl = parseFloat(dt);
-	if (isNaN(vl)) vl = 0;
-	return vl;
-};
-f.toBoolean = function(dt) {
-	return (dt=='true'||dt>=1)? true:false;
-};
-
-f.isNumeric = function (n)
-{
-	var nReg = new RegExp('[-][[:digit:]]');
-}
diff --git a/phpgwapi/js/dynapi/ext/functions.string.js b/phpgwapi/js/dynapi/ext/functions.string.js
deleted file mode 100644
index b95d233bf2..0000000000
--- a/phpgwapi/js/dynapi/ext/functions.string.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-	DynAPI Distribution
-	dynapi.functions.String extension	
-*/
-
-var f = dynapi.functions;
-f.String = {}; // used by dynapi.library
-
-
-// String Functions --------------------------------
-
-f.sprintf = function(t){
-	var ar = arguments;
-	var i=1,inx = t.indexOf("%s");
-	while(inx>=0){
-		t = t.substr(0, inx) + ar[i++] + t.substr(inx+2);
-		inx = t.indexOf("%s");
-	}
-	return t;
-};
-f.strRepeat = function(s,n) {
-	if(!s) return '';
-	var i,a=[];
-	for(i=1;i<=n;i++){
-		a[a.length]=s;
-	}
-	return a.join('');
-};
-f.strReverse = function(s) {
-	if(!s) return '';
-	var a=(s+'').split('');
-	a.reverse();
-	return a.join('');
-};
-f.strStuff = function(s,v,index) {
-	if(!s) return '';	
-	if (index==null) s=s+v+'';
-	else {
-		var t1=t2=s+'';
-		s=t1.substr(0,index)+v+t2.substr(index,t2.length-index);
-	}
-	return s;
-};
-f.trim = function(s,dir){
-	if(!s) return;
-	else s+=''; // make sure s is a string
-	dir=(dir)? dir:'<>';
-	if(dir=='<'||dir=='<>') s=s.replace(/^(\s+)/g,'');
-	if(dir=='>'||dir=='<>') s=s.replace(/(\s+)$/g,'');
-	return s;
-};
-f.limitString = function (s,max)
-{
-	if (!s) return s;
-	else s+='';
-
-	// Do not process HTML tags \\
-	var tag = new RegExp(/[<][^>]*[>]/g);
-	var special = new RegExp(/[&][^;]*;/g);
-	var m, count=0;
-	var tags = new Array();
-	var specials = new Array();
-
-	var r_s = s.replace(/[<][^>]*[>]/g,'\xFE').replace(/[&][^;]*;/g,'\xFF');
-	
-	while (m = tag.exec(s))
-	{
-		tags[tags.length] = m[0];
-		max++;
-	}
-
-	while (m = special.exec(s))
-	{
-		specials[specials.length] = m[0];
-		max += 2;
-	}
-
-	var i;
-	var count = 0;
-	var r_final = '';
-	for (i=0; i<r_s.length;i++)
-	{
-		if (r_s[i] == '\xFF')
-		{
-			r_final += r_s.charAt(i);
-		}
-		else if (r_s[i] == '\xFE')
-		{
-			r_final += r_s.charAt(i);
-			count++;
-		}
-		else if (count <= max)
-		{
-			r_final += r_s.charAt(i);
-			count++;
-		}
-	}
-
-	if (count > max)
-	{
-		r_final += '...';
-	}
-	
-	for (i=0; i<tags.length; i++)
-	{
-		r_final = r_final.replace(/\xFE/,tags[i]);
-	}
-
-	for (i=0; i<specials.length; i++)
-	{
-		r_final = r_final.replace(/\xFF/,specials[i]);
-	}
-
-	return r_final;
-}
diff --git a/phpgwapi/js/dynapi/ext/functions.system.js b/phpgwapi/js/dynapi/ext/functions.system.js
deleted file mode 100644
index ee39a58154..0000000000
--- a/phpgwapi/js/dynapi/ext/functions.system.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-	DynAPI Distribution
-	dynapi.functions.System extension	
-*/
-
-var f = dynapi.functions;
-f.System = System = {}; // used by dynapi.library
-
-// System Functions ---------------------------------
-
-f.coalesce=function(){
-	var a,i;
-	for(i=0;arguments.length;i++){
-		a=arguments[i];
-		if(a!=null && a!='' && a!=undefined) return a;
-	}
-}
-f.choose = function(index){
-	if(isNaN(index)) return;
-	if (arguments.length>index) return arguments[index+1];
-};
-f.cloneObject = function(src) {
-	if(!src) return;
-	var i,tar;
-	if(typeof(src)!='object') return src;
-	else {
-		if((src.constructor+'')==(Array+'')) tar=[];
-		else if((src.constructor+'')==(Date+'')) return src;
-		else tar={};
-	};
-	for(i in src) {
-		if(typeof(src[i])!='object') tar[i]=src[i];
-		else tar[i]=this.cloneObject(src[i]);
-	}
-	return tar;
-};
-f.copyObject = function(from,to,noclone) {
-	var i;
-	if (to && !noclone) to=this.cloneObject(to);
-	else if(to && noclone) to=to;
-	else {
-		if(typeof(from)=='object') {
-			if((from.constructor+'')==(Array+'')) to=[];
-			else if((from.constructor+'')==(Date+'')) return from;
-			else to={};
-		};
-	}
-	for(i in from) {
-		if(typeof(from[i])!='object') to[i]=from[i];
-		else to[i]=this.copyObject(from[i],to[i],true);
-	}
-	return to;
-};
-f.getElementById = function(id,parentLyr){
-	if (document.all) return document.all[id];
-	else if(document.getElementById) return document.getElementById(id);
-	else if(document.layers){
-		var i,nLayers,layer;
-		parentLyr = (parentLyr)? parentLyr:document;
-		nLayers = parentLyr.layers;
-		for (i=0;i<nLayers;i++){
-			layer=nLayers[i];
-			if (layer.id == id) return layer;
-			else if (layer.layers.length){
-				layer = this.getElementById(id,layer);
-				if (layer) return layer;
-			}				
-		}
-	}
-};
-f.isNull=function(value,_default){
-	if(value==null||value==''||value=='undefined') return _default;
-	else return value;
-};
-f.lookUp = function(value,array){
-	var i; if(!array) return;
-	for(i=0;i<array.length;i++){
-		if(value==array[i]) return i;
-	}
-};
-f.nullIf = function(){
-	var a,i;
-	for(i=0;arguments.length;i++){
-		a=arguments[i];
-		if(a!=null && a!='' && a!=undefined) return null;
-	}
-};
diff --git a/phpgwapi/js/dynapi/ext/images/debug_icon.gif b/phpgwapi/js/dynapi/ext/images/debug_icon.gif
deleted file mode 100644
index b503aa2260c26448a632197c477c5ecd050c151d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 267
zcmZ?wbhEHbRA5kGSoELa%uI&=XVMNFIMC40P+ndh8XC#~28usf7#SFt7<529kXi@k
z3mUub{5#iT*tAzdT8M$8?W0FzqS(zTf-UN1IWo(_rnXHm%2(umu=7~k<b@Zy%q}#Q
z9I0TFzoosRW22L;_SVEhd5Xrq+Oz)px}Q+XsF^*<Mo0Kq#lq}6CJmf^Ykn*eOAk%V
z@-%l0V`<T9bk>RI>tvZQWvXCU+B9z;X+7teA>HC~xycTKrETtWm-O;15?-~qVWpQ<
zjb>S<l(%1%da=l+@b#MNtUATw^^Hd>m((!lNH%S7-z44?cCFO6iMw;dD%%MURYW5V
PXHANl#ozD9$zTltTXkeD

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgclear.gif b/phpgwapi/js/dynapi/ext/images/debug_imgclear.gif
deleted file mode 100644
index 3c401162c943e2d650a7e7df3871ba1ba88ee00e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 489
zcmZ?wbhEHb)MF51xcZ;LJ-dJZ>FeijKWDJcmk+M@ub$8EUGARWAKyGby?uW9<mK`0
z^V7TMZ$Ev#eERbFtJiNoe0=@x?dvzM|Ni^?`_J#6zkYuG_W9?p@85rX{r%_X=g;qd
z{`~s=``5pJfB*jd^XJd+KYx7w`sL&2Pw&4ERQCA#^ZV!DzkdGw@%``LzcWw+=zt6X
z`Ne_l|A9$O1{zZRCzcddn&>z%ca?Z~2CfXt%$j|*X!$k0qa|8Z=U!~7I-9pzTi#F5
zb^Y!4KlaGk>!lfGX=XPy$+b3Swzg-8t1xr0^Gi*hGIiSY88fFS2{CZ8@Cq+lykzOJ
z<tvu)x`Zc0M6KPpDMU`*HK-$}t1}}eI=wr+H!XMH-n}uMCtI=$UF9!ayma}>)oWK|
zl$p6$8CTwaaG!~li}~U67mGDSTxH+Af4}eJhc92hy%X8GeQnZ)znd98-|RZ%A0}qV
z9v>?Bc%hSI(@r+V&s$&5SZI2fP2_RuM&%9tV$GF18X9NJo~+?-b$Q07rKj7@@i<60
iZeDhFwng!)Et!fgEPTw;G6IQCTQr23d5l;X8LR=-7uh%f

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgclear_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imgclear_on.gif
deleted file mode 100644
index 52721f6f6188f84cb18dda5c054e7285e7e65e51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 514
zcmZ?wbhEHb)MF51xcZ;r|NsBLzkm4s0f-)ce-1>KzCXP5{l=xwAawZirNf_30nxU1
zKy-N9yS*!30nz$7&mW(Ew)fJr6%(E<ns9f~wi`e+ZO-McmdkaOCyOiBMdhsv&0FM?
zvdAN44iLGd^xCAf83wlL21ZCb*os*&@EI~t3Fv^#0r|y&?Z1QP@)9kn{u4`zDoq+y
z)SF7Y90FH{X=cs7TD1I{-op(Va$M<Ke$B~Sf0gxz^tmvLuEsre=imSSUz_Y&n5U7)
zuEE;bQJCME)!m=N%EhCus4Oiqd(PZ>^A{|fBPyjLrz+O4YV{g1m+*v$s0~}ThD>n{
zYANjQ&FtUXwLj)S2`lF`^~tR<6WG&_6kP1=FDP^6x_OKH*4>+T?moD8@4+KJesx);
zm22L<6IPN{fA{4bi!1ZbU%!t0`Td`P`I+=$1#un2%>uWgJT5#CZQZ=;#3YH;T@og#
ziv$)ZcPdLIMOS$Ke$f_W6o2WK%Og|GNnX=RgiIv1oQ^naQZ!96`SP<{o$BVQrMIqV
pZaLeSt!7{oacaxT%gX~6TlG#j*uui+G9%;esUt1yoQ@0()&MG1-w6N!

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgeval.gif b/phpgwapi/js/dynapi/ext/images/debug_imgeval.gif
deleted file mode 100644
index 3d44859e3c1156c5ff854f0994fcfff2aa89d761..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 714
zcmZ?wbhEHbOkogXxcZ;LJ-dJZ>FeijKWDJcmk+M@ub$8EUGARWAKyGby?uW9<mK`0
z^V7TMZ$Ev#eERbFtJiNoe0=@x?dvzM|Ni^?`_J#6zkYuG_W9?p@85rX{r%_X|Np0*
zIg^%_W;}Cd+WGVQ4;(mf|Niyw-`~G~|NQy$`_CVrzkd1n`P2LF1GNCvzkdGw@%{h*
z|9}7febc5*PEJlNEG!Hp0>z&!j0_C&3_2ivAU`><{Xfv(WS}9{e_~0|$sDWs0gDqI
zr2^JPobCEtR2sAH?6PLv>50#@f30cTx$(8BDqs2W`^D8&^}Z{+lp33wq*|KWJ370%
zdwTo2MU@p?b*4_6Dm889%;|II&0nx^(c&cwL^NF`C7WdRWu&6?^!0UHdkwmG>}cG*
zXP?sE-G`bFAL#E8*I?#g=a)Nw;o_ysSFT>We&gn?^J+p2oGiS;kDok!_WZ@mSFhi^
zefNylr6wvqR=Osw=*REkAHOpH|5z$$xah=GN9nZO3kO`U>4^7K$#SWk=$joc())2!
z$HW^OQyTb6GXzge<CrX{8@I;dV&BGuU3HAbkv)$MJzd>i+&Q^<`T6Jb9h$jhy|!fd
z3#hYcXb3!*dwF@l;(fva4hI>^q?TmeJyj~h&E@LUA-md9XN`dLnZDT5VN0dA6+ArD
zp<SkTcX!40Acc$#J#1W2JI*Zn`hC59;~%C&H<wF%JlGVrDJE0nSm@sHe<7<*Ue7N~
zw=A*B|98f1K?hg8lJKOfiLQqZ%DTCQObJZ#ohFr=9P%^pW`nbC%-kymX@|R<Gz2~8
ztk_uj?yhX1_~e@}nA#?E<Qz0AS+o25`+J4|*!=hHseC_CO|qe2(ca(RKRiA?-+%wU
gzrTOnjn)u6cz~VV#YOQ!1B)0(D<e;e01JaP0C90x=>Px#

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgeval_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imgeval_on.gif
deleted file mode 100644
index ce7c8755e4f61421992aae04bd3bd4314f01d1ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 795
zcmZ?wbhEHbOkogXxcZ;rKL}|4{{G?j2OxU*{W%a_`u_0J_Zyc!gV5p6mkxhE1w`B4
z0ny=Y@Aj^E1w`xTJb!%t+1^XfR!n%dXu^{vns*m%y8%Sg=3K3<z1-DuxvuhLapkcX
z&2>?E>q7Gu`J^oJNLi@KHOC`mj!R0fO-h?#V4H4Wqo81fw1cgfg#-fw1D_#~AQk9<
zG=Ti#!1n)uXU0=4ss0m7icaQO%@0ssZBi(@?gm4{m7v;?Ri~de>rRh<ru}P8-Oi1#
zOBMObkKZq@uBvx6=wf5zXliU`Y-w+4?rQC6>h5jq?Vi#%b;8t^iOtg|b8z#!GA&-R
zm~qMS<x5wuS-WoihK-xnv2rxblGjyXjMCE8mF}F?r$4vxsDA&+mXjQ(&$6Ap)O-2j
zq&X9(v2pY2scFcGK6?D*>9glAUcP$$=ItXfX-y?<iOt`>|M>Z9iG)i{RQ#@(2gz=H
z2b+sIq<l6DB+klpU6--z!)qr7y?u2ncO1JYwJf>2OLp^To+pNrFM7=TQt|1r8Z+0f
zod?Wb9A<OwZt<-0yu@ev-%V?>W3h1Vg@E}=lYgCA!YRE%iCe-Y)?n(Y&{aW8!;V&M
zT^+hMesvb>>#1+9ZcN<1>a5pSMiy~Jzbm)hx39Y!A>!9kAn1Md?*4{kQ4OaB8y+&W
zRtoNzaAU*c<F<Eg=GpvYeR^n`e)hdLJFYc#q%w(IIP_H9;Nl`tE0-Gr=MG+5{kvw{
zq^DeNhP#;F1>FetJ=n6Y@$^FGJKGD)_*nlgjMZpZ&(EMS>tDj;w9BbCSQ7OmgLap{
zKNq!a%C+K2+j5O8^Dd+|T%W<sz@#wY{|OrtSGTnbdE&1q2mV#6oi1YbT`_@&iOYh)
zqs(Hf`~8|Z1~bmOU-Q&ZRAx6@s@V1{SJ>f{k9Fy!yWTS+B2IKjcV*mbWt(&(QPF?n
w0!9{-YZ;GwEuO7-+-LLc#p8Z6uLF$S!VL~CA|7fhpG*qapm2!Ak%7S)0EUBcwEzGB

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imghelp.gif b/phpgwapi/js/dynapi/ext/images/debug_imghelp.gif
deleted file mode 100644
index cdff0980ab13d26ae79ea08a0e3c93eaddaf84c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1043
zcmZ?wbhEHblw=TN_|5<ZhUXY8vpKwqC4#D*fFQfat9njU%ba8&>X}nKW$B!?Yu9dF
zyLRu^t;ddSJ$G&IxohXn?LBwz`L%1uuH8F#4}`7(dCx)U-t+fB^!z;#eFviV-$Cg6
z_y6Dj|7ZCBU*i8L7!85J6aqS+901A-4jexim~|8s7A!c}%)!s+A>eSJoljn=Ov8c6
zp^;z2T||T7<3nd&R_hKKOQXkblax#|b_5u-oSv>{eoBYo^V7o<G`#yZ%rH)6W8~y9
znBcHw#l^*L(h?pH3Qin?{)?UFYHiJ8X%bSMb;rX=`S==H2dkPHn-6fTmnq8np}8Ra
zBvWSfI-M1p*4^D*5gsM5;Xy<2s)p4;a|;q08&-5IR4ZE<@v*&0LCKqK;>R`DPbvh7
z^~|`c<KJVgU-oB*<?F+fqb&>SPB^YPvT5Pnbw_Vbe&o4RB4fI$<0G?EJ9F>)-C3cS
ho;{6OE+XRGo}HhciE3C#C`?E=^qPayfQN&@8UXj>M|uDN

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imghelp_down.gif b/phpgwapi/js/dynapi/ext/images/debug_imghelp_down.gif
deleted file mode 100644
index f55f4f32283c22f77eea3fba4b62e52a2b879df5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 950
zcmZ?wbhEHblw=TN_|5<UQ4EUN44TCZhUWx;AZm(Y@mjBzwb@Jeu040|+`V(>-ru|T
z|Nr~{K)?W{LF`d58UjN;1av?-0F)OPIA$|&sz?YdSa7hJgP+Sm;e$gnhk&xz9E*<!
z9N0ySvvM2)7Q1(`nu<wyUP|`pVwGDFVj1+<vr|)kLQ15<<I^3Qj8}Rl6hA*QTcG;W
zl1yWVW77<y#lFtCqVBO+N&dwj4v}Rc%l&7bI`T_+mB+f+t$C&|MO6c*rv_@d{@$p2
mgn>zJ*IACngHFs`3NP-S-mZV2l}&=r$HU?wLmML_gEat{vnCb*

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imghelp_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imghelp_on.gif
deleted file mode 100644
index 34c29180791e64db98516d6310c923d1355a408b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1070
zcmZ?wbhEHblw=TN_|5<Z9EJ>r=PU&*qa>VK1O!?PgL*8J=XfPA^-5kFm3^+b`dW4M
zwVsxHQ|8=Ty7l?mDbM#_d%t$h`@L)5AKUu=+}7_vbnV#pdq8yU`*R?A{{K4=egFTT
z;r}QY4S~TO0y>}^0Llvv9RC<tH53FEEI8QA!O!QQpm3m#S4u8V;{l^XW2c;r$PNj^
zN3GnfrWq#|JZw5KQN&bC<D}7HcP>`Tk_n!h4<DP&npSq<WFqqk26e*;CMz2k9bKp#
z8Q0Kx-~baxz+$htTBVJREG%+Y?ws1JeU_a?(XMC4r?g|eNs3u30t%Sf7wL4*i<P|o
z<WiH0DTi%lQS#kA`rLJEJ`{dnJ=DT4t>%;H#K6ifS26dD=^;i|Mvd%yyA;)q%u6xu
za+3~Rb9$SsqSW4wi;r$>wD(^AEqdDGBNKCEyIi7*wt6gb(SD-GX`$)5zo3!d+%qWS
z{!Y)Ylh!a8I}|T*$v<{>c4JioBcGZ`hrIv3no15{HV%~;8*C3Ta<Z_nFjxZs$c0LK

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imginspect.gif b/phpgwapi/js/dynapi/ext/images/debug_imginspect.gif
deleted file mode 100644
index e88093ca81aa2d40b9f40490b101612fa2e4fee2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 615
zcmZ?wbhEHb3}6srxcZ-gf#JV<cK`m<*U#U6&S0G{A6)NWJ)hsZ+&#ZPzIlFn`~33B
z%j4VUr+3fae)@X(^yTwcuit+7__P22*YDoGe)Ib8zrVl#{Qmjt=httafByRZ{m0ke
ze|~=c{Qmp*uYdpk{{8#s&!69a{`ma$%g4{3-hUsc2B_fm^XHH6|NsC0`}gk$4jgD`
zXaG8bY@h?u3G#~r+kb~EiySnh`cEt=I+<fNo!zY?VP({6ozAk;sj+*-^tpRvqmMrO
zJVPdK`_1dCUWWX+VXwpBaCF!2{|$|ewN0&U_2LS$uA04l{mHR9{Zpn+n?7Ua3^6rV
zY3YWEG0`pMElZa!D_gm|d11SxDhnrvfXwzCJ9q8gvv=SA1ACN37`a&aL{FYNedg@B
z^A|2&y2$5J7{7Q)VZrsg_wL6(5R+GM4PAIMwr=g}xAkk@y<7RQX=Ca8sv7O=&#Nl_
zRUBIpwYhJBX7hh8O)aKHiX3)2GG22$HZD5aEnyt=#-Zr|6EoAYP8rWlPc|{Ki3!X&
zc7Dm}>1Tr?G#)Kn<~uv`(#9Px6V=c6%y($!lC3I^vDCU-v~2Q$w%I$DKbRAzn6CFS
zNZ0pt!p&2rz7p$V4}02{H}VBJ{GN6$dAfnZs?yazHnK+ei#0k{xg@?lzAZnd{==<*
zufMA|w^c9uBxrXeqTuoIa<O~9XV^ETR!x^wk1A1M>O8-|xm(V6*Or%;S9m827(Qg^
VVt1K$VxI5rZ4;S!%~%*2tN}H|B$@yK

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imginspect_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imginspect_on.gif
deleted file mode 100644
index baccab89c66031a96cbb982179ffb6800c5aa314..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667
zcmZ?wbhEHb3}6srxcZ;r|NsBLzkm4s0f-)ce-1>KzCXP5{l=xwAawZirNf_30nxTk
z|Np-`we8*EZSVH3cm+i3=RALW{@LD3&sI!$wrIlLMceL9oOol=wj0ytT<&VQTvvIr
zxN?i5<GQH4b)k8Sd{P#9q|5;#my}+cls3b_Hr>DoX$M;|3kE(z28RC(6aXENUXWiL
z*!~~j<XEaD)qi41(a9XE=_@a~xUPs=y{4_~bZYEg7Jcp>+32IsKF^Se+kW%<tHeMX
z5ia&?S*?i=|CcqCH#V0y)z{aRHL`biH1%~%?B(KjWt=f{R&uP)toaKTE?T@~F$=qE
z+r&9B(RCeNU938jw`^|RxT>>#Q+pW~kCuv>tmv`hCr+L^edg@B^QXmR)D<<vm)^K}
z>-JJ{m%{k9>k11VJbV5k{v``5muu**&5vR?lyBSq<7?yky?;KgZ;=r75b$X|5Lx}J
zB7!+!f^MY1@i$S;$N8KiMBd7lgskjfV&xY3lK63>%87nO=Xp9SC#jyAZV<c8M6&p)
z&s2Ve6%2uoq_!WJ@6epKD1fPjD~G35OVn$@iH79?3)5yES9;a3Dr|Gs-BVk$uLQqa
zF=MvXddAsBuP-fgu72upqc~;ds_f>a>+YH)zPT5AT<qSQ^5rVJI=8j?<r)M9jk}H-
zgz0*;-V&WsQo*mSE5!QCdd<aqi5+uwi~Le%7%gVu3p(ia<5WqC`-b>xyB`{53*9y`
zmxgTIb$+4yy88Saj~8aC@y9-v_$*{>`uzODV(<BWdv|?(eN{Eb!|);VMD+)UyXEs$
LTsxQ?85pbqdGIo|

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgnext.gif b/phpgwapi/js/dynapi/ext/images/debug_imgnext.gif
deleted file mode 100644
index 6256ea32a5b73c35a7808bc14dca5b3ddff90e92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 406
zcmZ?wbhEHblw=TNxcZ;LJ-dJZ>FeijKWDJcmk+M@ub$8EUGARWAKyGby?uW9<mK`0
z^V7TMZ$Ev#eERbFtJiNoe0=@x?dvzM|Ni^?`_J#6zkYuG_W9?p@85rX{r%_X|Nk?b
zKfnL^^XvETU;qC7{rmUNpFh9<{PFqgmye%6z5hN?<>Twm@1KAF`uX$6_rHJt&OkBH
z0hs{uiv!zkhsjL_8dCiy7AFcy1<VUr;kCFc%74Y9^wUpQ?RwzPdPQ^Dxfffid@V(d
zXMRXuweXbwQpQIgZv6P)&{(f5#K6hIE8NxH)7!`E5*8RbDNtU))xW5uEU_Z0sCaHs
zimSr%6)RV*mQ`WqVrA^x+{eVq#k^%#kEV#L+<}9K4j&eoK69#w)|8XS{Z5vgnI;-}
zes*bTe8PO@g^L#7mRK<R*21NC@4ZY;WfM?&|Ka1Ok77!KY%+W<o_{>pcqE$`7_0$e
CkF+`f

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgnext_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imgnext_on.gif
deleted file mode 100644
index d5f90975242a9044116e8e8aced07e502d693d3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 421
zcmZ?wbhEHblw=TNxcZ;rKL{}V{{G?j2OxU*{W%a_`u_0J_Zyc!gV5p6mkxhE1w`B4
z0ny=Y@Aj^E1w`xTJb!%t+1^XfR!n%dXu{n^+in2Sv^kf%S}xaBo-D3h7nQdzG;fhl
z$|8@HIY8u+(rc5_W*FF}8yF$&U@K<9z-P!n4WI)u1mqV7wo?Z>kGE(^^`CgGY2qk4
zFCar}LRXYv&!U43H_CQuuB+&A(2;X(tU8;wo15cp*q^y<EAIVS)F?F3LbS1|xur==
zT2)?6Jg>J;+$Ah9bW$K2x2u1Aa#=+R8&{1+Y<y}$#gdZg85-O?-0L>1-?(|}27Unz
zIpv<deM}<CavJ-OGO@a{oH~8x?Ad}Dep6XBr(8~(dAaP`w1}IlmY0VtjjoPbS$TVY
v3>V+?%A~8W<I`QAy#BECtGcAXzyA!(Y*Q9IJkrAFGD*Xw=+WU81qN#XI7+a2

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgnormal.gif b/phpgwapi/js/dynapi/ext/images/debug_imgnormal.gif
deleted file mode 100644
index fb619b1a60b178b191bf8301c59f9c20cdc0233f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1032
zcmZ?wbhEHblw=TN_|5<ZhUXY8vpKwqC4#D*vU|L$=R~#4Nd}^xImJ_!&RM&5?bfwx
z_io*K?AX?G*Y=*fcJAEXbN8NKyLRl_y>s_K=o*ms9E9#Ye-A{@-viNiAbS5DguZ|O
z|NZ|c7!83z83H<>901A-4jgY8m^Bm>7A!c}%)!s+AmGrz&c|=dAi$Wgh@(qXv+Bl)
zM(4IBS?4Yp&mw0wZdS(?F()@IJ>9Ng-Lj=(W1266l5v7S!-4}%91hJ~vRYFd8Ch5q
z8aOs?(Y(CeZ?TiYi9%)H+2*UObWUu19J)rN_??KsC+)B~ivD6}4s2U{dwYRyh`@pa
z4M8g^7CTK%aA<5;)-aPTOfzCbdy~A7`nnT443m%Y+gsiFabb-wgP?NpQXRoJPdj9M
zibO397eC&Rd3@T@j){h^`Xu!lRNn3=^P7_5`ATnPSwl0|fo5)by*Y<k*qB*_d``$b
MY+zwzVq&lc01gH~6951J

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgnormal_down.gif b/phpgwapi/js/dynapi/ext/images/debug_imgnormal_down.gif
deleted file mode 100644
index 7260da6365f9988e731bc5cc14b5a4761ff32fb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 940
zcmZ?wbhEHblw=TN_|5<UQ4EUN44TCZhUWyLrYIJ#^=et`HDzt~(!FcXojZ5$+`0Gn
z?*0G&{yz|a2@qoxjE2B)2mu{X4glo^29AjgoGKCm3l<z~=HTbDP`Kd0%psucHOJ!O
z0S9&w<E$KqfW_`ztoB_k5<yB0lQn|pu}CH;HT3JNPwSBgPCnaVthg^`W${zrNxHs=
zQeGCVIJ3Y+@rTdKDJuf{?G>No>=H@6yx4W2)zX!lUSFFiwY=%5mD!qx_Ec57gbf=S
cn%D~-pPH*(?#S52Ed0t>gMqQJfq}sq0040$=l}o!

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgnormal_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imgnormal_on.gif
deleted file mode 100644
index aea632a8a27144802405fa81668b9a359c688691..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1054
zcmZ?wbhEHblw=TN_|5<Z9EJ>r=PU&*qa>VKG=o|UgL*8J=Qt(L@k(CmmAp16du>$q
zx#H?;)z#N}TJBAmb8qR^=S!zNUpwXb-fQpI&UwFg?fYX}-=Ew19fXd3zjo~VJs`UF
z{W%al|Nk9`zW*NuqaiRTLqG?V13-Dff#V+otB!)ef&~YgIr#ZJ6ci4$^UKLG2{0xs
z;^-39wCma7=<LWZXVvg!Lt={O1a;50D+LP`It28S56#is{H&c<-nKv>^W!4_`3z2z
z?ldSmFfsG0XvCh{q8ZH2CM3`iFnQV4RSHT1Eju<o_g@gBC|0U*rTO}Lk-$kgk`7N!
zZjNuBmlC;QF&nR};e)-|+ZW&6Ev~~7QJ`?>>fumLnFIlbjmfk16q|koY~1wpl(c=x
z2ajpmcjhzfSodefPvZ+60_Ng(Jc^Qzoz8sT7kW}y`Piw<P@%sSMTei>XK<Oc<aStk
s`()X&S9~jL4nLd5tPnB7Z||<s*TQl<0tXrr4!!4KXVDN45MZzd07K43OaK4?

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgprev.gif b/phpgwapi/js/dynapi/ext/images/debug_imgprev.gif
deleted file mode 100644
index 0a9f092235fe709e7d2bb530117a2ea589d01637..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 408
zcmZ?wbhEHblw=TNxcZ;LJ-dJZ>FeijKWDJcmk+M@ub$8EUGARWAKyGby?uW9<mK`0
z^V7TMZ$Ev#eERbFtJiNoe0=@x?dvzM|Ni^?`_J#6zkYuG_W9?p@85rX{r%_X|Nk?b
zKfnL^^XvETU;qC7{rmUNpFh9<{PFqgmye%6z5hN?<>Twm@1KAF`uX$6_rHJt&OkBH
z0hs{uiv!zUhsjL_8dCiy7AFcy1<bp!!fSDtoBxVO>8Ic3h2G0$y`s77+>0$$zLuiK
zGe3kl^XBU>WqkDE#*hCEjrGbx44f>y!d=}xy?wkcVUt8cC(A3i`WKaymQ_TR#m`Ml
zaaCBpV&$sUvMS76tc-n|`<Pg{n78ce(G+o&J8<yO;lm=+XHE{#nmXyY-^t=Lf%2k}
z=i`b?66RGhFO<KyP+Vfc{nHDV-n;)gIh9R7<>RN%Up|W|39`xXxp@BbV3SDUU}CTa
E0J?Ls8~^|S

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgprev_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imgprev_on.gif
deleted file mode 100644
index ab8290cb152ddde2d06e936b77b1bae3e9abab24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 426
zcmZ?wbhEHblw=TNxcZ;rKL{}V{{G?j2OxU*{W%a_`u_0J_Zyc!gV5p6mkxhE1w`B4
z0ny=Y@Aj^E1w`xTJb!%t+1^XfR!n%dXu{n^+in2Sv^kf%S}xaBo-D3h7nQdzG;fhl
z$|8@HIY8u+(rc5_W*FF}8yF$&U@K<9z-P!n4WI)u1mqV7w(|!%kGE(^^`CgGY2qk4
z??Q&wgf2J19;HJGH}ZBr5RvF{(2;X(tU8;wo4Z44`klFKD@r~rY80AiA==o~+|nc_
zttzi3p4Zza?h-bMHFPo?x2u0~d|5?Id^A^$#)9I+ilx!%uH4)_YuBz{zhUFLwfq7a
za>_k@`<O(O<uvvmWny(@Id%HX*|P;R{3ZuzPMwrC^K#j>z}U!3aWQj49wt{8t$b9T
zRLQ}`SCsrP`s&N+85*CG=U2{OtuCp+A>*+j!I4wS&*z1MN~g1mx}6UP6N5DXzCf$r

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgreload.gif b/phpgwapi/js/dynapi/ext/images/debug_imgreload.gif
deleted file mode 100644
index 69248fdd235787850e504bc512554401683c3f7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 444
zcmZ?wbhEHblw=TNxcZ;LJ-dJZ>FeijKWDJcmk+M@ub$8EUGARWAKyGby?uW9<mK`0
z^V7TMZ$Ev#eERbFtJiNoe0=@x?dvzM|Ni^?`_J#6zkYuG_W9?p@85rX{r%_X=g;qd
z{`~s=``5pJfB*jd^XJd+KYx7w`sL&2Pw&4ERQCA#^ZV!DzkdGw@%{h*|9}7f{lI|(
z4Gj$p6aXENUXWiL*d893)MTI`)qi4fBBNBmybJ2wOOw{F(hj>)qE)r;!TPD8yv^G3
zeuhW$makc1ar*7D8C^4ZX2`rheO69fg_(n$U#g?CtGiQ4h=G%ZS9r?QY13!$x&+P%
z(<+)HA}8<apBP-HrKKI2*c6vGZ@z|3Lwu&I{I1=5boTApBcsgB#mYG2#0(}@F6NW_
z_MH^g6mgZke&hPQqMO$jE%93zbbHI3#Y-2i2-&wLYME&4!|J*(Th}!+Zw%jD-yklr
w;mgWR>D=LV(Q-9wnOod?899`dyykcmE@~AJ<jE;;Q0a76VUtMVU}CTa0Kg`}D*ylh

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgreload_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imgreload_on.gif
deleted file mode 100644
index 46a9b856b3dacbeb0d34580bff8fa9b0a6da3042..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmZ?wbhEHblw=TNxcZ;r|NsBLzkm4s0f-)ce-1>KzCXP5{l=xwAawZirNf_30nxU1
zKy-N9yS*!30nz$7&mW(Ew)fJr6%(E<ns9f~w!0H2-dMEl#<V$?yIL;SRh}%a+~VlC
zE-G(bXx<{9ltmsXbAZStrPn5<%`mV{H!wol!B)(IfzObEVxR*u0pu44w$~0PpHI<}
z>OZ0ErQ#_#@4|Afg22*MvY}r#XvlFTe7L@9l^EasFOCm2*zSF35OoMY`nbi}utx9l
z|I+j(c1|8mWmOrG?w;Ph9#LsE1$D9V=`#w%Tmt8YiI>i0VdZl5Z(<E@5Eqw?Ok!<~
zOH2-5z@XK<A;*<#-#+gBTv|sCaUIOz*OXV8HuF5Au!_9q%p*rGu(&ecxqD}R>AgFZ
zOZ^rFJ=iffd)cB@AxG9lEsuE{zp~-y&J|p3n!D!bv3d!sIX2s-bFiH$<-az|?EjSm
mN^JboB;quTY;K&`xY)g4&}6}c2aO(+CVK=lOb}pUum%8;IlAQl

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgwatch.gif b/phpgwapi/js/dynapi/ext/images/debug_imgwatch.gif
deleted file mode 100644
index cafb82f872630ea2a5b0389132d1e491f433eb1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1052
zcmZ?wbhEHblw=TN_|5<ZhUXY8vl;&X=kO|)2&#6<?(wRg6V);&8Hjr36i-=NU0pqA
z?b@|l*RI{Wb?dQXThCqF3k2t`ojbSp+`Z@5t{uB}@7z5Qx(4Ju2cdh<-viO}_dxU=
zh~9q(q3_@SfB!!UMnhmQg@6ty2Y~W|1IIrGW*rTM1q%)~bMOm!2sk)&@GC0SF(^z-
zI?^GgS@$5|L-X-|1?RRe2NazT3TgzeiaGfy@pwOj7taKS1IcG*nmQKUP*7-WWD{xP
zlJzQC!OYCb<s;$PwDR(@fcai?9Re0z6%f&Ns_6(-a&PCiH(+omOY+^sAklK?=cQ#V
zbMhX(GSO^kzPr2P^Q*HBjt82Uy%%#$liGTyk(FtVR^BcN)#PJ}TwODKW*Rk|n&E2m
zr)pyM^>xvTX?J5jEPAn8z~6q2=cbYf2IiD!ExOgZ{)`HV`{&vgJDls6G1;;;QY`J`
o&cm)+|2;0LFmgyN@}BQk`-_#EpMyhX#s+IACN3r>78V9;0AznfVgLXD

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgwatch_down.gif b/phpgwapi/js/dynapi/ext/images/debug_imgwatch_down.gif
deleted file mode 100644
index 18624e546f1591a8b2c562db06986424b3d6e9af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 962
zcmZ?wbhEHblw=TN_|5<UQ4EUN44TCZhUXam{}+gwqFB7vt7Wa%l(pGQ_ZAlyuRV9}
z+`V(>-ru|T|Nna+_zwhN0>l^vqaiSaLqG?V13-C!fnzxXr-p>Uf&~YgIrzC86h0hi
z<`hu&nq%?tzyS^s<E$EofW_`ztoB_k5<$uh6NSBkY$}VEx=a;{-qvH8sOHmQoc`#J
zr_lkIx%SGpzDO1_HY_%cl#87psMf$F%yptgYpdqPxvUB&dRAS{I<qD;yNUIdv0BR-
zqw{5~m7?lF3-fO-`cqN-?)0{@c&>^W=8IU^xp@sHIPBQ)@Nk>7M1qCE!pAL4LINBd
G4Aua*uql85

diff --git a/phpgwapi/js/dynapi/ext/images/debug_imgwatch_on.gif b/phpgwapi/js/dynapi/ext/images/debug_imgwatch_on.gif
deleted file mode 100644
index 8341dce795ec73da1e465c621bdcc9026ac64dc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1076
zcmZ?wbhEHblw=TN_|5<Z9EJ>r=NSI~w-m69l5lF#3~Dh9>ak3o<CHwdD|x9`^4g&6
zwNcqyot(}US6{2HzSh%nZ_1Q=Q|8=Ty7l?eDbLqVdA|4B`?Yi4?_K-;*w**wwtfep
zW8beG`+g6Iu6=(FM9=?!2cqx)N5N<a45kp!0p$QtUU1;}$G~c!A+TV<!DbGAp#TMi
z1`a_*xh@8V!bgWY#GC_IE-qB)5Rh|f5Roi;a$=H#MV5v|lgsJpddY|8XdZHQoFwJV
zGl79Yg<-CZe^boL2M3zDJSJ<!t`a%K$jYj5W{PL&D-JFe?X0U7g2_iZL=^KhI0Bb2
zGh~>4bKySVcyfYV7#qXKhsq3`){Hlfo}T>fxPa`FsuvFuo!bw$vzHspvG|a{E6HTw
z;IMGj)0N@^CL9GjjeVyHxMysw2wW82m$E->$%(70UAyFR*b2_>`f~l2E&Jrw7mNoO
z=2n^hle=Ji<o;1}&tJ!)Yb*;Nt8lB!pA<_koztJ+_UCt)O8JXYW+`?B1I6Z_pI=;F
WzFnZPp@EG>_>{Xx0+7YPU=08+MMr!9

diff --git a/phpgwapi/js/dynapi/ext/library.html b/phpgwapi/js/dynapi/ext/library.html
deleted file mode 100644
index 506ec7772c..0000000000
--- a/phpgwapi/js/dynapi/ext/library.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-dynapi.library._handleLoad(this);
-</script>
\ No newline at end of file
diff --git a/phpgwapi/js/dynapi/ext/library.js b/phpgwapi/js/dynapi/ext/library.js
deleted file mode 100644
index 36217d3d40..0000000000
--- a/phpgwapi/js/dynapi/ext/library.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-	DynAPI Distribution
-	Dynamic Loading extension to dynapi.library
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-*/
-
-// begin loading the object
-DynAPILibrary.prototype.load = function(n,fn) {
-	var list = this._queue(n,null,arguments[2]);
-	//return dynapi.debug.print('going to load: '+list);
-	if (list.length) {
-		var s,src;
-		for (var i=0;i<list.length;i++) {
-			src = list[i];
-			s = this.scripts[list[i]];
-			if (i==list.length-1 && fn!=null) s.fn = fn;
-			this.loadList[this.loadList.length] = src;
-		}
-		this._load();
-	}
-	else if (fn) fn();
-};
-
-// reload the object
-DynAPILibrary.prototype.reload = function(n,fn,force) {
-	var s = this.objects[n];
-	if (s) {
-		s.loaded = false;
-		this.load(n,fn,force);
-	}
-};
-
-// load a script that is not added to the library
-DynAPILibrary.prototype.loadScript = function(src,fn) {
-	if (!this.scripts[src]) {
-		var n = 'unnamed'+this._c++;
-		s = this.add(n,src);  // generate a name for the script
-		s.unnamed = true;
-		s.fn = null;
-		s.dep = [];
-		this.load(n,fn);
-	}
-};
-
-// reload a script 
-DynAPILibrary.prototype.reloadScript = function(src,fn,force) {
-	var s=this.scripts[src];
-	if(s) this.load(s.objects[0],fn,force);
-}
-
-// inserts the script element into the page
-DynAPILibrary.prototype._load = function() {
-	if (this.busy) return; // dynapi.debug.print('Library Warning: busy');
-	else {
-		if (this.loadIndex<this.loadList.length-1) {
-			this.busy = true;
-			this.loadIndex++;
-			var src = this.loadList[this.loadIndex];
-			//if (!confirm('load: '+src+' ?')) return;
-			var rsrc = src + '?'+Math.random();     // random ensures cached files are not loaded
-			var s = this.scripts[src];
-			if (dynapi.ua.ns4) {
-				// delete the constructors
-				for (var j=0;j<s.objects.length;j++) {
-					var n = s.objects[j];
-					if (dynapi.frame[n]) {
-						dynapi.frame[n] = null;
-						if (s.pkg) dynapi.frame[s.pkg+'.'+n] = null;
-					}
-				}
-				//NS4 does not like "/" inside the ?name=value
-				src=src.replace(/\//g,'+'); //substitute "/" for "+"
-				this.elm.src = dynapi._path+'ext/library.html?js='+src;
-			}
-			else if (dynapi.ua.ie && (dynapi.ua.v==4 || dynapi.ua.mac)) {
-				dynapi.frame.document.body.insertAdjacentHTML('beforeEnd','<script type="text/javascript" language="javascript" src="'+rsrc+'" defer><\/script>');
-				this._export(src);
-			}
-			else {
-				var elm = s.elm = dynapi.frame.document.createElement('script');
-				elm.src = rsrc;
-				elm.type = 'text/javascript';
-				elm.defer = true;
-				if (dynapi.ua.ie) {
-					elm.C = 0;
-					var o = this;
-					elm.onreadystatechange = function() {
-						elm.C++;
-						if (elm.C==2 || elm.readyState=="complete") {  // use 2nd statechange for onload
-							o._export(src);
-						}
-					}
-				}
-				dynapi.frame.document.getElementsByTagName('head')[0].appendChild(elm);
-				
-				// I could not find way to know when the script is complete in Moz v0.9.3
-				if (dynapi.ua.ns6) setTimeout(this+'._export("'+src+'")',100);
-			}
-		}
-	}
-};
-
-// executed after a script is finished loading, run main() functions
-DynAPILibrary.prototype._export = function(src) {
-	var src = this.loadList[this.loadIndex];
-	var s = this.scripts[src];
-	if (s) {
-		this._register(s);
-
-		// run elm.main)() before global main()
-		if (dynapi.ua.ns4 && typeof(this.elm.main)=="function") {
-			this.elm.main();
-			this.elm.main = null;
-		}
-				
-		// run global main() if available
-		if (typeof(main)=="function") {
-			main();
-			main = null;
-		}
-
-		// clear out all functions in the layer's scope
-		if (dynapi.ua.ns4) {
-			for (var i in this.elm) {
-				if (typeof(this.elm[i])=="function") delete this.elm[i];
-			}
-		}
-		this.busy = false;
-
-		// load next file
-		this._load();
-	}
-	//else return alert('Library Error: unknown script '+src);
-};
-
-// registers the script as loaded, exports the objects
-DynAPILibrary.prototype._register = function(s) {
-	//dynapi.debug.print('loaded "'+s.src+'"');
-	s.loaded = true;
-	s.queued = false;
-	if (!s.unnamed) {
-		var n,found;
-		// loop through each object that the script contains
-		for (var i=0;i<s.objects.length;i++) {
-			found = false;
-			n = s.objects[i];
-					
-			// scope local objects in the layer to the DynAPI frame
-			if (dynapi.ua.ns4 && this.elm && typeof(this.elm[n])!="undefined") {
-				dynapi.frame[n] = this.elm[n];
-				found = true;
-			}
-			else if (typeof(dynapi.frame[n])!="undefined") found = true;
-			else if (n.indexOf('.')>0) {
-				var ns = n.split('.'), o = dynapi.frame, b = false;
-				for (var j=0;j<ns.length;j++) {
-					o = o[ns[j]];
-				}
-				if (typeof(o)!="undefined") found = true;
-			}
-			else if (typeof(dynapi[n])!="undefined") found = true;
-			
-			if (found) {
-				if (s.pkg) {
-					// make package link: dynapi.api.DynLayer = DynLayer
-					if (s.pkg!="dynapi") this.packages[s.pkg][n] = dynapi.frame[n];
-					n = s.pkg+'.'+n;
-				}
-				dynapi.debug.print('loaded ['+n+']');
-			}
-			else {
-				dynapi.debug.print('Library Error: could not find ['+n+']');
-			}
-		}
-	}
-	// run handler if available
-	if (s.fn) {
-		s.fn();
-		delete s.fn;
-	}
-};
-
-// called from /lib/dynapi/library.html to write the <script>, NS4 only
-DynAPILibrary.prototype._handleLoad = function(elm) {
-	var args = dynapi.functions.getURLArguments(elm.src);
-	var js = args["js"];
-	if (js) {
-		js=js.replace(/\+/g,'/'); // convert + to /
-		if (js.indexOf('http')!=0) {
-			var l = dynapi.frame.document.location;
-			if (js.substr(0,1)=='/') js = l.port+'//'+host+src;
-			else js = dynapi.documentPath+js;
-		}
-		elm.document.write('<script type="text/javascript" language="JavaScript" src="'+js+'?r'+Math.random()+'"><\/script>');
-		elm.document.close();
-		elm.onload = function() {
-			dynapi.library._export(js);
-		}
-	}
-};
-
-// inserts the layer for NS4, register included scripts
-DynAPILibrary.prototype._create = function() {
-	// ensure a previous main function is wiped out
-	if (typeof(main)=="function") main = null;
-		
-	// register objects from scripts included by dynapi.library.include() or manually
-	var s,n;
-	for (var i in this.scripts) {
-		s = this.scripts[i];
-		n=s.objects[0];
-		if(s.pkg=='dynapi.functions') { // used to avoid conflicts with intrinsic objects such as String, Image, Date and Math objects
-			if(dynapi.functions[n]) this._register(s);
-		}
-		else if (s.loaded || (s.objects[0] && dynapi.frame[s.objects[0]])) this._register(s);
-	}
-	
-	// create NS4 layer to load scripts into
-	if (dynapi.ua.ns4) this.elm = new Layer(0, dynapi.frame);
-	this.busy = false;
-	
-	// load any scripts before proceeding
-	if (this.loadList.length) {
-		var s = this.scripts[this.loadList[this.loadList.length-1]];
-		s.fn = function() {
-			setTimeout('dynapi._onLoad()',1);
-		}
-		this._load();
-	}
-	else setTimeout('dynapi._onLoad()',1);
-};
diff --git a/phpgwapi/js/dynapi/ext/packages.js b/phpgwapi/js/dynapi/ext/packages.js
deleted file mode 100644
index 64ade06343..0000000000
--- a/phpgwapi/js/dynapi/ext/packages.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-	DynAPI Distribution
-	Package File
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-*/
-
-var l = dynapi.library;
-var p = dynapi.library.path;
-l._pakLoaded=true;
-
-l.addPackage('dynapi',p);
-l.add('dynapi.library','ext/library.js');
-l.add('dynapi.debug','ext/debug.js','dynapi.functions.Image');
-
-// Functions
-l.addPackage('dynapi.functions',p+'ext/');
-l.add('dynapi.functions.Color','functions.color.js');
-l.add('dynapi.functions.Math','functions.math.js');
-l.add('dynapi.functions.Date','functions.date.js');
-l.add('dynapi.functions.Numeric','functions.numeric.js');
-l.add('dynapi.functions.String','functions.string.js');
-l.add('dynapi.functions.System','functions.system.js');
-if (dynapi.ua.ns4)
-	l.add('dynapi.functions.Image','functions.image.js','MouseEvent'); // ns4 required MouseEvent for Image functions
-else
-	l.add('dynapi.functions.Image','functions.image.js'); // ns4 required MouseEvent for Image functions
-
-// API - Core Events & DynDocument
-l.addPackage('dynapi.api',p+'api/');
-l.add(['dynapi.api.DynEvent','dynapi.api.EventObject','dynapi.api.DynElement'],'event.js');
-l.add('dynapi.api.DynDocument','dyndocument.js','DynEvent');
-	// DynLayer
-l.add('dynapi.api.DynLayerBase','dynlayer_base.js','DynDocument');
-if (dynapi.ua.ns4)
-	l.add('dynapi.api.DynLayer','dynlayer_ns4.js','DynLayerBase');
-else if (dynapi.ua.ie)
-	l.add('dynapi.api.DynLayer','dynlayer_ie.js','DynLayerBase');
-else if (dynapi.ua.opera)
-	l.add('dynapi.api.DynLayer','dynlayer_opera.js','DynLayerBase');
-else 
-	l.add('dynapi.api.DynLayer','dynlayer_dom.js','DynLayerBase');
-	// MouseEvent
-if (dynapi.ua.ns4)
-	l.add('dynapi.api.MouseEvent','mouse_ns4.js','DynLayer');
-else if(dynapi.ua.ie|| (dynapi.ua.opera && dynapi.ua.v < 8))
-	l.add('dynapi.api.MouseEvent','mouse_ie.js','DynLayer');
-else
-	l.add('dynapi.api.MouseEvent','mouse_dom.js','DynLayer');
-
-// Extensions
-l.addPackage('dynapi.api.ext',p+'api/ext/');
-l.add('dynapi.api.ext.DragEvent','dragevent.js','DynDocument');
-l.add(['dynapi.api.ext.DynKeyEvent','dynapi.api.ext.TabManager'],'dynkeyevent.js','DynLayer');
-l.add('dynapi.api.ext.DynLayerInline','dynlayer.inline.js','DynLayer');
-
-// FX
-/*
-l.addPackage('dynapi.fx',p+'fx/');
-l.add('dynapi.fx.Thread','thread.js','DynLayer');
-l.add('dynapi.fx.PathAnimation','pathanim.js','Thread');
-l.add('dynapi.fx.SlideAnimation','slideanim.js','Thread');
-l.add('dynapi.fx.GlideAnimation','glideanim.js',['Thread','dynapi.functions.Math']);
-l.add('dynapi.fx.CircleAnimation','circleanim.js',['Thread','dynapi.functions.Math']);
-l.add('dynapi.fx.HoverAnimation','hoveranim.js',['Thread','dynapi.functions.Math']);
-l.add('dynapi.fx.Bezier','bezier.js','Thread');
-l.add('dynapi.fx.TimerX','timerx.js','DynLayer');
-l.add('dynapi.fx.MotionX','motionx.js','DynLayer');
-l.add('dynapi.fx.SnapX','snapx.js','DynLayer');
-l.add('dynapi.fx.FlashSound','fsound.js','DynLayer');
-l.add('dynapi.fx.Fader','fader.js','DynLayer');
-l.add('dynapi.fx.Swiper','swiper.js','DynLayer');
-l.add('dynapi.fx.TextAnimation','textanim.js','DynLayer');
-*/
-
-// ThyAPI Packages
-// ThyAPI Utils
-l.addPackage('dynapi.thyutils', p+'thyutils/');
-l.add('dynapi.thyutils.thyCollection','thycollection.js');
-l.add('dynapi.thyutils.thyVisualCollection', 'thyvisualcollection.js', ['thyCollection']);
-l.add('dynapi.thyutils.thyProtocol','thyprotocol.js');
-l.add('dynapi.thyutils.thyXMLRPCProtocol','thyxmlrpcprotocol.js','thyProtocol');
-l.add('dynapi.thyutils.thyConnector','thyconnector.js', 'thyXMLRPCProtocol');
-l.add('dynapi.thyutils.thyDataSource','thydatasource.js', ['DynElement','thyConnector','thyCollection']);
-
-//ThyAPI Widgets
-l.addPackage('dynapi.thywidgets', p+'thywidgets/');
-l.add('dynapi.thywidgets.thyPanelBase', 'thypanel.js', ['DynLayer', 'System', 'DynKeyEvent', 'thyCollection']);
-if (dynapi.ua.ie) l.add('dynapi.thywidgets.thyPanel', 'thypanel_ie.js', 'thyPanelBase');
-else if (dynapi.ua.ns4) l.add('dynapi.thywidgets.thyPanel', 'thypanel_ns4.js', 'thyPanelBase');
-else if (dynapi.ua.opera) l.add('dynapi.thywidgets.thyPanel', 'thypanel_opera.js', 'thyPanelBase');
-else l.add('dynapi.thywidgets.thyPanel', 'thypanel_dom.js', 'thyPanelBase');
-
-l.add('dynapi.thywidgets.thyButton', 'thybutton.js', 'thyPanel');
-l.add('dynapi.thywidgets.thyTabsManager', 'thytabsmanager.js', 'thyPanel');
-l.add('dynapi.thywidgets.thyBorderPanel', 'thyborderpanel.js', 'thyPanel');
-l.add('dynapi.thywidgets.thyLabelPanel', 'thylabelpanel.js', 'thyPanel');
-l.add('dynapi.thywidgets.thyEditBox', 'thyeditbox.js', 'thyLabelPanel');
-l.add('dynapi.thywidgets.thyCheckBox', 'thycheckbox.js', 'thyLabelPanel');
-//l.add('dynapi.thywidgets.thyPopupCalendar', 'thypopupcalendar.js', ['thyEditBox','JSCalendarSetup','thyButton']);
-l.add('dynapi.thywidgets.thyPopupCalendar', 'thypopupcalendar.js', ['thyEditBox','thyButton']);
-l.add('dynapi.thywidgets.thyTextEdit', 'thytextedit.js', 'thyLabelPanel');
-//l.add('dynapi.thywidgets.thyRichTextEdit', 'thyrichtextedit.js', ['thyLabelPanel', 'FCKeditor']);
-l.add('dynapi.thywidgets.thyWindow', 'thywindow.js', ['thyBorderPanel','thyButton','DragEvent','dynapi.functions.String']);
-l.add('dynapi.thywidgets.thyDialogWindow', 'thydialogwindow.js', ['thyWindow','thyButton']);
-l.add('dynapi.thywidgets.thyGridCell', 'thygridcell.js', ['thyPanel','thyEditBox', 'thyCollection']);
-l.add('dynapi.thywidgets.thyGridRow', 'thygridrow.js', ['thyGridCell', 'thyVisualCollection'])
-l.add('dynapi.thywidgets.thyGridContents', 'thygridcontents.js', ['thyPanel']);
-l.add('dynapi.thywidgets.thyGrid', 'thygrid.js', ['thyGridContents','thyLabelPanel','thyGridCell','thyGridRow','thyVisualCollection']);
-l.add('dynapi.thywidgets.thyListBox', 'thylistbox.js', ['thyGrid']);
-l.add('dynapi.thywidgets.thyDropDownBox', 'thydropdownbox.js', ['thyListBox','thyEditBox','thyButton']);
-
-// ThyAPI External
-//l.addPackage('dynapi.thywidgets.external', p+'thywidgets/external/');
-//l.add('dynapi.thywidgets.external.FCKeditor', 'fckeditor/fckeditor.js');
-//l.add('dynapi.thywidgets.external.JSCalendar', 'jscalendar/calendar.js');
-//l.add('dynapi.thywidgets.external.JSCalendarLang', 'jscalendar/lang/calendar-en.js');
-//l.add('dynapi.thywidgets.external.JSCalendarSetup', 'jscalendar/calendar-setup.js',['JSCalendar','JSCalendarLang']);
-
-// Load buffered includes ---------
-if(l._buffer){
-	var i,ar=l._buffer;
-	for(i=0;i<ar.length;i++) l.include(true,ar[i]); // pass arguments true and bufferedArguments 
-	l._buffer=null;
-}
-
diff --git a/phpgwapi/js/dynapi/fx/bezier.js b/phpgwapi/js/dynapi/fx/bezier.js
deleted file mode 100644
index ab0485a71e..0000000000
--- a/phpgwapi/js/dynapi/fx/bezier.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	DynAPI Distribution
-	Bezier Class
-	
-	Bezier Algorithm Reference: http://astronomy.swin.edu.au/~pbourke/curves/bezier/
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: dynapi.fx.Thread
-*/
-
-
-function Bezier(cp, n) {
-	var l = cp.length;
-	var p = [];
-	for (var i=0; i<n; i++) p = p.concat(Bezier._plot(cp,i/n));
-	return p.concat([cp[l-2],cp[l-1]]);
-}
-
-Bezier._plot = function (cp, mu) {
-	var n = (cp.length/2)-1;
-	var k,kn,nn,nkn;
-	var blend;
-	var b = [0,0];
-
-	var muk = 1;
-	var munk = Math.pow(1-mu, n);
-
-	for (k=0;k<=n;k++) {
-		nn = n;
-		kn = k;
-		nkn = n - k;
-		blend = muk * munk;
-		muk *= mu;
-		munk /= (1-mu);
-		while (nn >= 1) {
-			blend *= nn;
-			nn--;
-			if (kn > 1) {
-				blend /= kn;
-				kn--;
-			}
-			if (nkn > 1) {
-				blend /= nkn;
-				nkn--;
-			}
-		}
-		
-		b[0] += cp[k*2] * blend;
-		b[1] += cp[k*2+1] * blend;
-	}
-	b[0] = Math.round(b[0]);
-	b[1] = Math.round(b[1]);
-	return b;
-}
-
-/*function Bezier3(cp,mu) {
-	var x1=cp[0],y1=cp[1],x2=cp[2],y2=cp[3],x3=cp[4],y3=cp[5];
-	var mu2 = mu * mu;
-	var mum1 = 1 - mu;
-	var mum12 = mum1 * mum1;
-	var x = Math.round(x1 * mum12 + 2 * x2 * mum1 * mu + x3 * mu2);
-	var y = Math.round(y1 * mum12 + 2 * y2 * mum1 * mu + y3 * mu2);
-	return [x,y];
-}
-
-function Bezier4(cp,mu) {
-	var x1=cp[0],y1=cp[1],x2=cp[2],y2=cp[3],x3=cp[4],y3=cp[5],x4=cp[6],y4=cp[7];
- 	var mum1 = 1 - mu;
-	var mum13 = mum1 * mum1 * mum1;
-	var mu3 = mu * mu * mu;
-	var x = Math.round(mum13*x1 + 3*mu*mum1*mum1*x2 + 3*mu*mu*mum1*x3 + mu3*x4);
-	var y = Math.round(mum13*y1 + 3*mu*mum1*mum1*y2 + 3*mu*mu*mum1*y3 + mu3*y4);
-	return [x,y];
-}*/
diff --git a/phpgwapi/js/dynapi/fx/circleanim.js b/phpgwapi/js/dynapi/fx/circleanim.js
deleted file mode 100644
index ed9953e9bd..0000000000
--- a/phpgwapi/js/dynapi/fx/circleanim.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-	DynAPI Distribution
-	CircleAnimation Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: dynapi.functions.Math,dynapi.fx.Thread
-*/
-
-function CircleAnimation(dlyr) {
-	this.Thread = Thread;
-	this.Thread(dlyr);
-
-	this.offsetX = 0;
-	this.offsetY = 0;
-	this.playing = false;
-	this.radius = 100;
-	this.angle = 0;
-	this.setAngleIncrement(10);
-};
-var p = dynapi.setPrototype('CircleAnimation','Thread');
-p.setRadius = function (r) {
-	this.hradius = this.vradius = r;
-};
-p.setHRadius = function (r) {
-	this.hradius = r;
-};
-p.setVRadius = function (r) {
-	this.vradius = r;
-};
-p.setAngle = function (a) {
-	this.angle = dynapi.functions.degreeToRadian(a);
-};
-p.setAngleIncrement = function (inc) {
-	this.angleinc = dynapi.functions.degreeToRadian(inc);
-};
-p.playAnimation = function () {
-	this.playing = true;
-	if (this.dlyr!=null) {
-		this.offsetX = this.hradius*Math.cos(this.angle);
-		this.offsetY = -this.vradius*Math.sin(this.angle);
-		this.baseX = this.dlyr.x-this.offsetX;
-		this.baseY = this.dlyr.y+this.offsetY;
-		this.dlyr.invokeEvent("circlestart");
-	}
-	this.start();
-};
-p.stopAnimation = function () {
-	this.playing = false;
-	this.stop();
-	if (this.dlyr!=null) this.dlyr.invokeEvent("circlestop");
-};
-p.run = function () {
-	if (!this.playing || this.dlyr==null) return;	
-	this.angle += this.angleinc;
-	this.offsetX = this.hradius*Math.cos(this.angle);
-	this.offsetY = -this.vradius*Math.sin(this.angle);
-
-	if (this.dlyr!=null) {
-		this.dlyr.invokeEvent("circlerun");
-		this.dlyr.setLocation(this.baseX+this.offsetX,this.baseY+this.offsetY);
-	}
-};
-p.reset = function () {
-	this.angle = this.offsetX = this.offsetY = 0;
-};
-p.generatePath = function(centerX,centerY) {
-	if (centerX==null) centerX = this.dlyr!=null? this.dlyr.x : 0;
-	if (centerY==null) centerY = this.dlyr!=null? this.dlyr.y : 0;
-	var path = [];
-	var i = 0;
-/*	for (var a=this.angle;a<=this.angle+Math.PI*2;a+=this.angleinc) {
-		path[i] = Math.round(centerX + this.hradius*Math.cos(a));
-		path[i+1] = Math.round(centerY - this.vradius*Math.sin(a));
-		i+=2;
-	}*/
-
-	if (this.angleinc>0)
-		for (var a=this.angle;a<=this.angle+Math.PI*2;a+=this.angleinc) {
-			path[i] = Math.round(centerX + this.hradius*Math.cos(a));
-			path[i+1] = Math.round(centerY - this.vradius*Math.sin(a));
-			i+=2;
-		}
-	else
-		for (var a=this.angle;a>=this.angle-Math.PI*2;a+=this.angleinc) {
-			path[i] = Math.round(centerX + this.hradius*Math.cos(a));
-			path[i+1] = Math.round(centerY - this.vradius*Math.sin(a));
-			i+=2;
-		}
-	return path;
-};
diff --git a/phpgwapi/js/dynapi/fx/fader.js b/phpgwapi/js/dynapi/fx/fader.js
deleted file mode 100644
index ff07a3dd74..0000000000
--- a/phpgwapi/js/dynapi/fx/fader.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-	DynAPI Distribution
-	Fader Animation Extension
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: DynLayer
-*/
-
-Fader = {}; // used by dynapi.library
-
-p = DynLayer.prototype;
-
-p._fadeMode = '';
-p.fadeIn = function(inc,ms){
-	this._opacity=0;
-	this._fadeMode='in';
-	this.fadeTo(100,(inc||4),ms);
-};
-p.fadeOut = function(inc,ms){
-	this._opacity=100;
-	this._fadeMode='out';
-	this.fadeTo(0,inc||4,ms);
-};
-// Fades an object to "opacity" by "inc" increments in every "ms" millisenconds
-p.fadeTo = function(opacity,inc,ms){
-	if(this._opacity==null) this._opacity=100;
-	inc=(inc)? Math.abs(inc):5;
-	this._fadeMs=(ms)? ms:50;
-	if (this._opacity>opacity) inc*=-1;
-	this._fadeInc=inc;
-	this._fadeToOpacity = opacity;
-	this._fadeTimeout=window.setTimeout(this+'._fade()',this._fadeMs);
-};
-p._fade = function(){
-	var ua=dynapi.ua;
-	var fm=this._fadeMode;
-	var inc = this._fadeInc;
-	var opac = this._opacity;
-	var fopac = this._fadeToOpacity;
-	opac+=inc;
-	if ((inc<0 && opac<=fopac)|| (inc>0 && opac>=fopac)) opac=fopac;
-	this._opacity=opac;
-	if(!ua.def) this.setVisible((opac>0)? true:false);
-	else if(ua.dom && this.css){
-		if(opac>1 && this.visible==false) this.setVisible(true);
-		if(ua.ie) this.css.filter='alpha(opacity=' + opac + ')';
-		else this.css.MozOpacity = parseInt(opac)/100;
-	}
-	if(opac!=fopac) this._fadeTimeout=window.setTimeout(this+'._fade()',this._fadeMs);
-	else {
-		this._fadeMode='';
-		window.clearTimeout(this._fadeTimeout);
-		this.invokeEvent('fade'+fm);
-	
-	}
-};
-
-p.getOpacity = function(){
-	if (this._opacity ||(this._opacity == 0)) return this._opacity;
-	else return	this._opacity=100;
-};
-p.setOpacity = function(n){
-	var ua=dynapi.ua;
-	if(n>100) n=100;
-	else if(n<0)n=0;
-	this._opacity = n;
-	this.fadeTo(n);
-};
diff --git a/phpgwapi/js/dynapi/fx/fsound.js b/phpgwapi/js/dynapi/fx/fsound.js
deleted file mode 100644
index 01c55aa536..0000000000
--- a/phpgwapi/js/dynapi/fx/fsound.js
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-	DynAPI Distribution
-	FlashSound Class - for sonifying web pages with the flash player
-	Based on the FlashSound API (1.8) Copyright 2001 Hayden Porter, hayden@aviarts.com
-
-	For more information please see the FlashSound Quick Reference
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	Requires: DynLayer
-	
-*/
-
-function FlashSound(swfURL,loop,autostart){
-
-	this.DynLayer = DynLayer;
-	this.DynLayer(null,-10,-10,1,1);
-	
-	// add layer to document
-	dynapi.document.addChild(this);
-	
-	// instance properties
-	this.playerID = this.id + "SWF";
-	FlashSound.players[FlashSound.players.length] = this;
-	
-	// instance embed properties
-	this.autostart = true;
-	this.base = null;
-	this.bgcolor = null;
-	this.loop = (loop)? loop:false;
-	this.src = null;
-	
-	// setup flash plugin
-	this.setSWF(swfURL);	
-	
-};
-
-
-/* ============== FlashSound Instance methods =============== */
-
-/*
-javascript embed ---------------------------------
-embeds swf if user has a supported browser and minimum player.
-script sets swf bgcolor attribute to document.bgcolor if no custom color specified.
-*/
-var p = dynapi.setPrototype('FlashSound','DynLayer');
-
-p._recognizeMethod = function (objstr){
-	// check for player readiness ----------------------
-	// check for javascript DOM object first then check to see if any frames are loaded in maintimeline
-	if(typeof(this.doc[this.playerID][objstr]) == "undefined") return false;
-	else return true;
-};
-
-p._checkForInstance = function() {
-	if(!FlashSound.supportedBrowser || !FlashSound.checkForMinPlayer()) return false;
-	if (this.doc[this.playerID] == null) return false;
-	return true;
-};
-
-// Public Methods -------------------
-
-p.isPlayerReady = function(){
-	if(!FlashSound.engage) return false;
-	if(!this._checkForInstance()) return false;
-	// block browsers that do not recognize Flash javascript methods
-	if(!this._recognizeMethod("PercentLoaded")) return false;
-	if(this.percentLoaded() > 0) return true;
-	return false;
-};
-
-p.getFramesLoaded = function(target){
-	if(!this._checkForInstance()) {return 0;}
-	if(target == null) target = "/";
-	var framesloaded = this.doc[this.playerID].TGetProperty(target,12);
-	return parseInt(framesloaded);
-};
-
-p.getTotalFrames = function(target){
-	if(!this.isPlayerReady()) {return 0;}
-	if(target == null) target = "/";
-	var totalframes = this.doc[this.playerID].TGetProperty(target,5);
-	return parseInt(totalframes);
-};
-
-// check to see if all frames are loaded for a given timeline.
-// check before moving playhead to a frame/label incase the frame/label is not yet loaded.
-p.isLoaded = function(target){
-	if(!this.isPlayerReady()) return false;
-	if(target == null) target = "/";
-	if (this.getFramesLoaded(target) == this.getTotalFrames(target)) return true;
-	return false;
-};
-
-/* flash javascript api functions ------------------------ */
-
-p.gotoAndPlay = function(target,frame){
-	if(!this.isPlayerReady()) return;
-	if(typeof(frame) == "number") {
-		this.doc[this.playerID].TGotoFrame(target,frame - 1);
-		this.doc[this.playerID].TPlay(target);
-	}
-	if(typeof(frame) == "string") {
-		this.doc[this.playerID].TGotoLabel(target,frame);
-		this.doc[this.playerID].TPlay(target);
-	}
-};
-
-p.gotoAndStop = function(target,frame){
-	if(!this.isPlayerReady()) return;
-	if(typeof(frame) == "number") {
-		this.doc[this.playerID].TGotoFrame(target,frame - 1);
-	}
-	if(typeof(frame) == "string") {
-		this.doc[this.playerID].TGotoLabel(target,frame);
-	}
-};
-
-// Is Playing (IsPlaying)
-p.isPlaying = function(){
-	if(!this.isPlayerReady()) return false;
-	return this.doc[this.playerID].IsPlaying();
-};
-
-// Load Movie
-p.loadMovie = function(layerNumber,url){					
-	if(!this.isPlayerReady()) return;
-	this.doc[this.playerID].LoadMovie(layerNumber,url);
-};
-
-p.percentLoaded = function(){
-	if(!this._checkForInstance()) return 0;
-	var percentLoaded = this.doc[this.playerID].PercentLoaded();
-	return parseInt(percentLoaded);
-};
-
-p.play  = function(target){
-	if(!this.isPlayerReady()) return;
-	if(target == null) target = "/";
-	this.doc[this.playerID].TPlay(target);
-};
-
-// Set SWF
-p.setSWF = function(swfURL){
-	if (!FlashSound.supportedBrowser || !FlashSound.checkForMinPlayer()) return;
-	
-	var defaultColor = (document.bgColor != null) ? document.bgColor : "#ffffff";
-	var defaultBase = ".";
-	swfURL=(swfURL)? swfURL:'';
-	this.bgcolor = (this.bgcolor == null) ? defaultColor : this.bgcolor;
-	this.base = (this.base == null) ? defaultBase : this.base; 
-	this.src = (swfURL.charAt(0) == "/") ? "http://" + location.host+swfURL : swfURL;
-	this.setHTML(
-		'<OBJECT ' +
-			'CLASSID="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" ' +
- 			'CODEBASE="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" ' +
- 			'WIDTH="1" ' +
-			'HEIGHT="1" ' +
-			'ID="' + this.playerID + '">\n' +
-    		'<PARAM NAME="movie" VALUE="' + this.src + '">\n' +
-			'<PARAM NAME="play" VALUE="' + this.autostart + '">\n' +
-			'<PARAM NAME="loop" VALUE="' + this.loop + '">\n' +
-    		'<PARAM NAME="quality" VALUE="low">\n' +
-    		'<PARAM NAME="wmode" VALUE="transparent">\n' +
-    		'<PARAM NAME="bgcolor" VALUE="' + this.bgcolor + '">\n' +
-			'<PARAM NAME="base" VALUE="' + this.base + '">\n' +
-    		'<EMBED \n' +
-				'name="' + this.playerID + '"\n' +
-				'swLiveConnect="true"\n' +
-				'src="' + this.src + '\"' + '\n' +
-				'play="' + this.autostart + '\"' + '\n' +
-				'loop="' + this.loop + '\"' + '\n' +
-				'quality="low"\n' +
-				'wmode="transparent"\n' +
-				'base="' + this.base + '"\n' +
-				'bgcolor="' + this.bgcolor + '"\n' +
-				'WIDTH="1"\n' +
-				'HEIGHT="2"\n' +
-				'TYPE="application/x-shockwave-flash"\n' +			
-				'PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">\n' +
-    		'</EMBED>\n' +
-  		'</OBJECT>'
-  	);
-};
-
-// Stop Play (TStopPlay)
-p.stopPlay = function(target){
-	if(!this.isPlayerReady()) return;
-	if(target == null) target = "/";
-	this.doc[this.playerID].TStopPlay(target);
-};
-
-
-/* Static Functions & Properties --------------------------- */
-
-var fs = FlashSound;
-fs.engage = true;			// engage
-fs.playerCount = 0;			// player count
-fs.players = new Array();	// players[]
-fs.playerVersion = 0; 		// set playerVersion to 0 for unsupported browsers
-
-										
-// check for LiveConnect - Opera version 6.x with Java Enabled and Netscape versions 4.x but not greater		
-fs.LiveConnect = ((navigator.javaEnabled() && 
-				 (dynapi.ua.ns4 && dynapi.ua.v<5)) || dynapi.ua.opera6);
-						
-// browser compatibility check -----------------
-fs.supportedBrowser = ((dynapi.ua.ie && dynapi.ua.win32) || 
-						dynapi.ua.ns6 || FlashSound.LiveConnect) ? true : false;
-
-// player compatibility  ------------------
-
-// checkForMinPlayer sets playerVersion for supported browsers
-fs.checkForMinPlayer = function(){
-	if(!this.supportedBrowser) return false;
-	if(dynapi.ua.ns6) {
-		// xpconnect works with version 6 r40 or greater
-		this.playerVersion = this.getPlugInVers(); // get version
-		releaseVers = this.getPlugInReleaseVers(); // get release version	
-		//check release vers only for vers 6
-		if(this.playerVersion == 6 && releaseVers >=40) return true; 
-	}
-	
-	if(this.LiveConnect) this.playerVersion = this.getPlugInVers();
-	if(dynapi.ua.ie) this.playerVersion = (Flash_getActiveXVersion());
-	
-	if(this.playerVersion >= this.minPlayer) return true;
-	else return false;
-};
-
-// check for flash plug-in in netscape
-fs.checkForPlugIn = function(){
-	var flashmimeType = "application/x-shockwave-flash";
-	var hasplugin = (navigator.mimeTypes && navigator.mimeTypes[flashmimeType]) ? navigator.mimeTypes[flashmimeType].enabledPlugin : 0;
-	return hasplugin;
-};
-
-// Get Plugin Version
-fs.getPlugInVers = function(){
-	if(this.checkForPlugIn()){
-		var plugin = navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin;
-		var pluginversion = parseInt(plugin.description.substring(plugin.description.indexOf(".")-1));
-		return pluginversion;
-	}else{
-		return 0;
-	}
-};
-
-// Get Plugin Release Version
-fs.getPlugInReleaseVers = function(){
-	if(this.checkForPlugIn()){
-		var plugin = navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin;
-		var pluginversion = parseInt(plugin.description.substring(plugin.description.indexOf("r")+1, plugin.description.length));
-		return pluginversion;
-	}else{
-		return 0;
-	} 
-};
-
-// vers is integer
-fs.setMinPlayer = function(vers){
-	if(!this.supportedBrowser) return;
-	this.minPlayer = (vers != null && vers >= 4) ? vers : 4;
-	if(dynapi.ua.ns6) { 
-		this.minPlayer = 6; // set min player to 6 for XPConnect
-	}
-	this.checkForMinPlayer();
-};
-
-// vbscript get Flash ActiveX control version for windows IE
-if(dynapi.ua.ie && dynapi.ua.win32){
-	var h='<scr' + 'ipt language="VBScript">' + '\n' +
-	'Function Flash_getActiveXVersion()' + '\n' +
-		'On Error Resume Next' + '\n' +
-		'Dim hasPlayer, playerversion' + '\n' +
-		'hasPlayer = false' + '\n' +
-		'playerversion = 15' + '\n' +
-		'Do While playerversion > 0' + '\n' +
-			'hasPlayer = (IsObject(CreateObject(\"ShockwaveFlash.ShockwaveFlash.\" & playerversion)))' + '\n' +
-			'If hasPlayer Then Exit Do' + '\n' +
-			'playerversion = playerversion - 1' + '\n' +
-		'Loop' + '\n' +
-		'Flash_getActiveXVersion = playerversion' + '\n' +
-	'End Function' + '\n' +
-	'<\/scr' + 'ipt>';
-	
-	if(!dynapi.loaded) document.write(h);
-	else {
-		dynapi.document.addChild(new DynLayer({w:0,h:0,visible:false,html:'<iframe name="FSVBS"></iframe'}));
-		var elm=document.frames['FSVBS'];
-		var doc = elm.document;
-		doc.open();doc.write(h);doc.close();
-		dynapi.frame.Flash_getActiveXVersion = function() {
-			return elm.Flash_getActiveXVersion();
-		};
-	}
-};
-
-// set minimum player version - default is 4
-fs.setMinPlayer();
diff --git a/phpgwapi/js/dynapi/fx/glideanim.js b/phpgwapi/js/dynapi/fx/glideanim.js
deleted file mode 100644
index 5e5cef763a..0000000000
--- a/phpgwapi/js/dynapi/fx/glideanim.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-	DynAPI Distribution
-	Glide Animation Extension
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: dynapi.fx.Thread
-*/
-
-function GlideAnimation(x1,y1,x2,y2,angleinc,startSpeed,endSpeed) {
-	if (x2==null) x2 = x1;
-	if (y2==null) y2 = y1;
-		
-	var normAngle = dynapi.functions.getNormalizedAngle(x1,y1,x2,y2);
-	var distx = x2-x1;
-	var disty = y2-y1;
-	var distance = Math.sqrt(Math.pow(distx,2) + Math.pow(disty,2));
-	angleinc = (angleinc==null)? 7 : Math.abs(angleinc);
-	
-	// a terrible mess but it works
-	var r = 1;
-	if (startSpeed == "fast") {
-		var centerX = x1;
-		var centerY = y1;
-		var centerX2 = x2;
-		var centerY2 = y2;
-		startAngle = 0;
-		endAngle = 90;
-		if (endSpeed=="fast") distance = distance/2;
-	}
-	else {
-		startAngle = -90;
-		endAngle = 0;
-		if (endSpeed == "fast") {
-			var centerX = x1+distx;
-			var centerY = y1+disty;
-		}
-		else {  // default slow,slow
-			var centerX2 = x2-distx/2;
-			var centerY2 = y2-disty/2;
-			distance = distance/2;
-			var centerX = x1+distx/2;
-			var centerY = y1+disty/2;
-			r = -1;
-		}
-	}
-
-	var i,d,x,y,dx,dy,path=[];
-	for (var a=startAngle; a<endAngle; a+=angleinc) {
-		i = path.length;
-		d = distance*Math.sin(a*Math.PI/180);
-		path[i] = Math.round(centerX + d*Math.cos(normAngle));
-		path[i+1] = Math.round(centerY - d*Math.sin(normAngle));
-	}
-	if (startSpeed==endSpeed) {
-		for (var a=endAngle; a<endAngle+90; a+=angleinc) {
-			i = path.length;
-			d = distance*Math.sin(a*Math.PI/180);
-			path[i] = Math.round(centerX2 - r*d*Math.cos(normAngle));
-			path[i+1] = Math.round(centerY2 + r*d*Math.sin(normAngle));
-		}
-	}
-	
-	var l = path.length;
-	if (path[l-2] != x2 || path[l-1]!=y2) {
-		path[l] = x2;
-		path[l+1] = y2;
-	}
-	
-	return path;
-};
-
-DynLayer.prototype.glideStop = function () {
-	if (this._thread) this._thread.stop();
-};
-DynLayer.prototype.glideTo = function(x2,y2,angleinc,ms,startSpeed,endSpeed) {
-	if (this.x!=x2 || this.y!=y2) {
-		if (!this._thread) this._thread = new Thread(this);
-		if (ms) this._thread.interval = ms;
-		this._thread.play(GlideAnimation(this.x,this.y,x2,y2,angleinc,startSpeed,endSpeed) );
-	}
-};
\ No newline at end of file
diff --git a/phpgwapi/js/dynapi/fx/hoveranim.js b/phpgwapi/js/dynapi/fx/hoveranim.js
deleted file mode 100644
index 9cd8f3c439..0000000000
--- a/phpgwapi/js/dynapi/fx/hoveranim.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-	DynAPI Distribution
-	HoverAnimation Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: dynapi.functions.Math, dynapi.fx.Thread
-*/
-
-function HoverAnimation(dlyr) {
-	this.Thread = Thread;
-	this.Thread(dlyr);
-
-	this.offsetX = 0;
-	this.offsetY = 0;
-	this.playing = false;
-	this.amplitude = 100;
-	this.angle = 0;
-	this.setAngleIncrement(10);
-};
-var p = dynapi.setPrototype('HoverAnimation','Thread');
-p.setAmplitude = function (amp) {
-	this.amplitude = amp;
-};
-p.setAngle = function (a) {
-	this.angle = dynapi.functions.degreeToRadian(a);
-};
-p.setAngleIncrement = function (inc) {
-	this.angleinc = dynapi.functions.degreeToRadian(inc);
-};
-p.playAnimation = function () {
-	this.playing = true;
-	if (this.dlyr!=null) {
-		this.offsetX = 0;
-		this.offsetY = this.amplitude*Math.sin(this.angle);
-		this.baseX = this.dlyr.x;
-		this.baseY = this.dlyr.y+this.offsetY;
-		this.dlyr.invokeEvent("hoverstart");
-	}
-	this.start();
-};
-p.stopAnimation = function () {
-	this.playing = false;
-	this.stop();
-	if (this.dlyr!=null) this.dlyr.invokeEvent("hoverstop");
-};
-p.run = function () {
-	if (!this.playing || this.dlyr==null) return;
-	this.angle += this.angleinc;
-	this.offsetX = 0;
-	this.offsetY = this.amplitude*Math.sin(this.angle);
-	if (this.dlyr!=null) {
-		this.dlyr.invokeEvent("hoverrun");
-		this.dlyr.setLocation(this.baseX+this.offsetX,this.baseY+this.offsetY);
-	}
-};
-p.reset = function () {
-	this.angle = this.offsetX = this.offsetY = 0;
-};
-
-p.generatePath = function(centerX,centerY) {
-	// to do
-};
diff --git a/phpgwapi/js/dynapi/fx/imganim.js b/phpgwapi/js/dynapi/fx/imganim.js
deleted file mode 100644
index 734ccd6ac1..0000000000
--- a/phpgwapi/js/dynapi/fx/imganim.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-	DynAPI Distribution
-	ImageAnimation Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: Thread
-*/
-
-function ImageAnimation(dynimage) {
-	this.Thread = Thread;
-	this.Thread(dynimage);
-
-	this.imgAnim = new Array();
-	this.imgAnim.playing = null;
-}
-var p = dynapi.setPrototype('ImageAnimation','Thread');
-p.addAnimation = function (imgArray) {
-	var animNum = this.imgAnim.length;
-	this.imgAnim[animNum] = imgArray;
-	this.imgAnim[animNum].loops = false;
-	this.imgAnim[animNum].resets = false;
-	this.imgAnim[animNum].frame = 0;
-	this.imgAnim[animNum].playing = true;
-	this.imgAnim[animNum].direction = 0;
-	this.imgAnim[animNum].alternates = false;
-	return animNum;
-};
-p.getFrame = function (animNum,frameNum) {
-	return this.imgAnim[animNum][frameNum];
-};
-
-p.setLoops = function (animNum,loop) {
-	this.imgAnim[animNum].loops = loop;
-};
-p.setResets = function (animNum) {
-	this.imgAnim[animNum].resets = true;
-};
-p.setAlternates = function (animNum,alt) {
-	this.imgAnim[animNum].loops = true;
-	this.imgAnim[animNum].alternates = alt;
-};
-
-p.playAnimation = function (animNum) {
-	if (animNum!=null && this.imgAnim.playing!=animNum) {
-		this.playing = true;
-		this.imgAnim.playing = animNum;
-		if (this.dlyr!=null) this.dlyr.invokeEvent("imgstart");
-		this.start();
-	}
-};
-p.stopAnimation = function () {
-	this.imgAnim.playing = null;
-	this.playing = false;
-	this.stop();
-	if (this.dlyr!=null) this.dlyr.invokeEvent("imgrun");
-};
-p.run = function () {
-	if (!this.playing || this.imgAnim.playing==null || this.dlyr==null) return;
-	
-	var anim = this.imgAnim[this.imgAnim.playing];
-	
-	if (anim.frame==0 && this.img==anim[anim.frame]) {
-		anim.frame++;	// skip 1st frame if same
-	}
-	if (this.dlyr!=null) this.dlyr.invokeEvent("imgrun");
-	this.dlyr.setImage(anim[anim.frame]);
-	
-	if (anim.frame>=anim.length-1) {
-		if (anim.loops) {
-			if (anim.alternates && anim.direction==0 && anim.frame==anim.length-1) {
-				anim.direction = 1; 
-				anim.frame = anim.length-2;
-			}
-			else anim.frame = 0;
-		}
-		else if (anim.resets) {
-			anim.frame = 0;
-			this.stop();
-		}
-		else {
-			this.stop();
-		}
-	}
-	else {
-		if (anim.alternates) {
-			if (anim.frame==0 && anim.direction==1) {
-				anim.direction = 0;
-				anim.frame = 1;
-			}
-			else if (anim.direction==0) {
-				anim.frame++;
-			}
-			else if (anim.direction==1) {
-				anim.frame--;
-			}
-		}
-		else {
-			anim.frame++;
-		}
-	}
-};
diff --git a/phpgwapi/js/dynapi/fx/motionx.js b/phpgwapi/js/dynapi/fx/motionx.js
deleted file mode 100644
index 024e433c57..0000000000
--- a/phpgwapi/js/dynapi/fx/motionx.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-	DynAPI Distribution
-	MotionX Class by Raymond Irving (http://dyntools.shorturl.com)
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: Dynlayer
-*/
-
-MotionX = {}; // used by dynapi.library
-
-DynLayer.prototype.makeSolid=function(){
-	this.isHard=true;
-	this._collideX=this.x;
-	this._collideY=this.x;
-	this.collideEvent ={
-		onlocationchange:function(e) {
-			var me=e.getSource();
-			var dirX='',dirY='';
-			// get direction
-			if (me._collideX!=me.x) {
-				if (me._collideX<me.x){dirX="E"}else{dirX="W"};
-			}
-			if (me._collideY!=me.y){
-				if (me._collideY<me.y){dirY="S"}else{dirY="N"};
-			}
-			// get angle direction
-			me._setCollideAngleDirection(me._collideX,me._collideY,me.x,me.y);
-			me._collideX=me.x;
-			me._collideY=me.y;
-			me._collideDirection=dirY+dirX;
-			me._checkForCollision();
-		}
-	}
-	this.addEventListener(this.collideEvent);
-};
-DynLayer.prototype._setCollideAngleDirection = function(x1,y1,x2,y2) {
-	var distx = (x2-x1),disty = (y1-y2),angle;
-	//if (distx==0 && disty==0) return 0;
-	var rad=Math.abs(Math.atan2(disty,distx))
-	if (disty>=0) {
-		if (distx>=0) angle = 90-(rad*180/Math.PI);
-		else angle = 270+(180-(rad*180/Math.PI));
-	}else{
-		angle = 90+(rad*180/Math.PI);
-	}
-	this._collideAngle=Math.ceil(angle);
-};
-DynLayer.prototype._checkForCollision=function(){
-	if (!this.parent.children.length>0) return false;
-	var ch,chX,sX,sY,colX1,colX2,colY1,colY2,n1,n2;
-	this.collideObject==null;
-	for (var i in this.parent.children) {
-		ch=this.parent.children[i];
-		if (ch!=this && ch.isHard==true) {
-			chX=ch.x;
-			chY=ch.y;
-			sX=this.x;
-			sY=this.y;
-			colX1=(sX>=chX && sX<=chX+ch.w);
-			colX2=(chX>=sX && chX<=sX+this.w);
-			colY1=(sY>=chY && sY<=chY+ch.h);
-			colY2=(chY>=sY && chY<=sY+this.h);
-			if ((colX1 || colX2) && (colY1 || colY2)) {
-				if (this._collideDirection=='NE') {
-					n1=((chY+ch.h)-this.y);n2=((sX+this.w)-chX);
-					if (n1<n2) {face="S"}else{face="W"}
-				}else if (this._collideDirection=='NW') {
-					n1=((chY+ch.h)-this.y);n2=((chX+ch.w)-sX);
-					if (n1<n2) {face="S"}else{face="E"}
-				}else if (this._collideDirection=='SE') {
-					n1=((sY+this.h)-ch.y);n2=((sX+this.w)-chX);
-					if (n1<n2) {face="N"}else{face="W"}
-				}else if (this._collideDirection=='SW') {
-					n1=((sY+this.h)-ch.y);n2=((chX+ch.w)-sX);
-					if (n1<n2) {face="N"}else{face="E"}
-				}else if (this._collideDirection=='E') {
-					face="W";
-				}else if (this._collideDirection=='W') {
-					face="E";
-				}else if (this._collideDirection=='N') {
-					face="S";
-				}else if (this._collideDirection=='S') {
-					face="N";
-				}
-
-				ch._impactSide=face;
-				if (face=="W"){this._impactSide="E"}
-				if (face=="E"){this._impactSide="W"}
-				if (face=="N"){this._impactSide="S"}
-				if (face=="S"){this._impactSide="N"}
-
-				this._collideObject=ch;
-				this.invokeEvent("collide");
-				ch._collideObject=this;
-				ch.invokeEvent("collide");
-			}
-		}
-	}
-	return false;
-};
-DynLayer.prototype.getImpactSide=function(){
-	return this._impactSide;
-}
-DynLayer.prototype.getObstacle=function(){
-	return this._collideObject;
-}
-DynLayer.prototype.getDirection=function(){
-	return this._collideDirection;
-}
-DynLayer.prototype.getDirectionAngle=function(){
-	return this._collideAngle;
-}
diff --git a/phpgwapi/js/dynapi/fx/pathanim.js b/phpgwapi/js/dynapi/fx/pathanim.js
deleted file mode 100644
index c674434d44..0000000000
--- a/phpgwapi/js/dynapi/fx/pathanim.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-	DS: the extra features of this version will possibly be rebuilt as an advanced timeline object
-	
-	DynAPI Distribution
-	PathAnimation Class
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: dynapi.fx.Thread
-*/
-
-function PathAnimation(dlyr) {
-	this.Thread = Thread;
-	this.Thread(dlyr);
-	this.paths = [];
-	this.pathPlaying = null;
-}
-var p = dynapi.setPrototype('PathAnimation','Thread');
-
-p.add = function (path, loops, resets) {
-	var n = this.paths.length;
-	this.paths[n] = path;
-	this.setLoops(n,loops);
-	this.setResets(n,resets);
-	this.setFrame(n,0);
-	return n;
-};
-p.setLoops = function (n, loops) {
-	this.paths[n].loops = (loops);
-};
-p.setResets = function (n, resets) {
-	this.paths[n].resets = (resets);
-};
-p.setFrame = function (n, frame) {
-	this.paths[n].frame = frame;
-};
-p.playAnimation = function (noevt) {
-	if (!this.playing) {
-		this.pathPlaying = null;
-		if (arguments[0]==null) arguments[0] = 0;
-		if (typeof(arguments[0]) == "number") {
-			this.pathPlaying = this.paths[arguments[0]];
-		}
-		else if (typeof(arguments[0]) == "object") {  
-			this.pathPlaying = arguments[0];
-			this.pathPlaying.loops = arguments[1]||false;
-			this.pathPlaying.resets = arguments[2]||false;
-			this.pathPlaying.frame = 0;
-		}
-		this.playing = true;
-		if (this.dlyr!=null && noevt!=false) this.dlyr.invokeEvent("pathstart");
-		this.start();
-	}
-};
-//p._Thread_stop = Thread.prototype.stop;
-p.stopAnimation = function (noevt) {
-	if (this.pathPlaying && this.pathPlaying.resets && this.dlyr!=null) this.dlyr.setLocation(this.pathPlaying[0],this.pathPlaying[1]);
-	this.stop();
-	this.pathPlaying = null;
-	this.playing = false;
-	if (this.dlyr!=null && noevt!=false) this.dlyr.invokeEvent("pathstop");
-};
-p.run = function () {
-	if (!this.playing || this.pathPlaying==null) return;
-	var anim = this.pathPlaying;
-	if (anim.frame>=anim.length/2) {
-		if (anim.loops) {
-			anim.frame = 0;
-		}
-		else if (anim.resets) {
-			anim.frame = 0;
-			if (this.dlyr!=null) this.dlyr.setLocation(anim[0],anim[1]);
-			this.stopAnimation();
-			this.dlyr.invokeEvent("pathfinish");
-			return;
-		}
-		else {
-			anim.frame = 0;
-			this.stopAnimation();
-			this.dlyr.invokeEvent("pathfinish");
-			return;
-		}
-	}
-	if (anim.frame==0 && (this.dlyr!=null && this.dlyr.x==anim[0] && this.dlyr.y==anim[1])) {
-		anim.frame += 1;
-	}
-	this.newX = anim[anim.frame*2];
-	this.newY = anim[anim.frame*2+1];
-	
-	if (this.dlyr!=null) {
-		this.dlyr.invokeEvent("pathrun");
-		this.dlyr.setLocation(this.newX,this.newY);
-	}
-	anim.frame++;
-};
-
diff --git a/phpgwapi/js/dynapi/fx/slideanim.js b/phpgwapi/js/dynapi/fx/slideanim.js
deleted file mode 100644
index 8121d417e7..0000000000
--- a/phpgwapi/js/dynapi/fx/slideanim.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-	DynAPI Distribution
-	Slide Animation Extension
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: dynapi.fx.Thread
-*/
-
-// Generates a path between 2 points, stepping inc pixels at a time
-function SlideAnimation(x1,y1,x2,y2,inc) {
-	var n,dx,dy,lx,ly,p=[];
-	if (x2==null) x2 = x1;
-	if (y2==null) y2 = y1;
-
-	lx = x2-x1;
-	ly = y2-y1;
-	n = Math.sqrt(Math.pow(lx,2) + Math.pow(ly,2))/(inc||10);
-	dx = lx/n;
-	dy = ly/n;
-	for (var i=0;i<n;i++) {
-		p[i*2] = x1 + Math.round(dx*i);
-		p[i*2+1] = y1 + Math.round(dy*i);
-	}
-	if (p[i*2-2] != x2 || p[i*2-1] != y2) {
-		p[i*2] = x2;
-		p[i*2+1] = y2;
-	}
-	return p;
-};
-
-
-DynLayer.prototype.slideTo = function(x2,y2,inc,ms) {
-	if (this.x!=x2 || this.y!=y2) {
-		if (!this._thread) this._thread = new Thread(this);
-		if (ms) this._thread.interval = ms;
-		this._thread.play(SlideAnimation(this.x,this.y,x2,y2,inc));
-	}
-};
-DynLayer.prototype.slideStop = function () {
-	if (this._thread) this._thread.stop();
-};
diff --git a/phpgwapi/js/dynapi/fx/snapx.js b/phpgwapi/js/dynapi/fx/snapx.js
deleted file mode 100644
index 152cce1c25..0000000000
--- a/phpgwapi/js/dynapi/fx/snapx.js
+++ /dev/null
@@ -1,780 +0,0 @@
-/*
-    DynAPI Distribution
-    SnapX Class by Leif Westerlind <warp-9.9 (at) usa (dot) net>
-
-    The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-    requires: DynLayer
-*/
-
-SnapX = {}; // used by dynapi.library
-
-var p = DynLayer.prototype;
-p._snapSetLocation = p.setLocation;
-p.setLocation  = function(x,y){	
-    this._snapSetLocation(x,y);
-
-    if (this.isSnapEnabled){
-        var dirX = '', dirY = '';
-
-        // get direction
-        if (this._snapX != this.x){
-            if (this._snapX < this.x){
-                dirX="E";
-            }
-            else {
-                dirX="W";
-            }
-        }
-
-        if (this._snapY != this.y){
-            if (this._snapY < this.y){
-                dirY="S";
-            }
-            else {
-                dirY="N";
-            }
-        }
-
-        this._snapX = this.x;
-        this._snapY = this.y;
-        this._snapDirection = dirY + dirX;
-        this._checkForSnap();
-    }
-};
-
-p.getSnapDirection = function (){
-    return(this._snapDirection);
-};
-
-/*
-INPUT:
-
-    0 args: use defaults
-    1 arg : snap type [normal|null|sticky|grid]
-    2 args: snap type [normal|null|sticky|grid],
-            boundary type [inner|outer|both]
-    3 args: snap type [normal|null|sticky|grid],
-            boundary type [inner|outer|both],
-            boundary
-    4 args: snap type [normal|null|sticky|grid],
-            boundary type [inner|outer|both],
-            boundary,
-            grid size (if applicable)
-*/
-p.enableSnap = function (){
-    var a = arguments;
-    var snapBoundaryDefault = DynLayer._snapBoundaryDefault;
-
-    this.isSnapEnabled = true;
-    this._snapX = this.x;
-    this._snapY = this.y;
-    
-    if ( a.length >= 0 ){
-        this.setSnapBoundary();
-        this.setSnapBoundaryType();
-    }
-
-    if ( a.length >= 1 ){
-        if ( a[0] == 'sticky' || a[0] == 'grid' ){
-            this.setSnapType(a[0]);
-        }
-        else if ( a[0] == 'normal' || a[0] == null ){
-            this.setSnapType();
-        }
-    }
-
-    if ( a.length >= 2 ){
-        if ( a[1] == 'inner' || a[1] == 'outer' || a[1] == 'both' ){
-            this.setSnapBoundaryType(a[1]);
-        }
-        else {
-            this.setSnapBoundaryType();
-        }
-    }
-
-    if ( a.length >= 3 ){
-        if ( typeof(a[2]) == 'number' ){
-            this.setSnapBoundary(a[1],a[2]);
-        }
-        else {
-            this.setSnapBoundary(a[1],snapBoundaryDefault);
-        }
-    }
-    
-    if ( a.length >= 4 ){
-        if ( typeof(a[3]) == 'number' ){
-            this.setGridSnapSize(a[3]);
-        }
-        else {
-            this.setGridSnapSize();
-        }
-    }
-};
-p.disableSnap = function(){
-    this.isSnapEnabled = false;
-};
-
-p.setSnapType = function(t){
-    var a = arguments;
-    
-    if (a.length == 0){
-        this._snapType = 'normal';
-    }
-    else if (a.length == 1 ){
-        if ( a[0] == 'sticky' ){
-            this._snapType = a[0];
-            this.enableStickySnap();
-        } else if ( a[0] == 'grid' ){
-            this._snapType = a[0];
-            this.enableGridSnap();
-        }
-        else {
-            this._snapType = 'normal';
-        }
-    }
-}
-
-p.enableStickySnap = function(){
-    if (arguments.length == 0){
-        this.isStickySnapEnabled = true;
-    }
-    else if (arguments.length == 1 ){
-        if (arguments[0] === true){
-            this.isStickySnapEnabled = true;
-        }
-        else if (arguments[0] === false){
-            this.isStickySnapEnabled = false;
-        }
-    }
-};
-p.disableStickySnap = function(){
-    this.isStickySnapEnabled = false;
-};
-
-p.enableGridSnap = function(){
-    this.isGridSnapEnabled = true;
-    this.setGridSnapSize();
-    this._snapGridX = null;
-    this._snapGridY = null;
-};
-p.disableGridSnap = function(){
-    this.isGridSnapEnabled = false;
-};
-
-DynLayer._snapBoundaryTypeDefault = 'outer';
-p.setSnapBoundaryTypeDefault = function(snapBoundaryType){
-    if (typeof(snapBoundaryType) == 'string') DynLayer._snapBoundaryTypeDefault = snapBoundaryType;
-}
-p.getSnapBoundaryTypeDefault = function(){
-    return(DynLayer._snapBoundaryTypeDefault);
-}
-p.setSnapBoundaryType = function(snapBoundaryType){
-    if (arguments.length == 0){
-        this._snapBoundaryType = DynLayer._snapBoundaryTypeDefault;
-    }
-    else if (typeof(snapBoundaryType) == 'string'){
-        this._snapBoundaryType = snapBoundaryType;
-    }
-};
-p.getSnapBoundaryType = function(){
-    return(this._snapBoundaryType);
-};
-
-DynLayer._snapBoundaryDefault = 25;
-p.setSnapBoundaryDefault = function(snapBoundary){
-    if(typeof(snapBoundary) == 'number') DynLayer._snapBoundaryDefault = snapBoundary;
-}
-p.getSnapBoundaryDefault = function(){
-    return(DynLayer._snapBoundaryDefault);
-}
-
-DynLayer._snapGridSizeDefault = 10;
-p.setGridSnapSizeDefault = function(s){
-    DynLayer._snapGridSizeDefault = s;
-}
-p.getGridSnapSizeDefault = function(){
-    return(DynLayer._snapGridSizeDefault);
-}
-p.setGridSnapSize = function(){
-    if (arguments.length == 0){
-        this._snapGridSize = DynLayer._snapGridSizeDefault;
-    }
-    else if (arguments.length == 1 ){
-        this._snapGridSize = arguments[0];
-    }
-};
-
-/*
-   INPUT:
-       0 args: set snapBoundaryType to snapBoundaryTypeDefault,
-               set boundary to snapBoundaryDefault
-       1 arg : if snapBoundaryType, set boundary to snapBoundaryDefault,
-               if boundary, set all sides to boundary
-                   and snapBoundaryType to snapBoundaryTypeDefault
-       2 args: if snapBoundaryType,boundary, set type and boundary for all sides
-               if N1,N2 set inner to N1 and outer to N2 and
-                   set snapBoundaryType to both
-       5 args: snapBoundaryType, t, r, b, l
-       8 args: ti, ri, bi, li, to, ro, bo, lo
-*/
-
-p.setSnapBoundary = function(){
-    var a = arguments;
-    var snapBoundaryDefault = DynLayer._snapBoundaryDefault;
-    
-    if (a.length == 0){
-        this.setSnapBoundaryType();
-        this._snapBndTi = snapBoundaryDefault;
-        this._snapBndRi = snapBoundaryDefault;
-        this._snapBndBi = snapBoundaryDefault;
-        this._snapBndLi = snapBoundaryDefault;
-        this._snapBndTo = snapBoundaryDefault;
-        this._snapBndRo = snapBoundaryDefault;
-        this._snapBndBo = snapBoundaryDefault;
-        this._snapBndLo = snapBoundaryDefault;
-    }
-    if (a.length == 1){
-        if(a[0] == 'inner' || a[0] == 'outer' || a[0] == 'both'){
-            this.setSnapBoundaryType(a[0]);
-            this._snapBndTi = snapBoundaryDefault;
-            this._snapBndRi = snapBoundaryDefault;
-            this._snapBndBi = snapBoundaryDefault;
-            this._snapBndLi = snapBoundaryDefault;
-            this._snapBndTo = snapBoundaryDefault;
-            this._snapBndRo = snapBoundaryDefault;
-            this._snapBndBo = snapBoundaryDefault;
-            this._snapBndLo = snapBoundaryDefault;
-        }
-        else {
-            this.setSnapBoundaryType();
-            this._snapBndTi = a[0];
-            this._snapBndRi = a[0];
-            this._snapBndBi = a[0];
-            this._snapBndLi = a[0];
-            this._snapBndTo = a[0];
-            this._snapBndRo = a[0];
-            this._snapBndBo = a[0];
-            this._snapBndLo = a[0];
-        }
-    }
-    else if (a.length == 2){
-        if (a[0] == 'inner'){
-            this.setSnapBoundaryType(a[0]);
-            this._snapBndTi = a[1];
-            this._snapBndRi = a[1];
-            this._snapBndBi = a[1];
-            this._snapBndLi = a[1];
-        }
-        else if (a[0] == 'outer'){
-            this.setSnapBoundaryType(a[0]);
-            this._snapBndTo = a[1];
-            this._snapBndRo = a[1];
-            this._snapBndBo = a[1];
-            this._snapBndLo = a[1];
-        }
-        else if (a[0] == 'both' || a[0] == null){
-            this.setSnapBoundaryType('both');
-            this._snapBndTi = a[1];
-            this._snapBndRi = a[1];
-            this._snapBndBi = a[1];
-            this._snapBndLi = a[1];
-            this._snapBndTo = a[1];
-            this._snapBndRo = a[1];
-            this._snapBndBo = a[1];
-            this._snapBndLo = a[1];
-        }
-        else if (typeof(a[0]) == 'number' && typeof(a[1]) == 'number'){
-            this.setSnapBoundaryType('both');
-            this._snapBndTi = a[0];
-            this._snapBndRi = a[0];
-            this._snapBndBi = a[0];
-            this._snapBndLi = a[0];
-            this._snapBndTo = a[1];
-            this._snapBndRo = a[1];
-            this._snapBndBo = a[1];
-            this._snapBndLo = a[1];
-        }
-    }
-    else if (a.length == 5){
-        if(a[0] == 'inner' || a[0] == 'outer' || a[0] == 'both'){
-            this.setSnapBoundaryType(a[0]);
-        }
-
-        if (this._snapBoundaryType == 'inner'){
-            this._snapBndTi = a[1];
-            this._snapBndRi = a[2];
-            this._snapBndBi = a[3];
-            this._snapBndLi = a[4];
-        }
-        else if (this._snapBoundaryType == 'outer'){
-            this._snapBndTo = a[1];
-            this._snapBndRo = a[2];
-            this._snapBndBo = a[3];
-            this._snapBndLo = a[4];
-        }
-        else if (this._snapBoundaryType == 'both'){
-            this._snapBndTi = a[1];
-            this._snapBndRi = a[2];
-            this._snapBndBi = a[3];
-            this._snapBndLi = a[4];
-            this._snapBndTo = a[1];
-            this._snapBndRo = a[2];
-            this._snapBndBo = a[3];
-            this._snapBndLo = a[4];
-        }
-    }
-    else if (a.length == 8){
-        this.setSnapBoundaryType('both');
-        this._snapBndTi = a[0];
-        this._snapBndRi = a[1];
-        this._snapBndBi = a[2];
-        this._snapBndLi = a[3];
-        this._snapBndTo = a[4];
-        this._snapBndRo = a[5];
-        this._snapBndBo = a[6];
-        this._snapBndLo = a[7];
-    }
-    else {
-        this.setSnapBoundaryType();
-        this._snapBndTi = snapBoundaryDefault;
-        this._snapBndRi = snapBoundaryDefault;
-        this._snapBndBi = snapBoundaryDefault;
-        this._snapBndLi = snapBoundaryDefault;
-        this._snapBndTo = snapBoundaryDefault;
-        this._snapBndRo = snapBoundaryDefault;
-        this._snapBndBo = snapBoundaryDefault;
-        this._snapBndLo = snapBoundaryDefault;
-    }
-};
-p.getSnapBoundary = function(t){
-    var To,Ro,Bo,Lo,Ti,Ri,Bi,Li,bndAry,X,Y,W,H;
-
-    X = this.x;
-    Y = this.y;
-    W = this.w;
-    H = this.h;
-
-    Ti = Y + this._snapBndTi;
-    Ri = X + W - this._snapBndRi;
-    Bi = Y + H - this._snapBndBi;
-    Li = X + this._snapBndLi;
-
-    To = Y - this._snapBndTo;
-    Ro = X + W + this._snapBndRo;
-    Bo = Y + H + this._snapBndBo;
-    Lo = X - this._snapBndLo;
-
-    if (t==null) bndAry = [Ti,Ri,Bi,Li,To,Ro,Bo,Lo];
-    else {
-        if (t=='inner') bndAry = [Ti,Ri,Bi,Li];
-        else if (t=='outer') bndAry = [To,Ro,Bo,Lo];
-        else if (t=='both') bndAry = [Ti,Ri,Bi,Li,To,Ro,Bo,Lo];
-    }
-    return(bndAry);
-};
-
-p._checkForSnap = function(){
-    switch (this._snapBoundaryType) {
-        case 'outer' :
-            this._checkForSnapOuter();
-            break;
-        case 'inner' :
-            this._checkForSnapInner();
-            break;
-        case 'both' :
-            this._checkForSnapInner();
-            this._checkForSnapOuter();
-            break;
-        default:
-            return(false);
-    }
-};
-
-p._checkForSnapInner = function(){
-    if (!this.parent.children.length>0) return(false);
-    if (!this.isSnapEnabled==true) return(false);
-
-    var ch,chX1,chY1,chX2,chY2,
-        chBiX1,chBiY1,chBiX2,chBiY2,
-        sX1,sY1,sX2,sY2,
-        chBndAry,sDir,
-        B1,B2a,B2b,B3,B4a,B4b,B5,B6a,B6b,B7,B8a,B8b,
-        D1,D2a,D2b,D3,D4a,D4b,D5,D6a,D6b,D7,D8a,D8b,
-        C1,C2a,C2b,C3,C4a,C4b,C5,C6a,C6b,C7,C8a,C8b;
-
-    sX1  = this.x;
-    sY1  = this.y;
-    sW   = this.w;
-    sH   = this.h;
-    sX2  = sX1 + sW;
-    sY2  = sY1 + sH;
-    sDir = this.getSnapDirection();
-
-    for (var i in this.parent.children){
-        ch = this.parent.children[i];
-        if (ch != this && ch.isSnapEnabled == true){
-            chX1 = ch.x;
-            chY1 = ch.y;
-            chX2 = chX1 + ch.w;
-            chY2 = chY1 + ch.h;
-            chBndAry = ch.getSnapBoundary('inner');
-            chBiX1 = chBndAry[3];
-            chBiY1 = chBndAry[0];
-            chBiX2 = chBndAry[1];
-            chBiY2 = chBndAry[2];
-
-            // Cases B1 - B8 test TRUE if source corner is in snap border.
-            // Cases D1 - D8 test TRUE if the corresponding direction of
-            //               movement of the corner is towards the boundary.
-            // Cases C1 - C8 test TRUE if the corresponding B and D cases
-            //               are true for standard or sticky snap.
-
-            // inner top-left corner, source top-left, move N, NW, W
-            B1  = (sX1 <= chBiX1 && sX1 >  chX1   && sY1 <= chBiY1 && sY1 > chY1);
-            D1  = (sDir == 'N' || sDir == 'NW' || sDir == 'W');
-            C1  = (B1 && (D1 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner top-middle side, source top-left, move NE, N, NW
-            B2a = (sX1 >  chBiX1 && sX1 <  chBiX2 && sY1 <= chBiY1 && sY1 > chY1);
-            D2a = (sDir == 'NE' || sDir == 'N' || sDir == 'NW');
-            C2a = (B2a && (D2a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner top-middle side, source top-right, move NE, N, NW
-            B2b = (sX2 >  chBiX1 && sX2 <  chBiX2 && sY1 <= chBiY1 && sY1 > chY1);
-            D2b = (sDir == 'NE' || sDir == 'N' || sDir == 'NW');
-            C2b = (B2b && (D2b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner top-right corner, source top-right, move E, NE, N
-            B3  = (sX2 >= chBiX2 && sX2 <  chX2   && sY1 <= chBiY1 && sY1 > chY1);
-            D3  = (sDir == 'E' || sDir == 'NE' || sDir == 'N');
-            C3  = (B3 && (D3 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner right-middle side, source top-right, move SE, E, NE
-            B4a = (sX2 >= chBiX2 && sX2 <  chX2   && sY1 >  chBiY1 && sY1 < chBiY2);
-            D4a = (sDir == 'SE' || sDir == 'E' || sDir == 'NE');
-            C4a = (B4a && (D4a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner right-middle side, source bottom-right, move SE, E, NE
-            B4b = (sX2 >= chBiX2 && sX2 <  chX2   && sY2 >  chBiY1 && sY2 < chBiY2);
-            D4b = (sDir == 'SE' || sDir == 'E' || sDir == 'NE');
-            C4b = (B4b && (D4b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner bottom-right corner, source lower-right, move dir E, SE, S
-            B5  = (sX2 >= chBiX2 && sX2 <  chX2   && sY2 >= chBiY2 && sY2 < chY2);
-            D5  = (sDir == 'E' || sDir == 'SE' || sDir == 'S');
-            C5  = (B5 && (D5 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner bottom-middle side, source lower-left, move SW, S, SE
-            B6a = (sX1 >  chBiX1 && sX1 <  chBiX2 && sY2 >= chBiY2 && sY2 < chY2);
-            D6a = (sDir == 'SW' || sDir == 'S' || sDir == 'SE');
-            C6a = (B6a && (D6a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner bottom-middle side, source lower-right, move SW, S, SE
-            B6b = (sX2 >  chBiX1 && sX2 <  chBiX2 && sY2 >= chBiY2 && sY2 < chY2);
-            D6b = (sDir == 'SW' || sDir == 'S' || sDir == 'SE');
-            C6b = (B6b && (D6b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner bottom-left corner, source lower-left, move W, SW, S
-            B7  = (sX1 <= chBiX1 && sX1 >  chX1   && sY2 >= chBiY2 && sY2 < chY2);
-            D7  = (sDir == 'W' || sDir == 'SW' || sDir == 'S');
-            C7  = (B7 && (D7 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner left-middle side, source top-left, move NW, W, SW
-            B8a = (sX1 <= chBiX1 && sX1 >  chX1   && sY1 >  chBiY1 && sY1 < chBiY2);
-            D8a = (sDir == 'NW' || sDir == 'W' || sDir == 'SW');
-            C8a = (B8a && (D8a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // inner left-middle side, source bottom-left, move NW, W, SW
-            B8b = (sX1 <= chBiX1 && sX1 >  chX1   && sY2 >  chBiY1 && sY2 < chBiY2);
-            D8b = (sDir == 'NW' || sDir == 'W' || sDir == 'SW');
-            C8b = (B8b && (D8b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            if (C1){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 + ( Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY1 + ( Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX1, chY1);
-                }
-            }
-            else if (C3){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX2 - ( Math.floor( ( chX2 - sX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY1 + ( Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX2-sW, chY1);
-                }
-            }
-            else if (C5){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX2 - ( Math.floor( ( chX2 - sX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY2 - sH - ( Math.floor( ( chY2 - sY2 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX2-sW, chY2-sH);
-                }
-            }
-            else if (C7){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 + ( Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY2 - sH - ( Math.floor( ( chY2 - sY2 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX1, chY2-sH);
-                }
-            }
-            else if (C2a || C2b){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 + ( Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, chY1);
-                }
-                else {
-                    this._snapSetLocation(sX1, chY1);
-                }
-            }
-            else if (C4a || C4b){
-                if (this.isGridSnapEnabled){
-                    var tmpY = chY1 + ( Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(chX2-sW, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX2-sW, sY1);
-                }
-            }
-            else if (C6a || C6b){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 + ( Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, chY2-sH);
-                }
-                else {
-                    this._snapSetLocation(sX1, chY2-sH);
-                }
-            }
-            else if (C8a || C8b){
-                if (this.isGridSnapEnabled){
-                    var tmpY = chY1 + ( Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(chX1 , tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX1 , sY1);
-                }
-            }
-
-            if (C1 || C2a || C2b || C3 || C4a || C4b || C5 || C6a || C6b || C7 || C8a || C8b){
-                this._snapObject=ch;
-                this.invokeEvent("snap");
-                ch._snapObject=this;
-                ch.invokeEvent("snap");
-            }
-        }
-    }
-};
-
-p._checkForSnapOuter = function(){
-    if (! this.parent.children.length > 0) return(false);
-    if (! this.isSnapEnabled == true) return(false);
-
-    var ch,chX1,chY1,chX2,chY2,
-        chBoX1,chBoY1,chBoX2,chBoY2,
-        sX1,sY1,sX2,sY2,
-        chBndAry,sDir,
-        B1,B2a,B2b,B3,B4a,B4b,B5,B6a,B6b,B7,B8a,B8b,
-        D1,D2a,D2b,D3,D4a,D4b,D5,D6a,D6b,D7,D8a,D8b,
-        C1,C2a,C2b,C3,C4a,C4b,C5,C6a,C6b,C7,C8a,C8b;
-
-/*
-    if(this.isGridSnapEnabled){
-        if( Math.abs( this._snapX - this._snapGridX ) > this._snapGridSize ) this._snapGridX=null;
-        if( Math.abs( this._snapY - this._snapGridY ) > this._snapGridSize ) this._snapGridY=null;
-        this._snapSetLocation( this._snapGridX || this._snapX, this._snapGridY || this._snapY );
-    }
-*/
-
-    sX1 = this.x;
-    sY1 = this.y;
-    sW  = this.w;
-    sH  = this.h;
-    sX2 = sX1 + sW;
-    sY2 = sY1 + sH;
-    sDir = this.getSnapDirection();
-
-    for (var i in this.parent.children){
-        ch = this.parent.children[i];
-        if (ch != this && ch.isSnapEnabled == true){
-            chX1 = ch.x;
-            chY1 = ch.y;
-            chX2 = chX1 + ch.w;
-            chY2 = chY1 + ch.h;
-            chBndAry = ch.getSnapBoundary('outer');
-            chBoX1 = chBndAry[3];
-            chBoY1 = chBndAry[0];
-            chBoX2 = chBndAry[1];
-            chBoY2 = chBndAry[2];
-
-            // Cases B1 - B8 test TRUE if source corner is in snap border.
-            // Cases D1 - D8 test TRUE if the corresponding direction of
-            //               movement of the corner is towards the boundary.
-            // Cases C1 - C8 test TRUE if the corresponding B and D cases
-            //               are true for standard, sticky or grid snap.
-
-            // outer top-left corner, source lower-right, move dir E, SE, S
-            B1  = (sX2 >= chBoX1 && sX2 <  chX1 && sY2 >= chBoY1 && sY2 <  chY1);
-            D1  = (sDir == 'E' || sDir == 'SE' || sDir == 'S');
-            C1  = (B1 && (D1 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer top-middle side, source lower-left, move SW, S, SE
-            B2a = (sX1 >= chX1   && sX1 <= chX2 && sY2 >= chBoY1 && sY2 <  chY1);
-            D2a = (sDir == 'SW' || sDir == 'S' || sDir == 'SE');
-            C2a = (B2a && (D2a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer top-middle side, source lower-right, move SW, S, SE
-            B2b = (sX2 >= chX1   && sX2 <= chX2 && sY2 >= chBoY1 && sY2 <  chY1);
-            D2b = (sDir == 'SW' || sDir == 'S' || sDir == 'SE');
-            C2b = (B2b && (D2b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer top-right corner, source lower-left, move W, SW, S
-            B3  = (sX1 <= chBoX2 && sX1 >  chX2 && sY2 >= chBoY1 && sY2 <  chY1);
-            D3  = (sDir == 'W' || sDir == 'SW' || sDir == 'S');
-            C3  = (B3 && (D3 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-            
-            // outer right-middle side, source top-left, move NW, W, SW
-            B4a = (sX1 <= chBoX2 && sX1 >  chX2 && sY1 >= chY1   && sY1 <= chY2);
-            D4a = (sDir == 'NW' || sDir == 'W' || sDir == 'SW');
-            C4a = (B4a && (D4a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer right-middle side, source bottom-left, move NW, W, SW
-            B4b = (sX1 <= chBoX2 && sX1 >  chX2 && sY2 >= chY1   && sY2 <= chY2);
-            D4b = (sDir == 'NW' || sDir == 'W' || sDir == 'SW');
-            C4b = (B4b && (D4b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer bottom-right corner, source top-left, move N, NW, W
-            B5  = (sX1 <= chBoX2 && sX1 >  chX2 && sY1 <= chBoY2 && sY1 >  chY2);
-            D5  = (sDir == 'N' || sDir == 'NW' || sDir == 'W');
-            C5  = (B5 && (D5 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer bottom-middle side, source top-left, move NE, N, NW
-            B6a = (sX1 >= chX1   && sX1 <= chX2 && sY1 <= chBoY2 && sY1 >  chY2);
-            D6a = (sDir == 'NE' || sDir == 'N' || sDir == 'NW');
-            C6a = (B6a && (D6a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer bottom-middle side, source top-right, move NE, N, NW
-            B6b = (sX2 >= chX1   && sX2 <= chX2 && sY1 <= chBoY2 && sY1 >  chY2);
-            D6b = (sDir == 'NE' || sDir == 'N' || sDir == 'NW');
-            C6b = (B6b && (D6b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer bottom-left corner, source top-right, move E, NE, N
-            B7  = (sX2 >= chBoX1 && sX2 <  chX1 && sY1 <= chBoY2 && sY1 >  chY2);
-            D7  = (sDir == 'E' || sDir == 'NE' || sDir == 'N');
-            C7  = (B7 && (D7 || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer left-middle side, source top-right, move SE, E, NE
-            B8a = (sX2 >= chBoX1 && sX2 <  chX1 && sY1 >= chY1  && sY1  <= chY2);
-            D8a = (sDir == 'SE' || sDir == 'E' || sDir == 'NE');
-            C8a = (B8a && (D8a || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            // outer left-middle side, source bottom-right, move SE, E, NE
-            B8b = (sX2 >= chBoX1 && sX2 <  chX1 && sY2 >= chY1  && sY2  <= chY2);
-            D8b = (sDir == 'SE' || sDir == 'E' || sDir == 'NE');
-            C8b = (B8b && (D8b || ch.isStickySnapEnabled || ch.isGridSnapEnabled));
-
-            if (C1){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 - ( Math.floor( ( chX1 - sX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY1 - ( Math.floor( ( chY1 - sY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX1-sW, chY1-sH);
-                }
-            }
-            else if (C3){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 + ( Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY1 - ( Math.floor( ( chY1 - sY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX2, chY1-sH);
-                }
-            }
-            else if (C5){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 + ( Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY1 + ( Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX2, chY2);
-                }
-            }
-            else if (C7){
-                if (this.isGridSnapEnabled){
-                    var tmpX = chX1 - ( Math.floor( ( chX1 - sX1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    var tmpY = chY1 + ( Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX1-sW, chY2);
-                }
-            }
-            else if (C2a || C2b){
-                if (this.isGridSnapEnabled){
-                    //if(!this._snapGridY) this._snapGridY=chY1-sH;
-                    //this._snapSetLocation(sX1 , this._snapGridY);
-                    var tmpX = chX1 + Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX , chY1-sH);
-                }
-                else {
-                    this._snapSetLocation(sX1, chY1-sH);
-                }
-            }
-            else if (C4a || C4b){
-                if (this.isGridSnapEnabled){
-                    //if(!this._snapGridX) this._snapGridX=chX2;
-                    //this._snapSetLocation(this._snapGridX, sY1);
-                    var tmpY = chY1 + Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) * this._snapGridSize;
-                    this._snapSetLocation(chX2, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX2, sY1);
-                }
-            }
-            else if (C6a || C6b){
-                if (this.isGridSnapEnabled){
-                    //if(!this._snapGridY) this._snapGridY=chY2;
-                    //this._snapSetLocation(sX1 , this._snapGridY);
-                    var tmpX = chX1 + Math.floor( ( sX1 - chX1 ) / this._snapGridSize ) * this._snapGridSize;
-                    this._snapSetLocation(tmpX , chY2);
-                }
-                else {
-                    this._snapSetLocation(sX1, chY2);
-                }
-            }
-            else if (C8a || C8b){
-                if (this.isGridSnapEnabled){
-                    //if(!this._snapGridX) this._snapGridX=chX1-sW;
-                    //this._snapSetLocation(chX1-sW , sY1);
-                    var tmpY = chY1 + Math.floor( ( sY1 - chY1 ) / this._snapGridSize ) * this._snapGridSize;
-                    this._snapSetLocation(chX1-sW, tmpY);
-                }
-                else {
-                    this._snapSetLocation(chX1-sW, sY1);
-                }
-            }
-
-            if (C1 || C2a || C2b || C3 || C4a || C4b || C5 || C6a || C6b || C7 || C8a || C8b){
-                this._snapObject=ch;
-                this.invokeEvent("snap");
-                ch._snapObject=this;
-                ch.invokeEvent("snap");
-            }
-        }
-    }
-};
diff --git a/phpgwapi/js/dynapi/fx/swiper.js b/phpgwapi/js/dynapi/fx/swiper.js
deleted file mode 100644
index 2de465acba..0000000000
--- a/phpgwapi/js/dynapi/fx/swiper.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-	DynAPI Distribution
-	Swiper Animation Extension - originally designed by Erik Arvidsson (http://web.eae.net)
-	IncDec addon - Created by Daniel Tiru (http://www.tiru.se)
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-	
-	requires: DynLayer
-	
-*/
-
-Swiper = {}; // used by dynapi.library
-
-DynLayer.prototype.swipeTo = function(dir, steps, ms, min) {
-
-	this._swipeSteps = (steps!=null)? steps: 4;
-	this._swipeMS = (ms!=null)? ms:25;
-	this._swipeDir=dir;
-	this._swiperMin=min;
-	if (this._swiperMinimized==null) { 
-		this._swiperMinimized = 0
-	}
-
-	if (this.swipeTimer != null) window.clearTimeout(this.swipeTimer);
-		
-	if (!this._swipeCnt) {		// No animation yet!
-		this._swipeOrgX  = this.getX();
-		this._swipeOrgY  = this.getY();
-		this._swipeOrgWidth = this.getWidth();
-		this._swipeOrgHeight  = this.getHeight();
-	}
-	
-	this._swipeCnt = this._swipeSteps;
-	if (dir.substr(0,3)!='dec' && dir.substr(0,3)!='inc') {
-		this.setClip([0,0,0,0]);
-	}
-	window.setTimeout(this+"._swipe()", this._swipeMS);
-};
-DynLayer.prototype._swipe = function() {
-	var steps	= this._swipeSteps;
-	var x = this._swipeOrgX;
-	var y = this._swipeOrgY;
-	var w = this._swipeOrgWidth;
-	var h = this._swipeOrgHeight;
-	var min = this._swiperMin;
-	
-	if (this._swipeCnt == 0) {
-		if (this._swipeDir.substr(0,3)!='dec' && this._swipeDir.substr(0,3)!='inc') {
-			this.setClip([0, w, h,0]);
-		}
-		else if(this._swipeDir.substr(0,3)=='dec') {
-			this._swiperMinimized=1;
-		}
-		else if(this._swipeDir.substr(0,3)=='inc') {
-			this._swiperMinimized=0;
-		}
-		this.invokeEvent('swipefinish');
-		return;
-	}
-	else {
-		this._swipeCnt--;
-		this.setVisible(true);
-		switch (this._swipeDir) {
-			case "bottom":		//down (see the numpad)
-				this.setClip([h * this._swipeCnt / steps, w, h, 0]);
-				this.setY(y - h * this._swipeCnt / steps);
-				break;
-			case "top":
-				this.setClip([0, w, h * (steps - this._swipeCnt) / steps, 0]);
-				this.setY(y + h * this._swipeCnt / steps);
-				break;
-			case "right":
-				this.setClip([0, w, h,w * this._swipeCnt / steps]);
-				this.setX(x - w * this._swipeCnt / steps);
-				break;
-			case "left":
-				this.setClip([0, w * (steps - this._swipeCnt) / steps, h, 0]);
-				this.setX(x + w * this._swipeCnt / steps);
-				break;
-			case "bottom-right":
-				this.setClip([h * this._swipeCnt / steps, w, h, w * this._swipeCnt / steps]);
-				this.setX(x - w * this._swipeCnt / steps);
-				this.setY(y - h * this._swipeCnt / steps);
-				break;
-			case "bottom-left":
-				this.setClip([h * this._swipeCnt / steps, w * (steps - this._swipeCnt) / steps, h, 0]);
-				this.setX(x + w * this._swipeCnt / steps);
-				this.setY(y - h * this._swipeCnt / steps);
-				break;
-			case "top-left":
-				this.setClip([0, w * (steps - this._swipeCnt) / steps, h * (steps - this._swipeCnt) / steps, 0]);
-				this.setX(x + w * this._swipeCnt / steps);
-				this.setY(y + h * this._swipeCnt / steps);
-				break;
-			case "top-right":
-				this.setClip([0, w, h * (steps - this._swipeCnt) / steps, w * this._swipeCnt / steps]);
-				this.setX(x - w * this._swipeCnt / steps);
-				this.setY(y + h * this._swipeCnt / steps);
-				break;
-			// inc-dec
-			case "dec-right":
-				if (this._swiperMinimized==0) {
-					if ((w/steps*this._swipeCnt) > min) {
-						this.setClip([0, (w/steps*this._swipeCnt), h, 0]);
-					}
-					else this.setClip([0, min, h, 0]);
-				}
-				break;
-			case "inc-right":
-				//var clippos = this.getClip().toString().split(',');
-				if (this.getClip()[1] < w-(w/steps*this._swipeCnt)) {
-					if (this._swiperMinimized==1) {
-						this.setClip([0, w-(w/steps*this._swipeCnt), h, 0]);
-					}
-				}
-				break;
-			case "dec-left":
-				if (this._swiperMinimized==0) {
-					if ((w/steps*this._swipeCnt) > min) {
-						this.setClip([0, Math.round(w/steps*this._swipeCnt), h, 0]);
-						this.setX(w+(x-(Math.round(w/steps*this._swipeCnt))));
-					}
-					else{
-						this.setClip([0, min, h, 0]);
-						this.setX(w+x-min);
-					}
-				}
-				break;
-			case "inc-left":
-				if (this._swiperMinimized==1) {
-					if (this.getClip()[1] < w-Math.round(w/steps*this._swipeCnt)) {
-						this.setClip([0, w-Math.round(w/steps*this._swipeCnt), h, 0]);
-						if (w-(w/steps*this._swipeCnt) < x) {
-							this.setX(x-(w-Math.round(w/steps*(this._swipeCnt)+min)));
-						}
-						else this.setX((steps*w/steps)-(x));
-					}
-				}
-				break;
-			case "dec-down":
-				if (this._swiperMinimized==0) {
-					if ((h/steps*this._swipeCnt) > min) {
-						this.setClip([0, w, (h/steps*this._swipeCnt), 0]);
-					}
-					else this.setClip([0, w, min, 0]);
-				}
-				break;
-			case "inc-down":
-				if (this._swiperMinimized==1) {
-					if (this.getClip()[2] < h-(h/steps*this._swipeCnt)) {
-						this.setClip([0,w, h-(h/steps*this._swipeCnt), 0]);
-					}
-				}
-				break;
-			case "dec-up":
-				if (this._swiperMinimized==0) {
-					if ((h/steps*this._swipeCnt) > min) {
-						this.setClip([0, w, Math.round(h/steps*this._swipeCnt), 0]);
-						this.setY((h+y-(Math.round(h/steps*this._swipeCnt))));
-					}
-					else{
-						this.setClip([0, w, min, 0]);
-						this.setY(h+y-min);
-					}
-				}
-				break;
-			case "inc-up":
-				if (this._swiperMinimized==1) {
-					if (this.getClip()[2] < h-Math.round(h/steps*this._swipeCnt)) {
-						this.setClip([0, w, h-Math.round(h/steps*this._swipeCnt), 0]);
-						if (h-(h/steps*this._swipeCnt) < y) {
-							this.setY(y-(h-Math.round(h/steps*(this._swipeCnt)+min)));
-						}
-						else this.setY((steps*h/steps)-(y-min));
-					}
-				}
-				break;
-		}		
-		this.swipeTimer = window.setTimeout(this+"._swipe()", this._swipeMS);
-	}
-};
-
diff --git a/phpgwapi/js/dynapi/fx/textanim.js b/phpgwapi/js/dynapi/fx/textanim.js
deleted file mode 100644
index 7f55ea6ae9..0000000000
--- a/phpgwapi/js/dynapi/fx/textanim.js
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-	DynAPI Distribution
-	Fader Animation Extension
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: DynLayer, Fader
-*/
-
-function TextAnimation(x,y,text,animBy,dlyr){
-	this.EventObject = EventObject;
-	this.EventObject();
-	
-	this._chars=[];
-	this._lyrPool=[];
-	this._text=text;
-	this._animBy=null;
-	this._inUse=0;
-	this._dlyr=(dlyr||dynapi.document);
-
-	this.setLocation(x,y);
-	this.animateBy(animBy);
-	this.visible=true;
-	
-	var me=this; // use delegate "me"
-	var fn=function(){
-		me._created=true;
-		me._split();
-	}
-	if(this._dlyr!=dynapi.document) this._dlyr.onCreate(fn);
-	else {
-		var e={onload:fn};
-		this._dlyr.addEventListener(e);
-	}
-};
-var p = dynapi.setPrototype('TextAnimation','EventObject');
-p._clear = function(){
-	var l;
-	var p=this._lyrPool;
-	var c=this._chars;
-	for(var i=0;i<c.length;i++){
-		l=c[i];
-		l.setVisible(false);
-		l.removeAllEventListeners();
-		p[p.length]=l;
-	}
-	this._chars.length=0;
-};
-p._createCharLayer=function(t){
-	var l;
-	var p=this._lyrPool;
-	if (!p.length) l = this._dlyr.addChild(new DynLayer());
-	else {
-		l = p[p.length-1];
-		p.length--;
-	};
-	l._ta=this;
-	l.setHTML(t);
-	if(l._created) {
-		// resize char layer
-		l.setSize(1,1); // why mozilla,gecko,ie??
-		l.setSize(l.getContentWidth(),l.getContentHeight());
-	}
-	l.setVisible(this.visible);
-	if(dynapi.ua.ie) l.css.filter='alpha(opacity=100)';
-	else l.css.MozOpacity = 1;
-	return l;
-};
-p._exec = function(cmd,i){
-	window.setTimeout(cmd,(this._ms*i)+5);
-};
-p._resize=function(align){
-	var x=this.x;
-	var y=this.y;
-	var i,l,c=this._chars;
-	for(i=0;i<c.length;i++){
-		l=c[i]; // resize char layer
-		if(l._created) {
-			l.setSize(1,1); // why mozilla,gecko,ie??
-			l.setSize(l.getContentWidth(),l.getContentHeight());
-			if(align) {
-				l.setLocation(x,y);
-				x+=l.w;
-			}
-		}
-	}
-};
-p._split = function(){
-	var i,ar,lyr;
-	var t=this._text;
-	var c=this._chars;
-	var x=this.x;
-	var y=this.y;
-	if(!t||!this._created) return;
-	this._clear();
-	if(this._animBy=='all') {	// By all
-		t='<nobr>'+t+'</nobr>';
-		lyr=c[0]=this._createCharLayer(t);
-		lyr.setLocation(x,y);
-	}else {						// By word or letter
-		if (this._animBy=='word') {
-			t=t.replace(/\s/g,' &nbsp; ');
-			ar=t.split(' ');
-		}
-		else {	
-			ar=t.split('');
-		}
-		for(i=0;i<ar.length;i++){
-			if (ar[i]==' ') ar[i]='&nbsp;';
-			lyr=c[i]=this._createCharLayer(ar[i]);
-			lyr.setLocation(x,y);
-			x+=lyr.w;
-		}
-	}
-	if(lyr) lyr.addEventListener(TextAnimation._tiggerEvents);
-};
-p.animateBy=function(s,delay){	// all, letter, word  
-	this._animBy=s||this._animBy||'letter';
-	this.setDelay(delay);
-	this._split();
-};
-p.getCharLayer = function(i){
-	if (i>=0 && i<this.chars.length) return this.chars[i];
-};
-p.setDelay = function(delay){
-	this._ms=delay||this._ms||50;
-};
-p.setFont=function(size,family){
-
-};
-p.setLocation=function(x,y){
-	x=x||0;	y=y||0;
-	var byX=x-this.x;
-	var byY=y-this.y;
-	var c=this._chars;
-	this.x=x; this.y=y;
-	for (var i=0;i<c.length;i++){
-		l=c[i];	l.setLocation(l.x+byX,l.y+byY);
-	}
-};
-p.setText=function(t,animBy,delay){
-	this._text=t||'';
-	this.setDelay(delay);
-	this.animateBy(animBy);
-};
-p.setVisible = function(b){
-	var c=this._chars;
-	this.visible=b;
-	for (var i=0;i<c.length;i++) c[i].setVisible(b);
-};
-
-// Trigger Events
-var fn = function(e){
-	var o=e.getSource();
-	o._ta._inUse--;
-	if(!o._ta._inUse) window.setTimeout(o._ta+'.invokeEvent("animfinish")',55);
-};
-TextAnimation._tiggerEvents = {
-	onpathfinish:fn,
-	onfadein:fn,
-	onfadeout:fn
-};
-
-
-// Effects
-// ------------------------
-// Apear
-p.appear = function(){
-	var i,ext,c=this._chars;
-	this._exec(this+'.invokeEvent("animstart")',1);
-	for (i=0;i<c.length;i++) {
-		if(!this._inUse) c[i].setVisible(false);
-		if(i==(c.length-1)) ext=c[i]+'.invokeEvent("pathfinish")';
-		this._exec(c[i]+'.setVisible(true);;'+ext,i);
-	}
-	this._inUse++;
-};
-// Bounce
-p.bounce = function(h,modifier){
-	var i,l,c;
-	c=this._chars;
-	h=(h||100);
-	modifier=(modifier<-1)? -1:(modifier||0);
-	this._exec(this+'.invokeEvent("animstart")',1);
-	// setup bounce chars
-	for (i=0;i<c.length; i++) {
-		l=c[i];
-		l._bonctmr=i<<modifier;
-		l._boncyv=0;
-		l._boncmaxv=8;
-		l._boncy=-l.h;
-		l.setLocation(null,this.y-h);
-		if(!this._inUse) l.setVisible(true);
-		this._exec(this+'._startBounce('+i+','+h+');',i);
-	}
-	this._inUse++;
-};
-p._startBounce = function(i,h){
-	var l,y,c,ext;
-	var c=this._chars;
-	l=c[i];
-	if (l._bonctmr>0) l._bonctmr--;
-	else {
-		yv=l._boncyv;
-		//y=l._boncy;
-		l._boncy+=yv;
-		if (yv<l._boncmaxv) l._boncyv++;
-		if (l._boncy>h-l.h) {
-			l._boncy=h-l.h;
-			l._boncyv=-l._boncyv;
-			if (l._boncmaxv>0) l._boncmaxv--;
-		}
-		l.setLocation(null,(this.y-h)+l._boncy+l.h);
-	}
-
-	if(l._boncmaxv!=0){
-		this._exec(this+'._startBounce('+i+','+h+');'+ext,1);
-	}
-	else if(i==(c.length-1)) {
-		this._exec(l+'.invokeEvent("pathfinish")',1);
-	}	
-};
-// Fade In
-p.fadeIn = function(inc,ms){
-	var i,c=this._chars;
-	this._exec(this+'.invokeEvent("animstart")',1);
-	for (i=0;i<c.length;i++) this._exec(c[i]+'.fadeIn('+inc+','+ms+');',i);
-	this._inUse++;
-};
-// Fade Out
-p.fadeOut = function(inc,ms){
-	var i,c=this._chars;
-	this._exec(this+'.invokeEvent("animstart")',1);
-	for (i=0;i<c.length;i++) this._exec(c[i]+'.fadeOut('+inc+','+ms+');',i);
-	this._inUse++;
-};
-// Fly From
-p.flyFrom = function(x,y,inc,ms){
-	var i,l,c=this._chars;
-	this._exec(this+'.invokeEvent("animstart")',1);
-	for (i=0;i<c.length;i++) {
-		l=c[i];
-		this._exec(
-			((!this._inUse)? l+'.setVisible(true);':'')
-			+l+'.slideTo('+l.x+','+l.y+','+inc+','+ms+');'
-		,i);
-		l.setLocation(x,y);
-	}
-	this._inUse++;	
-};
-p.zoomText = function(from,to,inc,ms){
-	var i,l,c;
-	c=this._chars;
-	this._exec(this+'.invokeEvent("animstart")',1);
-	// setup chars
-	for (i=0;i<c.length; i++) {
-		l=c[i];
-		l._zTo = to||20;
-		l._zFrom = from||10;
-		l._zMs=(ms)? ms:50;
-		l._zInc=(inc)? Math.abs(inc):5;
-		l.css.fontSize=l._zFrom+'px';
-		if (l._zFrom>l._zTo) l._zInc*=-1;
-		if(!this._inUse) l.setVisible(true);
-		this._exec(this+'._startZoom('+i+');',i);
-	}
-	this._inUse++;
-};
-p._startZoom= function(i){
-	var l,y,c,ext;
-	var l=this._chars[i];
-	var inc = l._zInc;
-	var from = l._zFrom;
-	var to = l._zTo;
-	from+=inc;
-	if ((inc<0 && from<=to)|| (inc>0 && from>=to)) from=to;
-	l._zFrom=from;
-	l.css.fontSize=from+'px';
-	l.setSize(0,0); // ??
-	l.setSize(l.getContentWidth(),l.getContentHeight());
-	if(i==0) l.setLocation(null,this.y-(l.h/2));
-	else l.setLocation(this._chars[i-1].x+this._chars[i-1].w,this.y-(l.h/2));
-	if(from!=to) l._zTmr=window.setTimeout(this+'._startZoom('+i+')',l._zMs);
-	else if(i==(this._chars.length-1)) {
-		this._exec(l+'.invokeEvent("pathfinish")',1);
-	}	
-};
-
-
-// to-do:
-p.wave = function(){};
-p.nudge = function(){};
-p.quake = function(){};
diff --git a/phpgwapi/js/dynapi/fx/thread.js b/phpgwapi/js/dynapi/fx/thread.js
deleted file mode 100644
index 1c7ea3700d..0000000000
--- a/phpgwapi/js/dynapi/fx/thread.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-	DynAPI Distribution
-	Glide Animation Extension
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: DynLayer, dynapi.functions.Math
-*/
-
-function Thread(dlyr) {
-	this.DynObject = DynObject;
-	this.DynObject();
-	
-	if (dlyr) this.dlyr = dlyr;
-	else dlyr = this;  // if no dynlayer passed it calls events onto itself
-	
-	this._frame = 0;
-	this._path = null;
-	this.loop = false;
-}
-var p = dynapi.setPrototype('Thread','DynObject');
-p.interval = 20;
-p.sleep = function (ms) {
-	this.interval = Math.abs(parseInt(ms));
-	if (this._timer) this.start();
-};
-p._restart = function () { // starts, or restarts if necessary
-	this.stop(false);
-	setTimeout(this+'.start()',this.interval+1);
-};
-p.start = function () { // starts, or restarts if necessary
-	if (this._timer) this._restart();
-	else {
-		this.dlyr.invokeEvent("threadstart");
-		this._timer = setInterval(this+'.run()',this.interval);
-	}
-};
-p.run = function () {
-	var p=this._path, d=this.dlyr;
-	this.dlyr.invokeEvent("threadrun");
-	if (p && this.dlyr!=this && this._timer) {
-		if (this._frame>=p.length/2) {
-			if (this.loop) this._frame = 0;
-			else {
-				this.stop(false);
-				this.dlyr.invokeEvent("threadfinish");
-				return;
-			}
-		}
-		if (this._frame==0 && (d.x==p[0] && d.y==p[1])) this.frame += 1; // already at 1st coordinate		
-		d.setLocation(p[this._frame*2],p[this._frame*2+1]);
-		this._frame++;
-	}
-};
-p.stop = function (noevt) {
-	clearInterval(this._timer);
-	this._timer = null;
-	this._frame = 0;
-	if (noevt!=false) this.dlyr.invokeEvent("threadstop");
-};
-p.play = function (path) {
-	this._path = path;
-	this.start();
-};
diff --git a/phpgwapi/js/dynapi/fx/timerx.js b/phpgwapi/js/dynapi/fx/timerx.js
deleted file mode 100644
index 87e2b7a286..0000000000
--- a/phpgwapi/js/dynapi/fx/timerx.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-	DynAPI Distribution
-	TimerX Class by Raymond Irving (http://dyntools.shorturl.com)
-
-	The DynAPI Distribution is distributed under the terms of the GNU LGPL license.
-
-	requires: Dynlayer
-*/
-
-TimerX = {}; // used by dynapi.library
-
-p = DynLayer.prototype;
-p.startTimer=function(interval) {
-	if (this.tickTimer>0) this.stopTimer();
-	this._timerInterval=interval||5;
-	this._timerTickCount=0;
-	this._timerStoped=false;
-	this._tickTimer=setTimeout(this+'.tickLoop()',this._timerInterval);
-};
-p.tickLoop=function() {
-	if (this._timerStoped==true||this._timerStoped==null) return;
-	this._timerTickCount++;
-	this.invokeEvent("timer");
-	this._tickTimer=window.setTimeout(this+'.tickLoop()',this._timerInterval);
-};
-p.stopTimer=function() {
-	this._timerStoped=true;
-	clearTimeout(this._tickTimer);
-};
-p.setTimerInterval=function(interval) {
-	this._timerInterval=interval||this._timerInterval;
-};
-p.getTimerInterval=function() {
-	return this._timerInterval;
-};
-p.getTickCount=function() {
-	return this._timerTickCount;
-};
-p.resetTickCount=function() {
-	this._timerTickCount=0;
-};
-
-
-
diff --git a/phpgwapi/js/dynapi/version.xml b/phpgwapi/js/dynapi/version.xml
deleted file mode 100644
index c1e82e0417..0000000000
--- a/phpgwapi/js/dynapi/version.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<version>
-	<major>3</major>
-	<minor>0</minor>
-	<revision>0</revision>
-</version>
diff --git a/phpgwapi/js/foldertree/foldertree.README b/phpgwapi/js/foldertree/foldertree.README
deleted file mode 100644
index 5f65668a23..0000000000
--- a/phpgwapi/js/foldertree/foldertree.README
+++ /dev/null
@@ -1,28 +0,0 @@
-Usage instructions for foldertree.js
-
-foldertree was modified for egw by NDEE 2004
-============================================
-
-detailed instructions follow shortly
-
-Definition of vars passed to function add Node()
-
- Node(id, pid, name, url, urlClick, urlOut, title, target, icon, iconOpen, open)
-
-where 
-id = increasing number beginning from 0 (-1=Tree-Root)
-pid = id of parent node
-name = name of node
-url = url of node's link
-urlClick = js command for onClick
-urlOut = js command(s) for onMouseOUt
-title = Popup Title
-target = target frame
-icon = icon :)
-iconOpen = special icon when opened
-open = TRUE/FALSE id to make node open on start
-
-vars to follow
-
-urlOver = js command(s) for onMouseOver (dont use currently!)
-urlUp = js command(s) for onMouseUp
diff --git a/phpgwapi/js/foldertree/foldertree.js b/phpgwapi/js/foldertree/foldertree.js
deleted file mode 100644
index 8b2c138ce9..0000000000
--- a/phpgwapi/js/foldertree/foldertree.js
+++ /dev/null
@@ -1,368 +0,0 @@
-/*--------------------------------------------------|
-| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
-|---------------------------------------------------|
-| Copyright (c) 2002-2003 Geir Landrö               |
-|                                                   |
-| This script can be used freely as long as all     |
-| copyright messages are intact.                    |
-|                                                   |
-| Updated: 17.04.2003                               |
-|--------------------------------------------------*/
-
-
-// modified for egw 29-12-03 ndee
-// 27-01-04 ndee: amended function dtree() with parameter for php based icondir
-
-// Node object
-function Node(id, pid, name, url, urlClick, urlOut, title, target, icon, iconOpen, open) {
-	this.id = id;
-	this.pid = pid;
-	this.name = name;
-	this.url = url;
-	this.urlClick = urlClick;
-	this.urlOut = urlOut;
-	this.title = title;
-	this.target = target;
-	this.icon = icon;
-	this.iconOpen = iconOpen;
-	this._io = open || false;
-	this._is = false;
-	this._ls = false;
-	this._hc = false;
-	this._ai = 0;
-	this._p;
-};
-
-
-// Tree object
-function dTree(objName,icondir) {
-	iconPath = (icondir !='') ? icondir : '/egroupware/phpgwapi/templates/default/images';
-	this.icon = {
-		root				: iconPath+'/foldertree_base.gif',
-		folder				: iconPath+'/foldertree_folder.gif',
-		folderOpen			: iconPath+'/foldertree_folderopen.gif',
-		node				: iconPath+'/foldertree_folder.gif',
-		empty				: iconPath+'/foldertree_empty.gif',
-		line				: iconPath+'/foldertree_line.gif',
-		join				: iconPath+'/foldertree_join.gif',
-		joinBottom			: iconPath+'/foldertree_joinbottom.gif',
-		plus				: iconPath+'/foldertree_plus.gif',
-		plusBottom			: iconPath+'/foldertree_plusbottom.gif',
-		minus				: iconPath+'/foldertree_minus.gif',
-		minusBottom			: iconPath+'/foldertree_minusbottom.gif',
-		nlPlus				: iconPath+'/foldertree_nolines_plus.gif',
-		nlMinus				: iconPath+'/foldertree_nolines_minus.gif'
-	};
-
-
-	this.config = {
-		target				: null,
-		folderLinks			: true,
-		useSelection			: true,
-		useCookies			: true,
-		useLines			: true,
-		useIcons			: true,
-		useStatusText			: false,	//must be set to false for drag and drop! change-me!
-		closeSameLevel			: false,
-		inOrder				: false,
-		useJSCode			: true
-	}
-	
-	this.obj = objName;
-	this.aNodes = [];
-	this.aIndent = [];
-	this.root = new Node(-1);
-	this.selectedNode = null;
-	this.selectedFound = false;
-	this.completed = false;
-};
-
-// Adds a new node to the node array
-dTree.prototype.add = function(id, pid, name, url, urlClick, urlOut, title, target, icon, iconOpen, open) {
-	this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, urlClick, urlOut, title, target, icon, iconOpen, open);
-};
-
-// Open/close all nodes
-dTree.prototype.openAll = function() {
-	this.oAll(true);
-};
-dTree.prototype.closeAll = function() {
-	this.oAll(false);
-};
-
-// Outputs the tree to the page
-dTree.prototype.toString = function() {
-	var str = '<div class="dtree">\n';
-	if (document.getElementById) {
-		if (this.config.useCookies) this.selectedNode = this.getSelected();
-		str += this.addNode(this.root);
-	} else str += 'Browser not supported.';
-	str += '</div>';
-	if (!this.selectedFound) this.selectedNode = null;
-	this.completed = true;
-	return str;
-};
-
-// Creates the tree structure
-dTree.prototype.addNode = function(pNode) {
-	var str = '';
-	var n=0;
-	if (this.config.inOrder) n = pNode._ai;
-	for (n; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == pNode.id) {
-			var cn = this.aNodes[n];
-			cn._p = pNode;
-			cn._ai = n;
-			this.setCS(cn);
-			if (!cn.target && this.config.target) cn.target = this.config.target;
-			if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
-			if (!this.config.folderLinks && cn._hc) cn.url = null;
-			if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
-					cn._is = true;
-					this.selectedNode = n;
-					this.selectedFound = true;
-			}
-			str += this.node(cn, n);
-			if (cn._ls) break;
-		}
-	}
-	return str;
-};
-
-// Creates the node icon, url and text
-dTree.prototype.node = function(node, nodeId) {
-	var str = '<div class="dTreeNode">' + this.indent(node, nodeId);
-	if (this.config.useIcons) {
-		if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
-		if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
-		if (this.root.id == node.pid) {
-
-// commented, so we dont have all same root icons (NDEE)
-			//node.icon = this.icon.root;
-			node.iconOpen = this.icon.root;
-		}
-		str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
-	}
-	if (node.url) {
-		str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
-		if (node.title) str += ' title="' + node.title + '"';
-		if (node.target) str += ' target="' + node.target + '"';
-		if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.title + '\';return true;" onmouseout="window.status=\'\';return true;" ';
-
-// added 02-01-03 NDEE
-// for easier JS code in links
- 
-		//if (this.config.useJSCode) str += ' onClick="alert(\'' + node.urlClick + '\');return true;"';
-		if (this.config.useJSCode) str += ' onClick="' + node.urlClick + '"';
-		if (this.config.useJSCode) str += ' onMouseOut="' + node.urlOut + '"';
-		if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
-		str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';
-		str += '>';
-	}
-	else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
-		str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
-	str += node.name;
-	if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
-	str += '</div>';
-	if (node._hc) {
-		str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
-		str += this.addNode(node);
-		str += '</div>';
-	}
-	this.aIndent.pop();
-	return str;
-};
-
-// Adds the empty and line icons
-dTree.prototype.indent = function(node, nodeId) {
-	var str = '';
-	if (this.root.id != node.pid) {
-		for (var n=0; n<this.aIndent.length; n++)
-			str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
-		(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
-		if (node._hc) {
-			str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';
-			if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
-			else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
-			str += '" alt="" /></a>';
-		} else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
-	}
-	return str;
-};
-
-// Checks if a node has any children and if it is the last sibling
-dTree.prototype.setCS = function(node) {
-	var lastId;
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id) node._hc = true;
-		if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
-	}
-	if (lastId==node.id) node._ls = true;
-};
-
-// Returns the selected node
-dTree.prototype.getSelected = function() {
-	var sn = this.getCookie('cs' + this.obj);
-	return (sn) ? sn : null;
-};
-
-// Highlights the selected node
-dTree.prototype.s = function(id) {
-	if (!this.config.useSelection) return;
-	var cn = this.aNodes[id];
-	if (cn._hc && !this.config.folderLinks) return;
-	if (this.selectedNode != id) {
-		if (this.selectedNode || this.selectedNode==0) {
-			eOld = document.getElementById("s" + this.obj + this.selectedNode);
-			eOld.className = "node";
-		}
-		eNew = document.getElementById("s" + this.obj + id);
-		eNew.className = "nodeSel";
-		this.selectedNode = id;
-		if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
-	}
-};
-
-// Toggle Open or close
-dTree.prototype.o = function(id) {
-	var cn = this.aNodes[id];
-	this.nodeStatus(!cn._io, id, cn._ls);
-	cn._io = !cn._io;
-	if (this.config.closeSameLevel) this.closeLevel(cn);
-	if (this.config.useCookies) this.updateCookie();
-};
-
-// Open or close all nodes
-dTree.prototype.oAll = function(status) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
-			this.nodeStatus(status, n, this.aNodes[n]._ls)
-			this.aNodes[n]._io = status;
-		}
-	}
-	if (this.config.useCookies) this.updateCookie();
-};
-
-// Opens the tree to a specific node
-dTree.prototype.openTo = function(nId, bSelect, bFirst) {
-	if (!bFirst) {
-		for (var n=0; n<this.aNodes.length; n++) {
-			if (this.aNodes[n].id == nId) {
-				nId=n;
-				break;
-			}
-		}
-	}
-	var cn=this.aNodes[nId];
-	if (cn.pid==this.root.id || !cn._p) return;
-	cn._io = true;
-	cn._is = bSelect;
-	if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
-	if (this.completed && bSelect) this.s(cn._ai);
-	else if (bSelect) this._sn=cn._ai;
-	this.openTo(cn._p._ai, false, true);
-};
-
-// Closes all nodes on the same level as certain node
-dTree.prototype.closeLevel = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
-			this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);
-		}
-	}
-}
-
-// Closes all children of a node
-dTree.prototype.closeAllChildren = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
-			if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);		
-		}
-	}
-}
-
-// Change the status of a node(open or closed)
-dTree.prototype.nodeStatus = function(status, id, bottom) {
-	eDiv	= document.getElementById('d' + this.obj + id);
-	eJoin	= document.getElementById('j' + this.obj + id);
-	if (this.config.useIcons) {
-		eIcon	= document.getElementById('i' + this.obj + id);
-		eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
-	}
-	eJoin.src = (this.config.useLines)?
-	((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
-	((status)?this.icon.nlMinus:this.icon.nlPlus);
-	eDiv.style.display = (status) ? 'block': 'none';
-};
-
-
-// [Cookie] Clears a cookie
-dTree.prototype.clearCookie = function() {
-	var now = new Date();
-	var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
-	this.setCookie('co'+this.obj, 'cookieValue', yesterday);
-	this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
-};
-
-// [Cookie] Sets value in a cookie
-dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
-	document.cookie =
-		escape(cookieName) + '=' + escape(cookieValue)
-		+ (expires ? '; expires=' + expires.toGMTString() : '')
-		+ (path ? '; path=' + path : '')
-		+ (domain ? '; domain=' + domain : '')
-		+ (secure ? '; secure' : '');
-};
-
-// [Cookie] Gets a value from a cookie
-dTree.prototype.getCookie = function(cookieName) {
-	var cookieValue = '';
-	var posName = document.cookie.indexOf(escape(cookieName) + '=');
-	if (posName != -1) {
-		var posValue = posName + (escape(cookieName) + '=').length;
-		var endPos = document.cookie.indexOf(';', posValue);
-		if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
-		else cookieValue = unescape(document.cookie.substring(posValue));
-	}
-	return (cookieValue);
-};
-
-// [Cookie] Returns ids of open nodes as a string
-dTree.prototype.updateCookie = function() {
-	var str = '';
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
-			if (str) str += '.';
-			str += this.aNodes[n].id;
-		}
-	}
-	this.setCookie('co' + this.obj, str);
-};
-
-// [Cookie] Checks if a node id is in a cookie
-dTree.prototype.isOpen = function(id) {
-	var aOpen = this.getCookie('co' + this.obj).split('.');
-	for (var n=0; n<aOpen.length; n++)
-		if (aOpen[n] == id) return true;
-	return false;
-};
-
-// If Push and pop is not implemented by the browser
-if (!Array.prototype.push) {
-	Array.prototype.push = function array_push() {
-		for(var i=0;i<arguments.length;i++)
-			this[this.length]=arguments[i];
-		return this.length;
-	}
-};
-if (!Array.prototype.pop) {
-	Array.prototype.pop = function array_pop() {
-		lastElement = this[this.length-1];
-		this.length = Math.max(this.length-1,0);
-		return lastElement;
-	}
-};
diff --git a/phpgwapi/js/jsapi/egwCategories-plugin.js b/phpgwapi/js/jsapi/egwCategories-plugin.js
deleted file mode 100644
index d9352bf420..0000000000
--- a/phpgwapi/js/jsapi/egwCategories-plugin.js
+++ /dev/null
@@ -1,164 +0,0 @@
-  /***************************************************************************\
-  * eGroupWare - Javascript API                                               *
-  * http://www.egroupware.org                                                 *
-  * Written by:                                                               *
-  *  - Raphael Derosso Pereira <raphaelpereira@users.sourceforge.net>         *
-  *  - Vinicius Cubas Brand <viniciuscb@users.sourceforge.net>                *
-  *  sponsored by Think.e - http://www.think-e.com.br                         *
-  * ------------------------------------------------------------------------- *
-  *  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.                                               *
-  \***************************************************************************/
-
-	/*
-	 * eGroupWare Global API - Categories Handling Floating Window
-	 *
-	 */
-
-	function egwCategoriesPlugin()
-	{
-		this.window = null;
-		this.selectedCategories = new Array();
-		this.categories = new Array();
-		this.postURL = GLOBALS['serverRoot']+'/xmlrpc.php';
-	
-		//user-defined method to execute when window closes
-		this.onCloseHandler = null;
-
-		//user-defined method to execute when window changes
-		this.onChangeHandler = null;
-
-		this.DOM = new Object();
-
-		// Initialization
-		this.DOM.egw_categories = Element("egw_categories");
-		this.DOM.egw_categories_change = Element("egw_categories_change");
-		this.DOM.egw_categories_w_form = Element("egw_categories_w_form");
-		this.DOM.egw_categories_wcontent = Element("egw_categories_wcontent");
-		this.DOM.egw_categories_title = Element("egw_categories_title");
-		
-        this.window = new dJSWin(
-		{			'id': 'egwCategories',
-					'content_id': 'egw_categories_wcontent',
-					'win_class': 'row_off',
-					'width': '200px',
-					'height': '120px',
-					'title_color': '#3978d6',
-					'title': this.DOM.egw_categories_title.value,
-					'title_text_color': 'white',
-					'button_x_img': GLOBALS['egw_img_dir']+'/winclose.gif',
-					'border': true});
-	}
-
-	//receives an object with keys=keys of select, vals=vals to show
-	egwCategoriesPlugin.prototype.populate = function(population)
-	{
-		this.categories = population;
-		clearSelectBox(this.DOM.egw_categories,0);
-		fillSelectBox(this.DOM.egw_categories,this.categories);
-		this.selectedCategories = new Array();
-	}
-
-	//receives array or object with values=categories ids, fetch categories
-	//from egw via rpc call
-	egwCategoriesPlugin.prototype.setCategories = function(categories)
-	{
-
-	}
-	
-	egwCategoriesPlugin.prototype.selectCategories = function(selected)
-	{
-		this.selectedCategories = selected;
-		selectOptions(this.DOM.egw_categories,this.selectedCategories);
-		
-	}
-
-	//gets all selected categories values
-	egwCategoriesPlugin.prototype.getSelectedIDs = function()
-	{
-		return this.selectedCategories;
-	}
-
-	//gets all selected categories values
-	egwCategoriesPlugin.prototype.getSelectedNames = function()
-	{
-		var ret = new Array();
-		for (var i in this.selectedCategories)
-		{
-			ret.push(this.categories[this.selectedCategories[i]]);
-		}
-
-		return ret;
-	}
-	
-	//gets all selected categories values
-	egwCategoriesPlugin.prototype.getSelectedCategories = function()
-	{
-		var ret = new Object();
-		for (var i in this.selectedCategories)
-		{
-			ret[this.selectedCategories[i]] = (this.categories[this.selectedCategories[i]]);
-		}
-
-		return ret;
-	}	
-
-	egwCategoriesPlugin.prototype.close = function ()
-	{
-		this.window.close();
-	}
-
-	egwCategoriesPlugin.prototype.open = function ()
-	{
-		this.window.open();
-	}
-	
-	egwCategoriesPlugin.prototype.setOnChangeHandler = function(func)
-	{
-		this.onChangeHandler = func;	
-	}
-
-	/*********************************************************************\
-	 *                          Private Methods                          *
-	\*********************************************************************/
-
-
-	//method to execute when window closes without saving
-	egwCategoriesPlugin.prototype._onClose = function()
-	{
-		if (typeof(this.onCloseHandler) == 'function')
-		{
-			this.onCloseHandler();
-		}
-	}
-
-	//method to execute when window changes its value
-	egwCategoriesPlugin.prototype._changeCategories = function(handler)
-	{
-		this.selectedCategories = getSelectedOptions(this.DOM.egw_categories);
-		if (typeof(this.onChangeHandler) == 'function')
-		{
-			this.onChangeHandler();
-		}
-		this.window.close();
-	}
-
-	egwCategoriesPlugin.prototype._clearAll = function ()
-	{
-		// Clear information container 
-		this.selectedCategories = new Array();
-
-		// Clear Fields 
-		this.DOM.egw_categories_w_form.reset();
-	}
-		
-	egwCategoriesPlugin.prototype._disableAll = function ()
-	{
-	}
-
-	//just in the end of tpl
-	//egwCategories = new egwCategoriesPlugin();
-	
-
diff --git a/phpgwapi/js/jsapi/jsapi.js b/phpgwapi/js/jsapi/jsapi.js
index 58fd477fe8..2c00e96b80 100644
--- a/phpgwapi/js/jsapi/jsapi.js
+++ b/phpgwapi/js/jsapi/jsapi.js
@@ -1,17 +1,15 @@
-  /***************************************************************************\
-  * eGroupWare - JavaScript API                                               *
-  * http://www.egroupware.org                                                 *
-  * Written by:                                                               *
-  *  - Raphael Derosso Pereira <raphaelpereira@users.sourceforge.net>         *
-  *  - Jonas Goes <jqhcb@users.sourceforge.net>                               *
-  *  - Vinicus Cubas Brand <viniciuscb@users.sourceforge.net>                 *
-  *  sponsored by Thyamad - http://www.thyamad.com                            *
-  * ------------------------------------------------------------------------- *
-  *  This program is free software; you can redistribute it and/or modify it  *
-  *  under the terms of the GNU Lesser General Public License as published by *
-  *  the Free Software Foundation; either version 2 of the License, or (at    *
-  *  your option) any later version.                                          *
-  \***************************************************************************/
+/**
+ * eGroupWare - API
+ * http://www.egroupware.org
+ *
+ * This file was originally created Tyamad, but their content is now completly removed!
+ * It still contains some commonly used javascript functions, always included by EGroupware.
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage jsapi
+ * @version $Id$
+ */
 
 /***********************************************\
 *               INITIALIZATION                  *
@@ -41,485 +39,6 @@ else if (document.layers)
 	is_ns4 = true;
 }
 
-// DO NOT CHANGE THIS!!! Enable DEBUG inside Application!
-var DEBUG = false;
-
-/***********************************************\
- *                DATA FUNCTIONS               *
-\***********************************************/
-
-function serialize(data)
-{
-	var f = function(data)
-	{
-		var str_data;
-
-		if (data == null || 
-			(typeof(data) == 'string' && data == ''))
-		{
-			str_data = 'N;';
-		}
-
-		else switch(typeof(data))
-		{
-			case 'object':
-				var arrayCount = 0;
-
-				str_data = '';
-
-				for (i in data)
-				{
-					if (i == 'length')
-					{
-						continue;
-					}
-					
-					arrayCount++;
-					switch (typeof(i))
-					{
-						case 'number':
-							str_data += 'i:' + i + ';' + serialize(data[i]);
-							break;
-
-						case 'string':
-							str_data += 's:' + i.length + ':"' + i + '";' + serialize(data[i]);
-							break;
-
-						default:
-							showMessage(Element('cc_msg_err_serialize_data_unknown').value);
-							break;
-					}
-				}
-
-				if (!arrayCount)
-				{
-					str_data = 'N;';	
-				}
-				else
-				{
-					str_data = 'a:' + arrayCount + ':{' + str_data + '}';
-				}
-				
-				break;
-		
-			case 'string':
-				str_data = 's:' + data.length + ':"' + data + '";';
-				break;
-				
-			case 'number':
-				str_data = 'i:' + data + ';';
-				break;
-
-			case 'boolean':
-				str_data = 'b:' + (data ? '1' : '0') + ';';
-				break;
-
-			default:
-				showMessage(Element('cc_msg_err_serialize_data_unknown').value);
-				return null;
-		}
-
-		return str_data;
-	}
-
-	var sdata = f(data);
-	return sdata;
-}
-
-function unserialize(str)
-{
-	var f = function (str)
-	{
-		switch (str.charAt(0))
-		{
-			case 'a':
-				
-				var data = new Array();
-				var n = parseInt( str.substring( str.indexOf(':')+1, str.indexOf(':',2) ) );
-				var arrayContent = str.substring(str.indexOf('{')+1, str.lastIndexOf('}'));
-			
-				for (var i = 0; i < n; i++)
-				{
-					var pos = 0;
-
-					/* Process Index */
-					var indexStr = arrayContent.substr(pos, arrayContent.indexOf(';')+1);
-					var index = unserialize(indexStr);
-					pos = arrayContent.indexOf(';', pos)+1;
-					
-					/* Process Content */
-					var part = null;
-					switch (arrayContent.charAt(pos))
-					{
-						case 'a':
-							var pos_ = matchBracket(arrayContent, arrayContent.indexOf('{', pos))+1;
-							part = arrayContent.substring(pos, pos_);
-							pos = pos_;
-							data[index] = unserialize(part);
-							break;
-					
-						case 's':
-							var pval = arrayContent.indexOf(':', pos+2);
-							var val  = parseInt(arrayContent.substring(pos+2, pval));
-							pos = pval + val + 4;
-							data[index] = arrayContent.substr(pval+2, val);
-							break;
-
-						default:
-							part = arrayContent.substring(pos, arrayContent.indexOf(';', pos)+1);
-							pos = arrayContent.indexOf(';', pos)+1;
-							data[index] = unserialize(part);
-							break;
-					}
-					arrayContent = arrayContent.substr(pos);
-				}
-				break;
-				
-			case 's':
-				var pos = str.indexOf(':', 2);
-				var val = parseInt(str.substring(2,pos));
-				var data = str.substr(pos+2, val);
-				str = str.substr(pos + 4 + val);
-				break;
-
-			case 'i':
-			case 'd':
-				var pos = str.indexOf(';');
-				var data = parseInt(str.substring(2,pos));
-				str = str.substr(pos + 1);
-				break;
-			
-			case 'N':
-				var data = null;
-				str = str.substr(str.indexOf(';') + 1);
-				break;
-
-			case 'b':
-				var data = str.charAt(2) == '1' ? true : false;
-				break;
-		}
-		
-		return data;
-	}
-
-	return f(str);
-}
-
-function matchBracket(strG, iniPosG)
-{
-	var f = function (str, iniPos)
-	{
-		var nOpen, nClose = iniPos;
-		
-		do 
-		{
-			nOpen = str.indexOf('{', nClose+1);
-			nClose = str.indexOf('}', nClose+1);
-
-			if (nOpen == -1)
-			{
-				return nClose;
-			}
-			
-			if (nOpen < nClose )
-			{
-				nClose = matchBracket(str, nOpen);
-			}
-			
-		} while (nOpen < nClose);
-
-		return nClose;
-	}
-
-	return f(strG, iniPosG);
-}
-
-/***********************************************\
-*                 DATE FUNCTIONS                *
-\***********************************************/
-
-	/**
-	* Converts a date string into an object second to a php date() date format.
-	*
-	* The result object have three indexes: day, month and year; (now currently
-	* only accepts d , m , and Y in any position and with any separator in the
-	* (input) date description string).
-	*
-	* @author Vinicius Cubas Brand <vinicius@users.sourceforge.net>
-	*
-	* @param string dateString  The date string in a format described in
-	*   phpDateFormat, like for instance '2005/02/09'
-	* @param string phpDateFormat  The date descriptor in a php date() format,
-	*   like for instance 'Y/m/d'
-	* 
-	* @todo Other types handling
-	*/
-	function strtodate(dateString,phpDateFormat)
-	{
-		var _this = this;
-		var elements = new Object;
-		this.tmpelm = elements;
-		elements['d'] = { leng: 2, pos:-1};
-		elements['m'] = { leng: 2, pos:-1};
-		elements['Y'] = { leng: 4, pos:-1};
-	
-
-		//array to populate - sort order
-		var indexes = new Array();
-
-		for (var i in elements)
-		{
-			elements[i]['pos'] = phpDateFormat.indexOf(i);
-
-			indexes.push(i);
-		}
-
-		function sortingFunction(a,b) {
-			return _this.tmpelm[a]['pos'] - _this.tmpelm[b]['pos'];
-		};
-		
-		indexes.sort(sortingFunction);
-
-		var offset = 0;
-		for (var i in indexes)
-		{
-			var curr_index = indexes[i];
-			elements[curr_index]['start_pos'] = elements[curr_index]['pos'] + offset;
-			offset += elements[curr_index]['leng'] - 1;
-		}
-
-		for (var i in elements)
-		{
-			switch (i)
-			{
-				case 'd':
-					var day = parseInt(dateString.slice(elements[i]['start_pos'],elements[i]['start_pos']+elements[i]['leng']));
-					break;
-				case 'm':
-					var month = parseInt(dateString.slice(elements[i]['start_pos'],elements[i]['start_pos']+elements[i]['leng']));
-					break;
-				case 'Y':
-					var year = parseInt(dateString.slice(elements[i]['start_pos'],elements[i]['start_pos']+elements[i]['leng']));
-					break;
-			}
-		}
-		var ret = new Object();
-		ret['year'] = year;
-		ret['month'] = month - 1;
-		ret['day'] = day;
-		return ret;
-	}
-
-
-/***********************************************\
-*               AUXILIAR FUNCTIONS              *
-\***********************************************/
-
-/* 
-	function js2xmlrpc
-	@param methodName  the name of the method, for instance appointmentcenter.uixmlresponder.test
-	@param args        all args in sequence, passed to the xml-rpc method
-	@return            xml-rpc string corresponding to js objects passed in args
-*/
-function js2xmlrpc(methodName)
-{
-	var msg = new XMLRPCMessage(methodName);
-	for (var i = 1; i< arguments.length; i++)
-	{
-		if (i==1 && GLOBALS['extra_get_vars'] && typeof(arguments[i]) == 'object' 
-			&& typeof(GLOBALS['extra_get_vars']) == 'object')
-		{
-			arguments[i]['extra_get_vars'] = GLOBALS['extra_get_vars'];
-		}
-		msg.addParameter(arguments[i]);
-	}
-	return msg.xml();
-}
-
-
-/* 
-	function xmlrpc2js
-	@param responseText  The xml-rpc text of return of a xml-rpc function call
-	@return				 Javascript object corresponding to the given xmlrpc 
-*/
-
-var xmlrpcHandler = null;
-function xmlrpc2js(responseText)
-{
-	if (!xmlrpcHandler || typeof(xmlrpcHandler) != 'object')
-	{
-		xmlrpcHandler = importModule("xmlrpc");
-	}
-	return xmlrpcHandler.unmarshall(responseText);
-}
-
-function resizeIcon(id, action)
-{
-	var element = Element(id);
-	
-	if (action == 0)
-	{
-		CC_old_icon_w = element.style.width;
-		CC_old_icon_h = element.style.height;
-
-		element.style.zIndex = parseInt(element.style.zIndex) + 1;
-		element.style.width = '36px';
-		element.style.height = '36px';
-		element.style.top = (parseInt(element.style.top) - parseInt(element.style.height)/2) + 'px';
-		element.style.left = (parseInt(element.style.left) - parseInt(element.style.width)/2) + 'px';
-	}
-	else if (action == 1)
-	{
-		element.style.zIndex = parseInt(element.style.zIndex) - 1;
-		element.style.top = (parseInt(element.style.top) + parseInt(element.style.height)/2) + 'px';
-		element.style.left = (parseInt(element.style.left) + parseInt(element.style.width)/2) + 'px';
-		element.style.width = CC_old_icon_w;
-		element.style.height = CC_old_icon_h;
-	}
-}
-
-function Element (element)
-{
-	/* IE OBJECTS */
-	if (document.all)
-	{
-		return document.all[element];
-	}
-	/* MOZILLA OBJECTS */
-	else if (document.getElementById)
-	{
-		return document.getElementById(element);
-	}
-	/* NS4 OBJECTS */
-	else if (document.layers)
-	{
-		return document.layers[element];
-	}
-}
-
-function removeHTMLCode(id)
-{
-	Element(id).parentNode.removeChild(Element(id));
-}
-
-function addHTMLCode(parent_id,child_id,child_code,surround_block_tag)
-{
-	var obj = document.createElement(surround_block_tag);
-	Element(parent_id).appendChild(obj);
-	obj.id = child_id;
-	obj.innerHTML = child_code;
-	return obj;
-}
-
-function adjustString (str, max_chars)
-{
-	if (str.length > max_chars)
-	{
-		return str.substr(0,max_chars) + '...';
-	}
-	else
-	{
-		return str;
-	}
-}
-
-function addSlashes(code)
-{
-	for (var i = 0; i < code.length; i++)
-	{
-		switch(code.charAt(i))
-		{
-			case "'":
-			case '"':
-			case "\\":
-				code = code.substr(0, i) + "\\" + code.charAt(i) + code.substr(i+1);
-				i++;
-				break;
-		}
-	}
-
-	return code;
-}
-
-function htmlSpecialChars(str)
-{
-	// TODO: Not implemented!!!
-	var pos = 0;
-	
-	for (var i = 0; i < str.length; i++)
-	{
-		
-	}
-}
-
-function replaceComAnd(str, replacer)
-{
-	var oldPos = 0;
-	var pos = 0;
-	
-	while ((pos = str.indexOf('&', pos)) != -1)
-	{
-		str = str.substring(oldPos, pos) + replacer + str.substring(pos+1);
-	}
-
-	return str;
-}
-
-function Timeout(control, code, maxCalls, actualCall, singleTimeout)
-{
-	if (control())
-	{
-		if (typeof(code) == 'function')
-		{
-			code();
-		}
-		else
-		{
-			eval(code);
-		}
-		
-		return true;
-	}
-
-	if (!actualCall)
-	{
-		actualCall = 1;
-	}
-
-	if (!maxCalls)
-	{
-		maxCalls = 100;
-	}
-
-	if (actualCall == maxCalls)
-	{
-		showMessage(Element('cc_msg_err_timeout').value);
-		return false;
-	}
-
-	if (!singleTimeout)
-	{
-		singleTimeout = 100;
-	}
-
-	setTimeout(function(){Timeout(control,code,maxCalls,actualCall+1,singleTimeout);}, singleTimeout);
-}
-
-function showMessage(msg, type)
-{
-	// TODO: Replace alert with 'loading' style div with Ok button
-
-	switch(type)
-	{
-		case 'confirm':
-			return confirm(msg);
-
-		default:
-			alert(msg);
-			return;
-	}
-}
-
 // works only correctly in Mozilla/FF and Konqueror
 function egw_openWindowCentered2(_url, _windowName, _width, _height, _status)
 {
@@ -529,12 +48,13 @@ function egw_openWindowCentered2(_url, _windowName, _width, _height, _status)
 	positionLeft = (windowWidth/2)-(_width/2)+egw_getWindowLeft();
 	positionTop  = (windowHeight/2)-(_height/2)+egw_getWindowTop();
 
-	windowID = window.open(_url, _windowName, "width=" + _width + ",height=" + _height + 
+	windowID = window.open(_url, _windowName, "width=" + _width + ",height=" + _height +
 		",screenX=" + positionLeft + ",left=" + positionLeft + ",screenY=" + positionTop + ",top=" + positionTop +
 		",location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status="+_status);
-	
+
 	return windowID;
 }
+
 function egw_openWindowCentered(_url, _windowName, _width, _height)
 {
 	return egw_openWindowCentered2(_url, _windowName, _width, _height, 'no');
@@ -624,388 +144,3 @@ function egw_getWindowOuterHeight()
 		return egw_getWindowInnerHeight();
 	}
 }
-
-/***********************************************\
-*      HTML ELEMENTS AUXILIAR FUNCTIONS         *
-\***********************************************/
-
-//-------------------SELECT-------------------------
-
-/* Copy the selected values from one select box to another */
-function copyFromSelects(origSelectObj,destSelectObj)
-{
-	var selectBox1 = origSelectObj;
-	var selectBox2 = destSelectObj;
-	var exists;
-	
-	if (selectBox1 == null || selectBox2 == null)
-	{
-		return false;
-	}
-	
-	var max1 = selectBox1.options.length;
-	var max2 = selectBox2.options.length;	
-	
-	for (var i=0 ; i < max1 ; i++)
-	{
-		if (selectBox1.options[i].selected)
-		{
-			exists = false;
-			for (var j=0 ; j < max2 ; j++)
-			{
-				if (selectBox1.options[i].value == selectBox2.options[j].value)
-				{
-					exists = true;
-				}
-			}
-
-			if (exists == false)
-			{
-				selectBox2.options[selectBox2.length] = new Option(selectBox1.options[i].text,selectBox1.options[i].value);
-				selectBox1.options[i].selected = false;
-			}
-		}
-	}
-}
-
-function removeSelectedOptions(selectId)
-{
-	var selectBox1 = Element(selectId);
-	
-	if (selectBox1 == null)
-	{
-		return false;	
-	}
-	
-	for (var i=0; i < selectBox1.options.length; )
-	{
-		if (selectBox1.options[i].selected)
-		{
-			selectBox1.removeChild(selectBox1.options[i]);	
-		}
-		else
-		{
-			i++;	
-		}
-	}
-	
-}
-
-function clearSelectBox(obj, startIndex)
-{
-	var nOptions = obj.options.length;
-
-	for (var i = nOptions - 1; i >= startIndex; i--)
-	{
-		obj.removeChild(obj.options[i]);
-	}
-}
-
-function fillSelectBox(obj,data)
-{
-
-	if (typeof(data) != 'object')
-	{
-		return false;
-	}
-	
-	var i;
-		
-	//include new options
-	for (i in data)
-	{
-		if (typeof(data[i]) == 'function')
-		{
-			continue;
-		}
-
-		obj.options[obj.length] = new Option(data[i],i);
-	}
-}
-
-//use for select-multiple. The values of opts will be selected.
-function selectOptions (obj,opts)
-{
-	if (obj == false || obj.options == false)
-	{
-		throw('selectOptions: invalid object given as param');
-		return false;	
-	}
-	if (opts == undefined || opts == null) //clean everything
-	{
-		var objtam  = obj.options.length;
-		for (var i=0; i < objtam; i++)
-		{
-			obj.options[i].selected = false;	
-		}
-	}
-	else
-	{		
-		if (typeof(opts) != 'object')
-		{
-			//throw('selectOptions: opts must be an element of type Array or Object');
-			return false;
-		}
-
-		var objtam  = obj.options.length;
-		var optstam = opts.length;
-
-		for (var i=0; i < objtam; i++)
-		{
-			obj.options[i].selected = false;
-			for (var j in opts)
-			{
-				if (obj.options[i].value == opts[j])
-				{
-					obj.options[i].selected = true;
-				}
-			}
-		}
-	}
-
-}
-
-//return selected options of a select in an array
-function getSelectedOptions(obj)
-{
-	if (obj == null)
-	{
-		throw('getSelectedOptions: invalid object');
-		return new Array();
-	}
-	
-	var max = obj.options.length;
-	var response = new Array();
-	
-	for (var i=0; i< max; i++)
-	{
-		if (obj.options[i].selected)
-		{
-			response.push(obj.options[i].value);	
-		}
-	}
-	return response;
-}
-
-//return selected values of a select in an array
-function getSelectedValues(obj)
-{
-	if (obj == null || typeof(obj) != 'object')
-	{
-		return new Object();
-	}
-
-	var max = obj.options.length;
-	var response = new Object();
-	
-	for (var i=0; i< max; i++)
-	{
-		if (obj.options[i].selected)
-		{
-			response[obj.options[i].value] = obj.options[i].text;
-		}
-	}
-	return response;
-}
-
-//return all options of a select in an array
-function getAllOptions(id)
-{
-	var	obj = Element(id);
-	
-	if (obj == null)
-	{
-		throw('getSelectedOptions: invalid object');
-		return new Array();
-	}
-	
-	var max = obj.options.length;
-	var response = new Array();
-	
-	for (var i=0; i< max; i++)
-	{
-		response.push(obj.options[i].value);	
-	}
-	return response;
-}
-
-
-//-------------------RADIO-------------------------
-
-function selectRadio (id, index)
-{
-	var obj = Element(id);
-	var max = obj.options.length;
-	for (var i = 0; i < max; i++)
-	{
-		i == index ? obj.options[i].checked = true : obj.options[i].checked = false;
-	}
-}
-
-function getSelectedRadio(obj)
-{
-	if (obj.type == 'radio')
-	{
-		if (obj.checked)
-		{
-			return obj.value;
-		}
-	}
-	else if (obj.length)
-	{
-		var max = obj.length;
-		for (var i = 0; i < max; i++)
-		{
-			if (obj[i].checked)
-			{
-				return obj[i].value;	
-			}	
-		}
-	}
-	return null;
-}
-
-
-/***********************************************\
-*                   JSLIB OBJECT                *
-\***********************************************/
-
-function cJsLib ()
-{
-	this._functions = new Array();
-	this._arguments = new Array();
-	this._original_body_onload = null;
-
-	this.loaded = false;
-}
-
-//postpone function to be executed after body had loaded
-cJsLib.prototype.postponeFunction = function(obj_function)
-{
-	if (typeof(obj_function) != 'function')
-	{
-		throw ('JsLib.postponeFunction: parameter must be a function');	
-	}
-	
-	this._functions.push(obj_function);
-	
-	// 'arguments' are all args passed to this function
-	var args = new Array();
-	for (var i = 1; i< arguments.length; i++)
-	{
-		args.push(arguments[i]);
-	}
-
-	if (args.length)
-	{
-		this._arguments.push(args);
-	}
-	this.init();
-}
-
-//exec postponed functions
-cJsLib.prototype.execPostponed = function(e)
-{
-	if (this._original_body_onload != null)
-	{
-		this._original_body_onload();	
-	}
-	
-	var code = '';
-	var _this = this;
-	
-	for (var i in this._functions)
-	{
-		if (typeof(this._functions[i]) != 'function')
-		{
-			continue;
-		}
-		
-		if (typeof(this._arguments[i]) == 'object')
-		{
-			code += 'this._functions['+i+'](';
-			for (var j in _this._arguments[i])
-			{
-				code += this._arguments[i][j]+',';
-			}
-
-			code = code.substr(code, code.length-1);
-			code += ');';
-
-			continue;
-		}
-
-		code += 'this._functions['+i+']();';
-	}
-
-	eval(code);
-
-	for (var i in this._functions)
-	{
-		if (typeof(this._arguments[i]) == 'object')
-		{
-			delete this._arguments[i];
-			this._arguments[i] = null;
-		}
-
-		delete this._functions[i];
-		this._functions[i] = null;
-	}
-}
-
-//put function on body onload
-cJsLib.prototype.init = function()
-{
-/*	if (this.initialized)
-	{
-		return;
-	}
-*/
-	this.initialized = true;
-
-	var _this = this;
-	var init = function()
-	{
-		_this.execPostponed();
-	};
-
-	Timeout(function() { if (document.body) return true; else return false;}, init);
-}
-
-var JsLib = new cJsLib();
-
-// Insert Debug Holder
-function _createDebugDOM()
-{
-	var dbg_holder = document.createElement('xmp');
-	
-	dbg_holder.id = 'jsapiDebug';
-	dbg_holder.style.position = 'absolute';
-	dbg_holder.style.left = '1500px';
-	dbg_holder.style.top = '0px';
-	dbg_holder.style.fontFamily = 'monospace';
-	
-	var func = function()
-	{
-		document.body.appendChild(dbg_holder);
-	}
-	
-	JsLib.postponeFunction(func);
-}
-
-/***********************************************\
-*                   CONSTANTS                   *
-\***********************************************/
-
-/***********************************************\
-*               GLOBALS VARIABLES               *
-\***********************************************/
-
-/***********************************************\
-*                OTHER FUNCTIONS                *
-\***********************************************/
-
-//JsLib.postponeFunction(function ()
-//{
-//	dynapi.setPath(GLOBALS['serverRoot']+'/phpgwapi/js/dynapi');
-//});
diff --git a/phpgwapi/js/jsolait/copying.txt b/phpgwapi/js/jsolait/copying.txt
deleted file mode 100644
index b1e3f5a263..0000000000
--- a/phpgwapi/js/jsolait/copying.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/phpgwapi/js/jsolait/doc/codecs.xhtml b/phpgwapi/js/jsolait/doc/codecs.xhtml
deleted file mode 100644
index 236c662b3e..0000000000
--- a/phpgwapi/js/jsolait/doc/codecs.xhtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | codecs</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.codecs" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    codecs</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-        <h1>Module codecs</h1>
-        This module extends the String class with encoding and decoding functionalities.<br />
-        
-        <br />
-        
-        <div class="contentItem"><h2>public methods:<a class="bttop" href="#top">â–²</a></h2><div>
-          
-             <h3>listEncoders()</h3><div class="indent">
-                    Returns an Array with all encoder names.<br />
-             </div>
-             <h3>listDecoders()</h3><div class="indent">
-                    Returns an Arra with all decoder names.<br />
-             </div>
-        </div></div>
-        
-        <div class="contentItem"><h2>globals:<a class="bttop" href="#top">â–²</a></h2><div>
-          
-             <h3>String::decode(codec)</h3><div class="indent">
-                          Decodes an encoded string using the codec specified by the <code>codec</code>parameter .<br />
-                          All parameters but the <code>codec</code> parameter are forwarded to the codec.<br />
-             </div>
-             <h3>String::encode(codec)</h3><div class="indent">
-                        Encodes a string using the codec specified by the <code>codec</code> parameter.<br />
-                        All Parameters but the <code>codec</code> parameter are forwarded to the codec.<br />
-             </div>
-             <h3>String::decode_base64()</h3><div class="indent">
-                          Decodes a Base64 encoded string to a byte string.<br />
-             </div>
-             <h3>String::encode_base64()</h3><div class="indent">
-                          Encodes a string using Base64.<br />
-             </div>
-             <h3>String::decode_uri()</h3><div class="indent">
-                          Decodes a URI using decodeURI.<br />
-             </div>
-             <h3>String::encode_uri()</h3><div class="indent">
-                          Encodes a URI using encodeURI.<br />
-             </div>
-        </div></div>
-        
-        <div class="contentItem"><h2>codecs<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            Currently there are only two codecs <b>base64</b> and <b>uri</b>.<br />
-            If you want to add your own codecs at runtime just extend the Stringl class by adding a 
-            <code>String.prototype.encode_yourCodec</code> or
-            <code>String.prototype.decode_yourCodec</code> method.
-        </div></div>
-    </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/crypto.xhtml b/phpgwapi/js/jsolait/doc/crypto.xhtml
deleted file mode 100644
index 6d51b64f43..0000000000
--- a/phpgwapi/js/jsolait/doc/crypto.xhtml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | crypto</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.crypto" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    crypto</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module crypto</h1>
-         This module adds cryptographic services to jsolait.
-         <br />
-         
-         <div class="contentItem"><h2>public members:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>listEncrypters()</h3><div class="indent">
-                              Returns an Array of all available encrypter names.<br />
-                 </div>
-                 <h3>listDecrypters()</h3><div class="indent">
-                              Returns an Array of all available decrypter names.<br />
-                 </div>
-         </div></div>
-         
-         <div class="contentItem"><h2>globals:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>String::encrypt(crydec)</h3><div class="indent">
-                              Encrypts a string using the encrypter specified by the <code>crydec</code>.<br />
-                            All parameters but the <code>crypdec</code> parameter are forwardet to the encrypter.<br />
-                 </div>
-                 <h3>String::decrypt(crydec)</h3><div class="indent">
-                              Decrypts a string using the decrypter specified by the <code>crydec</code>.<br />
-                            All parameters but the <code>crypdec</code> parameter are forwardet to the decrypter.<br />
-                 </div>
-                 <h3>String::encrypt_xor(key)</h3><div class="indent">
-                              Encrypts a string by  XOR.<br />
-                              The whole String will be XORed with the <code>key</code> parameter. <br />
-                              If the key is shorter than the String then it will be multiplied to fit the length of the String.<br />
-                 </div>
-                 <h3>String::decrypt_xor</h3><div class="indent">
-                              Decrypts a string using XOR.<br />
-                            Since XORing is symetric it is the same as the encrypter.<br />
-                 </div>
-                 <h3>String::encrypt_rc4(key)</h3><div class="indent">
-                              Encrypts a string using the ARC4 algorithm.<br />
-                             The key is a String and can be of any length.
-                 </div>
-                 <h3>String::decrypt_rc4</h3><div class="indent">
-                              Decrypts a string using the ARC4 algorithm.<br />
-                            Since it is symetric it is the same as the encrypter.<br />
-                 </div>
-         </div></div>
-         
-         <div class="contentItem"><h2>encrypters/decrypters<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            Currently there are only two encrypters/decrypters <b>xor</b> and <b>rc4</b>.<br />
-            If you want to add your own at runtime just extend the Stringl class by adding a 
-            <code>String.prototype.encrypt_yourEncrypter</code> or
-            <code>String.prototype.decrypt_yourDecrypter</code> method.
-        </div></div>
-        
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/highlight.css b/phpgwapi/js/jsolait/doc/highlight.css
deleted file mode 100644
index 7d02fd65e7..0000000000
--- a/phpgwapi/js/jsolait/doc/highlight.css
+++ /dev/null
@@ -1,88 +0,0 @@
-.S0 {
-	color: #808080;
-}
-.S1 {
-	color: #007F00;
-}
-.S2 {
-	color: #007F00;
-}
-.S3 {
-	color: #3F70AA;
-}
-.S4 {
-	color: #007F7F;
-}
-.S5 {
-	font-weight: bold;
-	color: #00007F;
-}
-.S6 {
-	color: #7F007F;
-}
-.S10 {
-	font-weight: bold;
-	color: #000000;
-}
-.S15 {
-	color: #3F70AA;
-}
-.S18 {
-	color: #804020;
-}
-span {
-	font-family: Verdana;
-	font-size: 10pt;
-}
-
-S50 {
-    font-family: Times New Roman;
-    color: #000000;
-    font-size: 11pt;
-}
-.S51 {
-    color: #000080;
-}
-.S53 {
-    color: #008080;
-}
-.S56 {
-    color: #7F007F;
-}
-.S58 {
-    color: #800080;
-}
-.S510 {
-    font-family: Times New Roman;
-    color: #800080;
-    font-size: 11pt;
-}
-.S511 {
-    color: #000080;
-}
-.S521 {
-    color: #000080;
-}
-.S522 {
-    font-weight: bold;
-    color: #000080;
-}
-.S523 {
-    color: #006600;
-}
-.S524 {
-    color: #800000;
-}
-
-.code{
-    padding:0.5em;
-    border:solid;
-    border-width:1px;
-    margin-left:1em;
-    margin-top:2em;
-    margin-bottom:1em;
-}
-
-code{
-    font-size:115%;
-}
diff --git a/phpgwapi/js/jsolait/doc/html.css b/phpgwapi/js/jsolait/doc/html.css
deleted file mode 100644
index dff7c2793c..0000000000
--- a/phpgwapi/js/jsolait/doc/html.css
+++ /dev/null
@@ -1,293 +0,0 @@
-
-html{
-    background-color:lightsteelblue;
-    font-size:14px;
-    font-family:Arial,sans-serif;
-}
-
-body{
-    padding:0em;
-    margin:0em;
-    height:100%;
-}
-
-
-div.navigationBar{
-    color:aliceblue;
-    z-index:98;     
-    position:absolute;
-    position:fixed;
-    left:0em;
-    top:0em;
-    width:100%;
-    height:1.6em;
-    padding-left:0.5em;
-    padding-top:0.3em;
-    padding-bottom:0em;
-    background-color:slategray;
-    font-weight:bold;
-    border-bottom:1px solid black;
-}    
-
-
-div.navigationBar a{
-    color:aliceblue;
-    text-decoration:none;
-}
-
-div.navigationBar a:link{
-    color:aliceblue;
-   text-decoration:none;
-}
-
-div.navigationBar a:visited{
-    color:aliceblue;
-    text-decoration:none;    
-}
-div.navigationBar a:active{
-    color:white;
-    text-decoration:none;
-}
-
-div.navigationBar a:hover{
-   color:white;
-   text-decoration:underline;
-}
-
-/*-----------------------------------------------------------------------*/
-div.menu{
-    color:aliceblue;
-    z-index:98;     
-    position:absolute;
-    position:fixed;
-    margin-top:0.1em;
-    top:2em;
-    left:0em;
-    width:11em;
-    min-height:20em;
-    height:95%;
-    bottom:1em;
-    background-color:slategray;
-    font-weight:bold;
-    padding-left:1em;
-    padding-top:1em;
-    padding-right:1em;
-    padding-bottom:1em;
-    border-top:1px solid black;
-    border-right:1px solid black;
-    border-bottom:1px solid black;
-}    
-
-
-div.menu ul{
-    padding-left:1em;
-    margin-left:0em;
-}
-div.menu ul li{
-    padding-bottom:0.5em;
-}
-
-div.menu a{
-    padding:0em;
-    color:aliceblue;
-    text-decoration:none;
-    font-size:13px;
-}
-
-div.menu a:link{
-    color:aliceblue;
-    text-decoration:none;
-}
-
-div.menu a:visited{
-    color:aliceblue;
-    text-decoration:none;
-}
-div.menu a:active{
-    color:white;
-    text-decoration:underline;
-}
-
-div.menu a:hover{
-   color:white;
-   text-decoration:underline;
-}
-
-
-div.menu div.copyright{
-    z-index:99;
-    border:none;  
-    position:absolute;
-    bottom:2em;
-    width:19em;
-    height:2em;
-    left:0.5em;
-    margin-left:0em;
-    padding:0em;
-    font-size:10px;
-    font-weight:normal;
-}
-
-div.menu div.donate{
-    z-index:99;
-    border:none;  
-    position:absolute;
-    bottom:5em;
-    width:3em;
-    height:3em;
-    margin-left:3.5em;
-    font-size:10px;
-    font-weight:normal;
-}
-
-a{
-    color:darkblue;
-}
-
-a:hover{
-   color:blue;
-   text-decoration:underline;
-}
-
-a:visited{
-    color:darkslategray;
-    text-decoration:underline;
-}
-
-/*-----------------------------------------------------------------*/
-
-h1{
-    font-size:16px;
-    font-weight:bold;
-    font-family:sans-serif;
-}
-
-h2{
-    font-size:15px;
-    font-weight:bold;
-    font-family:sans-serif;
-}
-
-h3{
-    font-size:14px;
-    font-weight:bold;
-    font-family:sans-serif;
-    padding-bottom:0em;
-    margin-bottom:0.2em;
-}
-
-div.content{
-    z-index:0;
-    padding:0.5em;
-    position:absolute;
-    left:14em;
-    top:2.5em;
-    width:45em;
-}
-
-div.contentItem{
-    padding:0em;
-    margin-bottom:3em;
-}
-
-div.contentItem h2{
-    height:20px;
-    padding-left:0.5em;
-    margin-left:0;
-    margin-bottom:0.5em;
-    margin-top:1.5em;
-    left:0em;
-    top:0em;
-    width:43em;
-    color:aliceblue;     
-    background-color:slategray;
-}
-
-div.contentItem div h2{
-    width:42em;
-}
-
-div.contentItem h2 a{
-    padding:0em;
-    margin-right:0;
-    margin-left:0;
-    color:aliceblue;
-    background-color:slategray;
-}
-
-
-div.contentItem h2 a:visited{
-    color:aliceblue;
-    background-color:slategray;
-}
-
-div.contentItem h2 a:active{
-    color:white;
-    background-color:slategray;
-}
-
-
-div.contentItem h2 a:hover{
-    color:white;
-    background-color:slategray;
-}
-
-
-div.contentItem h2 a:link{
-    color:aliceblue;
-    background-color:slategray;
-}
-
-
-div.contentItem a.bttop{
-    position:absolute;
-    left:43em;
-    color:aliceblue;
-    background-color:slategray;
-}
-
-
-div.contentItem a.bttop:link{
-    color:aliceblue;
-    text-decoration:none;
-}
-
-div.contentItem a.bttop:visited{
-    color:aliceblue;
-    text-decoration:none;
-}
-
-div.contentItem a.bttop:active{
-    color:white;
-    text-decoration:underline;
-}
-
-div.contentItem a.bttop:hover{
-    color:white;
-    text-decoration:underline;
-}
-
-div.contentItem div{
-    margin-left:1em;
-    margin-top:0;
-}
-
-button{
-    background-color:slategray;
-    border:1px;
-    border-style:solid;
-    border-color:black;
-    margin-right:1em;
-} 
-
-
-div.indent{
-    margin-left:1em;    
-}
-
-
-.code{
-    background-color:aliceblue;
-}
-    
-    
\ No newline at end of file
diff --git a/phpgwapi/js/jsolait/doc/index.xhtml b/phpgwapi/js/jsolait/doc/index.xhtml
deleted file mode 100644
index 78e45b9a2f..0000000000
--- a/phpgwapi/js/jsolait/doc/index.xhtml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>jsolait 1.0 documentation</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="JavaScript, OOP, object oriented programming, OOP in JavaScript, JS, OOP JS, tutorial, prototyping, inheritance, subclassing, data hiding" />
-    <link rel="stylesheet" type="text/css" href="./highlight.css" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar">documentation</div>
-    <div class="menu">
-      <ul>
-        <li>
-          <a href="./tutorial.xhtml">Tutorial</a>
-        </li>
-      </ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-        <h1>JavaScript o Lait documentation</h1>
-        Version 1.0<br />
-        October 2004<br />
-        <br />
-        
-        <div class="contentItem"><h2><a href="./tutorial.xhtml">Tutorial</a><a class="bttop" href="#top">â–²</a></h2><div>
-            
-            This is a good starting point if you have not worked with jsolait before.
-        </div></div>
-        
-        <div class="contentItem"><h2>Modules<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            
-            <h3><a href="./jsolait.xhtml">jsolait</a></h3><div class="indent">
-                
-                The main module containing the basic jsolait functionality.
-            </div>
-            <br />
-            <h3><a href="./codecs.xhtml">codecs</a></h3><div class="indent">
-                
-                Provides String encoding and decoding functionalities.
-            </div>
-            <h3><a href="./crypto.xhtml">crypto</a></h3><div class="indent">
-                
-                Provides cryptographic services.
-            </div>
-            <h3><a href="./jsonrpc.xhtml">jsonrpc</a></h3><div class="indent">
-                
-                An implementation of the <a href="http://json-rpc.org" target="_blank">JSON-RPC</a> protocoll.
-            </div>
-            <h3><a href="./lang.xhtml">lang</a></h3><div class="indent">
-                
-                Provides language services. E.g. a JavaScript tokenizer.
-            </div>
-            <h3><a href="./stringformat.xhtml">stringformat</a></h3><div class="indent">
-                
-                This module is automatically loaded with the main module. It provides some powerful string formatting.
-            </div>
-            <h3><a href="./urllib.xhtml">urllib</a></h3><div class="indent">
-                
-                Provides methods to make HTTP requests.
-            </div>
-            <h3><a href="./xml.xhtml">xml</a></h3><div class="indent">
-                
-                Provides XML services.
-            </div>
-            <h3><a href="./xmlrpc.xhtml">xmlrpc</a></h3><div class="indent">
-                
-                An implementation of the <a href="http://xml-rpc.com" target="_blank">XML-RPC</a> protocoll.
-            </div>
-            
-        </div></div>
-        
-        <div class="contentItem"><h2>Usage/Installation<a class="bttop" href="#top">â–²</a></h2><div>
-            
-                JavaScript o lait was designed to be used in web pages(HTML/SVG) but is not limited to it.
-                The simplest way to use it is to copy the jsolait folder to your project directory and include the main file into the web page by reference.<br />
-                In HTML use the script element:<br />
-                <span class="S51">&lt;script</span><span class="S58"> </span><span class="S53">type</span><span class="S58">=</span><span class="S56">"text/javascript"</span><span class="S58"> </span><span class="S53">src</span><span class="S58">=</span><span class="S56">"./jsolait/init.js"</span><span class="S51">&gt;&lt;/script&gt;</span><br />
-                In SVG it is similar:<br />
-                <span class="S51">&lt;script</span><span class="S58"> </span><span class="S53">type</span><span class="S58">=</span><span class="S56">"text/ecmascript"</span><span class="S58"> </span><span class="S53">xlink:href</span><span class="S58">=</span><span class="S56">"./jsolait/init.js"</span><span class="S511">/&gt;</span><br />
-                <br />
-                You can also use jsolait with WScript by running the init.js script and pass the script to be executed as a command line argument:<br />
-                <code>cscript.exe /nologo "c:\path_to_jsolait_folder\init.js" "file://path_to_script\your_script.js"</code><br />
-                <br />
-                See <a href="./jsolait.xhtml">jsolait</a> module documentation for customization and requirements.
-            
-        </div></div>
-    </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/jsolait.xhtml b/phpgwapi/js/jsolait/doc/jsolait.xhtml
deleted file mode 100644
index fde9aa372d..0000000000
--- a/phpgwapi/js/jsolait/doc/jsolait.xhtml
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | jsolait</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.lang" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    jsolait</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module jsolait</h1>
-            This is the main module.<br />
-            It is used by all jsolait modules and provides the basic functionality.<br />
-         <div class="contentItem"><h2>public members:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-               
-               <h3>baseURL</h3><div class="indent">
-                    
-                    The base URL to use when dynamically loading user modules.
-                </div>  
-               <h3>libURL</h3><div class="indent">
-                    
-                    The url of the jsolait installation, used for dynamically loading jsolait modules.
-                </div>  
-                
-               <br />
-                <h3>ModuleImportFailed()</h3><div class="indent">
-                    
-                    Exception thrown when a module could not be imported.
-                </div>  
-                <h3></h3><div class="indent">
-                    
-                </div>  
-                
-               <br /> 
-               <h3>importModule(moduleName)</h3><div class="indent">
-                    
-                   Imports a module given its name(e.g. "someModule.someSubModule").<br />
-                   For dynamic loading of modules:<br />
-                   A module's file location is determined by treating each module name as a directory.<br />
-                   Only the last one is assumed to point to a file.<br />
-                   If the module's URL is not known to jsolait then it will be searched for in jsolait.baseURL which is "." by default.<br />
-                </div>  
-                
-               <h3>reportException(e)</h3><div class="indent">
-                    
-                    Displays an Exception <code>e</code> and it's trace.<br />
-                    This is better than <code>alert(e)</code>.
-               </div>  
-         </div></div>
-         
-         <div class="contentItem"><h2>globals:<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            <h3>jsolait</h3><div class="indent">
-                
-                The jsolait module.
-            </div>
-            
-            <h3>Class(className, superClass, classScope)</h3><div class="indent">
-                
-                A method for creating Classes.<br />
-                The <code>className</code> parameter is not needed if the Class is going to be a public member of a module.<br />
-                The <code>superClass</code> parameter must be specified if the new class is to be a subclass of the class specified by <code>superClass</code>.
-                The <code>classScope</code> is a <code>ClassScope</code> function and defines the scope of the class.<br />
-                <br />
-                Each class created by this method has the following properies and methods:<br />
-                <ul>
-                    <li><b>className</b> The name of the class.</li>
-                    <li><b>superClass</b> The super class of the class</li>
-                </ul>
-                <br />
-            </div>
-            
-            <h3>Module(name, version, moduleScope)</h3><div class="indent">
-                
-                A method for creating modules.<br />
-                The <code>name</code> parameter defines the name of the module.<br />
-                The <code>version</code> parameter contains the version of the module.<br />
-                The <code>moduleScope</code> is a <code>ModuleScope</code> function and defines the scope of the module.<br />
-                <br />
-                Modules created with this function have the following properties:<br />
-                <ul>
-                    <li><b>name</b> The name of the module.</li>
-                    <li><b>version</b> The module's version.</li>
-                    <li><b>Exception</b> The base class for all exception classes in the module.</li>
-                </ul>
-            </div>
-            
-            <br />
-            
-            <h3>importModule(moduleName)</h3><div class="indent">
-                
-                The globalized jsolait.importModule method.
-            </div>
-            
-            <h3>reportException(e)</h3><div class="indent">
-                
-                The globalized jsolait.reportException method.
-            </div>
-         </div></div>
-         
-         <div class="contentItem"><h2>interfaces:<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            
-            <h3>ClassScope(publ, supr)</h3><div class="indent">
-                
-                The ClassScope is a function which is called by the Class method when a new class is constructed.<br />
-                The <code>publ</code> parameter contains the new class' prototype object.<br />
-                All objects added to this object become public members of the new class.<br />
-                The <code>supr</code> parameter contains a wrapper function for easyly calling the super class' methods<br />
-                Everything declared with var inside the scope becomes "private" to the scope, i.e. is only visible within the scope.<br />
-            </div>
-            
-            <h3>ModuleScope(mod)</h3><div class="indent">
-                
-                The ModuleScope is a function which is called by the Module function when a new module is created.<br />
-                All objects added to the <code>mod</code> parameter will become public members of the module.<br />
-                It will already contain the modules porperties like name, version and the Exception class.<br />
-            </div>
-         </div></div>
-         
-         <div class="contentItem"><h2>requirements:<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            For dynamic loading of modules a synchronous HTTP connection must be available. Mozilla and IE both have it.
-         </div></div>
-         
-         
-         
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/jsonrpc.xhtml b/phpgwapi/js/jsolait/doc/jsonrpc.xhtml
deleted file mode 100644
index 810caea067..0000000000
--- a/phpgwapi/js/jsolait/doc/jsonrpc.xhtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | jsonrpc</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.jsonrpc" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    jsonrpc</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module jsonrpc</h1>
-
-             This module implements the <a href="http://json-rpc.org" target="_blank">JSON-RPC</a> protocoll.<br />
-             It supports both JSON-RPC over HTTP and JSON-RPC over TCP sockets(if sockets are available).<br />
-             
-        <div class="contentItem"><h2>public members:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>ServiceProxy(url, methodNames, localService)</h3><div class="indent">
-                        A class which creates proxy objects for remote JSON-RPC services.<br />
-                      <ul>
-                            <li><b>ServiceProxy::url</b>   The URL of the remote services.</li>
-                            <li><b>ServiceProxy::methodNames</b>   An Array containing the methodNames of the remote service.</li>
-                            <li><b>ServiceProxy::localService</b>   An Object providing methods to the remote service.</li>
-                      </ul>
-                 </div>
-         </div></div>
-         <div class="contentItem"><h2>dependencies:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-              
-              <h3><a href="./lang.xhtml">lang</a></h3><div class="indent">
-                    
-                    The <code>lang</code> module is required for JSON object serialization and deserialization.
-              </div>
-              
-              <h3><a href="./urllib.xhtml">urllib</a></h3><div class="indent">
-                    
-                    The <code>urllib</code> module is only required when using JSON-RPC over HTTP.
-              </div>
-              
-              <h3>Sockets</h3><div class="indent">
-                    
-                    You will need SVG1.2 sockets for JSON-RPC over TCP sockets to work.
-                    This dependency will change once the <code>net</code> module is written.
-                    It will provide networking services to jsolait.
-                </div>
-              
-         </div></div>
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/lang.xhtml b/phpgwapi/js/jsolait/doc/lang.xhtml
deleted file mode 100644
index 3bd4fb97eb..0000000000
--- a/phpgwapi/js/jsolait/doc/lang.xhtml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | lang</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.lang" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    lang</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module lang</h1>
-
-            This module provides language services like tokenizing JavaScript code 
-            or converting JavaScript objects to and from <a href="http://json.org" target="_blank">JSON</a>.<br />
-            To customize JSON serialization of Objects just overwrite the toJSON method in your class.
-         <div class="contentItem"><h2>public members:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>JSONParser()</h3><div class="indent">
-                      A class for parsing JSON.<br />
-                      <ul>
-                          <li><b>JSONParser::addLib(obj,name,exports)</b><br />
-                              Adds a lib object for converting application specific JSON-Objects.<br />
-                              This is an extension to the default JSON behavior to allow class hinitng.
-                         </li>
-                         <li><b>JSONParser::jsonToObj(data)</b><br />
-                                Turns JSON code into JavaScript objects.<br />
-                              <code>data</code> is a String containing the JSON code.
-                         </li>
-                         <li><b>JSONParser::objToJson(obj)</b><br />
-                              Turns an object into JSON.<br />
-                              This is the same as calling obj.toJSON();<br />
-                         </li>
-                    </ul>
-                 </div>
-                 <h3>parser</h3><div class="indent">
-                      A JSONParser object used for jsonToObj and objToJson.
-                 </div>
-                 <h3>jsonToObj(src)</h3><div class="indent">
-                              Turns JSON code into JavaScript objects.<br />
-                              <code>src</code> is a String containing the JSON code.
-                 </div>
-                 <h3>objToJson(obj)</h3><div class="indent">
-                             Turns an object into JSON.<br />
-                             This is the same as calling obj.toJSON();<br />
-                 </div>
-                 <h3>tokens</h3><div class="indent">
-                    Token  type constants for the tokenizer.<br />
-                    <ul>
-                        <li><b>tokens.WSP</b> WhiteSpace </li>
-                        <li><b>tokens.OP</b>  Operator </li>
-                        <li><b>tokens.STR</b> String</li>
-                        <li><b>tokens.NAME</b> Name</li>
-                        <li><b>tokens.NUM</b> Number</li>
-                        <li><b>tokens.ERR</b> Error</li>
-                        <li><b>tokens.NL</b> NewLine </li>
-                        <li><b>tokens.COMMENT</b> Comment </li>
-                        <li><b>tokens.DOCCOMMENT</b> Documentation comment </li>
-                        <li><b>tokens.REGEXP</b> Regular Expression</li>
-                    </ul>
-                 </div>
-                 
-                 <h3>Tokenizer(source)</h3><div class="indent">
-                         Tokenizer Class which incrementally parses JavaScript code(<code>source</code>) and returns the language tokens.<br />
-                        <ul>
-                              <li><b>Tokenizer::next()</b><br />                             
-                                Returns the next Token object.
-                             </li>
-                             <li><b>Tokenizer::nextNonWS(nlIsWS)</b><br />
-                                Returns the next non whitespace token.<br />
-                                If <code>nlIsWS</code> is <code>true</code> then a NewLine token is interpreted as whitespace.
-                             </li>
-                             <li><b>Tokenizer::finished()</b><br />
-                                Returns <code>true</code> if the Tokenizer has finished the parsing.
-                             </li>
-                         </ul>
-                 </div>
-                 
-                 <h3>Token(type, value, pos, err)</h3><div class="indent">
-                         Token class for token objects returned by the Tokenizer.<br />
-                        <ul>
-                              <li><b>Token::type</b>The type of the token(see the tokens constants).</li>
-                              <li><b>Token::value</b>A String containing the token value.</li>
-                              <li><b>Token::pos</b>The starting position of the token in the source .</li>
-                              <li><b>Token::err</b>The error object for Error tokens.</li>
-                        </ul>
-                 </div>
-         </div></div>
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/stringformat.xhtml b/phpgwapi/js/jsolait/doc/stringformat.xhtml
deleted file mode 100644
index 356283671b..0000000000
--- a/phpgwapi/js/jsolait/doc/stringformat.xhtml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | stringformat</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.stringformat" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    stringformat</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module stringformat</h1>
-            This module is automatically loaded with the main module.<br />
-            It allows python like string formatting ("some text %s" % "something").
-            Also similar to sprintf from C.
-          
-         <div class="contentItem"><h2>globals:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>String::format()</h3><div class="indent">
-                        Formats a string replacing formatting specifiers with values provided as arguments<br />
-                        which are formatted according to the specifier.<br />
-                        This is an implementation of  python's % operator for strings and is similar to sprintf from C.<br />
-                        Usage:<br />
-                        <code>resultString = formatString.format(value1, v2, ...);</code><br />
-                        <br />
-                        Each formatString can contain any number of formatting specifiers which are<br />
-                        replaced with the formated values.<br />
-                        <br />
-                        The following describes a format-specifier ([...] are optional): <br />
-                        <code>%[(key)][flag][sign][min][percision]typeOfValue</code>
-                        <ul>
-                            <li><b>(key)</b><br />
-                                       If specified the 1st argument is treated as an object/associative array and the formating values <br />
-                                     are retrieved from that object using the key.<br />
-                            </li>
-                            <li><b>flag:</b><br />
-                                0      Use 0s for padding.<br />
-                                -      Left justify result, padding it with spaces.<br />
-                                        Use spaces for padding.<br />
-                            </li>
-                            <li><b>sign:</b><br />
-                                +      Numeric values will contain a +|- infront of the number.<br />
-                            </li>
-                            <li><b>min:</b><br />
-                                l      The string will be padded with the padding character until it has a minimum length of l. <br />
-                            </li>
-                            <li><b>percision:</b><br />
-                               .x     Where x is the percision for floating point numbers and the lenght for 0 padding for integers.<br />
-                            </li>
-                            <li><b>typeOfValue:</b><br />
-                                d    Signed integer decimal.  	 <br />
-                                i     Signed integer decimal. 	 <br />
-                                b    Unsigned binary.                 <br />
-                                o    Unsigned octal. 	<br />
-                                u    Unsigned decimal. 	<br />
-                                x    Unsigned hexidecimal (lowercase). 	<br />
-                                X   Unsigned hexidecimal (uppercase). 	<br />
-                                e   Floating point exponential format (lowercase). 	 <br />
-                                E   Floating point exponential format (uppercase). 	 <br />
-                                f    Floating point decimal format. 	 <br />
-                                F   Floating point decimal format. 	 <br />
-                                c   Single character (accepts byte or single character string). 	 <br />
-                                s   String (converts any object using object.toString()). 	<br />
-                        </li>
-                    </ul>    
-                        Examples:<br />
-                            "%02d".format(8) == "08"<br />
-                            "%05.2f".format(1.234) == "01.23"<br />
-                            "123 in binary is: %08b".format(123) == "123 in binary is: 01111011"<br />
-                            <br />
-                        <b></b> *  Each parameter is treated as a formating value. <br />
-                    <br />
-                 </div>
-                 <h3>String::pad(flag,len)</h3><div class="indent">
-                              Padds a String with a character to have a minimum length.<br />
-                            <br />
-                            <b>flag</b>    "-":      to padd with " " and left justify the string.<br />
-                                Other: the character to use for padding. <br />
-                            <b>len</b>     The minimum length of the resulting string.<br />
-                 </div>
-                 <h3>String.prototype.mul(c)</h3><div class="indent">
-                              Repeats a string.<br />
-                            <b>c</b>   The count how often the string should be repeated.<br />
-                 </div>
-         </div></div>
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/tutorial.xhtml b/phpgwapi/js/jsolait/doc/tutorial.xhtml
deleted file mode 100644
index afa8e03dc3..0000000000
--- a/phpgwapi/js/jsolait/doc/tutorial.xhtml
+++ /dev/null
@@ -1,295 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | tutorial</title>
-    <link rel="stylesheet" type="text/css" href="/html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="JavaScript, OOP, object oriented programming, OOP in JavaScript, JS, OOP JS, tutorial, prototyping, inheritance, subclassing, data hiding" />
-    <link rel="stylesheet" type="text/css" href="./highlight.css" />
-    <style type="text/css">
-.S0 {
-	font-family: 'Times New Roman';
-	color: #000000;
-	font-size: 11pt;
-}
-.S1 {
-	color: #000080;
-}
-.S3 {
-	color: #008080;
-}
-.S6 {
-	color: #7F007F;
-}
-.S8 {
-	color: #800080;
-}
-span {
-	font-family: 'Verdana';
-	color: #000000;
-	font-size: 10pt;
-}
-</style>
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    tutorial</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="donate">
-        <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-          <input type="hidden" name="cmd" value="_xclick" />
-          <input type="hidden" name="business" value="donate@kollhof.net" />
-          <input type="hidden" name="item_name" value="project development" />
-          <input type="hidden" name="no_shipping" value="1" />
-          <input type="hidden" name="return" value="http://jan.kollhof.net/projects/donation/success" />
-          <input type="hidden" name="cancel_return" value="http://jan.kollhof.net/projects/donation/cancel" />
-          <input type="hidden" name="cn" value="your comments" />
-          <input type="hidden" name="currency_code" value="EUR" />
-          <input type="hidden" name="tax" value="0" />
-          <input type="image" src="/ppbtn.gif" border="0" name="submit" alt="support development" />
-        </form>
-      </div>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-        Please note, this is only a current draft of the online jsolait tutorial and is not complete.<br />
-        
-        <br />
-        <h1>Object Oriented Programming  using JavaScript o Lait</h1>
-        
-        It is very simple to use jsolait for object oriented programming.<br />
-        In this tutorial we will  look at how we can integrate jsolait functionality in our projects.<br />
-        Then we will create our first jsolait module. As we go on we will add classes and methods and will explore the 
-        OOP feautures of jsolai.<br />
-        All example code can be tried using your own webpage or <a href="../jsolaitonline.xhtml">jsolait online</a>.<br />
-        <div class="contentItem"><h2>integrating jsolait<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            To use jsolait you will need to copy the library files to the location of your website.
-            Add a refference to jsolait's initialization script( ./jsolait/init.js) in your page.<br />
-            In HTML it will look like this:<br />
-            <br /><div class="code">
-                <span style="margin-left:0.5em"></span><span class="S0">...</span><br />
-                <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span class="S1">&lt;script</span><span class="S8"> </span><span class="S3">type</span><span class="S8">=</span><span class="S6">"text/javascript"</span><span class="S8"> </span><span class="S3">src</span><span class="S8">=</span><span class="S6">"./jsolait/init.js"</span><span class="S1">&gt;&lt;/script&gt;</span><br />
-
-                <span style="margin-left:0.5em"></span><span class="S0">...</span><br />
-            </div>
-            <br />
-            After that you are ready to begin working with jsolait<br />
-            An easy way to do so is to create a JavaScript file and refference it  in the page after the init script.<br />
-            The script can now use any jsolait functionality in addition to what is available in JavaScript alone.<br />
-            Your HTML file should now contain somethign similar to the following:<br />
-            <br /><div class="code">
-                <span style="margin-left:0.5em"></span><span class="S0">...</span><br />
-                <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span class="S1">&lt;script</span><span class="S8"> </span><span class="S3">type</span><span class="S8">=</span><span class="S6">"text/javascript"</span><span class="S8"> </span><span class="S3">src</span><span class="S8">=</span><span class="S6">"./jsolait/init.js"</span><span class="S1">&gt;&lt;/script&gt;</span><br />
-                <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span class="S1">&lt;script</span><span class="S8"> </span><span class="S3">type</span><span class="S8">=</span><span class="S6">"text/javascript"</span><span class="S8"> </span><span class="S3">src</span><span class="S8">=</span><span class="S6">"./tutorial.js"</span><span class="S1">&gt;&lt;/script&gt;</span><br />
-                <span style="margin-left:0.5em"></span><span class="S0">...</span><br />
-            </div>
-        </div></div>
-        
-        <div class="contentItem"><h2>first script using jsolait<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            As an example we will now use jsolait's powerful string-formating methods.<br />
-            <br /><div class="code">
-                <span>
-                <span class="S5">var</span><span class="S0"> </span>s1<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S6">"Hello %s!"</span><span class="S10">.</span>format<span class="S10">(</span><span class="S5">jsolait</span><span class="S10">.</span>name<span class="S10">);</span><br />
-                alert<span class="S10">(</span>s1<span class="S10">);</span><br />
-                <span class="S5">var</span><span class="S0"> </span>s2<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S6">"The number %d as a hexadecimal is %X."</span><span class="S10">.</span>format<span class="S10">(</span><span class="S4">123456789</span><span class="S10">,</span><span class="S4">123456789</span><span class="S10">);</span><br />
-                alert<span class="S10">(</span>s2<span class="S10">);</span>
-                </span>
-            </div>
-            <br />
-            In the example all <code>%s, %f, %X</code> are replaced by converting the values passed into the <code>format</code> method to a desired format.<br />
-            There are more formating specifiers than <code>%s, %f, %X</code>. Please see the documentation for the <a href="./stringformat.xhtml"><code>stringformat</code></a> module.
-        </div></div>
-        <div class="contentItem"><h2>using modules<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            To use modules in your script jsolait provides a special method called <code>importModule</code>.
-            Let us see how this works. For an example we will import the <code>codecs</code> module which provides e.g. base64 encoding of strings.<br />
-            <br /><div class="code">
-                <span class="S5">var</span> <span>codecs<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">importModule</span><span class="S10">(</span><span class="S6">"codecs"</span><span class="S10">);</span><br />
-                <br />
-                alert<span class="S10">(</span>codecs<span class="S10">.</span>listEncoders<span class="S10">());</span><br />
-                <br />
-                <span class="S5">var</span><span class="S0"> </span>s1<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S6">"Hello jsolait"</span><span class="S10">;</span><br />
-                <span class="S5">var</span><span class="S0"> </span>s2<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>s1<span class="S10">.</span>encode<span class="S10">(</span><span class="S6">"base64"</span><span class="S10">);</span><br />
-                <br />
-                alert<span class="S10">(</span><span class="S6">"'%s' encoded using base64 is '%s'"</span><span class="S10">.</span>format<span class="S10">(</span>s1<span class="S10">,</span>s2<span class="S10">));</span><br />
-                </span>
-            </div>
-            <br />
-            The <code>codecs</code> module is loaded by jsolait and provided to the script calling the <code>importModule</code> function.<br />
-            Depending on your browser jsolait loads the module source files on demand, i.e. the file is retrieved during the first call to <code>importModule</code>.
-            A second call to <code>importModule</code> will only return the module object which has been loaded already by the first call, jsolait will not retrieve the file again.
-            In some browsers the feauture of loading moudule files on demand is not available.<br />
-            This does not mean you cannot uses jsolait. What you need to do is refference all module scripts in your web page.<br />
-            For oure example our web page would contain something like:<br />
-            <br /><div class="code">
-                <span style="margin-left:0.5em"></span><span class="S0">...</span><br />
-                <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span class="S1">&lt;script</span><span class="S8"> </span><span class="S3">type</span><span class="S8">=</span><span class="S6">"text/javascript"</span><span class="S8"> </span><span class="S3">href</span><span class="S8">=</span><span class="S6">"./jsolait/init.js"</span><span class="S1">&gt;&lt;/script&gt;</span><br />
-                <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span class="S1">&lt;script</span><span class="S8"> </span><span class="S3">type</span><span class="S8">=</span><span class="S6">"text/javascript"</span><span class="S8"> </span><span class="S3">href</span><span class="S8">=</span><span class="S6">"./jsolait/lib/codecs.js"</span><span class="S1">&gt;&lt;/script&gt;</span><br />
-                <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span class="S1">&lt;script</span><span class="S8"> </span><span class="S3">type</span><span class="S8">=</span><span class="S6">"text/javascript"</span><span class="S8"> </span><span class="S3">href</span><span class="S8">=</span><span class="S6">"./tutorial.js"</span><span class="S1">&gt;&lt;/script&gt;</span><br />
-                <span style="margin-left:0.5em"></span><span class="S0">...</span><br />
-            </div>
-            All module scripts depend on the initialization script <code>init.js</code> to be loaded first.<br />
-            Depending on the module dependencies you must make sure the scripts are refferenced in the right order.<br />
-            But more on that later.<br />
-        </div></div>
-        
-        <div class="contentItem"><h2>creating a jsolait module<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            You can easily create your own modules by using the <code>Module</code> constructor.<br />
-            See the following code:<br />
-            <br /><div class="code">
-                <span><span class="S5">Module</span><span class="S10">(</span><span class="S6">"tutorial"</span><span class="S10">,</span><span class="S0"> </span><span class="S6">"0.0.1"</span><span class="S10">,</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span><span class="S5">mod</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">var</span><span class="S0"> </span>codecs<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">importModule</span><span class="S10">(</span><span class="S6">"codecs"</span><span class="S10">);</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">mod</span><span class="S10">.</span>testCodecs<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span>data<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span>alert<span class="S10">(</span>codecs<span class="S10">.</span>listEncoders<span class="S10">());</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">var</span><span class="S0"> </span>s1<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S6">"Hello jsolait"</span><span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">var</span><span class="S0"> </span>s2<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>s1<span class="S10">.</span>encode<span class="S10">(</span><span class="S6">"base64"</span><span class="S10">);</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span>alert<span class="S10">(</span><span class="S6">"'%s' encoded using base64 is '%s'"</span><span class="S10">.</span>format<span class="S10">(</span>s1<span class="S10">,</span>s2<span class="S10">));</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S10">})</span><br />
-                <span class="S0"></span></span>
-            </div>
-            The module constructor is a function with 3 parameters. The first one is the module's name. This name is used when importing modules.<br />
-            The second one is the modules version. It is good practice to give a module a version string.<br />
-            The third parameter is a function object. <br />
-            This function is called to construct the module. Once constructed the module is registered with jsolait and can be imported.<br />
-            A special parameter <code>mod</code> is passed to that function wich represents the modul. It is very similar to the <code>this</code> object in JavaScript.
-            All properties set on the <code>mod</code> object will become public properties of the module. In our example this would be the <code>testCodecs</code> method.<br />
-            Variables declared with <code>var</code> are only visible inside the module constructor. One could say they are the private objects of the module.
-            In our example this would be the <code>codecs</code> object.<br />
-            If you declare a variable without the <code>var</code> keyword then this object will become global.<br />
-            Only declare global objects if you realy intend to create global objects. In most cases you should never need them.
-            The jsolait module for example defines two global objects: <code>importModule and reportException</code>.<br />
-            At first, using a function object might seem a little awkward, but it allowes us to practice good data hiding.<br />
-        </div></div>
-        
-        <div class="contentItem"><h2>creating classes<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            Creating classes in jsolait is as simple as creating modules. Especially when it comes to inheritance jsolait will take 
-            care of all the work involved for creating subclasses in JavaScript.<br />
-            Have a look at the following code:<br />
-            <br /><div class="code">
-                <span><span class="S5">Module</span><span class="S10">(</span><span class="S6">"tutorial"</span><span class="S10">,</span><span class="S0"> </span><span class="S6">"0.0.1"</span><span class="S10">,</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span><span class="S5">mod</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">mod</span><span class="S10">.</span>SomeClass<span class="S10">=</span><span class="S5">Class</span><span class="S10">(</span><span class="S5">function</span><span class="S10">(</span><span class="S5">publ</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>foo<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span>p1<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">return</span><span class="S0"> </span><span class="S5">this</span><span class="S10">.</span>bar<span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>p1<span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>bar<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">3</span><span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">})</span><br />
-                <span class="S10">})</span><br />
-                <span class="S0"></span></span> 
-            </div>
-            You can see we declared a public object in our module. This object is a class object created with the <code>Class</code> function.<br />
-            The <code>Class</code> function accepts up to three parameters. For now we only need one, a function object.
-            Similar to the function object passed to the module constructor it is used for data hiding.<br />
-            The parameter passed to the function object is the <code>publ</code> object.
-            All properties added to this object will become the public members of the class.<br />
-            In our example we have two public members of the class: the method <code>foo</code> and the property <code>bar</code>.<br />
-            To create objects of the class we use the JavaScript <code>new</code> keyword.<br />
-            <br /><div class="code">
-                <span><span class="S5">var</span><span class="S0"> </span>tutorial<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">importModule</span><span class="S10">(</span><span class="S6">"tutorial"</span><span class="S10">);</span><br />
-                <br />
-                <span class="S5">var</span><span class="S0"> </span>obj<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">new</span><span class="S0"> </span>tutorial<span class="S10">.</span>SomeClass<span class="S10">();</span><br />
-                <br />
-                alert<span class="S10">(</span>obj<span class="S10">.</span>foo<span class="S10">(</span><span class="S4">3</span><span class="S10">));</span></span>
-            </div>
-            Becase our class <code>SomeClass</code> is part of the module <code>tutorial</code> we need to import that module before we use it.
-            Then we can create an object of our class and call methods of that objects.
-        </div></div>
-        
-        <div class="contentItem"><h2>inheritence<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            Let us create another class and have it be a subclass of <code>SomeClass</code>.<br />
-            
-            <br /><div class="code">
-                <span><span class="S5">Module</span><span class="S10">(</span><span class="S6">"tutorial"</span><span class="S10">,</span><span class="S0"> </span><span class="S6">"0.0.1"</span><span class="S10">,</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span><span class="S5">mod</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">mod</span><span class="S10">.</span>SomeClass<span class="S10">=</span><span class="S5">Class</span><span class="S10">(</span><span class="S5">function</span><span class="S10">(</span><span class="S5">publ</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>foo<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span>p1<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">return</span><span class="S0"> </span><span class="S5">this</span><span class="S10">.</span>bar<span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>p1<span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>bar<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">3</span><span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">})</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">mod</span><span class="S10">.</span>SubClass<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">Class</span><span class="S10">(</span><span class="S5">mod</span><span class="S10">.</span>SomeClass<span class="S10">,</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span><span class="S5">publ</span><span class="S10">,</span><span class="S0"> </span><span class="S5">supr</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>foo<span class="S10">=</span><span class="S5">function</span><span class="S10">(</span>p1<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">var</span><span class="S0"> </span>v1<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">supr</span><span class="S10">(</span><span class="S5">this</span><span class="S10">).</span>foo<span class="S10">(</span>p1<span class="S10">);</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">return</span><span class="S0"> </span>v1<span class="S0"> </span><span class="S10">*</span><span class="S0"> </span><span class="S4">3</span><span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">})</span><span class="S0"> <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S10">})</span><br /></span>
-            </div>
-            In the above excample one can see that we added another class to our module. The difference to the first class is that we pass in another parameter to the <code>Class</code> method before the 
-            last parameter, the function object.
-            This first parameter is the base class of our new class, i.e. our new class will inherit form that class.<br />
-            You can also notice that we have another parameter <code>supr</code> in our function object.
-            This parameter is a spechial function for calling overwritten methods of the base class. You can see how a base class method is invoked in the line <code>var v1 = supr(this).foo(p1)</code>.<br />
-            <code>SubClass</code> overwrites the <code>foo</code> method of <code>SomeClass</code>. When the <code>foo</code> method is called then it calls it's base class's <code>foo</code>
-             method first, then multiplying the return value by 3 and then returns the result.<br />
-            
-        </div></div>
-        
-        <div class="contentItem"><h2>object initialization<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            Whenever an object is created form a class an initialization method is called with the parameters passed to the constructor. This method is named <code>init</code> and you may 
-            consider it to be the constructor of the class, though technically speaking it is not.
-            You can overwrite the <code>init</code> method in your class. If you do so make sure you call the base class's <code>init</code> method.
-            For example:<br />
-            <br /><div class="code">
-                <span><span class="S5">Module</span><span class="S10">(</span><span class="S6">"tutorial"</span><span class="S10">,</span><span class="S0"> </span><span class="S6">"0.0.1"</span><span class="S10">,</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span><span class="S5">mod</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">mod</span><span class="S10">.</span>SomeClass<span class="S10">=</span><span class="S5">Class</span><span class="S10">(</span><span class="S5">function</span><span class="S10">(</span><span class="S5">publ</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>init<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span>barVal<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">this</span><span class="S10">.</span>bar<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>barVal<span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>foo<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span>p1<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">return</span><span class="S0"> </span><span class="S5">this</span><span class="S10">.</span>bar<span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>p1<span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>bar<span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">})</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">mod</span><span class="S10">.</span>SubClass<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">Class</span><span class="S10">(</span><span class="S5">mod</span><span class="S10">.</span>SomeClass<span class="S10">,</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span><span class="S5">publ</span><span class="S10">,</span><span class="S0"> </span><span class="S5">supr</span><span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>init<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">function</span><span class="S10">(</span>a<span class="S10">,</span><span class="S0"> </span>b<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">supr</span><span class="S10">(</span><span class="S5">this</span><span class="S10">).</span>init<span class="S10">(</span>a<span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>b<span class="S10">);</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">publ</span><span class="S10">.</span>foo<span class="S10">=</span><span class="S5">function</span><span class="S10">(</span>p1<span class="S10">){</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">var</span><span class="S0"> </span>v1<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">supr</span><span class="S10">(</span><span class="S5">this</span><span class="S10">).</span>foo<span class="S10">(</span>p1<span class="S10">);</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S5">return</span><span class="S0"> </span>v1<span class="S0"> </span><span class="S10">*</span><span class="S0"> </span><span class="S4">3</span><span class="S10">;</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">}</span><br />
-                <span class="S0"><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><span class="S10">})</span><span class="S0"> <span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span><span style="margin-left:0.5em"></span></span><br />
-                <span class="S10">})</span></span>
-            </div>
-            You can see that both of our classes have different initialization parameters and that <code>SubClass</code> calls the <code>SomeClass</code>'s initialization method.<br />
-            The code for the object creation would look like this:<br />
-            <br /><div class="code">
-                <span><span class="S5">var</span><span class="S0"> </span>tutorial<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">importModule</span><span class="S10">(</span><span class="S6">"tutorial"</span><span class="S10">);</span><br />
-                <br />
-                <span class="S5">var</span><span class="S0"> </span>obj<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S5">new</span><span class="S0"> </span>tutorial<span class="S10">.</span>SubClass<span class="S10">(</span><span class="S4">3</span><span class="S10">,</span><span class="S4">4</span><span class="S10">);</span><br />
-                <br />
-                alert<span class="S10">(</span>obj<span class="S10">.</span>foo<span class="S10">(</span><span class="S4">3</span><span class="S10">));</span></span>
-            </div>
-            
-        </div></div>
-        
-        <div class="contentItem"><h2>exception handling<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            coming soon
-        </div></div>
-        
-        <div class="contentItem"><h2>module dependencies<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            coming soon
-        </div></div>
-        
-    </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/urllib.xhtml b/phpgwapi/js/jsolait/doc/urllib.xhtml
deleted file mode 100644
index ce057e8af4..0000000000
--- a/phpgwapi/js/jsolait/doc/urllib.xhtml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | urllib</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.urllib" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    urllib</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module urllib</h1>
-            Provides methods for making HTTP requests.
-            <br />
-            The module is to be replaced by a richer <code>net</code> module, also containing sockets.<br />
-         <div class="contentItem"><h2>public members:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>NoHTTPRequestObject()</h3><div class="indent">
-                              Exception thrown if no request object could be instanciated.<br />
-                 </div>
-                 <h3>RequestOpenFailed()</h3><div class="indent">
-                              Exception thrown if an HTTP request could not be opened.<br />
-                 </div>
-                 <h3>SendFailed()</h3><div class="indent">
-                              Exception thrown if a request could not be sent to the server.<br />
-                 </div>
-                 <br />
-                 <h3>sendRequest(type,url,user,pass,data,headers,callback)</h3><div class="indent">
-                              Sends a request to a server.<br />
-                            To explain the way the optional arguments work I will give examples:<br />
-                            simple:<br />
-                                sendRequest("get", "url")<br />
-                                sendRequest("post", "url", "data")<br />
-                            <br />
-                            with headers:<br />
-                                sendRequest("get", "url", [["headername","value"]])<br />
-                                sendRequest("post", "url", "data", [["headername","value"]])<br />
-                            <br />
-                            with user information:<br />
-                                sendRequest("get", "url", "user", "pass")<br />
-                                sendRequest("post", "url", "user", "pass", "data")<br />
-                            <br />
-                            with headers and user information:<br />
-                                sendRequest("get", "url", "user", "pass", [["headername","value"]])<br />
-                                sendRequest("post", "url", "user", "pass", "data", [["headername","value"]])<br />
-                            <br />
-                            To make the request asynchronous just add a callback function as the last argument to the calls above.<br />
-                            <br />
-                            <b>type</b>               Type of connection (GET, POST, ...).<br />
-                            <b>url</b>                  The URL to retrieve.<br />
-                            <b>user</b> =null        The username for auth.<br />
-                            <b>pass</b> =null        The password. (must be set if user is set!)<br />
-                            <b>data</b> =""          The data to send with the request.<br />
-                            <b>headers</b> =[]      Array of headers. Each element in the array should be another array containing [headername,value].<br />
-                            <b>callback</b> =null   Callback for asynchronous connections. The callback is called after completion and is passed the request object as 1st Parameter.<br />
-                            <b>returns</b>                      HTTP request object.<br />
-                 </div>
-                 <h3>getURL(url,user,pass,headers,callback)</h3><div class="indent">
-                              Shorthand for a GET request.<br />
-                                It calls sendRequest with "GET" as first argument.<br />
-                                See the sendRequest method for more information.<br />
-                                <br />
-                                <b>url</b>                  The URL to retrieve.<br />
-                                <b>user</b> =null        The username for auth.<br />
-                                <b>pass</b> =null        The password. (must be set if user is set!)<br />
-                                <b>headers</b> =[]      Array of headers. Each element in the array should be another array containing [headername,value].<br />
-                                <b>callback</b> =null   Callback for asynchronous connections. The callback is called after completion and is passed the request object as 1st Parameter.<br />
-                                <b>returns</b>                      HTTP request object.<br />
-                            <br />
-                 </div>
-                 <h3>postURL(url,user,pass,data,headers, callback)</h3><div class="indent">
-                              Shorthand for a POST request.<br />
-                                It calls sendRequest with "POST" as first argument.<br />
-                                See the sendRequest method for more information.<br />
-                                <br />
-                                <b>url</b>                  The URL to retrieve.<br />
-                                <b>user</b> =null        The username for auth.<br />
-                                <b>pass</b> =null        The password. (must be set if user is set!)<br />
-                                <b>data</b> =""          The data to send with the request.<br />
-                                <b>headers</b> =[]      Array of headers. Each element in the array should be another array containing [headername,value].<br />
-                                <b>callback</b> =null   Callback for asynchronous connections. The callback is called after completion and is passed the request object as 1st Parameter.<br />
-                                <b>returns</b>                      HTTP request object.<br />
-                            <br />
-                 </div>
-         </div></div>
-         <div class="contentItem"><h2>requirements<a class="bttop" href="#top">â–²</a></h2><div>
-            
-            The urllib requires the HTTPRequest object as fond in Mozilla and IE.<br />
-            In SVG it will use ASV's getURL/postURL methods, but is limited to asynchronous connections.<br />
-            
-         </div></div>
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/xml.xhtml b/phpgwapi/js/jsolait/doc/xml.xhtml
deleted file mode 100644
index d7bd292b70..0000000000
--- a/phpgwapi/js/jsolait/doc/xml.xhtml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | xml</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.xml" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    xml</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module xml</h1>
-            Provides parseXML and an importNode implementation.
-         <div class="contentItem"><h2>public members:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>NoXMLParser()</h3><div class="indent">
-                              Exception thrown if no parser could be instanciated.<br />
-                 </div>
-                 <h3>ParsingFailed()</h3><div class="indent">
-                              Exception thrown if a document could not be parsed.<br />
-                              <ul>
-                                    <li><b>ParsingFailed::xml</b>     The xml source which could not be parsed.</li>
-                              </ul>
-                 </div>
-                 <br />
-                 <h3>parseXML(xml)</h3><div class="indent">
-                        Parses an xml document.<br />
-                        <b>xml</b>      The xml text.<br />
-                        <b>returns</b>           A DOM of the xml document.<br />
-                 </div>
-                 <h3>importNode(importedNode,deep)</h3><div class="indent">
-                         DOM2 implimentation of document.importNode().<br />
-                        This will import into the current document. In SVG it will create SVG nodes in HTML it will create HTML nodes....<br />
-                        This might become customizable in the future.<br />
-                        <b>importedNode</b>    The node to import.<br />
-                        <b>deep</b> =true        Import all childNodes recursively.<br />
-                        <b>returns</b>                       The imported Node.<br />
-                    <br />
-                 </div>
-                 <h3>node2XML(node)</h3><div class="indent">
-                         Turns an XML document into a String.<br />
-                        <b>node</b>    The node to print.<br />
-                        <b>returns</b>            A string containing the text for the XML.<br />
-                    <br />
-                 </div>
-         </div></div>
-         <div class="contentItem"><h2>requirements<a class="bttop" href="#top">â–²</a></h2><div>
-            
-                Requires Mozilla's or IE's XML objects or parseXML in SVG(ASV).
-         </div></div>
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/doc/xmlrpc.xhtml b/phpgwapi/js/jsolait/doc/xmlrpc.xhtml
deleted file mode 100644
index 137eba19ec..0000000000
--- a/phpgwapi/js/jsolait/doc/xmlrpc.xhtml
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>.: jsolait :. | documentation | xmlrpc</title>
-    <link rel="stylesheet" type="text/css" href="./html.css" />
-    <meta name="author" content="Jan-Klaas Kollhof" />
-    <meta name="keywords" content="jsolait.xmlrpc" />
-  </head>
-  <body>
-    <a name="top" id="top"></a>
-    <div class="navigationBar"><a href="./index.xhtml">documentation</a> | 
-                    xmlrpc</div>
-    <div class="menu">
-      <ul></ul>
-      <div class="copyright">copyright © 2004, Jan-Klaas Kollhof</div>
-    </div>
-    <div class="content">
-         <h1>Module xmlrpc</h1>
-             Provides an XML-RPC imlementation.
-             It is similar to python's xmlrpclib module.
-             
-        <div class="contentItem"><h2>public members:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                 <h3>InvalidServerResponse()</h3><div class="indent">
-                              Exception thrown if a  server did not respond with response status 200 (OK).<br />
-                 </div>
-                 <h3>MalformedXmlRpc()</h3><div class="indent">
-                              Exception thrown if an XML-RPC response is not well formed.<br />
-                 </div>
-                 <h3>Fault()</h3><div class="indent">
-                              Exception thrown if the RPC response is a Fault. <br />
-                              <ul>
-                                    <li><b>Fault::faultCode</b>        The fault code returned by the rpc call.</li>
-                                    <li><b>Fault::faultString</b>       The fault string returned by the rpc call.</li>
-                              </ul>
-                 </div>
-                 
-                 <br />
-                 <h3>marshall(obj)</h3><div class="indent">
-                              Marshalls an object to XML-RPC.(Converts an object into XML-RPC conforming xml.)<br />
-                             It just calls the toXmlRpc function of the objcect.<br />
-                             So, to customize serialization of objects one just needs to specify/override the toXmlRpc method 
-                             which should return an xml string conforming with XML-RPC spec.<br />
-                            <b>obj</b>     The object to marshall<br />
-                            <b>returns</b>          An xml representation of the object.<br />
-                 </div>
-                 <h3>unmarshall(xml)</h3><div class="indent">
-                              Unmarshalls an XML document to a JavaScript object. (Converts xml to JavaScript object.)<br />
-                            It parses the xml source and creates a JavaScript object.<br />
-                            <b>xml</b>     The xml document source to unmarshall.<br />
-                            <b>returns</b>          The JavaScript object created from the XML.<br />
-                 </div>
-                 <h3>unmarshallDoc(doc,xml)</h3><div class="indent">
-                              Unmarshalls an XML document to a JavaScript object like unmarshall but expects a DOM document as parameter.<br />
-                              It parses the xml source and creates a JavaScript object.<br />
-                              <b>doc</b>    The xml document(DOM compatible) to unmarshall.<br />
-                              <b>returns</b>          The JavaScript object created from the XML.<br />
-                 </div>
-                 
-                 <br />
-                 
-                 <h3>ServiceProxy(url,methodNames,user,pass)</h3><div class="indent">
-                        Class for creating proxy objects which resemble the remote service.<br />
-                        Method calls to this proxy will result in calls to the remote service.<br />
-                        <br />
-                        The arguments are interpreted as shown in the examples:<br />
-                        <br />
-                        ServerProxy("url")<br />
-                        ServerProxy("url", ["methodName1",...])<br />
-                        ServerProxy("url", ["methodName1",...], "user", "pass")<br />
-                        ServerProxy("url", "user", "pass")<br />
-                        <ul>
-                            <li><b>url</b>                      The url of the service.</li>
-                            <li><b>methodNames</b> =[]  Array of names of methods that can be called on the server.<br />
-                                                                If no methods are given then introspection is used to get the methodnames from the server.</li>
-                            <li><b>user</b> =null             The user name to use for HTTP authentication.</li>
-                            <li><b>pass</b> =null             The password to use for HTTP authentication.</li>
-                        </ul>
-                        
-                        The ServiceProxy objects expose all the methods of the remote service as XMLRPCMethod objects.
-                        In addition the object also has the following methods and properties.<br />
-                        <ul>
-                            <li><b>ServiceProxy::_addMethodNames(methodNames)</b><br />
-                                              Adds new XMLRPCMethods to the proxy server which can then be invoked.<br />
-                                            <b>methodNames</b>    Array of names of methods that can be called on the server.<br />
-                             </li>
-                             <li><b>ServiceProxy::_setAuthentication(user,pass)</b><br />
-                                              Sets username and password for HTTP Authentication for all methods of this service.<br />
-                                            <b>user</b>     The user name.<br />
-                                            <b>pass</b>     The password.<br />
-                             </li>
-                             <li><b>ServiceProxy::_introspect()</b><br />
-                                              Initiate XML-RPC introspection to retrieve methodnames from the server<br />
-                                                and add them to the server proxy.<br />
-                             </li>
-                             <li><b>ServiceProxy::_url</b><br />
-                                  The url of the service to resemble.<br />
-                             </li>
-                             <li><b>ServiceProxy::_user</b><br />
-                                  The user used for HTTP authentication.<br />
-                             </li>
-                             <li><b>ServiceProxy::_password</b><br />
-                                  The password used for HTTP authentication.<br />
-                             </li>
-                             <li><b>ServiceProxy::_methods</b><br />
-                                  All XMLRPCMethod objects the proxy can call.<br />
-                             </li>
-                        </ul>
-                 </div>
-                 
-                 
-                 
-                 <h3>XMLRPCMethod(url, name, user, pass)</h3><div class="indent">
-                        Class for creating XML-RPC methods.<br />
-                        Calling the created method will result in an XML-RPC call to the service.<br />
-                        The return value of this call will be the return value of the RPC call.<br />
-                        RPC-Faults will be raised as Exceptions.<br />
-                        <br />
-                        <ul>
-                            <li><b>url</b>                  The URL of the service providing the method.</li>
-                            <li><b>name</b>    The name of the method to invoke.</li>
-                            <li><b>user</b> =null             The user name to use for HTTP authentication.</li>
-                            <li><b>pass</b> =null             The password to use for HTTP authentication.</li>
-                        </ul>
-                        Asynchronous operation:<br />
-                        If the last parameter passed to the method is an XMLRPCAsyncCallback object, <br />
-                        then the remote method will be called asynchronously. <br />
-                        The results and errors are passed to the callback.  <br />
-                        <br />
-                        <ul>
-                            <li><b>XMLRPCMethod::toMulticall()</b><br />
-                                      Returns the method representation for system.multicall.<br />
-                                      All params will be passed to the remote method.<br />
-                                    <b>returns</b>    An object containing a member methodName and a member params(As required by system.multicall).<br />
-                            </li>
-                             <li><b>XMLRPCMethod::setAuthentication(user,pass)</b><br />
-                                              Sets username and password for HTTP Authentication.<br />
-                                            <b>user</b>     The user name.<br />
-                                            <b>pass</b>     The password.<br />
-                             </li>
-                             <li><b>XMLRPCMethod::methodName</b><br />
-                                  The name of the remote method.<br />
-                             </li>
-                             <li><b>XMLRPCMethod::url</b><br />
-                                  The url of the remote service containing the method.<br />
-                             </li>
-                             <li><b>XMLRPCMethod::user</b><br />
-                                  The user name used for HTTP authorization.<br />
-                             </li>
-                             <li><b>XMLRPCMethod::password</b><br />
-                                  The password used for HTTP authorization.<br />
-                             </li>
-                        </ul>
-                 </div>
-                 
-                 <h3>XMLRPCAsyncCallback(result, err)</h3><div class="indent">
-                            The interface of a callback for asynchronous XML-RPC.
-                            <ul>
-                                <li><b>result</b>  The result of the call (null if error)</li>
-                                <li><b>err</b>  The Fault if there was one returned otherwise null</li>
-                            </ul>
-                    
-                 </div>
-                 
-          </div></div>
-          
-         <div class="contentItem"><h2>requirements:<a class="bttop" href="#top">â–²</a></h2><div>
-              
-                <h3><a href="./urllib.xhtml">urllib</a></h3><div class="indent"> is required for making the HTTP request to the remote service.</div>
-                <h3><a href="./xml.xhtml">xml</a></h3><div class="indent"> is required for parsing the responses from the service.</div>
-         </div></div>
-     </div>
-  </body>
-</html>
diff --git a/phpgwapi/js/jsolait/init.js b/phpgwapi/js/jsolait/init.js
deleted file mode 100644
index 377e978017..0000000000
--- a/phpgwapi/js/jsolait/init.js
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
-  Copyright (c) 2003 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-/**    
-    Evaluates script in a global scope.
-    @param [0]  The code to evaluate.
-*/
-globalEval=function(){
-    return eval(arguments[0]);
-}
-
-
-/**
-    Creates a new class object which inherits from superClass.
-    @param className="anonymous"  The name of the new class.
-                                                  If the created class is a public member of a module then 
-                                                  the className is automatically set.
-    @param superClass=Object        The class to inherit from (super class).
-    @param classScope                  A function which is executed for class construction.
-                                                As 1st parameter it will get the new class' protptype for 
-                                                overrideing or extending the super class. As 2nd parameter it will get
-                                                the super class' wrapper for calling inherited methods.
-*/
-Class = function(className, superClass, classScope){
-    if(arguments.length == 2){
-        classScope = superClass;
-        if(typeof className != "string"){
-            superClass = className;
-            className = "anonymous";
-        }else{
-            superClass = Object;
-        }
-    }else if(arguments.length == 1){
-        classScope = className;
-        superClass = Object;
-        className = "anonymous";
-    }
-    
-    //this is the constructor for the new objects created from the new class.
-    //if and only if it is NOT used for prototyping/subclassing the init method of the newly created object will be called.
-    var NewClass = function(calledBy){
-        if(calledBy !== Class){
-            return this.init.apply(this, arguments);
-        }
-    }
-    //This will create a new prototype object of the new class.
-    NewClass.createPrototype = function(){
-        return new NewClass(Class);
-    }
-    //setting class properties for the new class.
-    NewClass.superClass = superClass;
-    NewClass.className=className; 
-    NewClass.toString = function(){
-        return "[class %s]".format(NewClass.className);
-    };
-    if(superClass.createPrototype!=null){//see if the super class can create prototypes. (creating an object without calling init())
-        NewClass.prototype = superClass.createPrototype();
-    }else{//just create an object of the super class
-        NewClass.prototype = new superClass();
-    }
-    //reset the constructor for new objects to the actual constructor.
-    NewClass.prototype.constructor = NewClass;
-    
-    if(superClass == Object){//all other objects already have a nice toString method.
-        NewClass.prototype.toString = function(){
-            return "[object %s]".format(this.constructor.className);
-        };
-    }
-    
-    if(NewClass.prototype.init==null){
-        NewClass.prototype.init=function(){
-        }
-    }
-   
-    
-    //create a supr  function to be used to call methods of the super class
-    var supr = function(self){
-        //set up super class functionality  so a call to super(this) will return an object with all super class methods 
-        //the methods can be called like super(this).foo and the this object will be bound to that method
-        var wrapper = {};
-        var superProto = superClass.prototype;
-        for(var n in superProto){
-            if(typeof superProto[n] == "function"){
-                 wrapper[n] = function(){
-                    var f = arguments.callee;
-                    return superProto[f._name].apply(self, arguments);
-                }
-                wrapper[n]._name = n;
-            }
-        }
-        return wrapper;
-    }
-        
-    //execute the scope of the class
-    classScope(NewClass.prototype, supr);
-    
-    return NewClass;
-}    
-Class.toString = function(){
-    return "[object Class]";
-}
-Class.createPrototype=function(){ 
-    throw "Can't use Class as a super class.";
-}
-
-/**
-    Creates a new module and registers it.
-    @param name              The name of the module.
-    @param version            The version of a module.
-    @param moduleScope    A function which is executed for module creation.
-                                     As 1st parameter it will get the module variable.                                     
-*/
-Module = function(name, version, moduleScope){
-    var mod = new Object();
-    mod.version = version;
-    mod.name = name;
-    mod.toString=function(){
-        return "[module '%s' version: %s]".format(mod.name, mod.version);
-    }
-    
-    /**
-        Base class for all module-Exceptions.
-    */
-    mod.Exception=Class("Exception", function(publ){
-        /**
-            Initializes a new Exception.
-            @param msg           The error message for the user.
-            @param trace=null   The error causing this Exception if available.
-        */
-        publ.init=function(msg, trace){
-            this.name = this.constructor.className;
-            this.message = msg;
-            this.trace = trace;
-        }
-        
-        publ.toString=function(){
-            var s = "%s %s\n\n".format(this.name, this.module);
-            s += this.message;
-            return s;
-        }
-        /**
-            Returns the complete trace of the exception.
-            @return The error trace.
-        */
-        publ.toTraceString=function(){
-            var s = "%s %s:\n    ".format(this.name, this.module );
-            s+="%s\n\n".format(this.message);
-            if(this.trace){
-                if(this.trace.toTraceString){
-                    s+= this.trace.toTraceString();
-                }else{
-                    s+= this.trace;
-                }
-            }
-            return s;
-        }
-        ///The name of the Exception(className).
-        publ.name;
-        ///The error message.
-        publ.message;
-        ///The module the Exception belongs to.
-        publ.module = mod;
-        ///The error which caused the Exception or null.
-        publ.trace;      
-    })
-    
-    //execute the scope of the module
-    moduleScope(mod);
-    
-    //todo: set classNames for anonymous classes.
-    for(var n in mod){
-        if(mod[n].className == "anonymous"){
-            mod[n].className = n;
-        }
-    }
-    
-    if(name != "jsolait"){
-        jsolait.registerModule(mod);
-    }
-    return mod;
-}
-Module.toString = function(){
-    return "[object Module]";
-}
-Module.createPrototype=function(){ 
-    throw "Can't use Module as a super class.";
-}
-
-//docstart
-/**
-    The root module for jsolait.
-    It provides some global functionality for loading modules,
-    some String enhancements.
-*/
-Module("jsolait", "0.1.0", function(mod){
-    ///The global jsolait object.
-    jsolait=mod;
-    
-    ///base url for user modules.
-    mod.baseURL=".";
-    ///The URL where jsolait is installed.
-	/// viniciuscb 2004-11-18 - to work with eGroupWare
-	///mod.libURL ="./jsolait";
-	mod.libURL =GLOBALS['serverRoot']+"/phpgwapi/js/jsolait";
-    ///Collection of all loaded modules.(module cache)
-    mod.modules = new Array();
-    ///The URLs of there the modules, part of jsolait.
-    mod.moduleURLs = {urllib:"%(libURL)s/lib/urllib.js",
-                                      xml:"%(libURL)s/lib/xml.js",
-                                      crypto:"%(libURL)s/lib/crypto.js",
-                                      codecs:"%(libURL)s/lib/codecs.js",
-                                      jsonrpc:"%(libURL)s/lib/jsonrpc.js",
-                                      lang:"%(libURL)s/lib/lang.js",
-                                      xmlrpc:"%(libURL)s/lib/xmlrpc.js"};
-   
-    mod.init=function(){
-        //make jsolait work with WScript
-        var ws = null;
-        try{//see if WScript is available
-            ws = WScript;
-        }catch(e){
-        }
-        if(ws != null){
-            initWS();
-        }
-    }
-    
-    ///initializes jsolait for using it with WScript
-    var initWS = function(){
-        print=function(msg){
-            WScript.echo(msg);
-        }
-        alert=function(msg){
-            print(msg);
-        }
-        var args = WScript.arguments;
-        try{
-            //get script to execute
-            var url = args(0);
-            url = url.replace(/\\/g, "/");
-            url = url.split("/");
-            url = url.slice(0, url.length-1);
-            //set base for user module loading
-            mod.baseURL = url.join("/");
-        }catch(e){
-            throw new mod.Exception("Missing script filename to be run.", e);
-        }
-        
-        //location of jsolait/init.js
-        url = WScript.ScriptFullName;
-        
-        if(args(0).replace("file://","").toLowerCase() == url.toLowerCase()){
-            WScript.stderr.write("Can't run myself! exiting ... \n");
-            return;
-        }
-        url = url.replace(/\\/g, "/");
-        url = url.split("/");
-        url = url.slice(0, url.length-1);
-        mod.libURL = "file://" + url.join("/");
-        try{
-            mod.loadScript(args(0));
-        }catch(e){
-            WScript.stdErr.write("%s(1,1) jsolait runtime error:\n%s\n".format(args(0).replace("file://",""), e.toTraceString()));
-        }
-    }
-    
-    
-    /**
-       Imports a module given its name(someModule.someSubModule).
-       A module's file location is determined by treating each module name as a directory.
-       Only the last one points to a file.
-       If the module's URL is not known to jsolait then it will be searched for in jsolait.baseURL which is "." by default.
-       @param name   The name of the module to load.
-       @return           The module object.
-    */
-    mod.importModule = function(name){
-
-        if (mod.modules[name]){ //module already loaded
-            return mod.modules[name];
-        }else{
-            var src,modURL;
-            //check if jsolait already knows the url of the module(moduleURLs contains urls to modules)
-            if(mod.moduleURLs[name]){
-                modURL = mod.moduleURLs[name].format(mod);
-            }else{//assume it's a user module and located at baseURL
-                modURL = "%s/%s.js".format(mod.baseURL, name.split(".").join("/"));
-            }  
-            try{//to load module from location calculated above
-                src = getFile(modURL);
-            }catch(e){//module could not be found at the location.
-                throw new mod.ModuleImportFailed(name, modURL, e);
-            }
-            
-            try{//interpret the script
-                globalEval(src);
-            }catch(e){
-                throw new mod.ModuleImportFailed(name, modURL, e);
-            }
-            //the module should have registered itself
-            return mod.modules[name]; 
-        }
-    }
-    //make it global
-    importModule = mod.importModule;
-    
-    /**
-        Loads and interprets a script file.
-        @param url  The url of the script to load.
-    */
-    mod.loadScript=function(url){
-        var src = getFile(url);
-        try{//to interpret the source 
-            globalEval(src);
-        }catch(e){
-            throw new mod.EvalFailed(url, e);
-        }
-    }
-    /**
-        Registers a new module. 
-        Registered modules can be imported with importModule(...).
-        @param module  The module to register.
-    */
-    mod.registerModule = function(module){
-        this.modules[module.name] = module;
-    }
-    
-    /**
-        Creates an HTTP request object for retreiving files.
-        @return HTTP request object.
-    */
-    var getHTTP=function() {
-        var obj;
-        try{ //to get the mozilla httprequest object
-            obj = new XMLHttpRequest();
-        }catch(e){
-            try{ //to get MS HTTP request object
-                obj=new ActiveXObject("Msxml2.XMLHTTP.4.0");
-            }catch(e){
-                try{ //to get MS HTTP request object
-                    obj=new ActiveXObject("Msxml2.XMLHTTP");
-                }catch(e){
-                    try{// to get the old MS HTTP request object
-                        obj = new ActiveXObject("microsoft.XMLHTTP"); 
-                    }catch(e){
-                        throw new mod.Exception("Unable to get an HTTP request object.");
-                    }
-                }    
-            }
-        }
-        return obj;
-    }
-    /**
-        Retrieves a file given its URL.
-        @param url             The url to load.
-        @param headers=[]  The headers to use.
-        @return                 The content of the file.
-    */
-    var getFile=function(url, headers) { 
-        //if callback is defined then the operation is done async
-        headers = (headers != null) ? headers : [];
-        //setup the request
-        try{
-            var xmlhttp= getHTTP();
-            xmlhttp.open("GET", url, false);
-            for(var i=0;i< headers.length;i++){
-                xmlhttp.setRequestHeader(headers[i][0], headers[i][1]);    
-            }
-            xmlhttp.send("");
-        }catch(e){
-            throw new mod.Exception("Unable to load URL: '%s'.".format(url), e);
-        }
-        if(xmlhttp.status == 200 || xmlhttp.status == 0){
-            return xmlhttp.responseText;
-        }else{
-             throw new mod.Exception("File not loaded: '%s'.".format(url));
-        }
-    }
-    
-    Error.prototype.toTraceString = function(){
-        if(this.message){
-            return "%s\n".format(this.message);
-        }
-        if (this.description){
-           return "%s\n".format(this.description);
-        }
-        return "unknown error\n"; 
-    }
-   
-    
-    /**
-        Thrown when a module could not be found.
-    */
-    mod.ModuleImportFailed=Class(mod.Exception, function(publ, supr){
-        /**
-            Initializes a new ModuleImportFailed Exception.
-            @param name      The name of the module.
-            @param url          The url of the module.
-            @param trace      The error cousing this Exception.
-        */
-        publ.init=function(moduleName, url, trace){
-            supr(this).init("Failed to import module: '%s' from URL:'%s'".format(moduleName, url), trace);
-            this.moduleName = moduleName;
-            this.url = url;
-        }
-        ///The  name of the module that was not found.
-        publ.moduleName;
-        ///The url the module was expected to be found at.
-        publ.url;
-    })
-    
-    /**
-        Thrown when a source could not be loaded due to an interpretation error.
-    */
-    mod.EvalFailed=Class(mod.Exception, function(publ, supr){
-        /**
-            Initializes a new EvalFailed exception.
-            @param url                   The url of the module.
-            @param trace               The exception that was thrown while interpreting the module's source code.
-        */
-        publ.init=function(url, trace){
-            supr(this).init("File '%s' Eval of script failed.".format(url), trace);
-            this.url = url;
-        }
-        ///The url the module was expected to be found at.
-        publ.url;
-    })
-    
-    /**
-        Displays an exception and it's trace.
-        This works better than alert(e) because traces are taken into account.
-        @param exception  The exception to display.
-    */
-    mod.reportException=function(exception){
-        if(exception.toTraceString){
-            var s= exception.toTraceString();
-        }else{
-            var s = exception.toString();
-        }
-        var ws = null;
-        try{//see if WScript is available
-            ws = WScript;
-        }catch(e){
-        }
-        if(ws != null){
-            WScript.stderr.write(s);
-        }else{
-            alert(s);
-        }
-    }    
-    ///The global exception report method;
-    reportException = mod.reportException;
-})
-
-//stringmod
-/**
-    String formatting module.
-    It allows python like string formatting ("some text %s" % "something").
-    Also similar to sprintf from C.
-*/
-Module("stringformat", "0.1.0", function(mod){
-    /**
-        Creates a format specifier object. 
-    */
-    var FormatSpecifier=function(s){
-        var s = s.match(/%(\(\w+\)){0,1}([ 0-]){0,1}(\+){0,1}(\d+){0,1}(\.\d+){0,1}(.)/);
-        if(s[1]){
-            this.key=s[1].slice(1,-1);
-        }else{
-            this.key = null;
-        }
-        this.paddingFlag = s[2];
-        if(this.paddingFlag==""){
-            this.paddingFlag =" " 
-        }
-        this.signed=(s[3] == "+");
-        this.minLength = parseInt(s[4]);
-        if(isNaN(this.minLength)){
-            this.minLength=0;
-        }
-        if(s[5]){
-            this.percision = parseInt(s[5].slice(1,s[5].length));
-        }else{
-            this.percision=-1;
-        }
-        this.type = s[6];
-    }
-
-    /**
-        Formats a string replacing formatting specifiers with values provided as arguments
-        which are formatted according to the specifier.
-        This is an implementation of  python's % operator for strings and is similar to sprintf from C.
-        Usage:
-            resultString = formatString.format(value1, v2, ...);
-        
-        Each formatString can contain any number of formatting specifiers which are
-        replaced with the formated values.
-        
-        specifier([...]-items are optional): 
-            "%(key)[flag][sign][min][percision]typeOfValue"
-            
-            (key)  If specified the 1st argument is treated as an object/associative array and the formating values 
-                     are retrieved from that object using the key.
-                
-            flag:
-                0      Use 0s for padding.
-                -      Left justify result, padding it with spaces.
-                        Use spaces for padding.
-            sign:
-                +      Numeric values will contain a +|- infront of the number.
-            min:
-                l      The string will be padded with the padding character until it has a minimum length of l. 
-            percision:
-               .x     Where x is the percision for floating point numbers and the lenght for 0 padding for integers.
-            typeOfValue:
-                d    Signed integer decimal.  	 
-                i     Signed integer decimal. 	 
-                b    Unsigned binary.                       //This does not exist in python!
-                o    Unsigned octal. 	
-                u    Unsigned decimal. 	 
-                x    Unsigned hexidecimal (lowercase). 	
-                X   Unsigned hexidecimal (uppercase). 	
-                e   Floating point exponential format (lowercase). 	 
-                E   Floating point exponential format (uppercase). 	 
-                f    Floating point decimal format. 	 
-                F   Floating point decimal format. 	 
-                c   Single character (accepts byte or single character string). 	 
-                s   String (converts any object using object.toString()). 	
-        
-        Examples:
-            "%02d".format(8) == "08"
-            "%05.2f".format(1.234) == "01.23"
-            "123 in binary is: %08b".format(123) == "123 in binary is: 01111011"
-            
-        @param *  Each parameter is treated as a formating value. 
-        @return The formated String.
-    */
-    String.prototype.format=function(){
-        var sf = this.match(/(%(\(\w+\)){0,1}[ 0-]{0,1}(\+){0,1}(\d+){0,1}(\.\d+){0,1}[dibouxXeEfFgGcrs%])|([^%]+)/g);
-        if(sf){
-            if(sf.join("") != this){
-                throw new mod.Exception("Unsupported formating string.");
-            }
-        }else{
-            throw new mod.Exception("Unsupported formating string.");
-        }
-        var rslt ="";
-        var s;
-        var obj;
-        var cnt=0;
-        var frmt;
-        var sign="";
-        
-        for(var i=0;i<sf.length;i++){
-            s=sf[i];
-            if(s == "%%"){
-                s = "%";
-            }else if(s.slice(0,1) == "%"){
-                frmt = new FormatSpecifier(s);//get the formating object
-                if(frmt.key){//an object was given as formating value
-                    if((typeof arguments[0]) == "object" && arguments.length == 1){
-                        obj = arguments[0][frmt.key];
-                    }else{
-                        throw new mod.Exception("Object or associative array expected as formating value.");
-                    }
-                }else{//get the current value
-                    if(cnt>=arguments.length){
-                        throw new mod.Exception("Not enough arguments for format string");
-                    }else{
-                        obj=arguments[cnt];
-                        cnt++;
-                    }
-                }
-                    
-                if(frmt.type == "s"){//String
-                    if (obj == null){
-                        obj = "null";
-                    }
-                    s=obj.toString().pad(frmt.paddingFlag, frmt.minLength);
-                    
-                }else if(frmt.type == "c"){//Character
-                    if(frmt.paddingFlag == "0"){
-                        frmt.paddingFlag=" ";//padding only spaces
-                    }
-                    if(typeof obj == "number"){//get the character code
-                        s = String.fromCharCode(obj).pad(frmt.paddingFlag , frmt.minLength) ;
-                    }else if(typeof obj == "string"){
-                        if(obj.length == 1){//make sure it's a single character
-                            s=obj.pad(frmt.paddingFlag, frmt.minLength);
-                        }else{
-                            throw new mod.Exception("Character of length 1 required.");
-                        }
-                    }else{
-                        throw new mod.Exception("Character or Byte required.");
-                    }
-                }else if(typeof obj == "number"){
-                    //get sign of the number
-                    if(obj < 0){
-                        obj = -obj;
-                        sign = "-"; //negative signs are always needed
-                    }else if(frmt.signed){
-                        sign = "+"; // if sign is always wanted add it 
-                    }else{
-                        sign = "";
-                    }
-                    //do percision padding and number conversions
-                    switch(frmt.type){
-                        case "f": //floats
-                        case "F":
-                            if(frmt.percision > -1){
-                                s = obj.toFixed(frmt.percision).toString();
-                            }else{
-                                s = obj.toString();
-                            }
-                            break;
-                        case "E"://exponential
-                        case "e":
-                            if(frmt.percision > -1){
-                                s = obj.toExponential(frmt.percision);
-                            }else{
-                                s = obj.toExponential();
-                            }
-                            s = s.replace("e", frmt.type);
-                            break;
-                        case "b"://binary
-                            s = obj.toString(2);
-                            s = s.pad("0", frmt.percision);
-                            break;
-                        case "o"://octal
-                            s = obj.toString(8);
-                            s = s.pad("0", frmt.percision);
-                            break;
-                        case "x"://hexadecimal
-                            s = obj.toString(16).toLowerCase();
-                            s = s.pad("0", frmt.percision);
-                            break;
-                        case "X"://hexadecimal
-                            s = obj.toString(16).toUpperCase();
-                            s = s.pad("0", frmt.percision);
-                            break;
-                        default://integers
-                            s = parseInt(obj).toString();
-                            s = s.pad("0", frmt.percision);
-                            break;
-                    }
-                    if(frmt.paddingFlag == "0"){//do 0-padding
-                        //make sure that the length of the possible sign is not ignored
-                        s=s.pad("0", frmt.minLength - sign.length);
-                    }
-                    s=sign + s;//add sign
-                    s=s.pad(frmt.paddingFlag, frmt.minLength);//do padding and justifiing
-                }else{
-                    throw new mod.Exception("Number required.");
-                }
-            }
-            rslt += s;
-        }
-        return rslt;
-    }
-    
-    /**
-        Padds a String with a character to have a minimum length.
-        
-        @param flag   "-":      to padd with " " and left justify the string.
-                            Other: the character to use for padding. 
-        @param len    The minimum length of the resulting string.
-    */
-    String.prototype.pad = function(flag, len){
-        var s = "";
-        if(flag == "-"){
-            var c = " ";
-        }else{
-            var c = flag;
-        }
-        for(var i=0;i<len-this.length;i++){
-            s += c;
-        }
-        if(flag == "-"){
-            s = this + s;
-        }else{
-            s += this;
-        }
-        return s;
-    }
-    
-    /**
-        Repeats a string.
-        @param c  The count how often the string should be repeated.
-    */
-    String.prototype.mul = function(c){
-        var a = new Array(this.length * c);
-        var s=""+ this;
-        for(var i=0;i<c;i++){
-            a[i] = s;
-        }
-        return a.join("");
-    }
-})
-
-//let jsolait do some startup initialization
-jsolait.init();
-
diff --git a/phpgwapi/js/jsolait/lib/codecs.js b/phpgwapi/js/jsolait/lib/codecs.js
deleted file mode 100644
index 2ccff80a6a..0000000000
--- a/phpgwapi/js/jsolait/lib/codecs.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-  Copyright (c) 2004 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-/**
-    Codecs for encoding decoding Strings.
-    To add new encoders simply create new String.prototype.encode_yourCodec methods.
-    To add new decoders simply create new String.prototype.decode_yourCodec methods.
-*/
-Module("codecs", "0.1.2", function(mod){
-    /**
-        Returns all all available encoders.
-        @return  An array of encoder names.
-    */
-    mod.listEncoders=function(){
-        var c=[];
-        for(var attr in String.prototype){
-            if(attr.slice(0, 7) == "encode_"){
-                c.push(attr.slice(7));
-            }
-        }
-        return c;
-    }
-    /**
-        Returns all all available decoders.
-        @return  An array of decoder names.
-    */
-    mod.listDecoders=function(){
-        var c=[];
-        for(var attr in String.prototype){
-            if(attr.slice(0, 7) == "decode_"){
-                c.push(attr.slice(7));
-            }
-        }
-        return c;
-    }
-    
-    /**
-        Decodes an encoded string.
-        Parameters but the codec parameter are forwardet to the codec.
-        @param codec  The codec to use.
-    */
-    String.prototype.decode = function(codec){
-        var n ="decode_" + codec;
-        if(String.prototype[n]){
-            var args=[];
-            for(var i=1;i<arguments.length;i++){
-                args[i-1] = arguments[i];
-            }
-            return String.prototype[n].apply(this, args);
-        }else{
-            throw new mod.Exception("Decoder '%s' not found.".format(codec));
-        }
-    }
-    
-    /**
-        Encodes a string.
-        Parameters but the codec parameter are forwardet to the codec.
-        @param codec  The codec to use.
-    */
-    String.prototype.encode = function(codec){
-        var n ="encode_" + codec;
-        if(String.prototype[n]){
-            var args=[];
-            for(var i=1;i<arguments.length;i++){
-                args[i-1] = arguments[i];
-            }
-            return String.prototype[n].apply(this, args);
-        }else{
-            throw new mod.Exception("Ecnoder '%s' not found.".format(codec));
-        }
-    }
-    
-    /**
-        Decodes a Base64 encoded string to a byte string.
-    */
-    String.prototype.decode_base64=function(){
-         if((this.length % 4) == 0){
-             if(typeof(atob) != "undefined"){//try using mozillas builtin codec
-                 return atob(this);
-             }else{
-                 var nBits;
-                 //create a result buffer, this is much faster than having strings concatinated.
-                 var sDecoded = new Array(this.length /4);
-                 var base64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-                 for(var i=0; i < this.length; i+=4){
-                     nBits = (base64.indexOf(this.charAt(i))   & 0xff) << 18 |
-                                (base64.indexOf(this.charAt(i+1)) & 0xff) << 12 |
-                                (base64.indexOf(this.charAt(i+2)) & 0xff) <<  6 |
-                                base64.indexOf(this.charAt(i+3)) & 0xff;
-                    sDecoded[i] = String.fromCharCode((nBits & 0xff0000) >> 16, (nBits & 0xff00) >> 8, nBits & 0xff);
-                }
-                //make sure padding chars are left out.
-                sDecoded[sDecoded.length-1] = sDecoded[sDecoded.length-1].substring(0, 3 - ((this.charCodeAt(i - 2) == 61) ? 2 : (this.charCodeAt(i - 1) == 61 ? 1 : 0)));
-                return sDecoded.join("");
-             }
-         }else{
-             throw new mod.Exception("String length must be divisible by 4.");
-         }
-    }
-    
-    /**
-        Encodes a string using Base64.
-    */
-    String.prototype.encode_base64=function(){
-        if(typeof(btoa) != "undefined"){//try using mozillas builtin codec
-            return btoa(this);
-        }else{
-            var base64 = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-                                'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',
-                                '0','1','2','3','4','5','6','7','8','9','+','/'];
-            var sbin;
-            var pad=0;
-            var s="" + this;
-            if((s.length % 3) == 1){
-                s+=String.fromCharCode(0);
-                s+=String.fromCharCode(0);
-                pad=2;
-            }else if((s.length % 3) == 2){
-                s+=String.fromCharCode(0);
-                pad=1;
-            }
-            //create a result buffer, this is much faster than having strings concatinated.
-            var rslt=new Array(s.length / 3);
-            var ri=0;
-            for(var i=0;i<s.length; i+=3){
-                sbin=((s.charCodeAt(i) & 0xff) << 16) | ((s.charCodeAt(i+1) & 0xff ) << 8) | (s.charCodeAt(i+2) & 0xff);    
-                rslt[ri] = (base64[(sbin >> 18) & 0x3f] + base64[(sbin >> 12) & 0x3f] + base64[(sbin >>6) & 0x3f] + base64[sbin & 0x3f]);
-                ri++;
-            }
-            if(pad>0){
-                rslt[rslt.length-1] = rslt[rslt.length-1].substr(0, 4-pad) +  ((pad==2) ? "==" : (pad==1) ? "=" : "");
-            }
-            return rslt.join("");
-        }
-    }
-
-    /**
-        Decodes a URI using decodeURI.
-    */
-    String.prototype.decode_uri=function(){
-        return decodeURI(this);
-    }
-    
-    /**
-        Encodes a URI using encodeURI.
-    */
-    String.prototype.encode_uri=function(){
-        return encodeURI(this);
-    }
-})
diff --git a/phpgwapi/js/jsolait/lib/crypto.js b/phpgwapi/js/jsolait/lib/crypto.js
deleted file mode 100644
index f1654bc2ee..0000000000
--- a/phpgwapi/js/jsolait/lib/crypto.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-  Copyright (c) 2003 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/ 
-
-/**
-    Cryptography module.
-    Provides String encryption/decryption and hashing. 
-*/
-Module("crypto", "0.1.2", function(mod){
-    /**
-        Returns all all available encrypters.
-        @return  An array of encrypters names.
-    */
-    mod.listEncrypters=function(){
-        var c=[];
-        for(var attr in String.prototype){
-            if(attr.slice(0, 8) == "encrypt_"){
-                c.push(attr.slice(8));
-            }
-        }
-        return c;
-    }
-    /**
-        Returns all all available decrypters.
-        @return  An array of decrypters names.
-    */
-    mod.listDecrypters=function(){
-        var c=[];
-        for(var attr in String.prototype){
-            if(attr.slice(0, 8) == "decrypt_"){
-                c.push(attr.slice(8));
-            }
-        }
-        return c;
-    }
-    
-    /**
-        Encrypts a string.
-        Parameters but the crypdec parameter are forwardet to the crypdec.
-        @param codec  The codec to use.
-    */
-    String.prototype.encrypt=function(crydec){
-        var n = "encrypt_" + crydec;
-        if(String.prototype[n]){
-            var args=[];
-            for(var i=1;i<arguments.length;i++){
-                args[i-1] = arguments[i];
-            }
-            return String.prototype[n].apply(this, args);
-        }else{
-            throw new mod.Exception("Decrypter '%s' not found.".format(crydec));
-        }
-    }
-    /**
-        Decrypts a string.
-        Parameters but the crypdec parameter are forwardet to the crypdec.
-        @param codec  The codec to use.
-    */
-    String.prototype.decrypt=function(crydec){
-        var n = "decrypt_" + crydec;
-        if(String.prototype[n]){
-            var args=[];
-            for(var i=1;i<arguments.length;i++){
-                args[i-1] = arguments[i];
-            }
-            return String.prototype[n].apply(this, args);
-        }else{
-            throw new mod.Exception("Encrypter '%s' not found.".format(crydec));
-        }
-    }
-    
-    /**
-        Encrypts a string using XOR.
-        The whole String will be XORed with the key. 
-        If the key is shorter than the String then it will be multiplied to fit the length of the String.
-        @param key  The key to use for encryption.
-    */
-    String.prototype.encrypt_xor=function(key){
-        var e=new Array(this.length);
-        var l=key.length;
-        for(var i=0;i<this.length;i++){
-            e[i] = String.fromCharCode(this.charCodeAt(i) ^ key.charCodeAt(i % l));
-        }
-        return e.join("");
-    }
-    /**
-        Decrypts a string using XOR.
-        Since XORing is symetric it is the same as the encrypter.
-        @param key  The key to use for decryption.
-    */
-    String.prototype.decrypt_xor=String.prototype.encrypt_xor;
-    /**
-        Encrypts a string using the ARC4 algorithm.
-        @param key  The key to use for encryption.
-    */
-    String.prototype.encrypt_rc4=function(key){
-        //generate substitution box
-        var sbox = new Array (256);
-        for (var i=0; i<256; i++){
-             sbox[i]=i;
-        }
-        
-        //swap things around 
-        var j=0;
-        for (var i=0; i < 256; i++) {
-             j = (j + sbox[i] + key.charCodeAt(i % key.length)) % 256;
-             var tmp = sbox[i];
-             sbox[i] = sbox[j];
-             sbox[j] = tmp;
-        }
-        
-        //calculate the result
-        var i=256;    
-        var j=256;
-        var rslt=new Array(this.length);
-        for (var k=0; k < this.length; k++) {
-            i = (i + 1) % 256;
-            j = (j + sbox[i]) % 256;
-            var tmp = sbox[i];
-            sbox[i] = sbox[j];
-            sbox[j] = tmp;
-            t = (sbox[i] + sbox[j]) % 256;
-            rslt[k] = String.fromCharCode(this.charCodeAt(k) ^ sbox[t]);
-        }
-        return rslt.join("");
-    }
-    /**
-        Decrypts a string using the ARC4 algorithm.
-        Since it is symetric it is the same as the encrypter.
-        @param key  The key to use for decryption.
-    */
-    String.prototype.decrypt_rc4=String.prototype.encrypt_rc4;
-})
\ No newline at end of file
diff --git a/phpgwapi/js/jsolait/lib/jsonrpc.js b/phpgwapi/js/jsolait/lib/jsonrpc.js
deleted file mode 100644
index 2092c275d7..0000000000
--- a/phpgwapi/js/jsolait/lib/jsonrpc.js
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
-  Copyright (c) 2003-2004 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/**
-    Provides an JSON-RPC imlementation.
-*/
-Module("jsonrpc", "0.3.2", function(mod){
-    
-    var lang = importModule("lang");
-    var tokens =  lang.tokens;
-    
-    var ObjectBuffer=Class("ObjectBuffer", function(publ, supr){
-        publ.init=function(){
-            this.data="";
-        }
-        publ.getObjects=function(data){
-            this.data += data;
-            var t = new lang.Tokenizer(this.data);
-            var brCnt= 0;
-            var objects = [];
-            var readCnt = 0
-            while(! t.finished()){
-                var n = t.next();
-                if(n.type != tokens.ERR){
-                    if(n.value == "{"){
-                        brCnt+=1;
-                    }else if(n.value == "}"){
-                        brCnt-=1;
-                        if(brCnt==0){
-                            var s = this.data.slice(readCnt, n.pos+1);
-                            readCnt += s.length;
-                            objects.push(s);
-                        }
-                    }
-                }else{
-                    break;
-                }
-            }
-            this.data = this.data.slice(readCnt);
-            return objects;
-        }
-    })
-    
-    var nameAllowed=function(name){
-        return name.match(/^[a-zA-Z]\w*$/) != null;
-    }
-    
-    var getMethodByName=function(obj, name){
-        try{//to get a method by asking the service
-            obj = obj._getMethodByName(name)
-        }catch(e){
-            var names = name.split(".");
-            for(var i=0;i<names.length;i++){
-                name = names[i];
-                if(nameAllowed(name)){
-                    obj = obj[name];
-                }
-            }
-        }
-        return obj;
-    }
-    
-    var Response=Class("Response", function(publ, supr){
-        publ.init=function(id, result, error){
-            this.id=id;
-            this.result = result;
-            this.error = error;
-        }
-        publ._toJSON=function(){
-            var p = [lang.objToJson(this.id), lang.objToJson(this.result),lang.objToJson(this.error)];
-            return '{"id":' + p[0] + ', "result":' + p[1] + ', "error":' + p[2] + "}";
-        }
-    })
-    
-    var Request=Class("Request", function(publ, supr){
-        publ.init=function(id, method, params){
-            this.id=id;
-            this.method = method;
-            this.params = params;
-        }
-        publ._toJSON=function(){
-            var p = [lang.objToJson(this.id), lang.objToJson(this.method),lang.objToJson(this.params)];
-            return '{"id":' + p[0] + ', "method":' + p[1] + ', "params":' + p[2] + "}";
-        }
-    })
-    
-    var Notification=Class("Notification", function(publ, supr){
-        publ.init=function(method, params){
-            this.method = method;
-            this.params = params;
-        }
-        publ._toJSON=function(){
-            var p = [lang.objToJson(this.method),lang.objToJson(this.params)];
-            return '{"method":' + p[0] + ', "params":' + p[1] + "}";
-        }
-    })
-    
-    var ResponseHandler=Class("ResponseHandler", function(publ, supr){
-        publ.init=function(callback){
-            this.callback=callback;
-        }
-        publ.handleResponse=function(resp){
-            this.callback(resp.result, resp.error);
-        }
-    })
-    
-    var RPCLib = Class("RPCLib", function(publ, supr){
-        
-    })
-    
-    var BaseConnectionHandler = Class("BaseConnectionHandler",  function(publ, supr){
-        publ.init=function(service){
-            this.service = service;
-            this.jsonParser = new lang.JSONParser();
-            this.jsonParser.addLib(new RPCLib(), "rpc", []);
-            this.respHandlers = [];
-            this.objBuffer = new ObjectBuffer();
-        }
-                
-        publ.addResponseHandler=function(cb){
-            var id=1;
-            while(this.respHandlers[""+id] ){
-                id+=1;
-            }
-            id="" + id;
-            this.respHandlers[id] = new ResponseHandler(cb);
-            return id;
-        }
-        
-        publ.send = function(data){
-        }
-        
-        publ.sendNotify = function(name, args){
-            var n = new Notification(name, args);
-            n = this.jsonParser.objToJson(n);
-            this.send(n)
-        }
-        
-        publ.sendRequest = function(name, args, callback){
-            var id = this.addResponseHandler(callback);
-            var r = new Request(id, name, args);
-            r = this.jsonParser.objToJson(r);
-            this.send(r);
-        }
-        
-        publ.sendResponse = function(id, result, error){
-            var r = new Response(id, result, error);
-            r = this.jsonParser.objToJson(r);
-            this.send(r);
-        }
-        
-        publ.handleRequest = function(req){
-            var name = req.method;
-            var params = req.params;
-            var id=req.id;
-            if(this.service[name]){
-                try{
-                    var rslt = this.service[name].apply(this.service,params);
-                    this.sendResponse(id, rslt, null)
-                }catch(e){
-                    this.sendResponse(id, null, new ApplicationError("" + e))
-                }
-            }else{
-                this.sendResponse(id, null, new MethodNotFound());
-            }
-        }
-        
-        publ.handleNotification = function(notif){
-            if(this.service[notif.method]){
-                try{
-                    this.service[notif.method].apply(this.service, notif.params);
-                }catch(e){
-                }
-            }
-        }
-        
-        publ.handleResponse = function(resp){
-            var id=resp.id;
-            var h = this.respHandlers[id];
-            h.handleResponse(resp)
-            delete this.respHandlers[id]
-        }
-        
-        publ.handleData = function(data){
-            var objs = this.objBuffer.getObjects(data);
-            for(var i=0;i<objs.length;i++){
-                try{
-                    var obj = this.jsonParser.jsonToObj(objs[i]);
-                }catch(e){
-                    throw "Not well formed";
-                }
-                if(obj.method != null){ 
-                    if(obj.id != null){
-                        this.handleRequest(new Request(obj.id, obj.method, obj.params));
-                    }else{
-                        this.handleNotification(new Notification(obj.method, obj.params));
-                    }
-                }else if(obj.id != null){
-                     this.handleResponse(new Response(obj.id, obj.result, obj.error));
-                }else{
-                   throw "Unknown Data";
-                }
-            }
-        }
-    })
-    
-    var SocketConnectionHandler = Class("SocketConnectionHandler", BaseConnectionHandler, function(publ, supr){
-        publ.init=function(socket, localService){
-            this.socket = socket;
-            socket.addEventListener("connectionData", this, false);
-            supr(this).init( localService);
-        }
-        
-        publ.handleEvent=function(evt){
-            this.handleData(evt.data);
-        }
-        
-        publ.send=function(data){
-            this.socket.send(data);
-        }
-        
-        publ.close=function(data){
-            this.socket.close();
-        }
-    })
-    
-    var HTTPConnectionHandler = Class("HTTPConnectionHandler", BaseConnectionHandler, function(publ, supr){
-        var urllib;
-        publ.init=function(url, localService){
-            urllib=importModule("urllib");
-            this.url = url;
-            supr(this).init( localService);
-        }
-                
-        publ.handleData = function(data){
-            try{
-                var obj = this.jsonParser.jsonToObj(data);
-            }catch(e){
-                throw "Not well formed";
-            }
-            if(obj.id != null){
-                return obj;
-            }else{
-                throw "Unknown Data (No id property found)";
-            }  
-        }
-        
-        publ.sendRequest = function(name, args, callback){
-            var sync = false;
-            if(typeof callback != "function"){//see if it is sync
-                args.push(callback); 
-                sync=true;
-            }
-            var data = new Request("httpReq", name, args);
-            data = this.jsonParser.objToJson(data);
-            if(sync){
-                var rsp = urllib.postURL(this.url, data, [["Content-Type", "text/plain"]]);
-                rsp = this.handleData(rsp.responseText);
-                if(rsp.error){
-                    throw rsp.error;
-                }else{
-                    return rsp.result;
-                }
-            }else{//async connection uses the respHandler to handle the repsonse
-                var self = this;
-                urllib.postURL(this.url, data, [["Content-Type", "text/plain"]], function(rsp){
-                    try{
-                        rsp = self.handleData(rsp.responseText);
-                    }catch(e){
-                        callback(null,e);
-                        return;
-                    }
-                    callback(rsp.result, rsp.error);
-                });
-            }
-        }
-        
-        publ.sendNotify = function(name, args){
-            var data = new Notification(name, args);
-            data = this.jsonParser.objToJson(data);
-            urllib.postURL(this.url, data, [["Content-Type", "text/plain"]], function(rsp){});
-        }
-    })
-    
-    var PeerObject=Class("PeerObject", function(publ, supr){
-        publ.init=function(name, conn){
-            var fn=function(){
-                var args=[];
-                for(var i=0;i<arguments.length;i++){
-                    args[i] = arguments[i];
-                }
-                var cb=args.pop();
-                return conn.sendRequest(name, args, cb);
-            }
-            return fn;
-        }
-    })
-     
-    var PeerNotifyObject=Class("PeerNotifyObject", function(publ, supr){
-        publ.init=function(name, conn){
-            var fn=function(){
-                var args=[];
-                for(var i=0;i<arguments.length;i++){
-                    args[i] = arguments[i];
-                }
-                conn.sendNotify(name, args);
-            }
-            return fn;
-        }
-    })
-    
-    var BasePeer = Class("BasePeer", function(publ, supr){
-        publ.init=function(conn, methodNames){
-            this._conn = conn;
-            this.notify = new PeerObject("notify", conn);
-            this._add(methodNames);
-        }
-        
-        var setupPeerMethod=function(root, methodName, conn, MethClass){
-            var names = methodName.split(".");
-            var obj = root;
-            for(var n=0;n<names.length-1;n++){
-                var name = names[n];
-                if(obj[name]){
-                    obj = obj[name];
-                }else{
-                    obj[name] = new Object();
-                    obj = obj[name];
-                }
-            }
-            var name = names[names.length-1];
-            if(obj[name]){
-            }else{
-                var mth = new MethClass(methodName, conn);
-                obj[name] = mth;
-            }
-        }
-        
-        publ._add = function(methodNames){
-            for(var i=0;i<methodNames.length;i++){
-                setupPeerMethod(this, methodNames[i], this._conn, PeerObject);
-                setupPeerMethod(this.notify, methodNames[i], this._conn, PeerNotifyObject);
-            }
-        }
-    })
-    
-    
-    mod.ServiceProxy = Class("ServiceProxy", BasePeer, function(publ, supr){
-        publ.init = function(url, methodNames, localService){
-            var n = url.match(/^jsonrpc:\/\/(.*:\d*)$/);
-            if(n!=null){//is it  json-rpc over TCP protocoll 
-                var hostaddr = n[1];
-                try{
-                    var socket = createConnection();
-                }catch(e){
-                    throw "Can't create a socket connection."
-                }
-                socket.connect(hostaddr);
-                supr(this).init( new SocketConnectionHandler(socket, localService), methodNames);
-            }else{//or is it json-rpc over http
-                supr(this).init( new HTTPConnectionHandler(url, localService), methodNames);
-            }
-        }
-    })
-})
-
diff --git a/phpgwapi/js/jsolait/lib/lang.js b/phpgwapi/js/jsolait/lib/lang.js
deleted file mode 100644
index 778fd3d437..0000000000
--- a/phpgwapi/js/jsolait/lib/lang.js
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-  Copyright (c) 2004 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/**
-    Module providing language services like tokenizing JavaScript code
-    or converting JavaScript objects to and from JSON (see json.org).
-    To customize JSON serialization of Objects just overwrite the toJSON method in your class.
-*/
-Module("lang", "0.3.5", function(mod){
-   
-    var ISODate = function(d){
-        if(/^(\d{4})(\d{2})(\d{2})T(\d{2}):(\d{2}):(\d{2})/.test(d)){
-            return new Date(Date.UTC(RegExp.$1, RegExp.$2-1, RegExp.$3, RegExp.$4, RegExp.$5, RegExp.$6));
-        }else{ //todo error message
-            throw "Not an ISO date: " + d;
-        }
-    }
-        
-    mod.JSONParser=Class("JSONParser", function(publ, supr){
-        publ.init=function(){
-            this.libs = {};
-            var sys = {"ISODate" : ISODate};
-            this.addLib(sys, "sys", ["ISODate"]);
-        }
-        
-        publ.addLib = function(obj, name, exports){
-            if(exports == null){
-                this.libs[name] = obj;
-            }else{
-                for(var i=0;i<exports.length;i++){
-                    this.libs[name + "." + exports[i]] = obj[exports[i]];
-                }
-            }
-        }
-        
-        var EmptyValue = {};
-        var SeqSep = {};
-        
-        var parseValue = function(tkns, libs){
-            var tkn = tkns.nextNonWS();
-            switch(tkn.type){
-                case mod.tokens.STR:
-                case mod.tokens.NUM:
-                    return eval(tkn.value);
-                case mod.tokens.NAME:
-                    return parseName(tkn.value);
-                case mod.tokens.OP:
-                    switch(tkn.value){
-                        case "[":
-                            return parseArray(tkns, libs);
-                            break;
-                        case "{":
-                            return parseObj(tkns, libs);
-                            break;
-                        case "}": case "]":
-                            return EmptyValue;
-                        case ",":
-                            return SeqSep;
-                        default:
-                            throw "expected '[' or '{' but found: '" + tkn.value + "'";
-                    }
-            }
-            return EmptyValue;
-        }
-        
-        var parseArray = function(tkns, libs){
-            var a = [];
-            while(! tkns.finished()){
-                var v = parseValue(tkns, libs);
-                if(v == EmptyValue){
-                    return a;
-                }else{
-                    a.push(v);
-                    v = parseValue(tkns, libs);
-                    if(v == EmptyValue){
-                        return a;
-                    }else if(v != SeqSep){
-                        throw "',' expected but found: '" + v + "'";
-                    }
-                }
-            }
-            throw "']' expected";
-        }
-                     
-        var parseObj = function(tkns, libs){
-            var obj = {};
-            var nme =""
-            while(! tkns.finished()){
-                var tkn = tkns.nextNonWS();
-                if(tkn.type == mod.tokens.STR){
-                    var nme =  eval(tkn.value);
-                    tkn = tkns.nextNonWS();
-                    if(tkn.value == ":"){
-                        var v = parseValue(tkns, libs);
-                        if(v == SeqSep || v == EmptyValue){
-                            throw "value expected";
-                        }else{
-                            obj[nme] = v;
-                            v = parseValue(tkns, libs);
-                            if(v == EmptyValue){
-                                return transformObj(obj, libs);
-                            }else if(v != SeqSep){
-                                throw "',' expected";
-                            }
-                        }
-                    }else{
-                        throw "':' expected but found: '" + tkn.value + "'";
-                    }
-                }else if(tkn.value == "}"){
-                    return transformObj(obj, libs);
-                }else{
-                    throw "String expected";
-                }
-            }
-            throw "'}' expected."
-        }
-        
-        var transformObj = function(obj, libs){
-            var o2;
-            if(obj.jsonclass != null){
-                var clsName = obj.jsonclass[0];
-                var params = obj.jsonclass[1]
-                if(libs[clsName]){
-                    o2 = libs[clsName].apply(this, params);
-                    for(var nme in obj){
-                        if(nme != "jsonclass"){
-                            if(typeof obj[nme] != "function"){
-                                o2[nme] = obj[nme];
-                            }
-                        }
-                    }
-                }else{
-                    throw "jsonclass not found: " + clsName;
-                }
-            }else{
-                o2 = obj;
-            }
-            return o2;
-        }
-        
-        var parseName = function(name){
-            switch(name){
-                case "null":
-                    return null;
-                case "true":
-                    return true;
-                case "false":
-                    return false;
-                default:
-                    throw "'null', 'true', 'false' expected but found: '" + name + "'";
-            }
-        }
-        
-        publ.jsonToObj = function(data){
-            var t = new mod.Tokenizer(data);
-            return parseValue(t, this.libs);
-        }
-                
-        publ.objToJson=function(obj){
-            if(obj == null){
-                return "null";
-            }else{
-                return obj.toJSON();
-            }
-        }
-    })
-        
-    mod.parser = new mod.JSONParser();
-    
-    /**
-        Turns JSON code into JavaScript objects.
-        @param src  The source as a String.
-    */
-    mod.jsonToObj=function(src){
-        return mod.parser.jsonToObj(src);
-    }
-    
-    /**
-        Turns an object into JSON.
-        This is the same as calling obj.toJSON();
-        @param obj  The object to marshall.
-    */
-    mod.objToJson=function(obj){
-        return mod.parser.objToJson(obj);
-    }
-    
-    ///Token constants for the tokenizer.
-    mod.tokens = {};
-    mod.tokens.WSP = 0;
-    mod.tokens.OP =1;
-    mod.tokens.STR = 2;
-    mod.tokens.NAME = 3;
-    mod.tokens.NUM = 4;
-    mod.tokens.ERR = 5;
-    mod.tokens.NL = 6;
-    mod.tokens.COMMENT = 7;
-    mod.tokens.DOCCOMMENT = 8;
-    mod.tokens.REGEXP = 9;
-    
-    
-    //todo:doc
-    mod.Token=Class(function(publ, supr){
-        
-        publ.init=function(type, value, pos, err){
-            this.type = type;
-            this.value = value;
-            this.pos = pos;
-            this.err= err;
-        }
-        
-    })
-    
-    /**
-        Tokenizer Class which incrementally parses JavaScript code and returns the language tokens.
-    */
-    mod.Tokenizer=Class("Tokenizer", function(publ, supr){
-        publ.init=function(s){
-            this._working = s;
-            this._pos = 0;
-        }
-        
-        /**
-            Returns weather or not the code was parsed.
-            @return True if the complete code was parsed, false otherwise.
-        */
-        publ.finished=function(){
-            return this._working.length == 0;
-        }
-        
-        publ.nextNonWS = function(nlIsWS){
-            var tkn = this.next();
-            while((tkn.type == mod.tokens.WSP) ||  (nlIsWS && (tkn.type == mod.tokens.NL))){
-                tkn = this.next();
-            }
-            return tkn;
-        }
-        
-        /**
-            Returns the next token.
-            @return The next token.
-        */
-        publ.next = function(){
-            if(this._working ==""){
-                throw "Empty";
-            } 
-            var s1 = this._working.charAt(0);
-            var s2 = s1 + this._working.charAt(1);
-            var s3 = s2 + this._working.charAt(2);
-            var rslt=[];
-            switch(s1){
-                case '"': case "'":
-                    try{
-                        s1 = extractQString(this._working);
-                        rslt= new mod.Token(mod.tokens.STR, s1, this._pos);
-                    }catch(e){
-                        rslt= new mod.Token(mod.tokens.ERR, s1, this._pos, e);
-                    }
-                    break;
-                case "\n": case "\r":
-                    rslt =new mod.Token(mod.tokens.NL, s1, this._pos);
-                    break;   
-                case "{": case "}": case "[": case "]": case "(": case ")":
-                case ":": case ",": case ".": case ";":
-                case "*": case "-": case "+":
-                case "=": case "<": case ">":  case "!":   
-                    switch(s2){
-                        case "==": case "!=": case "<>":  case "<=": case ">=":
-                            rslt = new mod.Token(mod.tokens.OP, s2, this._pos);
-                            break;
-                        default:
-                            rslt = new mod.Token(mod.tokens.OP, s1, this._pos);
-                    }
-                    break;
-                case "/":
-                    if(s2 == "//" || s3 =="///"){
-                        s1 = extractSLComment(this._working);
-                        rslt = new mod.Token(s1.charAt(2) != "/" ? mod.tokens.COMMENT:mod.tokens.DOCCOMMENT, s1, this._pos);
-                    }else if(s2 == "/*" || s3 =="/**"){
-                        try{
-                            s1 = extractMLComment(this._working);
-                            rslt = new mod.Token(s3 !="/**" ? mod.tokens.COMMENT: mod.tokens.DOCCOMMENT, s1, this._pos);
-                        }catch(e){
-                            rslt= new mod.Token(mod.tokens.ERR, s3 != "/**" ? s2 : s3, this._pos, e);
-                        }
-                    }else{
-                        try{
-                            s1 = extractRegExp(this._working);
-                            rslt  = new mod.Token(mod.tokens.REGEXP, s1, this._pos);
-                        }catch(e){
-                            rslt = new mod.Token(mod.tokens.OP, s1, this._pos, e);
-                        }
-                    }
-                    break;
-                default:
-                    s1=this._working.match(/\d+\.\d+|\d+|\w+|\s+/)[0];
-                    if(s1.replace(/\s+/g,"") == ""){ //whitespace
-                        rslt = new mod.Token(mod.tokens.WSP, s1, this._pos);
-                    }else if(/^\d|\d\.\d/.test(s1)){//number
-                        rslt =  new mod.Token(mod.tokens.NUM, s1, this._pos);
-                    }else{//name
-                        rslt =new mod.Token(mod.tokens.NAME, s1, this._pos);
-                    }
-            }
-            
-            this._working=this._working.slice(rslt.value.length);
-            this._pos += rslt.value.length;
-            return rslt;
-        }
-        
-        var searchQoute = function(s, q){
-            if(q=="'"){
-                return s.search(/[\\']/);
-            }else{
-                return s.search(/[\\"]/);
-            }
-        }
-        
-        var extractQString=function(s){
-            if(s.charAt(0) == "'"){
-                var q="'";
-            }else{
-                var q='"';
-            }
-            s=s.slice(1);
-            var rs="";
-            var p= searchQoute(s, q);
-            while(p >= 0){
-                if(p >=0){
-                    if(s.charAt(p) == q){
-                        rs += s.slice(0, p+1);
-                        s = s.slice(p+1);
-                        return q + rs;
-                    }else{
-                        rs+=s.slice(0, p+2);
-                        s = s.slice(p+2);
-                    }
-                }
-                p = searchQoute(s, q);
-            }
-            throw "End of String expected.";
-        }
-        
-        var extractSLComment=function(s){
-            var p = s.search(/\n/);
-            if(p>=0){
-                return s.slice(0,p+1);
-            }else{
-                return s;
-            }
-        }
-        
-        var extractMLComment=function(s){
-            var p = s.search(/\*\//);
-            if(p>=0){
-                return s.slice(0,p+2);
-            }else{
-                throw "End of comment expected.";
-            }
-        }
-        
-        var extractRegExp=function(s){
-            var p=0;
-            for(var i=0;i<s.length;i++){
-                if(s.charAt(i) == "/"){
-                    p=i;
-                }
-                if(s.charAt(i) == "\n"){
-                    i = s.length;
-                }
-            }
-            return s.slice(0,p+1);
-        }
-    })
-    
-    /**
-        Converts an object to JSON.
-    */
-    Object.prototype.toJSON = function(){
-        var v=[];
-        for(attr in this){
-            if(typeof this[attr] != "function"){
-                v.push('"' + attr + '": ' + mod.objToJson(this[attr]));
-            }
-        }
-        return "{" + v.join(", ") + "}";
-    }
-    
-    /**
-        Converts a String to JSON.
-    */
-    String.prototype.toJSON = function(){
-        var s = '"' + this.replace(/(["\\])/g, '\\$1') + '"';
-        s = s.replace(/(\n)/g,"\\n");
-        return s;
-    }
-    
-    /**
-        Converts a Number to JSON.
-    */
-    Number.prototype.toJSON = function(){
-        return this.toString();
-    }
-    
-    /**
-        Converts a Boolean to JSON.
-    */
-    Boolean.prototype.toJSON = function(){
-        return this.toString();
-    }
-    
-    /**
-        Converts a Date to JSON.
-        Date representation is not defined in JSON.
-    */
-    Date.prototype.toJSON= function(){
-        var padd=function(s, p){
-            s=p+s
-            return s.substring(s.length - p.length)
-        }
-        var y = padd(this.getUTCFullYear(), "0000");
-        var m = padd(this.getUTCMonth() + 1, "00");
-        var d = padd(this.getUTCDate(), "00");
-        var h = padd(this.getUTCHours(), "00");
-        var min = padd(this.getUTCMinutes(), "00");
-        var s = padd(this.getUTCSeconds(), "00");
-        
-        var isodate = y +  m  + d + "T" + h +  ":" + min + ":" + s
-        
-        return '{"jsonclass":["sys.ISODate", ["' + isodate + '"]]}';
-    }
-    
-    /**
-        Converts an Array to JSON.
-    */
-    Array.prototype.toJSON = function(){
-        var v = [];
-        for(var i=0;i<this.length;i++){
-            v.push(mod.objToJson(this[i])) ;
-        }
-        return "[" + v.join(", ") + "]";
-    }
-        
-})
-
diff --git a/phpgwapi/js/jsolait/lib/urllib.js b/phpgwapi/js/jsolait/lib/urllib.js
deleted file mode 100644
index 3cf574e88e..0000000000
--- a/phpgwapi/js/jsolait/lib/urllib.js
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-  Copyright (c) 2003 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/**
-   Provides methods for making HTTP requests.
-*/
-Module("urllib","1.1.2", function(mod){
-    /**
-        Thrown if no request object could be instanciated.
-    */
-    mod.NoHTTPRequestObject=Class("NoHTTPRequestObject", mod.Exception, function(publ, supr){
-        /**
-            Initializes the Exception.
-            @param trace The error causing this exception.
-        */
-        publ.init=function(trace){
-            supr(this).init( "Could not create an HTTP request object", trace);
-        }
-    })
-    
-    /**
-        Thrown if an HTTP request could not be opened.
-    */
-    mod.RequestOpenFailed = Class("RequestOpenFailed", mod.Exception, function(publ, supr){
-        /**
-            Initializes the Exception.
-            @param trace The error causing this exception.
-        */
-        publ.init=function(trace){
-            supr(this).init( "Opening of HTTP request failed.", trace);
-        }
-    })
-    
-    /**
-        Thrown is arequest could not be sent to the server.
-    */
-    mod.SendFailed=Class("SendFailed", mod.Exception, function(publ, supr){
-         /**
-            Initializes the Exception.
-            @param trace The error causing this exception.
-        */
-        publ.init = function(trace){
-            supr(this).init( "Sending of HTTP request failed.", trace);
-        }
-    })
-    
-    /**
-        Mimics the HTTPRequest object using Adobe's SVG Viewer's postURL and getURL.
-        It can only process asyncronous connection and the only header that's supported is 'Content-Type'.
-    */
-    var ASVRequest=Class("ASVRequest", function(publ){
-        /**
-            Initializes the ASVRequest.
-        */
-        publ.init = function(){
-            if((getURL==null) || (postURL==null)){
-                throw "getURL and postURL are not available!";
-            }else{
-                this.readyState=0;
-                this.responseText="";
-                this.__contType ="";
-                this.status=200;
-            }
-        }
-        /**
-            Mimics the open method without actually opening a connection.
-            @param type          "GET" or "POST".
-            @param url             The url to open.
-            @param async=true True for async. connection. Otherwhise an exception is thrown.
-        */
-        publ.open=function(type,url,async){
-            if (async == false){
-                throw "Can only open asynchronous connections!";
-            }
-            this.__type = type;
-            this.__url = url;
-            this.readyState=0;
-        }
-        /**
-            Sets a header.
-            @param name  The header name. All but "Content-Type" are ignored.
-            @param value  The value of the header.
-        */
-        publ.setRequestHeader=function(name, value){
-            if (name=="Content-Type"){
-                this.__contType =value;
-            }
-        }
-        /**
-            Sends the request.
-            @param data   The data to send when doing a post.
-        */
-        publ.send=function(data){
-            var self=this;
-            var cbh=new Object();
-            cbh.operationComplete = function(rsp){
-                self.readyState=4;
-                self.responseText=rsp.content;
-                if(this.ignoreComplete == false){
-                    if(self.onreadystatechange){
-                        self.onreadystatechange();
-                    }
-                }
-            }
-            cbh.ignoreComplete = false;
-            try{
-                if(this.__type =="GET"){
-                    getURL(this.__url,cbh);
-                }else if (this.__type == "POST"){
-                    postURL(this.__url, data, cbh, this.__contType);
-                }
-            }catch(e){
-                cbh.ignoreComplete=true;
-                throw e;
-            }
-        }
-    })
-    
-    /**
-        Creates an HTTP request object for retreiving files.
-        @return  HTTP request object.
-    */    
-    var getHTTP=function() {
-        var obj;
-        try{ //to get the mozilla httprequest object
-            obj = new XMLHttpRequest();
-        }catch(e){
-            try{ //to get MS HTTP request object
-                obj=new ActiveXObject("Msxml2.XMLHTTP.4.0");
-            }catch(e){
-                try{ //to get MS HTTP request object
-                    obj=new ActiveXObject("Msxml2.XMLHTTP")
-                }catch(e){
-                    try{// to get the old MS HTTP request object
-                        obj = new ActiveXObject("microsoft.XMLHTTP"); 
-                    }catch(e){
-                        try{//to create the ASV request object.
-                            obj = new ASVRequest();
-                        }catch(e){
-                            throw new mod.NoHTTPRequestObject("Neither Mozilla, IE nor ASV found. Can't do HTTP request without them.");
-                        }
-                    }
-                }    
-            }
-        }
-        return obj;
-    }
-    /**
-        Sends a request to a server.
-        To explain the way the optional arguments work I will give examples:
-        simple:
-            sendRequest("get", "url")
-            sendRequest("post", "url", "data")
-        
-        with headers:
-            sendRequest("get", "url", [["headername","value"]])
-            sendRequest("post", "url", "data", [["headername","value"]])
-        
-        with user information:
-            sendRequest("get", "url", "user", "pass")
-            sendRequest("post", "url", "user", "pass", "data")
-        
-        with headers and user information:
-            sendRequest("get", "url", "user", "pass", [["headername","value"]])
-            sendRequest("post", "url", "user", "pass", "data", [["headername","value"]])
-        
-        To make the request asynchronous just add a callback function as the last argument to the calls above.
- 
-        @param type              Type of connection (GET, POST, ...).
-        @param url                 The URL to retrieve.
-        @param user=null        The username for auth.
-        @param pass=null        The password. (must be set if user is set!)
-        @param data=""          The data to send with the request.
-        @param headers=[]      Array of headers. Each element in the array should be another array containing [headername,value].
-        @param callback=null   Callback for asynchronous connections. The callback is called after completion and is passed the request object as 1st Parameter.
-        @return                     HTTP request object.
-    */
-    mod.sendRequest=function(type, url, user, pass, data, headers, callback){
-        var async=false;
-        //check if the last argument is a function and treat it as callback;
-        if(arguments[arguments.length-1]  instanceof Function){
-            var async=true;
-            callback = arguments[arguments.length-1];
-        }
-        //treat sencond last(if callback)/last(if no callback) argument as headers
-        var headindex=arguments.length-((async || arguments[arguments.length-1] == null) ?2:1);
-        //is it an array then it's headers
-        if(arguments[headindex] instanceof Array){
-            headers=arguments[headindex];
-        }else{
-            headers=[];
-        }
-        //are user AND password not specified then assume data as 3rd argument.
-        if(typeof user == "string" && typeof pass == "string"){
-            if(typeof data != "string"){
-                data="";
-            }
-        }else if (typeof user == "string"){
-            data = user;
-            user=null;
-            pass=null;
-        }else{
-            user=null;
-            pass=null;
-        }
-        var xmlhttp= getHTTP();
-        try{
-            if(user!=null){
-                xmlhttp.open(type, url, async, user, pass);
-            }else{
-                xmlhttp.open(type, url, async);
-            }
-        }catch(e){
-            throw new mod.RequestOpenFailed(e);
-        }
-        //set headers
-        for(var i=0;i< headers.length;i++){
-            xmlhttp.setRequestHeader(headers[i][0], headers[i][1]);    
-        }
-        
-        if(async){//set up a callback
-            xmlhttp.onreadystatechange=function(){
-                if (xmlhttp.readyState==4) {
-                    callback(xmlhttp);
-                    xmlhttp = null; //help IE with arbage collection
-                }else if (xmlhttp.readyState==2){
-                    //status property should be available (MS IXMLHTTPRequest documentation) 
-                    //in Mozilla it is not if the request failed(server not reachable)
-                    //in IE it is not available at all ?!
-                    try{//see if it is mozilla otherwise don't care.
-                        var isNetscape = netscape;
-                        try{//if status is not available the request failed.
-                            var s=xmlhttp.status;
-                        }catch(e){//call the callback because Mozilla will not get to readystate 4
-                            callback(xmlhttp);
-                            xmlhttp = null;
-                        }
-                    }catch(e){
-                    }
-                }
-            }
-        }
-        
-        try{
-            xmlhttp.send(data);
-        }catch(e){            
-            throw new mod.SendFailed(e);
-        }
-        return xmlhttp;
-    }
-    /**
-        Shorthand for a GET request.
-        It calls sendRequest with "GET" as first argument.
-        See the sendRequest method for more information.
-        @param url                 The URL to retrieve.
-        @param user=null        The username for auth.
-        @param pass=null        The password. (must be set if user is set!)
-        @param headers=[]      Array of headers. Each element in the array should be another array containing [headername,value].
-        @param callback=null   Callback for asynchronous connections. The callback is called after completion and is passed the request object as 1st Parameter.
-        @return                     HTTP request object.
-    */
-    mod.getURL=function(url, user, pass, headers, callback) { 
-        var a=  new Array("GET");
-        for(var i=0;i<arguments.length;i++){
-            a.push(arguments[i]);
-        }
-        return mod.sendRequest.apply(this,a)
-    }
-    /**
-        Shorthand for a POST request.
-        It calls sendRequest with "POST" as first argument.
-        See the sendRequest method for more information.
-        @param url                 The URL to retrieve.
-        @param user=null        The username for auth.
-        @param pass=null        The password. (must be set if user is set!)
-        @param data=""          The data to send with the request.
-        @param headers=[]      Array of headers. Each element in the array should be another array containing [headername,value].
-        @param callback=null   Callback for asynchronous connections. The callback is called after completion and is passed the request object as 1st Parameter.
-        @return                     HTTP request object.
-    */
-    mod.postURL=function(url, user, pass, data, headers, callback) { 
-        var a=  new Array("POST");
-        for(var i=0;i<arguments.length;i++){
-            a.push(arguments[i]);
-        }
-        return mod.sendRequest.apply(this,a)
-    }
-})
-
diff --git a/phpgwapi/js/jsolait/lib/xml.js b/phpgwapi/js/jsolait/lib/xml.js
deleted file mode 100644
index fefe7944d4..0000000000
--- a/phpgwapi/js/jsolait/lib/xml.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-  Copyright (c) 2003 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-/**
-   Provides parseXML and an importNode implementation.
-*/
-Module("xml","1.1.2", function(mod){
-    /**
-        Thrown if no parser could be instanciated.
-    */
-    mod.NoXMLParser=Class("NoXMLParser", mod.Exception, function(publ, supr){
-        /**
-            Initializes the Exception.
-            @param trace  The error causing the Exception.
-        */
-        publ.init=function(trace){
-            supr(this).init("Could not create an XML parser.", trace);
-        }
-    })
-    /**
-        Thrown if a document could not be parsed.
-    */
-    mod.ParsingFailed=Class("ParsingFailed", mod.Exception, function(publ, supr){
-        /**
-            Initializes the Exception.
-            @param xml    The xml source which could not be parsed.
-            @param trace The error causing this Exception.
-        */
-        publ.init=function(xml,trace){
-             supr(this).init("Failed parsing XML document.",trace);
-            this.xml = xml;
-        }
-        ///The xml source which could not be parsed.
-        publ.xml;
-    })
-    /**
-        Parses an xml document.
-        @param xml     The xml text.
-        @return          A DOM of the xml document.
-    */
-    mod.parseXML=function(xml){
-        var obj=null;
-        var isMoz=false;
-        var isIE=false;
-        var isASV=false;
-        
-        try{//to get Adobe's SVG parseXML
-            var p=window.parseXML;
-            if(p==null){
-                throw "No ASV paseXML";
-            }
-            isASV=true;
-        }catch(e){
-            try{//to get the mozilla parser
-                obj = new DOMParser();
-                isMoz=true;
-            }catch(e){
-                try{//to get the MS XML parser
-                    obj = new ActiveXObject("Msxml2.DomDocument.4.0"); 
-                    isIE=true;
-                }catch(e){
-                    try{//to get the MS XML parser
-                        obj = new ActiveXObject("Msxml2.DomDocument"); 
-                        isIE=true;
-                    }catch(e){
-                        try{//to get the old MS XML parser
-                            obj = new ActiveXObject("microsoft.XMLDOM"); 
-                            isIE=true;
-                        }catch(e){
-                            throw new mod.NoXMLParser(e);
-                        }
-                    }
-                }
-            }
-        }
-        try{
-            if(isMoz){
-                obj = obj.parseFromString(xml, "text/xml");
-                return obj;
-            }else if(isIE){
-                obj.loadXML(xml);
-                return obj;
-            }else if(isASV){
-                return window.parseXML(xml, null);
-            }
-        }catch(e){
-            throw new mod.ParsingFailed(xml,e);
-        }
-    }
-    /**
-        DOM2 implimentation of document.importNode().
-        This will import into the current document. In SVG it will create SVG nodes in HTML it will create HTML nodes....
-        This might become customizable in the future.
-        @param importedNode   The node to import.
-        @param deep=true        Import all childNodes recursively.
-        @return                      The imported Node.
-    */
-    mod.importNode=function(importedNode, deep){
-        deep = (deep==null) ? true : deep;
-        //constants from doom2
-        var ELEMENT_NODE = 1;
-        var ATTRIBUTE_NODE = 2;
-        var TEXT_NODE = 3;
-        var CDATA_SECTION_NODE = 4;
-        var ENTITY_REFERENCE_NODE = 5;
-        var ENTITY_NODE = 6;
-        var PROCESSING_INSTRUCTION_NODE = 7;
-        var COMMENT_NODE = 8;
-        var DOCUMENT_NODE = 9;
-        var DOCUMENT_TYPE_NODE = 10;
-        var DOCUMENT_FRAGMENT_NODE = 11;
-        var NOTATION_NODE = 12;
-        var importChildren=function(srcNode, parent){
-            if(deep){
-                 for(var i=0; i<srcNode.childNodes.length; i++){
-                    var n=mod.importNode(srcNode.childNodes.item(i), true);
-                    parent.appendChild(n);
-                }
-            }
-        }
-        var node=null;
-        switch(importedNode.nodeType){
-            case ATTRIBUTE_NODE:
-                node=document.createAttributeNS(importedNode.namespaceURI, importedNode.nodeName);
-                node.value=importedNode.value;
-                break;
-            case DOCUMENT_FRAGMENT_NODE:
-                node=document.createDocumentFragment();
-                importChildren(importedNode,node);
-                break;
-            case ELEMENT_NODE:
-                node=document.createElementNS(importedNode.namespaceURI, importedNode.tagName);
-                //import all attributes
-                for(var i=0; i<importedNode.attributes.length; i++){
-                    var attr=this.importNode(importedNode.attributes.item(i), deep);
-                    node.setAttributeNodeNS(attr);
-                }
-                importChildren(importedNode,node);
-                break;
-            case ENTITY_REFERENCE_NODE:
-                node=importedNode;
-                break;
-            case PROCESSING_INSTRUCTION_NODE:
-                node=document.createProcessingInstruction(importedNode.target, importedNode.data);
-                break;
-            case TEXT_NODE:
-            case CDATA_SECTION_NODE:
-            case COMMENT_NODE:
-                node=document.createTextNode(importedNode.nodeValue);
-                break;
-            case DOCUMENT_NODE:
-                //Document nodes cannot be imported.
-            case DOCUMENT_TYPE_NODE:
-                //DocumentType nodes cannot be imported.
-            case NOTATION_NODE:
-                //readonly in DOM2
-            case ENTITY_NODE:
-                //readonly in DOM2
-                throw "not supported in DOM2";
-                break;
-        }
-        return node;
-    }
-    /**
-        Turns an XML document into a String.
-        @param node   The node to print.
-        @return           A string containing the text for the XML.
-    */
-    mod.node2XML = function(node){
-        var ELEMENT_NODE = 1;
-        var ATTRIBUTE_NODE = 2;
-        var TEXT_NODE = 3;
-        var CDATA_SECTION_NODE = 4;
-        var ENTITY_REFERENCE_NODE = 5;
-        var ENTITY_NODE = 6;
-        var PROCESSING_INSTRUCTION_NODE = 7;
-        var COMMENT_NODE = 8;
-        var DOCUMENT_NODE = 9;
-        var DOCUMENT_TYPE_NODE = 10;
-        var DOCUMENT_FRAGMENT_NODE = 11;
-        var NOTATION_NODE = 12;
-        var s="";
-        switch(node.nodeType){
-            case ATTRIBUTE_NODE:
-                s+=node.nodeName+'="' + node.value + '"';
-                break;
-            case DOCUMENT_NODE:
-                s+=this.node2XML(node.documentElement);
-                break;
-            case ELEMENT_NODE:
-                s+="<" + node.tagName;
-                //attributes
-                for(var i=0; i<node.attributes.length; i++){
-                    s+=" " + this.node2XML(node.attributes.item(i));
-                }
-                //children
-                if(node.childNodes.length==0){
-                    s+="/>\n";
-                }else{
-                    s+=">";
-                    for(var i=0; i<node.childNodes.length; i++){
-                        s+=this.node2XML(node.childNodes.item(i));
-                    }
-                    s+="</" + node.tagName+ ">\n";
-                }
-                break;
-            case PROCESSING_INSTRUCTION_NODE:
-                s+="<?" + node.target + " " + node.data + " ?>";
-                break;
-            case TEXT_NODE:
-                s+=node.nodeValue;
-                break;
-            case CDATA_SECTION_NODE:
-                s+="<" +"![CDATA[" + node.nodeValue + "]" + "]>";
-                break;
-            case COMMENT_NODE:
-                s+="<!--" + node.nodeValue + "-->";
-                break;
-            case ENTITY_REFERENCE_NODE:
-            case DOCUMENT_FRAGMENT_NODE:
-            case DOCUMENT_TYPE_NODE:
-            case NOTATION_NODE:
-            case ENTITY_NODE:
-                throw new mod.Exception("Nodetype(%s) not supported.".format(node.nodeType));
-                break;
-        }
-        return s;
-    }
-})
diff --git a/phpgwapi/js/jsolait/lib/xmlrpc.js b/phpgwapi/js/jsolait/lib/xmlrpc.js
deleted file mode 100644
index aa980798e1..0000000000
--- a/phpgwapi/js/jsolait/lib/xmlrpc.js
+++ /dev/null
@@ -1,828 +0,0 @@
-/*
-  Copyright (c) 2003-2004 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-        
-/**
-    Provides an XML-RPC imlementation.
-    It is similar to python's xmlrpclib module.
-*/
-Module("xmlrpc","1.3.1", function(mod){
-    var xmlext = importModule("xml");
-    var urllib = importModule("urllib");
-    /**
-        Thrown if a  server did not respond with response status 200 (OK).
-    */
-    mod.InvalidServerResponse = Class("InvalidServerResponse", mod.Exception, function(publ, supr){
-        /**
-            Initializes the Exception.
-            @param status       The status returned by the server.
-        */
-        publ.init= function(status){
-            supr(this).init("The server did not respond with a status 200 (OK) but with: " + status);
-            this.status = status;
-        }
-         ///The status returned by the server.
-        publ.status;
-    })
-    
-    /**
-        Thrown if an XML-RPC response is not well formed.
-    */
-    mod.MalformedXmlRpc = Class("MalformedXmlRpc", mod.Exception, function(publ, supr){
-        /**
-            Initializes the Exception.
-            @param msg          The error message of the user.
-            @param xml           The xml document's source.
-            @param trace=null  The error causing this Exception
-        */
-        publ.init= function(msg, xml, trace){
-            supr(this).init(msg,trace);
-            this.xml = xml;
-        }
-         ///The xml source which was mal formed.
-        publ.xml;
-    })
-    /**
-        Thrown if the RPC response is a Fault.        
-    */
-    mod.Fault = Class("Fault", mod.Exception, function(publ, supr){
-        /**
-            Initializes the Exception.
-            @param faultCode       The fault code returned by the rpc call.
-            @param faultString      The fault string returned by the rpc call.
-        */
-        publ.init= function(faultCode, faultString){
-            supr(this).init("XML-RPC Fault: " +  faultCode + "\n\n" + faultString);
-            this.faultCode = faultCode;
-            this.faultString = faultString;
-        }
-        ///The fault code returned from the rpc call.
-        publ.faultCode;
-        ///The fault string returned from the rpc call.
-        publ.faultString;
-    })
-
-    /**
-        Marshalls an object to XML-RPC.(Converts an object into XML-RPC conforming xml.)
-        It just calls the toXmlRpc function of the objcect.
-        So, to customize serialization of objects one just needs to specify/override the toXmlRpc method 
-        which should return an xml string conforming with XML-RPC spec.
-        @param obj    The object to marshall
-        @return         An xml representation of the object.
-    */
-    mod.marshall = function(obj){
-//vcb        return obj.toXmlRpc()
-    }
-    /**
-        Unmarshalls an XML document to a JavaScript object. (Converts xml to JavaScript object.)
-        It parses the xml source and creates a JavaScript object.
-        @param xml    The xml document source to unmarshall.
-        @return         The JavaScript object created from the XML.
-    */
-    mod.unmarshall = function(xml){
-        try {//try to parse xml ... this will throw an Exception if failed
-            var doc = xmlext.parseXML(xml);
-        }catch(e){
-            throw new mod.MalformedXmlRpc("The server's response could not be parsed.", xml, e);
-        }
-        var rslt = mod.unmarshallDoc(doc);
-        doc=null;
-        return rslt;
-    }
-    
-    /**
-        Unmarshalls an XML document to a JavaScript object like unmarshall but expects a DOM document as parameter.
-        It parses the xml source and creates a JavaScript object.
-        @param doc   The xml document(DOM compatible) to unmarshall.
-        @return         The JavaScript object created from the XML.
-    */
-    mod.unmarshallDoc = function(doc, xml){
-        try{
-            var node = doc.documentElement;
-            if(node==null){
-			/* just in case parse xml didn't throw an Exception but returned nothing usefull. */
-                throw new mod.MalformedXmlRpc("No documentElement found.", xml);
-            }
-            switch(node.tagName){
-                case "methodResponse":
-                    return parseMethodResponse(node);
-                case "methodCall":
-                    return parseMethodCall(node);
-                default://nothing usefull returned by parseXML.
-                    throw new mod.MalformedXmlRpc("'methodCall' or 'methodResponse' element expected.\nFound: '" + node.tagName + "'", xml);
-            }
-        }catch(e){
-            if(e instanceof mod.Fault){//just rethrow the fault.
-                throw e;
-            }else {
-                throw new mod.MalformedXmlRpc("Unmarshalling of XML failed.", xml, e);    
-            }
-        }
-    }
-    
-    /**
-        Parses a methodeResponse element.
-        @param node  The methodResponse element.
-        @return          The return value of the XML-RPC.
-    */
-    var parseMethodResponse=function(node){
-        try{
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "fault": //a fault is thrown as an Exception
-                            throw parseFault(child);
-                        case "params":
-                            var params = parseParams(child);
-                            if(params.length == 1){//params should only have one param
-                                return params[0];
-                            }else{
-                                throw new mod.MalformedXmlRpc("'params' element inside 'methodResponse' must have exactly ONE 'param' child element.\nFound: " + params.length);
-                            }
-                        default:
-                            throw new mod.MalformedXmlRpc("'fault' or 'params' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            //no child elements found
-            throw new mod.MalformedXmlRpc("No child elements found.");    
-        }catch(e){
-            if(e instanceof mod.Fault){
-                throw e;
-            }else{
-                throw new mod.MalformedXmlRpc("'methodResponse' element could not be parsed.",null,e);    
-            }
-        }
-    }
-    /**
-        Parses a methodCall element.
-        @param node  The methodCall element.
-        @return          Array [methodName,params]. 
-    */        
-    var parseMethodCall = function(node){
-        try{
-            var methodName = null;
-            var params = new Array();//default is no parameters
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "methodName":
-                            methodName = new String(child.firstChild.nodeValue);
-                            break;
-                        case "params":
-                            params = parseParams(child);
-                            break;
-                        default:
-                            throw new mod.MalformedXmlRpc("'methodName' or 'params' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            if(methodName==null){
-                throw new mod.MalformedXmlRpc("'methodName' element expected.");
-            }else{
-                return new Array(methodName, params);
-            }
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'methodCall' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a params element.
-        @param node  The params element.
-        @return          Array of params values. 
-    */
-    var parseParams = function(node){
-        try{
-            var params=new Array();
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "param":
-                            params.push(parseParam(child));
-                            break;
-                        default:
-                            throw new mod.MalformedXmlRpc("'param' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            //the specs say a 'params' element can contain any number of 'param' elements. That includes 0 ?!
-            return params;
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'params' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a param element.
-        @param node  The param node.
-        @return          The value of the param.
-    */
-    var parseParam = function(node){
-        try{
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "value":
-                            return parseValue(child);
-                        default:
-                            throw new mod.MalformedXmlRpc("'value' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            //no child elements found, that's an error
-            throw new mod.MalformedXmlRpc("'value' element expected.But none found.");
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'param' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a value element.
-        @param node  The value element.
-        @return         The value.
-    */
-    var parseValue = function(node){
-        try{
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "string":
-                            var s="" 
-                            //Mozilla has many textnodes with a size of 4096 chars each instead of one large one.
-                            //They all need to be concatenated.
-                            for(var j=0;j<child.childNodes.length;j++){
-                                s+=new String(child.childNodes.item(j).nodeValue);
-                            }
-                            return s;
-                        case "int":
-                        case "i4":
-                        case "double":
-                            //return (child.firstChild) ? new Number(child.firstChild.nodeValue) : 0;
-							var n = (child.firstChild) ? new Number(child.firstChild.nodeValue) : new Number(0);
-							var val = n.valueOf();
-							return val;
-                        case "boolean":
-                            return Boolean(isNaN(parseInt(child.firstChild.nodeValue)) ? (child.firstChild.nodeValue == "true") : parseInt(child.firstChild.nodeValue));
-                        case "base64":
-                            return parseBase64(child);
-                        case "dateTime.iso8601":
-                            return parseDateTime(child);
-                        case "array":
-                            return parseArray(child);
-                        case "struct":
-                            return parseStruct(child);
-                        case "nil": //for python None todo: ??? is this valid XML-RPC
-                            return null;
-                        default:
-                            throw new mod.MalformedXmlRpc("'string','int','i4','double','boolean','base64','dateTime.iso8601','array' or 'struct' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            if(node.firstChild){
-                var s="" 
-                //Mozilla has many textnodes with a size of 4096 chars each instead of one large one.
-                //They all need to be concatenated.
-                for(var j=0;j<node.childNodes.length;j++){
-                    s+=new String(node.childNodes.item(j).nodeValue);
-                }
-                return s;
-            }else{
-                return "";
-            }
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'value' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a base64 element.
-        @param node   The base64 element.
-        @return          A string with the decoded base64.
-    */
-    var parseBase64=function(node){
-        try{
-            var s = node.firstChild.nodeValue;
-            return s.decode("base64");
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'base64' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a dateTime.iso8601 element.
-        @param node   The dateTime.iso8601 element.
-        @return           A JavaScript date.
-    */
-    var parseDateTime=function(node){
-        try{
-            if(/^(\d{4})-?(\d{2})-?(\d{2})T(\d{2}):?(\d{2}):?(\d{2})/.test(node.firstChild.nodeValue)){
-                return new Date(Date.UTC(RegExp.$1, RegExp.$2-1, RegExp.$3, RegExp.$4, RegExp.$5, RegExp.$6));
-            }else{ //todo error message
-                throw new mod.MalformedXmlRpc("Could not convert the given date.");
-            }
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'dateTime.iso8601' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses an array element.
-        @param node   The array element.
-        @return           An Array.
-    */
-    var parseArray=function(node){
-        try{
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "data":
-                            return parseData(child);
-                        default:
-                            throw new mod.MalformedXmlRpc("'data' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            throw new mod.MalformedXmlRpc("'data' element expected. But not found.");   
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'array' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a data element.
-        @param node   The data element.
-        @return           The value of a data element.
-    */
-    var parseData=function(node){
-        try{
-            var rslt = new Array();
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "value":
-                            rslt.push(parseValue(child));
-                            break;
-                        default:
-                            throw new mod.MalformedXmlRpc("'value' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            return rslt;
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'data' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a struct element.
-        @param node   The struct element.
-        @return           A JavaScript object. Struct memembers are properties of the object.
-    */
-    var parseStruct=function(node){
-        try{
-            var struct = new Object();
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "member":
-                            var member = parseMember(child); //returns [name, value]
-                            if(member[0] != ""){
-                                struct[member[0]] = member[1];
-                            }
-                            break;
-                        default:
-                            throw new mod.MalformedXmlRpc("'data' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            return struct;
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'struct' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a member element.
-        @param node  The member element.
-        @return          Array containing [memberName, value].
-    */
-    var parseMember=function(node){
-        try{
-            var name="";
-            var value=null;
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "value":
-                            value = parseValue(child); 
-                            break;
-                        case "name":
-                            if(child.hasChildNodes()){
-                                name = new String(child.firstChild.nodeValue);
-                            }
-                            break;
-                        default:
-                            throw new mod.MalformedXmlRpc("'value' or 'name' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            /*if(name == ""){
-                throw new mod.MalformedXmlRpc("Name for member not found/convertable.");
-            }else{
-                return new Array(name, value);
-            }*/
-            return [name, value];
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'member' element could not be parsed.",null,e);    
-        }
-    }
-    /**
-        Parses a fault element.
-        @param node  The fault element.
-        @return          A Fault Exception object.
-    */
-    var parseFault = function(node){
-        try{
-            for(var i=0;i<node.childNodes.length;i++){
-                var child = node.childNodes.item(i);
-                if (child.nodeType == 1){
-                    switch (child.tagName){
-                        case "value":
-                            var flt = parseValue(child); 
-                            return new mod.Fault(flt.faultCode, flt.faultString);
-                        default:
-                            throw new mod.MalformedXmlRpc("'value' element expected.\nFound: '" + child.tagName + "'");                        
-                    }
-                }
-            }
-            throw new mod.MalformedXmlRpc("'value' element expected. But not found.");                        
-        }catch(e){
-            throw new mod.MalformedXmlRpc("'fault' element could not be parsed.",null,e);    
-        }
-    }
-
-    /**
-        Class for creating XML-RPC methods.
-        Calling the created method will result in an XML-RPC call to the service.
-        The return value of this call will be the return value of the RPC call.
-        RPC-Faults will be raised as Exceptions.
-        
-        Asynchronous operation:
-        If the last parameter passed to the method is an XMLRPCAsyncCallback object, 
-        then the remote method will be called asynchronously. 
-        The results and errors are passed to the callback.
-    */
-    mod.XMLRPCMethod =Class("XMLRPCMethod", function(publ){
-        
-        var postData = function(url, user, pass, data, callback){
-            if(callback == null){
-                var rslt = urllib.postURL(url, user, pass, data, [["Content-Type", "text/xml"]]);
-                return rslt;
-            }else{
-                urllib.postURL(url, user, pass, data, [["Content-Type", "text/xml"]], callback);
-            }
-        }
-        
-        var handleResponse=function(resp){
-            var status=null;
-            try{//see if the server responded with a response code 200 OK.
-                status = resp.status;
-            }catch(e){
-            }
-            if(status == 200){
-                var respDoc=null;
-                try{
-                    respDoc = resp.responseXML;
-                }catch(e){
-                }
-                var respTxt = ""; 
-                try{                 
-                    respTxt=resp.responseText;
-                }catch(e){
-                }
-                if(respDoc == null){
-                    if(respTxt == null || respTxt == ""){
-                        throw new mod.MalformedXmlRpc("The server responded with an empty document.", "");
-                    }else{
-                        return mod.unmarshall(respTxt);
-                    }
-                }else{ //use the respDoc directly so the xml does not have to be parsed.
-                    return mod.unmarshallDoc(respDoc, respTxt);
-                }
-            }else{
-                throw new mod.InvalidServerResponse(status);
-            }
-        }
-        
-        var getXML = function(methodName, args){
-            var data='<?xml version="1.0"?><methodCall><methodName>' + methodName + '</methodName>';
-            if (args.length>0){
-                data += "<params>";
-                for(var i=0;i<args.length;i++){
-                    data += '<param><value>' + mod.marshall(args[i]) + '</value></param>';
-                }
-                data += '</params>';
-            }
-            data += '</methodCall>';
-            return data;
-        }
-        /**
-            Initializes the XML-RPC method.
-            @param url                 The URL of the service providing the method.
-            @param methodName   The name of the method to invoke.
-            @param user=null             The user name to use for HTTP authentication.
-            @param pass=null             The password to use for HTTP authentication.
-        */
-        publ.init = function(url, methodName, user, pass){
-            
-            //this is pretty much a hack.
-            //we create a function which mimics this class and return it instead of really instanciating an object. 
-            var fn=function(){
-                //sync or async call
-                if(typeof arguments[arguments.length-1] != "function"){
-                    var data=getXML(fn.methodName,arguments);
-                    var resp = postData(fn.url, fn.user, fn.password, data);
-                    
-                    return handleResponse(resp);
-                }else{
-                    var args=new Array();
-                    for(var i=0;i<arguments.length;i++){
-                        args.push(arguments[i]);
-                    }
-                    var cb = args.pop();
-                    var data=getXML(fn.methodName, args);
-                    postData(fn.url, fn.user, fn.password, data, function(resp){
-                        var rslt = null;
-                        var exc =null;
-                        try{
-                            rslt = handleResponse(resp);
-                        }catch(e){
-                            exc = e;
-                        }
-                        try{//call the callback for the async call.
-                            cb(rslt,exc);
-                        }catch(e){
-                        }
-                        args = null;
-                        resp = null;
-                    });
-                }
-            }
-            //make sure the function has the same property as an object created from this class.
-            fn.methodName = methodName;
-            fn.url = url;
-            fn.user = user;
-            fn.password=pass;
-            fn.toMulticall = this.toMulticall;
-            fn.toString = this.toString;
-            fn.setAuthentication=this.setAuthentication;
-            fn.constructor = this.constructor;
-            return fn;
-        }
-                
-        /**
-            Returns the method representation for system.multicall.
-            @param   All params will be passed to the remote method.
-            @return   An object containing a member methodName and a member params(As required by system.multicall).
-        */
-        publ.toMulticall = function(){
-            var multiCallable = new Object();
-            multiCallable.methodName = this.methodName;
-            var params = [];
-            for(var i=0;i<arguments.length;i++){
-                params[i] = arguments[i];
-            }
-            multiCallable.params = params;
-            return multiCallable;
-        }
-        /**
-            Sets username and password for HTTP Authentication.
-            @param user    The user name.
-            @param pass    The password.
-        */
-        publ.setAuthentication = function(user, pass){
-            this.user = user;
-            this.password = pass;
-        }
-        ///The name of the remote method.
-        publ.methodName;
-        ///The url of the remote service containing the method.
-        publ.url;
-        ///The user name used for HTTP authorization.
-        publ.user;
-        ///The password used for HTTP authorization.
-        publ.password;
-    })
-    
-    /**
-        Creates proxy objects which resemble the remote service.
-        Method calls of this proxy will result in calls to the service.
-    */
-    mod.ServiceProxy=Class("ServiceProxy", function(publ){
-        /**
-            Initializes a new ServerProxy.
-            The arguments are interpreted as shown in the examples:
-            ServerProxy("url")
-            ServerProxy("url", ["methodName1",...])
-            ServerProxy("url", ["methodName1",...], "user", "pass")
-            ServerProxy("url", "user", "pass")
-            
-            @param url                     The url of the service.
-            @param methodNames=[]  Array of names of methods that can be called on the server.
-                                                If no methods are given then introspection is used to get the methodnames from the server.
-            @param user=null             The user name to use for HTTP authentication.
-            @param pass=null             The password to use for HTTP authentication.
-        */
-        publ.init = function(url, methodNames, user, pass){
-            if(methodNames instanceof Array){
-                if(methodNames.length > 0){
-                    var tryIntrospection=false;
-                }else{
-                    var tryIntrospection=true;
-                }
-            }else{
-                pass=user;
-                user=methodNames;
-                methodNames=[];
-                var tryIntrospection=true;
-            }
-            this._url = url;
-            this._user = user;
-            this._password = pass;
-            this._addMethodNames(methodNames);
-            if(tryIntrospection){
-                try{//it's ok if it fails.
-                    this._introspect();
-                }catch(e){
-                }
-            }
-        }
-        
-        /**
-            Adds new XMLRPCMethods to the proxy server which can then be invoked.
-            @param methodNames   Array of names of methods that can be called on the server.
-        */
-        publ._addMethodNames = function(methodNames){
-            for(var i=0;i<methodNames.length;i++){
-                var obj = this;
-                //setup obj.childobj...method
-                var names = methodNames[i].split(".");
-                for(var n=0;n<names.length-1;n++){
-                    var name = names[n];
-                    if(obj[name]){
-                        obj = obj[name];
-                    }else{
-                        obj[name]  = new Object();
-                        obj = obj[name];
-                    }
-                }
-                var name = names[names.length-1];
-                if(obj[name]){
-                }else{
-                    var mth = new mod.XMLRPCMethod(this._url, methodNames[i], this._user, this._password);
-                    obj[name] = mth;
-                    this._methods.push(mth);
-                }
-            }
-        }
-        
-        /**
-            Sets username and password for HTTP Authentication for all methods of this service.
-            @param user    The user name.
-            @param pass    The password.
-        */
-        publ._setAuthentication = function(user, pass){
-            this._user = user;
-            this._password = pass;
-            for(var i=0;i<this._methods.length;i++){
-                this._methods[i].setAuthentication(user, pass);
-            }
-        }
-        
-        /**
-            Initiate XML-RPC introspection to retrieve methodnames from the server
-            and add them to the server proxy.
-        */
-        publ._introspect = function(){
-            this._addMethodNames(["system.listMethods","system.methodHelp", "system.methodSignature"]);
-            var m = this.system.listMethods();
-            this._addMethodNames(m);
-        }
-        ///The url of the service to resemble.
-        publ._url;
-        ///The user used for HTTP authentication.
-        publ._user;
-        ///The password used for HTTP authentication.
-        publ._password;
-        ///All methods.
-        publ._methods=new Array();
-    })
-    
-    ///@deprecated  Use ServiceProxy instead.
-    mod.ServerProxy= mod.ServiceProxy;
-
-    
-    /**
-        Returns the XML-RPC representation of an object.
-        A struct is used. Each property of an object is a member of that struct.
-        @return   A string containing the object's representation in XML.
-    */
-/*    Object.prototype.toXmlRpc = function(){
-        var s = "<struct>";
-        for(var attr in this){
-            if(typeof this[attr] != "function"){
-                s += "<member><name>" + attr + "</name><value>" + this[attr].toXmlRpc() + "</value></member>";
-            }
-        }
-        s += "</struct>";
-        return s
-    }
-*/
-    /**
-        XML-RPC representation of a string.
-        All '&' and '<' are replaced with the '&amp;'  and  '&lt'.
-        @return  A string containing the String's representation in XML.
-    */
-/*    String.prototype.toXmlRpc = function(){
-        return "<string>" + this.replace(/&/g, "&amp;").replace(/</g, "&lt;") + "</string>";
-    }*/
-    /**
-        XML-RPC representation of a number.
-        @return A string containing the Number's representation in XML.
-    */
-/*    Number.prototype.toXmlRpc = function(){
-        if(this == parseInt(this)){
-            return "<int>" + this + "</int>";
-        }else if(this == parseFloat(this)){
-            return "<double>" + this + "</double>";
-        }else{
-            return false.toXmlRpc();
-        }
-    }
-*/
-    /**
-        XML-RPC representation of a boolean.
-        @return A string containing the Boolean's representation in XML.
-    */
-/*    Boolean.prototype.toXmlRpc = function(){
-        if(this == true) {
-            return "<boolean>1</boolean>";
-        }else{
-            return "<boolean>0</boolean>";
-        }
-    }
-*/
-    /**
-        XML-RPC representation of a date(iso 8601).
-        @return A string containing the Date's representation in XML.
-    */
-/*    Date.prototype.toXmlRpc = function(){
-        var padd=function(s, p){
-            s=p+s
-            return s.substring(s.length - p.length)
-        }
-        var y = padd(this.getUTCFullYear(), "0000");
-        var m = padd(this.getUTCMonth() + 1, "00");
-        var d = padd(this.getUTCDate(), "00");
-        var h = padd(this.getUTCHours(), "00");
-        var min = padd(this.getUTCMinutes(), "00");
-        var s = padd(this.getUTCSeconds(), "00");
-        
-        var isodate = y +  m  + d + "T" + h +  ":" + min + ":" + s
-    
-        return "<dateTime.iso8601>" + isodate + "</dateTime.iso8601>";
-    }
-*/
-    /**
-        XML-RPC representation of an array.
-        Each entry in the array is a value in the XML-RPC.
-        @return A string containing the Array's representation in XML.
-    */
-/*    Array.prototype.toXmlRpc = function(){
-        var retstr = "<array><data>";
-        for(var i=0;i<this.length;i++){
-            retstr += "<value>" + this[i].toXmlRpc() + "</value>";
-        }
-        return retstr + "</data></array>";
-    }
-*/
-
-})
diff --git a/phpgwapi/js/jsolait/missingmixin.js b/phpgwapi/js/jsolait/missingmixin.js
deleted file mode 100644
index 487efb1deb..0000000000
--- a/phpgwapi/js/jsolait/missingmixin.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-  Copyright (c) 2003 Jan-Klaas Kollhof
-  
-  This file is part of the JavaScript o lait library(jsolait).
-  
-  jsolait is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
- 
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-if(Function.prototype.apply == null){
-    Function.prototype.apply = function(thisObj, args){
-        var a =[];
-        for(var i=0;i<args.length;i++){
-            a[i] = "args[" + i + "]";
-        }
-        thisObj.__apply__ = this;
-        a="thisObj.__apply__(" + a.join(",") +")";
-        var r = eval(a);
-        delete thisObj.__apply__;
-        return r;
-    }
-}
-if(Function.prototype.call==null){
-    Function.prototype.call=function(thisObj){
-        var args=[]; //copy all arguments but the first
-        for(var i=1;i<arguments.length;i++){
-            args[i-1] = arguments[i];
-        }
-        return this.apply(thisObj, args);
-    }
-}
-
-
-///----------------------------------Array functions----------------------------------
-if(Array.prototype.splice == null){
-    Array.prototype.splice = function(index, howMany){
-        var a = this.slice(0, index);
-        var e = this.slice(index + howMany, this.length);
-        var r = this.slice(index, index+howMany);
-        this.length=0;
-        for(var i=0;i<a.length;i++){
-            this[this.length] = a[i];
-        }
-        for(var i=2;i<arguments.length;i++){
-            this[this.length] = arguments[i];
-        }
-        for(var i=0;i<e.length;i++){
-            this[this.length] = e[i];
-        }
-        return r;
-    }
-}
-
-if(Array.prototype.pop == null){
-    Array.prototype.pop = function(){
-        var e=this[this.length-1];
-        this.length -= 1;
-        return e;
-    }
-}
-
-if(Array.prototype.push == null){
-    Array.prototype.push = function(){
-        for(var i=0;i<arguments.length;i++){
-            this[this.length] = arguments[i];
-        }
-        return this.length;
-    }
-}
-
-if(Array.prototype.shift == null){
-    Array.prototype.shift = function(){
-        var e = this[0];
-        for(var i=1;i<this.length;i++){
-            this[i-1] = this[i];
-        }
-        this.length -= 1;
-        return e;
-    }
-}
-
-if(Array.prototype.unshift == null){
-    Array.prototype.unshift = function(){
-        var a=[]
-        for(var i=0;i<arguments.length;i++){
-            a[i] = arguments[i];
-        }
-        for(var i=0;i<this.length;i++){
-            a[a.length] = this[i];
-        }
-        this.length=a.length;
-        for(var i=0;i<a.length;i++){
-            this[i] = a[i];
-        }
-        return this.length;
-    }
-}
-
-
-/**
-    Number functions.
-    
-    Contributed by Wolfgang Dumhs.
-*/
-if(Number.prototype.toFixed == null){
-    Number.prototype.toFixed = function(d){
-        var n = this;
-        d = d || 0;
-        var f = Math.pow(10, d);
-        n = Math.round (f * n) / f;
-        n = (n >= 0) ? n+Math.pow(10, -(d+1)) : n-Math.pow(10, -(d+1));
-        n += '';
-        return d == 0 ? n.substring(0, n.indexOf('.')) : n.substring(0, n.indexOf('.') + d + 1);
-    }
-}
-
-if(Number.prototype.toExponential == null){
-    Number.prototype.toExponential = function(d){
-        var n = this;
-        var e = 0;
-        if (n != 0){
-            e = Math.floor(Math.log(Math.abs(n)) / Math.LN10);
-        }
-        n /= Math.pow(10, e);
-        if (isFinite(d)){
-            if (Math.abs(n) + 5*Math.pow(10, -(d+1)) >= 10.0){
-                n /= 10;
-                e += 1;
-            }
-            n = n.toFixed(d);
-        }
-        n += "e";
-        if (e >= 0){
-            n += "+";
-        }
-        n += e;
-        return n;
-    }
-}
-
diff --git a/phpgwapi/js/tablesort/tablesort.js b/phpgwapi/js/tablesort/tablesort.js
deleted file mode 100644
index e079c67371..0000000000
--- a/phpgwapi/js/tablesort/tablesort.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************
- * Sort tables by column                                                      *
- * Copyright (C) 2002 by Mike Hall                                            *
- * Please see http://www.brainjar.com for terms of use.                       *
- *                                                                            *
- * 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.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software                *
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.*
- ******************************************************************************/
-
-/* function         sortTable 
- * @author          Mike Hall
- * @abstract        Sorts an table by selection sort
- * @param int col   Number (0-n)of the column which will be used for the sorting
- * @param string section  name of the id of the sorted section
- */
-function sortTable(col,section) {
-
-  // Get the table section to sort.
-  var tblEl = document.getElementById(section);
-
-  // Set up an array of reverse sort flags, if not done already.
-  if (tblEl.reverseSort == null)
-    tblEl.reverseSort = new Array();
-
-  // If this column was the last one sorted, reverse its sort direction.
-  if (col == tblEl.lastColumn)
-    tblEl.reverseSort[col] = !tblEl.reverseSort[col];
-
-  // Remember this column as the last one sorted.
-  tblEl.lastColumn = col;
-
-  // Set the table display style to "none" - necessary for Netscape 6 
-  // browsers.
-  var oldDsply = tblEl.style.display;
-  tblEl.style.display = "none";
-
-  // Sort the rows based on the content of the specified column using a
-  // selection sort.
-
-  var tmpEl;
-  var i, j;
-  var minVal, minIdx;
-  var testVal;
-  var cmp;
-
-  for (i = 0; i < tblEl.rows.length - 1; i++) {
-
-    // Assume the current row has the minimum value.
-    minIdx = i;
-    minVal = TSgetTextValue(tblEl.rows[i].cells[col]);
-
-    // Search the rows that follow the current one for a smaller value.
-    for (j = i + 1; j < tblEl.rows.length; j++) {
-      testVal = TSgetTextValue(tblEl.rows[j].cells[col]);
-      cmp = TScompareValues(minVal, testVal);
-      // Reverse order?
-      if (tblEl.reverseSort[col])
-        cmp = -cmp;
-      // If this row has a smaller value than the current minimum, remember its
-      // position and update the current minimum value.
-      if (cmp > 0) {
-        minIdx = j;
-        minVal = testVal;
-      }
-    }
-
-    // By now, we have the row with the smallest value. Remove it from the
-    // table and insert it before the current row.
-    if (minIdx > i) {
-      tmpEl = tblEl.removeChild(tblEl.rows[minIdx]);
-      tblEl.insertBefore(tmpEl, tblEl.rows[i]);
-    }
-  }
-
-  // Restore the table's display style.
-  tblEl.style.display = oldDsply;
-
-  return false;
-}
-
-//-----------------------------------------------------------------------------
-// Functions to get and compare values during a sort.
-//-----------------------------------------------------------------------------
-
-// This code is necessary for browsers that don't reflect the DOM constants
-// (like IE).
-if (document.ELEMENT_NODE == null) {
-  document.ELEMENT_NODE = 1;
-  document.TEXT_NODE = 3;
-}
-
-function TSgetTextValue(el) {
-
-  var i;
-  var s;
-
-  // Find and concatenate the values of all text nodes contained within the
-  // element.
-  s = "";
-  for (i = 0; i < el.childNodes.length; i++)
-    if (el.childNodes[i].nodeType == document.TEXT_NODE)
-      s += el.childNodes[i].nodeValue;
-    else if (el.childNodes[i].nodeType == document.ELEMENT_NODE &&
-             el.childNodes[i].tagName == "BR")
-      s += " ";
-    else
-      // Use recursion to get text within sub-elements.
-      s += TSgetTextValue(el.childNodes[i]);
-
-  return TSnormalizeString(s);
-}
-
-function TScompareValues(v1, v2) {
-
-  var f1, f2;
-
-  // If the values are numeric, convert them to floats.
-
-  f1 = parseFloat(v1);
-  f2 = parseFloat(v2);
-  if (!isNaN(f1) && !isNaN(f2)) {
-    v1 = f1;
-    v2 = f2;
-  }
-
-  // Compare the two values.
-  if (v1 == v2)
-    return 0;
-  if (v1 > v2)
-    return 1
-  return -1;
-}
-
-// Regular expressions for normalizing white space.
-var whtSpEnds = new RegExp("^\\s*|\\s*$", "g");
-var whtSpMult = new RegExp("\\s\\s+", "g");
-
-function TSnormalizeString(s) {
-
-  s = s.replace(whtSpMult, " ");  // Collapse any multiple whites space.
-  s = s.replace(whtSpEnds, "");   // Remove leading or trailing white space.
-
-  return s;
-}
-
-
diff --git a/phpgwapi/js/xmlrpcMsgCreator/index.html b/phpgwapi/js/xmlrpcMsgCreator/index.html
deleted file mode 100644
index fd77961b09..0000000000
--- a/phpgwapi/js/xmlrpcMsgCreator/index.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>XML-RPC Message Builder</title>
-  
-  <style type="text/css">
-  .code {
-    font-family:courier,monospace;
-    font-size:12px;
-  }
-  body,td {
-    font-family: verdana;
-    font-size:12px;
-  }
-  h2 {
-    border-bottom:1px solid #c0c0c0;
-  }
-  </style>
-  
-</head>
-
-<body>
-<p><a href="http://www.scottandrew.com">s c o t t a n d r e w . c o m</a></p>
-<p><i>Last updated: 08/20/2001</i></p>
-
-<h2>What is this?</h2>
-<p>It's an XML-RPC message builder, written in JavaScript.  It takes JavaScript data objects and converts them into an XML-RPC message.</p>
-<p>There are actually two components available here.  One is the message builder, the other a PHP gateway called <strong>xmlrpc-socket</strong> that forwards XML-RPC requests to remote servers over the Internet. Together they turn your browser into an XML-RPC client.</p>
-
-<p>You can see a live demo of it <a href="test-rs.html">here</a>.</p>
-
-<p>Download the library <a href="#rpc-download">here</a>.</p>
-
-<p>You can read more about the XML-RPC specification <a href="http://www.xmlrpc.com">here</a>.</p>
-
-<p><a href="mailto:xmlrpc@scottandrew.com">Comments?</a></p>
-
-<p>
-<ol>
-<li><a href="#rpc-create">Creating an XML-RPC Message</a></li>
-<ol type="A">
-<li><a href="#rpc-methods">Object Methods</a></li>
-<li><a href="#rpc-dtypes">Supported Data Types</a></li>
-</ol>
-<li><a href="#rpc-sample">A Sample XML-RPC Message</a></li>
-<li><a href="#rpc-use">Making the Procedure Call</a></li>
-<ol type="A">
-<li><a href="#rpc-socket">Using xmlrpc-socket</a></li>
-</ol>
-<li><a href="#rpc-download">Download</a></li>
-</ol>
-</p>
-
-<a name="rpc-create"></a>
-<h2>Creating an XML-RPC Message</h2>
-
-<p>First, create a new instance of the XMLRPCMessage object. The syntax is:</p>
-
-<p><code>var msg = new XMLRPCMessage([string methodName]);</code></p>
-
-<p><code>methodName</code> is the name of the method you wish to call on the remote server.  This parameter is optional.  If left out, the default requested method is <code>system.listMethods</code></p>
-
-<a name="rpc-methods"></a>
-<h3>Object Methods</h3>
-<p>The XMLRPCMessage object has three methods:</p>
-
-<table cellspacing="0" cellpadding="4" border="1" width="600">
-<tr>
-    <td class="code" valign="top">void addParameter(object variant)</td>
-    <td valign="top">Accepts a JavaScript data type and adds a matching XML-RPC data type to the message</td>
-</tr>
-<tr>
-    <td class="code" valign="top">void setMethod(string methodName)</td>
-    <td valign="top">Declares the XML-RPC method you wish to call on the remote server.  You only need to use this if you haven't specified a method name when creating the XMLRPCMessage object.</td>
-</tr>
-<tr>
-    <td class="code" valign="top">string xml()</td>
-    <td valign="top">Returns a string of XML containing the message contents.</td>
-</tr>
-</table>
-<h3>Supported Data Types</h3>
-<a name="rpc-dtypes"></a>
-<p>The XMLRPCMessage object is designed to take any JavaScript data type and convert it into the proper XML-RPC data type.  Simply pass the JS data thingy to the <code>addParameter</code> method and it will be converted to the proper format and value.</p>
-
-<p>The following data types are supported:</p>
-
-<table cellspacing="0" cellpadding="6" border="1" width="600">
-<tr>
-    <th>JavaScript Data Type</th>
-    <th>Example</th>
-    <th>XML-RPC equivalent</th>
-    <th>Notes</th>
-</tr>
-<tr>
-    <td>Boolean</td>
-    <td>true</td>
-    <td><xmp><boolean>1</boolean></xmp></td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td>four-byte signed integer</td>
-    <td>7</td>
-    <td><xmp><i4>7</i4></xmp></td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td>double-precision signed floating point number</td>
-    <td>-3.14</td>
-    <td><xmp><double>-3.14</double></xmp></td>
-    <td>The script automagically determines whether a number is an integer or double.</td>
-</tr>
-<tr>
-    <td>string</td>
-    <td><xmp>"scottandrew"</xmp></td>
-    <td>
-<xmp>
-<string>
- scottandrew
-</string>
-</xmp></td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td>Date object</td>
-    <td><xmp>d = new Date();</xmp></td>
-    <td>
-<xmp>
-<dateTime.iso8601>
- 20010716T18:16:18
-</dateTime.iso8601>
-</xmp></td>
-    <td>Date objects are automatically converted into the ISO8601 format. You cannot pass date strings here; those will remain strings. Instead create a new Date object and use that.</td>
-</tr>
-<tr>
-    <td>array</td>
-    <td>
-<xmp>
-a = [
- "one",
- "two",
- "three"
-];</xmp></td>
-    <td>
-<xmp>
-<array>
- <data>
-  <value>
-   <string>one</string>
-  </value>
-  <value>
-   <string>two</string>
-  </value>
-  <value>
-   <string>three</string>
-  </value>
- </data>
-</array>
-</xmp></td>
-    <td rowspan="2">You don't have to worry if an Array or Object has a variety of data types as members; the script identifies the data type of each member and includes it in the message.<br /><br />Both arrays and structs can contain other arrays and structs as members, so it's possible to take a complex Object and describe it in XML by passing it to addParameter (this recursive feature is still being tested, though).</td>
-</tr>
-
-<tr>
-    <td>object</td>
-    <td>
-<xmp>
-obj = new Object();
-obj.a = "hello";
-obj.b = 7.22;
-obj.c = 100;
-</xmp></td>
-    <td>
-<xmp>
-<struct>
- <member>
-  <name>a</name>
-  <value>
-   <string>hello</string>
-  </value>
- </member>
- <member>
-  <name>b</name>
-  <value>
-   <double>7.22</double>
-  </value>
- </member>
- <member>
-  <name>c</name>
-  <value>
-   <i4>100</i4>
-  </value>
- </member>
-</struct>
-</xmp></td>
-</tr>
-</table>
-
-<p>This library does not currently support the base64 data type.</p>
-
-<a name="rpc-sample"></a>
-<h2>A Sample Message</h2>
-<p>Here is an example of using the XMLRPCMessage object to create a message:</p>
-<p><pre>
-var a = ["chicken","duck","goose"];
-
-var obj = new Object();
-obj.x = 20;
-obj.y = "cow";
-obj.z = 3.14;
-
-var date = new Date();
-
-var msg = new XMLRPCMessage("system.myMethod");
-msg.addParameter("mississippi");
-msg.addParameter(7);
-msg.addParameter(false);
-msg.addParameter(a);
-msg.addParameter(obj);
-msg.addParameter(date);
-</pre>
-</p>
-<p>This will create the following XML-RPC message:</p>
-<p>
-<xmp>
-<?xml version="1.0"?>
-<methodCall>
- <methodName>system.myMethod</methodName>
- <params>
-   <param>
-   <value><string>mississippi</string></value>
-  </param>
-  <param>
-   <value><i4>7</i4></value>
-  </param>
-  <param>
-   <value><boolean>0</boolean></value>
-  </param>
-  <param>
-   <value>
-    <array><data>
-     <value><string>chicken</string></value>
-     <value><string>duck</string></value>
-     <value><string>goose</string></value>
-    </data></array>
-   </value>
-  </param>
-  <param>
-   <value>
-    <struct>
-     <member>
-      <name>x</name>
-      <value><i4>20</i4></value>
-     </member>
-     <member>
-      <name>y</name>
-      <value><string>cow</string></value>
-     </member>
-     <member>
-      <name>z</name>
-      <value><double>3.14</double></value>
-     </member>
-    </struct>
-   </value>
-  </param>
-  <param>
-   <value><dateTime.iso8601>20010720T14:48:10</dateTime.iso8601></value>
-  </param>
- </params>
-</methodCall>
-</xmp>
-</p>
-
-<a name="rpc-use"></a>
-<h2>Making The Procedure Call</h2>
-<p>Now that you have the XML message, you need to post it to an RPC server. There are a number of ways to do this. The xmlrpc-socket PHP script allows you to post a message to a remote server and return the response as a JavaScript string to the browser.</p>
-
-<p>Depending upon your implementation, you may need to remove line breaks from, escape or otherwise encode the content of the message before posting it.</p>
-
-<p>The response is also XML-formatted.  Once you receive the response string, you can parse it or load it into a DOM object to walk through its elements.</p>
-
-<a name="rpc-socket"></a>
-<h3>Using xmlrpc-socket</h3>
-
-<p>xmlrpc-socket utilizes Brent Ashley's <a href="http://www.ashleyit.com/rs">JavaScript Remote Scripting</a> library to facilitate communication between the browser and the PHP script, and a modified version of Alan van den Bosch's HTTP Post utility to create the POST request from your server to a remote XML-RPC server via PHP.</p>
-
-<p>You can see it in action <a href="test-rs.html">here</a>.</p>
-
-<p>Because xmlrpc-socket serves as a proxy between your browser and the remote RPC server, it helps sidestep JavaScript security in the browser and allow the response to be returned as a JavaScript string.  What you decide to do with this string depends on your web application. xmlrpc-socket strips the header information, leaving only the XML response.</p>
-
-<a name="rpc-download"></a>
-<h2>Download</h2>
-<p>The download is avaliable as a <a href="xml-rpc.zip">ZIP file</a> (9K) which contains:</p>
-<ul>
-<li>index.html - this about page.</li>
-<li>xmlrpc.js - the XML-RPC message builder script</li>
-<li>xmlrpc-socket.php - the PHP proxy</li>
-<li>http_post.util - the modifed version of http_post needed by xmlrpc-socket.</li>
-<li>all three demo pages</li>
-</ul>
-
-<p>You'll also need to grab a copy of the JavaScript Remote Scripting library from <a href="http://www.ashleyit.com/rs">http://www.ashleyit.com/rs</a></p>
-
-<p><a href="mailto:xmlrpc@scottandrew.com">Comments?</a></p>
-<p><a href="http://www.scottandrew.com">s c o t t a n d r e w . c o m</a></p>
-</body>
-</html>
diff --git a/phpgwapi/js/xmlrpcMsgCreator/xmlrpc.js b/phpgwapi/js/xmlrpcMsgCreator/xmlrpc.js
deleted file mode 100644
index f69734520c..0000000000
--- a/phpgwapi/js/xmlrpcMsgCreator/xmlrpc.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-
-xmlrpc.js beta version 1
-Tool for creating XML-RPC formatted requests in JavaScript
-
-Copyright 2001 Scott Andrew LePera
-scott@scottandrew.com
-http://www.scottandrew.com/xml-rpc
-
-License: 
-You are granted the right to use and/or redistribute this 
-code only if this license and the copyright notice are included 
-and you accept that no warranty of any kind is made or implied 
-by the author.
-
-*/
-
-function XMLRPCMessage(methodname){
-  this.method = methodname||"system.listMethods";
-  this.params = [];
-  return this;
-}
-
-XMLRPCMessage.prototype.setMethod = function(methodName){
-  if (!methodName) return;
-  this.method = methodName;
-}
-
-XMLRPCMessage.prototype.addParameter = function(data){
-  if (arguments.length==0) return;
-  this.params[this.params.length] = data;
-}
-
-XMLRPCMessage.prototype.xml = function(){
-
-  var method = this.method;
-  
-  // assemble the XML message header
-  var xml = "";
-  
-  xml += "<?xml version=\"1.0\"?>\n";
-  xml += "<methodCall>\n";
-  xml += "<methodName>" + method+ "</methodName>\n";
-  xml += "<params>\n";
-  
-  // do individual parameters
-  for (var i = 0; i < this.params.length; i++){
-    var data = this.params[i];
-    xml += "<param>\n";
-
-    xml += "<value>" + XMLRPCMessage.getParamXML(XMLRPCMessage.dataTypeOf(data),data) + "</value>\n";
-    
-    xml += "</param>\n";
-  }
-  
-  xml += "</params>\n";
-  xml += "</methodCall>";
-  
-  return xml; // for now
-}
-
-XMLRPCMessage.dataTypeOf = function (o){
-  // identifies the data type
-  
-  if (o == null)
-  {
-  	return 'null';
-  }
-  
-  var type = typeof(o);
-  type = type.toLowerCase();
-  switch(type){
-    case "number":
-      if (Math.round(o) == o) type = "i4";
-      else type = "double";
-      break;
-    case "object":
-      var con = o.constructor;
-      if (con == Date) type = "date";
-      else if (con == Array) type = "array";
-      else type = "struct";
-      break;
-  }
-  return type;
-}
-
-XMLRPCMessage.doValueXML = function(type,data){
-  switch (type)
-  {
-  	case 'null':
-	  	type = 'boolean';
-		data = 0;
-		break;
-		
-	case 'string':
-		data = data.split('&').join('&amp;');
-		data = data.split('<').join('&lt;');
-		data = data.split('>').join('&gt;');
-		break;
-  }
-
-  var xml = "<" + type + ">" + data + "</" + type + ">";
-  return xml;
-}
-
-XMLRPCMessage.doBooleanXML = function(data){
-  var value = (data==true)?1:0;
-  var xml = "<boolean>" + value + "</boolean>";
-  return xml;
-}
-
-XMLRPCMessage.doDateXML = function(data){
-  var xml = "<dateTime.iso8601>";
-  xml += dateToISO8601(data);
-  xml += "</dateTime.iso8601>";
-  return xml;
-}
-
-XMLRPCMessage.doArrayXML = function(data){
-  var xml = "<array><data>\n";
-  for (var i = 0; i < data.length; i++){
-    xml += "<value>" + XMLRPCMessage.getParamXML(XMLRPCMessage.dataTypeOf(data[i]),data[i]) + "</value>\n";
-  }
-  xml += "</data></array>\n";
-  return xml;
-}
-
-XMLRPCMessage.doStructXML = function(data){
-  var xml = "<struct>\n";
-  for (var i in data){
-    xml += "<member>\n";
-    xml += "<name>" + i + "</name>\n";
-    xml += "<value>" + XMLRPCMessage.getParamXML(XMLRPCMessage.dataTypeOf(data[i]),data[i]) + "</value>\n";
-    xml += "</member>\n";
-  }
-  xml += "</struct>\n";
-  return xml;
-}
-
-XMLRPCMessage.getParamXML = function(type,data){
-  var xml;
-  switch (type){
-    case "date":
-      xml = XMLRPCMessage.doDateXML(data);
-      break;
-    case "array":
-      xml = XMLRPCMessage.doArrayXML(data);
-      break;
-    case "struct":
-      xml = XMLRPCMessage.doStructXML(data);
-      break;
-	  case "boolean":
-      xml = XMLRPCMessage.doBooleanXML(data);
-      break;
-    default:
-      xml = XMLRPCMessage.doValueXML(type,data);
-      break;
-  }
-  return xml;
-}
-
-function dateToISO8601(date){
-  // wow I hate working with the Date object
-  var year = new String(date.getYear());
-  var month = leadingZero(new String(date.getMonth()));
-  var day = leadingZero(new String(date.getDate()));
-  var time = leadingZero(new String(date.getHours())) + ":" + leadingZero(new String(date.getMinutes())) + ":" + leadingZero(new String(date.getSeconds()));
-
-  var converted = year+month+day+"T"+time;
-  return converted;
-} 
-  
-function leadingZero(n){
-  // pads a single number with a leading zero. Heh.
-  if (n.length==1) n = "0" + n;
-  return n;
-}

From ae657f2b260c9087ab972ca695a35337546148a7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Jul 2009 10:12:31 +0000
Subject: [PATCH 456/510] "handling text/rtf as rtf"

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

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index e79c3b4ae8..e7267f1b65 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -51,6 +51,7 @@ class addressbook_merge	// extends bo_merge
 			case 'application/msword':
 				if (strtolower($extension) != '.rtf') break;
 			case 'application/rtf':
+			case 'text/rtf':
 				return true;	// rtf files
 			case 'application/vnd.oasis.opendocument.text':
 				if (!check_load_extension('zip')) break;
@@ -338,6 +339,7 @@ class addressbook_merge	// extends bo_merge
 				case 'application/msword':
 					if (strtolower(substr($document,-4)) != '.rtf') break;	// no binary word documents
 				case 'application/rtf':
+				case 'text/rtf':
 					return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.text':
 					// todo OO writer files
@@ -358,6 +360,7 @@ class addressbook_merge	// extends bo_merge
 				case 'application/msword':
 					if (strtolower(substr($document,-4)) != '.rtf') break;	// no binary word documents
 				case 'application/rtf':
+				case 'text/rtf':
 					return $contentstart.implode('\\par \\page\\pard\\plain',$contentrep).$contentend;
 				case 'application/vnd.oasis.opendocument.text':
 					// todo OO writer files

From 1e58b525d1ea5807467033bc9c93fd17a0ba2437 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Jul 2009 10:22:11 +0000
Subject: [PATCH 457/510] "fixed messed up indention"

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

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 3f7045c4c1..44fa25a7a9 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -96,34 +96,34 @@ class calendar_bo
 	 * @var array $verbose_status translated 1-char status values to a verbose name, run through lang() by the constructor
 	 */
 	var $verbose_status = array(
-	'A' => 'Accepted',
-	'R' => 'Rejected',
-	'T' => 'Tentative',
-	'U' => 'No Response',
-	'G' => 'Group invitation',
+		'A' => 'Accepted',
+		'R' => 'Rejected',
+		'T' => 'Tentative',
+		'U' => 'No Response',
+		'G' => 'Group invitation',
 	);
 	/**
 	 * @var array recur_types translates MCAL recur-types to verbose labels
 	 */
 	var $recur_types = Array(
-	MCAL_RECUR_NONE         => 'None',
-	MCAL_RECUR_DAILY        => 'Daily',
-	MCAL_RECUR_WEEKLY       => 'Weekly',
-	MCAL_RECUR_MONTHLY_WDAY => 'Monthly (by day)',
-	MCAL_RECUR_MONTHLY_MDAY => 'Monthly (by date)',
-	MCAL_RECUR_YEARLY       => 'Yearly'
+		MCAL_RECUR_NONE         => 'None',
+		MCAL_RECUR_DAILY        => 'Daily',
+		MCAL_RECUR_WEEKLY       => 'Weekly',
+		MCAL_RECUR_MONTHLY_WDAY => 'Monthly (by day)',
+		MCAL_RECUR_MONTHLY_MDAY => 'Monthly (by date)',
+		MCAL_RECUR_YEARLY       => 'Yearly'
 	);
 	/**
 	 * @var array recur_days translates MCAL recur-days to verbose labels
 	 */
 	var $recur_days = array(
-	MCAL_M_MONDAY    => 'Monday',
-	MCAL_M_TUESDAY   => 'Tuesday',
-	MCAL_M_WEDNESDAY => 'Wednesday',
-	MCAL_M_THURSDAY  => 'Thursday',
-	MCAL_M_FRIDAY    => 'Friday',
-	MCAL_M_SATURDAY  => 'Saturday',
-	MCAL_M_SUNDAY    => 'Sunday',
+		MCAL_M_MONDAY    => 'Monday',
+		MCAL_M_TUESDAY   => 'Tuesday',
+		MCAL_M_WEDNESDAY => 'Wednesday',
+		MCAL_M_THURSDAY  => 'Thursday',
+		MCAL_M_FRIDAY    => 'Friday',
+		MCAL_M_SATURDAY  => 'Saturday',
+		MCAL_M_SUNDAY    => 'Sunday',
 	);
 	/**
 	 * @var array $resources registered scheduling resources of the calendar (gets chached in the session for performance reasons)
@@ -187,9 +187,9 @@ class calendar_bo
 				}
 			}
 			$this->resources['e'] = array(
-			'type' => 'e',
-			'info' => __CLASS__.'::email_info',
-			'app'  => 'email',
+				'type' => 'e',
+				'info' => __CLASS__.'::email_info',
+				'app'  => 'email',
 			);
 			$GLOBALS['egw']->session->appsession('resources','calendar',$this->resources);
 		}
@@ -219,10 +219,10 @@ class calendar_bo
 				$email = $matches[2];
 			}
 			$data[] = array(
-			'res_id' => $id,
-			'email' => $email,
-			'rights' => EGW_ACL_READ_FOR_PARTICIPANTS,
-			'name' => $name,
+				'res_id' => $id,
+				'email' => $email,
+				'rights' => EGW_ACL_READ_FOR_PARTICIPANTS,
+				'name' => $name,
 			);
 		}
 		//echo "<p>email_info(".print_r($ids,true).")="; _debug_array($data);
@@ -486,14 +486,14 @@ class calendar_bo
 	function clear_private_infos(&$event,$allowed_participants = array())
 	{
 		$event = array(
-		'id'    => $event['id'],
-		'start' => $event['start'],
-		'end'   => $event['end'],
-		'title' => lang('private'),
-		'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
-		'public'=> 0,
-		'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
-		'non_blocking' => $event['non_blocking'],
+			'id'    => $event['id'],
+			'start' => $event['start'],
+			'end'   => $event['end'],
+			'title' => lang('private'),
+			'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
+			'public'=> 0,
+			'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
+			'non_blocking' => $event['non_blocking'],
 		);
 	}
 
@@ -1260,13 +1260,13 @@ class calendar_bo
 	function debug_message($msg,$backtrace=True)
 	{
 		static $acl2string = array(
-		0               => 'ACL-UNKNOWN',
-		EGW_ACL_READ    => 'ACL_READ',
-		EGW_ACL_ADD     => 'ACL_ADD',
-		EGW_ACL_EDIT    => 'ACL_EDIT',
-		EGW_ACL_DELETE  => 'ACL_DELETE',
-		EGW_ACL_PRIVATE => 'ACL_PRIVATE',
-		EGW_ACL_FREEBUSY => 'ACL_FREEBUSY',
+			0               => 'ACL-UNKNOWN',
+			EGW_ACL_READ    => 'ACL_READ',
+			EGW_ACL_ADD     => 'ACL_ADD',
+			EGW_ACL_EDIT    => 'ACL_EDIT',
+			EGW_ACL_DELETE  => 'ACL_DELETE',
+			EGW_ACL_PRIVATE => 'ACL_PRIVATE',
+			EGW_ACL_FREEBUSY => 'ACL_FREEBUSY',
 		);
 		for($i = 2; $i < func_num_args(); ++$i)
 		{
@@ -1484,21 +1484,21 @@ class calendar_bo
 				switch($status)
 				{
 					case 'A':	// accepted
-					$status = html::image('calendar','agt_action_success',$this->verbose_status[$status]);
-					break;
+						$status = html::image('calendar','agt_action_success',$this->verbose_status[$status]);
+						break;
 					case 'R':	// rejected
-					$status = html::image('calendar','agt_action_fail',$this->verbose_status[$status]);
-					break;
+						$status = html::image('calendar','agt_action_fail',$this->verbose_status[$status]);
+						break;
 					case 'T':	// tentative
-					$status = html::image('calendar','tentative',$this->verbose_status[$status]);
-					break;
+						$status = html::image('calendar','tentative',$this->verbose_status[$status]);
+						break;
 					case 'U':	// no response = unknown
-					$status = html::image('calendar','cnr-pending',$this->verbose_status[$status]);
-					break;
+						$status = html::image('calendar','cnr-pending',$this->verbose_status[$status]);
+						break;
 					case 'G':	// group invitation
-					// Todo: Image, seems not to be used
-					$status = '('.$this->verbose_status[$status].')';
-					break;
+						// Todo: Image, seems not to be used
+						$status = '('.$this->verbose_status[$status].')';
+						break;
 				}
 			}
 			else
@@ -1561,9 +1561,9 @@ class calendar_bo
 			$arr = &$users;
 		}
 		$arr[$name] = Array(
-		'grantor' => $id,
-		'value'   => ($type == 'g' ? 'g_' : '') . $id,
-		'name'    => $name
+			'grantor' => $id,
+			'value'   => ($type == 'g' ? 'g_' : '') . $id,
+			'name'    => $name
 		);
 	}
 
@@ -1695,12 +1695,12 @@ class calendar_bo
 						list($m,$d,$y) = explode('/',$pers['bday']);
 						if ($y > $year) continue; 	// not yet born
 						$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
-						'day'       => $d,
-						'month'     => $m,
-						'occurence' => 0,
-						'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
-						$pers['n_family'].($y && !$GLOBALS['egw_info']['server']['hide_birthdays'] ? ' ('.$y.')' : ''),
-						'birthyear' => $y,	// this can be used to identify birthdays from holidays
+							'day'       => $d,
+							'month'     => $m,
+							'occurence' => 0,
+							'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
+								$pers['n_family'].($y && !$GLOBALS['egw_info']['server']['hide_birthdays'] ? ' ('.$y.')' : ''),
+							'birthyear' => $y,	// this can be used to identify birthdays from holidays
 						);
 					}
 				}
@@ -1787,28 +1787,28 @@ class calendar_bo
 		}
 		$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
 		$defaults = array(
-		'defaultcalendar' => 'week',
-		'mainscreen_showevents' => '0',
-		'summary'         => 'no',
-		'receive_updates' => 'no',
-		'update_format'   => 'extended',
-		'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
-		'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
-		'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
-		'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
-		'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
-		'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
-		'show_rejected'   => '0',
-		'display_status'  => '1',
-		'weekdaystarts'   => 'Monday',
-		'workdaystarts'   => '9',
-		'workdayends'     => '17',
-		'interval'        => '30',
-		'defaultlength'   => '60',
-		'planner_start_with_group' => $planner_start_with_group,
-		'defaultfilter'   => 'all',
-		'default_private' => '0',
-		'defaultresource_sel' => 'resources',
+			'defaultcalendar' => 'week',
+			'mainscreen_showevents' => '0',
+			'summary'         => 'no',
+			'receive_updates' => 'no',
+			'update_format'   => 'extended',
+			'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
+			'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
+			'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
+			'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
+			'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
+			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
+			'show_rejected'   => '0',
+			'display_status'  => '1',
+			'weekdaystarts'   => 'Monday',
+			'workdaystarts'   => '9',
+			'workdayends'     => '17',
+			'interval'        => '30',
+			'defaultlength'   => '60',
+			'planner_start_with_group' => $planner_start_with_group,
+			'defaultfilter'   => 'all',
+			'default_private' => '0',
+			'defaultresource_sel' => 'resources',
 		);
 		foreach($defaults as $var => $default)
 		{
@@ -1836,8 +1836,8 @@ class calendar_bo
 		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
 
 		return (!$GLOBALS['egw_info']['server']['webserver_url'] || $GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
-		($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
-		$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.urlencode($user).
-		($pw ? '&password='.urlencode($pw) : '');
+			($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
+			$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.urlencode($user).
+			($pw ? '&password='.urlencode($pw) : '');
 	}
 }

From 8f4960f9b4c153327d9bc0c7532ac1b59264cb54 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Jul 2009 10:29:06 +0000
Subject: [PATCH 458/510] "fixed messed up indention"

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

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 44fa25a7a9..4fdcfb695c 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -241,7 +241,7 @@ class calendar_bo
 		foreach($event['participants'] as $uid => $status)
 		{
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
-			($members = $GLOBALS['egw']->accounts->member($uid)))
+				($members = $GLOBALS['egw']->accounts->member($uid)))
 			{
 				foreach($members as $member)
 				{
@@ -291,7 +291,7 @@ class calendar_bo
 		$params_in = $params;
 
 		if (!isset($params['users']) || !$params['users'] ||
-		count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
+			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
 		{
 			// for a search use all account you have read grants from
 			$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
@@ -328,7 +328,7 @@ class calendar_bo
 					{
 						// use only members which gave the user a read-grant
 						if (!in_array($member['account_id'],$users) &&
-						($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id'])))
+							($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id'])))
 						{
 							$users[] = $member['account_id'];
 						}
@@ -372,7 +372,7 @@ class calendar_bo
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
 		{
 			$this->debug_message('bocal::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, show_rejected=%11)',
-			True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
+				True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
 		}
 		// date2ts(,true) converts to server time, db2data converts again to user-time
 		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
@@ -765,7 +765,7 @@ class calendar_bo
 			if ($this->debug && ((int) $this->debug > 3 || $this->debug == 'insert_all_repetions' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions'))
 			{
 				$this->debug_message('bocal::insert_all_repetions(...,%1) checking recur_exceptions[%2] and event[recur_exceptions]=%3 ==> %4',False,
-				$recur_exceptions,$search_date_ymd,$event['recur_exception'],$have_exception);
+					$recur_exceptions,$search_date_ymd,$event['recur_exception'],$have_exception);
 			}
 			if ($have_exception)
 			{
@@ -849,7 +849,7 @@ class calendar_bo
 					}
 
 					if (($GLOBALS['egw']->datetime->day_of_week($event_start_arr['year'],$event_start_arr['month'],$event_start_arr['day']) == $GLOBALS['egw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day)) &&
-					(ceil($event_start_arr['day']/7) == ceil($search_date_day/7)))
+						(ceil($event_start_arr['day']/7) == ceil($search_date_day/7)))
 					{
 						$this->add_adjusted_event($events,$event,$search_date_ymd);
 					}
@@ -928,12 +928,12 @@ class calendar_bo
 		{
 			if (is_numeric($uid))
 			{
-				$info = array(
-				'res_id'    => $uid,
-				'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
-				'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
-				$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
-				'type'  => $GLOBALS['egw']->accounts->get_type($uid),
+					$info = array(
+					'res_id'    => $uid,
+					'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
+					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
+					$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
+					'type'  => $GLOBALS['egw']->accounts->get_type($uid),
 				);
 			}
 			else
@@ -1088,12 +1088,12 @@ class calendar_bo
 			// removing all non-nummerical chars, gives YYYYMMDDhhmmss, independent of the iso8601 format
 			$date = str_replace(array('-',':','T','Z',' ','+'),'',$date);
 			$date = array(
-			'year'   => (int) substr($date,0,4),
-			'month'  => (int) substr($date,4,2),
-			'day'    => (int) substr($date,6,2),
-			'hour'   => (int) substr($date,8,2),
-			'minute' => (int) substr($date,10,2),
-			'second' => (int) substr($date,12,2),
+				'year'   => (int) substr($date,0,4),
+				'month'  => (int) substr($date,4,2),
+				'day'    => (int) substr($date,6,2),
+				'hour'   => (int) substr($date,8,2),
+				'minute' => (int) substr($date,10,2),
+				'second' => (int) substr($date,12,2),
 			);
 			// fall-through
 			case 'array':	// day, month and year keys
@@ -1330,7 +1330,7 @@ class calendar_bo
 		$timefmt = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
 		$month_before_day = strtolower($datefmt[0]) == 'm' ||
-		strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
+			strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
 
 		if ($display_day)
 		{

From 7edb16d35a9f5b6ffd71981f4821fc03ea4d17b0 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 9 Jul 2009 08:10:29 +0000
Subject: [PATCH 459/510] fix for "Column 'account_id' in field list is
 ambiguous" ERROR while importing events

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

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index ab46449f65..0a084367bd 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -888,7 +888,7 @@ class calendar_ical extends calendar_boupdate
  								continue;	// participants without email AND CN --> ignore it
  							}
 							elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
-								array('id','account_id','n_fn'),'account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
+								array('id','account_id','n_fn'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
 							{
 								$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 							}

From 00c55151e33ef3302e1d245cee04922403809139 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 9 Jul 2009 08:32:18 +0000
Subject: [PATCH 460/510] fix for "Column 'account_id' in field list is
 ambiguous" ERROR while importing events 2nd.go

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

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 0a084367bd..2eb8a5a962 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -888,7 +888,7 @@ class calendar_ical extends calendar_boupdate
  								continue;	// participants without email AND CN --> ignore it
  							}
 							elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
-								array('id','account_id','n_fn'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
+								array('id','egw_addressbook.account_id as account_id','n_fn'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
 							{
 								$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 							}

From 1ac7c459c316dcc721b1ed27889ab61c5ad11e1c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 9 Jul 2009 09:50:47 +0000
Subject: [PATCH 461/510] fix for lost owner selection in manage_states

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

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index fb54aef42a..669c338ae6 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -309,7 +309,7 @@ class calendar_ui
 					}
 				}
 				// for the uiforms class (eg. edit), dont store the (new) owner, as it might change the view
-				if (substr($_GET['menuaction'],0,16) == 'calendar.calendar_uiforms')
+				if (substr($_GET['menuaction'],0,25) == 'calendar.calendar_uiforms')
 				{
 					$this->owner = $set_states[$state];
 					continue;

From aa1d03353247ef9513144bc93fcb1804ce314c29 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 9 Jul 2009 12:14:35 +0000
Subject: [PATCH 462/510] preserve the col_filter within the active session

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

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 68cee705ca..ffe0efe2c3 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -478,6 +478,8 @@ class infolog_ui
 				$action = $session['action'];
 				$action_id = $session['action_id'];
 				$action_title = $session['action_title'];
+				// no action -> try to restore the previous colfilter 
+				$colfilter = $session['col_filter'];
 				unset($session);
 			}
 		}
@@ -581,6 +583,7 @@ class infolog_ui
 
 		$this->tmpl->read('infolog.index');
 
+		if ($colfilter) $values['nm']['col_filter'] = $persist['col_filter'] = $colfilter;
 		$values['nm']['options-filter'] = $this->filters;
 		$values['nm']['get_rows'] = 'infolog.infolog_ui.get_rows';
 		$values['nm']['options-filter2'] = (in_array($this->prefs['show_links'],array('all','no_describtion')) ? array() : array(

From dc813fd7416fa8e884e21e9ef1ab878f76761a32 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Jul 2009 12:27:42 +0000
Subject: [PATCH 463/510] Implemented configurable unique id's in addressbook
 cvs import: - primary unique id: id (default), uid, or any custom field -
 fallback: id, uid(default), two from n_family, org_name or n_given,   or any
 custom field - some bugfixes

---
 addressbook/csv_import.php                   | 100 +++++++++++++++----
 addressbook/setup/egw_de.lang                |   4 +
 addressbook/setup/egw_en.lang                |   4 +
 addressbook/templates/default/csv_import.tpl |  42 ++++----
 4 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index 4091409d94..c80c1dd77f 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -42,7 +42,7 @@ if (isset($_POST['charset']))
 $GLOBALS['egw_info']['flags']['app_header'] = lang('Import CSV-File into Addressbook');
 $GLOBALS['egw']->common->egw_header();
 
-$GLOBALS['egw']->contacts = new contacts();
+$bocontacts = new addressbook_bo();
 
 //$GLOBALS['egw']->template->set_unknowns('keep');
 $GLOBALS['egw']->template->set_file(array('import' => 'csv_import.tpl'));
@@ -64,24 +64,30 @@ $VPre = '|#'; // Value-Prefix, is expanded to \ for ereg_replace
 $CPre = '|['; $CPreReg = '\|\['; // |{csv-fieldname} is expanded to the value of the csv-field
 $CPos = ']';  $CPosReg = '\]';	// if used together with @ (replacement is eval-ed) value gets autom. quoted
 
-// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
+/**
+ * Find contact with at least n_family AND (n_given OR org_name) have to match
+ *
+ * @param string $n_family
+ * @param string $n_given
+ * @param string $org_name
+ * @return int|boolean contact id or false if no match
+ */
 function addr_id($n_family,$n_given,$org_name)
 {
-	$addrs = $GLOBALS['egw']->contacts->search(array('n_family'=>$n_family,'n_given'=>$n_given,'org_name'=>$org_name));
+	global $bocontacts;
+	$addrs = $bocontacts->search(array('n_family'=>$n_family,'n_given'=>$n_given,'org_name'=>$org_name));
 	if(!count($addrs))
 	{
-		$addrs = $GLOBALS['egw']->contacts->search(array('n_family'=>$n_family,'n_given'=>$n_given));
+		$addrs = $bocontacts->search(array('n_family'=>$n_family,'n_given'=>$n_given));
 	}
 	if(!count($addrs))
 	{
-		$addrs = $GLOBALS['egw']->contacts->search(array('n_family'=>$n_family,'org_name'=>$org_name));
+		$addrs = $bocontacts->search(array('n_family'=>$n_family,'org_name'=>$org_name));
 	}
-
 	if(count($addrs))
 	{
 		return $addrs[0]['id'];
 	}
-
 	return False;
 }
 
@@ -131,6 +137,8 @@ switch($_POST['action'])
 	case 'continue':
 	case 'download':
 		$defaults = $GLOBALS['egw_info']['user']['preferences']['addressbook']['cvs_import'];
+		if (!($unique_id = $GLOBALS['egw_info']['user']['preferences']['addressbook']['cvs_import_unique_id'])) $unique_id = 'id';
+		if (!($unique_id2 = $GLOBALS['egw_info']['user']['preferences']['addressbook']['cvs_import_unique_id2'])) $unique_id2 = 'uid';
 		if(!is_array($defaults))
 		{
 			$defaults = array();
@@ -144,16 +152,17 @@ switch($_POST['action'])
 		$GLOBALS['egw']->template->set_var('lang_debug',lang('Test Import (show importable records <u>only</u> in browser)'));
 		$GLOBALS['egw']->template->parse('fheaderhandle','fheader');
 
-		$addr_names = $GLOBALS['egw']->contacts->contact_fields;
+		$addr_names = $bocontacts->contact_fields;
 		$addr_names['cat_id']  .= ': id or name, comma separated list';
 		$addr_names['private'] .= ': 0 = public, 1 = private';
 		$addr_names['owner']   .= ': id or account name of user or group, defaults to importing user';
 		$addr_names['bday']    .= ': YYYY-mm-dd';
+		$addr_names['uid']      = lang('Unique ID (UID)');
 		unset($addr_names['jpegphoto']);	// cant cvs import that
 
-		foreach($GLOBALS['egw']->contacts->customfields as $name => $data)
+		foreach($bocontacts->customfields as $name => $data)
 		{
-			$addr_names['#'.$name] = $data['label'];
+			$cfs['#'.$name] = $addr_names['#'.$name] = $data['label'];
 		}
 		$addr_name_options = "<option value=\"\">none\n";
 		foreach($addr_names as $field => $name)
@@ -182,6 +191,17 @@ switch($_POST['action'])
 			}
 			$GLOBALS['egw']->template->parse('fieldshandle','fields',True);
 		}
+		$GLOBALS['egw']->template->set_var('lang_unique_id',lang('Unique ID<br />(to update existing records)'));
+		$GLOBALS['egw']->template->set_var('unique_id',html::select('unique_id',$unique_id,array(
+			'id' => $addr_names['id'],
+			'uid' => $addr_names['uid'],
+		)+$cfs)."\n".html::select('unique_id2',$unique_id2,array(
+			'*none*'   => lang('No fallback'),
+			'id' => $addr_names['id'],
+			'uid' => $addr_names['uid'],
+			'addr_id' => lang('two of: %1',$addr_names['org_name'].', '.$addr_names['n_family'].', '.$addr_names['n_given']),
+		)+$cfs));
+
 		$GLOBALS['egw']->template->set_var('lang_start',lang('Startrecord'));
 		$GLOBALS['egw']->template->set_var('start',get_var('start',array('POST'),1));
 		$msg = ($safe_mode = ini_get('safe_mode') == 'On') ? lang('to many might exceed your execution-time-limit'):
@@ -205,7 +225,7 @@ switch($_POST['action'])
 			"usefull for the last pair, as they are worked from left to right.<p>".
 			"First example: <b>1${ASep}private${PSep}public</b><br>".
 			"This will translate a '1' in the CSV field to 'privat' and everything else to 'public'.<p>".
-			"Patterns as well as the replacement can be regular expressions (the replacement is done via ereg_replace). ".
+			"Patterns as well as the replacement can be regular expressions (the replacement is done via preg_replace). ".
 			"If, after all replacements, the value starts with an '@' the whole value is eval()'ed, so you ".
 			"may use all php, phpgw plus your own functions. This is quiet powerfull, but <u>circumvents all ACL</u>. ".
 			"Therefor this feature is only availible to Adminstrators.<p>".
@@ -243,7 +263,9 @@ switch($_POST['action'])
 			'max'     => $_POST['max'],
 			'debug'   => $_POST['debug'],
 			'addr_fields' => $_POST['addr_fields'],
-			'trans'   => $_POST['trans']
+			'trans'   => $_POST['trans'],
+			'unique_id' => $_POST['unique_id'],
+			'unique_id2' => $_POST['unique_id2'],
 		));
 		@set_time_limit(0);
 		ini_set('auto_detect_line_endings',true);	// to allow to import files created eg. on a mac
@@ -267,10 +289,16 @@ switch($_POST['action'])
 		}
 		$GLOBALS['egw']->preferences->read_repository();
 		$GLOBALS['egw']->preferences->add('addressbook','cvs_import',$defaults);
+		$GLOBALS['egw']->preferences->add('addressbook','cvs_import_unique_id',$unique_id = $_POST['unique_id']);
+		$GLOBALS['egw']->preferences->add('addressbook','cvs_import_unique_id2',$unique_id2 = $_POST['unique_id2']);
 		$GLOBALS['egw']->preferences->save_repository(True);
 
 		$log = '<table border="1" style="border: 1px dotted black; border-collapse: collapse;">'."\n\t<tr><td>#</td>\n";
 
+		if (!in_array('id',$addr_fields))	// autocreate public access if not set by user
+		{
+			$log .= "\t\t<td><b>ID</b></td>\n";
+		}
 		if (!in_array('private',$addr_fields))	// autocreate public access if not set by user
 		{
 			$log .= "\t\t<td><b>private</b></td>\n";
@@ -328,14 +356,14 @@ switch($_POST['action'])
 					$trans_csv = $_POST['trans'][$csv_idx];
 					while(list($pattern,$replace) = each($trans_csv))
 					{
-						if(ereg((string) $pattern,$val))
+						if(preg_match('/'.(string) $pattern.'/',$val))
 						{
 							// echo "<p>csv_idx='$csv_idx',info='$addr',trans_csv=".print_r($trans_csv).",preg_replace('/$pattern/','$replace','$val') = ";
 							$val = preg_replace('/'.(string) $pattern.'/',str_replace($VPre,'\\',$replace),(string) $val);
 							// echo "'$val'</p>";
 
 							$reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
-							while(ereg($reg,$val,$vars))
+							while(preg_match('/'.(string) $reg.'/',$val,$vars))
 							{	// expand all CSV fields
 								$val = str_replace($CPre . $vars[1] . $CPos, $val[0] == '@' ? "'"
 									. addslashes($fields[array_search($vars[1], $csv_fields)])
@@ -374,19 +402,51 @@ switch($_POST['action'])
 			// convert dates to timestamps
 			foreach(array('created','modified') as $date)
 			{
-				if (isset($values[$date]) && !is_numeric($date))
+				if (isset($values[$date]) && !is_numeric($values[$date]))
 				{
 					// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
 					$values[$date] = preg_replace('/([0-9]{1,2}).([0-9]{1,2}).([0-9]{4})/','\3-\2-\1',$values[$date]);
 					// remove fractures of seconds if present at the end of the string
-					if (ereg('(.*)\.[0-9]+',$values[$date],$parts)) $values[$date] = $parts[1];
+					if (preg_match('/(.*)\.[0-9]+/',$values[$date],$parts)) $values[$date] = $parts[1];
 					$values[$date] = strtotime($values[$date]);
 				}
 			}
+			// check unique ids
+			$existing = false;
+			if (!empty($values[$unique_id]))
+			{
+				if ($unique_id == 'id')
+				{
+					$existing = $bocontacts->read($values[$unique_id]);
+				}
+				else
+				{
+					list($existing) = $bocontacts->search(array($unique_id => $values[$unique_id]),false);
+				}
+			}
+			if (!$existing && (!empty($values[$unique_id2]) ||
+				$unique_id2 == 'addr_id' && (!empty($values['org_name'])+!empty($values['n_family'])+!empty($values['n_given'])) >= 2))
+			{
+				if ($unique_id2 == 'id' || $unique_id2 == 'addr_id' &&
+					($values[$unique_id2] = addr_id($values['n_family'],$values['n_given'],$values['org_name'])))
+				{
+					$existing = $bocontacts->read($values[$unique_id2]);
+				}
+				elseif ($unique_id2 != 'addr_id')
+				{
+					list($existing) = $bocontacts->search(array($unique_id2 => $values[$unique_id2]),false);
+				}
+			}
+			//echo "<p>unique_id=$unique_id='{$values[$unique_id]}', unique_id2=$unique_id2='{$values[$unique_id2]}' --> ".array2string($existing)."</p>\n";
+			if ($existing)
+			{
+				unset($values['id']);	// to NOT overrite the found one
+				$values = array_merge($existing,$values);
+			}
 			// convert user-names to user-id's
 			foreach(array('owner','modifier','creator') as $user)
 			{
-				if (isset($values[$user]) && !is_numeric($user))
+				if (isset($values[$user]) && !is_numeric($values[$user]))
 				{
 					if (preg_match('/\[([^\]]+)\]/',$values[$user],$matches)) $values[$user] = $matches[1];
 					$values[$user] = $GLOBALS['egw']->accounts->name2id($values[$user],'account_lid',$user=='owner'?null:'u');
@@ -396,6 +456,10 @@ switch($_POST['action'])
 			{
 				$values['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
+			if (!in_array('id',$addr_fields))
+			{
+				$log .= "\t\t<td>".$values['id']."</td>\n";
+			}
 			if (!in_array('private',$addr_fields))
 			{
 				$values['private'] = 0;	// public access if not set by user
@@ -414,7 +478,7 @@ switch($_POST['action'])
 			}
 			if(!$_POST['debug'] && !$empty)	// dont import empty contacts
 			{
-				$rvalue=$GLOBALS['egw']->contacts->save($values);
+				$rvalue=$bocontacts->save($values);
 				//echo "<p>adding: ".print_r($values,true)."</p>\n";
 			}
 			// display read and interpreted results, so the user can check it
diff --git a/addressbook/setup/egw_de.lang b/addressbook/setup/egw_de.lang
index f3baa341e3..02030715ad 100644
--- a/addressbook/setup/egw_de.lang
+++ b/addressbook/setup/egw_de.lang
@@ -287,6 +287,7 @@ new contact submitted by %1 at %2	addressbook	de	Neuer Kontakt eingetragen von %
 new window opened to edit infolog for your selection	addressbook	de	Es wird ein neues Fenster zum erstellen des Infolog Eintrags geöffnet
 next date	addressbook	de	Nächster Termin
 no categories selected	addressbook	de	keine Kategorien ausgewählt
+no fallback	addressbook	de	Kein Ausweichlösung
 no vcard	addressbook	de	Keine VCard
 number	addressbook	de	Nummer
 number of records to read (%1)	addressbook	de	Anzahl der einzulesenden Datensätze (%1)
@@ -382,7 +383,10 @@ to many might exceed your execution-time-limit	addressbook	de	zu viel können ih
 today is %1's birthday!	common	de	Heute ist der Geburtstag von %1!
 tomorrow is %1's birthday.	common	de	Morgen ist der Geburtstag von %1.
 translation	addressbook	de	Ãœbersetzung
+two of: %1	addressbook	de	Zwei von: %1
 type	addressbook	de	Typ
+unique id (uid)	addressbook	de	Eindeutige ID (UID)
+unique id<br />(to update existing records)	addressbook	de	Eindeutige ID<br />(um existierende Datensätze zu aktualisieren)
 update a single entry by passing the fields.	addressbook	de	Aktualisiert einen einzelnen Eintrag durch Ãœbergabe seiner Felder.
 update fields by edited organisations?	admin	de	Welche Felder sollen  beim Bearbeiten von Organisationen aktualisiert werden?
 updated	addressbook	de	Aktualisiert
diff --git a/addressbook/setup/egw_en.lang b/addressbook/setup/egw_en.lang
index 68d487c7a3..8a0b0d5920 100644
--- a/addressbook/setup/egw_en.lang
+++ b/addressbook/setup/egw_en.lang
@@ -287,6 +287,7 @@ new contact submitted by %1 at %2	addressbook	en	New contact submitted by %1 at
 new window opened to edit infolog for your selection	addressbook	en	New window opened to edit Infolog for your selection
 next date	addressbook	en	Next date
 no categories selected	addressbook	en	no categories selected
+no fallback	addressbook	en	No fallback
 no vcard	addressbook	en	No VCard
 number	addressbook	en	Number
 number of records to read (%1)	addressbook	en	Number of records to read (%1)
@@ -382,7 +383,10 @@ to many might exceed your execution-time-limit	addressbook	en	to many might exce
 today is %1's birthday!	common	en	Today is %1's birthday!
 tomorrow is %1's birthday.	common	en	Tomorrow is %1's birthday.
 translation	addressbook	en	Translation
+two of: %1	addressbook	en	two of: %1
 type	addressbook	en	Type
+unique id (uid)	addressbook	en	Unique ID (UID)
+unique id<br />(to update existing records)	addressbook	en	Unique ID<br />(to update existing records)
 update a single entry by passing the fields.	addressbook	en	Update a single entry by passing the fields.
 update fields by edited organisations?	admin	en	Update Fields by edited organisations?
 updated	addressbook	en	Updated
diff --git a/addressbook/templates/default/csv_import.tpl b/addressbook/templates/default/csv_import.tpl
index 11eb3785d4..341f90f990 100644
--- a/addressbook/templates/default/csv_import.tpl
+++ b/addressbook/templates/default/csv_import.tpl
@@ -1,17 +1,17 @@
 
 <br><center>
 
-  <FORM {enctype} action="{action_url}" method="post">
-      <TABLE>
+  <form {enctype} action="{action_url}" method="post">
+   <table>
 
 <!-- BEGIN filename -->
-     <TR>
-       <TD>{lang_csvfile}</td>
-    <td><INPUT NAME="csvfile" SIZE=30 TYPE="file" VALUE="{csvfile}"></td>
+   <tr>
+    <td>{lang_csvfile}</td>
+    <td><input NAME="csvfile" SIZE=30 TYPE="file" VALUE="{csvfile}" /></td>
    </tr>
    <tr>
     <td>{lang_fieldsep}</td>
-    <td><input name="fieldsep" size=1 value="{fieldsep}"></td>
+    <td><input name="fieldsep" size=1 value="{fieldsep}" /></td>
    </tr>
    <tr>
     <td>{lang_charset}</td>
@@ -20,8 +20,8 @@
     </td>
    </tr>
    <tr><td>&nbsp;</td>
-    <td><INPUT NAME="convert" TYPE="submit" VALUE="{submit}"></TD>
-   </TR>
+    <td><input NAME="convert" TYPE="submit" VALUE="{submit}" /></TD>
+   </tr>
 <!-- END filename -->
 
 <!-- BEGIN fheader -->
@@ -35,21 +35,25 @@
 <!-- BEGIN fields -->
    <tr>
     <td>{csv_field}</td>
-    <td><SELECT name="addr_fields[{csv_idx}]">{addr_fields}</select></td>
-    <td><input name="trans[{csv_idx}]" size=60 value="{trans}"></td>
+    <td><select name="addr_fields[{csv_idx}]">{addr_fields}</select></td>
+    <td><input name="trans[{csv_idx}]" size=60 value="{trans}" /></td>
    </tr>
 <!-- END fields -->
 
 <!-- BEGIN ffooter -->
    <tr>
-    <td rowspan="2" valign="middle"><br>{submit}</TD>
-    <td colspan="2"><br>
-     {lang_start} <INPUT name="start" type="text" size="5" value="{start}"> &nbsp; &nbsp;
-     {lang_max} <INPUT name="max" type="text" size="3" value="{max}"><td>
+    <td>{lang_unique_id}</td>
+    <td colspan="2">{unique_id}</td>
    </tr>
    <tr>
-    <td colspan="3"><INPUT name="debug" type="checkbox" value="1" {debug}> {lang_debug}</td>
-   </TR>
+    <td rowspan="2" valign="middle"><br>{submit}</TD>
+    <td colspan="2"><br>
+     {lang_start} <input name="start" type="text" size="5" value="{start}" /> &nbsp; &nbsp;
+     {lang_max} <input name="max" type="text" size="3" value="{max}" /><td>
+   </tr>
+   <tr>
+    <td colspan="3"><input name="debug" type="checkbox" value="1" {debug}> {lang_debug}</td>
+   </tr>
    <tr><td colspan="3">&nbsp;<p>
     {help_on_trans}
    </td></tr>
@@ -61,11 +65,11 @@
      {log}<p>
      {anz_imported}
     </td>
-   </TR>
+   </tr>
 <!-- END imported -->
 
-</TABLE>
+</table>
 {hiddenvars}
 </form>
 
-</CENTER>
+</center>

From 69d377b5d5f71541884ba5b9abdc85e2a8758630 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Jul 2009 12:38:50 +0000
Subject: [PATCH 464/510] "use default addressbook for new contacts (user
 preferences), if no owner specified"

---
 addressbook/csv_import.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index c80c1dd77f..a4aeae966e 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -454,7 +454,11 @@ switch($_POST['action'])
 			}
 			if (!in_array('owner',$addr_fields) || !$values['owner'])
 			{
-				$values['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+				// use default addressbook for new contacts (user preferences), if no owner specified
+				if(!($values['owner'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default']))
+				{
+					$values['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+				}
 			}
 			if (!in_array('id',$addr_fields))
 			{

From 25dc87e835aa1f23fb50bfe2b307c48abd172a0d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Jul 2009 13:02:57 +0000
Subject: [PATCH 465/510] "only use default addressbook, if none is specified
 AND no existing contact already in a defined addressbook"

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

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index a4aeae966e..009c701bf4 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -452,7 +452,7 @@ switch($_POST['action'])
 					$values[$user] = $GLOBALS['egw']->accounts->name2id($values[$user],'account_lid',$user=='owner'?null:'u');
 				}
 			}
-			if (!in_array('owner',$addr_fields) || !$values['owner'])
+			if (!isset($values['owner']) || isset($values['owner']) && !$values['owner'])
 			{
 				// use default addressbook for new contacts (user preferences), if no owner specified
 				if(!($values['owner'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default']))

From abbe9915fab86a1f1f6bd7a565cef3a143f656ae Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 Jul 2009 12:39:00 +0000
Subject: [PATCH 466/510] "- allways display addressbook contact is imported to
 - dont move accounts to default addressbook"

---
 addressbook/csv_import.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index 009c701bf4..88fe56a057 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -295,10 +295,14 @@ switch($_POST['action'])
 
 		$log = '<table border="1" style="border: 1px dotted black; border-collapse: collapse;">'."\n\t<tr><td>#</td>\n";
 
-		if (!in_array('id',$addr_fields))	// autocreate public access if not set by user
+		if (!in_array('id',$addr_fields))		// allways show ID
 		{
 			$log .= "\t\t<td><b>ID</b></td>\n";
 		}
+		if (!in_array('owner',$addr_fields))	// allways show addressbook
+		{
+			$log .= "\t\t<td><b>".lang('Addressbook')."</b></td>\n";
+		}
 		if (!in_array('private',$addr_fields))	// autocreate public access if not set by user
 		{
 			$log .= "\t\t<td><b>private</b></td>\n";
@@ -452,7 +456,7 @@ switch($_POST['action'])
 					$values[$user] = $GLOBALS['egw']->accounts->name2id($values[$user],'account_lid',$user=='owner'?null:'u');
 				}
 			}
-			if (!isset($values['owner']) || isset($values['owner']) && !$values['owner'])
+			if (!isset($values['owner']) || isset($values['owner']) && (string)$values['owner'] === '')
 			{
 				// use default addressbook for new contacts (user preferences), if no owner specified
 				if(!($values['owner'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default']))
@@ -464,6 +468,10 @@ switch($_POST['action'])
 			{
 				$log .= "\t\t<td>".$values['id']."</td>\n";
 			}
+			if (!in_array('owner',$addr_fields))
+			{
+				$log .= "\t\t<td>".$values['owner']."</td>\n";
+			}
 			if (!in_array('private',$addr_fields))
 			{
 				$values['private'] = 0;	// public access if not set by user

From 49c5b2933cdd34409d9be166edca503467004919 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 11 Jul 2009 09:07:59 +0000
Subject: [PATCH 467/510] New vfs-upload widget to upload files into vfs: - if
 file already exists, show download and delete link - if file does NOT exist,
 show upload box Name or value of widget is either: - vfs path or -
 $app:$id:$relative_name (if empty($id) a temporary directory in users   home
 directory is created and application is responsible to move   content of that
 directory to the entry directory (/apps/$app/$id)

---
 etemplate/inc/class.vfs_widget.inc.php | 170 ++++++++++++++++++++++++-
 etemplate/setup/egw_de.lang            |   6 +
 etemplate/setup/egw_en.lang            |   6 +
 3 files changed, 181 insertions(+), 1 deletion(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index af0000f6bd..ef33ea71ff 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -21,6 +21,10 @@
  * - vfs-mime aka File icon:	    mime type icon or thumbnail (if configured AND enabled in the user-prefs)
  * - vfs-uid  aka File owner:       Owner of file, or 'root' if none
  * - vfs-gid  aka File group:       Group of file, or 'root' if none
+ * - vfs-upload aka VFS file:       displays either download and delete (x) links or a file upload
+ *   value is either a vfs path or colon separated $app:$id:$relative_path, eg: infolog:123:special/offer
+ *   if empty($id) / new entry, file is created in a hidden temporary directory in users home directory
+ *   and calling app is responsible to move content of that dir to entry directory, after entry is saved
  *
  * All widgets accept as value a full path.
  * vfs-mime and vfs itself also allow an array with values like stat (incl. 'path'!) as value.
@@ -36,6 +40,7 @@ class vfs_widget
 	 */
 	var $public_functions = array(
 		'pre_process' => True,
+		'post_process' => true,		// post_process is only used for vfs-upload (all other widgets set $cell['readlonly']!)
 	);
 	/**
 	 * availible extensions and there names for the editor
@@ -49,6 +54,7 @@ class vfs_widget
 		'vfs-mime' => 'File icon',		// mime type icon or thumbnail
 		'vfs-uid'  => 'File owner',		// Owner of file, or 'root' if none
 		'vfs-gid'  => 'File group',		// Group of file, or 'root' if none
+		'vfs-upload' => 'VFS file',		// displays either download and delete (x) links or a file upload
 	);
 
 	/**
@@ -67,7 +73,7 @@ class vfs_widget
 	function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 	{
 		$type = $cell['type'];
-		$readonly = $cell['readonly'] || $readonlys;
+		if ($type != 'vfs-upload') $cell['readonly'] = true;	// to not call post-process
 
 		// check if we have a path and not the raw value, in that case we have to do a stat first
 		if (in_array($type,array('vfs-size','vfs-mode','vfs-uid','vfs-gid')) && !is_numeric($value) || $type == 'vfs' && !$value)
@@ -83,6 +89,83 @@ class vfs_widget
 
 		switch($type)
 		{
+			case 'vfs-upload':	// option: allowed mime types (regular expression) if limited
+				if(empty($value)) $value = $cell['name'];	// if no value via content array, use widget name
+				$extension_data = array('value' => $value, 'mimetype' => $cell['size'], 'type' => $type);
+				if ($value[0] != '/')
+				{
+					list($app,$id,$relpath) = explode(':',$value,3);
+					if (empty($id))
+					{
+						static $tmppath = array();	// static var, so all vfs-uploads get created in the same temporary dir
+						if (!isset($tmppath[$app])) $tmppath[$app] = '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.'.$app.'_'.md5(time().session_id());
+						$value = $tmppath[$app];
+					}
+					else
+					{
+						$value = egw_link::vfs_path($app,$id,'',true);
+					}
+					if (!empty($relpath)) $value .= '/'.$relpath;
+				}
+				$path = $extension_data['path'] = $value;
+				$dir = egw_vfs::dirname($path);
+				static $files = array();	// static var, to scan each directory only once
+				if (!isset($files[$dir])) $files[$dir] = egw_vfs::file_exists($dir) ? egw_vfs::scandir($dir) : array();
+				$basename = egw_vfs::basename($path);
+				$basename_len = strlen($basename);
+				foreach($files[$dir] as $file)
+				{
+					if (substr($file,0,$basename_len) == $basename)
+					{
+						$file_exists = true;
+						break;
+					}
+				}
+				if ($file_exists)	// display download link and delete icon
+				{
+					$path = $extension_data['path'] = $dir.'/'.$file;
+					$value = empty($cell['label']) ? $file : lang($cell['label']);	// display (translated) Label or filename (if label empty)
+
+					$vfs_link = etemplate::empty_cell('label',$cell['name'],array(
+						'size' => ','.egw_vfs::download_url($path).',,,,,'.$path,
+					));
+					// if dir is writable, add delete link
+					if (egw_vfs::is_writable($dir))
+					{
+						$cell = etemplate::empty_cell('hbox','',array('size' => ',,0,0'));
+						etemplate::add_child($cell,$vfs_link);
+						$delete_icon = etemplate::empty_cell('button',$path,array(
+							'label' => 'delete',
+							'size'  => 'delete',	// icon
+							'onclick' => "return confirm('Delete this file');",
+							'span' => ',leftPad5',
+						));
+						etemplate::add_child($cell,$delete_icon);
+					}
+					else
+					{
+						$cell = $vfs_link;
+					}
+				}
+				else	// file does NOT exists --> display file upload
+				{
+					$cell['type'] = 'file';
+					// if no explicit help message set and we only allow certain file types --> show them
+					if (empty($cell['help']) && $cell['size'])
+					{
+						if (($type = mime_magic::mime2ext($cell['size'])))
+						{
+							$type = '*.'.strtoupper($type);
+						}
+						else
+						{
+							$type = $cell['size'];
+						}
+						$cell['help'] = lang('Allowed file type: %1',$type);
+					}
+				}
+				break;
+
 			case 'vfs-size':	// option: add size in bytes in brackets
 				$value = egw_vfs::hsize($size = is_numeric($value) ? $value : $stat['size']);
 				if ($cell['size']) $value .= ' ('.$size.')';
@@ -258,4 +341,89 @@ class vfs_widget
 
 		return true;
 	}
+
+	/**
+	 * postprocessing method, called after the submission of the form
+	 *
+	 * It has to copy the allowed/valid data from $value_in to $value, otherwise the widget
+	 * will return no data (if it has a preprocessing method). The framework insures that
+	 * the post-processing of all contained widget has been done before.
+	 *
+	 * Only used by vfs-upload so far
+	 *
+	 * @param string $name form-name of the widget
+	 * @param mixed &$value the extension returns here it's input, if there's any
+	 * @param mixed &$extension_data persistent storage between calls or pre- and post-process
+	 * @param boolean &$loop can be set to true to request a re-submision of the form/dialog
+	 * @param object &$tmpl the eTemplate the widget belongs too
+	 * @param mixed &value_in the posted values (already striped of magic-quotes)
+	 * @return boolean true if $value has valid content, on false no content will be returned!
+	 */
+	function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	{
+		if (!$extension_data || $extension_data['type'] != 'vfs-upload')
+		{
+			return false;
+		}
+		//echo '<p>'.__METHOD__."('$name',".array2string($value).','.array2string($extension_data).",$loop,,".array2string($value_in)."</p>\n";
+
+		// check if delete icon clicked
+		if ($_POST['submit_button'] == str_replace($extension_data['value'],$extension_data['path'],$name))
+		{
+			if (!egw_vfs::remove($extension_data['path']))
+			{
+				etemplate::set_validation_error($name,lang('Error deleting %1!',$extension_data['path']));
+			}
+			$loop = true;
+			return false;
+		}
+
+		// handle file upload
+		$name = preg_replace('/^exec\[([^]]+)\](.*)$/','\\1\\2',$name);	// remove exec prefix
+
+		$filename = etemplate::get_array($_FILES['exec']['name'],$name);
+		if (empty($filename))
+		{
+			return false;	// no file attached
+		}
+		$tmp_name = etemplate::get_array($_FILES['exec']['tmp_name'],$name);
+		$error = etemplate::get_array($_FILES['exec']['error'],$name);
+		if ($error || empty($tmp_name) || function_exists('is_uploaded_file') && !is_uploaded_file($tmp_name) || !file_exists($tmp_name))
+		{
+			return false;
+		}
+		// check if type matches required mime-type, if specified
+		if (!empty($extension_data['mimetype']))
+		{
+			$type = etemplate::get_array($_FILES['exec']['type'],$name);
+			$is_preg = $extension_data['mimetype'][0] == '/' || $extension_data['mimetype'] != preg_quote($extension_data['mimetype']);
+			//echo "<p>preg_quote('{$extension_data['mimetype']}')='".preg_quote($extension_data['mimetype'])."' --> is_preg=".array2string($is_preg)."</p>\n";
+			if (!$is_preg && strcasecmp($extension_data['mimetype'],$type) ||
+				$is_preg && !preg_match($extension_data['mimetype'][0]=='/'?$extension_data['mimetype']:'/'.$extension_data['mimetype'].'/',$type))
+			{
+				etemplate::set_validation_error($name,lang('File is of wrong type (%1 != %2)!',$type,$extension_data['mimetype']));
+				return false;
+			}
+		}
+		$path = $extension_data['path'];
+		// add extension to path
+		$parts = explode('.',$filename);
+		if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))	// really an extension --> add it to path
+		{
+			$path .= '.'.$extension;
+		}
+		if (!egw_vfs::file_exists($dir = egw_vfs::dirname($path)) && !egw_vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		{
+			etemplate::set_validation_error($name,lang('Error create parent directory %1!',$dir));
+			return false;
+		}
+		if (!copy($tmp_name,egw_vfs::PREFIX.$path))
+		{
+			etemplate::set_validation_error($name,lang('Error copying uploaded file to vfs!'));
+			return false;
+		}
+		$value = $path;	// return path of file, important if only a temporary location is used
+
+		return true;
+	}
 }
diff --git a/etemplate/setup/egw_de.lang b/etemplate/setup/egw_de.lang
index 2d5b305613..7ac420915d 100644
--- a/etemplate/setup/egw_de.lang
+++ b/etemplate/setup/egw_de.lang
@@ -33,6 +33,7 @@ alignment of label and input-field in table-cell	etemplate	de	Ausrichtung der Be
 alignment of the v/hbox containing table-cell	etemplate	de	Ausrichtung der die V/HBox enthaltenden Tabellenzelle
 all days	etemplate	de	alle Tage
 all operations save the template!	etemplate	de	alle Operation speichern das Template!
+allowed file type: %1	etemplate	de	Erlaubter Dateityp: %1
 am	etemplate	de	Vormittag
 an indexed column speeds up querys using that column (cost space on the disk !!!)	etemplate	de	eine indizierte Spalte beschleunigt Anfragen die diese benutzen (kostet Plattenplatz !!!)
 application	etemplate	de	Anwendung
@@ -146,6 +147,9 @@ enter filename to upload and attach, use [browse...] to search for it	etemplate
 enter the new version number here (> old_version), empty for no update-file	etemplate	de	Neue Versionsnummer eingeben (größer als alte), leer wenn keine Update-Datei erzeugt werden soll
 enter the new version number here (has to be > old_version)	etemplate	de	Neue Versionsnummer eingeben (muss größer als die alte sein)
 entry saved	etemplate	de	Eintrag gespeichert
+error copying uploaded file to vfs!	etemplate	de	Fehler beim Kopieren der hochgeladenen Datei ins VFS!
+error create parent directory %1!	etemplate	de	Fehler beim Anlegen des Elternverzeichnisses %1!
+error deleting %1!	etemplate	de	Fehler beim Löschen von %1!
 error: template not found !!!	etemplate	de	Fehler: eTemplate nicht gefunden !!!
 error: webserver is not allowed to write into '%1' !!!	etemplate	de	Fehler: der Webserver hat keine Schreibberechtigung in '%1' !!!
 error: while saving !!!	etemplate	de	Fehler: beim Speichern !!!
@@ -164,7 +168,9 @@ extensions loaded:	etemplate	de	Erweiterungen geladen:
 field	etemplate	de	Feld
 field must not be empty !!!	etemplate	de	Das Feld darf nicht leer sein !!!
 file	etemplate	de	Datei
+file '%1' not found!	etemplate	de	Datei '%1' nicht gefunden!
 file contains more than one etemplate, last one is shown !!!	etemplate	de	Datei enthält mehr als ein eTemplate, das letzte wird angezeigt !!!
+file is of wrong type (%1 != %2)!	etemplate	de	Datei hat ungültigen Typ (%1 != %2)!
 file writen	etemplate	de	Datei geschrieben
 fileupload	etemplate	de	DateiUpload
 first	etemplate	de	Zuerst
diff --git a/etemplate/setup/egw_en.lang b/etemplate/setup/egw_en.lang
index 3e931b0475..14e90eea03 100644
--- a/etemplate/setup/egw_en.lang
+++ b/etemplate/setup/egw_en.lang
@@ -33,6 +33,7 @@ alignment of label and input-field in table-cell	etemplate	en	alignment of label
 alignment of the v/hbox containing table-cell	etemplate	en	Alignment of the V/HBox containing table-cell
 all days	etemplate	en	all days
 all operations save the template!	etemplate	en	all operations save the template!
+allowed file type: %1	etemplate	en	Allowed file type: %1
 am	etemplate	en	am
 an indexed column speeds up querys using that column (cost space on the disk !!!)	etemplate	en	an indexed column speeds up querys using that column (cost space on the disk !!!)
 application	etemplate	en	Application
@@ -146,6 +147,9 @@ enter filename to upload and attach, use [browse...] to search for it	etemplate
 enter the new version number here (> old_version), empty for no update-file	etemplate	en	enter the new version number here (> old_version), empty for no update-file
 enter the new version number here (has to be > old_version)	etemplate	en	enter the new version number here (has to be > old_version)
 entry saved	etemplate	en	Entry saved
+error copying uploaded file to vfs!	etemplate	en	Error copying uploaded file to vfs!
+error create parent directory %1!	etemplate	en	Error create parent directory %1!
+error deleting %1!	etemplate	en	Error deleting %1!
 error: template not found !!!	etemplate	en	Error: Template not found !!!
 error: webserver is not allowed to write into '%1' !!!	etemplate	en	Error: webserver is not allowed to write into '%1' !!!
 error: while saving !!!	etemplate	en	Error: while saving !!!
@@ -164,7 +168,9 @@ extensions loaded:	etemplate	en	Extensions loaded:
 field	etemplate	en	Field
 field must not be empty !!!	etemplate	en	Field must not be empty !!!
 file	etemplate	en	File
+file '%1' not found!	etemplate	en	File '%1' not found!
 file contains more than one etemplate, last one is shown !!!	etemplate	en	File contains more than one eTemplate, last one is shown !!!
+file is of wrong type (%1 != %2)!	etemplate	en	File is of wrong type (%1 != %2)!
 file writen	etemplate	en	File writen
 fileupload	etemplate	en	FileUpload
 first	etemplate	en	First

From 919aea627ea498602627afc645c590549688c0f0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 13 Jul 2009 08:14:59 +0000
Subject: [PATCH 468/510] "use form_name (with replaced substitutes) instead of
 $cell[name], allows to put into the name something like
 \"app:$cont[id]:files/blah\" or \"app:$row_cont[id]:files/blub\""

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

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index ef33ea71ff..93e1cda408 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -72,6 +72,7 @@ class vfs_widget
 	 */
 	function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 	{
+		//echo "<p>".__METHOD__."($form_name,$value,".array2string($cell).",...)</p>\n";
 		$type = $cell['type'];
 		if ($type != 'vfs-upload') $cell['readonly'] = true;	// to not call post-process
 
@@ -89,8 +90,11 @@ class vfs_widget
 
 		switch($type)
 		{
-			case 'vfs-upload':	// option: allowed mime types (regular expression) if limited
-				if(empty($value)) $value = $cell['name'];	// if no value via content array, use widget name
+			case 'vfs-upload':		// option: allowed mime types (regular expression) if limited
+				if (empty($value) && preg_match('/^exec.*\[([^]]+)\]$/',$form_name,$matches))	// if no value via content array, use widget name
+				{
+					$value = $matches[1].$matches[2];
+				}
 				$extension_data = array('value' => $value, 'mimetype' => $cell['size'], 'type' => $type);
 				if ($value[0] != '/')
 				{

From ee2b5cf164f2fb13f9e65c00d60bb150d24dc675 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 13 Jul 2009 08:17:41 +0000
Subject: [PATCH 469/510] new param to delete method only return ids: can be
 used in extended class for deletes in other tables

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

diff --git a/etemplate/inc/class.so_sql_cf.inc.php b/etemplate/inc/class.so_sql_cf.inc.php
index 79ceda4d12..b2c7959da7 100644
--- a/etemplate/inc/class.so_sql_cf.inc.php
+++ b/etemplate/inc/class.so_sql_cf.inc.php
@@ -299,11 +299,12 @@ class so_sql_cf extends so_sql
 	 * reimplented to also delete the custom fields
 	 *
 	 * @param array $keys if given array with col => value pairs to characterise the rows to delete
+	 * @param boolean $only_return_ids=false return $ids of delete call to db object, but not run it (can be used by extending classes!)
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null)
+	function delete($keys=null,$only_return_ids=false)
 	{
-		if ($this->customfields)
+		if ($this->customfields || $only_return_query)
 		{
 			$query = parent::delete($keys,true);
 			// check if query contains more then the id's
@@ -319,6 +320,7 @@ class so_sql_cf extends so_sql
 			{
 				$ids = $query[$this->autoinc_id];
 			}
+			if ($only_return_query) return $ids;
 			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
 		}
 		return parent::delete($keys);

From b731dcbfe000e37c4f84de498dbdb89799ce9a7c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 13 Jul 2009 10:33:26 +0000
Subject: [PATCH 470/510] loading infolog translations if current_app is NOT
 infolog

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

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index ffe0efe2c3..9afd47be81 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -91,6 +91,7 @@ class infolog_ui
 	 */
 	function __construct()
 	{
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') $GLOBALS['egw']->translation->add_app('infolog');
 		$this->bo = new infolog_bo();
 
 		$this->tmpl = new etemplate();
@@ -312,7 +313,7 @@ class infolog_ui
 		}
 		// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
 		// so we have to check that as well
-        $details = $query['filter2'] == 'all';
+		$details = $query['filter2'] == 'all';
 		$columselection = $this->prefs['nextmatch-infolog.index.rows'.($details?'-details':'')];
 		//_debug_array($columselection);
 		if ($columselection)
@@ -1367,8 +1368,6 @@ class infolog_ui
 
 		if (!empty($_to_emailAddress))
 		{
-			$GLOBALS['egw_info']['flags']['currentapp'] = 'infolog';
-			$GLOBALS['egw']->translation->add_app($GLOBALS['egw_info']['flags']['currentapp']);
 			echo '<script>window.resizeTo(750,550);</script>';
 
 			if (is_array($_attachments))

From 7d0184e9ead9c7d29f9599ad79342a3b91492f0c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 13 Jul 2009 10:47:19 +0000
Subject: [PATCH 471/510] you need to have current_app modified when importing
 mail

---
 infolog/inc/class.infolog_ui.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 9afd47be81..eae3c2cc03 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -1368,6 +1368,7 @@ class infolog_ui
 
 		if (!empty($_to_emailAddress))
 		{
+			$GLOBALS['egw_info']['flags']['currentapp'] = 'infolog';
 			echo '<script>window.resizeTo(750,550);</script>';
 
 			if (is_array($_attachments))

From 2bb5884ad9f4b2f27e9106bd8c54722f2d1f8aed Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 14 Jul 2009 16:29:47 +0000
Subject: [PATCH 472/510] Captcha widget based on secureimage, contributed by
 Randy Houlahan

---
 .../inc/class.ajax_captcha_widget.inc.php     | 1125 +++++++++++++++++
 etemplate/setup/etemplates.inc.php            |    1 +
 etemplate/templates/default/audio/0.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/1.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/2.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/3.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/4.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/5.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/6.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/7.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/8.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/9.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/a.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/b.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/c.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/d.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/e.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/f.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/g.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/h.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/i.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/j.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/k.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/l.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/m.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/n.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/o.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/p.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/q.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/r.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/s.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/t.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/u.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/v.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/w.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/x.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/y.wav       |  Bin 0 -> 22158 bytes
 etemplate/templates/default/audio/z.wav       |  Bin 0 -> 22158 bytes
 .../templates/default/images/audio_icon.gif   |  Bin 0 -> 621 bytes
 .../templates/default/images/refresh.gif      |  Bin 0 -> 865 bytes
 etemplate/templates/default/words/.htaccess   |    1 +
 etemplate/templates/default/words/words.txt   |  250 ++++
 42 files changed, 1377 insertions(+)
 create mode 100644 etemplate/inc/class.ajax_captcha_widget.inc.php
 create mode 100644 etemplate/templates/default/audio/0.wav
 create mode 100644 etemplate/templates/default/audio/1.wav
 create mode 100644 etemplate/templates/default/audio/2.wav
 create mode 100644 etemplate/templates/default/audio/3.wav
 create mode 100644 etemplate/templates/default/audio/4.wav
 create mode 100644 etemplate/templates/default/audio/5.wav
 create mode 100644 etemplate/templates/default/audio/6.wav
 create mode 100644 etemplate/templates/default/audio/7.wav
 create mode 100644 etemplate/templates/default/audio/8.wav
 create mode 100644 etemplate/templates/default/audio/9.wav
 create mode 100644 etemplate/templates/default/audio/a.wav
 create mode 100644 etemplate/templates/default/audio/b.wav
 create mode 100644 etemplate/templates/default/audio/c.wav
 create mode 100644 etemplate/templates/default/audio/d.wav
 create mode 100644 etemplate/templates/default/audio/e.wav
 create mode 100644 etemplate/templates/default/audio/f.wav
 create mode 100644 etemplate/templates/default/audio/g.wav
 create mode 100644 etemplate/templates/default/audio/h.wav
 create mode 100644 etemplate/templates/default/audio/i.wav
 create mode 100644 etemplate/templates/default/audio/j.wav
 create mode 100644 etemplate/templates/default/audio/k.wav
 create mode 100644 etemplate/templates/default/audio/l.wav
 create mode 100644 etemplate/templates/default/audio/m.wav
 create mode 100644 etemplate/templates/default/audio/n.wav
 create mode 100644 etemplate/templates/default/audio/o.wav
 create mode 100644 etemplate/templates/default/audio/p.wav
 create mode 100644 etemplate/templates/default/audio/q.wav
 create mode 100644 etemplate/templates/default/audio/r.wav
 create mode 100644 etemplate/templates/default/audio/s.wav
 create mode 100644 etemplate/templates/default/audio/t.wav
 create mode 100644 etemplate/templates/default/audio/u.wav
 create mode 100644 etemplate/templates/default/audio/v.wav
 create mode 100644 etemplate/templates/default/audio/w.wav
 create mode 100644 etemplate/templates/default/audio/x.wav
 create mode 100644 etemplate/templates/default/audio/y.wav
 create mode 100644 etemplate/templates/default/audio/z.wav
 create mode 100644 etemplate/templates/default/images/audio_icon.gif
 create mode 100644 etemplate/templates/default/images/refresh.gif
 create mode 100644 etemplate/templates/default/words/.htaccess
 create mode 100644 etemplate/templates/default/words/words.txt

diff --git a/etemplate/inc/class.ajax_captcha_widget.inc.php b/etemplate/inc/class.ajax_captcha_widget.inc.php
new file mode 100644
index 0000000000..732f071baa
--- /dev/null
+++ b/etemplate/inc/class.ajax_captcha_widget.inc.php
@@ -0,0 +1,1125 @@
+<?php
+/**
+ * eGroupWare eTemplate Extension - captcha - based on secureimage - www.phpcaptcha.org
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage extensions
+ * @link http://www.egroupware.org
+ * @author Randy Houlahan randy@roadwarriors.ca
+
+ */
+
+/**
+ * Captcha Widget
+ *
+ * Using secureimage a captcha test is generated using etemplates.  Image refresh and audio files<br />
+ * are generated as well*/
+class ajax_captcha_widget
+{
+	var $public_functions = array(
+		'pre_process' => True,
+		'post_process' => True,
+		'show_image'	=>	True,
+		'play_sound' => True,
+	);
+	var $human_name = 'Captcha';	// this is the name for the editor
+
+	private $debug = false;
+
+	function ajax_captcha_widget($ui='')
+	{
+		
+		$this->img = new securimage();
+		switch($ui)
+		{
+			case '':
+			case 'html':
+				$this->ui = 'html';
+				break;
+			default:
+				echo "UI='$ui' not implemented";
+		}
+		return 0;
+	}
+
+	/**
+	* pre-processing of the extension
+	*
+	* This function is called before the extension gets rendered
+	*
+	* @param string $name form-name of the control
+	* @param mixed &$value value / existing content, can be modified
+	* @param array &$cell array with the widget, can be modified for ui-independent widgets
+	* @param array &$readonlys names of widgets as key, to be made readonly
+	* @param mixed &$extension_data data the extension can store persisten between pre- and post-process
+	* @param object &$tmpl reference to the template we belong too
+	* @return boolean true if extra label is allowed, false otherwise
+	*/
+	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+	{
+
+		//sets main etemplate cell with data created in etemplate.captcha_widget
+		$cell['type'] = 'template';
+		$cell['size'] = $cell['name'];
+		$widget =& new etemplate('etemplate.captcha_widget');
+		$widget->no_onclick = True;
+		$cell['obj'] = &$widget;
+		
+		$refresh_image_wig =& $widget->get_widget_by_name('etemplate/refresh.gif');
+		$refresh_image_wig['size'] = 'etemplate.captcha_widget.show_image';
+		$refresh_image_wig['onclick']='
+		document.getElementById(\'show_image\').src = \''.$GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=etemplate.ajax_captcha_widget.show_image&sid=\' + Math.random(); return false;';
+		
+		$value = array('captcha'=>'','captcha_code'=>'');
+		
+		//set needed onload for refresh JS
+		$GLOBALS['egw']->js->set_onload('"document.getElementById(\'show_image\').src = \''.$GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=etemplate.ajax_captcha_widget.show_image&sid=\' + Math.random(); return false"'
+		);
+		
+		// sets audio icon link properties
+		$audio_image_wig =& $widget->get_widget_by_name('etemplate/audio_icon.gif');
+		$audio_image_wig['size'] = 'etemplate.ajax_captcha_widget.play_sound';
+		
+		// sects code text field to be needed
+		$code_text_wig =& $widget->get_widget_by_name('captcha_code');
+		//$code_text_wig['name']=$name;
+		$code_text_wig['needed'] = 1;
+
+		return True;	// no extra label
+	}
+
+	/**
+	 * postprocessing method, called after the submission of the form
+	 *
+	 * It has to copy the allowed/valid data from $value_in to $value, otherwise the widget
+	 * will return no data (if it has a preprocessing method). The framework insures that
+	 * the post-processing of all contained widget has been done before.
+	 *
+	 * Only used by select-dow so far
+	 *
+	 * @param string $name form-name of the widget
+	 * @param mixed &$value the extension returns here it's input, if there's any
+	 * @param mixed &$extension_data persistent storage between calls or pre- and post-process
+	 * @param boolean &$loop can be set to true to request a re-submision of the form/dialog
+	 * @param object &$tmpl the eTemplate the widget belongs too
+	 * @param mixed &value_in the posted values (already striped of magic-quotes)
+	 * @return boolean true if $value has valid content, on false no content will be returned!
+	 */
+	function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	{
+			// sends user back to form if no code entered
+			if ($value_in[captcha_code]=='' || !isset($value_in[captcha_code]))
+			{
+				$loop=TRUE;
+				return false; 
+			}
+			// sends uder back to form with err msg if wrong code
+			if ($this->img->getCode() != $value_in[captcha_code])
+			{
+
+				$tmpl->set_validation_error('captcha',lang(" Your code is incorrect !!!"));
+                $loop=TRUE;
+				return false; 
+			}
+			
+	}//post process
+
+	
+		/**
+	 * Public function to return a new image and set the code in the sessions var from within the class
+	 *
+	 * @return new image
+	 */
+	function show_image() {
+
+			return $this->img->show();
+	}
+	
+	
+	 /**
+	 * Return new wav file
+	 * @return new wav file
+	 */
+	function play_sound() {
+		
+		header('Content-type: audio/x-wav');
+		header('Content-Disposition: attachment; name="securimage.wav"');
+		echo $this->img->getAudibleCode();
+	}
+	
+}//widget
+
+/**
+ * Project:     Securimage: A PHP class for creating and managing form CAPTCHA images<br />
+ * File:        securimage.php<br />
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or any later version.<br /><br />
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.<br /><br />
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA<br /><br />
+ *
+ * Any modifications to the library should be indicated clearly in the source code
+ * to inform users that the changes are not a part of the original software.<br /><br />
+ *
+ * If you found this script useful, please take a quick moment to rate it.<br />
+ * http://www.hotscripts.com/rate/49400.html  Thanks.
+ *
+ * @link http://www.phpcaptcha.org Securimage PHP CAPTCHA
+ * @link http://www.phpcaptcha.org/latest.zip Download Latest Version
+ * @link http://www.phpcaptcha.org/Securimage_Docs/ Online Documentation
+ * @copyright 2007 Drew Phillips
+ * @author drew010 <drew@drew-phillips.com>
+ * @version 1.0.3.1 (March 24, 2008)
+ * @package Securimage
+ *
+ */
+
+/**
+  ChangeLog
+
+  1.0.3.1
+  - Error reading from wordlist in some cases caused words to be cut off 1 letter short
+
+  1.0.3
+  - Removed shadow_text from code which could cause an undefined property error due to removal from previous version
+
+  1.0.2
+  - Audible CAPTCHA Code wav files
+  - Create codes from a word list instead of random strings
+
+  1.0
+  - Added the ability to use a selected character set, rather than a-z0-9 only.
+  - Added the multi-color text option to use different colors for each letter.
+  - Switched to automatic session handling instead of using files for code storage
+  - Added GD Font support if ttf support is not available.  Can use internal GD fonts or load new ones.
+  - Added the ability to set line thickness
+  - Added option for drawing arced lines over letters
+  - Added ability to choose image type for output
+
+*/
+
+/**
+ * Output images in JPEG format
+ */
+define('SI_IMAGE_JPEG', 1);
+/**
+ * Output images in PNG format
+ */
+define('SI_IMAGE_PNG',  2);
+/**
+ * Output images in GIF format
+ * Must have GD >= 2.0.28!
+ */
+define('SI_IMAGE_GIF',  3);
+
+/**
+ * Securimage CAPTCHA Class.
+ *
+ * @package    Securimage
+ * @subpackage classes
+ *
+ */
+class Securimage {
+
+  /**
+   * The desired width of the CAPTCHA image.
+   *
+   * @var int
+   */
+  var $image_width = 175;
+
+  /**
+   * The desired width of the CAPTCHA image.
+   *
+   * @var int
+   */
+  var $image_height = 45;
+
+  /**
+   * The image format for output.<br />
+   * Valid options: SI_IMAGE_PNG, SI_IMAGE_JPG, SI_IMAGE_GIF
+   *
+   * @var int
+   */
+  var $image_type = SI_IMAGE_PNG;
+
+  /**
+   * The length of the code to generate.
+   *
+   * @var int
+   */
+  var $code_length = 4;
+
+  /**
+   * The character set for individual characters in the image.<br />
+   * Letters are converted to uppercase.<br />
+   * The font must support the letters or there may be problematic substitutions.
+   *
+   * @var string
+   */
+  var $charset = 'ABCDEFGHKLMNPRSTUVWYZ23456789';
+  //var $charset = '0123456789';
+
+  /**
+   * Create codes using this word list
+   *
+   * @var string  The path to the word list to use for creating CAPTCHA codes
+   */
+  var $wordlist_file = '/etemplate/templates/default/words/words.txt';
+
+  /**
+   * True to use a word list file instead of a random code
+   *
+   * @var bool
+   */
+  var $use_wordlist  = true;
+
+  /**
+   * Whether to use a GD font instead of a TTF font.<br />
+   * TTF offers more support and options, but use this if your PHP doesn't support TTF.<br />
+   *
+   * @var boolean
+   */
+  var $use_gd_font = true;
+
+  /**
+   * The GD font to use.<br />
+   * Internal gd fonts can be loaded by their number.<br />
+   * Alternatively, a file path can be given and the font will be loaded from file.
+   *
+   * @var mixed
+   */
+  var $gd_font_file = '/etemplate/templates/default/gdfonts/automatic.gdf';
+
+  /**
+   * The approximate size of the font in pixels.<br />
+   * This does not control the size of the font because that is determined by the GD font itself.<br />
+   * This is used to aid the calculations of positioning used by this class.<br />
+   *
+   * @var int
+   */
+  var $gd_font_size = 20;
+
+  // Note: These font options below do not apply if you set $use_gd_font to true with the exception of $text_color
+
+  /**
+   * The path to the TTF font file to load.
+   *
+   * @var string
+   */
+  var $ttf_file = "./elephant.ttf";
+
+  /**
+   * The font size.<br />
+   * Depending on your version of GD, this should be specified as the pixel size (GD1) or point size (GD2)<br />
+   *
+   * @var int
+   */
+  var $font_size = 24;
+
+  /**
+   * The minimum angle in degrees, with 0 degrees being left-to-right reading text.<br />
+   * Higher values represent a counter-clockwise rotation.<br />
+   * For example, a value of 90 would result in bottom-to-top reading text.
+   *
+   * @var int
+   */
+  var $text_angle_minimum = -20;
+
+  /**
+   * The minimum angle in degrees, with 0 degrees being left-to-right reading text.<br />
+   * Higher values represent a counter-clockwise rotation.<br />
+   * For example, a value of 90 would result in bottom-to-top reading text.
+   *
+   * @var int
+   */
+  var $text_angle_maximum = 20;
+
+  /**
+   * The X-Position on the image where letter drawing will begin.<br />
+   * This value is in pixels from the left side of the image.
+   *
+   * @var int
+   */
+  var $text_x_start = 8;
+
+  /**
+   * Letters can be spaced apart at random distances.<br />
+   * This is the minimum distance between two letters.<br />
+   * This should be <i>at least</i> as wide as a font character.<br />
+   * Small values can cause letters to be drawn over eachother.<br />
+   *
+   * @var int
+   */
+  var $text_minimum_distance = 30;
+
+  /**
+   * Letters can be spaced apart at random distances.<br />
+   * This is the maximum distance between two letters.<br />
+   * This should be <i>at least</i> as wide as a font character.<br />
+   * Small values can cause letters to be drawn over eachother.<br />
+   *
+   * @var int
+   */
+  var $text_maximum_distance = 33;
+
+  /**
+   * The background color for the image.<br />
+   * This should be specified in HTML hex format.<br />
+   * Make sure to include the preceding # sign!
+   *
+   * @var string
+   */
+  var $image_bg_color = "#e3daed";
+
+  /**
+   * The text color to use for drawing characters.<br />
+   * This value is ignored if $use_multi_text is set to true.<br />
+   * Make sure this contrasts well with the background color.<br />
+   * Specify the color in HTML hex format with preceding # sign
+   *
+   * @see Securimage::$use_multi_text
+   * @var string
+   */
+  var $text_color = "#ff0000";
+
+  /**
+   * Set to true to use multiple colors for each character.
+   *
+   * @see Securimage::$multi_text_color
+   * @var boolean
+   */
+  var $use_multi_text = true;
+
+  /**
+   * String of HTML hex colors to use.<br />
+   * Separate each possible color with commas.<br />
+   * Be sure to precede each value with the # sign.
+   *
+   * @var string
+   */
+  var $multi_text_color = "#0a68dd,#f65c47,#8d32fd";
+
+  /**
+   * Set to true to make the characters appear transparent.
+   *
+   * @see Securimage::$text_transparency_percentage
+   * @var boolean
+   */
+  var $use_transparent_text = true;
+
+  /**
+   * The percentage of transparency, 0 to 100.<br />
+   * A value of 0 is completely opaque, 100 is completely transparent (invisble)
+   *
+   * @see Securimage::$use_transparent_text
+   * @var int
+   */
+  var $text_transparency_percentage = 15;
+
+
+  // Line options
+
+  /**
+   * Draw vertical and horizontal lines on the image.
+   *
+   * @see Securimage::$line_color
+   * @see Securimage::$line_distance
+   * @see Securimage::$line_thickness
+   * @see Securimage::$draw_lines_over_text
+   * @var boolean
+   */
+  var $draw_lines = true;
+
+  /**
+   * The color of the lines drawn on the image.<br />
+   * Use HTML hex format with preceding # sign.
+   *
+   * @see Securimage::$draw_lines
+   * @var string
+   */
+  var $line_color = "#80BFFF";
+
+  /**
+   * How far apart to space the lines from eachother in pixels.
+   *
+   * @see Securimage::$draw_lines
+   * @var int
+   */
+  var $line_distance = 5;
+
+  /**
+   * How thick to draw the lines in pixels.<br />
+   * 1-3 is ideal depending on distance
+   *
+   * @see Securimage::$draw_lines
+   * @see Securimage::$line_distance
+   * @var int
+   */
+  var $line_thickness = 1;
+
+  /**
+   * Set to true to draw angled lines on the image in addition to the horizontal and vertical lines.
+   *
+   * @see Securimage::$draw_lines
+   * @var boolean
+   */
+  var $draw_angled_lines = false;
+
+  /**
+   * Draw the lines over the text.<br />
+   * If fales lines will be drawn before putting the text on the image.<br />
+   * This can make the image hard for humans to read depending on the line thickness and distance.
+   *
+   * @var boolean
+   */
+  var $draw_lines_over_text = false;
+
+  /**
+   * For added security, it is a good idea to draw arced lines over the letters to make it harder for bots to segment the letters.<br />
+   * Two arced lines will be drawn over the text on each side of the image.<br />
+   * This is currently expirimental and may be off in certain configurations.
+   *
+   * @var boolean
+   */
+  var $arc_linethrough = true;
+
+  /**
+   * The colors or color of the arced lines.<br />
+   * Use HTML hex notation with preceding # sign, and separate each value with a comma.<br />
+   * This should be similar to your font color for single color images.
+   *
+   * @var string
+   */
+  var $arc_line_colors = "#8080ff";
+
+  /**
+   * Full path to the WAV files to use to make the audio files, include trailing /.<br />
+   * Name Files  [A-Z0-9].wav
+   *
+   * @since 1.0.1
+   * @var string
+   */
+  var $audio_path = './audio/';
+
+
+  //END USER CONFIGURATION
+  //There should be no need to edit below unless you really know what you are doing.
+
+  /**
+   * The gd image resource.
+   *
+   * @access private
+   * @var resource
+   */
+  var $im;
+
+  /**
+   * The background image resource
+   *
+   * @access private
+   * @var resource
+   */
+  var $bgimg;
+
+  /**
+   * The code generated by the script
+   *
+   * @access private
+   * @var string
+   */
+  var $code;
+
+  /**
+   * The code that was entered by the user
+   *
+   * @access private
+   * @var string
+   */
+  var $code_entered;
+
+  /**
+   * Whether or not the correct code was entered
+   *
+   * @access private
+   * @var boolean
+   */
+  var $correct_code;
+
+  /**
+   * Class constructor.<br />
+   * Because the class uses sessions, this will attempt to start a session if there is no previous one.<br />
+   * If you do not start a session before calling the class, the constructor must be called before any
+   * output is sent to the browser.
+   *
+   * <code>
+   *   $securimage = new Securimage();
+   * </code>
+   *
+   */
+  function Securimage()
+  {
+     $this->gd_font_file =EGW_SERVER_ROOT.'/etemplate/templates/default/gdfonts/automatic.gdf';
+	 $this->audio_path=EGW_SERVER_ROOT.'/etemplate/templates/default/audio/';
+    $this->wordlist_file=EGW_SERVER_ROOT.	'/etemplate/templates/default/words/words.txt';
+	
+	
+	if ( session_id() == '' ) { // no session has been started yet, which is needed for validation
+      session_start();
+    }
+  }
+
+  /**
+   * Generate a code and output the image to the browser.
+   *
+   * <code>
+   *   <?php
+   *   include 'securimage.php';
+   *   $securimage = new Securimage();
+   *   $securimage->show('bg.jpg');
+   *   ?>
+   * </code>
+   *
+   * @param string $background_image  The path to an image to use as the background for the CAPTCHA
+   */
+  function show($background_image = "")
+  {
+    if($background_image != "" && is_readable($background_image)) {
+      $this->bgimg = $background_image;
+    }
+
+    $this->doImage();
+  }
+
+  /**
+   * Validate the code entered by the user.
+   *
+   * <code>
+   *   $code = $_POST['code'];
+   *   if ($securimage->check($code) == false) {
+   *     die("Sorry, the code entered did not match.");
+   *   } else {
+   *     $valid = true;
+   *   }
+   * </code>
+   * @param string $code  The code the user entered
+   * @return boolean  true if the code was correct, false if not
+   */
+  function check($code)
+  {
+    $this->code_entered = $code;
+    $this->validate();
+    return $this->correct_code;
+  }
+
+  /**
+   * Generate and output the image
+   *
+   * @access private
+   *
+   */
+  function doImage()
+  {
+    if($this->use_transparent_text == true || $this->bgimg != "") {
+      $this->im = imagecreatetruecolor($this->image_width, $this->image_height);
+      $bgcolor = imagecolorallocate($this->im, hexdec(substr($this->image_bg_color, 1, 2)), hexdec(substr($this->image_bg_color, 3, 2)), hexdec(substr($this->image_bg_color, 5, 2)));
+      imagefilledrectangle($this->im, 0, 0, imagesx($this->im), imagesy($this->im), $bgcolor);
+    } else { //no transparency
+      $this->im = imagecreate($this->image_width, $this->image_height);
+      $bgcolor = imagecolorallocate($this->im, hexdec(substr($this->image_bg_color, 1, 2)), hexdec(substr($this->image_bg_color, 3, 2)), hexdec(substr($this->image_bg_color, 5, 2)));
+    }
+
+    if($this->bgimg != "") { $this->setBackground(); }
+
+    $this->createCode();
+
+    if (!$this->draw_lines_over_text && $this->draw_lines) $this->drawLines();
+//print_r(get_defined_constants());die();
+//print_r($this->code.'dddd');die();
+    $this->drawWord();
+
+    if ($this->arc_linethrough == true) $this->arcLines();
+
+    if ($this->draw_lines_over_text && $this->draw_lines) $this->drawLines();
+
+    $this->output();
+
+  }
+
+  /**
+   * Set the background of the CAPTCHA image
+   *
+   * @access private
+   *
+   */
+  function setBackground()
+  {
+    $dat = @getimagesize($this->bgimg);
+    if($dat == false) { return; }
+
+    switch($dat[2]) {
+      case 1:  $newim = @imagecreatefromgif($this->bgimg); break;
+      case 2:  $newim = @imagecreatefromjpeg($this->bgimg); break;
+      case 3:  $newim = @imagecreatefrompng($this->bgimg); break;
+      case 15: $newim = @imagecreatefromwbmp($this->bgimg); break;
+      case 16: $newim = @imagecreatefromxbm($this->bgimg); break;
+      default: return;
+    }
+
+    if(!$newim) return;
+
+    imagecopy($this->im, $newim, 0, 0, 0, 0, $this->image_width, $this->image_height);
+  }
+
+  /**
+   * Draw arced lines over the text
+   *
+   * @access private
+   *
+   */
+  function arcLines()
+  {
+    $colors = explode(',', $this->arc_line_colors);
+    imagesetthickness($this->im, 3);
+
+    $color = $colors[rand(0, sizeof($colors) - 1)];
+    $linecolor = imagecolorallocate($this->im, hexdec(substr($color, 1, 2)), hexdec(substr($color, 3, 2)), hexdec(substr($color, 5, 2)));
+
+    $xpos   = $this->text_x_start + ($this->font_size * 2) + rand(-5, 5);
+    $width  = $this->image_width / 2.66 + rand(3, 10);
+    $height = $this->font_size * 2.14 - rand(3, 10);
+
+    if ( rand(0,100) % 2 == 0 ) {
+      $start = rand(0,66);
+      $ypos  = $this->image_height / 2 - rand(5, 15);
+      $xpos += rand(5, 15);
+    } else {
+      $start = rand(180, 246);
+      $ypos  = $this->image_height / 2 + rand(5, 15);
+    }
+
+    $end = $start + rand(75, 110);
+
+    imagearc($this->im, $xpos, $ypos, $width, $height, $start, $end, $linecolor);
+
+    $color = $colors[rand(0, sizeof($colors) - 1)];
+    $linecolor = imagecolorallocate($this->im, hexdec(substr($color, 1, 2)), hexdec(substr($color, 3, 2)), hexdec(substr($color, 5, 2)));
+
+    if ( rand(1,75) % 2 == 0 ) {
+      $start = rand(45, 111);
+      $ypos  = $this->image_height / 2 - rand(5, 15);
+      $xpos += rand(5, 15);
+    } else {
+      $start = rand(200, 250);
+      $ypos  = $this->image_height / 2 + rand(5, 15);
+    }
+
+    $end = $start + rand(75, 100);
+
+    imagearc($this->im, $this->image_width * .75, $ypos, $width, $height, $start, $end, $linecolor);
+  }
+
+  /**
+   * Draw lines on the image
+   *
+   * @access private
+   *
+   */
+  function drawLines()
+  {
+    $linecolor = imagecolorallocate($this->im, hexdec(substr($this->line_color, 1, 2)), hexdec(substr($this->line_color, 3, 2)), hexdec(substr($this->line_color, 5, 2)));
+    imagesetthickness($this->im, $this->line_thickness);
+
+    //vertical lines
+    for($x = 1; $x < $this->image_width; $x += $this->line_distance) {
+      imageline($this->im, $x, 0, $x, $this->image_height, $linecolor);
+    }
+
+    //horizontal lines
+    for($y = 11; $y < $this->image_height; $y += $this->line_distance) {
+      imageline($this->im, 0, $y, $this->image_width, $y, $linecolor);
+    }
+
+    if ($this->draw_angled_lines == true) {
+      for ($x = -($this->image_height); $x < $this->image_width; $x += $this->line_distance) {
+        imageline($this->im, $x, 0, $x + $this->image_height, $this->image_height, $linecolor);
+      }
+
+      for ($x = $this->image_width + $this->image_height; $x > 0; $x -= $this->line_distance) {
+        imageline($this->im, $x, 0, $x - $this->image_height, $this->image_height, $linecolor);
+      }
+    }
+  }
+
+  /**
+   * Draw the CAPTCHA code over the image
+   *
+   * @access private
+   *
+   */
+  function drawWord()
+  {
+    if ($this->use_gd_font == true) {
+      if (!is_int($this->gd_font_file)) { //is a file name
+        $font = @imageloadfont($this->gd_font_file);
+        if ($font == false) {
+          trigger_error("Failed to load GD Font file {$this->gd_font_file} ", E_USER_WARNING);
+          return;
+        }
+      } else { //gd font identifier
+        $font = $this->gd_font_file;
+      }
+
+      $color = imagecolorallocate($this->im, hexdec(substr($this->text_color, 1, 2)), hexdec(substr($this->text_color, 3, 2)), hexdec(substr($this->text_color, 5, 2)));
+      imagestring($this->im, $font, $this->text_x_start, ($this->image_height / 2) - ($this->gd_font_size / 2), $this->code, $color);
+
+    } else { //ttf font
+      if($this->use_transparent_text == true) {
+        $alpha = intval($this->text_transparency_percentage / 100 * 127);
+        $font_color = imagecolorallocatealpha($this->im, hexdec(substr($this->text_color, 1, 2)), hexdec(substr($this->text_color, 3, 2)), hexdec(substr($this->text_color, 5, 2)), $alpha);
+      } else { //no transparency
+        $font_color = imagecolorallocate($this->im, hexdec(substr($this->text_color, 1, 2)), hexdec(substr($this->text_color, 3, 2)), hexdec(substr($this->text_color, 5, 2)));
+      }
+
+      $x = $this->text_x_start;
+      $strlen = strlen($this->code);
+      $y_min = ($this->image_height / 2) + ($this->font_size / 2) - 2;
+      $y_max = ($this->image_height / 2) + ($this->font_size / 2) + 2;
+      $colors = explode(',', $this->multi_text_color);
+
+      for($i = 0; $i < $strlen; ++$i) {
+        $angle = rand($this->text_angle_minimum, $this->text_angle_maximum);
+        $y = rand($y_min, $y_max);
+        if ($this->use_multi_text == true) {
+          $idx = rand(0, sizeof($colors) - 1);
+          $r = substr($colors[$idx], 1, 2);
+          $g = substr($colors[$idx], 3, 2);
+          $b = substr($colors[$idx], 5, 2);
+          if($this->use_transparent_text == true) {
+            $font_color = imagecolorallocatealpha($this->im, "0x$r", "0x$g", "0x$b", $alpha);
+          } else {
+            $font_color = imagecolorallocate($this->im, "0x$r", "0x$g", "0x$b");
+          }
+        }
+        @imagettftext($this->im, $this->font_size, $angle, $x, $y, $font_color, $this->ttf_file, $this->code{$i});
+
+        $x += rand($this->text_minimum_distance, $this->text_maximum_distance);
+      } //for loop
+    } //else ttf font
+  } //function
+
+  /**
+   * Create a code and save to the session
+   *
+   * @since 1.0.1
+   *
+   */
+  function createCode()
+  {
+    $this->code = false;
+
+    if ($this->use_wordlist && is_readable($this->wordlist_file)) {
+      $this->code = $this->readCodeFromFile();
+    }
+
+    if ($this->code == false) {
+      $this->code = $this->generateCode($this->code_length);
+    }
+
+    $this->saveData();
+  }
+
+  /**
+   * Generate a code
+   *
+
+   * @access private
+   * @param int $len  The code length
+   * @return string
+   */
+  function generateCode($len)
+  {
+    $code = '';
+
+    for($i = 1, $cslen = strlen($this->charset); $i <= $len; ++$i) {
+      $code .= strtoupper( $this->charset{rand(0, $cslen - 1)} );
+    }
+    return $code;
+  }
+
+  /**
+   * Reads a word list file to get a code
+   *
+   * @access private
+   * @since 1.0.2
+   * @return mixed  false on failure, a word on success
+   */
+  function readCodeFromFile()
+  {
+    $fp = @fopen($this->wordlist_file, 'rb');
+    if (!$fp) return false;
+
+    $fsize = filesize($this->wordlist_file);
+    if ($fsize < 32) return false; // too small of a list to be effective
+
+    if ($fsize < 128) {
+      $max = $fsize; // still pretty small but changes the range of seeking
+    } else {
+      $max = 128;
+    }
+
+    fseek($fp, rand(0, $fsize - $max), SEEK_SET);
+    $data = fread($fp, 128); // read a random 128 bytes from file
+    fclose($fp);
+    $data = preg_replace("/\r?\n/", "\n", $data);
+
+    $start = strpos($data, "\n", rand(0, 100)) + 1; // random start position
+    $end   = strpos($data, "\n", $start);           // find end of word
+
+    return strtolower(substr($data, $start, $end - $start)); // return substring in 128 bytes
+  }
+
+  /**
+   * Output image to the browser
+   *
+   * @access private
+   *
+   */
+  function output()
+  {
+    header("Expires: Sun, 1 Jan 2000 12:00:00 GMT");
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . "GMT");
+    header("Cache-Control: no-store, no-cache, must-revalidate");
+    header("Cache-Control: post-check=0, pre-check=0", false);
+    header("Pragma: no-cache");
+
+    switch($this->image_type)
+    {
+      case SI_IMAGE_JPEG:
+        header("Content-Type: image/jpeg");
+        imagejpeg($this->im, null, 90);
+        break;
+
+      case SI_IMAGE_GIF:
+        header("Content-Type: image/gif");
+        imagegif($this->im);
+        break;
+
+      default:
+        header("Content-Type: image/png");
+        imagepng($this->im);
+        break;
+    }
+
+    imagedestroy($this->im);
+  }
+
+  /**
+   * Get WAV file data of the spoken code.<br />
+   * This is appropriate for output to the browser as audio/x-wav
+   *
+   * @since 1.0.1
+   * @return string  WAV data
+   *
+   */
+  function getAudibleCode()
+  {
+    $letters = array();
+    $code    = $this->getCode();
+//print_r($code );die();
+    if ($code == '') {
+      $this->createCode();
+      $code = $this->getCode();
+    }
+
+    for($i = 0; $i < strlen($code); ++$i) {
+      $letters[] = $code{$i};
+    }
+
+    return $this->generateWAV($letters);
+  }
+
+  /**
+   * Save the code in the session
+   *
+   * @access private
+   *
+   */
+  function saveData()
+  {
+    $_SESSION['securimage_code_value'] = strtolower($this->code);
+  }
+
+  /**
+   * Validate the code to the user code
+   *
+   * @access private
+   *
+   */
+  function validate()
+  {
+    if ( isset($_SESSION['securimage_code_value']) && !empty($_SESSION['securimage_code_value']) ) {
+      if ( $_SESSION['securimage_code_value'] == strtolower(trim($this->code_entered)) ) {
+        $this->correct_code = true;
+        $_SESSION['securimage_code_value'] = '';
+      } else {
+        $this->correct_code = false;
+      }
+    } else {
+      $this->correct_code = false;
+    }
+  }
+
+  /**
+   * Get the captcha code
+   *
+   * @since 1.0.1
+   * @return string
+   */
+  function getCode()
+  {
+    if (isset($_SESSION['securimage_code_value']) && !empty($_SESSION['securimage_code_value'])) {
+      return $_SESSION['securimage_code_value'];
+    } else {
+      return '';
+    }
+  }
+
+  /**
+   * Check if the user entered code was correct
+   *
+   * @access private
+   * @return boolean
+   */
+  function checkCode()
+  {
+    return $this->correct_code;
+  }
+
+  /**
+   * Generate a wav file by concatenating individual files
+   * @since 1.0.1
+   * @access private
+   * @param array $letters  Array of letters to build a file from
+   * @return string  WAV file data
+   */
+  function generateWAV($letters)
+  {
+  
+      $fields = join('/',array( 'H8ChunkID', 'VChunkSize', 'H8Format',
+                              'H8Subchunk1ID', 'VSubchunk1Size',
+                              'vAudioFormat', 'vNumChannels', 'VSampleRate',
+                              'VByteRate', 'vBlockAlign', 'vBitsPerSample' ));
+    $data = '';
+$count=0;
+    foreach($letters as $letter){
+        
+		//print($count);
+		//if($count!=4){$count++;continue;} 
+		$fname=$this->audio_path . strtoupper($letter) . '.wav';
+		$fp     = fopen($fname,'rb');
+        $header = fread($fp,36);
+        $info   = unpack($fields,$header);
+//print_r($info);
+        // read optional extra stuff
+        if($info['Subchunk1Size'] > 16){
+            $header .= fread($fp,($info['Subchunk1Size']-16));
+        }
+        // read SubChunk2ID
+        $header .= fread($fp,4);
+        // read Subchunk2Size
+        $sizeArray  = unpack('Vsize',fread($fp, 4));
+        $size  += $sizeArray['size'];
+//print('print:'.$size.'<br>');
+        // read data
+        $data .= fread($fp,$sizeArray['size']);
+//print($count);
+
+//print_r($size.'<br>');
+ 		fclose($fp);
+    }
+    return $header.pack('V',$size).$data;//
+}
+ /*   $first = true; // use first file to write the header...
+    $data_len    = 0;
+    $files       = array();
+    $out_data    = '';
+
+    foreach ($letters as $letter) {
+      $filename = $this->audio_path . strtoupper($letter) . '.wav';
+//print($filename.'<br>');
+      $fp = fopen($filename, 'rb');
+
+      $file = array();
+
+      $data = fread($fp, filesize($filename)); // read file in
+//print($data.'<br>');
+      $header = substr($data, 0, 36);
+      $body   = substr($data, 44);
+
+
+      $data = unpack('NChunkID/VChunkSize/NFormat/NSubChunk1ID/VSubChunk1Size/vAudioFormat/vNumChannels/VSampleRate/VByteRate/vBlockAlign/vBitsPerSample', $header);
+
+      $file['sub_chunk1_id']   = $data['SubChunk1ID'];
+      $file['bits_per_sample'] = $data['BitsPerSample'];
+      $file['channels']        = $data['NumChannels'];
+      $file['format']          = $data['AudioFormat'];
+      $file['sample_rate']     = $data['SampleRate'];
+      $file['size']            = $data['ChunkSize'] + 8;
+      $file['data']            = $body;
+
+//      if ( ($p = strpos($file['data'], 'LIST')) !== false) {
+//        // If the LIST data is not at the end of the file, this will probably break your sound file
+//        $info         = substr($file['data'], $p + 4, 8);
+//        $data         = unpack('Vlength/Vjunk', $info);
+//        $file['data'] = substr($file['data'], 0, $p);
+//        $file['size'] = $file['size'] - (strlen($file['data']) - $p);
+//      }
+
+      $files[] = $file;
+      $data    = null;
+      $header  = null;
+      $body    = null;
+
+      $data_len += strlen($file['data']);
+
+      fclose($fp);
+    }
+	$data_len += strlen($file['data']);
+	$data_len += strlen($file['data']);
+//print_r($files);
+    $out_data = '';
+    for($i = 0; $i < sizeof($files); ++$i) {
+      if ($i == 0) { // output header
+        $out_data .= pack('C4VC8', ord('R'), ord('I'), ord('F'), ord('F'), $data_len + 36, ord('W'), ord('A'), ord('V'), ord('E'), ord('f'), ord('m'), ord('t'), ord(' '));
+
+        $out_data .= pack('VvvVVvv',
+                          16,
+                          $files[$i]['format'],
+                          $files[$i]['channels'],
+                          $files[$i]['sample_rate'],
+                          $files[$i]['sample_rate'] * (($files[$i]['bits_per_sample'] * $files[$i]['channels']) / 8),
+                          ($files[$i]['bits_per_sample'] * $files[$i]['channels']) / 8,
+                          $files[$i]['bits_per_sample'] );
+
+        $out_data .= pack('C4', ord('d'), ord('a'), ord('t'), ord('a'));
+
+        $out_data .= pack('V', $data_len);
+      }
+
+      $out_data .= $files[$i]['data'];
+    }
+//print_r($out_data);die();
+    return $out_data;
+  }*/
+} /* class Securimage */
diff --git a/etemplate/setup/etemplates.inc.php b/etemplate/setup/etemplates.inc.php
index 763474f244..cd2847f747 100644
--- a/etemplate/setup/etemplates.inc.php
+++ b/etemplate/setup/etemplates.inc.php
@@ -324,3 +324,4 @@ $templ_data[] = array('name' => 'etemplate.vbox.test','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'etemplate.xslt_widget.test','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:7:{s:4:"type";s:4:"xslt";s:4:"size";s:14:"etemplate.test";s:4:"span";s:5:",test";s:5:"label";s:4:"Test";s:4:"name";s:4:"test";s:8:"readonly";s:1:"1";s:4:"help";s:22:"This is a help message";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1033497079',);
 
+$templ_data[] = array('name' => 'etemplate.captcha_widget','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c1";s:7:",bottom";s:2:"c2";s:4:",top";s:2:"h3";s:10:",!@val_msg";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:25:"etemplate/securimage_show";s:4:"size";s:14:",,,,show_image";}s:1:"B";a:2:{s:4:"type";s:5:"image";s:4:"name";s:24:"etemplate/audio_icon.gif";}}i:2;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:12:"captcha_code";s:4:"size";s:2:"24";s:6:"needed";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"image";s:4:"name";s:21:"etemplate/refresh.gif";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:7:"val_msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:4:"size";s:8:",,0,,0,0";s:7:"options";a:3:{i:4;s:1:"0";i:5;s:1:"0";i:2;s:1:"0";}}}','size' => ',,0,,0,0','style' => '','modified' => '1245517015',);
diff --git a/etemplate/templates/default/audio/0.wav b/etemplate/templates/default/audio/0.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b01b8dd9476a3e50e1fd810c537cdedee0620783
GIT binary patch
literal 22158
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
VwsXwz5#n<DQbXTmp|1*=_aB&iyhQ*2

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/1.wav b/etemplate/templates/default/audio/1.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f37f81e758549b9587b39dceb61c624cfeb970ac
GIT binary patch
literal 22158
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%0A9j*uBlY!q=Uzph3cLAzSjupXBnIirP--oP1Ts
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
ZCeNRnH>~iUWOVVA$yfOd`722t{U4Nq#25eo

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/2.wav b/etemplate/templates/default/audio/2.wav
new file mode 100644
index 0000000000000000000000000000000000000000..66ed235afc4cd20c5c5266f861c84251b865d093
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/3.wav b/etemplate/templates/default/audio/3.wav
new file mode 100644
index 0000000000000000000000000000000000000000..45bb85fa4b10be296a2376450baddad5751739cc
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/4.wav b/etemplate/templates/default/audio/4.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b21bb652307bd91026d5d724247ddc0278cb6787
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/5.wav b/etemplate/templates/default/audio/5.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b7654b0f10a39763e197e298f397e3e1eb6d73ce
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/6.wav b/etemplate/templates/default/audio/6.wav
new file mode 100644
index 0000000000000000000000000000000000000000..a8a23ad762b6ab30ae061aad290b94ada30318a4
GIT binary patch
literal 22158
zcmds<Wq6fW)9+{PcmhdCf+o0ok>c(YZJ|hUDN<aD7Kc*2IFurV;_mM5P+WscaEX!Z
zHSg~x4{x7yov-K9$-W5Ld*8CwtdalxXV(2)&1%(ZG!kiCu~F3y-TGz<5fQ^HMP89C
zeD0E9K55^kZyV>`9oxpn>0-I5WwnECXY0!x@s}g=Nfw%4<%)e^SGYUa;u0Ve%-3e8
zj+4!*)>GGLU+E&jCPu!OUnP^7tFLT7`Bs+7Hu*zSNSqeY=h{t6X%6{IZ)r#QL5u57
zJ#V|}9c^Ii+u2%JpV=C6MiR7%Hj#%?&7?GYbgme4T(9bG-UplU8fVAI4Gq+fc8|@g
z;gZgzV>Ea5i5+gA*~aR&=j|)aYlcb@36)*)N<5{woMKGpbg8{#*J>&0s|WS8{H^_M
zHN7NFCAZ$x`#M@im>ja0u_elSxvop~SG}P>ah2J&i>{W&I>9E>Z#iP7PBg70N_XgU
zo8JVQ96D4dNoQtx#m2a6>JnWgKf0cB<}g{r^^Wp?ptP|0?Kb;^j+Jv#P0nh0U9NQ{
zUL))RyW5PH-Fik^XsA>&#U$K}l?!&I=9VK`PUEzJtA^<-i{%?#hP=<~F=-<?Bt)v4
zDRRVqw5J)X)#Nf$Ur9|lWDn|0IW8yVmR8h%WR@JW3-ziT;EXp~4>{je7xNjRZ6%$o
z&{48gzmk=5-|nzabe_zztKC=if^^XDbr7rft8}s*ZD(ZLQ&rb$Gu^B2HNQsNpY3<H
z7_*-!nOr+0wa(SN%;~LWaCg_2y4-Fxg-jc{V>-xl-6i?tJN=*yMdgvSwBt0b+_I}>
z2$Gy&mWm(O%c0TQRr_mWvr9Ihi967_B3i>tFhk_DB$LKAkMuG>%O{;=AKJCDR=3+r
z>Vtk>G8eRmp3~ztjcye$R}a@>8LDrjiTt8Pq`l16fvj|0?IDBoq6{-twSqR%qPj_Q
znv<GK>+oGKiIO0xEeG{G-EBi;gS@dzkU;^hEv2-Lo{|Z&Nw?`D9j8HNqRGvA&o+Lp
z{nA>>$sy*}5$))rMdh{RVvNhMowBk>3TqB6%L@O^H@j?cO(UVUiLNtV@=>3gH?l=j
zbI;W_t+v*Wx?XPB8ro96me;z@p0>+1udLUZcAAtlG1gb^OMSBejjw8|nzm9wd`y&D
z+ea?TPAO}SNCT-WPxZ0>pvRE;TK!8;YA7;#FN37K?9=tke+TPc0$G*QG5Vvdlfh^}
zG4#tDy9<*P@&f&D&nz!<@1r_c&YK&OiSgvu>RhdmnTCG8mPzPdf~_hqwW{PapLC$E
zl}_e{*0r<jchX;CbcB4XM!nTjYpK7MW^LoFOEU|r%$i)Z9!O`u`pZN0lJTOtTAS)%
z&0!|U@47*&u_}|~kxtR6Qp31pmG;*9dPFDa06i(Ejfl5CWvtEdXZN+HY{HkFu$vkC
z0o%kpmh@80+>+{g2pJB<62|M_c!)poQctwBRFMIaRZ1|w@lxJ&)gXz+@4dE0ck3@$
zY!|Jf`}A)O7C&=9F6j?)OMZ}|5`ix}FF84PyZ&ac;t5|c>R|m%SJ@8u%I|EL8Do;;
z=c4Ud`B{SO09{}n>Qy_;6n8Z;bEFB!C)g%<r?K{wEh8VzGI_;Of7uAlCap9Bmf1r0
z=mpcvl+kIrQ5Q)oIcwu>K0RfJ%3`jzNZX;QB0X8XMN&i3v0k?s<0eK`M!u8Va#Fvt
zcaVOlPLq{-*j}`y(17AnnEPMQd{R?|yB*SAnnw<6eXKJ==F8vmSl`%*>M8H-I-Mi6
zu=h^-lX{zZx?k_%?G{O-48$)rXT`peuT521qgnAs;S$d3WJl8H(XIsjUMir2@3Dlm
zx{<Ng(Bo3a_(@6ikSs{Lqb$@1Iz%c;LpjA?6?Be{lnycuEnI-?C*b`~VWEF<_Xo`V
z7mb&1%|xjrL%CaP$tE#29roMbHn6YlT)UFdU(_@vE%!ED|0FU?j+cC;-EDE(4lh5^
z4wh+}Q6rgi8?D9hLu8C>(=K+t-jqZ=XX=^hnt{J+ur?);=`$T_Mwu+)*7WAOY_bRK
zeYqi3%p}=qU)e-!B$sK$NDgZ(UNjS06DvLBA0#kLus*FMo8_`LmWk4x$hcOLnMif(
zJoUoY6qXeD$P4-{65b`L%noe+H?40QNj-B|9^fm!G5N5LmB^-vX-70&CV!!|wXw+<
zIiSsLeSGP4sjTU>gI2J;S&dD2`BXApdYa?-#CkH0$T>#K%VCboCAH+Jc`c2I$=i|S
zCs{%asz|H~GQZ&;Lh)1m<bY`*-H3;xH?6n%T}IoY@)nEw1>I3%!z$^G2lzo2+V8ZQ
z+0JV1LCXErrK7Ra+C<F9c(AL?uDMjzopz19!=L<tr3}#H`ohj2O64F@zO$u?9^>p{
z;^9ec#NDsiecIa`Gv3lvf7eaK+=cR^&enDMhkdUVB^Z>Em3i;Q3lGM2b7>@U_|2l5
ztUwm?2i9K;4|-3=;^lhkdVAO&wfk&lU0^Hd1dzaTGvDMwudmw`@`RPRp~=kzqM8S~
z>m%QpGp3e&t%uOVF*X%ZJj!;^rc#brlvdBHzbTIfgh@6NPV^apcRGR3I4Dm|ezQ`h
z*-q&C9Gg$B$Q$<<J5RG|ch=&9J;y2!kn`xFr{1?98QYDsU!rqOwIBYgBzPy>Ol1rY
zh&72Iga)912=h)iOMWvEZ~2&cUDvLz>ZS|h``R8u`|E)Uu4ps-%^N(+aQ%lU_l;RD
zm(4jdQ>#cFS*Ek`%6sH{Wc{a(!n1AB2w94^TOnid$ED=4%|MhNZab=%@x)pVV2gD%
zfp}g74H|{-duYSeg+&d;w`4RvGTv4-jm#?a?kAltL9P{ON>+0Z-&a<uXbt?ud|idr
z7qHQImA-h97TQ_;B%2PkJMAKTcX{byDr#}N%igrNh{`wZW02295KJ)>iw9~XMYRmN
zKZ8}ch`zOy(wyI2<}lyYGDYW03-hZ^)Czd6hM<;8#!W<?h7Ve-5!&09l&M7C-{ies
z!f*NMEA+=3pL*Qp0;@XcV?HtV7@D+7``As~<-L8XlZ>}%ro-ieeyz*#Rpq3siINFi
zKU(Gy(PQ-;nh>v*z_od#pvfrB<d96#A-YrC<|Q&NLi|l5)3u%~!Io2)L-Ly}2Z_wb
zc6=DCL4sc9kyaLelgwlnLAz4xd>tdVOb2sRXXz37Sx>vIgu6a!Up-1xyn#(^WFBom
zF28Fmh{w-tWi3*g2IjaqY(DA>ahV*p3br*$7lK$j;e}Kq-D5OB8rjP>s~ITy^`Y5d
zw%L<f#5Gnwx%-2^?qba^#ZPv)w@4?~BT&~Xdylnki*FicyucGNGF5Ne%UW1|!EX%5
zOU0uhzt}zME0=5w*5(CBZwE2GAPByz^aT&)GIPN+@5vuNu#%_r9A3DX86d0OQ}KbR
z<c@5VEwWm>>miwJTAHQA*UXX$Pu!YFR#Zauh%H5w@d1rY(_HcuXekUlzYCNeNR00w
zr_}>XXu-^1>s|0ku%stW%*Laf1CgfFIc|Twi;rlEmEK4Dnws{m{xZY<t&>3LhjqF;
ztDIm(b4dYwPL#po<h?0r)=3+z@GB`pPBKb1Xc|y=1#JrkDK8@=2X<NqbX*kOj<?fv
zD4u2%5wn!8wTFpT$+fkdK(}tmMy-QYZ_#_qtb|!Bx7E|E*S>bF&LEE|Ap<qPv;dEf
zV@01xN@O%#=9nPk%;E}BE~`{DXS5GCxKUD?QuvF!M59yK`B2Sf@8j`j>0zSlcc6pw
zcDdcGzmQkm#xuSlUNu1m&A=tKKwi)7Mtsrl5^u*!Lvx7;v<y$3nfdk8n);2oiQhN{
z0-ivGcn1dD2Oc|t7x|mG^4dn2r})oh;E~sO_gb0~>>Z?O$sLZ_-kOQH(NfkimW{-k
z%&g5^uwz=H<SD#CLkS^67_Z~ZQ!v!G(%-C-E%pVr{LmiK;-&~u_Jy(1lXaUc1IQU3
z>vm!z2*$QSZ@YnDnjoi0G;Iv{J)Jz0(h{KH1~ls^^XrZr%V-SvpcW`%8mm@L1MnxG
zhzf1=Az4iu`2+0zLc_42BcQz$V3u}hV{LrH5in>oy9TSy$NXz*cC%k9>S3_$2z6rB
zuX+vd*F_eHny+M(eJ-=e9lynE)Ha>XK|Ikm@a<{4K}KOC`{g)#(ulLtqT6e91-NLC
zbi{%@BoEoZMEvZ2xrx>H*RwW*$z)b)GVzcz%rpi0SR!aBUaygVdXvYx)yd8k{DOnv
zxANW-1pE|D_aTRR!_ohK!=L|;f8v>CJg->1Z2}o(98$Kt5;T#2&TluFqw<&g^UE2d
z7b7%c8L2lf5B~Y`@?*T-eCLOD`0>AsBMiS?{OyZ21$;i*hwqZ{-iw#vTu;9DWKK#x
z;K3(8|2fb3#yQ)Y-=7%cTQvP0UMrq|(Twrq=YP@qi4n&!`VXIH5X-0U`Q911o6Oab
zrf^+nWG=3x|Cxm|cIWPXjLI3gKSwzKJEL*FaYpRN_eqj>j!K5@Mo0!;DL5vPyS>pU
zJfbr$=Z=ZIVu(F&xO39A{n6vRVC*o7<;eG+<ra(WzGbFi$jBL6GF}OI(=&YThrFIM
zk7RtCoO5oX*D)Lu#LJOQM)-{qT+xx72iW2onztEb`&z^B1mT>Wk7L~2e<u;7j#Nj>
zo`9n2$Q8zQ3+^HfNPjxsHW<d>CouR2{>~*`(ac}qM|_ddQQ~?%JwTT5y)<T)&lu}B
zjOQ&;^c1Lin100i=F4dAwhvD?lgQRbue#gt{Y8CC{#76RcMsdBW_obOD185)MD4+h
zyE{4maxm#>5Xm5ra%nt4HP$XOQRad^BBI<tDzRYQKGsit%^I#&8MNvT5}sin+XDKN
z%>v4*X>yu$4l*>aKw2a4j2_YpjCt8S!;|!sdr0^)dFNiq>~iZ?y&@a!SleB0+Pm(`
zps*-?WTNpGLu3lMbW@FXN83pATnvb|uuQ~D925_5#9QlcU&(GMg70iclzV`eNM`!k
z=BBjAA$W@hrZEy5DLt6YVQr@~&0SLoO}HVISeX|#CA?KxWIb1w+R}KUa6D8Y{AvI`
z=7^*)FY#zE>;+=#NxR<ewM}g_NT~?uvbUKGI^IfT6jRfTz%S*)zm&AYB#kMma0TwZ
zWD|Z`#cVW>@bi^TTUS-{9A8`vZ~iSg<^Xs+50edl*N1$nkzABnc%|QoYf<E<yJfEo
zvXSI`<aC<Z{w%{?DWn{_@__MKLynBp#}Qp8>d&BoDRvzr`$jxXQ*ycynn{Ke14hVR
zQ`n?3t#yZ8V=|gZ$!eOA10`x1*YBn;(R35Jp`Sgg?eW(e(5CrzH_TFNbhA6?W|UR~
zQ=XBWt{PHYi%TC<*%Sa#gvog9<qi?YN1|-Fy`#xYFc#6n)X>vt>2ytCoezNUlj}VD
z1{Bc)PrL|Q4+7~OhAa75_L7&ZwOPR|+3^@r+8B&KKw6qN<_hEc!;G*eY`EkBzy3~M
zo?N$MF_Vd+0q}kI(b<jI!*N{#a}<Jp1~S`3^6Y+E4xZ%~a*0EdhU-)WEr*g*HAa{7
zXcnm|&uj!aaf}usXT2vdo%pVYI>zNk>^}}_9qy{7eN89nVcVKOvajCY^Bs7X1?Hrk
zVMoFw{0Yz5SIWEc!|l}5()OfwMi>5auLVu-vE9upqIy+14BPUJ$qc?}VDD>MlZohD
z-8=%r-O_{ZMevoEv54)U@HVXQQsVncB%Q*nkj(Cp#HM}LTfTO;)`liInd=s!?*edm
zcQa5&f%zxd@4+WkV1G($Px)jg@LfS|Z}OQ#pxIaCX<O`6TSa|9{15D2-G`hOqm4Vz
zpf#G#U0vp5{kbF%PO^Zh$;!WXhuhiM+(>r^G;F=?DE@GvJ3Z=vk7Gfne}Xg9nOEfN
z$v~6qO&uitOngBp<*}oQ`YSmlo}T$lHV5%<*EECcnS{BD8aNx!crKX_CXTna@HK_u
zD+Ykl@{m<EBbV?%i#*AfJ;|ll%HJj!R53xGxO2k)wjgKTBOA<ZvsX9RD@2$v*zOpZ
ztZ>;X<7{2~kgRjD{-GyeZAxSB#X*(bLHLRI@1h!{7v0ZI5AExIZ_n6rt{g;?onRnu
za+=b_s50)`%;#%-#u)8v$J>E$uCe&8PvFm@u;*=A$DiD3?ORh1T(XRn+-hdHKiVj=
zKri^*=iugXFi(5o6prZ>d&E5mzTsE>nLI8GUolqJNGls{l4Bc_;OpHm&5yvTVdjR;
zcHbl~_a<gMh0_*2A>Vrpw~_9-prka&q5(Whplb-LI38Pip(jB|ukkf^^f{WI&g=y7
zj5pJ<)Jt%m+a!f6FDy=VWcZ%kZipPTUu$);lVfVgB!bLBqERqby4@9r51j$i7-C9*
z-LsiC`Za#CFE*1+_L%`>#}ncGL!_Sdgfoc5Lmq*f?nJZ+Gecd``W2b@bN$LZke=2T
z?%|S*Gk5UbE9_F~NGynjgY8F<&1n2=dDytD=BVV;-Y_`f=D9s)my<^Yxa#Rm_YwmB
zF~*d}UW3mIhaXvLb7IezVPI5>>F@R@xTP9qEKwz|84hPVTOUd<d(tj5zep$0Vs|jX
zBby&AU%<8^=bvs9iF^%AW#V;C_<$nP(OTXe*Lkib*h!+hA{o_v)*z+Klo$4Zer=xF
zLh5prlWwLQdEYJ=iaF#_^{~`x<o>VBBXhwXA?LZuO8-ioASKcCu6+g*QbB8b43&&T
z`GR<xEX2bCFkoZs5?Sv0X#XHPIB5I2N}B9&L6d-x9^}2<$S2dATlntra4#p#GBXKX
zyKaNYG5g?8hD(I2kw+?tbNgv#7@Qbc1y@$o<e}p86AV{xQ_6fTPi;yf!hL%M$rT|M
z=P@6s*u>lPW{{mHX-#U|n)nig9^c1is$tzN@LbPrA-q#h?)uaYvboJ%3%W7YncHZY
ztDVW>T7f`X+DN%3BQz(OYFoVhBioG3xfuE4VPfw(Gaojov(B|!$ZD>TOH6h@C$82d
z&ZUAk`BB!Ja5DSOrh=v+&l^k}m;&2!Trb-?t|@r>ie`wroz#b$i~xfdG2@9_xrvK)
z$d}vbX4{n<qol1R^WaAlh<TMge$(sjZm=MKaE+>D&{s5%IqU9Yeuo)82|rd}CR?{H
zi*<H{BPc>d+kjOx((=Zi96p)ZiC&Lz@5Ptb#qW-EFL#g7m9XT`$#HVxP1_UAh8SO%
zj1H{tH28#UQb?YP51CwkQ^m<r>?0ebv2H^~-Oj9m3EBi_<6*YgS+Id2=-;nu@KPnX
zUr(wC3D%R*&2s-{&VYCdnhbWjd7>F@X&AMFSY311Ce36F5wQre4TlZ<06)D0hHRJC
zHFsf^dfMsk!DKw^$#?@bowRhlg?T)vCD58eV6&^z3%e6D-QAkHQht*Ygf>bNZAN&6
z%QibcWe(`dlEB28IWW%?sk=<J)rid<>~FA++sQ+Jbsv_(Cc!Rnji9b_(-jZm%ufct
z-PAQ{?NM0`Pngnd(GNDzO!d5MLg1}i*eg=T9E8QoXlm<eb6M`$A|{Kg8ui1!;7b>p
zCMJ-&WJ?&=Y^=q4GTuwnzqY!6wArN@8U7u2PHF18Bjw>gz9WtV<44-#0cYZ;TElE4
zXg-gsW{zD9dh&!V&tfY|LA%3!*7XOreHKn(n7KwB!w0*m0lRe27M6Ohi$pz7*F9!D
z6l6OV)-j)HBn_;elyU{Rv*}+RuWe0Rh!`6JPwubZxy#xvM2d%0Py0ztd&2FuxouXs
zr{of!_}G2Pth7_zU8p8)(f#hhAlo-m%vB70w30|X9+_4FKc{nrcs!G8<o?@`M-Q0)
zAyU-Ul5_5p`$Q2vw@Y4o+pdFqI7EzDV;{h=on<z?-F2|yLkY(dgWbFAHCsQSYGQpX
zxUzlYZj@NveJ^o&;v9FJ`vujAj>L&XR~4^59{+e;_T1!|*1MC>J|9n??cOuI<Gj!K
zX7+pPlfpOF`>fY}uezQSJzjcjcg=%|J?m~~pL}W&8x&LY!_c=CUS5p)?nRU5L!R|~
zT;}neXW5<}cyj2aeU~bFN<uo%J-+*sWe@dFGbP<O>2GITl(Bw>Lg^<&>`u2K)%y?)
zN|k(7KwG~$Uei2Bc;@yv?@`FJohw!fN;{qJ?wJrCo9+G5Hyfh9dDQ++mzyPS_*~w9
zvH8V&S5n?f`6Tp3zYo50Gazedo^-DxmSyactx%Si8P<glNR>16VL&#IrFPP%R?z_;
z<3A*e9_L=|8R$DZFjLB>Y1d>(o9R}@5}6NYoE_dNRinT_p9oVlrp3!=PrUDk-pP4=
z?WH!C_g{{^JmYGnt6n#HMrMf8xL)A456Nn$?wT$k-QaX%QkO~fGHhDlINwa3JzY7a
zSNw>W-qGh{{`{2d(=fO785cYy<*l?a>0>ij$i6;nwhWKLr>3oxa#-+tpP|wvu}tim
zw+o+Ne{}uf#rrF6Z@M}6R;}CbZvS(0&ds#9mPNLCJ32mNY&Z8wznP&;Ql<-Ql6q^(
z!eRe}o=dKN8GP4zrZAC-TjOiQZ;zWCxAD^%cWIAJ{+)s+hBZx>m@#AKQ<+?ub7Wi{
zULy6r;7a~kz5cNo;ugLOdiDBQ$A^{gO^-BpSKQimtN88bH(p;~acgzt!dLm@JH`E?
z@BCYbEKIp4ta{3TRBclp4Vj$0i0=fi>|O(8`lsxl662=E?}{H1UrjT6EeJT8qFc)A
zX|H9RpS5z9-!fgukS?N8nh_~F2c-5st{vl2zU%X{_46W++df!zU+$faED;%TxAENt
zx4*ra<Id2i*qGIE1rjQH97#Sl^oNjhp(Rp|2zwBkDKNx$vu~_V4p(t^o`mpEzVUhE
zhklx7>v|OP_e!xbMfcQcGutekG7e0CH2t-7;i*!Gd<ZDyoyN5`{-<}pzbXB)>ytko
zE`Lz@{+zpY?)cojd%N7twl`<rx%cdc*wFa*al1S-q-Yd2Ammoq{M1Lo+J`m@dgeRR
zr=3@SGt8Yf;l!u;pK>RxNvNv9UjO*-2;LY{Jk@vUr)27up?rASh~we^r0f(F91!gF
zo&FL(_`~Hlb)qspx%nvc!J)`{_Yd9kjQlEc@9jdj8%3s#x)i-Lc5gx>@4tedg-i%;
zopN%j7b!}F+)cj7x2sQt=X5!jST&(jLcfGm2|p%8>U-}!fzMNP4_%pNP5NOO?}z`E
z?sj-&>Ng>C1H1V>@e0w&G4tP>x0RxrKHC4V=EL3ha^AZTdHv47I}`7`x-<5P@5h~S
zZQ|aEPx9p{E~FS8)+qJdkXwOM0uTE|_~iC#<k43;B<%RK;!}S28+S7e_Wh9TP4Y9r
z<x@vTWQ+(7KOa6SolR9XMOgB3evLeTwliYF-rsz)CTi-F>5s3WCok@-x!eA3x!dJ$
z^^OdCIWVSiOvtB;UM&J+f`<m33|XJrCp24Nj%2s}KKX3+$V8Ui+`e-^bnkTEbJy_P
z?Elj5X0oecQ`0U^7nr7g>N4rRPJ1qNL{M<@hrWNgo+O-&e))d;n}yFFJl4mHAN06C
z?B0#YIrnDXEqJ%(;~nqbNALdF%YDo5N?>^4v%n3Z=fm=+$dr7VzrX)TuXV1)t_pg~
zz0utlER@ybfL{y07yivtJPy4T`hCh?soSTz82VG_{g4ttE&axMRJW(&$3^?REgE(E
z>FXz#A3b_7{r=2*8Sl-%Kl0xA$FDzBkInw^QNj)1yg@sX{S}Zs<VsjnP^DyB19}8B
z^PT7U!4)IzL7=zfs_E`g!266}o@8~Cp9?A*G9mQa&|x9tLKdg!7<4iqtB;Q>nftH!
zhtV_M7I>L8%I|r-Cl4Ohc$Dq&lt<$qzJKKT^6kg#G4o<_yTg3;1}yO%=G!o^S8%E1
zfBN<Ho9jQrw~N<ZkMBKpyV|?H_2}X`$8)on+qYuCQUCY;3zHuWx)>Oc{HNp+xHaH_
z&+ncYOoY4Mr{}RLK7M+0?DcPNYQN6<qH@%Sm)l>Dc@^_=@Y@zKuJ}`NS3V8UeXc-{
z0UqCbUG%Q+Q_Sa)_fGG#-uZpr;>GWH_V#M&^Ow&FujgL<e3$we-#@)a``++7<$Khp
zvQKxP-@N;Hu5ne6!S1q&!xE~+yJOD8*w~G+&!V?RXN?Vun-*I<_I>P@xIyu^<2Qaf
zm=KycDDk@c8L?%L?Jvbm4LTK`m~tNTJX(58@rd%c$o<lKt@n)fJmmG-Yp!Q4k3Jp`
zJ@$J9dCYSyaBXy*cKN$LfQV|6Rb|y#Hr`#*mU8D$%;=uzuH;^txIZxu-1KsH8Fzxa
zyp|*$Znty5EO+3rme?|MQ*;MMzOlc85~om=i2_lbr1lUY#pD<jolEp8)gbrEVzQZW
z@M#64H`)Ge5Z@+{<qUYJHsDgH%VQx3=nTBUI_im~$jJtBOfUXjhoLA2Czz7+dXt3|
zlibv22hsyn9@OqlPSG9y>J6;=QK?GxrGvRj)m2P-5Yz#ftemEo$7I(`+b1C)@wKfY
zv9^|bo_mr$ATP;nee8Df>%U+Ome950RAD2jDI~y<c!2_IfUwViP4kkgbpb)GCv!Uj
zlUW89uM0JjkzjzE^ii!MtJ^_+@^A9j+His;sFK7pm(wu*C%N)y=F}KgJr@=6^ki9$
zbU5{>lQ1M{r3}@8!LVn2>Hqqh%w--m!<FQ+SLwF6O=h)&>mMUK97K*2M(yPQW2g?>
zo=Xd94A?aVwYYfl?C)Vz7Lf_w<f^G9HMycM6}>rBaJ#}9UZ#F~oNRwKpG<K$5*W%9
zaG;OL=~q+X*zHtendu2?BfF`^oF@zR25s#j<G%$~-otub0{3L2{+k0-K1yatCwep{
z3zcI!Z%UG(dcuLMM0(Ge`FN@w2RQQrXYS!%$zc&9`QJ_U=H{>4a5eAX+8>gW2Eif}
zVl~^qko`oprXklaONHNyEaV0CohyvyJlDL$S<gUTFF9Aq^!?$AefjM$)dJT+WsUDX
zGRj0ahtx2iMZl3osE-$9)F63!VP0^J3#{pBUT5HH?lan#oM}H_&mXoc1lA`xb8+}{
zhkbWgZiiX+WIX<?KpNQPh|i34IE=IpnV%a@`XyJ2<liIa=+qA4{=<Mfl?I1dM;W=A
z!}iB>wS>=ORQP=#UJh>`{GV4c-aGufQxEtEcl{1d^#eyc-Gg2n7se}?bqnOWo*eb*
z^EHzg`h?H-G{_@>ms25d<m16niOf&=?bI9G|2fK;O&~K3;9ub9;{fVh?*pTM%Y9$-
zdi(kAaeV4jOPn8P9?oz1eAT3DIb(CA<J20QT7>`S-_ER^A2&1kz;)jI=k@mU3OUsb
zAMPE9v{QT@MbcT0+>`F$$@Tm>A{pO0H4Go_;qm#JPUR$;5k~QP#VFq))tJvRa%vaO
ztevWZQ$uimXyRk^PTj%9XWo40@c7R6&V8H}c4QdC6=OcHj&rQST{$b`%e{jbqf@1D
z>KI?H=SVcE!jW`+-f(^A)1=Cc^S`ss&X037XYHKzaAf4L{mwj+UY{@dzrUO+iF2+q
zBB%cI<&|_5=MMkgHR-P;Y5ng7_~Xk8IkWrsC+VGY&m=h{-92d>&Zv^4>&VZk{`~vn
zjL7+MM&gVrX>88#FIw!3*O9Oz5$8BZ(n&vG#+vl*%T<#;bt+6>#`@)dXXMW3PJJk8
z^}ZbCeD*~zl8$!tCus#8-E;o>a_)a_&VOH|_T>}jz4LP3JCaNqkz*JC&M|3p&U~Ej
zoim*4{P#QOebTj^YkisHm;aOQ<&4GoNt#L0-;QP`X`oZZb4KjEb5<isubiWjuJZ4-
z{{73jmNV*qrOR7>lCGUJ4(Hn>`7^Blon_KdNymMWXVSYQNjl#r$<Vof(wLmjoOjMu
zl4Ox|J*UQ%WFHRW_3s)vTJx_a{@<fax}IYn&dbpyM`w~g{cnv)`XuT17wJ2)bnfMh
z*^yO}4@lDDBrlyL$uD#I_ZrT5Nj@WKY>tjPcT3XNq?P?|D|1%aIs5<Ao1}M+EdG05
z|LV_|`z4Ljxt|Ai?#L!d+DRjJ{Ep*896#w)Xq}^+**LTOas}re|Bk?syi)~sK5_2s
z{3NY!(m0&IoimfX&L=F=c_mq8EZ)rV+D?5o?z7c85#Y;xzG#i}-h5uUBx_2NZjz65
zytx18IOF(q=WnNa9LPWCw-Yy#{&M1$Qzvy^A)h_D^KDXXH>vWQw2q04Bj)pXJ`xSy
z5er`7y`O!4J%ML)5Wx*zx4<vgh|3p=_(@Uv1l6@uu)Ifk9iV!-4UDrx_k&a}fv&D{
z{C%$E4;JhLQVKBFT?4)Hdbjl4C<%$B6W%7Yw$D(OW@eLy+hOkHwvu+CLU$6m)r9Zu
zMVI_3@iluHbz}OIeCUAO$!KQ6Sbk+rxU6fnX|Ao@=Mzu5hf=W#GoxVNPEk?#NPl}p
z@Ms7%7%w{8Dl@vb$lu%Sb2ax2_WH^*yDN&yX&}dD0rC0Jo07ri;$2r*#dLIlGzGa0
z(nr$9Rm9`At1(@lJ?LAXYpXNc@#+in+yEx*0Vwb){n0(>a+*dBYAfen!8gqV$J~Ss
zJ4>fj4{Fzg>2gR-#i1sh5;xc_@En|19`y5sT23;MTt(_-55OtCKzBE&K4+nxH&Lh3
z5j358*gE>SdZAHwspr+BDm+|&M>mFnx!ZD125RNy!NVIr_YZFYdvDT$^pcgNf^Zg|
zv!Y~&1rDQAwI%0GgFVkAbL|Q$LU*}u16OldYY(tO*UctZ6|TRI+Gi+S?hmq(8ejuZ
za2M)K$zb5dald*p)Ldka73nQM2=iZxYF=|NVM$P2qL!nU_!Fr380*%Px_N3dn%<R-
zrairtJ7D6Tfwbq4OEgC>?qLV#>C*P6Ke(s4W;TOu&w@9b(>>k5mDQH8GvV4B(>vPA
zok@GU_JLm~f%Fg1t=Q1)guN@u{)&OR+kBK^_6_~lk8BP2?@-=nMJDOw37l;M_5w_&
zQvWxZL^urb(a*K+YP#6=pt_KVMDEe2dXVZ?Q{>c)nf$8hZGX7`mNJ^L4v{vd6@4+A
z;po@W$<>Lhr6{%HuI6X<8Z4x4*V;8op1RN3HpWo%+N%Yqkj#a@-9**t2%Pa#x{U_u
zX!|?0oD8;;`O#FCKTHgLiN!#ptH>uB(DQDQ$)EI+24F9XsHr{RjzMHTH>{VbPnT9l
zvjDa{3f^}*y<`)q*naQ$X}bgYU$g0LCD{8!D)U+CE;<1Q+k#g(E<UchX0_&~R`&}w
z+ku@3jiiKGViL`E>b>1ee!4G<@y$Bw*ylKE9_u!N>c&_s!09F$1IIgBS4ex4TA!IC
z)FnsLS$=~Nx>!{@+wDp8@-)`omR|EnnEyV~Rx)w_?o<?`$w7D7)O1Fu9ci<%vODD=
zU6L2*tbMMtTn)HRA9(rwR8@;HqZ;UDR;+5R9ffwLA|K06_y1+OF8*Qu;U+Wr%t5Nd
zmdwsjhh4=wg;0x*kWf>I$_Bmg(wk1r4(x(R={iE+TxTl4cj;)lLH#cWxytXX*EFng
zF<$J5U4RyDkc;#P{7IL?J6nsooi`QBNL}du$KIlT))HSgg6wQQJq}Z`fpz*F9UDh&
zahESl{yi9Mb`YR19qI1$mj~t@V{e5&IAQyd2mWd^Vt4(uE1j<8wH0;HhVH5oM*aFL
zJk?`#v#tGxe7cQ$1ogFSc#IQt0aP%f$v%tY|ErTPf3RWHUZ2ZH82VM@H(%=#6Y8pg
zo*u?K&ZK&k+yv+a^z{ZSah8sX-1N^4L^qp}pSNe9$B*>e9@cSuwwG0or4Otq9TN@c
zcP$Tt69v1lm>&Aobm~8(@|cQmZqZNqntI~T$i0@yL5-uI-m-6W6<xy3$Ws5LR=bhj
z@SpI0Gs!Uf5vRsb!8prbgULF7r*HQ>zG^Y}zZ{*Z9jSk()J1kUUg?buBA2X>Ev1!)
zRI%q#fy!>Cn@ZA}kzTNusa4m*N*A)fV<mkW(e$&;!;5U9$EGtp#&dPqKClum?Q1%W
z!>N?HslC6Uv&IMZ;VN+=9eL{<{gFLJ)rsRR%vV^Bhsk3~vt#B@`cM0iBX7o^R-pgm
zskAlM>><0IPKJ}L_Hz32+GDl5xO;V~H?Qa(I!(>*nm(q2P?|2dgJi7ZsHyj*Vt7)b
z>8#FA-&|pQdmF7_-m_n<2NjT(bO`UoqNm&Zx{H3GT=aSt(e$k1JVu=h`E)QXSnZ-(
z6|F2rHKh+FqdQ2hGrLwS6}q|fT8HD6ec@qdn3Ap&^pLlKJt;>&L|fVIe$U+kq!bmh
zU#QWSw$Jg6wM;b=FDpzOHLw@dbPOHSciEQ|Xx3rn#jw(k>_J&Wui!Q~nf>^RUiA5%
zrh@uVedwXcOjk>7a@dK~(ps2ebeT?-ulTlz^s{&9y7?JT(}RANuhE2PN7Jdbzm;;X
z!*sqpX6E@}28Q9o{-84_lvTa~7vpE9Ne+_@zOa~iN;C<ff;ku;-T+_x9_i+gX2^Lk
z_wHo#fWn><FH^FoXDOYA2A}XADgK47eM|hV3~%Bl`e#GW8WS11(Z6fatv-6rE}<IM
z9%)2k=R<V5$!!{d$v&DUn#-o5W|xNw{dBsl^ANv%*{PD(UUoO7X8P9lwFQy$Vrs13
z^c<CwJ~|6qUqH>#kD6T>qH{8->MCPu$@f@ee|E17rvJJQ`}EEe1Jc^l_~DG~bh$~r
zwV-j^ag5ZH9)MDIiF<^UvH6Lg*)=1bW1V%Y4Y0lFaHwbFwT*EwMnxk2Gi-1X{7-3W
zYGdgwN~AmM9uiyt54D2o-ejtt$)%YsWE<%=w5~ZlRZ$?eY3fU*U-6}>%vb2vNPLD1
zs9TAi;%E&AU*1GQn`NE}r9PVuUGirvXVIVE*e%nKy4wwQA*F#A$pptYh`kIO;DUlo
zd-fZyWj{zSy3T}}ax2)V=TzMmfiqX=Qu)c`$NNN}EB<ucod7W|V`s$+`q{Fxuf_xE
zrol4L+nu~GX8xuc{53VqS(?_B20z`O%4;h6Bb@y{QPjH!gMx|?kEvOkF?iZoG`281
z7q)|G^0DSss78<Fy1D3D`M}PMf_Sg-bl=}&ch76~g3YI{c!3p6#y-6uc3Sq3hU_3x
zI+XGdgSYD-V#FJ|YvyYw*w98M4c_@XSim#d#q_7=xF|D>p$mOJ<A`9NWp%vaE^J^C
zdQ+HP3CHPYVP_D?tq5HbvxrAgW<2^f6>E3}lNN?&tzvuH!6uG94aexa=nJZw2BIix
zoc@LL$SN8yciA@8W#&9sU@pA?U5Rb^;Qu~?d49#_vLeY`%%~gpJ3)=S6+Sf#CaWJ_
zA%cqXe0gVo2VHjNukE0W@o<ylKzC=rjk&;iu^`NuM2*MvI(&uS8&Bs);O9M!!Y3<0
zjdSUrm<A?K2isQ&boY|DUz0gMW6#18y2uT8FGdBwK2hcYGp@th(?5+behuRq28Q%U
z@0+8EWmtoO+%FC!*_jT<W%$%T$zkfyot=?gEP23Av)Kvj>@h9EJ)3Zs+h|!V%*`}B
z#Xnfg9oEw6y7&ig9YrTh9`MIK*w~WrfYHci8}|J(Ig77UW{zLUJNDMC<{B~hjxq8K
z#5Nyq`3A=FG5&KqUTPKS><#(UDY<I*vcBU$`wbmDiQdFx#ZJ9{Jct^9Aw$3%Wf<85
zMs|U5x5mTFrz0?&UiQx5m!0MZS8JGBe`eR5Ih032TbRQPaHZ2}kPlpNlWvu>XlgZP
zH6QzMc)@X;Gn&q^KIl{yG<Y?4sZDi0D=37nFV-&~UZ^V4KR_(ofd!97zcb^1KWHEr
zWgt=WJ^rl&61mU1__3xfK6kHH1Pj*Z{A_d}#IZB<d(M7_H_XLZhL!#U$-ThiH6T((
z5?yD(l^@e!&{ZtEl!l;lYmjSkIy+mUb;sBl;ACgD@Tf7&tPA#*oF0|+So~7P(v6j@
zL~Y<8(l|n%n}PXNfZLysk3UM}4nl9)53SWXuMn%@N$*fH5cDIoAOM6M2kzO=w<qxC
z<IpMgM}SQBV)q4E)7KnTn3&pv<Kx&7(Nh0Lb`yz9of%O+5O`7ch*qX=*BAWPh@%^W
zTXHhKrTEs~%*>meDTm3SAF*zy*@uuop0ynvJjP6pqOB41gEU5GFM?Mdf&KG<S1Xe*
zfx_?<<=LNehIn}q1l5C;t;n|z*t_7M6|1e0L=8sq&u2!wGx59xXQrj2z7sa-tau(e
zDQBTAgRqHMtm8Ibz|H7evr@Z|(>vthi)7bx-@U9!LmA1)q8V3Oy!t=<RhA=Pu+C-4
zi6W6)Fl!fxRGnNp4|2?pJa=O~9;}kn`*eeR>;PKz1DcwPc^zT2%UP#G<mA=qO{>mv
z*T5HdShYyjD-{ySibr&lr$<q1sKe?fu(pd?hd-EaZLZKjhT-$?u>y7J7G6jX_e0Je
zfxUNOUZ>HpVdRm`=}`KC@f~1JuaLgedH;&@Qj!<6Lhml%>#uWVZ+r#2>G3N5Ai@ox
znzz_xWvWTnu+6S?{^h05?0c@-hbw*rqyIwm--Jbi+`-Tl$OJ#qDfgC)E)V(R9ppBF
z?DjRe!ESn#oV_`Xu%<!i<S$(P1{zkD%)rTj`+>2?keN+qRlHb*CF~Sx3u4HR#W{YX
zBJ){-)((IV7|y7C*&*^3G4LcKE{|p(!p6TvYyY9QtR8c<T(LaTh-Pjj`Sdk2m_p`I
zj|y5byp9iEYy_UP2HO7uxt5SjAX`Bi@5v|({xgm%Jz(9}5gRkZ282>WiNr!*<MUFJ
zJ;$O&L9FsUa{Dr9X$kq0eTaTsyCL^!Kp%5BJvhnfM;>8!;^X|d(qWlNZhe`3BuW={
zLuyNlKl?iiXLW`?Z*Q}SjOi6T!%TK3v7a0K*AlDfh>q<8=l=*oy{Dh-6YQx6dDmK`
z)|*`HF_v(Mnq3xbAl4qje=g9PmYkfJyBz5jFwIRCkm~Q!#kRvUI(wXV^LJ{viSxDx
z{&=}vhBrRQp6S%A`eTWAcc&+HB^=Hrt!N)J&PK%I5js+@O9r!#{jiDD`ux$GyJ$!=
zMlWc7C)T?bxHSsNE=6vGu-nb}ybB<QX>>P_G9LPqdos@?XlC0phg^7q#xm6wz%NwB
zpLav+v*U3afy|n#7rahMvtBZqg>-7SX7%IPFBoa|*db(PQS3-QWLMb@XvB7G^oEu)
zTUm(=Am?wi39QC8ba;eR#}jwK54D7^c?$9gC;!?-hIY)Zwu7hxwqwWM?>vp5If%HX
zMAD5^fHgh?W`9U*?nd6!1Wm5M&g(hoYf&P{6!wk!fYdf3>xJ0uANa=XrnXF`BlMD-
zV{g?G^ztHo*MVr6u)E*}c}i8f_FnL`gwdQ^9xrmkU7P&EP4A&U*zG9@@jbq)4wcT7
zjQao@Ocypgr>4tJa=)i^+qEDEULvWDukq%yddzH+GiohC?_?uT6nGXN`-iMD(~!Ui
zqHipoDK)6_7Z7!4s-I2|?>X$X2QvE>dkbf;(-k;|k?=&KDI8`7uQkO+v&Y~W+8T}C
z)zZE8l#QU9HOy?rs~T9MeC!gfPQTU!T~0>Uiz{E{IRjx_VIlf<(YAmcD~vtfrR(!4
zQDH79<qh@JGw69RJHLBUgN+d{kW^px92O%|IX#kNnf>2*>L^<pPc~O?J5sXKY##di
zCt~gK%wa7ywL^!|`MnsOa&g_XaCCc!*vIi2hq2UaAa19Vu`KtZkCWd4#FHKNFFTA`
z^&%R_;>F9u=CEF@bRzZBjk1((!v}b@(`a-wdvr^gPV757&Dpcr9Wg`MnG6~UXJ2VQ
ze0eAQ$R7IsCb7e#FKciQ&(#(BI2RqTYw=li@gJwj2>!%c2O-f+*nvNJ+ZMdhd9>Vv
zp4=v6jIHtGL%=YP>8^a~t`48k(zc>!J(PW?JvBARZG<c*Lx041XYk~u(9`ksg%0PQ
zeL)bpOcry%mVgO~V{hv?_ERf6-3#HtKfyG0W4`67!l%K5U&X4=qth>J1v2JQtnn`v
zZw_PP)PoNbs|ymX7m)9tlT2oa6P3+;YVon`><F~!=&)>Or(+LUbO_J6s4hX^kWf76
zVaB}4euN<y35G95Hr<u}#zW**v)PxhMf<ZmJ1@tr$98(-d*4|v#uMW5brl3PmBMqM
zrTX8E^-IM%mZgi~8)h>Z-ldHWBMR+cr|C$ZH<5*P$tLaS;Pu4rB8i=i$sxM1I*VA3
zVB&2IIBY-rtAC>hvn}ZSF<k+*L8OzB{R|@43i=qXfTFL_xA+%aS4%K-5&D<EW(O*L
z?&`(@@1k>y@an_KXy4kK;LRhf^<bW+QV6dyh#eB%_*VE(?7R$xgWT`{chK}tV3ZE@
zYUVIG*zehhj^UqSEVH7aIgE$vERkh0Sn~!?SGi_S61)1)*?Sp{&WGP_LHy_r@=g9Z
zpE(OEclf90j4u_j@1!XL<G2kC8%<a5Q9Na5(9Z$(?X5&3pTgrk*Iu>=jKFL=hv#aP
zm1;Hs>#=km_hSuq%Qia(Js8N|@@%Fk=&%>M+=5*jW%0iKk@-b@|Ig$$TfqWd@H}^k
zvuk;($r!r5L&5JcbfNAgLQ)0b?_G>+2$p)z8lqAT;>T>Kn;v9%mJZ#~X#8#a0G9eE
zB1K=MJQAFi#?&{*@O&S6>ck=ByA6+ZMWaC)1KDTD69K?3Rb`1O3;WsyeO*O%zm<`W
zhtt2rGe#bv3CHlF5%j%W(!8#`=7h~;`r=(1o4Y&#WG@^xJEhq3(AzxKrl5}~&44wG
zr)xeZJ82x;ItYDT51aNkSKkF5cxM+e^GC?%p)TX>-jd!#m~%wZ0b0hqq|5)HJ+8CK
zKE2>vBhdQ3;KGr_g-~q%D0^`ZQ>WNT=06iY<OZ>@8rL`q?^Xfike$2D!+%$X<7iEH
zv5QE}nqwdB`7DgpUI+r~2QCzlLKm|04#bfQAf9LRKZg=|oNA9^jZro|k?j!OM@|hO
zFO1KA_$EIhsLNEqi;N^fj5C>tp(}VEh?BJ^Gv!Sj^3RO7!Q+8ta)F*YqbE7(M=uN?
zpNuGZ6b@o1{Wwpt?A^8?e$`E+zYHr^2K#W^Kv3Fh_$v5aW_;NE$$qF7rW$eW1YJ<6
z%ylBlYxahbeK^k;f~jc;7h9ib;Z4qX0S$?<U$fd>VeuZodTs{mv;&|0OavQ&F1zs@
z8QC{=6r@)IR`CxQ)@EqIZv0jkH0v>aNxMKxpU|;P@EK)@@IS(6dczV1N(S~Ri~{?7
zfDJxEw!~8gj0ae3l%}(*8SfF8ju@o1m1iT}hSf@KQn((0G&7q3I_BrVHZ2FWWCk}}
z1|99hJFd2I7Ay*%x)emW52?AxNHfyOGm25g@no7v^lc1w^MM%I6}@O=egl~nA~NNt
zS7#FY^>bq3XJLk>u|uaVT|fKrHWl%CJK*(KnCgb7Lg5dmAvd0FLatF6OBeu-uSS>D
z0<0rYN|^*xhr30AQC6WFDOiux;EkKaHD8`_P}s)Ul4Jni@N|*8WUb?{uKj4sc4}WY
z^(8nZIbLImE+EUj#E!*J_O=;~hUFzUX~KT&TWHuYwBi-HP6MLrdhqRZxVE?KSNIWb
ztgQ7VRxh=+VF-S(chJA&M3OqNcO%JJ?xMLlk;fD3JTc|G%|@sEN!av;@YMc1Y3Yr1
z!7Oi~=Zx-iJZO0X7IYUw^N%6d4&c&P*veDl%M%dC1=gt{{%;J?eIQY=5Knd3!J1{~
znIVsfZ{?YP0kTC8*rkc|Lp_wN>|tokQ+etV3nvn>?%*3TfKcjTZF$WsJkeB(&VaLh
z@XpU*_13ZGXV{xJg(7JWDqwv<!1sv;A!O5Y@Xu3O{gh;6Ey%CF1zD_t@hnSK#ezof
z%V^@rC_2Li^6a9zc<Dg?#XA)la^h3u0^{J09+2a8#?uU@>ufXLupJR2jMa5=BoAsl
zqlxjCz!Qt`ZX2{C`Fd`ue*N(>o4^wJi2z<`_bTd+XVE4w2guihNZ%e*H5|<H+P;;H
zFvq!g;>=v)^Ia@x1Zz?kL|y>2x*RKB2^%mPn|s1;hnHl1iI(RzkSiz^r5vUrh)wY{
zvF1m4=H7-}gIS5KrW~11Z*WU8Cw`jK>{A<wmsw~(umh|W^`#9Ut97=PoFi%!k?rhm
zn(D5AFRutjPh<WvMcAkL0S57J*!q<)f<CNb0_QKXYw%CP%66b`y8`)DBA08%{*b#M
zsd7}-c9AU)V;@B;<Taj1ITP>P3#5}5mT@0Gx(?d5!2U>_X$ck{41YTb9=8r$;#k=M
z51o<-mW<sP_)B=JE9P7DW3Nep&VlXhTv)|F(Dqi;P$J!p;A0lplGt!O3}sflPiZ`l
zFVB`b$n|q`t#+o4YpFi9g{l8!HN#nx`NW4ppvIe2&#Hoes+z@&ZxdP0M4sF>96LE;
z4%;X8E+gm*ayvp)<atb-7eTgGjC|(<neYnau?<<(Ay$sUUrpfYWw)`KUx|eu$>2_C
zC36W2+0K>Q&|T?gi`h6(a#nQe0X+0vYKBXRx^-dbwh%Ro@Kmt0$nkI8!~UoNSim5j
z%kmWFVm?T}JK1Aruy=BH2##kT=MDYd-l7KhGkolBEPfyRWHQ6YH=?Gy886+K*jJLA
z{5sgl8|{CHEnd{prnaWAoAij8VtRue>$7XRGG1bzRCZlM$8ura@u1}6jPy@eAoC5u
zo91SwJ*nAda5xC9?E1;L*(*k;A(l%=DVcFYJa>KSX>;&Dvq1Z6?JhXhUU=a=^lJuD
z&Dw5;;tz{Ddzq=Llw>d5N85$k@FX-aCp)!km<M>8(&jp!rzSt#h4!q0U75lD$cJ_S
z`;^Y(ORK?EU4?tEj#bYA<2NI_I`cUXAI=kVHt8AnX8Vw}T*gxm93DL_QFx>@VgFKj
zvg#Jt=_cbwr-%%ooyqu$v9R|UVG|$VuY05CwW**y;kg_8i2@IabZN*Nf{`zn10T@`
z<iC}ANi;ER1(@L;yT(50kNQ2&dWyidck5|;3VHoXC3P+t*eJB*Z(_@S&}(b#t{hJ<
zItn_Q%StaXwLw8Osf>};m_WFt>v%qwImNeY@EXs}Khln>*D6yGjM7b-xl)*}#H+!2
zj~JK><U0qhv7Wt1MlcPo@Ckg_8t`#n`wZz^LrXjJWS7Bs#awvo>10nch|Er&)4`kv
zc}Gyc_!)m(8I6C%{>4Bu6swyK`VIi!g@MOsFy^wLykf-p1;n^a@Gi^nxLILJ77^vD
zgE(rS!Fw6^0G{x1hP#ZDkz};gy0wG(M?dh{3z(W{xV3oBUqcnPC{H!IYERGs-IVBA
z35zJfw{b8LA9)VRAm(_7oqeTEV=%-~^tdQGyp{NS1U}@YjU=Kq#U@^pi&kJ2^5BK$
zQ|+lpME{$-e2y3!2(xk#Tor=d?gIJN6gRoyIH`dC&OyJ&^1Y|YL!{0M?x`fjVMw~b
zEj**X*No^A2$wX2(UpTAX--}>89Y(R6epUrBf1VpDka$Y>pa8p7<(v3*buXVTqnZh
z<moC)>;!hHy#}EtQmJnOpKy=3{gDdjN&N6DJCgpJ_u$veaCK#{i1)Ap)yQ%Svp4J#
z8G<i*zn{u5-8e*x^^Elz@g;ye_hE1HkL(^@uERjQ$=Gq75kH!mwM$F<i{&XYak84-
z_*KYk$oJq<3gN5b(b`2|nveE4b-*cPs<nywf8h(?5ixsm)qQyF?bxrSPTP#Q)f0a|
zifT|PaL7{PAUpSAD#NK-bTrkmshU*BJ;B+JK()n)bYVoMY;bVwQKkNP4P2CozVSHp
z>mT{eH0Agi=zS^4!Ltn3*lEOyCwRa5>|XW7Q!HU5K2(0|6US%iNHY;++fi%VrbLNf
z!9pobGnkT6c#%*ti8`RBc;fPX>~*IdiZ1<0<eLkIoW-8oi=g#W<V0sdx6Q!d*Wov^
z!yX^ty!Y(E-btPlizM@ziu86AGmo+4+vuCaYwm?h%PTI{%z0W~C6n5)Q<P^6IcuF8
z#&-qJ4=k=@VUUKvd=_NCb2oE<cyoaazcjnrXUZOO!;e_rE25(Z7}G%>&eKGF@Ir2Q
zO6N%`ZkYFYBp*Ycpwoq%5>7TAOrMGf9)qSiy}r-+=gpD+<itT7<6I*OM%Tsv$-!+Y
zILGjfCmQwvZFaG`!quFfIbT-F>BV+BE}afJH-8y$R#Gn_Wk>GwrC-i@_y6}#?V1f5
z=3<I9>sG5*vvQq=5&T`JP5U1+_3zxbQ>F$zx)01$v2x8Snd<lMk*QdLucS)N2KBu;
J=CfRy{0~d*lOF&8

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/7.wav b/etemplate/templates/default/audio/7.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f76c22b5678fc0975b007e8c2e1704d6d1a0ee10
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/8.wav b/etemplate/templates/default/audio/8.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c356ccafc9432596a070c203f5d861a4d84cd9b5
GIT binary patch
literal 22158
zcmeIag?p4&_x*j&J#kNnkOT<?cPmz;xYJUkxD|IT?(XhTtWd1DySuvvf+ZwCd}cB;
z_c^~0&wIW9#rNTQfQICjbM{_)?X~uq-y7Ah->{7kf7EJIuh+m4F(E<-$*<tzLgeS`
zh6v&-J-UtP_T#@+>CbApXeeju(|VPhCxUb>k*!9m0iv<!D3*yL`mmZPR*4GwfS#%+
z=w!W7zt*G0S+PuS6a8fk{ZVfaJ|bBp%V%Pn_7zR^OdTpF>8*ObE+Qw3+$uuP)y2eC
zkze1{4U7w7vx*V5^%s>SI`h>j!d-U}O~e>|QFw`;bv1EUchnt3nkXX+iwwP8Y|(dB
zbDcw6)Wh{S;U?V0Cpk%Y>6^N^^p!3ZsDBgQGK%Z((bsehu~sLmExN5(C|v5Oc8S>{
zOs44-qOk0)_Ngf%NP3A}Dn;cGxkZ5dCL(zL3F18Olt=ug6ZB8wfX*pKid=fJ{wO}_
z+v252(KTg#IayECA)=rjqx<WHdatgfe-+I|qF5*H=>x`9SxsAY5n<|k+NB<<5+biG
zBM1KPX`;n!nO}TS^Ti{%LhjZJ^aq(H{KazdUYY8y7$)b79Adh*s(bp5F0KpduHtug
zr=e^k_Lx=m5xGOO)AMx;p3c-`)ll6{ln}%9KPpt*W0eN!>AI9Su6Oc$$F<3y!6H<C
z*V(K<OA)Gl^lp8g)$7N*#p#J6RlnC`grDA~vbj!%9w2XvwPF{$wn+XZ>WQwhrCuzG
z$#At$=M#~<XEWVUJR>%ii`?><IInA~1!6eswNtF&ZKT{NF6b7bmz*me=wU=axQq}Z
z#Ae-EZ;?qlU5ysMh<)O|o^0mgYTwlvT~GLldHSYWtcI&~BEKB3kBDu=XHIcO$BJWm
zmOiIi=u)z#4iM+%5xq@+(c`oiS3JtECSs>9sD<dR^Xtaqs@B?F78HT{h<+npiPG|*
z*dgLXZoNhSB4YG&eznkB#C|<Y?dCau7MVodZ1GH0*5$-d{X`U!8<fz?#W(d<RTT-W
z+FQ{|$LM(?ShN*i$c)csQynQ!iqC4YKFn9Q>t?)DAKjnTII0>F8+XM@@mNQTJ!DRj
z_)gY+*IBx^=qrYab|OPu5YP2kGHb0KpySnGRYCU>&qcbP%*qJSSq|oELKNazuj)I>
z#T(Sse-oXrbgDkauAV0=QgsON`%t;`V9`Z1(D_A6>Cgw%ay?ash-_^mZae6eKcZdS
z5ND;Sq#i93v_-!X?PNdMResQ|bVU&=ZtH!zk2K|C-B!ivIx<WY5x>e`<p}XoKh&2+
z9eG=i*IPvgqI#>bOr)zFdJL=gv)rTGi`H_SNFz`3%Nt@TZ`DXt(%HmfapEONZWjNF
z>ttn7nNQRbt@S%qOFYrP>-*}idMSp8RAnPeY6ySgE=i0Q<z-XewY?~+9cDMNSj3yR
zRZ%gGtp7(J(z}SRpF{<@TP)%|%8M-GxQhPB8Wa*^c!D!TQ48|roAwuBqBn?gN!KNF
z28gAi4(okWS=3scN8A*XL7wj9>j}|OI>lG9QPh(Eu!;?YuL#ip=p4G99wDxY-()Pi
zbROjTgS}}knh84?Hh?#Y(Y^F$-AEo~4}|!a_3F&sej;wVuxrzK3x^Ij;`B7$Vxb~~
z*>i_}Earo|BlR04d801ewK~_HO@<dID_^tkU%7s~@)9d$C*HHG`r91Edp6Re^eo{4
zeqB<nwGEU`)=zo&SLSn(L+)11^ikeBNw+4m?&)6AQ!Z9*^l7n4T+yqvDGrIf#KaiA
z3AE}bp6WV!z0$g!tin4b>pygwNa4*ti~M4mS_uMdP}6l=U0Bxv(H^V&?EYwWv=j0E
zmslf5OCRk}r`Ut#WZ+w{;1AJAtr5HAQvH(swun|@gYG1<R3+U~PS98MOp#Z=5dVl@
zbSAj;PF>Lkd+=PvtKDLPjudT-DDlE{(?f{3T;h<bLnR1Op5maqB>L&9{G?s=7qeLX
z$zqK##T-#icB9VB*9+BOx~eXq`$`+xw1em~bz!kXmjFfYX&;fwn^~lvoTe^|4)U|<
zLzU=EeYl~Psr}^CDV?PTs;9anyE;?U)YsHRcJ`4TsHdxTqPe^SPR<0O$B7lXj5<oD
z&jua7nBjU2E9WIY$_!AXwpgsTgWi|a2l75yca}aPgc>kIR2GxS1AkDW2$ABe(}~3v
zAj&ws#yBdvsr|aA?hR^R)Ki5g&)q~U;q3y%LOnu9=zj8|*r`tIcKV>`DJQZH&3Nl9
z_J6MG3<gdo7poD)Z^d+xOFq%wI!cdFGju^Qme|OlQ`Iou`-=Xq{6s!cPrp>&>~oT?
zPj%e_>TlC$We)QAwXPsWkP#kK?2e+8SR%KII-sG@gOx+{;mL-|w#MJ0yYkWtxIzKZ
zRIF7=`jqxisk*c{tR3<vSyMd(eIKZq!riE(m+6=KlUk=+sO4&x9BuR$g>^&yGk7?R
zO1fC&5?<8rC(6(}Rc>8HYSCMtR~>n)WFqz!mAIY04#(Ip9*D)DYnl$!H^e19OU>7x
zbq}Gnm)J{XJ0UyED0NCr(BsrH@t-IG#+0DeB#AjPNLX|R82*VhdoC)nE9J#QeL~L_
zHCeAma;%&WwpF4=oq$J_6&vL?QC!@i{^b+@5~F!UGg;PHuk)zs@CZLpz@~HaR95nO
zrR*+Cup7zx1;28O#~^GUYUDzdOKbq2e_+rY9iTU<^*X11WV(SeRW-S%+L<{)yDgx#
zxAIpv)KS$$mE;M}sDtW}Zm#y2VTRScp)~Y;kJ%oN+52wBD#Ie;T|bM0GE_Y`cj;y_
z07ThuR5o6VcrjX)CYt{i^V~gs<Bf3RqL0O0>Ur{^aaviNL(N*Ix9hueo8yf6Tz@bt
z=tH8WdTJgc$9+Kkx#qv-dX-CMI18Ko)FrbEZ?aY-%D%FTvB8Kn-pl@$Z<aeU(r9BT
zZCPSWF@A8ifkv`?EPGqh#a!{HagA#KMt%f^3X2G8b3Q$V+Eze~S5M4PGssodJm-pV
zjC3AzwsVwqjdeb-4X~%%W3xRSQP~BZbIeZamik?fk{c~uJZ^gp_3rJn*ndo5RzT69
zNkP_t;Q`<LoBR3ruJDQUx#%72HQVEq+uyREu5K=NHnj&@k7e#oEB!q#c}vpG&+#8l
zy-j?1>}BD&NuNq2*Giq{8sT2q=g$y(=#>bSvwBF=pr!%8dHyawItyh_w0^Qx$aZ&)
zH%fTvfG0Wb=NyoCcfNix`SW(jwLQFC$UXlsuafSC<q~IXc7!z`vqa|gbdR*Zzwi3q
zC#6&Jql9*e3qDPGdpgegw#7$}6wgdy9V!d>R`<#4yCJw)NIw5AK8AO3kE?p8<B%iW
zVR1flzB4^#A-Anw-hr7pwuGlguFlggZ;9MZa(PCU3SAcT%rC*SqGhLgkiE)g%Suig
zkY-PdNnM@N^84B3a*0PixWC==`pByW?^+~1j`w=|!j;Ez-<I2bPw?fiNkMMDCBnlZ
z)_UbJR(Rz0THzXQ`$R?B<hrOg$l_kJ1BV7q3^@}uA@4tV{>;@OPk}tw!p{bN@xAPo
z-_5D=Ih?i{w!P_*>0VjRlvUp<rpTmApF4kk79aJd=&K?xGhh7q>hY&OX|vNSnsfbH
z`R5JT9Cjyif9SKoDM9P}q~|Xdr%E)-I>YQsoU_52x0bzLwF2LVwu<_YZ+vX$e4AqH
z=l>QR6y7_ih@YRwziN}?q`io>QO5lA?P=}PZlzBD{?oUzN$(RDf8HEFGv4pxpcloS
z)lC@xy~<Zx${oGN`+;SbXF%xu(7^$X{muq83cP12Zftg&t53R2v#zqK2qVj~+`Xe;
zozVUf-J+fOFXb<lcU(+j?yotk=D6#>$fuy&3!O*DIj-8CSXWwovx=vENgI`VFzIvR
z&xvI|40vUK(d}jMlXv$PJemACG`U^kb4Qx*SntOEj_}P<-y>S(*bp`_w5*?-M|nD=
zk4``9Gh1Ir5obHm#O<}GdvM8|J94eg|FGcQg5L^0iw%sq8TBG$y5B92e)5c&$6>d1
zvhKAWwcX5GW=pXhNh_OjC?)c%`RUHvMz5MYb9=b%?&W(SFTFl4{y6KqzufBS;k`Gw
zY4on#zL8sVc8qQk=HdU|{Q&j6ytQiP)~qENA8kRd!e%{>B0(p@3g+$|JG}7zqO*!r
zD-f8kP_C_^F@Y7mipoB&uJ#SqvDO^cQ(1?t=dy3urf2oBu21*>-Yfa^r_48%UwJ+c
zzgP0+s{8X_FMRv{U7w7LZtvZ4_>_+dj+q(ND|%<%Nm0HbjRV?vj}Y&(pJY8sAC@N4
zi&|f2Pj-E9KN37Kyj`xZg>1!+6>VDVT9LT?<8xgLzY=i4qlEFwjI-sjF0wDQEwXLN
zera!!T`xP$dNK2tw0z%MCC0x`d)464>)X$7eY=12QP;<h<1<n{GgDmo15(0DL=?-F
zmTzZF@#u+B%_ABI?)Px1^Ujyn@@YQlw=%9|e#w5MOiKg*Sz+nXL9vGmEh${9*dIkw
zW7bCpM>Gxm?lsMAn|kG#ZC_=LwGFZTYU|;6;yh!oYhReXGOI?)t1q)YLRFq$zB}qx
zsaut<KYCC#?p0ieq(oKSqpeTF@JD%N-q*Qpu?u74qaKDW4m#sCU%trxJL^Gum+$|j
zHq2a?<!9b?f9+E|=zipf{HqG?EHa}+onl7{+|HX2SuD7zcTV@lBER#q)sgwuy4arE
z9%H}ZIO4kKxMB0M&&mq_Rwi-Zhe@v<KJ0q?)lKtCog2koTzF~5IkTL`S@+X{_j8ww
z9hP@xexuN$ysaXK=6LKM;1TPXnRO#$?Dyl};!~Svbhhqy&3Bva|2*fzm=guZlw4iL
zRiZ($`-K|EBt-lX+|WB!b#RWb@5l_yc$nTLYf;vztj_ki*{vL1?E^9wWED#HOc)q{
z<n7p}4R0>K8E|*=o!O5zKfm!dHhsK0C2I!F$vY!Yc%CUmmK1xG_jUBo(U*gVc-|5%
zU3TlSl<;qsl=PIlDK%{iMS|t1-|ff^`6?G0RNPU@QDRw<o&_WFd=2draKdw{vBp`@
zdLV0HW_HFe)|U1;*+JP|Z2#HK>?OA18KG%yzZ;+IZ&tp%_29~lH#e%?9C5$N>)mhq
zeqQRBEJj&w<uG}M=$Q9Kt`&;TGda3;#D>6RkB=hK^tN6|TbfoOEhBYTMnh+Qqm0MX
zz+Slu<%=j#wCLty>x#UJEf}*Z`g_Pt-_jo4L~m!fJ;?egb6BRdwz4m`wX_-8E$qFs
z?q<A8&-FbZVa$i#@ugqPyqEXhhr4&~?sz`%?V9(;QxeQXOK0C%Vb!92bGOcWE7l|S
zWv+aYM)=0S>mH*-N3)mR$kZ8QG7h9yw8gus7%#l@h8R)b@^s8^D_Fa5YJrS=wes8v
z9}(2pH{0#CxMnVJL}yR3<*;72&aegBlWbk>o$bC^xidbeie&reHy?cC8a}K2sQiO-
zcdkAf7gzU9>W2xoNL^Vj^PL^;6LmI9=UovyA+LX~5z%YHj{0r!h_*OgKiTeP{gvJ(
zwP40AYZ+IDp5<OWcwj`ys1tc_#<~jl#7@iCJ!W^#dm(QE`+7aFoE9z3u8wl{H2X&T
z0_zxSf7>csS6e;n-mGF7>g%6h79=?0Z7+5{`S{p)FzrEw7gyfoiSLx0YQJgzZ0rdf
z7uGa<VeY>9#>I@tGbPvL$i*S^{cd}8vN&8@?CY#$Gh@@cX7sftIJW5+_t$>YL((F~
z<{1}LD#pxf#N^9UA)-o1g}@!&-X3M$8ptH`r8CyK&M`Ins{Oh>SM~x&_3Uz4VHxAn
zbEa4mCVgldfAn?JXP+K-c{2R*(ie{Rp&#xfezCU}IW1m(FT=LxEE{<`_xU`FqL)XV
z%Go3|E3kyOuUoua=gezcZ{3kmE+e<i%h}Qlmz}+R0+t4M%4tSV&fPKhzFeoHk3<B9
zJ_|k-u+Mv{dmBr4QAz!2PBJGrcV%~Wc65BTdD(7S&t!U~?@!&3JpZ%D$KvsW-n4u!
zo|k$S@MO`O;~(#TXz*1yE35m`>VH0mE60MIGxMy?Ju7NN)UcdWLwg0h_iW>F*GO=7
zaV)fdO@ESc(B9b*;JT<9x?S+;7tlWBSwwbJ-RMVARim0l-VOUb#3v}j@1D;(uLtf!
zjZtcZid5~Kd7Qf(9**LU&GzdySJtt#*(pQ5&G}N|(~0<?w|ifDy$E|b<$1>I+n;(R
zocY?v-o;f(5Aj+av@~>EcyiR@+!LZ^=4=+RKS#sB3Vxrxo4S8jk<MD#m96<Rk7lj1
z=g$7*Tq!@gU-6zDa41Ky@Xg_4BPT?i&iN?(WR8Ww0l~!r+IyGs>g<teED^_59aY99
zoNt{69lzUuv7NAX&iXsObV}QASzmtry#9UlxK43J-z<Jn?^RNKzE8bB#eHj@y~F9D
z>Ufn4+!N#(x;rvgbW+Z$kv(%}hsFla_3z_dz*0nCF$X&KT79iH>s)J1o7J&Pxrqht
zNq&O@o(Fk`9gWD9Gc){i#K4Fgp>={E1YGm`*XO;Lzo%*0DI17?RU6j~XESFvyC0Fe
z*t#e4e)`aqsN@>Se<hrYH{LgX=lf>Bo4B}t-);Fc`b+e;eOYas+s%*emcTrLHv$(&
z<c<6<JSC!Lgm2iJpt}BdeQvo873a)<oLB7IvsPHgQIYN0OC9so4msQXtM9A8At4<@
z10xQGr-b&5_&uy=NS7Rc1h)>5e!)IVJ?0tr=}155YOeZ@&Ca&Y(Y72}(zY-2bK35-
z$=_cjRZi^vx$dU|9}C0}h>LpX_n}C_?_UNc|D1Uz+v&Vwx#(Ld;J<)^IcA3s4O<)@
zn=@~CR`C7+)3=A$Ma#eXglTcqu%5JLS^H#_ux8o|ySC}Omc1TU?^yrvz!o`Phs_EP
z4G#``kRvvDcF?524}Rx-o_O{5yyEs9?WT(^;(G5ioj+x-v&CCIY%?<pXUxj*PhIr&
zS@Ni);LmG6KKk_ZLqPnc_cF10(xIexDGlwpTo(1fZKziz?+XF#bEJeW467CPYv`g7
zGjOASmd{=H!6;A%&F<M#ZJTV}Z9}bFi0i)`)6Eh_LHGP#o&56#`32t#868?DEMI87
z(Dfk;gW`hL_?PrO<uk#nu}49-MuttKn6sVN9G|jlXV0?su=cYT%UYVzIrC_$?Q782
z#H4Xwt|rv|Jo|I(=VzaPPulgh{kLB;COCFyPgNbgs(SbGu?E^hYK9~P_sdZ+M{Ljz
zzq7vS-e=t&(WQNJcDJ9fH@ExPHdrgz*E%LRPna!@@oud>Py5{Wa|J96DwpG0j^9JJ
zh8Q{0f)@lH@hj%v!1uPtF^?(k<K;QMNTs^gxxP56WLLC5vt6<l$lRV`%^02WA}vqK
z?ynb;_9veI{M+Y!pT~Tu@NMU}<tYuaie$HS)YGTk!aM_fruwfB{4=O;$n}s`L7{=w
z0<QV`dTQgTF;^~dc{)NIt8JIFPTP*zTiCy4J6zRNU2((W@(A%c>=P7FB)C@4wICfd
zG`Lvs&cNuvdj1Fel6_}*MS6z0|6&x8NvenW-gU=u(Vl4QXKQQik~uCtSGqH;V(P1J
zUy^$yg?=fW*gP>YanaWTshd*L)AwXgavpMZk?-6tdrt8^7%(cZWnf0ofS^19L;U^x
zqP=^#WsBOfqrU9uo}JIp$-c=}#o?8m(-z>oKv&jGUo|}4fAvi9+V0)aZ(@KophMv7
z;DN#S1A+sm1)TAl>3h(pveyf@)s`1VK8ccGmU6wzu3>LtZ)#7-dXrf+qdiZtJ*DLL
zh_CIx4o)7C)cWi8?*&s|roGE-Z`aPHYQEI&4?KVOy6LkrpmI=Lz>R=)0qg1D?s(mF
zpXfG6o>Yrmjhqj%?^t!#NZV_BHAf-mZr2+1Mb!{(jZnAe?oB<qdT;Pc_dVlxKOj7y
zdcfqswgHp<GW-_#we;TV8SGWWv%RH(h!y#CN7rtr;Tk}!wX*Kb9GvzrH9K`p%IWU~
zzDIuDoU|kvc|YYw+K|i|w#JTot~6~}-dP@bT=vQ3+u!e~|0%!eew+Ok`p)%scz$r}
zVVsd~&F79uuEUO9_Ti3v*~_vwfzs_<z0^Cj#<$XHbhNB<-{<kk<D_R7?`)q%K81b%
z^Bdqh(PzJ3Q$H`CJibS~l}C_gefI>TuklKpQpa_=Sv7lxeVwg-R==!jS*_FWr=Cuo
zkTN}G+V{!do2Pe8kIpz?y>0*M=;yklvn~7F%6k0nv&DC`PYvH_|DS!oc>nFw-|L8b
zj9a>~Psf>ET{#@foxeC<+boU;jy;ZduJW$Q&da7dnu`aTW?xHtw}tNK-HN)E_SoUk
z$z!Cu#Y1_#aKG)b*?o$8FVEBNi`}-nop<Z%w%Bsc5@oq>^frEx)6jrRsyB4%A6<i;
zuI!81EvVU9)(@H0GE*}~WYpu&6B%=}7Tb2(OE{*O=k+7iLs;BPcx?5!>lN#j<kjB$
zq~{{9n;sq9O1sTAQbkW;n!}unopoHZonsvF*%KYpoO7KE%;V~bdWTB>K_|;mmTY5?
zrI_1EW22E^tdqx$nr?~46U$Tgv&K$2!F`fj9m`$IdFgK~HHOPg=nNmxhJHd9Tj3I}
z(q?nlW=Djpywk(EmZvV_9OvlinBh!y1UOzh`<n|~PIHo4XWmk0wKp2@3S+c;qFX0R
z4!1rYv0fuQJ9)T!WOzLFIOpEiW0<9^QP6Fh<)$%CDsco~sIz`-t~ST29cD$>&#rr}
z8RiA2gtR})p5mD8oR@vq;dD)Ru6E`$kGh_k=hRZ=Qe(w*IZFClyex~1K}Jbg-?Gv2
z35RR3Tq{50+8jqujuF-6EA-eb(O+-SWu-+Hmm}mz!_8QPvU$T;WJ#3!<r<@u5oTE}
z^P<3AL*xFA4rs_WMqAz7oM-McU#bb}wAmB|t*6>zwo^Iqf$Hc)I^E~0wJM>i=nx&L
zO6$woL?sns4{Bf$@fF?d4vy4D9nGBz7zgEG>1E6_-WgRbHshXAS*FSnWPPZmzs%B?
z<)5;HST2)sgU*RGrCpoNKh$C~-ZWixUGr6WGsd;tY~^a<T5B#dzqo3eL)0TxNmN5|
zzHWHRhH{f-y^$#Yvea}N=+@uTUH)UtHR{SlX%ioDa_;IO;;?w6BlT!CKvly*=qNjj
zKv7fPN7*icyAULM;>*=R1N?$dHcMSmS-KP}aT68LigK9(kNQOqRGrmzl(6?GsULMb
ziu!i-1&=TUKeMci(lPS9Fz}AridFI!caG$);Udel=s+<}KNM@_0Nn)LaR_>Ef}WxB
zvHt<+r-em190!ZYqrT~DtX&h_B8hWyTKMZ)DyMia_UL?Sj+%!;I$4wv4MmKI7Q=Kr
z`gbLMwyBsV;$%MgK~={g^gwSeBNm9UXuKivKVsOfQgEb#@L<AFcW;T6;NN(3?h|^g
zI)@_m)*P&UVKv|Be!8g65Z&c2)l_to+to=uMW*7WT*cpV>Ph-A>gYrKo&&lFF)&Y;
zM)jVHCl|tMl@yV}P1nT_{H#W3fs43IuhxHRPgbi3nrIu`6^lq#rBs-HhMSkkotvvn
zou-3%>ke`u%B++8$&VXQ9>3;>$kLO<WwAwF&~xQ*?TK#|r#`Cs+DSC`(@pg~oPxK+
zcBW8xvb*ra#u7oT#8i~kNjNkEbv2aoIMn{0Lg^EttazukvhvOKaJ5^xizzxv<Y9#t
z-~u*8kA17%(1Rm!56-BP?B8TOrbMw_?h!3ead&Dd?uz+(t!^yy%0jHjKHRAFcqTje
z`OC@!KeW79q8saVVmGm$n>{k*Nqs`K#WS3%_Hw=V=-tuAIds@sqBqX>Lirj!Js1At
z-+HvJ$(sKyI*3-}%@2h;FJ8%c`9gfaH7SA9c2r!!=V~M>vp&CygW|f3k`MXnH6pV<
z%4|Q@v7)HYdbidy!~#87D>+BD)?M{@k&Y%^NmUaCWKor<!elM>zYlq^4sWxzG*Rj|
zh_9-p{#72veJD@8d#f*q8~Ur5Dkf?dJ2nc(^gEu+D)E>%t|^MkT(Z0xF7g<CaN8>2
zlU2ZV`cI8R&)$a<`JA6zASTJbWE0$JU+!Z=r*ETIt9xo6UfLM6_AosB={SesxEmXV
z1E1fQ)m|!G;*#7T+sl8&M!e=p-0dX)en?-yV_zlaf@+WT1Qhp<_%O9ZFS4vGQP+Z)
z%mBlFB9GszSk+EP$%}Z;7WqzJAuA>-C)m{%N77r&Q|0iQdV$!vc)uXruY*L{P2Bf6
zL~W4RigVi^rM(=xQka}9rf=!VaJzW*m|bue&rt4Hi@MUKtLQVtUL2@00l(%fu3|$`
z(I_pG^*M5(F@Dhwc}m<7g^Uz(pbJ-s!;Pzm*53q|?5iFix{^7evaSrm@mnRY;%Jsd
z`))2<gUU)>CFgb!bz8(dyt~?D{WRRg0R0>2yU+9#<MDIz%hgOP%p}83iS{B<7r;$A
zscmFSURL&it|X3$1U!eDDqWY8=Tvp_^D<uFzrxDTRG01KEU<0~`4r9UMLaRsm}l;a
zpHxk();su@EqLVv#US$Qf@F#VU)m|p$$Fr{b^V(j#*D-g{kL3C^hL4<uf#h1$80?i
z?{}Q|34e|{A^*XL+|4du11~aEU42OXi4&x__Ff$!TY!M6Y7EZGF#N8%c#4y7kmK-h
zE{S{clU|~JhMO-{hB${8yo6|f$@8_;L&^3w;P^~D+^@PBS-(*nAW!Guhj!Qh;YZC@
z|LA?nN9>esz~%ek>jZsKeP9M8x0<Y4;nb{@P2><f={}&67jYje{m9e|aS$|EqW<MQ
z?x|@i827XxQJs#v-VJB<GVz`hym_MCz=0unk=xV@-01)C^?zr_yWuMd9H(m{hjCgK
zz#V<93gO)JrN$}sMy$pgZ3=1?6&IA9dkkU{WV7C{5^!p^=y%#zA3=96h)3_hDH5t8
znXm?@a3}6@3g}&$pG?QEA4Zh!(Jka#F;FYq#WLjNNYROW>x?^8lS!Gqe5VzU>#XQ4
zkE@j`LXQ8j#=^xc!*+71C%)%L5h(8ni!oW|W&$Tp9F~v8b#+_aBZph#!KZ+s`}9aW
z#B*YhjFy$*7;QyKDo{Q#T)K(Yssqyl-Bg6Ii=wiX^w(2VQ{sOKS<zbF)xWYv)mhUV
z#7s}wR+rXIg{PGAIXn0k#CfA{>u^?g0>0uwCT;%22NitR61_;gm&Nf=wT$7J+rnz5
zfxS<4U1k(c;HO%_tv^&xqW-X6MJ^rCPw<{I)j+VLk=!Bs8Li|TVZ$#g$xOj>v5S3L
zD^^fBE6YdhIQ&4LR7;eD35{m@FJ?pjghNHhhphHX5Mv$n%UhgPA5<CrjC#G>Y{m4#
zeKm#Xn2FmxPQTH2K%v|E1M>!Nsf63~H{A$)N>X=CAD*hL`9#gqc3pz!+@=k6T>Y(o
zRh_6lcj%L9h<Bp3VA@Bt)xUW~2k!OE;ql%wfZ2$t&UVi7s+5j%1(~LEv-6g6xC)py
zvo$k5zlqIw^|`^%O2%5_IJKz`b*iXkg6yh4sNS-yo`-*X)ZD0M>u_01-F8N(D7@<$
zWKy<S55z79ZcQ@(QIm0N56ki(+#urxdsEQp!rKg#;YL$Xw=_QIJtmXdQosC}78)R>
zc&&S=F_!&CKm9Ljc#Hq`XXlDhE!v1!rg=(n#Z7R(^XfDxIo|b-N;`mQfT3VzJUh7)
zj#XTi60vHO9<Nrb-^_aEcJrH=r5d}gk&$OyP069vaLKynIQ3DicSWgnGLk(grhCvq
zTreBqDbG@AYJ_xo4)ZVLyVTp|)xjgTM?SM(c96Nwsa@%=+4jF2-SiWf^;g$$o!_mD
z`=6GRmdo;!rIN>Fc~k$QKj8+pGk2<Su03WYJ=Ywgy<N>zDEqX=eCJvV0^XA)nWgGV
zybUv6sbn)B^8l~G^tx2xVZv(oiC|{Kwuqs|ab{Q&sW*Sf5SeD))alw`MByGj0~fQ6
zhdP`|vEH(s@tFyeyQV{>kc%ayHg|I8I>ut=gI?+du&u9J>Y>aaRaO(&(?NQ_u4?qa
z$G^u^!g$!<3w2IEca0>|)6E((P<Q9wTT`<hGMV*Fj#pik9d)?AancyAlGPMfb0bzZ
zP>aN`BEXm=olFO$s-+^zC_^>;S2ROM`GZNUlcKNdsorgLl<!<;^-N2OJS%L({@>z0
zF`gGxdMzu+ooa!;B>L+7)PRR#j0#aR<zd-?r|3x@)`wgEs=BKs%w+v1YMYTF*@&bX
zb~S3LC?-ILf}c;!DWa#5M5eSALj5E6Q6bV)BeSRB0&9+<#jnsQqP<*T+0V4rb+^q-
zWn2?Cm?`)sdg<flP1ioX4c0WpGDRxaRk@a_kB-!%>0*R&oG83%ECm^h8d`bcwU322
z6;}Stz#N8ghTtc^m$}si^MbeqHz;VdH^0zbrs#@tn95e~n9BG>7jj?S(0AyHj;Ng~
zOFV^P9EPbUnM1`(BMeVHfy$B&@BGb3C8CEJiSUt7qPZqhVgHzm^lF&vRajjax`WOl
zK~-Ubs~6sL2D3hy%#l3OVbrzuL`VQ!cm*BcuVRuaOND%6#=vW==6B+5EY9OmGf~zz
zj++<tH)Ae*@{G}5eo^n4o0~!>)Y{AgpIfc2GY^!Ty4wKkoTNs=1iv%k7)@X1GVkb@
z?Cl?B1M~3@&dDlFA@dH))8JS>s?bVi={ho>P=fiKV@#sFq{EvBJKHMiGmFuO*(NXf
zlTIaec2Iqe(FNRwV+>{5WFK|(k(xz+@-yrsSSzNed_m8Nxbk5}F(X2EHb=1|ejtdK
z{_5&0))+V7+|TJY>KN?}Z#dU!<`#w<pG5~(6|;~iY#f!1VQIT`Nh8eIrFXG9Mc_Kq
z$oHj8ajlc>Ezfmn;=v_v$t>6kyi8U^e`;)gbgf{1uP>~2Hj_d<c`MW*=IwgH2B%Ta
ze#}c=qhfWTBIf?z`|SbSK2gu<448nsuJ?!r{Cc22iScrva4^#&sK+(vKPIa%x~gFA
z2FGV#M=%LefEmjwaLK`H48704)c6Hp#4h@miEyCze0QRHC;JO8m0!fmg>*)nMGq#=
zp2HdLnWdR$2$n-+5n{fmd`%Vnh2CK#ymK^DudrrTF_%2YJm!BUlS)+M1@POeyiWn<
ztm2sRsY8wJ&(qoUQdxwo-A?B=0&cdRI@%7L^h3+YWGW)w%nz$>t<Rh9^(++cjbaGB
z?lYq78FMaMm}t2mg>hERB=W-H<b&xIs>9cP#4l<ROng1lmGzmKtImXEabt+=q&KKC
zs;FM2W`L7FsSdiM>}_}(HY)g2V>v4)#cfsYf4p)F`+J4&odOd|)GPEF?I%mq4OG$3
z=o0qJXrghm_=Wj4G*cLl(>!B-BZ8jjw{%Q<nM2B;#+RqtIH$%jhgx0~HQI|mRE(&?
z^rag!d;?@|*@rowgP=*M{-!R2pXZq%TdOOw6CL4#lbNP@r<0lSe5bz94H~E*lc?@>
znCIQWT<{5b96VpBkE>er1AUY~^?U?eeXRVbooa)c%KTPd6##d!p#mIYrp_O3aZ6R=
ziL%Ly+M*bW!3{e65bDG>s{A`x$zHho9`<p)e9vTEFJmWcye04Hq=%ZMi^GDV<x{3A
zbHbXc5km)*7grhyA8$jim!h?3BYz@Ba>;n+q7D-c7f@hA(Xys%cMzl#cRWC+(^qd2
zZ)BL<3*Rk;!q5ut^AMC>FG|WTVzMsrzYgjH^MK*x(Rt#25L2s%^#gLewXDiBm`qD$
zz(Km{k<5(EW}<qY>O^I0BpVoe<pAd344!8g|9W0lhq-1G|9Q|(R)K&0L?&I!Ci4Bq
zba50<Y|{yF=LXdDMHu0Om;rRc%`EiD-I(&bL*F!4Tj?Zo^8SN}_3bd!b9DA)gsIY*
zDVu<1v66|XK`NI%FWZS~s-g6eHuZ!VH6K+3MP@2<P>Z>@w|I>jvsgFKNje*KqYP?9
zcT|?2m?Hdv8hg-t;^6Xwe&~O?`H$&stwe%cBo@dIa;kc-)>GZP@$+}oM_9=rc+qEl
zMXgYU=)OwBl$+~~N-^bTz>*izH$9S?C#@!W>Q^A<9z7kjU!mNo0E1vs|AF~m_}L{)
zf|U{LR3OuM16Z|I^sX;a!*YXzt57;Vs3*E78GlrS>qOOusm&^4201c_>CBHzU@l;K
zw=i1R6DE!O%Po2<t2kb7R&&KTSxjz}f9qHjy@leMiUvDQ(rF#~5y^1mQp_>B&@T4q
zSF)b$0e(zn;(IY_%5~jM9)orM3;OvH&$;zvx`g^v_HXD}Q^j3Yd!QJFQZbq?c#znn
z;qGwTsW8&t=mk5<*|3h%MD8cGON^CcSfK=V>Lnd~4XXZl(VcxwQPcDs5k+LKW>4Rv
zb4AO6awJ{FG4|SDcB6OQMkgYTS?DEenF`a)!qt{%byp_CM~Urfi;S10;r+>?7FuFc
zS(Pc#8zAyme9Y0xKxI5ADx%R8=k1n&lQnp{cqV~wF+-iI_AvdKA~vJ@^yaCi^ON(5
z=u~>lP-;~ul`V}Yd<4V)uKyCd$@=}`rd~=%T8l~Dg4Bm-F^g&YOk(#iQ{=O#cNdwE
zKLL~YN%?_9rS&6nOEHr>MRgY?jdIkIL#)pR)QMxvQnqFW&j5+ekPT_<LlCh!pK7$6
z-aVOmP!CmSnA)f|soE$z2k5HL!KWG<A@V-D*(SP>-*snZ$jgiA>M3UuEX43;6-A$Y
z91UQK94aTWx-;nX%Yh>ov;nJrPm~rEJ;?ZN@)^0kSk~g}>2d`XYcd*K8S2cRvKaB_
zM&I;`4C<t-$yaDgM_@5miBV7S4|BGqd6(<N#u4=%J?$l{QG<-?CigR|Hwb009gOW?
zG`Cye(K7b*6rF5S>S+@C)k%Kh2j5?d3LLJtq8Yv>()*)0y;D!<*DAxaxAIhPd7Bg3
z6CC+O?|uYL;1V7CAa=MZYw{OJv=er1A$mG6?_Ncor}KJ1)tE`NRg{}Rxd3=(4d!f@
zG6VXYtnEq_xG1Xfd__@tCK7|qd9U77^>;dlOlA7<kzNmP%GC7px~~x~hLAHYiJ`y1
z&NpD?MxCHma@W~n2Gh{z!RbakYY6LFmfc(oucB???{Q#uYi5)ulbIu76MdP2t&D<m
z931IKH05Bn^&uHm4K=|odQe54u?DrtzIO1XN?f@qh&_P5p^UtWLb*u)$-5_U-&<%U
z<6v&jS)a#r;m_%3$MMwvP!+DD0>{&rrBZ#`FbQ3do;;d;8YqTQH%g(cOn_09M&HTO
z)9B2DL2qAK7hgLs-R95WNq>0%P1T!O{iE>P{;W<x`4#jWD%a56PC?I!6{m@_)^x{*
zP)=Hd$-U$)5cU>*ftT1r{}ZD^c-uB=An)-UjDMtR@-*|%)kDa#jWEw<#H7$AVVIAJ
z`leLekJO4UYA8=R5#)cOlHnD_M4|u95I10!bUeM{BGB|dkxk#+nOx2SZ+@JG@D}5#
z<TY3U_80bFUALA~*w2AvHjatx2gWo*yQw60F$I2vp9<!D$758CRI1!#+}8s1IAeI5
zad4qds7r@=!{1n|!sK})>fjZz8{cRXJn|$8?q!{bPQDtIxt{!s^;@gU%P;iOoEl+j
zx0~FF<~S0Ke*l?egQaXn<3FS<VwvhG4jP}RnU6Rb(LoFr>&d9fq7<tVjH31@JChf^
z{V)|`1(DK+xSS!U!QHM<3G=Z|AE{VQDuxC09|-=N^yeQz&Qzjj3W%nu&SgM~MNITc
zb}CbkLiI1Me~05_6PqqoPx!!p9<Un`+`li#cMRQZ9>`Y%6zfBunTYN^Np(kg`G9tN
zk#1)goUsFU?Fmx-qO#0T-jj1VWL<GxN!Lb&+NrKlm%MqGK$yo$RGL5Jn;(<h>I9ue
zb?|a8u{?}ZBtv1mWjT-0Q+(zc=fS!%=mDW}1RYI#I<wwr0hQ45cEBL3q2V1xA3H>?
zzt0(=;V9R)IlDAS#>2ndWhrL<tBUh#5}8vCz7xS&hWt8H-=sDSBg*cHQ=FctA)3fK
zoVv*7e9UlAEE(KQRP*SlilO6HWv7Z0(GFEqb%Q4#WWSF~i)_cWeCXVM+_eGG;!d=7
zN8!v+{&bMLsA2!<R`NIF0N7AWwnYakLB3A;U+?<}4ls+86ve3{ux@g@1I*&AN)`2G
zagg$*dVzwoix~FdenaW_Qt1$Pga4iAj1Cathv3;;IL9%GdrhM^J4~KjLtpMJXQ2D9
z7bnrKp5h6_fgW3_iayMF7o>jY<EInp%ofNIctdA#Jrd}$SFm%f^)m3T4JRv>f@>Y%
z<UXvcKri?Y{ka3Exd5&1gziFT_EwLRm#Ma&P!N_Ab+3rNg3PhMVQ(hGuuUA8wP;w0
zaHnJN$V;jS-SKt463z;A;+_76$2j5Ki^WPZGXo{>9rueBU+{s;gN_U7vZirDtTu}B
zHyBJE!=F0-!_znfvusT*`J3+H99Qc~Rmr9YiWSx5CETWyaEE-jS%1SQ{sNC*u+J9u
zs4EC~UgXerrr5jEC+6YrH?@~hi#@#s(?7x4g$zzv<faz;!NzZJtvY1LE12jVyd;O-
zt#+bPco^--*1>eDPsob}a2%7r|Il-1P@x-vIoElIiPZh>tVB)WK;?{q70d+1CxaZt
z>C1Y+l#6jPDHQ!7n@V08RX0@jB2w4uHmKQ;L7g7t+HlTxjnlJr1)QA1L_t&ZC4b?~
z>4G?M-@FWW_;JdwKk;yhjGe=JpH^-8vn1>PoQN4sztUe-kuBv3`b``sILS7+Uq6s*
zAiY5v-DwLWQVt<<PvS?oP_i3>SsRRP(w&oBaqRa`Vz8_Uf5<7*d5Ygb_<a0y5ZB*?
zOIU(D{aaT>UoOl$%-|g0eQ@{yh&YygX(4uV3U3Oyc+|Wlsu~|~np3IPZ_s#eP?=wY
zur=T_<*DKysGz-31-meZ9|i+>!AXcNVASti^Nn7Kl2J~KBttS`ztd!G@e{quZg$`@
zRl!NUU5iT|&kj6B1CA%#v(+JeRvp2KXdsT_TU<g{oCiLX;8fRe<B8Z!9XSfOT8dZx
zLcbQZz|u$j+`p`HJx&CM&?DZ0gO((E-_Vh>EA&e_d7emFhLz}v3*16*f<j*7q~KQJ
zsfVgRI0bcxHJwLK^_Qv(UJk~|7*Cx2MKzrV7ki`{(@V|=S2J;u{N;GjSq-6*6`~t|
z10L;w(`*MJw@}|)<|`d2JMfjg>Ny(!wI9qJ)?9>G8AJ~;nQGaTvn+$rZidsJd?R~$
zvo9w(O_oRGR6Af64OpF5RP76(`9nI3r<{vDss`wv=)kSo$!^9`*;?os#KdaYVnLpB
zn>wNziFNGIFQ8rnPQ45zT5gD{vJ~&K3LT=EbWlO=s_keO74eX(irFd%w29~B)E7|A
zj<1`B#+;y!bKd10JF=0is7~iRPF!W5I>4=7p;e6ne;3FOoK`CY+I=;r>$-*yXIt8#
z4-VD4;F0Bw6`bmla;GRutr!K~6yV*asb}O#7b0c~u5%0HI_H93u*#dr&xZ7XortY@
zJoioX6;@3)lOEJx7wY3fHCjGVeRNk;&4$Fza88Rg=9KO;GH!-!MpUGdA^kXk)|Qnm
zj%w(M)8~X+jnUQUo=mvPV5+H={v=qoM|Wt3K0izx=fAI$iD6*Jb9%s5=%CN2CB0-W
znCL0)b5^y%FMPl?Tk0rvUNweMPKLV_#`~y`Cs$ovR=qg6x)i<F4^4cu_C~GAO~;y|
zzc5kIjp*FUn%?2OS7&sK<6v|W`ih%a!)c}C^iEIVFeRx)E?kA#u==a|F6h3NEIXn$
zg6>_(qU9jvb{xa1IId0U<+9B^s0)SRrBkR8=hY0HsHQN)z3P%`p*zAyN*VKY5%m(z
zbRYjB7dSo$Rx$=ON<=%_Oz+;9>)oQut%0t*la&fXg;<M9wbU$2P5%t94IpxtiOcLK
zz7F-Kt+*!RRRgMA2Qu1AK1B^lrXTf^b5ZJdQuCd3N!j4qb=4m2wgC4%rE=*eGC%WI
zrSw7hQfyNjVFqV;!Z2cP15+Z6L7-G{{2uyT1-hH<vI$u<A1-wo*58C|_^u1G5~omJ
zdVzNFpk;nAvNl@uV&dHa%NkD{1xpK_>q{cO4hS<_N5iXQ<StH@6{ANq#S^iLbIIYN
zi8&43_yH(To2WaEr&$oZFGZdeK_$)&@)ecoVki7O1${6YXR`<0+GjO{uJ?l3LbXGU
ziKa{I2x}`X2CA>PY_qsiE>2LrP`NoBw;k89F!*x_CO(utx)ti6fYEk?zpTQAvolk1
znvQrb)pr_uyPiG#g5psQ_oSEZCC11~^lZ<`%Q9RkM304i3$pSI>=hT4n(`GM{`iN}
z$W+KT6)nf%@p-^5QrJfuZdV|l@hlWDgJ&*<J{3XkW}wS>;f!^MJ<p|zE>de?QHRYl
zbRVmEZg08)lkV;qinBx=@q^QiMj;$$j^fPeN}T^@Fsf5z-YnKKQ13vEtS<(Dk6Wm$
zrBRd(x}sn)haNpmcj8>X=HClbpIvl^qfm=O^;!109`#}zx%NZlZ-Q=A5GEDL?;}u#
zVyP(GaZFpnKBDo>_v^N@EQ<YJ)m7Jre|v%C{@nXMEblC{O%d`8Iz|gQ)!?%N%-(R1
zM#P67h#exw@K!dEZxQVOxvHm@vG-F%ANf1DISG^s=iGl$kq;)8O2=D-F4U!tu>zj(
zUN2cdjt0T|flYs~G76XYH@Ke(2kj!e>t<@A>>;DklU9r0d5($1zT#x&U&L>yOrw)n
z56eD_HtWW@+GSw=bE--bTAEe?sxQd90QY^WsLU1if+JJF6ts7ol(w8`UCb`jVV}d)
zNcdJswI1Y~%qka05gJJ}x<K;>;3TNXN&IV6lK|pnAWA@%ZpHb_3+zK_`GEes94psW
z?}JMXfFJFnm#a!vP9S$K!|T@aHa_t6Bs$**{M16Y*c#$D7RG)E@2Lqs_)J!4x(qU0
zJYy9ds8*AeubG>OQ$H&C38MB5oz`bQ?x8asY>d1Dzi7@oHzQKkGUIec6<3?dguVFk
zH+e=c9P?8kdm+v%_Q#3NqK6ioJTA}M|H1TCFtz(R7}bz_yrc@8z%ehtwI9GS>QQ~a
zkuiSsgMGp6*W7&>_wR|iaZE2(o3*<rK>wOdtZ6=fp&xx~c_vG`G7&Hd^}vnOpzC07
z?_u?OL7)9pwM(F3sCdhn&;!)(CB$)i(D<}EC<_=JxK|%g^CMTji`w@ub0L0I?L?S`
zmuRe3P`75nJ^zHAKPT#b!^>TOgZ~>C{zPp;2`EnnE(2YcgHOB2?grGqq3DTsR3G|#
zw;x)ybeGF`m-SS?ACo_8sV|<qOHGvTuGHLTI9@-AB)OM9rVr@!0cNrsbj*!@c99h{
zaF0@{$O-fY_r;&|A3ISWJ=tYn+>n-ZXs=NRHW69xRRuKf1ht9Z{m3~t(Bve#%S8BB
zJfDqFR~5zYI1RTQ02`mkXK+|m47{!(y2n8Bu{<Ywuc=OS!l&_H^KgZYtWHZJXbaWl
zE-K**P<@RoOzga((*MasQgOVLxv<kna%vV8Yz~p#8(w2l3zot#Mu35FoY=PD_8g>>
zUdp7~9Qurp^rZ=`O<Ve)&R|M1pHN|=wiIKQqzKxM#y|LjJo&7$P~!i>X?@6A=Y?<l
zjC#Bf?p_g2XmI68Am0kKypepmLt~gx2vORC)s)0ru$(}xS*=&ddw4d_=&uJ0!$9Gp
zH#T_gE^-NzOjF={^pVVBZAVF%iRLhtj+l7@JfoB7o~6;WZ0LaB;Ndpv!c#hyaZEGi
zL66@HD|`oQo<^_y5q{g8dNl+L{z`pU>Hr<`WLR=%w2Q@L?inga0vVA^tc*qj+bHI%
z!Sr6usa20ruB#CXcz5K1AsVCjT_U4<$@-vF6I7~_;F5&Jl%VVWp|IYhkN=>;K>>&A
z49l|94Q;0b8zM8|N*9T?k+^D=i1xqe&<>C{b6^kW;K0pvd)B%Y+GQ=Cr4yap43Oud
z`pBnTNPG;JxXJnHZ|v$N+=YE$*-hpRC*qv^M=dMPsoXrQ_iw1#ubD4-qdUMxH~;9f
z$-Q5}l;63>zu?Xh9I?8h09`-_IgR{W#XeovE!AA!X99b>4sK8YbrY3V|3}|eMb9L2
zGnEToK7|~sLvQypm{3u!B<FJwv0cH1F5;sMlrO>ladcZn^+4$c$BqOiUCj3E)WuOQ
zTA+6?C-$GC*K}qoDFC(Q5*p#pV3(Eqb|MQWFlA*yA=yJDO+$yz{X^Lmvx$;&=pdo;
zE<N(EtU@^MZe!kOCu=x|T%Jn@e^t#?A<X|AgM%I-vKFgRDqLRGXQ=ig>EpcwP8UkB
zgQ}eXYK_#@)gh|E0i3pdV8~azo#Of!$kKu-+ke=vdSqE3^;E!I?t&9JnSm^$*?V~q
zhfA|gH_+ss!Ki{@)z|bgbrT=3lwK{r!rt?PaVYz^>LXCg*U8)9P#?J&x9plOhWmdG
zw690^QkwNE2VMryo0Xup*5Xr5O3LHtx0hiL2Cl;!^xYV`h!a$ux2g#Iz#F%99}IjF
zxGd!|oXsfqcp^&9J+6P2-ue<f{Vh6}KqiU4z}n8jY9^37aeSUYXX?N$R`LwBJ^)my
z4VneZE$W`SN_R0qS5v={-z8X)HmLGBrHkq0UUG)4KrOz80yji>!1Z#%kEe-=Y9`g%
z%1lWmd5em+3B7r&IZgG0E$-2caSckLUT)x%hGr0xe{kJi#QzXF<dG_l?`a^4ps>SC
z*_&}N?do_oiy7uWiXs$4o~_|idnVwoloVIF)>d-)F`op{!?@0MOM`i}$&9>ACdK1~
zPUN#|?Cd~4{50GEI)?n9^%{*|OD?|S(>|^<_3<~ju!FgPt#q!E$wha5VkR{{7xDSC
zng|}8S0$(#C+Kp2W#9kO3Fb#?@GiQBFf@z2Oedz1H^rGz`y{iOm3$?t(2*RV_Krmp
zN+5=Vnc`lAPF9&U%#FI}$waCLETNay_yrA6<sQ)W&Om`(idXzz$B=b>i2MWaH3Oxr
z2A>z;$<%fM)eIE8i<<VGQ~WVFLw~^qPLQ$H`4o#J)TdIy2X4|&<{(lFF>g^7#`vQn
zoy^r<pz{}IDqyMFCjZmt%skXQfvYl%9Gr@e)fGG!RM9@{K@gv&ah6q%;0^`I!2V2a
zSlET%_*9T{WLc6qn<>sem?!cA_gbO;YNn=E!za5@g^N)a|AlFU(N$c9&E24PiKl|`
zX%NiqZDn5LD=1}fy;^(*Pzp-Pd%BAjAnK2po%KJo{)i6SjP<(1XVnZvdG123*n?I$
zQ=Q~9k`n01vze_uq!z+9x8Z&_<#Qt3n67Px#yi#YLH#|zblY*Y51nT@D!>nAtu^}B
z5_rdQ_QxR)$Z%bO9doL)%rC4414qEXt`Nn!c%luk!RLZc$6`9|9BZ6_uGWh_csP?I
z=ZVmm|2e^><q26HCF>xO=_yaqSzPCHL*}YX`A`PXi!S1dRhZAOfKxJA4uUfblkec4
z&p^ifL`YM9x-D_g8fSJpYk!fqzeIic55Mbo)}km{T{5-pyZ)hQdGa|tA)KV>`#-i(
z9AwA^znI8(4#E%fV-9nRS&_QF3szH^DeTia4|;AWENwKZ!9Mi*ckIR#=EX)4H~rC%
z3Q;{1ad~euW%m$o;Fxkpm+FTGI0trfjUK-Fj~Nwe+){pa9NAtMOlSie=uMTcL+4>5
z?%MFQR;KkA(>qV0!>UKzZI#VseyZbR9F+W2vs$=3Km3E4u#HYI)S5UWQ{c8P?l>Pl
z{1#8ImR_KWGgJIt)rT7vL9gmb9ZJ<gPh)nkvx)>0b}>gan-1wY>SqCFSWobF>-i*_
z!Mx#o;>TV7M4g<257wQ2^#H1I9J3mG<u3eW7u-g|My3(b77#M0ENz6KUsTkSL5@BA
zN<r-@52G^iNB(7!H;L}W0%w_`e*!1p!zp~J+kc<|4-qp_7MALBD3lFQTjE%~KR}oR
z<kTp7o1by}`?8Kdrn%dJL-*09OOs18<O8{$zdwQL{?Hoh!HQz_bvobraw+o+JK4ov
z^!{;p4?n{U7tt-PWSu<u#H3=V`ips<_H@51P_C`&0m^DCbmpgcOk3bH&8d8$xbaPy
z&=|^;>_obu|MYFMDgA$vc?!P#1P;~(_LqtS#b=6{#Z)}1!hQB91f3zB+Hir4s>NDf
zrMIoj_vPgit9}6uicn|nzzRpmt;|$@rrOU2d2WGcuUWkw?4X^>kqR3y$WtdZH4^5N
zPK3CKItjLT(~kmq{JR~+*uqx?-=X;l8&BlM_n7?YVg<ALnt~~r)M-B9i+{;RM-(t!
z3*Tda9X9gc$#-S&yQGRc`Rb1=xcIt*yO{j><2&8>UN?S9@_#q(=i=Xf-1q<c{m0+_
z?|=Wd0{^!H|F;7Fw*vpS0{^!H|Nja!ZPc<=5&ol5^ZLIws?)4hF8<!ETaTVGqxz2M
m6Vr0=pfNGE>NKhw^V_h&F%?Ud5p^52{LO>!`BCRZ+y4gytr>d&

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/9.wav b/etemplate/templates/default/audio/9.wav
new file mode 100644
index 0000000000000000000000000000000000000000..1d828f1aed4ca85ab390e687dab0bfa4910678aa
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/a.wav b/etemplate/templates/default/audio/a.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c3dcd8a23cd5998b064f7c627ce7738835793944
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/b.wav b/etemplate/templates/default/audio/b.wav
new file mode 100644
index 0000000000000000000000000000000000000000..9f380c286f427a472da1dd42f03201cad10af0ca
GIT binary patch
literal 22158
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
D<2OVU

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/c.wav b/etemplate/templates/default/audio/c.wav
new file mode 100644
index 0000000000000000000000000000000000000000..a9b81ebb1a1060f68c7c068818410e5cfb317b66
GIT binary patch
literal 22158
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
z%0A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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/d.wav b/etemplate/templates/default/audio/d.wav
new file mode 100644
index 0000000000000000000000000000000000000000..66ee3a1b5e660e4f0ae3461f702ca182d169f55c
GIT binary patch
literal 22158
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
E0L<U6G5`Po

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/e.wav b/etemplate/templates/default/audio/e.wav
new file mode 100644
index 0000000000000000000000000000000000000000..d8fe4500be3e91240ef378936fc52889be2e112d
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/f.wav b/etemplate/templates/default/audio/f.wav
new file mode 100644
index 0000000000000000000000000000000000000000..4046176db4b66a40c9b4040c86684f836118b360
GIT binary patch
literal 22158
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
A6951J

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/g.wav b/etemplate/templates/default/audio/g.wav
new file mode 100644
index 0000000000000000000000000000000000000000..8700179f3d19e4130ab883edd6960a1a75ec2e33
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/h.wav b/etemplate/templates/default/audio/h.wav
new file mode 100644
index 0000000000000000000000000000000000000000..2e33c4e80b3ba19a32e88dd12af5c562d8beaf44
GIT binary patch
literal 22158
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
Lyocm2MBD!ZLCNFf

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/i.wav b/etemplate/templates/default/audio/i.wav
new file mode 100644
index 0000000000000000000000000000000000000000..cf60cd80eeacdca0fd19d9f8c3665e34e5a98146
GIT binary patch
literal 22158
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
DJT0ji

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/j.wav b/etemplate/templates/default/audio/j.wav
new file mode 100644
index 0000000000000000000000000000000000000000..5fecfaeb716360e760efe353198a678450b05071
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/k.wav b/etemplate/templates/default/audio/k.wav
new file mode 100644
index 0000000000000000000000000000000000000000..27e1d37cdf6fbf441ac3ccef99f96930b5ebb8e9
GIT binary patch
literal 22158
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
DqoY2+

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/l.wav b/etemplate/templates/default/audio/l.wav
new file mode 100644
index 0000000000000000000000000000000000000000..139f7cdd00e546bf17cbb76b59285e8e533033d2
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/m.wav b/etemplate/templates/default/audio/m.wav
new file mode 100644
index 0000000000000000000000000000000000000000..08d5cf53732d5ad9143fe35bd83cdc7e4ec2d486
GIT binary patch
literal 22158
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
O_2??$oZnX4_x}Jjg^axb

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/n.wav b/etemplate/templates/default/audio/n.wav
new file mode 100644
index 0000000000000000000000000000000000000000..fba69231b99d62a94c0d33f23dbb7f0bf6ef02b1
GIT binary patch
literal 22158
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
M=_$XVCH@WkKabd@bN~PV

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/o.wav b/etemplate/templates/default/audio/o.wav
new file mode 100644
index 0000000000000000000000000000000000000000..e5a3578c592a97de00812a1000d12e01c311e42b
GIT binary patch
literal 22158
zcmd^H1$!L3vXq9FcMV}?W_FlQ7#wCshaF}nhnbm~nVFd!jv02%_QK3auYCW;yZP?<
z5_@+fwYsaTTcrtZ-Lhq??u7Jc(!Is-v6G7g5JD*a_?IW77=A7gKm26qpvi->|Mman
zf0S^ZZ3T@7lAOfD4aCc%cn)GGI%hnZt6U~-{O%1mlJ;Z|Z%cNNaQ*?Gd&pPwvP8yr
z_L2=`A_*er@R@kx;y2iCVy6DQ0gvU&NDq3KG~{`CAu@r)ky+#>-^fdl_2d)(&TDWJ
z|3*5~I-~)gfw7`^2)Rcpk%@dTmq;yAmXsn{Jc%dcvx)e9QT(hvem0+9;4MfxuY}pW
z;>9si5ZOs`lW}Ayv5=EIk}ISraga0~Mn>}<+{>46k(}Z0F#nu9jByshdy{!&4w=Sl
z;z>t&9lo5H=u{F)evld@na|`E$Uf4SXK+7QWIa}?@mNxrgt83Qk{ria)i7=yewF7V
z6-X13i|iru$zpzkAI9Gbkw5$dxr+HL!`iHT6o1VQ@+)K;=|C=#cH}!BhWXASZO98!
zgskOXF~=zG<OlgV_+dY8rKQO*mchpnGwDO3_$waHpK?3CeT3X4{m4x=g_ojX+=`Xe
zz}}ho4xUEVk*Xw&XYzT(NETuSTloW$$(M1329sAT6)S#;UC{VLa+oLSar_3>X@V7N
zl9psFxk&Ewll(GPZHLX%F?I&|N^)RL8_7xXh`V_oev22T+c3js<N;YtpW?T5=}7Vd
zW7oz{L&#R1g;4@Y2rt1;lRIP>f5WemQ=}{W=K`MHgg)S-xtVn0%`uB4{QLq*;Gg(R
z%-u%X@cyI{y-3{nS6Nb=H02TeF~)w1d9H*F*70vV59a@#|KZb#ovtGdvDb|KBF9Js
zs|)+hA=}A#vKM}3CQV5-tf@G8%Xh;!Q+Rj$e<Hl70BO(5k;7yG@6OL+SIuN0Z;Ai5
zB`wGe{)IIlIjM*D<yDD;&V?Nrzr<^k{A2*R%tw*mWGMXQ1gXx8@<ND!j&v=_2S3jw
z5%_im%p`#?<_ho4fAU|59}|Ei2)>;TzZw9qpGVe^L%b5Nz~?iWOeO<(PuiSb<PG2j
zyLc-6XFPe#2k=~2rxCl_7(2QcKGF$3SeUMa4+oH~B#pgftw|$z#ut{G8)+H(2wv-E
zi}Cr|q#(J#uai%B&Kz=(?}4vZCo_nLjD|gAx`2!#o%s>$?;Ab>Ho3)e5s}X1ZTVaN
zj65UTILEG)#)_N520O`e-kM}$2f{J_A)=5KybGee5a!jFAH@zaeumfQ{a}4FSw@y%
z^z-B!35KsZ$Rw=r2EU1Qjf9_;#=Hzv=d;-aei46?*;dA|`!)DnQUWWShWYfR;fVak
zh~fycn7rfb5#yst9N!NQ@UYkT=0u*8G^OK-6>}R;9+E2LIMz7<sIZpT<zc)7IRH#+
z&DXK2WHIeTO7fC?6@S2=lSAYLUqW7!zdSGEIfIoW9bvP!@UJ4|Dg1UOo-~XM$8%Z`
ziFPChcwHdKQXWBCV^?PpnfFJ`yu<!}<!g8^%&|FeEscF6l#b@L`D{Lr<Rv9|Fu%-I
zl0xG7NvxqaxeU)5h8?X;bCSuJ{TtY)B``q1Z<k;PYLYW#JU_)m{vZF$`;jgrlwaqI
z;5k$Hb3{M@qVFs`IS3=~0!sho8RR{01KTfPm-#W$pZ5i3CUf8)tW=fsrUx+ME>ahk
z&E(sGn~xElKiPM_6@J?dw#ef9$Y-9$pO9hX2;a%u;qx_sxxawmd&weT><PsC6H*az
zNbsHUd@Mf)%MWCO`B>7648rW|!Tz0iL3mU!;%OP##uPFYPZ>a_W4|hqk>nI#%O#-y
zd*FR@cuWI)YZu=M3+LrcxeGg0l$N6@yd$|y9<w%VD6ofN{{6^V(ia#s5!NU~cJgba
z1}zIaJ;V$z@SbETtd$2VUd(p@<?HjI!0yj{7~4f&(g5uDYy8%PJq_S8pAWRSi~PXI
zcB%m9yCP;J_-tMH=W{-We1y$D^MA0>W%`i+W{b&2;8+X9M?Z3mrLcJNj;w^m!ucnb
zhL~FfYhMGRn1Bp*XkR*u_`_$T_&w%@Eza>_d=ggRk3EXwIr#?6BoE0;=aE%F&-r{a
z^2>4FlON(Q_;5tr9R3)76$@Pd&d-p}$h7_GLS&gG$ZFqUsbtLWG*IRjJx^Y<0YH=U
z!0rnCIM(=(cjaYhJNlg+;xVvB269^<{K}8+C;7;1j1&zYUBr*GBZ&Lfz=xTz`ZM;9
ztwa=bB?qz6U%Vrq!U<wBn%%)O%Yz9VgqOTTj;w%~UIavLgiNvnvAqXaI~I8{H+h8J
z8AC>31+Wo`L<EjTCZuEyqO>2W1SDum?(rem%@af-J@|6$KyN+)dA|*Qa*Vg&Re@9I
z!6O`4`5itNh!RQ$B4!5wCt8wJ;Bq)V`3pG{dym{*3%TJA9}Y}3Bl9v~p+MV%p?pUS
z_z>MMkZHYaD{MXsQ56hp76ymd&VK_X3L$m_v9f2_v2dXBcm9uULd1*&v$+eu{lR_g
z6`nB*(Hcvt&>8UFnWPLpy9Tj)20QeMZ-+O}hc9mC)%iN0Uw7E|6LNoZQjJc*%o*mm
zmHpvY_#xH_`|l;?$!~rUs8RqP@EfsR95FW-OyLH&R9T?UC4A}~KhF=5A@GBz$W|7f
zfc!C@$M8J-J+hEU2J`a#Df7da&56nhuL95bj9DR~NGsBtJ7J&O!0YY2GwDI@lN|g$
zZ$(625gEcjm(UGBqg;sLKFG%dfYN995PB9dYrrfvA&yoOC+xeKBJ+~XK!^v(iZf_2
zS{V^CpKm}MtVZPaB@Jml8U$~s31k`x)N2a+`@mBA!xLAr6YK-LN@4f;2t@2MVAw$T
zYz0=CZ-OuNXAa(&&tX~YH>;1CHQ<5l3R}+GV>au7LV1)Ia#L_di8a<v=vn$37O1z?
zPV*okL1|+SF>DYglWXjSUQ?^8o={WxYVncSOL=ejB?SoUX(8c0zpJ&>^XuKTlUj=Y
z6fyXK+^6%&71BZsp)=W6wuo8SY*q#_vx1K%pM^f+38AWVM!10Sx9bbl5^9VuMqQyc
z(5|wPdRJZM&-I!59M*{qW5MhQ8^Ct!IT0mp{+lKsj%o_?MVDAu$}bKU4hnUIl|mQc
z9hmKFu#A!PCcTeO?F82ug52<r<VGZUSRQ?-ewu$}8`uft+faCXBD(^#d;xykkbb0*
zv@4Au&4tclIq|*tQM@NUmfFk2u+o%ax^3!W43PZDM|HF3gf~vjr>E&>^ncn{^@lgr
z-995v$_r<B+>-b?NnsgV)$x1)?Jspw&KjRtdYBbCC!eeK@<n*xsk3#$C(!`uhAGlk
z$<fUJfa9Qfh~g6q2xG8124wCiOjQ<`x>|qR#@IGl>KGl$4yiBA#eMopwVThbW~#Gv
zLEr7YpV=d&Q)0>Z60y#xJ<-=<io_q!DrqX5!;~i|m&32BVL6>a)3uoye#sY{osz1$
zPm7N%FYKos{rnOf_5FVMx3yL$^*yiCN2Q(c{3HLQ>&gqG*Yd|c+0W{K!x}2jAm6d0
zo%MP8XRWGMgEbSFywG^sa8bCUpYzRf-%4+gv>^KN?@vGG{u&a!+4(1ZKE3EL=YE%O
zf4;JTV@*^jq~1@DOA2!pPM(=@S~n}ptdj#S<*1XRe&Bb<0`nxvtl#o(^Elka)SYCQ
z9BI01?d*5T@2=yF<F%!bqLB`I39YGGT)m@5vOvV~VCrM_d^a-lCc9(8Bi~1ji{2aa
zJ0>aSaf(X!I2z@7owr{OpS6Pwrp(%Vl~mDHJz2?kshLe{9A_Qt9UttEZ9VKB%L^%8
z)7@3wv%CfQ9ob@bT0YncJBmAQI9@r9TFWX;=>k?+-^a$1dh{EaOlJ$LNCF$Gded#L
zrcqn|K8*SpGc4|9yfL9~+If1xa@C<bZkpT5o5et7t0mPiLhYa4E~!}3T~Aqgm3f*m
zO`0nYGltk#2VAno2nSTv9j-P<WKA-+SGtH9#$wjJevNWGblf-l#OI`h)LJ?uE)|FI
zs#-AnLw|_Pg_YXGj18`gxL1)SBlbidja(YpF#2tLxwOM<wY6KG(fM=c+G)2cgE{vN
z%IcCHkP@6cBWpabYW(Q<98fP{lfz=`V)<@-EskU*e1)^BxJT%^5MnCsHzDALpTVz$
z|8~ELHiN0Xc#OB>cH}cEUJ|cK-Q`HRsnC|KRvTt+b5)5x_9yA@#K=z3HRGBj{FhKX
zxjbuOd!6f1-sU;0S?h^i*ll%=r(Q<8v}UOv(kHN`#<TV={$9r~TX%CQlVonBwBmog
z9kX&|-t^@XSDFsm_S>)d&Gw(-pYFfje#e|o;baec!UoWu;yt0Dct{G7=gEboI9|$g
zJ*7}$$*8J-HvVfC)h2ploH=1@Vsu(7vfq9nSKHig0$Q2J(m;K&?{DVMw6CeP(&lE3
z;n$5@>?iyp?0&X|=5@w?##ZtcUeedeeaEe7Po-aGYA@zj)8FKOHlS*tXrE@hE&b$e
zQ0;}&SYaPVA1|*pbTIyvkJHuOA}J5!^G0_6+cNT8WF&U~M@(}3kd#>Mk;R_leD23N
z2U_Pz2gnTdan_>r3aJNE&Zk}T^_34>Py2cOw%8w7hM7m0-zvZP8+DUsXy!!UR$-b_
z+%mzQVgKq_=@;j}%s<k0*VtJo%G$E$+#-IFkICiae^LXbqT#7@jWuwmB$Jp`zbE}U
z9JwMoJ~lX^YW%l2E%_z)*v{v;m3w}UbW<*}O5d(6bDz&RkbWcOQCfMun6Zfcy#IfG
zF_!nH3C04ZCWhYRx?0iQE@PALfH2y4%9g`Vb`-L8cN7Q+^SfyqXznX*WyRTgvQKy~
zZ#GPk8%Vb#e|d$xUHGWpOCOuqCbHe1EfF81=f!@FZx|mLcOvn5##E`7-@9Cea}RO!
zQks%Tt)_2B=CahCDYuhnXI&AuSQhzR^Y3CmX0B*DWEyH5BDLg&ysq>vSy_6jbk#D#
zubf|!eSo8d|Db?Y_7Ub|@(DhXH6jZHQQ9p(QhFMe7#<jwD2>GD`isneN%pwl$X=1I
zD0lRi*n07De367>u1L=U#o`!|YhbQw_HaccM}5USgEPLRR!tq5w$?X5YHZ%@c;`Rf
zzTO;RoN279<PwVNg*;!grg${%o^;#X!S>MZXUG5i3fYfZ@|ZsuM#%Go*+Lnquhc|p
zD<4q`7!+lS>=Q@xTE3|C)y`+paS?ALOGkf<{T<KZF2s(Ff0t5-eX>r@H7(DWfFRQs
z+CaPJ9q4|WA*Y#BW3#5Rv&w6G`G8J-yRD@x$4oY(CSRvxwS!rPEUP-6bTEvx1vr{I
z7C2mf@&3CV3$0%aKA|=3PWsc;(g694JWbiC1R9f#MCneSYlE`>C67*+5}EJc{>b)G
z^I{_7T?uCr%O_2DzmYoGdgi#ATk*@KaGpoq?(UpbKJ!YNm=WR|L`xgK+fMo~c092C
zvy?ODkqZl*_z&Ootaa`cT4AA^v6k(UEsyP=ZJh0=wURZ&vdnx-DGM9C76OD0(sspS
zm~6OUXs&FM8cG+*dvCFf`p(T!9U|LBmx%2X?~bn-7Z$rUzCx;%PqdT_tdP5FV4Ufy
zP?|0FP0IS1{xh|EO5RMf9w*JRW;$m0?QrOp8>VRE2k9oit6q0c$`X9t$wg&?b+hBI
zJ<T5DnBX_n;b)CE+!PKXLu+Ka@Shx{EHU&qrWibiCQ5C|AgtA5GLIz3#(#`@8gVtM
zR;-ec*Xd5oN*wGOl;NRP+o^zkIi@(K7?Q{vwTthgyIE#|%qQs!-0jIpg;^dt3iy?_
z)ib>?1{>ChMd&!Kf_sX)nRbT0H*jl`eT8GF<AwdTt*-T*sko9~ypMj#Qemg)kz$pN
z#`4C!#w~^=QajO~_R=0^#ixckM@3JJ=oZDJ8^_mi1-o`R$2m8p)Yn=WhxuR3Ine)`
z@i|?m74<ds&UEj}yp%C0%cM`1)|<=vRq)$s{cB1yB+D+bnJ|-$@^<rl_eJTe#EIrT
zwq>>k)^FA*yT`W8dcyofK2OV$1~goJFD1%T4FwEXpYgWwm0^oqhz#|rsnwjPW7Wuf
z(djXbVxK2;NLuZxlyo)ac*Z7n#mH@ne=*wy`7UXq-tag)h20h1&)gq<J$QoD!}8Sr
z&o;&~(saNuQ$8(BC*Ac9-U{9^n#R9Mq2{-?OnVD^xUG%thB?qQMR_Lf7l(>3#O~5o
zxsq|JX@u#eQ8KhtiYudp#%!{8XIem#IiXr?Y|Mbz!SUUle_RJ$X4hiZoYXAuLOG9p
zPe9v%I+lXs9<9F5?Azyw_4M%^aes%e9x{el102x~(Q?9IGAxxk3F&;9R@t}KC$ctT
zi1C$GwkKMqT2pO;)nKV)&QgX-XX!XvN}MFEQMwp14WY(xgTpXVX&`^2W%W^6Z<BK-
zwu-42eLKbx@9&IpwQ^|*e-qavMQ6s*>lPAd$T8ZMDMyiH?X)-8o9QW^<<9Eto65{`
z9gEeT&z{$Iz?9q2UO6aK<eRj+-Y(v`>T!}&sbTV34%=GTV{NOg>&*L%J(T)lU%@0i
zpu5E8N;hMwag1?>v61nS@=FR8^U|LBVUJ(BlGHzbYm68h6u&XCb<(q>Wap<ud*a>X
z9KPLBX~(0$M8A9H&EhepszjaO?dkD){JdwhaC%&^Sr^-ER>4e+ACv}C7`@92YW;lc
z)G&Pm`6KNz<*<&i$d;kjYu2-td#0m?`bxAgj8+y;iOb{=;|}9$gJ2wI$ggyk`(ZXG
zHJiIr`iSHo3FG58#qEjRlaTD>iMtbvCk}G%NiFURQFhqP0RsbmS{%}3=2kPjOWpn5
zt=*eE>(wr#m2%Ad+SbZ`+|t{WsT>gB(#~8}Z}@ts&$JVq%JHVw))m&Cme!UL*1MJ$
zrZdL6ay-2wSj5fZM8$0!V@fj?H)Kjj<c`W!`Ia<<7S%6%3ZzFT^-kn*$Ku3<9nKO-
zKIiL%>WLwVSCR^N-%Ew;`vNNlp0SpbN0DvX7Vk=r&m(yMdPb{^4HRWlW$S2LqV<LO
zsv%t*Pyg~U`VwC!-zU|My5+p`&KPB?Y`I`LX4Xx6%(6MmuuJ|a-V{cQW@W6Qo}s?s
ziSk`OAb(f3$R064Xvw>&OWXxBB9p@s3nZk*w~voZnD4BS*et$Zd|js@^_Op-^1#6Z
zdj_nsZj=r)QOmC`_b&33_9&j8zCZkvT-oBXy|K-(lr`rt-Vkq7jhE6Vs=ItlZN($S
z<;MRk`>fk-A@-Nnl@^!zvXUewiW`M=`bNx>rpaHF1BNxmRfZ6Gr@T<ABvhfF`6G3l
zn`TT)rp}2883_%Xm0kOi+PI1(HcTiLAK<dM?~4cRu>s!${2lL=e&mL}R^`6ZYCGQn
z?`UsfO{a4dKXYv$iNR9SG)pQ=dy*e4L947y(bw@a^rWmBo0^hMUUQgvx;fRv3=0ei
z$_?qD_)H8DQ>4$zEW=RaEkmOG6dcW<w3ANKgM6)4*mEL%b8;=$F{jP7*VWo})!8zk
zd)&{satTSUuUSM`VSeXdKF4s!Cu0}s1J6`v`~LG9yw$u#eTo*qt@0n!OUq~5SZf_~
z8RJ;7A5ryfT5FxMhk82iDEBc&oB!Ab*w5HBOLucU<4?J;Tv8In3SwSqhg40PDK%7P
z8$yf)48x=e;(TE$ZOg{^I(kzx$EO6l$|T&2OO2073{I+)6zkmVtmt&P7G=fLz2*o%
zHNfErH<T5Y>HB=md_#O6ealg2ozT}3w-jbhu_jwxmdmEW$}#aWjX@uE8Y{@w^9AI+
z*wb*v^vx1ry=lp1IgCs;$8c9Vj+)Ucc914X5rS1ZAq%pov`~J^{p7B~4_;80eF<5O
z(sQKLaE(jY7XLFLCUJ%<#+f^jIs;udQx$Eg9BZu;I400yJuG?2KK+evA!@!m-c8=o
zT6uPo=a8S7b6LZzLDmDNiE<a=KN`Wj`bu<hRd$N}5F?as=4RGi7K^2~xq@l2p`hZE
zr^r^Rs;CPlF}D;bQ~bM+oL~AY#)?PiD^^%v>aCO|Wa!DITmzjC68)V0ofhZM#MFeO
z1d`M!P4=~yRP$BGJ-=_3mP%WpAWQT4sr%Ik-%VeTdH|>sB-JtHv6i-l0hOvLy9AZ*
zMR)0zeu5RjS<(<Gx1o(`sHKfHz#3#pF_$*)Fl>|)q|>5R{3YZNPl(f{b@D9bpAxJT
zliLa(cq_I?%dK_xIWu#n&P-b9?2$Onna}mYmFR4g*e$VN;#Ozr^m(k2afMwBRQ>l`
z@+-4QmfA<np_WvcT2l>I&*?MyU}=Quk7cg)p5>5foT8)Gu$d*WeLOe1dwb|0>6+{?
zjx{|ro2{L!>n(A{2&IB@P&UhZrHRrFvA!@$h!kf?5ppHNP&rDxAzml9v~ND{uAlBm
zS(W5)(ZqF$sji8xO3sMHWr@R``;s?iI@x!_5&LZaeRkO#AeSWtwYR<`^^4k7eXE|-
z67^$bxLn+{#L~)UwstorNq>ZK#KH*kvbTISnNME`qr@t*-Pq0C%ktHH!Cc?8%J5Ce
zr__@}rEqDl^j<6^&5*iF@8p?Es1zZ+mb#&@S(laewfCfDUQer%QXsi<(k0h9XO6@V
z337rju4Cf+q^IeVbg!b>9{K0;kF%9Eb`a{a&01}(wc1e4;p^cmsw+H?*wqkfT5Ww`
zJ7Yep7^Iyv1RaTLIMsRx7P?0`AT=~>H*GV2wd4gy?rI7$R8eXx<>U+E0I`fDz-q@u
zn^aeJ$@67RdM<?tX}~$3?}L|TZAvemdOZ2M>xFZt>$bDCbDHyN!oI|^uCvKA+z~v+
z(Af6Y5o0%)hbn96G**$NXny)w&8B5&YqU5vTI{ckFq$l%EH{ns<vk*ybNLDW9sPiM
zIAz!+JP=MwHsf_uQR@ubY3qIST*C$VhD4-QQl`{O+98$|`v@b&)>1vWr1DZq5+4X-
zNp99jzo$Cg+cK}GzfUnF^>mGM?RE}wmP;I-up?nmV(sMdnXUDmN+o+y|F(WBZGBA9
zVtqbVf27S)XR9vXWnZ$kNq@jEOT7%UOu4N8S*{xz$b-dM=y#t$|Fsq!KntT|S54?I
zk22;lcd%Tx3^G?U_EbXT6Oy0QOS&)ZmmY{mg>Yemv_guMI?LUqkJ2RJEgR3e=_P!{
zytzDmGJL6V$*-N6iD#VWoqyo@Jrc_$UUQi;9;-&l&pO$ERX|6_JJSsbCpcP9Em1A1
zmC{S-qqJD<A9K(<GBfGsG;?p$Ql+o>0zKQAq&W=~4ha7VYbcOjXdrD;WK&ObSMzjJ
zPUA?Wq3n_#NPDC$QdMcF_)6F#d=a*ayQBtkvUF8+;*9LHzC!z=dVGhyjoiuUFH?e&
z8aOK?en~i&us*??P}aFJ$&}Ghn<9zUnf{vt^7ys2w3SPfhuTo}mpV(^g$`jsEnVHE
z&mqO6CdR>*PF9PhuJMYrgnq;+!69;;t{1|DPqa5ZMI!}={MJz0+}iTYT+Z}MIVW8a
ze~A4hRkFze(m7!#HPK#lli(9yN!O*b;z?SPf7euBnD?URi@R)=IpYXG?7VYqqBEgX
z;-5sDD>A88T7aiMH!BUT?fh2xrP(f-)}qIdrFqqo+D@&jeqW!c@6)|ZpkKw_24cQr
zjy635u4mAlI1wm7`v^zTc^o48iL%&MoG4XOHW`{2`xy5a$|w({NHJ8LB7PCm#g+K|
za=|P(X-DCP@LX6fgwy3Dkqy(`>Q&!YZ?b2CdqrjlENDowJ6#DK6OJa#b(Trqoz}zC
znRk=dnM3R~9KCG+nI|Znh03sd5&eahtWDBa=wJ25Kry4ZSr&}M^v0-wbJmgKgc;b^
zu|k}XChQf?32vc1(4w(iUb(H94Z1Q;xg=MYA4mhFa?($+t~grQMKf{!aGrFcpQ%P~
z(TAiqU!imLq3?~?>+!k=W(8&3OU+Db>KvW0Ki-;<$2m1QD?Qd*o-C0~W}kJNZG&~B
zxu+qY6in;!_j-gjS6iz+)#m95>>PO_l#zoB1C95=e_I${10gPp9(dG3p`joNC52wX
zVPT56RoWzvQ;HgT8Z3szN}^mw9xge>nc@$jtB^#e(%e*{l)fR$(L?XY%P@n^)FfXK
z-wN+^&ylRqjMu4illmvNkMAGnAHO$oezGO=gK85d8Nw}!J-^*#du~2yI4EV&4g5a(
zBj43U>L)c^8_wF3ErMIRraUwBG6ouR8%iln<T~KzsxVx5f;yrW%}bZjg~D#}suV8o
zRqiVrly*wIyjz|t*O2c?jioVSN1+p4g0rmMIE8THTu4Ri8+i#<UazK=RrC0Wca?j2
zX8H7mDW_dM67wYZCG<}WNE(<{*VB`^#UiGC)?>ChwsV#!<3D-2*oSWABiK^?hE^8X
z{9Q}efAASXtn^0dXnbcZWb`-a@<Z(0dU&5jd?YLt?7|+phq~wlVTSlrx-Jh?-Ye&o
z^2#;2Hn?Jh*jL;qJf=q47N<h_a1Q6s3-gA&GP>V^thL@r>#NT2P4@Qi5VtcUUs|E$
z;m$z`Pti+Q?b1{8c{(voG@EKz{cI<!H7vJ`4V8w{Tp@+*$4Npjy@w`i6SRSP9=?YD
z63@wv4F=;ALqo$&MU{KX0rE}BAXOKK2;=D~_?VX*qMw9jKsh@)8Eci?$~L(?Rx?2=
zDusy$;ED6FyVIFRzpQW4kLw@wSNe9nfxc1OrmpeL^49iz&MKVwB&}LXv`cmtPyCpe
zFR61{K~D*mEIN(xmRRdt>m74vV-;nL<QD$WmpCsh$=+#h^@F-ptIhV4f?^jrw;|E+
z+c3@WPH`xk<@Uh3LDFIIxUc}HG^I&Ra)UgfqF6*KFQ>{)lwL|_#f*76<et(9bYb&Q
zff#s4M%f?zhJIKduN(Dy+I%gK_DY?rzV`j{hItlem4QbtK(5Pjws(C<ic1}yHCbIq
z%E%9lFU*rH0harwL_-B-my}1mfl=G=RNbqM*M?~2^_T1&aS1+YmD1O6z_89x(69jG
z?*xPFhunHyI7vU?gjmG6you%(>Wjl+%}+9yf67zk7^#DFM)V5Rgg&${sl%(XzWM>J
z4mf=?ZIpHa-gF%Q+N56g9rP~nG<2WHOiAyO_B-WQ^5f)VDTmW&R&C!VmLTj?GL5oX
zG-nyd8ZzWv(hPBz@R7Q4{%qnw?7IF;-^x6w5w?r{<ZVi@VUr;k)@-R<luO7*q(ahI
zagXqU=EC`1Z88KW?EC3i;N?UqzdT5;CC5v{q>bV;!73D|B}r9Yoi)-IXcq0MdPqI3
zK3C7FW7WKBnD4i@g?FQ8k9%oWzf4oc-866N_ta5oH8TdfbE}+Dv9S_h{AK)Z{AL)f
zw3A0mJH?V>qR?I#OgEE@{1pqsd0h%`KxOf)^jSWyR54f$yOn0jGr72YTxuY#M7`$_
zf}x@rn62X=dyzwe#c;8ov|bu4m6X1SO~lp0U#gQx{*K+(&uO34wrZqri*Jc<rEiR{
z8qRWhcvpD#y7y--%?!(kO5c!vI(=})+sqXAUf*H;G#MeTk`t6UhOvflB~6y)s?u~Z
zS{Nz(q>bo4oLldNir_7uLS~{C7NwH11yOMe2vbT~i@t9)X_5F{XeQjHJzz^OQD|G7
zXtfi*3q!;QVib7$U9p!KB@7f!Q76u}{W;f(UR0Z`=2SJGr246f8t$9qd+9ZUMdWg~
z$U2$XFw>WDIx`~kUS@#1n)i_E$L5kf!g;B`yj3}8*r0ror%2_+g`yxv&;`O~nufE|
zoKP<1A&k7B(}bU5FZqcaE_YKdD%ViaY?EI}7AaU<B*f9xbPnxDN7C!GvT$AKAiflf
zOSPo((sj`%^b}UX&rkC=ELC>{*S4z<e4?+s*XMD0E_fcIPTt~vm31L=Smvj6l0Gi|
zO}Z&-rQ7N0qE=*mXfq)}xF-!m4hu4jL&xHY^jvHu<`l~bb7^D5!(wm*mk=m+7TbxL
z;3-U6D?f&>HIz?DBPEx3SC|GyT~6#R<PwQ+pDq!<i#x@dqE+%r@luR*O*}0O5e5rK
zsR<rlh?Ue^qu&w;WGkWt!w*fqRBxhZnfn}ku}(&(^dcF5GMZ$x%xIjYW##mk)GOLJ
zHkq6jE=gnLm$FBm03Xi~-wS2LP@#aZRNO8O00$@})scFNsp3KLoU}`xF3&=D|AKT$
zoDJr@S@ahQ3rB>?!gk@d*j@Y}#0rJPuVS<mBv+K`fhWd`mBb{$2VKK*=)@MW1<13z
zwG1^ti&2w(E^lM+3U4P*KlhWYI~lDq12QwxCZ^9#zm(oS>#FCLH^g^RTa7cvSYabh
zm1HSFikALKw<Ru~7W0Xhg>B%^al$2GtFTTSB#o5<<WM<84wJe`lO>ZBEX|Rqv|T(V
zBni>tSy(Yls)5{-B85tI#6YQ;B*`1)yi!3iQ<y5qf)2e-1be`i=~k_#_84_f0kxK|
zzjv4?&Q0B>tp4bE_RV;mzA+;xLrX87Ro=bCGsgEw9iTtb-?2jU4h=>m5{&#rj74>m
zEPN9;%JZf6(nNW)Tu&|_kCGqCo0Mwc(ZA(ha-_6Ks*Aanz)rewqPzm%doE3rwuvXj
zs*)@&70OFx#JRMn&>4M~ZqN&^WWV(FT32lo;<%l!zsKKu!qdv#++Ew9oV6pfK-Q3~
zR~d~n`(z!=YU_UN`R*;JuGBv3yO=-J2~Zl6VcF-ZuvMJ+Pb@9n0q-m={SjwM3#Aj%
zA?blUNJ*9K%3GzZ90cywT#ghg$p6WY#TQa_Nf(dF>k!+;VAXK3jdWG&Cmt7vi8F*m
zXaf2|i%<aP)k9eeeUf%aeWPCR4f8(n&P3OymbZ}Sru(k@l-ug|WSX-^y9aqTdMbO%
z`PQfpwGmo~Rvj5B3a8v3*lp-37LtWRIiZoTOcYQpnxtunjy2*-VVk&C@}Z8LDYsBA
zN^hhsvK!~zhom}kOQkh%YJ=QDehV*{f!$TaBBBwvnodg~a_Un%Ee1Ti3nk2O_EsyZ
zSI~;9?X*Ig=DXyZ<BRfk^Of;=J(-@F-r3#&PfPb#Piyac&v@Sub)4E38BWoAvsisE
zdKK$gV;;|MLwnSMmJ#j?ZW=|~iX!Z=h-T8fh@TlEIG_}TyfIbYk4V<A%bzj#n$inV
zl;6v1@Ut{2r@T!XE{;N1s<YTlEGG66@(T5Z7qkv7MXo~`@sj<=TIoad`g(h9p4M1z
zru9-kt25Cj5PUXojJKfA<QwYS?|tr7)QxJiT18V;s@2h(LxHe`HDJ1apCz-yP_6ET
z;;J*5M!wQRbR~5NRe;W8g_HPmSEwUy#a>>P)`=s<i&9IelQ<O|;v^ViqF7m~fxktH
z%fu;Caj-Un6e4aFN(eQC<1`j(#2=(2)Fw&bk0tmWRsoD>w_Zqph#Dlf-bEjR`E=Hb
zs+WAn)H+%fEr;4e?GJ34t{v0H>D~1Hx?6W@TeaT0OTP=9R9}{tF=m8@ZYoqo>!B1H
z!7D>0WF|{!rch9D(b__D#BiF>NeB=Ni|vKpVl`=rP*W%&Z52-mx-d>03j{icOcjlI
zK1xL)f=1KBbO^mhE6^b5`z}D277Z20S?G5Uv8(!Ty%;OT*0A@OZ++H;S%FVPU!$L7
z=U9U7WG>c=-C#Y~Ahr$4i}R>n95`kE!{$ND0i7<g%n4|iZg8D9<DGahR3IUIB)NvH
z{Dd2zzS<6L&|y*l{BaxV_OoOw-7b6;deUdKv#^vlpg(9DdhNexi13W&6&ll$sAJya
z+lf#eRfKM;9+WrV@$@C&1x2AVj%U}{W&D3IdK-RF$`s&LpcL&7ZA=>|&m0(i9Pb6S
zlplY>qM;pI!;V46JPFE-+vpy(fTH9nzXaX24wYU3s5ApeBPgDt`7uOB05o1bFxq&i
zozkEOn+Q$oD=6iB&{j^T&!L_h4?XTH{24>OLN(Ngwty0K9oWDiXsK$G8L&VglvD3{
z5h!s-!_vptc4%g&K}(&j?4C<*k)EjGx6@E)oJL~YJ;1YqQ1R3t-7vGsB$cc~*X9lM
zS6g`iRMXv|bDIifSTRzLeuI^VK#{iy8uD&D3O1<Ct(fT$d?pU+p<e72a(ziC5iR67
zG>%=#6lkSABn<4YE&UC}bO<!pjp%2nY{H>Sc9UmNkX?l$Z4x;O1(X8S>1n9^D45L+
z-UX`OKUhO9D01$y1TNC5P?+7NHKAQfhiYsis|qbydGN$m(8pPTSytGhGdyerG*?Zb
zDvZSXpTOTXK(Vw3bGe7-=Y)RIhm}u*9=r@@mkJ$KS$Y}zvbRuvrttjGPmjm?!?4o~
z`k!B@dS*jq7ta5KX6-O<LVn_RgGnvE1vV=Q#t)S$txJ!wY<>D<-VBPzyRiONjI*16
zCe_I(9tVAyKfaL$#dAmWc8Wrs*%fu)E545}fO;?u%G=WL;g!4xnZw($LD=~dJb|r*
z#<&dBPIcjhN1#`m1ohl{?9v5JX#>&|Tz)=0X(W`-&oJ_1=!1vBR$ZX?o<Igeg?I_d
z!AsCG_JH1x;aeY|$U8(H(TbS&8*s=*Q1w-TcRave9)UJ>Bx2<rv}q#jcpl2$rcfh(
z<&Ci7O}r1*DL`LV4L_R>6=E1vfSaI<BfvBRv|-KY1L)MIkqGFC_rn|C05i%${d*a6
zX^DB?z<+BZ15Sp9uRT^C2kl;c{P~8NO(px#u}xv!=^5;Y4vQGcbSR4Vk}c5GUWQ#G
zpe+l+nqsh`t<Z*T<T~?0o7)YZvK^NC0zLW!e7-7_&EKF0jo=qqLnv;WAr=O+D|{6q
zs3f@PEa)m%kvh=p&xgLXKW;*7$6bf_@PiXj-+kmF4~1?ooW-(HP~LV#wDp0$nn4XZ
z5q5IJ^IO3mpFvlz;(30^X06C~vI^C4VPxMmP~QIlDuqHZ-2=7D6JW9hV~mD=cO_Xt
z&f*?|nb@(uU%Ue_>;+cy2#UrsBp7PcY;PKg>LZzLXAfB|s0wF6t38p-g+}x~o68)~
za^n^PJ&Bk&h<QcvC-5|de`FER=-Ejj;9y_)$^m%xQ_O1)`2ansifHZvr6hb1>O=z+
zt!;@B8crwFgk$+}MD{-H^H2U3>)nIsT>^D(31D6ajMWDjrXoD_GWu#QVWFb%_J&YL
zjv}qFN)h)e7QtJpVWiwp74E^PZs<S<;5JDO;O=B79!02FkML5^o_=CZjFyjXpv&N?
zIcR(M`y(Js3O@zEpN<&}gqrs(qBsLO`z&~g4Sj+Gh=?TY@mHwH1L;QG6qt!Ul1OnV
z1ozNcuz71zn!DHqsDR61MpvNpd<_ja$4U>f1>`Z*#lTVc(iuLNNl>8Luv<BZ#+G8Q
z){@=OS)PJ!vj<ex0onInpb-8@D$;BCPAj?#8q+Iy)&|Tl47*(l`}Gz05J>hzqkE1Y
z0lI|Z7QlBPo|E+f>iYu~cEVo;=xPT6!TLe3n4kOuDjbKFwifi3L1YKklbutl!<(P-
z8QAj{$hN!qUwFR8=JOS}QId&UBD3*y;3RrOQ9v9CUAA1%pbi6mKVvx&856N%<8TvU
z2=H?TZx3vpf*neNO4bAns0VLqgG^%QHsq)Xp!RWIg8l*b8VgLA4Sx56zsGkrvz^eP
z|HGY{2;3jo0#vz#@4w`376d$A40J66AF6|0*^4_bN3m0LxXOS9(D*hav1|=~vH&$+
zFR}^#x&|mQ1^QkBUHdc4&5rne2!DzK8oc8ixx5Vgsy8q(7#^3z&#^!30Cr*zZYng#
z$X3KhQ$&afxndo({%&|r0qovsM5qk?{9Nc#U+{a#^rzTcc8&Zb%b-zz#2X<J!r*7M
zftO{WAr?qC`VJUVkXoS9O@>ky%6y_>M*FZoI}srXtQ#!)7V&u+_XMWGZ%?DkRF5<R
zOT7U#Jn{=>(EzuP{Gg`Zj5!p=?V24}M_zQnW#phuJPNkA0A-(I>>WH6-u4w*(L+GP
z{Xmxu(1$O==N4dYd2w4q2ew|pQ+L9f(K{qd!BX1LZpfWcPzH~NKVgqZIYd-`_(o?^
zogU!R`8(`$wnZ-CHdhAj1Wmy$j3|6=4fgLKZm(QrrQwTdQ0tCD?1uwk7-BIPc;~^L
ztmDw=7eUVIi0u9k@z;`W0aBeIU*H8D=y~LgT*5D&pUoyi=@sP6>bQ$xByXUa{RCvs
z1)S*#{19=MB3rGUA9%V6IC2KaI|&*75%~8|^pgfc|El1e+>3g@AodMej^YLi?iX~z
zN|&HVWq~K3;q`#wZIGpdprF19i=6=WIf0}O@)`>8LO`o5o`nv1X{;w4HeL^nc@fyF
z1CYM~>@o;Xzr-J5_D1lWs{AOtbsc`1twPR0b08boaEGl6?7sl4f+FIe>PD13hW~!S
z?Sv(`H*^(a^&zLhn4Dl8Gl0Y=k^e>mD_0>luA!<}1pmH*XP?2|1;YQz0rO*EwH$mX
zIYayNk*pQaI~M!U54iXZ=UaWaiHfv2Sk4B_`!lM%%eW`fAFK94Ashmo`40Ai*N3-F
z1QM=*{~qRFa9iUuPsPodIPA<BAl?t$i{Zeanz&~c1g-%a;igeJWYCj{r-|6fdb|#u
zLxv+(M0%Tl<iVKJ4wetMXI}Fp#OiCd3;6T&e>(JGu+S7Rn`)So4b?|YtTYg4`5PVF
z0OVvS(b404hY=ToJq^VTrsAYB*$p1B2U$D&Uc+H9f`arG@;}%hcuP~T!92)lYv5^9
za0e(1n7bK!lLEe52Kk}`V!t>%=o;=0lz|V10~gnl?NGrlK?H`8XSnUw9T~blp0^YH
z?la~U04(T5-;rYQtRzH2HQZE~g#20!|ILn^!@z@~s1`KLurtYl^N&LCzmw3=e}`|>
z#0`yg$WKK`Rb-Ve=-HJ3YhQ=FI1k8{8%!~h-@=`wmhhh*V6GeCb(f*OpATeHz`3db
zQ{KR0jNJrwb>p4+HrA2Pqpg7PixKx3xE1&f%p-wq1%6Jz&4!~;eFx)?&}G~l(!g_e
z<F>*}>{l}GP4vedq9fqy4seUA$m74+U}*D)B69xVW&;&+(&w<05B4mIJ5X)NIns|V
zgYCa!pMq%<@S}a;06-941G|<7zUsscl?1S*p|m5gU=vTk9VZ31XtJ>Hc3`6c9DWCW
zZbVmSBJLX9Kwen~OZEp!mBzZx0k2vB3rgVL(nTOhF#iQhyk)m=_F0pvP_q9eYr#V=
z!b4xftG<xA;FtuR{&>C(@m&Q`TOFP{0a-GOodw66Mk?dhNeA*5`1TXk&2}(B3TBfN
zHE162eHZQ*bwJ&G82Pz0x@!}#4|~8$buh4JK=-_ey)z_>EklMJfCx{*+%EG2<R9zH
z*U^`#v5J8uH3bU22UFA#L9Z~n4Sn<1EChUFJ3o(kUBXI_a1XlJ|8W1|G8kQRjPeWl
zXaJ(B3(3chA|5sZjqbw|UvO(;HI)79fHB7q6_qgeS;+VT?qaQlM}8(<QN_H%URFZX
z)defE!`BNV=Oa%c6AuIOSEjA8_VdVUgAv&ku)o(3&0*{ta_0opAP0fP50U?S1L<|d
zP7T~o^pY*eAiohg%TYI!L<awX{!w3?J-=p7*gp(-eHl5TJghek%)As(uP<)+l|voh
z7U<F&8M`!YaD*ZkE&?0;hG;9#r((skz-rcjeH_ES??;vtgkz)%tbQ4soFG>fBv*0A
zGbj0vSf~#<&xZXyf%{l>Q42+46ch4XDq_rv3Lq8tOY0-Y#NpOMadHc&-v;<_5V+h1
z?CKk{k_$8h_j-nd?Y#&0D-MjbgC|u4!&$}~(aB^sdIU1CWf|s6ffx~pIuY?Z7V`)p
zBUmD9jr!sSDM5>ZzvaYJ-N5dGh{eOea;Raj-#1~sxxm?AWR~`bwYOjhPuOqpxp7!W
zXGGIPeiy%^_)Irc5lg{C-|&NAg9>~$7Iqzms%kB`-FM7nHqb2w{@e-?+y`D1g}Xs#
z!PD0xJBH#(t-(+>aWncGdFX8T*(F3$SFq1PsNJ7~-OfR7&I=wbAmWQbv2z>Q<vJp(
z9cJ<Z(dEFHMtTAGv=O+GgWSc9$9s5o2r|(OjJyE&8HTu?1U#yPOne_1V?6y24BDT#
z*j}utAH1p!ZqLMF=4;_2CfpfX3?B?drtSgXz6a##gNP}F?@t7#h2k!l1$+1o86^of
zhctEz6}5(2gGsmvSO>oBLpHsD>`bwT5x5n474`ID#J?ZzAIRh*Yl>TZ$%u!Kd>im=
z6z)GYho}5zw|Ol(0UkXa*(?v()L$@z9^?V*43@DQIBrHgo*({;9F4i$#AxH;KRb|>
zUctu(q7J-(dh01}5OoDwU4-8!!AdsNRMUX5MX|zuV71M`s|c+OBrgTtG?7%GQ+R%0
z`xo%e>^siWfMKoRp~<jEaq7V7PkZF5Pw<i|SnVL(%xl4KVoWz~SKWtgRaATz5rJiq
z-)kbmc7YLYBPZcu7l3*L(36-0ZgCYh9Eg0o9!$I&vRZS*=^U`wAh3jB%;h<vKN`HN
zD{7V&V1O&o6&OyMA;!;R|0jaI+=LB-(K|T+MtmRGHWj&MK4R|>p7aPKO+zhL1$Sx3
z0+FU7U%yAi7(>@#XV&AM^DZ_XIc_~xSQPtO6+Ojo;IFH&l8K0~wy0DbxcB%CU6<^8
zza_vBU&00j_yaZ$+<z73HwlcVI@s$ZWSC0u>%Q==C`8YEQjG3}N0kK+$*u*D0xz=f
zSYJc8?hI}*PJ^#zun~y$yttjU3*9e@da(u8odv$L1N(Flr#`E)^Ber3FCtMzmg){a
ztA*H^jlG@)B<Tp&vkw{LIZ)M~R>WtT&;&$WXE3#|VC}fKkGsPc!1FpFs-JQfSk!4S
zis#7CR^;YT<XYrGGKofmg-=H8&4Yhb1HxPe_8Y*w3nPNwq6W+bh82Nm>4!b8ihR-y
zl}b31z_k~kF6@Qe)($<%7vOp``CFWq?1%SQ(5-k3wwj%Ro}g!9!iw%-ZXJ;$tD)j*
zONycURvS@W0v2xp?(HQ1fUnDeqXmEykN6h0827e|V*l0w!$*KIU&X4%0$rbjxl99g
z%)~zK#tl)GxNryZ5bo*j$4rN0<2p$MW2#Q;fhFIEJ$`|QB%@lb3d`5vO)x@D@a2Mt
z$SUBSRmpSQ<PL{bE8<^Au&-Z%&Q@Sm4SZt{YPFmgZxR0931g$1#_l3l*9WRUU@x)9
zi@<1ta1;DK{C_QCItRE_SDJx5lYt!+P(L*THyDTc&w`bXz}CHSulE%DNdD1A$YeIG
zdIR?dvkqk@U{??#{R#R(KJ*=vfkY+ow~5FuHdv?=vd1GZky5DW?;*McWW&<1=_YUh
zjjcsCYY47W47KMpz7zKa*CL0wkxfbfPiiCA>ZoQG0!!|o4|fo`G!h6r9=<RbJ0Hxq
zz&;OH6?_VBpa9Prk0^M7T3``4(q7>5Tp&t*M0^0$GXK~t+$EY0KmCB}$Bmn_$5Dd~
z26sq;r*uMO)dD9hiEMEW)#VP@`aSa3Y_P1`@ZLCZ?$YSNco6;d5y$ah&1I2SM&dSm
z9q{4eJU3!785mj_UTQ#gUygSL)W$b&V@3;rlJ&9w8!-F5sDT~>$qM0wFBj0g7Dn5M
z3ho0Kn+fwM0n8nZ9VyPQ;2!!?u;U{12)=uRgadag(Btsvl0Z2DF>wbSdk6SUU6KpP
zF%KEIJdHsY2Au}@e;0VuGBC!6h>T&_)$AMH5=Q%tSwb%gyqEyaI0Cq92NqXAZS@+t
zw<0RpD0ucUW=Djb#!Ta|PX%B%)OYwq7ORPUj0JOuheaZQs?lJxMc^a(z|yn3BOkHj
zVdyG%20rveyv;_(DtmpOk+HghA<O_?_5wbR1Vg%jJGL``TIY~Q7vUQgpwJ5J*(-EM
z*5bbXP9PG;3i^Wybw{t+LCc}KS&Xxv{p=CqXC}wpDqz7D)&zAxDmq<*amV@*(4#5;
z0#11z-&zV=Oa=0dMSfU<88yf5bj5r_;8D$aDePziWW{pe?@JJQ1K`omuou6u^Ow<M
zACGkxL~XYOeAtQn^%HwB4Jex%7X65Good+k-pCH)z|aPhPzvsa9d8dNKM$Q{JKhIy
z6&dC`A~2gdEr-YEr2~N@Kf$S2qboKS`!)?#`AfWCzy@x13jRL~@mvBC{}7h50{7a0
z4dnq#>;-SS3SKuCh!X^sSO!rQ1P^Hge()Wc>k{nP0^h9w6nOzOy~q2qX~3Yl$XF$j
z$BqF*f?)H<{0$<!7Wg^GST*p}0$9ZpV5b8!zKv&Z2FI_C`37UQWeG(;(@Iz2x0&3F
zJM~kM*;JsZ3w3-CoUy)RrO>180p2naW8UMf&?T4&?mZk`+hy>UV~Ca+sDDoa%{yb2
zpYXhH*!QYnNBQVgp2;?YyWT?O8UR#lgMQ3V@aY_gW-oBe4KG|kpOCh!d3NmsELny=
zK`^TLWO!=})bEQ)ep(Z;^Aor-6JDBtoG=CvG8khffyoQl={*0leQ79;&cU(^aPPh+
zFmOLI)-dpa!k9@Y_WuAZ+W=~a{jlX2oP-_4E}w>%Z9rEv3oDaQp)LZ_j>c$*!4o%u
z$25kg;I=xQfC^wG_*V!%w+t0m9%K*L2fi>2BX&if?>VAz87jv~u<;R`CpAVt?gIM<
z9#98p`3?5<AoA(~uR`#|Yot7o<2Ul`L2$56sEQ2W3ujS75qO3f9M%dpy$zUzH`_2P
zD*BOlOH5bH_9rrUE%c6Fumb2*JVc&I1^3ME3fw?!v;tnvg2%N0&%27xorIqrg=cI-
z2kIkyxIh2KCcw^bP_t*>EpJPopt@^{3i&$x>;;%oJ0M;-I|v-ju70ini$&zNCj2Mc
zjpx-uR*J-16~=)(%|Z-a1ef)&G#-rG7`2f%v-4vG;Lst`n1;hT*}N?gJa#91FbKAM
z4rY1=y^aX5jS-m95p-RLpr!~#-an3b_zuRC3)nFW6>&XOk2#Qy)4&c(Avd{^)g3@S
z2G83MyeWtLG9TwoBiLJvVh6XX4EzrTPYZy(5234->wl*MXHji^f<^xz7i>Vp3<C?A
zfLH-9Lrv8XJ%zH!5a&?w=on)L^6Dn^GB*Las(>jJhF)tLIGR87FT22O8i0+w1lQ;R
z&s>N~Es4jl!K@r=nX`D?$sPFjEil;v{65|iG#6GJi*9=hFs*mUpj!~vM^TOb0RpbW
zTK-~Rz5uUG=+d<&bMamm18S`iu*wzeSzGL2M{w(YI6eD@nkp7MlKswy3+QpgBNF1_
z%eBDyP9pQXM<h`65EQ(<AQN>_K~&F|$T}JapYDe&>*C#jd}mlNP@KVsaFT*ImlVf5
zR)IYv09mu&z?2K|cO0_`!tO$Ak8FD!c$$e$PZ`t<Zdf4*)$eI;fyQP5a#JKQW(?}9
zALtmo#2i+k8@!ek#Jr1>)xePk=y@9vi$>_Wrh@w<!7_z$CQ=<XABWyrJD^1(`o#}$
zVoI^|@4zinvaueO9)-0D5X%pUunsty{a&UC=<6<pH+)C^SOZL>4e)&jW^f!H*%tj~
zFA)6-dJ?O_F4BPQyTK@fz#YDT4=qG&b^~)MfEr~jdS9rtfu=6(%1p#xcE6<q-WAmZ
z@%jPS6@s4>!EQw(0`sC%cpg@13FgD$w}G(JIsB_9YM=th9Mf^45`Ys36HdL-z$2}6
z11w?1?*AkmsXsbVB~bmI0n!~o?e`5m6&>$Ls)2Dff<s(ECXPqmoDVy`z$?n$z*{AZ
zSO>FTk8kb3+QCe~QMVwQZ$f7yn+f$t#_5N8`YAGR1*j0bIQ?A=Ul@sZh^zwRtd1Sb
zL<N2ySYHGE^c+~@cl>lO_W3;eTs`n!kGAkY1?=D!@Gum)@h~ioHz#2qe&FAqz}%i8
zxBSE|doi*H=NvM9hzKizGwUZ{jZ49Ir}FPC6!WZ%^B)3a%|@C}hz<ulW&&{0i@tPM
z@I;(Wfq}aa!7Jeh*&L@5PA58{hxHfrbSmmcJ9v_eH&AR~qp=6!cyCDpYM{!nN?EM(
z25>1JUQrlN%SNt$umFKyUq!Z?jcP_hw#?4rpOAx2f-6PChl_!ahGPA3h^!0z05f3s
zR-p<UfHSWT!1>zbA^XI9I48=FURwmb>L=`F1?F6aw^4Y?bMTg0c-n3-oi@~s+P)Ro
z`W2j%1d{PI6}f*W{??xUK$Lw)y?+ZCIuyGw0{oy19gBb020rJ8Uo6F`Q!Jw5FLv-Q
zdU~tyrk9I2AMl||b`OZ36SZOp-aAu;t^gM0=AYR>ApQe*a!;_yUpQxs0p{bpl@0>N
zb1;+T=rHs_7r7=~NWY@GY>54SfVj_OK{!3y04B8&`9lCpZjYx_0+KX?N?<Lby%Z4P
z0dVI6K2aaFt_^1&2T>X4$6I0E^1nD|YRYpUU$1~q$D*e-gEqtnB4RfH`*{+p>W=s8
zIB+hg0rTR~$r;br;*5Va`hl16_OZ`kZ4v0o;6xNBojrg9&(ZOG%?hBC6^I#i2giy-
z+z#f~P`w<3LO};ByoC-rloH4a^^k$>v>q4$2bwR&IqpPS0MX6BOT#g%?(mnDK#?Cf
zE#HBNL%$QVoP-Rw2C;MkmF!9QLq$AGAh*HJ3eu_Y<REa^x+IC2pf{+-LYNI~vpxTc
z&h{$A={@vNFW`*(H|qYm$R3?B3k5sB1#$3&7lan>FFS)ceur^qg7x+#_t|W|72{Wg
z-_`|7It+H#AKa`2_Ok+5;7s`9M#T9xpmG7k{Xk&+H!#l^U=eu#3^G_EBD?^YemF2P
zyYgR%&(^?t{169EQ7s!$Lm%XKa3b>t?^U`=B)lD_7I3s8x&Tg`l;;IceGiY@4=);w
zk!JykoUr8)yo;p<d}|YS`4xID8xXN`!L&2*tPM~FoX3jdP%)hX$Ik={dIGOm4)6QK
zqk-vz5U01n4xU2q5sYdv5;J$9UZJRVZ9wNSu+%2-!FqU0*a>tcmf&g0$iD?q)Az>C
zq1OjL?G3~-l7h$`qfrUn!isOhvY}uZr{MeOodXM(f^lSbH2T0w|3O*$3Vq53@M|;1
zK8*Pa$N^!%^WE9qGsMC}^i2w*x~K^ZYD{8Kiwy;qEkI`{3%~t?+`JgRoBc+^>^iRt
zSjTBFE)VixN%TKcz=3bVgBQaql36I?E`dL1W#Dt;;1MUV6W_6tx$u&jSVbG~vE0b!
z17YD(;HDu&Wit>1SJ1(0foC)TYnx2#0_FZdVc-OQKS4&>jyxEFtQCs7G#4+(t^o%q
zxxfk`->yORo&sJQjcRW{*7zQ=>p)GEjV>!N|D4#x3Fz|{!LF@EPr4-7T^nFq6823(
zujM69<cp&#)*Fa42ncu$I+JqPO~$$-N>YG-RdDhhhA1tLE`BEKjLr~Z1Unc5uKXVJ
znvRGFfe*gLo9qO1FVBFp{{R;J!ntD?c$o&vzG4zAc^R=-54(5+{+fNJ)(UmNHjHOS
zY@@2CZ-LAGfuwujeI=12x{waYi$Tb>@4#Hvq4Lg)mEK49H694P6mdBRyZ0B>OheQz
zf6+0vfge;yjNXLLxzKUX!z&`o7^n#LQyLnULi8q9o&axa0N)7(N4LTjsjxvAczGNT
zrN7`^F2rGJVDE2uxfM_TgKkk1oGN9%6{-`e%X{cDC9oLerK6}C1L-t)-Bo1F?Dy-<
zfpTjP>is1^i?YZkZIPwIksEe^XDPH2=Kl^1U=04eLUxD&v+53}IuktY3Ruv2bk~x>
zQ?3AK`@)--XY(m^xjutQPsC}!D|Cb(!Pm#3t}6`>Z$hVG4+{ff?;*DgLJidlUUU~v
z@IohsxBb8)&Y;iP7rt>4-9raB(O;}tBxS%Qjsqp;AX<_T3!#YHd+66M1uiy59Ttrq
zPE{c47gVYzfxP>GM~8r~Ymm(q%;PGMBqwT=g6QiFhh19X-H=~d0j&Hr?9vKn-NoQj
zJJJ9A4|QxfGOz*O^AK!iJaA(?=I|G};W+qw0pupU$q3A05Gws~@XwAIKMU{fTE)}Z
zc4$z1V1do)HgqB$0neu5tyDHr0W&Ly%H<g8PAkEKUD$&dj4*-aLbqfhvdC<fNfy$X
zc-lqyQ#icG!**arvFN6b02ahCH_O60YGGy!R`|yo(py;jeIS<Ue+Ur-zq*VukD$-%
z1g;zdjz)reZ$TzjPz}Aojwfa#9e8UOu!w$$`6Gxj8*DcQDuAZIp)trn$$U9`#jc}j
z?1Pb}gUg5Ey;#+NDC0=G)?K=m0q1Dlp=HO`&DwV@fWNmNG;~;zX`?2OEYfBCxEV#7
dG;7_wNT*5Ti`1%Ag*0#7rIUisQ2d|t{6ETFRVx4h

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/p.wav b/etemplate/templates/default/audio/p.wav
new file mode 100644
index 0000000000000000000000000000000000000000..3b94c7a33c21408bb25392a6d920f52f967aca71
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/q.wav b/etemplate/templates/default/audio/q.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c757e54e1c514e26a0b2cb934fc25c9086b5cd21
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/r.wav b/etemplate/templates/default/audio/r.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c2e4b24114b6c26b5d91a44761badd09f270106a
GIT binary patch
literal 22158
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
X#z$5!Uy(Fz)up3^_aL|v()0fVGIZ#Q

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/s.wav b/etemplate/templates/default/audio/s.wav
new file mode 100644
index 0000000000000000000000000000000000000000..8edcf8dc4c66656e8fd5e4b40f7a22a622163d15
GIT binary patch
literal 22158
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
a740x#Y|&bktB7W;J9jX1%_mLh{{H|45tD5I

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/t.wav b/etemplate/templates/default/audio/t.wav
new file mode 100644
index 0000000000000000000000000000000000000000..e714a4aee64e899ebe2760c996c15eb84aec4835
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/u.wav b/etemplate/templates/default/audio/u.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f5f35d1cf3b320a8f230e08268ab5d987ffac7f5
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/v.wav b/etemplate/templates/default/audio/v.wav
new file mode 100644
index 0000000000000000000000000000000000000000..4234a9606286be3b84e6626efe297d0782eb3777
GIT binary patch
literal 22158
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
K!{Lk&J^lxZd@*?d

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/w.wav b/etemplate/templates/default/audio/w.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f6fba71a13f52df7b32e25cd51af28bfeebf1eeb
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/x.wav b/etemplate/templates/default/audio/x.wav
new file mode 100644
index 0000000000000000000000000000000000000000..a45fd4b87403df192f05b09999c457c35bc70802
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/y.wav b/etemplate/templates/default/audio/y.wav
new file mode 100644
index 0000000000000000000000000000000000000000..921ae5ded2fa61e01d9ac3b7ee9bb0b9bf81954f
GIT binary patch
literal 22158
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

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/audio/z.wav b/etemplate/templates/default/audio/z.wav
new file mode 100644
index 0000000000000000000000000000000000000000..1fa83a48dc2962a52c41fa0cc5410bf1992d4be6
GIT binary patch
literal 22158
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
A6#xJL

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/audio_icon.gif b/etemplate/templates/default/images/audio_icon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..beafd518270f15bd62e15276ede1c5daab7d8892
GIT binary patch
literal 621
zcmZ?wbhEHb6k`x!_^QpIqpNFdY;5n~;OXV*;u07d77`tuk`SMg4g%!``GsX=6`7eG
zdAYMHE8DB9Cl}-|Dk@sq*4En8JY(Xd{;AWZcXzLtI%VaIncG&ZSh;fLjtv{u?cBL*
z-n?TgR~%Wn^4iXwNA~QwzIDrk0|)jWJ$mfyncG*dUO#s1;k9c|Uc7kq`}ZFcBNGM+
zfZ|UUMg|6;KR{-H{KUZa&ta<9(x8<gS|m~p2o0^P6vU=XK{CZ=x(}m*1do6k+{~vt
zLl_zy85agHh-yLwMY$G7F^ElJatew}f!V&KPji7mu1JShn^PdvNmCX08&s4T)r95*
zx-Npb)0TtzaMHmE6FfvZVb)HK;^E=tNH%$-p|ey7D%i!Mqa(x5*E!j+#73?UA{gqW
zcyofAOwhw7#zY^jsofCKNlJ$$Q@Q&6o)v@b<yrx<>0Hu6g9xjs6OJx{*}F1irQnIh
u7dv#M;XVU}-70|>#f(4=q5()DsoH-GNgp`0mIfgL4N0Ze0<a?-8LR>AvFtqn

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/images/refresh.gif b/etemplate/templates/default/images/refresh.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a10b24717f9d5be6af61c1c3dd646f6bf0e99ab9
GIT binary patch
literal 865
zcmZ?wbhEHb6k`x!_!h>%CaB6Ptji&y#V=<qs$wmzW+Sg-BdX;puji<w=cZ=lrDYu+
zo?KniIj5?BRp+$j-IG`J&RX3zdt2X}ZBys2?OC{Y`hxW{7q6ePX!DfCyQi(#H+$*k
z8OwLgU$K48$~_BLZCku%_mT~JR&LxgZRz1@E00cHeQL(CLvvRjnYH@lybZ_ZY`(N?
z{ecDR&n($^XwjxKt2Q56v;E}iok!O0I<tQN&5b*cZr*ch$NuxXkDT3p@Y0sUH+LPq
zvj6z4Jtyw$JpOR+)sKfxT|Io}&WZE4j$OEO^78$|XP+Ip^7`zRhbJz-ym<Zbg&U7A
z-+p!N!OPpP|37;9_37ImFW!E5{N?}q&!1j@{rl$6|4-lkeE#$A_rHG(0|yj;vVbku
z0g<3MVPOB)5C#RIFb0ec0Wm^CLW4rkq<o!BloZU}eBr_&VIg7m^3w7_`VzVd4nRF%
zBY>p2w7!KzXt05lpspEM3`BTH%UXDah6V>n8Og~tI6xGK`HJXUg#tx`gY`5u<@9|a
z${kJRgF-nOg9F(4R6=DG>_MWTp(f&{p)Bf_0o<Z?qM??$rVt~P6l_AJ^i-Htv{Z$H
zUHSDPCMYOag{o^PYXqyRssvl=D}dF8nCjaE>q%;a?r#XtQw|MwS1<*8Ce%$(jz?HI
zI5;#YDAa~u-UDKWuc<z-gl(t~(0wip*7BYZ(GU|uISF-^&;TwbRtb4$uwW?A7z<e=
z2?>r+83P4<hrlp@ka!5t(N>BI7J_Vwa^hB@P%i@|8bZRnos_J^l|21I!{Ff=78Vo=
aM8QB^K+!<3$zTGg0-_A8G%&D{!5RQ?yDO0Z

literal 0
HcmV?d00001

diff --git a/etemplate/templates/default/words/.htaccess b/etemplate/templates/default/words/.htaccess
new file mode 100644
index 0000000000..fa6ce3fd4e
--- /dev/null
+++ b/etemplate/templates/default/words/.htaccess
@@ -0,0 +1 @@
+deny from all 
diff --git a/etemplate/templates/default/words/words.txt b/etemplate/templates/default/words/words.txt
new file mode 100644
index 0000000000..ed410f0986
--- /dev/null
+++ b/etemplate/templates/default/words/words.txt
@@ -0,0 +1,250 @@
+spell
+study
+still
+plant
+along
+often
+until
+carry
+black
+bring
+drink
+funny
+seven
+blast
+blend
+blimp
+blink
+bliss
+block
+blond
+bluff
+blunt
+brand
+brass
+brunt
+clamp
+clasp
+class
+cliff
+cling
+clink
+clump
+clung
+craft
+cramp
+crisp
+crust
+draft
+drank
+dress
+drift
+drill
+fling
+flung
+flunk
+frank
+frill
+frisk
+frost
+gland
+glass
+glint
+gramp
+grand
+grant
+grasp
+grass
+grill
+grump
+grunt
+plank
+plump
+prank
+press
+print
+scalp
+scram
+scrap
+skill
+skunk
+slang
+slant
+slept
+sling
+slump
+smack
+smell
+snack
+sniff
+spank
+spend
+spent
+spill
+splat
+split
+spunk
+stack
+stamp
+stand
+stiff
+sting
+stink
+stomp
+strap
+strip
+stuck
+stump
+swang
+swell
+swift
+swing
+swung
+tramp
+trend
+trick
+trunk
+trust
+twang
+twist
+admit
+album
+blank
+clock
+crack
+crept
+cross
+index
+stuff
+stunt
+upset
+click
+cluck
+stick
+added
+attic
+brick
+buddy
+bunny
+buses
+cabin
+camel
+candy
+fifty
+habit
+happy
+jelly
+kitty
+lemon
+limit
+model
+nanny
+penny
+puppy
+robin
+salad
+sandy
+scrub
+silly
+slick
+stung
+sunny
+truck
+tummy
+unzip
+visit
+wagon
+bless
+brisk
+clack
+clang
+crick
+crock
+flick
+flock
+frizz
+gloss
+gruff
+plums
+scuff
+skips
+skull
+smock
+snuff
+swept
+track
+given
+angry
+belly
+empty
+extra
+hurry
+sorry
+spell
+study
+still
+plant
+along
+often
+until
+carry
+black
+bring
+drink
+funny
+seven
+blast
+blend
+blimp
+blink
+bliss
+block
+blond
+bluff
+blunt
+brand
+brass
+brunt
+clamp
+clasp
+class
+cliff
+cling
+clink
+clump
+clung
+craft
+cramp
+crisp
+crust
+draft
+drank
+dress
+drift
+drill
+fling
+flung
+flunk
+frank
+frill
+frisk
+frost
+gland
+glass
+glint
+gramp
+grand
+grant
+grasp
+grass
+grill
+grump
+grunt
+plank
+plump
+prank
+press
+print
+scalp
+scram
+scrap
\ No newline at end of file

From 8dc163f04f11bcb5180a8c95fea68aa0d76eba6d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 14 Jul 2009 19:51:03 +0000
Subject: [PATCH 473/510] some modifications to get iPhone working with
 EGroupware

---
 calendar/inc/class.calendar_groupdav.inc.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index b9b78e2836..a0a3ce39da 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -128,6 +128,7 @@ class calendar_groupdav extends groupdav_handler
 	            			'text/calendar; charset=utf-8; component=VEVENT' : 'text/calendar'),
 					// getlastmodified and getcontentlength are required by WebDAV and Cadaver eg. reports 404 Not found if not set
 					HTTP_WebDAV_Server::mkprop('getlastmodified', $event['modified']),
+					HTTP_WebDAV_Server::mkprop('resourcetype',''),	// iPhone requires that attribute!
 				);
 				//error_log(__FILE__ . __METHOD__ . "Calendar Data : $calendar_data");
 				if ($calendar_data)
@@ -175,7 +176,7 @@ class calendar_groupdav extends groupdav_handler
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($path,...) comp-filter='{$filter['attrs']['name']}'");
-						
+
 						switch($filter['attrs']['name'])
 						{
 							case 'VTODO':
@@ -253,7 +254,7 @@ class calendar_groupdav extends groupdav_handler
 					if ($option['name'] == 'href')
 					{
 						$parts = explode('/',$option['data']);
-		
+
 						if (is_numeric($id = basename(array_pop($parts),'.ics'))) $ids[] = $id;
 					}
 				}
@@ -262,7 +263,7 @@ class calendar_groupdav extends groupdav_handler
 			{
 				$cal_filters['query'][] = 'egw_cal.cal_id IN ('.implode(',',array_map(create_function('$n','return (int)$n;'),$ids)).')';
 			}
-			
+
 			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($path,,,$user,$id) calendar-multiget: ids=".implode(',',$ids));
 		}
 		return true;
@@ -302,10 +303,10 @@ class calendar_groupdav extends groupdav_handler
 		if($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
 		$return_no_access=true;	// as handled by importVCal anyway and allows it to set the status for participants
 		$event = $this->_common_get_put_delete('PUT',$options,$id,$return_no_access);
-		
+
 		if (!is_null($event) && !is_array($event))
 		{
-		
+
 		if($this->debug) error_log(__METHOD__.print_r($event,true).function_backtrace());
 			return $event;
 		}
@@ -362,7 +363,7 @@ class calendar_groupdav extends groupdav_handler
 	function read($id)
 	{
 		//$cal_read = $this->bo->read($id,null,false,'server');//njv: do we actually get anything
-		if ($this->debug > 1) error_log("bo-ical read  :$id:");//njv: 
+		if ($this->debug > 1) error_log("bo-ical read  :$id:");//njv:
 		return $this->bo->read($id,null,false,'server');
 	}
 
@@ -414,6 +415,11 @@ class calendar_groupdav extends groupdav_handler
 		$props[] =	HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',$_SERVER['SCRIPT_NAME'].'/');
 		// email of the current user, see caldav-sheduling draft
 		$props[] =	HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set','MAILTO:'.$GLOBALS['egw_info']['user']['email']);
+		// supported components, currently only VEVENT
+		$props[] =	$sc = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-component-set',array(
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VEVENT')),
+//			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VTODO')),	// not yet supported
+		));
 
 		return $props;
 	}

From 1dc2c8805938f8e38e918fc69ef303d8679c3af1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Jul 2009 10:47:36 +0000
Subject: [PATCH 474/510] fixed not working precistion display

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

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index fd8a660320..1825995364 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -1113,7 +1113,7 @@ class etemplate extends boetemplate
 				if (($type == 'float' || !is_numeric($pre)) && $value && $pre)
 				{
 					$value = str_replace(array(' ',','),array('','.'),$value);
-					$value = is_numeric($pre) ? round($value,$pre) : sprintf($pre,$value);
+					$value = is_numeric($pre) ? number_format($value,$pre,'.','') : sprintf($pre,$value);
 				}
 				$cell_options .= ',,'.($cell['type'] == 'int' ? '/^-?[0-9]*$/' : '/^-?[0-9]*[,.]?[0-9]*$/');
 				// fall-through

From 7c3f249f717fa16f4249e015387653dbe575746b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Jul 2009 11:31:02 +0000
Subject: [PATCH 475/510] "added static function to check if file exists, which
 does NOT take the extension into account (can be used in the application code
 too)"

---
 etemplate/inc/class.vfs_widget.inc.php | 53 +++++++++++++++++---------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index 93e1cda408..fd0a9e6725 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -112,29 +112,16 @@ class vfs_widget
 					if (!empty($relpath)) $value .= '/'.$relpath;
 				}
 				$path = $extension_data['path'] = $value;
-				$dir = egw_vfs::dirname($path);
-				static $files = array();	// static var, to scan each directory only once
-				if (!isset($files[$dir])) $files[$dir] = egw_vfs::file_exists($dir) ? egw_vfs::scandir($dir) : array();
-				$basename = egw_vfs::basename($path);
-				$basename_len = strlen($basename);
-				foreach($files[$dir] as $file)
+				if (self::file_exists($path))	// display download link and delete icon
 				{
-					if (substr($file,0,$basename_len) == $basename)
-					{
-						$file_exists = true;
-						break;
-					}
-				}
-				if ($file_exists)	// display download link and delete icon
-				{
-					$path = $extension_data['path'] = $dir.'/'.$file;
-					$value = empty($cell['label']) ? $file : lang($cell['label']);	// display (translated) Label or filename (if label empty)
+					$extension_data['path'] = $path;
+					$value = empty($cell['label']) ? basename($path) : lang($cell['label']);	// display (translated) Label or filename (if label empty)
 
 					$vfs_link = etemplate::empty_cell('label',$cell['name'],array(
 						'size' => ','.egw_vfs::download_url($path).',,,,,'.$path,
 					));
 					// if dir is writable, add delete link
-					if (egw_vfs::is_writable($dir))
+					if (egw_vfs::is_writable(egw_vfs::dirname($path)))
 					{
 						$cell = etemplate::empty_cell('hbox','',array('size' => ',,0,0'));
 						etemplate::add_child($cell,$vfs_link);
@@ -346,6 +333,38 @@ class vfs_widget
 		return true;
 	}
 
+	/**
+	 * Check if vfs file exists *without* using the extension
+	 *
+	 * If you rename a file, you have to clear the cache ($clear_after=true)!
+	 *
+	 * @param string &$path on call path without extension, if existing on return full path incl. extension
+	 * @param boolean $clear_after=null clear file-cache after (true) or before (false), default dont clear
+	 * @return
+	 */
+	static function file_exists(&$path,$clear_after=null)
+	{
+		static $files = array();	// static var, to scan each directory only once
+		$dir = egw_vfs::dirname($path);
+		if ($clear_after === false) unset($files[$dir]);
+		if (!isset($files[$dir])) $files[$dir] = egw_vfs::file_exists($dir) ? egw_vfs::scandir($dir) : array();
+
+		$basename = egw_vfs::basename($path);
+		$basename_len = strlen($basename);
+		$found = false;
+		foreach($files[$dir] as $file)
+		{
+			if (substr($file,0,$basename_len) == $basename)
+			{
+				$path = $dir.'/'.$file;
+				$found = true;
+			}
+		}
+		if ($clear_after === true) unset($files[$dir]);
+		//echo "<p>".__METHOD__."($path) returning ".array2string($found)."</p>\n";
+		return $found;
+	}
+
 	/**
 	 * postprocessing method, called after the submission of the form
 	 *

From ab20b324e05c5da6c61abf5331b7ac5823344800 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 15 Jul 2009 14:22:29 +0000
Subject: [PATCH 476/510] fix for: if no cf import fails with fatal error

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

diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index 88fe56a057..c1e7464cd7 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -159,7 +159,7 @@ switch($_POST['action'])
 		$addr_names['bday']    .= ': YYYY-mm-dd';
 		$addr_names['uid']      = lang('Unique ID (UID)');
 		unset($addr_names['jpegphoto']);	// cant cvs import that
-
+		$cfs=array();
 		foreach($bocontacts->customfields as $name => $data)
 		{
 			$cfs['#'.$name] = $addr_names['#'.$name] = $data['label'];

From e667e168b4325e6613d71be26b1f1f208802ffeb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Jul 2009 19:31:25 +0000
Subject: [PATCH 477/510] - merged SyncML-1.2 branch with trunk: svn merge
 ^/trunk/phpgwapi@27377 ^/branches/SyncML-1.2/phpgwapi .

---
 phpgwapi/inc/class.contenthistory.inc.php     |    4 +-
 phpgwapi/inc/horde/Horde/Date.php             |  769 +++++++++
 phpgwapi/inc/horde/Horde/RPC/syncml.php       |    4 +-
 phpgwapi/inc/horde/Horde/String.php           |  437 +++--
 phpgwapi/inc/horde/Horde/SyncML.php           |  369 +++--
 phpgwapi/inc/horde/Horde/SyncML/Command.php   |  180 ++-
 .../inc/horde/Horde/SyncML/Command/Alert.php  |  699 ++++----
 .../inc/horde/Horde/SyncML/Command/Final.php  |   31 +-
 .../inc/horde/Horde/SyncML/Command/Get.php    |   85 +-
 .../inc/horde/Horde/SyncML/Command/Map.php    |  130 +-
 .../inc/horde/Horde/SyncML/Command/Put.php    |  231 ++-
 .../horde/Horde/SyncML/Command/Replace.php    |   35 +-
 .../horde/Horde/SyncML/Command/Results.php    |  307 +---
 .../inc/horde/Horde/SyncML/Command/Status.php |  173 +-
 .../inc/horde/Horde/SyncML/Command/Sync.php   |  340 ++--
 .../horde/Horde/SyncML/Command/Sync/Add.php   |   33 +-
 .../Command/Sync/ContentSyncElement.php       |  203 ++-
 .../Horde/SyncML/Command/Sync/Delete.php      |   32 +-
 .../Horde/SyncML/Command/Sync/Replace.php     |   42 +-
 .../Horde/SyncML/Command/Sync/SyncElement.php |  184 ++-
 .../SyncML/Command/Sync/SyncElementItem.php   |   82 +-
 phpgwapi/inc/horde/Horde/SyncML/State.php     |  300 +++-
 phpgwapi/inc/horde/Horde/SyncML/State_egw.php |  727 +++++----
 phpgwapi/inc/horde/Horde/SyncML/Sync.php      |  578 +++++--
 .../SyncML/Sync/RefreshFromClientSync.php     |   17 +-
 .../SyncML/Sync/RefreshFromServerSync.php     |  190 ++-
 .../inc/horde/Horde/SyncML/Sync/SlowSync.php  |  334 ++--
 .../horde/Horde/SyncML/Sync/TwoWaySync.php    |  445 ++++--
 phpgwapi/inc/horde/Horde/iCalendar.php        | 1410 +++++++++--------
 phpgwapi/inc/horde/Horde/iCalendar/valarm.php |   10 +-
 phpgwapi/inc/horde/Horde/iCalendar/vcard.php  |   46 +-
 phpgwapi/inc/horde/Horde/iCalendar/vevent.php |   48 +-
 .../inc/horde/Horde/iCalendar/vfreebusy.php   |  285 +++-
 .../inc/horde/Horde/iCalendar/vjournal.php    |   10 +-
 phpgwapi/inc/horde/Horde/iCalendar/vnote.php  |   18 +-
 .../inc/horde/Horde/iCalendar/vtimezone.php   |  144 +-
 phpgwapi/inc/horde/Horde/iCalendar/vtodo.php  |   10 +-
 phpgwapi/inc/horde/XML/WBXML.php              |   46 +-
 .../inc/horde/XML/WBXML/ContentHandler.php    |   39 +-
 phpgwapi/inc/horde/XML/WBXML/DTD.php          |   14 +-
 phpgwapi/inc/horde/XML/WBXML/DTD/SyncML.php   |   37 +-
 .../inc/horde/XML/WBXML/DTD/SyncMLDevInf.php  |   35 +-
 .../inc/horde/XML/WBXML/DTD/SyncMLMetInf.php  |   32 +-
 phpgwapi/inc/horde/XML/WBXML/DTDManager.php   |   76 +-
 phpgwapi/inc/horde/XML/WBXML/Decoder.php      |  110 +-
 phpgwapi/inc/horde/XML/WBXML/Encoder.php      |   56 +-
 phpgwapi/inc/horde/config/conf.php            |    2 +-
 phpgwapi/inc/horde/lib/core.php               |   31 +-
 48 files changed, 5959 insertions(+), 3461 deletions(-)
 create mode 100644 phpgwapi/inc/horde/Horde/Date.php

diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index c01a878a91..2c0ad1f5f7 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -39,7 +39,7 @@ class contenthistory
 	 *
 	 * @param string $_appName the appname example: infolog_notes
 	 * @param int $_id the internal egwapp content id
-	 * @return bool
+	 * @return boolean
 	 */
 	function expireMapping($_appName, $_id)
 	{
@@ -163,7 +163,7 @@ class contenthistory
 				// now update the time stamp
 				$newData = array (
 					'sync_changedby'	=> $GLOBALS['egw_info']['user']['account_id'],
-					$_action == 'modify' ? 'sync_modified' : 'sync_deleted' => $_ts ,
+					$_action == 'delete' ? 'sync_deleted' : 'sync_modified' => $this->db->to_timestamp($_ts),
 				);
 				$this->db->update(self::TABLE, $newData, $where,__LINE__,__FILE__);
 				break;
diff --git a/phpgwapi/inc/horde/Horde/Date.php b/phpgwapi/inc/horde/Horde/Date.php
new file mode 100644
index 0000000000..496a2ca328
--- /dev/null
+++ b/phpgwapi/inc/horde/Horde/Date.php
@@ -0,0 +1,769 @@
+<?php
+
+define('HORDE_DATE_SUNDAY',    0);
+define('HORDE_DATE_MONDAY',    1);
+define('HORDE_DATE_TUESDAY',   2);
+define('HORDE_DATE_WEDNESDAY', 3);
+define('HORDE_DATE_THURSDAY',  4);
+define('HORDE_DATE_FRIDAY',    5);
+define('HORDE_DATE_SATURDAY',  6);
+
+define('HORDE_DATE_MASK_SUNDAY',    1);
+define('HORDE_DATE_MASK_MONDAY',    2);
+define('HORDE_DATE_MASK_TUESDAY',   4);
+define('HORDE_DATE_MASK_WEDNESDAY', 8);
+define('HORDE_DATE_MASK_THURSDAY', 16);
+define('HORDE_DATE_MASK_FRIDAY',   32);
+define('HORDE_DATE_MASK_SATURDAY', 64);
+define('HORDE_DATE_MASK_WEEKDAYS', 62);
+define('HORDE_DATE_MASK_WEEKEND',  65);
+define('HORDE_DATE_MASK_ALLDAYS', 127);
+
+define('HORDE_DATE_MASK_SECOND',    1);
+define('HORDE_DATE_MASK_MINUTE',    2);
+define('HORDE_DATE_MASK_HOUR',      4);
+define('HORDE_DATE_MASK_DAY',       8);
+define('HORDE_DATE_MASK_MONTH',    16);
+define('HORDE_DATE_MASK_YEAR',     32);
+define('HORDE_DATE_MASK_ALLPARTS', 63);
+
+/**
+ * Horde Date wrapper/logic class, including some calculation
+ * functions.
+ *
+ * $Horde: framework/Date/Date.php,v 1.8.10.18 2008/09/17 08:46:04 jan Exp $
+ *
+ * @package Horde_Date
+ */
+class Horde_Date {
+
+    /**
+     * Year
+     *
+     * @var integer
+     */
+    var $year;
+
+    /**
+     * Month
+     *
+     * @var integer
+     */
+    var $month;
+
+    /**
+     * Day
+     *
+     * @var integer
+     */
+    var $mday;
+
+    /**
+     * Hour
+     *
+     * @var integer
+     */
+    var $hour = 0;
+
+    /**
+     * Minute
+     *
+     * @var integer
+     */
+    var $min = 0;
+
+    /**
+     * Second
+     *
+     * @var integer
+     */
+    var $sec = 0;
+
+    /**
+     * Internally supported strftime() specifiers.
+     *
+     * @var string
+     */
+    var $_supportedSpecs = '%CdDeHImMnRStTyY';
+
+    /**
+     * Build a new date object. If $date contains date parts, use them to
+     * initialize the object.
+     *
+     * Recognized formats:
+     * - arrays with keys 'year', 'month', 'mday', 'day' (since Horde 3.2),
+     *   'hour', 'min', 'minute' (since Horde 3.2), 'sec'
+     * - objects with properties 'year', 'month', 'mday', 'hour', 'min', 'sec'
+     * - yyyy-mm-dd hh:mm:ss (since Horde 3.1)
+     * - yyyymmddhhmmss (since Horde 3.1)
+     * - yyyymmddThhmmssZ (since Horde 3.1.4)
+     * - unix timestamps
+     */
+    function Horde_Date($date = null)
+    {
+        if (function_exists('nl_langinfo')) {
+            $this->_supportedSpecs .= 'bBpxX';
+        }
+
+        if (is_array($date) || is_object($date)) {
+            foreach ($date as $key => $val) {
+                if (in_array($key, array('year', 'month', 'mday', 'hour', 'min', 'sec'))) {
+                    $this->$key = (int)$val;
+                }
+            }
+
+            // If $date['day'] is present and numeric we may have been passed
+            // a Horde_Form_datetime array.
+            if (is_array($date) && isset($date['day']) &&
+                is_numeric($date['day'])) {
+                $this->mday = (int)$date['day'];
+            }
+            // 'minute' key also from Horde_Form_datetime
+            if (is_array($date) && isset($date['minute'])) {
+                $this->min = $date['minute'];
+            }
+        } elseif (!is_null($date)) {
+            // Match YYYY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS and YYYYMMDD'T'HHMMSS'Z'.
+            if (preg_match('/(\d{4})-?(\d{2})-?(\d{2})T? ?(\d{2}):?(\d{2}):?(\d{2})Z?/', $date, $parts)) {
+                $this->year = (int)$parts[1];
+                $this->month = (int)$parts[2];
+                $this->mday = (int)$parts[3];
+                $this->hour = (int)$parts[4];
+                $this->min = (int)$parts[5];
+                $this->sec = (int)$parts[6];
+            } else {
+                // Try as a timestamp.
+                $parts = @getdate($date);
+                if ($parts) {
+                    $this->year = $parts['year'];
+                    $this->month = $parts['mon'];
+                    $this->mday = $parts['mday'];
+                    $this->hour = $parts['hours'];
+                    $this->min = $parts['minutes'];
+                    $this->sec = $parts['seconds'];
+                }
+            }
+        }
+    }
+
+    /**
+     * @static
+     */
+    function isLeapYear($year)
+    {
+        if (strlen($year) != 4 || preg_match('/\D/', $year)) {
+            return false;
+        }
+
+        return (($year % 4 == 0 && $year % 100 != 0) || $year % 400 == 0);
+    }
+
+    /**
+     * Returns the day of the year (1-366) that corresponds to the
+     * first day of the given week.
+     *
+     * TODO: with PHP 5.1+, see http://derickrethans.nl/calculating_start_and_end_dates_of_a_week.php
+     *
+     * @param integer $week  The week of the year to find the first day of.
+     * @param integer $year  The year to calculate for.
+     *
+     * @return integer  The day of the year of the first day of the given week.
+     */
+    function firstDayOfWeek($week, $year)
+    {
+        $jan1 = new Horde_Date(array('year' => $year, 'month' => 1, 'mday' => 1));
+        $start = $jan1->dayOfWeek();
+        if ($start > HORDE_DATE_THURSDAY) {
+            $start -= 7;
+        }
+        return (($week * 7) - (7 + $start)) + 1;
+    }
+
+    /**
+     * @static
+     */
+    function daysInMonth($month, $year)
+    {
+        if ($month == 2) {
+            if (Horde_Date::isLeapYear($year)) {
+                return 29;
+            } else {
+                return 28;
+            }
+        } elseif ($month == 4 || $month == 6 || $month == 9 || $month == 11) {
+            return 30;
+        } else {
+            return 31;
+        }
+    }
+
+    /**
+     * Return the day of the week (0 = Sunday, 6 = Saturday) of this
+     * object's date.
+     *
+     * @return integer  The day of the week.
+     */
+    function dayOfWeek()
+    {
+        if ($this->month > 2) {
+            $month = $this->month - 2;
+            $year = $this->year;
+        } else {
+            $month = $this->month + 10;
+            $year = $this->year - 1;
+        }
+
+        $day = (floor((13 * $month - 1) / 5) +
+                $this->mday + ($year % 100) +
+                floor(($year % 100) / 4) +
+                floor(($year / 100) / 4) - 2 *
+                floor($year / 100) + 77);
+
+        return (int)($day - 7 * floor($day / 7));
+    }
+
+    /**
+     * Returns the day number of the year (1 to 365/366).
+     *
+     * @return integer  The day of the year.
+     */
+    function dayOfYear()
+    {
+        $monthTotals = array(0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
+        $dayOfYear = $this->mday + $monthTotals[$this->month - 1];
+        if (Horde_Date::isLeapYear($this->year) && $this->month > 2) {
+            ++$dayOfYear;
+        }
+
+        return $dayOfYear;
+    }
+
+    /**
+     * Returns the week of the month.
+     *
+     * @since Horde 3.2
+     *
+     * @return integer  The week number.
+     */
+    function weekOfMonth()
+    {
+        return ceil($this->mday / 7);
+    }
+
+    /**
+     * Returns the week of the year, first Monday is first day of first week.
+     *
+     * @return integer  The week number.
+     */
+    function weekOfYear()
+    {
+        return $this->format('W');
+    }
+
+    /**
+     * Return the number of weeks in the given year (52 or 53).
+     *
+     * @static
+     *
+     * @param integer $year  The year to count the number of weeks in.
+     *
+     * @return integer $numWeeks   The number of weeks in $year.
+     */
+    function weeksInYear($year)
+    {
+        // Find the last Thursday of the year.
+        $day = 31;
+        $date = new Horde_Date(array('year' => $year, 'month' => 12, 'mday' => $day, 'hour' => 0, 'min' => 0, 'sec' => 0));
+        while ($date->dayOfWeek() != HORDE_DATE_THURSDAY) {
+            --$date->mday;
+        }
+        return $date->weekOfYear();
+    }
+
+    /**
+     * Set the date of this object to the $nth weekday of $weekday.
+     *
+     * @param integer $weekday  The day of the week (0 = Sunday, etc).
+     * @param integer $nth      The $nth $weekday to set to (defaults to 1).
+     */
+    function setNthWeekday($weekday, $nth = 1)
+    {
+        if ($weekday < HORDE_DATE_SUNDAY || $weekday > HORDE_DATE_SATURDAY) {
+            return false;
+        }
+
+        $this->mday = 1;
+        $first = $this->dayOfWeek();
+        if ($weekday < $first) {
+            $this->mday = 8 + $weekday - $first;
+        } else {
+            $this->mday = $weekday - $first + 1;
+        }
+        $this->mday += 7 * $nth - 7;
+
+        $this->correct();
+
+        return true;
+    }
+
+    function dump($prefix = '')
+    {
+        echo ($prefix ? $prefix . ': ' : '') . $this->year . '-' . $this->month . '-' . $this->mday . "<br />\n";
+    }
+
+    /**
+     * Is the date currently represented by this object a valid date?
+     *
+     * @return boolean  Validity, counting leap years, etc.
+     */
+    function isValid()
+    {
+        if ($this->year < 0 || $this->year > 9999) {
+            return false;
+        }
+        return checkdate($this->month, $this->mday, $this->year);
+    }
+
+    /**
+     * Correct any over- or underflows in any of the date's members.
+     *
+     * @param integer $mask  We may not want to correct some overflows.
+     */
+    function correct($mask = HORDE_DATE_MASK_ALLPARTS)
+    {
+        if ($mask & HORDE_DATE_MASK_SECOND) {
+            while ($this->sec < 0) {
+                --$this->min;
+                $this->sec += 60;
+            }
+            while ($this->sec > 59) {
+                ++$this->min;
+                $this->sec -= 60;
+            }
+        }
+
+        if ($mask & HORDE_DATE_MASK_MINUTE) {
+            while ($this->min < 0) {
+                --$this->hour;
+                $this->min += 60;
+            }
+            while ($this->min > 59) {
+                ++$this->hour;
+                $this->min -= 60;
+            }
+        }
+
+        if ($mask & HORDE_DATE_MASK_HOUR) {
+            while ($this->hour < 0) {
+                --$this->mday;
+                $this->hour += 24;
+            }
+            while ($this->hour > 23) {
+                ++$this->mday;
+                $this->hour -= 24;
+            }
+        }
+
+        if ($mask & HORDE_DATE_MASK_MONTH) {
+            while ($this->month > 12) {
+                ++$this->year;
+                $this->month -= 12;
+            }
+            while ($this->month < 1) {
+                --$this->year;
+                $this->month += 12;
+            }
+        }
+
+        if ($mask & HORDE_DATE_MASK_DAY) {
+            while ($this->mday > Horde_Date::daysInMonth($this->month, $this->year)) {
+                $this->mday -= Horde_Date::daysInMonth($this->month, $this->year);
+                ++$this->month;
+                $this->correct(HORDE_DATE_MASK_MONTH);
+            }
+            while ($this->mday < 1) {
+                --$this->month;
+                $this->correct(HORDE_DATE_MASK_MONTH);
+                $this->mday += Horde_Date::daysInMonth($this->month, $this->year);
+            }
+        }
+    }
+
+    /**
+     * Compare this date to another date object to see which one is
+     * greater (later). Assumes that the dates are in the same
+     * timezone.
+     *
+     * @param mixed $date  The date to compare to.
+     *
+     * @return integer  ==  0 if the dates are equal
+     *                  >=  1 if this date is greater (later)
+     *                  <= -1 if the other date is greater (later)
+     */
+    function compareDate($date)
+    {
+        if (!is_a($date, 'Horde_Date')) {
+            $date = new Horde_Date($date);
+        }
+
+        if ($this->year != $date->year) {
+            return $this->year - $date->year;
+        }
+        if ($this->month != $date->month) {
+            return $this->month - $date->month;
+        }
+
+        return $this->mday - $date->mday;
+    }
+
+    /**
+     * Compare this to another date object by time, to see which one
+     * is greater (later). Assumes that the dates are in the same
+     * timezone.
+     *
+     * @param mixed $date  The date to compare to.
+     *
+     * @return integer  ==  0 if the dates are equal
+     *                  >=  1 if this date is greater (later)
+     *                  <= -1 if the other date is greater (later)
+     */
+    function compareTime($date)
+    {
+        if (!is_a($date, 'Horde_Date')) {
+            $date = new Horde_Date($date);
+        }
+
+        if ($this->hour != $date->hour) {
+            return $this->hour - $date->hour;
+        }
+        if ($this->min != $date->min) {
+            return $this->min - $date->min;
+        }
+
+        return $this->sec - $date->sec;
+    }
+
+    /**
+     * Compare this to another date object, including times, to see
+     * which one is greater (later). Assumes that the dates are in the
+     * same timezone.
+     *
+     * @param mixed $date  The date to compare to.
+     *
+     * @return integer  ==  0 if the dates are equal
+     *                  >=  1 if this date is greater (later)
+     *                  <= -1 if the other date is greater (later)
+     */
+    function compareDateTime($date)
+    {
+        if (!is_a($date, 'Horde_Date')) {
+            $date = new Horde_Date($date);
+        }
+
+        if ($diff = $this->compareDate($date)) {
+            return $diff;
+        }
+
+        return $this->compareTime($date);
+    }
+
+    /**
+     * Get the time offset for local time zone.
+     *
+     * @param boolean $colon  Place a colon between hours and minutes?
+     *
+     * @return string  Timezone offset as a string in the format +HH:MM.
+     */
+    function tzOffset($colon = true)
+    {
+        $secs = $this->format('Z');
+
+        if ($secs < 0) {
+            $sign = '-';
+            $secs = -$secs;
+        } else {
+            $sign = '+';
+        }
+        $colon = $colon ? ':' : '';
+        $mins = intval(($secs + 30) / 60);
+        return sprintf('%s%02d%s%02d',
+                       $sign, $mins / 60, $colon, $mins % 60);
+    }
+
+    /**
+     * Return the unix timestamp representation of this date.
+     *
+     * @return integer  A unix timestamp.
+     */
+    function timestamp()
+    {
+        if (class_exists('DateTime')) {
+            return $this->format('U');
+        } else {
+            return Horde_Date::_mktime($this->hour, $this->min, $this->sec, $this->month, $this->mday, $this->year);
+        }
+    }
+
+    /**
+     * Return the unix timestamp representation of this date, 12:00am.
+     *
+     * @return integer  A unix timestamp.
+     */
+    function datestamp()
+    {
+        if (class_exists('DateTime')) {
+            $dt = new DateTime();
+            $dt->setDate($this->year, $this->month, $this->mday);
+            $dt->setTime(0, 0, 0);
+            return $dt->format('U');
+        } else {
+            return Horde_Date::_mktime(0, 0, 0, $this->month, $this->mday, $this->year);
+        }
+    }
+
+    /**
+     * Format time using the specifiers available in date() or in the DateTime
+     * class' format() method.
+     *
+     * @since Horde 3.3
+     *
+     * @param string $format
+     *
+     * @return string  Formatted time.
+     */
+    function format($format)
+    {
+        if (class_exists('DateTime')) {
+            $dt = new DateTime();
+            $dt->setDate($this->year, $this->month, $this->mday);
+            $dt->setTime($this->hour, $this->min, $this->sec);
+            return $dt->format($format);
+        } else {
+            return date($format, $this->timestamp());
+        }
+    }
+
+    /**
+     * Format time in ISO-8601 format. Works correctly since Horde 3.2.
+     *
+     * @return string  Date and time in ISO-8601 format.
+     */
+    function iso8601DateTime()
+    {
+        return $this->rfc3339DateTime() . $this->tzOffset();
+    }
+
+    /**
+     * Format time in RFC 2822 format.
+     *
+     * @return string  Date and time in RFC 2822 format.
+     */
+    function rfc2822DateTime()
+    {
+        return $this->format('D, j M Y H:i:s') . ' ' . $this->tzOffset(false);
+    }
+
+    /**
+     * Format time in RFC 3339 format.
+     *
+     * @since Horde 3.1
+     *
+     * @return string  Date and time in RFC 3339 format. The seconds part has
+     *                 been added with Horde 3.2.
+     */
+    function rfc3339DateTime()
+    {
+        return $this->format('Y-m-d\TH:i:s');
+    }
+
+    /**
+     * Format time to standard 'ctime' format.
+     *
+     * @return string  Date and time.
+     */
+    function cTime()
+    {
+        return $this->format('D M j H:i:s Y');
+    }
+
+    /**
+     * Format date and time using strftime() format.
+     *
+     * @since Horde 3.1
+     *
+     * @return string  strftime() formatted date and time.
+     */
+    function strftime($format)
+    {
+        if (preg_match('/%[^' . $this->_supportedSpecs . ']/', $format)) {
+            return strftime($format, $this->timestamp());
+        } else {
+            return $this->_strftime($format);
+        }
+    }
+
+    /**
+     * Format date and time using a limited set of the strftime() format.
+     *
+     * @return string  strftime() formatted date and time.
+     */
+    function _strftime($format)
+    {
+        if (preg_match('/%[bBpxX]/', $format)) {
+            require_once 'Horde/NLS.php';
+        }
+
+        return preg_replace(
+            array('/%b/e',
+                  '/%B/e',
+                  '/%C/e',
+                  '/%d/e',
+                  '/%D/e',
+                  '/%e/e',
+                  '/%H/e',
+                  '/%I/e',
+                  '/%m/e',
+                  '/%M/e',
+                  '/%n/',
+                  '/%p/e',
+                  '/%R/e',
+                  '/%S/e',
+                  '/%t/',
+                  '/%T/e',
+                  '/%x/e',
+                  '/%X/e',
+                  '/%y/e',
+                  '/%Y/',
+                  '/%%/'),
+            array('$this->_strftime(NLS::getLangInfo(constant(\'ABMON_\' . (int)$this->month)))',
+                  '$this->_strftime(NLS::getLangInfo(constant(\'MON_\' . (int)$this->month)))',
+                  '(int)($this->year / 100)',
+                  'sprintf(\'%02d\', $this->mday)',
+                  '$this->_strftime(\'%m/%d/%y\')',
+                  'sprintf(\'%2d\', $this->mday)',
+                  'sprintf(\'%02d\', $this->hour)',
+                  'sprintf(\'%02d\', $this->hour == 0 ? 12 : ($this->hour > 12 ? $this->hour - 12 : $this->hour))',
+                  'sprintf(\'%02d\', $this->month)',
+                  'sprintf(\'%02d\', $this->min)',
+                  "\n",
+                  '$this->_strftime(NLS::getLangInfo($this->hour < 12 ? AM_STR : PM_STR))',
+                  '$this->_strftime(\'%H:%M\')',
+                  'sprintf(\'%02d\', $this->sec)',
+                  "\t",
+                  '$this->_strftime(\'%H:%M:%S\')',
+                  '$this->_strftime(NLS::getLangInfo(D_FMT))',
+                  '$this->_strftime(NLS::getLangInfo(T_FMT))',
+                  'substr(sprintf(\'%04d\', $this->year), -2)',
+                  (int)$this->year,
+                  '%'),
+            $format);
+    }
+
+    /**
+     * mktime() implementation that supports dates outside of 1970-2038,
+     * from http://phplens.com/phpeverywhere/adodb_date_library.
+     *
+     * @TODO remove in Horde 4
+     *
+     * This does NOT work with pre-1970 daylight saving times.
+     *
+     * @static
+     */
+    function _mktime($hr, $min, $sec, $mon = false, $day = false,
+                     $year = false, $is_dst = false, $is_gmt = false)
+    {
+        if ($mon === false) {
+            return $is_gmt
+                ? @gmmktime($hr, $min, $sec)
+                : @mktime($hr, $min, $sec);
+        }
+
+        if ($year > 1901 && $year < 2038 &&
+            ($year >= 1970 || version_compare(PHP_VERSION, '5.0.0', '>='))) {
+            return $is_gmt
+                ? @gmmktime($hr, $min, $sec, $mon, $day, $year)
+                : @mktime($hr, $min, $sec, $mon, $day, $year);
+        }
+
+        $gmt_different = $is_gmt
+            ? 0
+            : (mktime(0, 0, 0, 1, 2, 1970, 0) - gmmktime(0, 0, 0, 1, 2, 1970, 0));
+
+        $mon = intval($mon);
+        $day = intval($day);
+        $year = intval($year);
+
+        if ($mon > 12) {
+            $y = floor($mon / 12);
+            $year += $y;
+            $mon -= $y * 12;
+        } elseif ($mon < 1) {
+            $y = ceil((1 - $mon) / 12);
+            $year -= $y;
+            $mon += $y * 12;
+        }
+
+        $_day_power = 86400;
+        $_hour_power = 3600;
+        $_min_power = 60;
+
+        $_month_table_normal = array('', 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+        $_month_table_leaf = array('', 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+
+        $_total_date = 0;
+        if ($year >= 1970) {
+            for ($a = 1970; $a <= $year; $a++) {
+                $leaf = Horde_Date::isLeapYear($a);
+                if ($leaf == true) {
+                    $loop_table = $_month_table_leaf;
+                    $_add_date = 366;
+                } else {
+                    $loop_table = $_month_table_normal;
+                    $_add_date = 365;
+                }
+                if ($a < $year) {
+                    $_total_date += $_add_date;
+                } else {
+                    for ($b = 1; $b < $mon; $b++) {
+                        $_total_date += $loop_table[$b];
+                    }
+                }
+            }
+
+            return ($_total_date + $day - 1) * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
+        }
+
+        for ($a = 1969 ; $a >= $year; $a--) {
+            $leaf = Horde_Date::isLeapYear($a);
+            if ($leaf == true) {
+                $loop_table = $_month_table_leaf;
+                $_add_date = 366;
+            } else {
+                $loop_table = $_month_table_normal;
+                $_add_date = 365;
+            }
+            if ($a > $year) {
+                $_total_date += $_add_date;
+            } else {
+                for ($b = 12; $b > $mon; $b--) {
+                    $_total_date += $loop_table[$b];
+                }
+            }
+        }
+
+        $_total_date += $loop_table[$mon] - $day;
+        $_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
+        $_day_time = $_day_power - $_day_time;
+        $ret = -($_total_date * $_day_power + $_day_time - $gmt_different);
+        if ($ret < -12220185600) {
+            // If earlier than 5 Oct 1582 - gregorian correction.
+            return $ret + 10 * 86400;
+        } elseif ($ret < -12219321600) {
+            // If in limbo, reset to 15 Oct 1582.
+            return -12219321600;
+        } else {
+            return $ret;
+        }
+    }
+
+}
diff --git a/phpgwapi/inc/horde/Horde/RPC/syncml.php b/phpgwapi/inc/horde/Horde/RPC/syncml.php
index f276e2f6b2..93350b03da 100644
--- a/phpgwapi/inc/horde/Horde/RPC/syncml.php
+++ b/phpgwapi/inc/horde/Horde/RPC/syncml.php
@@ -113,8 +113,8 @@ class Horde_RPC_syncml extends Horde_RPC {
          * that came up for later debugging. */
         $errorLogging = ob_get_clean();
         if (!empty($errorLogging)) {
-            #Horde::logMessage('SyncML: caught output=' .
-            #                  $errorLogging, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            Horde::logMessage('SyncML: caught output=' .
+                              $errorLogging, __FILE__, __LINE__, PEAR_LOG_DEBUG);
         }
 
         return $response;
diff --git a/phpgwapi/inc/horde/Horde/String.php b/phpgwapi/inc/horde/Horde/String.php
index 7e4ef98878..1ff4021c21 100644
--- a/phpgwapi/inc/horde/Horde/String.php
+++ b/phpgwapi/inc/horde/Horde/String.php
@@ -1,16 +1,14 @@
 <?php
 
-require_once 'Horde/Util.php';
-
 $GLOBALS['_HORDE_STRING_CHARSET'] = 'iso-8859-1';
 
 /**
  * The String:: class provides static methods for charset and locale safe
  * string manipulation.
  *
- * $Horde: framework/Util/String.php,v 1.50 2005/02/10 17:09:44 jan Exp $
+ * $Horde: framework/Util/String.php,v 1.43.6.31 2008/10/23 21:28:38 jan Exp $
  *
- * Copyright 2003-2005 Jan Schneider <jan@horde.org>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
@@ -21,18 +19,40 @@ $GLOBALS['_HORDE_STRING_CHARSET'] = 'iso-8859-1';
  */
 class String {
 
+    /**
+     * Caches the result of extension_loaded() calls.
+     *
+     * @param string $ext  The extension name.
+     *
+     * @return boolean  Is the extension loaded?
+     *
+     * @see Util::extensionExists()
+     */
+    function extensionExists($ext)
+    {
+        static $cache = array();
+
+        if (!isset($cache[$ext])) {
+            $cache[$ext] = extension_loaded($ext);
+        }
+
+        return $cache[$ext];
+    }
+
     /**
      * Sets a default charset that the String:: methods will use if none is
-     * explicitely specified.
+     * explicitly specified.
      *
      * @param string $charset  The charset to use as the default one.
      */
     function setDefaultCharset($charset)
     {
         $GLOBALS['_HORDE_STRING_CHARSET'] = $charset;
-        if (Util::extensionExists('mbstring') &&
+        if (String::extensionExists('mbstring') &&
             function_exists('mb_regex_encoding')) {
-            @mb_regex_encoding($charset);
+            $old_error = error_reporting(0);
+            mb_regex_encoding(String::_mbstringCharset($charset));
+            error_reporting($old_error);
         }
     }
 
@@ -44,44 +64,53 @@ class String {
      * The original string is returned if conversion failed or none
      * of the extensions were available.
      *
-     * @param mixed $input     The data to be converted. If $input is an an
-     *                         array, the array's values get converted
-     *                         recursively.
-     * @param string $from     The string's current charset.
-     * @param string $to       The charset to convert the string to. If not
-     *                         specified, the global variable
-     *                         $_HORDE_STRING_CHARSET will be used.
-     * @param bool $recursion  Internally used.
+     * @param mixed $input  The data to be converted. If $input is an an array,
+     *                      the array's values get converted recursively.
+     * @param string $from  The string's current charset.
+     * @param string $to    The charset to convert the string to. If not
+     *                      specified, the global variable
+     *                      $_HORDE_STRING_CHARSET will be used.
      *
-     * @return string  The converted string.
+     * @return mixed  The converted input data.
      */
-    function convertCharset($input, $from, $to = null, $recursion = false)
+    function convertCharset($input, $from, $to = null)
     {
+        /* Don't bother converting numbers. */
+        if (is_numeric($input)) {
+            return $input;
+        }
+
         /* Get the user's default character set if none passed in. */
         if (is_null($to)) {
             $to = $GLOBALS['_HORDE_STRING_CHARSET'];
         }
 
         /* If the from and to character sets are identical, return now. */
-        if (!$recursion) {
-            $from = String::lower($from);
-            $to = String::lower($to);
-        }
+        $from = String::lower($from);
+        $to = String::lower($to);
         if ($from == $to) {
             return $input;
         }
 
         if (is_array($input)) {
             $tmp = array();
-            foreach ($input as $key => $val) {
-                $tmp[String::convertCharset($key, $from, $to, true)] = String::convertCharset($val, $from, $to, true);
+            while (list($key, $val) = each($input)) {
+                $tmp[String::_convertCharset($key, $from, $to)] = String::convertCharset($val, $from, $to);
             }
             return $tmp;
         }
         if (is_object($input)) {
+            // PEAR_Error objects are almost guaranteed to contain recursion,
+            // which will cause a segfault in PHP.  We should never reach
+            // this line, but add a check and a log message to help the devs
+            // track down and fix this issue.
+            if (is_a($input, 'PEAR_Error')) {
+                Horde::logMessage('Called convertCharset() on a PEAR_Error object. ' . print_r($input, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                return '';
+            }
             $vars = get_object_vars($input);
-            foreach ($vars as $key => $val) {
-                $input->$key = String::convertCharset($val, $from, $to, true);
+            while (list($key, $val) = each($vars)) {
+                $input->$key = String::convertCharset($val, $from, $to);
             }
             return $input;
         }
@@ -90,43 +119,62 @@ class String {
             return $input;
         }
 
-        $output = false;
+        return String::_convertCharset($input, $from, $to);
+    }
 
-        /* Use utf8_[en|de]code() if possible. */
+    /**
+     * Internal function used to do charset conversion.
+     *
+     * @access private
+     *
+     * @param string $input  See String::convertCharset().
+     * @param string $from   See String::convertCharset().
+     * @param string $to     See String::convertCharset().
+     *
+     * @return string  The converted string.
+     */
+    function _convertCharset($input, $from, $to)
+    {
+        $output = '';
         $from_check = (($from == 'iso-8859-1') || ($from == 'us-ascii'));
-        if ($from_check && ($to == 'utf-8')) {
-            return utf8_encode($input);
-        }
-
         $to_check = (($to == 'iso-8859-1') || ($to == 'us-ascii'));
-        if (($from == 'utf-8') && $to_check) {
-            return utf8_decode($input);
+
+        /* Use utf8_[en|de]code() if possible and if the string isn't too
+         * large (less than 16 MB = 16 * 1024 * 1024 = 16777216 bytes) - these
+         * functions use more memory. */
+        if (strlen($input) < 16777216 || !(String::extensionExists('iconv') || String::extensionExists('mbstring'))) {
+            if ($from_check && ($to == 'utf-8')) {
+                return utf8_encode($input);
+            }
+
+            if (($from == 'utf-8') && $to_check) {
+                return utf8_decode($input);
+            }
         }
 
         /* First try iconv with transliteration. */
-        if ($from != 'utf7-imap' &&
-            $to != 'utf7-imap' &&
-            Util::extensionExists('iconv')) {
-            ini_set('track_errors', 1);
-            /* We need to tack an extra character temporarily because
-             * of a bug in iconv() if the last character is not a 7
-             * bit ASCII character. */
+        if (($from != 'utf7-imap') &&
+            ($to != 'utf7-imap') &&
+            String::extensionExists('iconv')) {
+            /* We need to tack an extra character temporarily because of a bug
+             * in iconv() if the last character is not a 7 bit ASCII
+             * character. */
+            $oldTrackErrors = ini_set('track_errors', 1);
+            unset($php_errormsg);
             $output = @iconv($from, $to . '//TRANSLIT', $input . 'x');
-            if (isset($php_errormsg)) {
-                $output = false;
-            } else {
-                $output = String::substr($output, 0, -1, $to);
-            }
-            ini_restore('track_errors');
+            $output = (isset($php_errormsg)) ? false : String::substr($output, 0, -1, $to);
+            ini_set('track_errors', $oldTrackErrors);
         }
 
         /* Next try mbstring. */
-        if (!$output && Util::extensionExists('mbstring')) {
-            $output = @mb_convert_encoding($input, $to, $from);
+        if (!$output && String::extensionExists('mbstring')) {
+            $old_error = error_reporting(0);
+            $output = mb_convert_encoding($input, $to, String::_mbstringCharset($from));
+            error_reporting($old_error);
         }
 
         /* At last try imap_utf7_[en|de]code if appropriate. */
-        if (!$output && Util::extensionExists('imap')) {
+        if (!$output && String::extensionExists('imap')) {
             if ($from_check && ($to == 'utf7-imap')) {
                 return @imap_utf7_encode($input);
             }
@@ -135,7 +183,7 @@ class String {
             }
         }
 
-        return !$output ? $input : $output;
+        return (!$output) ? $input : $output;
     }
 
     /**
@@ -155,12 +203,14 @@ class String {
 
         if ($locale) {
             /* The existence of mb_strtolower() depends on the platform. */
-            if (Util::extensionExists('mbstring') &&
+            if (String::extensionExists('mbstring') &&
                 function_exists('mb_strtolower')) {
                 if (is_null($charset)) {
                     $charset = $GLOBALS['_HORDE_STRING_CHARSET'];
                 }
-                $ret = @mb_strtolower($string, $charset);
+                $old_error = error_reporting(0);
+                $ret = mb_strtolower($string, String::_mbstringCharset($charset));
+                error_reporting($old_error);
                 if (!empty($ret)) {
                     return $ret;
                 }
@@ -173,7 +223,7 @@ class String {
         }
         if (!isset($lowers[$string])) {
             $language = setlocale(LC_CTYPE, 0);
-            setlocale(LC_CTYPE, 'en_US');
+            setlocale(LC_CTYPE, 'C');
             $lowers[$string] = strtolower($string);
             setlocale(LC_CTYPE, $language);
         }
@@ -203,7 +253,9 @@ class String {
                 if (is_null($charset)) {
                     $charset = $GLOBALS['_HORDE_STRING_CHARSET'];
                 }
-                $ret = @mb_strtoupper($string, $charset);
+                $old_error = error_reporting(0);
+                $ret = mb_strtoupper($string, String::_mbstringCharset($charset));
+                error_reporting($old_error);
                 if (!empty($ret)) {
                     return $ret;
                 }
@@ -216,7 +268,7 @@ class String {
         }
         if (!isset($uppers[$string])) {
             $language = setlocale(LC_CTYPE, 0);
-            setlocale(LC_CTYPE, 'en_US');
+            setlocale(LC_CTYPE, 'C');
             $uppers[$string] = strtoupper($string);
             setlocale(LC_CTYPE, $language);
         }
@@ -251,31 +303,34 @@ class String {
     /**
      * Returns part of a string.
      *
-     * @param string $string  The string to be converted.
-     * @param int $start      The part's start position, zero based.
-     * @param int $length     The part's length.
-     * @param string $charset The charset to use when calculating the part's
-     *                        position and length, defaults to current charset.
+     * @param string $string   The string to be converted.
+     * @param integer $start   The part's start position, zero based.
+     * @param integer $length  The part's length.
+     * @param string $charset  The charset to use when calculating the part's
+     *                         position and length, defaults to current
+     *                         charset.
      *
      * @return string  The string's part.
      */
     function substr($string, $start, $length = null, $charset = null)
     {
-        if (Util::extensionExists('mbstring')) {
+        if (is_null($length)) {
+            $length = String::length($string, $charset) - $start;
+        }
+        if ($length == 0) {
+            return '';
+        }
+        if (String::extensionExists('mbstring')) {
             if (is_null($charset)) {
                 $charset = $GLOBALS['_HORDE_STRING_CHARSET'];
             }
-            if (is_null($length)) {
-                $length = String::length($string, $charset);
-            }
-            $ret = @mb_substr($string, $start, $length, $charset);
+            $old_error = error_reporting(0);
+            $ret = mb_substr($string, $start, $length, String::_mbstringCharset($charset));
+            error_reporting($old_error);
             if (!empty($ret)) {
                 return $ret;
             }
         }
-        if (is_null($length)) {
-            $length = String::length($string);
-        }
         return substr($string, $start, $length);
     }
 
@@ -290,11 +345,17 @@ class String {
      */
     function length($string, $charset = null)
     {
-        if (Util::extensionExists('mbstring')) {
-            if (is_null($charset)) {
-                $charset = $GLOBALS['_HORDE_STRING_CHARSET'];
-            }
-            $ret = @mb_strlen($string, $charset);
+        if (is_null($charset)) {
+            $charset = $GLOBALS['_HORDE_STRING_CHARSET'];
+        }
+        $charset = String::lower($charset);
+        if ($charset == 'utf-8' || $charset == 'utf8') {
+            return strlen(utf8_decode($string));
+        }
+        if (String::extensionExists('mbstring')) {
+            $old_error = error_reporting(0);
+            $ret = mb_strlen($string, String::_mbstringCharset($charset));
+            error_reporting($old_error);
             if (!empty($ret)) {
                 return $ret;
             }
@@ -308,22 +369,24 @@ class String {
      *
      * @param string $haystack  The string to search through.
      * @param string $needle    The string to search for.
-     * @param int $offset       Allows to specify which character in haystack
+     * @param integer $offset   Allows to specify which character in haystack
      *                          to start searching.
      * @param string $charset   The charset to use when searching for the
      *                          $needle string.
      *
-     * @return int  The position of first occurrence.
+     * @return integer  The position of first occurrence.
      */
     function pos($haystack, $needle, $offset = 0, $charset = null)
     {
-        if (Util::extensionExists('mbstring')) {
+        if (String::extensionExists('mbstring')) {
             if (is_null($charset)) {
                 $charset = $GLOBALS['_HORDE_STRING_CHARSET'];
             }
-            ini_set('track_errors', 1);
-            $ret = @mb_strpos($haystack, $needle, $offset, $charset);
-            ini_restore('track_errors');
+            $track_errors = ini_set('track_errors', 1);
+            $old_error = error_reporting(0);
+            $ret = mb_strpos($haystack, $needle, $offset, String::_mbstringCharset($charset));
+            error_reporting($old_error);
+            ini_set('track_errors', $track_errors);
             if (!isset($php_errormsg)) {
                 return $ret;
             }
@@ -337,7 +400,7 @@ class String {
      * This method behaves exactly like str_pad but is multibyte safe.
      *
      * @param string $input    The string to be padded.
-     * @param int $length      The length of the resulting string.
+     * @param integer $length  The length of the resulting string.
      * @param string $pad      The string to pad the input string with. Must
      *                         be in the same charset like the input string.
      * @param const $type      The padding type. One of STR_PAD_LEFT,
@@ -388,22 +451,89 @@ class String {
     /**
      * Wraps the text of a message.
      *
-     * @todo Make multibyte-save.
+     * @since Horde 3.2
      *
-     * @access public
+     * @param string $string         String containing the text to wrap.
+     * @param integer $width         Wrap the string at this number of
+     *                               characters.
+     * @param string $break          Character(s) to use when breaking lines.
+     * @param boolean $cut           Whether to cut inside words if a line
+     *                               can't be wrapped.
+     * @param string $charset        Character set to use when breaking lines.
+     * @param boolean $line_folding  Whether to apply line folding rules per
+     *                               RFC 822 or similar. The correct break
+     *                               characters including leading whitespace
+     *                               have to be specified too.
      *
-     * @param string $text                 String containing the text to wrap.
-     * @param optional integer $length     Wrap $text at this number of
-     *                                     characters.
-     * @param optional string $break_char  Character(s) to use when breaking
-     *                                     lines.
-     * @param optional string $charset     Character set to use when breaking
-     *                                     lines.
-     * @param optional boolean $quote      Ignore lines that are wrapped with
-     *                                     the '>' character (RFC 2646)? If
-     *                                     true, we don't remove any padding
-     *                                     whitespace at the end of the
-     *                                     string.
+     * @return string  String containing the wrapped text.
+     */
+    function wordwrap($string, $width = 75, $break = "\n", $cut = false,
+                      $charset = null, $line_folding = false)
+    {
+        /* Get the user's default character set if none passed in. */
+        if (is_null($charset)) {
+            $charset = $GLOBALS['_HORDE_STRING_CHARSET'];
+        }
+        $charset = String::_mbstringCharset($charset);
+        $string = String::convertCharset($string, $charset, 'utf-8');
+        $wrapped = '';
+
+        while (String::length($string, 'utf-8') > $width) {
+            $line = String::substr($string, 0, $width, 'utf-8');
+            $string = String::substr($string, String::length($line, 'utf-8'), null, 'utf-8');
+            // Make sure didn't cut a word, unless we want hard breaks anyway.
+            if (!$cut && preg_match('/^(.+?)(\s|\r?\n)/u', $string, $match)) {
+                $line .= $match[1];
+                $string = String::substr($string, String::length($match[1], 'utf-8'), null, 'utf-8');
+            }
+            // Wrap at existing line breaks.
+            if (preg_match('/^(.*?)(\r?\n)(.*)$/u', $line, $match)) {
+                $wrapped .= $match[1] . $match[2];
+                $string = $match[3] . $string;
+                continue;
+            }
+            // Wrap at the last colon or semicolon followed by a whitespace if
+            // doing line folding.
+            if ($line_folding &&
+                preg_match('/^(.*?)(;|:)(\s+.*)$/u', $line, $match)) {
+                $wrapped .= $match[1] . $match[2] . $break;
+                $string = $match[3] . $string;
+                continue;
+            }
+            // Wrap at the last whitespace of $line.
+            if ($line_folding) {
+                $sub = '(.+[^\s])';
+            } else {
+                $sub = '(.*)';
+            }
+            if (preg_match('/^' . $sub . '(\s+)(.*)$/u', $line, $match)) {
+                $wrapped .= $match[1] . $break;
+                $string = ($line_folding ? $match[2] : '') . $match[3] . $string;
+                continue;
+            }
+            // Hard wrap if necessary.
+            if ($cut) {
+                $wrapped .= String::substr($line, 0, $width, 'utf-8') . $break;
+                $string = String::substr($line, $width, null, 'utf-8') . $string;
+                continue;
+            }
+            $wrapped .= $line;
+        }
+
+        return String::convertCharset($wrapped . $string, 'utf-8', $charset);
+    }
+
+    /**
+     * Wraps the text of a message.
+     *
+     * @param string $text        String containing the text to wrap.
+     * @param integer $length     Wrap $text at this number of characters.
+     * @param string $break_char  Character(s) to use when breaking lines.
+     * @param string $charset     Character set to use when breaking lines.
+     * @param boolean $quote      Ignore lines that are wrapped with the '>'
+     *                            character (RFC 2646)? If true, we don't
+     *                            remove any padding whitespace at the end of
+     *                            the string.
      *
      * @return string  String containing the wrapped text.
      */
@@ -422,7 +552,7 @@ class String {
                 if ($input != '-- ') {
                     $input = rtrim($input);
                 }
-                $line = wordwrap($input, $length, $break_char);
+                $line = String::wordwrap($input, $length, $break_char, false, $charset);
             }
 
             $paragraphs[] = $line;
@@ -432,9 +562,8 @@ class String {
     }
 
     /**
-     * Returns true if the every character in the parameter is an
-     * alphabetic character. This method doesn't work with any charset
-     * other than the current charset yet.
+     * Returns true if the every character in the parameter is an alphabetic
+     * character.
      *
      * @param $string   The string to test.
      * @param $charset  The charset to use when testing the string.
@@ -443,26 +572,30 @@ class String {
      */
     function isAlpha($string, $charset = null)
     {
-        if (Util::extensionExists('mbstring')) {
-            $old_charset = mb_regex_encoding();
-            if ($charset != $old_charset) {
-                @mb_regex_encoding($charset);
-            }
-            $alpha = !mb_ereg_match('[^[:alpha:]]', $string);
-            if ($charset != $old_charset) {
-                @mb_regex_encoding($old_charset);
-            }
-            return $alpha;
+        if (!String::extensionExists('mbstring')) {
+            return ctype_alpha($string);
         }
 
-        return ctype_alpha($string);
+        $charset = String::_mbstringCharset($charset);
+        $old_charset = mb_regex_encoding();
+        $old_error = error_reporting(0);
+
+        if ($charset != $old_charset) {
+            mb_regex_encoding($charset);
+        }
+        $alpha = !mb_ereg_match('[^[:alpha:]]', $string);
+        if ($charset != $old_charset) {
+            mb_regex_encoding($old_charset);
+        }
+
+        error_reporting($old_error);
+
+        return $alpha;
     }
 
     /**
-     * Returns true if every character in the parameter is a lowercase
-     * letter in the current locale.
-     *
-     * @access public
+     * Returns true if ever character in the parameter is a lowercase letter in
+     * the current locale.
      *
      * @param $string   The string to test.
      * @param $charset  The charset to use when testing the string.
@@ -476,10 +609,8 @@ class String {
     }
 
     /**
-     * Returns true if every character in the parameter is an
-     * uppercase letter in the current locale.
-     *
-     * @access public
+     * Returns true if every character in the parameter is an uppercase letter
+     * in the current locale.
      *
      * @param string $string   The string to test.
      * @param string $charset  The charset to use when testing the string.
@@ -493,63 +624,59 @@ class String {
     }
 
     /**
-     * Performs a regex match search on the text provided.  Will correctly
-     * handle text with multibyte characters if the mbstring extensions and
-     * the mbregex functions are available.  Will use the preg_match()
-     * function if possible or if the mbregex ereg function is not available.
+     * Performs a multibyte safe regex match search on the text provided.
      *
-     * @access public
      * @since Horde 3.1
      *
      * @param string $text     The text to search.
-     * @param array $regex     The regular expressions to use.  These
-     *                         expressions should conform to ereg() rules -
-     *                         extended perl rules are NOT supported.
-     *                         Additionally, do NOT add perl regex delimiters
-     *                         (e.g. '/' or '|') to the beginning/end.
+     * @param array $regex     The regular expressions to use, without perl
+     *                         regex delimiters (e.g. '/' or '|').
      * @param string $charset  The character set of the text.
      *
      * @return array  The matches array from the first regex that matches.
      */
     function regexMatch($text, $regex, $charset = null)
     {
-        static $mbregex;
-        if (!isset($mbregex)) {
-            $mbregex = function_exists('mb_ereg');
-        }
-
-        $use_mb = false;
-
-        if ($mbregex && !is_null($charset) &&
-            (String::lower($charset) != 'utf-8')) {
-            $old_charset = mb_regex_encoding();
-            if ($charset != $old_charset) {
-                @mb_regex_encoding($charset);
-            } else {
-                unset($old_charset);
-            }
-            $use_mb = true;
+        if (!empty($charset)) {
+            $regex = String::convertCharset($regex, $charset, 'utf-8');
+            $text = String::convertCharset($text, $charset, 'utf-8');
         }
 
         $matches = array();
-
         foreach ($regex as $val) {
-            if ($use_mb) {
-                if (mb_ereg($val, $text, $matches)) {
-                    break;
-                }
-            } else {
-                if (preg_match('/' . $val . '/u', $text, $matches)) {
-                    break;
-                }
+            if (preg_match('/' . $val . '/u', $text, $matches)) {
+                break;
             }
         }
-          
-        if (isset($old_charset)) {
-            @mb_regex_encoding($old_charset);
+
+        if (!empty($charset)) {
+            $matches = String::convertCharset($matches, 'utf-8', $charset);
         }
 
         return $matches;
     }
 
+    /**
+     * Workaround charsets that don't work with mbstring functions.
+     *
+     * @access private
+     *
+     * @param string $charset  The original charset.
+     *
+     * @return string  The charset to use with mbstring functions.
+     */
+    function _mbstringCharset($charset)
+    {
+        /* mbstring functions do not handle the 'ks_c_5601-1987' &
+         * 'ks_c_5601-1989' charsets. However, these charsets are used, for
+         * example, by various versions of Outlook to send Korean characters.
+         * Use UHC (CP949) encoding instead. See, e.g.,
+         * http://lists.w3.org/Archives/Public/ietf-charsets/2001AprJun/0030.html */
+        if (in_array(String::lower($charset), array('ks_c_5601-1987', 'ks_c_5601-1989'))) {
+            $charset = 'UHC';
+        }
+
+        return $charset;
+    }
+
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML.php b/phpgwapi/inc/horde/Horde/SyncML.php
index 50bd3935bd..8bdef4f2cd 100644
--- a/phpgwapi/inc/horde/Horde/SyncML.php
+++ b/phpgwapi/inc/horde/Horde/SyncML.php
@@ -1,32 +1,32 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3.0
+ *
+ * The Horde_SyncML_SyncHdr and Horde_SyncML_SyncBody classes provides
+ * a SyncHdr and SyncBody in SyncML Representation Protocol, version
+ * 1.1 5.2.2 and 5.2.3.  Most of the work is passed on to
+ * Horde_SyncML_Command_Alert and Horde_SyncML_Command_Sync.
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Karsten Fourmont <fourmont@gmx.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Command.php';
 include_once 'Horde/SyncML/Command/Status.php';
 include_once 'Horde/SyncML/Command/Alert.php';
 include_once 'Horde/SyncML/Command/Final.php';
 include_once 'Horde/SyncML/Command/Sync.php';
 include_once 'Horde/SyncML/Sync.php';
+include_once 'Horde/SyncML/Command/Sync/SyncElementItem.php';
 
-/**
- * The Horde_SyncML_SyncHdr and Horde_SyncML_SyncBody classes provides
- * a SyncHdr and SyncBody in SyncML Representation Protocol, version
- * 1.1 5.2.2 and 5.2.3.  Most of the work is passed on to
- * Horde_SyncML_Command_Alert and Horde_SyncML_Command_Sync.
- *
- * $Horde: framework/SyncML/SyncML.php,v 1.21 2004/07/21 19:26:36 karsten Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @author  Karsten Fourmont <fourmont@gmx.de>
- *
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_ContentHandler {
 
     /**
@@ -144,41 +144,52 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
 
     var $_credType;
 
+    var $_maxMsgSize;
+
     function getStateFromSession($sourceURI, $locName, $sessionID)
     {
         // Remove any existing session since we'll be contructing a
         // custom session id.
+		session_regenerate_id();
         session_destroy();
 
 		// we need to (re-)load the eGW session-handler, as session_destroy unloads custom session-handlers
-		if (function_exists('init_session_handler'))
-		{
-			init_session_handler();
+		if (function_exists('init_session_handler')) {
+ 			init_session_handler();
 		}
-		// Reload the Horde SessionHandler if necessary.
+
+        // Reload the Horde SessionHandler if necessary.
         Horde::setupSessionHandler();
 
         // It would seem multisync does not send the user name once it
         // has been authorized. Make sure we have a valid session id.
         if(!empty($_GET['syncml_sessionid'])) {
         	session_id($_GET['syncml_sessionid']);
-	        Horde::logMessage('SyncML['.  session_id() .']: reusing existing session', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+	        Horde::logMessage('SyncML['.  session_id() .']: reusing existing session',
+	        	__FILE__, __LINE__, PEAR_LOG_DEBUG);
         } else {
         	#session_id('syncml' . preg_replace('/[^a-zA-Z0-9]/', '', $sourceURI . $sessionID));
         	session_id('syncml-' . md5(uniqid(rand(), true)));
-	        Horde::logMessage('SyncML['.  session_id() .']: starting new session for '.$this->_locName, __FILE__, __LINE__, PEAR_LOG_INFO);
+	        Horde::logMessage('SyncML['.  session_id() .']: starting new session for '
+	        	. $this->_locName, __FILE__, __LINE__, PEAR_LOG_INFO);
         }
+
         @session_start();
 
         if (!isset($_SESSION['SyncML.state'])) {
             // Create a new state if one does not already exist.
-            Horde::logMessage('SyncML['. session_id() .']: create new session state variable', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            Horde::logMessage('SyncML['. session_id() .']: create new session state variable for '
+            	. $sourceURI, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-# LK        $_SESSION['SyncML.state'] = new Horde_SyncML_State($sourceURI, $locName, $sessionID);
             $_SESSION['SyncML.state'] = new EGW_SyncML_State($sourceURI, $locName, $sessionID);
-        }
-        #if($_SESSION['SyncML.state']->_isAuthorized)
-        #	Horde::logMessage('SyncML['. session_id() .']: is session authorized', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		}
+
+
+        if($_SESSION['SyncML.state']->isAuthorized()) {
+			Horde::logMessage('SyncML['. session_id() .']: session is authorized',
+				__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		}
+        #Horde::logMessage('SyncML['. session_id() . "]:\n" . print_r($_SESSION['SyncML.state'], true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         return $_SESSION['SyncML.state'];
     }
@@ -216,18 +227,26 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
             #Horde::logMessage('SymcML: SyncHdr done. Try to load state from session.', __FILE__, __LINE__, PEAR_LOG_DEBUG);
             $state = $this->getStateFromSession($this->_sourceURI, $this->_locName, $this->_sessionID);
 
-		Horde::logMessage('SyncML['. session_id() .']: package '.$this->_msgID.' +++++++++++++++++++++ started', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			Horde::logMessage('SyncML['. session_id() .']: package '
+				. $this->_msgID.' +++++++++++++++++++++ started',
+				__FILE__, __LINE__, PEAR_LOG_DEBUG);
 
             $state->setVersion($this->_version);
             $state->setMsgID($this->_msgID);
             $state->setTargetURI($this->_targetURI);
             $state->setWBXML(is_a($this->_output, 'XML_WBXML_Encoder'));
-            if(isset($this->_credData) && isset($this->_locName) && !$state->isAuthorized())
-            {
+
+            if(isset($this->_credData)
+            	&& isset($this->_locName)
+            	&& !$state->isAuthorized()) {
             	$state->setPassword($this->_credData);
                 $state->setLocName($this->_locName);
             }
 
+            if (isset($this->_maxMsgSize)) {
+				$state->setMaxMsgSize($this->_maxMsgSize);
+            }
+
             #$str  = 'authorized=' . $state->isAuthorized();
             #$str .= ' version=' . $state->getVersion();
             #$str .= ' msgid=' . $state->getMsgID();
@@ -246,11 +265,17 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
         case 3:
             if ($element == 'VerProto') {
                 // </VerProto></SyncHdr></SyncML>
-                if (trim($this->_chars) == 'SyncML/1.1') {
-                    $this->_version = 1;
-                } else {
-                    $this->_version = 0;
-                }
+				switch (strtolower(trim($this->_chars))) {
+					case 'syncml/1.2':
+						$this->_version = 2;
+						break;
+					case 'syncml/1.1':
+						$this->_version = 1;
+						break;
+					default:
+						$this->_version = 0;
+						break;
+				}
             } elseif ($element == 'SessionID') {
                 // </SessionID></SyncHdr></SyncML>
                 $this->_sessionID = trim($this->_chars);
@@ -271,8 +296,7 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
 
                 $tmp = explode(':', $this->_credData, 2);
                 // set only if not set by LocName already
-                if(!isset($this->_locName))
-                {
+                if(!isset($this->_locName)) {
                 	$this->_locName = $tmp[0];
                 }
                 $this->_credData = $tmp[1];
@@ -282,26 +306,34 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
             break;
 
         case 4:
-            if ($element == 'LocURI') {
-                if ($this->_isSource) {
-                    // </LocURI></Source></SyncHdr></SyncML>
-                    $this->_sourceURI = trim($this->_chars);
-                } else {
-                    // </LocURI></Target></SyncHdr></SyncML>
-                    $this->_targetURI = trim($this->_chars);
-                }
-            } elseif ($element == 'LocName') {
-                if ($this->_isSource) {
-                    // </LocName></Source></SyncHdr></SyncML>
-                    $this->_locName = trim($this->_chars);
-                }
-            } elseif ($element == 'Data') {
-                    // </Data></Cred></SyncHdr></SyncML>
-                if ($this->_isCred) {
-                    $this->_credData = trim($this->_chars);
-                }
-            }
-            break;
+		switch ($element) {
+            		case 'LocURI':
+                		if ($this->_isSource) {
+                    			// </LocURI></Source></SyncHdr></SyncML>
+                    			$this->_sourceURI = trim($this->_chars);
+                		} else {
+                    			// </LocURI></Target></SyncHdr></SyncML>
+                    			$this->_targetURI = trim($this->_chars);
+                		}
+				break;
+            		case 'LocName':
+                		if ($this->_isSource) {
+                    			// </LocName></Source></SyncHdr></SyncML>
+                    			$this->_locName = trim($this->_chars);
+                		}
+				break;
+            		case 'Data':
+                    		// </Data></Cred></SyncHdr></SyncML>
+                		if ($this->_isCred) {
+                    			$this->_credData = trim($this->_chars);
+                		}
+				break;
+			case 'MaxMsgSize':
+				//</MaxMsgSize></Meta></SyncHdr></SyncML>
+				$this->_maxMsgSize = trim($this->_chars);
+				break;
+            		}
+            		break;
 
         case 5:
             if ($this->_isCred) {
@@ -323,19 +355,31 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
     {
         $attrs = array();
 
-        $state = $_SESSION['SyncML.state'];
+        $state = &$_SESSION['SyncML.state'];
 
         $uri = $state->getURI();
         $uriMeta = $state->getURIMeta();
         $output->startElement($uri, 'SyncHdr', $attrs);
 
         $output->startElement($uri, 'VerDTD', $attrs);
-        $chars = ($this->_version == 1) ? '1.1' : '1.0';
+		if ($this->_version == 2) {
+        	$chars = '1.2';
+		} elseif ($this->_version == 1) {
+			$chars = '1.1';
+		} else {
+			$chars = '1.0';
+		}
         $output->characters($chars);
         $output->endElement($uri, 'VerDTD');
 
         $output->startElement($uri, 'VerProto', $attrs);
-        $chars = ($this->_version == 1) ? 'SyncML/1.1' : 'SyncML/1.0';
+		if ($this->_version == 2) {
+        	$chars = 'SyncML/1.2';
+		} elseif ($this->_version == 1) {
+			$chars = 'SyncML/1.1';
+		} else {
+			$chars = 'SyncML/1.0';
+		}
         $output->characters($chars);
         $output->endElement($uri, 'VerProto');
 
@@ -359,37 +403,40 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
         $output->endElement($uri, 'LocURI');
         $output->endElement($uri, 'Source');
 
-	if(session_id() != '' && !strpos($this->_targetURI,'syncml_sessionid')) {
-		$output->startElement($uri, 'RespURI', $attrs);
+		if (session_id() != '' && !strpos($this->_targetURI,'syncml_sessionid')) {
+			$output->startElement($uri, 'RespURI', $attrs);
 
-		// some clients don't send the whole URL as targetURI
-		if (strpos($this->_targetURI,$_SERVER['PHP_SELF']) === false) {
-			$output->characters($this->_targetURI . $_SERVER['PHP_SELF'] . '?syncml_sessionid=' . session_id());
-		} else {
-			$output->characters($this->_targetURI . '?syncml_sessionid=' . session_id());
+			// some clients don't send the whole URL as targetURI
+			if (strpos($this->_targetURI,$_SERVER['PHP_SELF']) === false) {
+				$output->characters($this->_targetURI . $_SERVER['PHP_SELF'] . '?syncml_sessionid=' . session_id());
+			} else {
+				$output->characters($this->_targetURI . '?syncml_sessionid=' . session_id());
+			}
+			$output->endElement($uri, 'RespURI');
 		}
-		$output->endElement($uri, 'RespURI');
-	}
 
-        /*
+
         $output->startElement($uri, 'Meta', $attrs);
 
-        // Dummy Max MsqSize, this is just put in to make the packet
-        // work, it is not a real value.
+		if (!($maxMsgSize = $state->getMaxMsgSizeClient())) {
+			// Dummy MaxMsqSize, this is just put in to make the packet
+			// work, it is not our real value.
+			$maxMsgSize = 50000;
+		}
         $output->startElement($uriMeta, 'MaxMsgSize', $attrs);
-        $chars = '50000';
-        $output->characters($chars);
+        $output->characters($maxMsgSize);
         $output->endElement($uriMeta, 'MaxMsgSize');
 
-        // Dummy MaxObjSize, this is just put in to make the packet
-        // work, it is not a real value.
-        $output->startElement($uriMeta, 'MaxObjSize', $attrs);
-        $chars = '4000000';
-        $output->characters($chars);
-        $output->endElement($uriMeta, 'MaxObjSize');
+        #// Dummy MaxObjSize, this is just put in to make the packet
+        #// work, it is not our real value.
+		#if ($this->_version > 0) {
+		#	// Don't send this to old devices
+        #	$output->startElement($uriMeta, 'MaxObjSize', $attrs);
+        #	$output->characters('4000000');
+        #	$output->endElement($uriMeta, 'MaxObjSize');
+		#}
 
         $output->endElement($uri, 'Meta');
-        */
 
         $output->endElement($uri, 'SyncHdr');
     }
@@ -448,26 +495,27 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
     function startElement($uri, $element, $attrs)
     {
         parent::startElement($uri, $element, $attrs);
+        $state = &$_SESSION['SyncML.state'];
 
         switch ($this->_xmlStack) {
         case 2:
-            $state = & $_SESSION['SyncML.state'];
-
-
             $this->_actionCommands = false; // so far, we have not seen commands that require action from our side
             $state->_sendFinal = false;
 
             // <SyncML><SyncBody>
             $this->_output->startElement($uri, $element, $attrs);
 
-	    if($state->getLocName())
-	    {
-            	// Right our status about the header.
-            	$status = new Horde_SyncML_Command_Status(($state->isAuthorized()) ?
-                                                       RESPONSE_AUTHENTICATION_ACCEPTED : RESPONSE_INVALID_CREDENTIALS, 'SyncHdr');
-            }
-            else
-            {
+	    	if($state->getLocName()) {
+				if($state->isAuthConfirmed()) {
+            		// Right our status about the header
+            		$status = new Horde_SyncML_Command_Status(($state->isAuthorized()) ?
+                    	RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS, 'SyncHdr');
+				} else {
+            		// Right our status about the header.
+            		$status = new Horde_SyncML_Command_Status(($state->isAuthorized()) ?
+                   		RESPONSE_AUTHENTICATION_ACCEPTED : RESPONSE_INVALID_CREDENTIALS, 'SyncHdr');
+				}
+            } else {
             	// Request credentials if not sent so far
             	$status = new Horde_SyncML_Command_Status(RESPONSE_MISSING_CREDENTIALS, 'SyncHdr');
             }
@@ -475,6 +523,7 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
             $status->setSourceRef($state->getSourceURI());
             $status->setTargetRef($state->getTargetURI());
             $status->setCmdRef(0);
+            $state->clearNumberOfElements();
 
             /*$str = 'authorized=' . $state->isAuthorized();
             $str .= ' version=' . $state->getVersion();
@@ -483,11 +532,12 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
             $str .= ' target=' . $state->getTargetURI();
             */
             $this->_currentCmdID = $status->output($this->_currentCmdID, $this->_output);
+            if ($state->isAuthorized()) {
+	    		$state->AuthConfirmed();
+            }
             break;
 
         case 3:
-            $state = & $_SESSION['SyncML.state'];
-
             // <SyncML><SyncBody><[Command]>
             #Horde::logMessage('SyncML['. session_id() ."]:    found command    $element         ", __FILE__, __LINE__, PEAR_LOG_DEBUG);
             $this->_currentCommand = Horde_SyncML_Command::factory($element);
@@ -497,7 +547,7 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
                 // We've got to do something! This can't be the last
                 // packet.
                 $this->_actionCommands = true;
-                Horde::logMessage('SyncML['. session_id() ."]: found action commands <$element> " . $this->_actionCommands, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                Horde::logMessage('SyncML['. session_id() ."]: found action commands <$element> ", __FILE__, __LINE__, PEAR_LOG_DEBUG);
             }
 
             switch($element)
@@ -516,23 +566,29 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
         }
     }
 
-	function endElement($uri, $element) {
+	function endElement($uri, $element)
+	{
+		$state = &$_SESSION['SyncML.state'];
+
 		switch ($this->_xmlStack) {
 			case 2:
 				// </SyncBody></SyncML>
-				$state = & $_SESSION['SyncML.state'];
 
 				Horde::logMessage('SyncML['. session_id() .']: package ----------------------- done', __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-				if($state->getSyncStatus() == CLIENT_SYNC_FINNISHED && $state->getAlert222Received() == true) {
-					$state->setSyncStatus(CLIENT_SYNC_ACKNOWLEDGED);
+				if ($state->getAlert222Received() == true) {
+					// the Funambol specialty
+					if ($state->getSyncStatus() == CLIENT_SYNC_FINNISHED) {
+						$state->setSyncStatus(CLIENT_SYNC_ACKNOWLEDGED);
+					}
 					$state->setAlert222Received(false);
 				}
 
+
 				// send the sync reply
 				// we do still have some data to send OR
 				// we should reply to the Sync command
-				if($state->getSyncStatus() >= CLIENT_SYNC_ACKNOWLEDGED && $state->getSyncStatus() < SERVER_SYNC_FINNISHED) {
+				if($state->getSyncStatus() > CLIENT_SYNC_FINNISHED && $state->getSyncStatus() < SERVER_SYNC_FINNISHED) {
 					$sync = new Horde_SyncML_Command_Sync();
 					$this->_currentCmdID = $sync->syncToClient($this->_currentCmdID, $this->_output);
 				}
@@ -546,13 +602,13 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 
 				$this->_output->endElement($uri, $element);
 
-				Horde::logMessage('SyncML['. session_id() .']: syncStatus ' . $state->getSyncStatus() .'actionCommands: '.$this->_actionCommands, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				Horde::logMessage('SyncML['. session_id() .']: syncStatus = '. $state->getSyncStatus() .', actionCommands = '.
+					($this->_actionCommands ? 'True' : 'False'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 				if (!$this->_actionCommands && $state->getSyncStatus() == SERVER_SYNC_FINNISHED) {
 					// this packet did not contain any real actions, just status and map.
 					// This means, we're through! The session can be closed and
 					// the Anchors saved for the next Sync
-					$state = & $_SESSION['SyncML.state'];
 					Horde::logMessage('SyncML['. session_id() .']: sync' . session_id() . ' completed successfully!', __FILE__, __LINE__, PEAR_LOG_INFO);
 					$state->writeSyncSummary();
 					$log = $state->getLog();
@@ -560,6 +616,9 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 					foreach($log as $k => $v) {
 						$s .= " $k=$v";
 					}
+					if (strlen(trim($s)) == 0) {
+						$s = ' Both parties were already in sync';
+					}
 					Horde::logMessage('SyncML['. session_id() .']: summary:' . $s, __FILE__, __LINE__, PEAR_LOG_INFO);
 				#	Horde::logMessage('SyncML['. session_id() .']: destroying sync session '.session_id(), __FILE__, __LINE__, PEAR_LOG_INFO);
 				#	// session can be closed here!
@@ -571,7 +630,6 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 					// this packet did not contain any real actions, just status and map.
 					// This means, we're through! The session can be closed and
 					// the Anchors saved for the next Sync
-					$state = & $_SESSION['SyncML.state'];
 					Horde::logMessage('SyncML['. session_id() .']: sync' . session_id() . ' completed successfully!', __FILE__, __LINE__, PEAR_LOG_INFO);
 					$state->writeSyncSummary();
 					$log = $state->getLog();
@@ -579,6 +637,9 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 					foreach($log as $k => $v) {
 						$s .= " $k=$v";
 					}
+					if (strlen(trim($s)) == 0) {
+						$s = ' Both parties were already in sync';
+					}
 					Horde::logMessage('SyncML['. session_id() .']: summary:' . $s, __FILE__, __LINE__, PEAR_LOG_INFO);
 
 					Horde::logMessage('SyncML['. session_id() .']: destroying sync session '.session_id(), __FILE__, __LINE__, PEAR_LOG_INFO);
@@ -586,75 +647,53 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
 					session_unset();
 					session_destroy();
 				}
-				if($state->getSyncStatus() == CLIENT_SYNC_FINNISHED) {
-					$state->setSyncStatus(CLIENT_SYNC_ACKNOWLEDGED);
-					Horde::logMessage('SyncML['. session_id() .']: syncStatus(client sync acknowledged) '.$state->getSyncStatus(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				}
-
 				break;
 
 			case 3:
 				// </[Command]></SyncBody></SyncML>
-				$state = & $_SESSION['SyncML.state'];
-
-				// this should be moved to case 2:
-				if($element == 'Final')
-				{
-					// make sure that we request devinfo, if we not have them already
-
-/*            	if(!$state->getClientDeviceInfo())
-            	{
-            		$attrs = array();
-            		$this->_output->startElement($state->getURI(), 'Get', $attrs);
-            		$this->_output->startElement($state->getURI(), 'CmdID', $attrs);
-            		$this->_output->characters($this->_currentCmdID);
-            		$this->_currentCmdID++;
-            		$this->_output->endElement($state->getURI(), 'CmdID');
-
-            		$this->_output->startElement($state->getURI(), 'Meta', $attrs);
-            		$this->_output->startElement($state->getURIMeta(), 'Type', $attrs);
-            		if(is_a($this->_output, 'XML_WBXML_Encoder'))
-                          $this->_output->characters('application/vnd.syncml-devinf+wbxml');
-                        else
-                          $this->_output->characters('application/vnd.syncml-devinf+xml');
-            		$this->_output->endElement($state->getURIMeta(), 'Type');
-            		$this->_output->endElement($state->getURI(), 'Meta');
-
-            		$this->_output->startElement($state->getURI(), 'Item', $attrs);
-            		$this->_output->startElement($state->getURI(), 'Target', $attrs);
-            		$this->_output->startElement($state->getURI(), 'LocURI', $attrs);
-			$this->_output->characters(($state->getVersion() == 0) ? './devinf10' : './devinf11');
-            		$this->_output->endElement($state->getURI(), 'LocURI');
-            		$this->_output->endElement($state->getURI(), 'Target');
-            		$this->_output->endElement($state->getURI(), 'Item');
-
-            		$this->_output->endElement($state->getURI(), 'Get');
-            	} */
-            			}
 
             			$this->_currentCommand->endElement($uri, $element);
 
             			switch($element) {
-            				case 'Final':
-            					if($state->getSyncStatus() == CLIENT_SYNC_STARTED) {
-            						$state->setSyncStatus(CLIENT_SYNC_FINNISHED);
-            						Horde::logMessage('SyncML['. session_id() .']: syncStatus(client sync finnished) ' . $state->getSyncStatus(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-            					}
+	            			case 'Final':
+		            			$this->_actionCommands = false;
+		            			$deviceInfo = $state->getClientDeviceInfo();
 
-            					if($state->getSyncStatus() == SERVER_SYNC_FINNISHED) {
-            						$state->setSyncStatus(SERVER_SYNC_ACKNOWLEDGED);
-            						Horde::logMessage('SyncML['. session_id() .']: syncStatus(server sync acknowledged) ' . $state->getSyncStatus(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-            					}
+		            			if ($state->getSyncStatus() == CLIENT_SYNC_STARTED) {
+			            			if (strtolower($deviceInfo['manufacturer']) == 'funambol'
+				            			&& isset($deviceInfo['softwareVersion'])) {
+				            			$swversion = $deviceInfo['softwareVersion'];
+				            			if ($swversion < 1.0) {
+					            			// e.g. Mozilla plugin uses this range
+					            			$swversion = $swversion * 10;
+				            			}
+				            			if($swversion < 7.0) {
+					            			// We wait for a ALERT_NEXT_MESSAGE from Funambol clients
+					            			Horde::logMessage('SyncML['. session_id()
+						            			. "]: Special treatment for Funambol version $swversion activated",
+												__FILE__, __LINE__, PEAR_LOG_DEBUG);
+					            			$state->setSyncStatus(CLIENT_SYNC_FINNISHED);
+				            			} else {
+					            			$state->setSyncStatus(CLIENT_SYNC_ACKNOWLEDGED);
+				            			}
+			            			} else {
+				            			$state->setSyncStatus(CLIENT_SYNC_ACKNOWLEDGED);
+			            			}
+		            			}
 
-            					$this->_clientSentFinal = true;
-            					#Horde::logMessage('SyncML['. session_id() .']: Sync _syncTag = '. $state->getSyncStatus(), __FILE__, __LINE__, PEAR_LOG_INFO);
+		            			if ($state->getSyncStatus() == SERVER_SYNC_FINNISHED) {
+			            			$state->setSyncStatus(SERVER_SYNC_ACKNOWLEDGED);
+		            			}
 
-						break;
+		            			$this->_clientSentFinal = true;
+		            			Horde::logMessage('SyncML['. session_id() .']: syncStatus(server sync acknowledged) '
+			            			. $state->getSyncStatus(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		            			break;
 
-					default:
-						$this->_currentCmdID = $this->_currentCommand->output($this->_currentCmdID, $this->_output);
-						break;
-				}
+	            			default:
+		            			$this->_currentCmdID = $this->_currentCommand->output($this->_currentCmdID, $this->_output);
+	            			break;
+            			}
 
 				unset($this->_currentCommand);
 				break;
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command.php b/phpgwapi/inc/horde/Horde/SyncML/Command.php
index 97a2236109..505a32e12c 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command.php
@@ -1,80 +1,166 @@
 <?php
-
-include_once 'Horde/SyncML/State.php';
-
 /**
- * The Horde_SyncML_Command class provides a super class fo SyncBody commands.
+ * eGroupWare - SyncML based on Horde 3
  *
- * $Horde: framework/SyncML/SyncML/Command.php,v 1.4 2004/07/03 15:26:46 chuck Exp $
+ * The SyncML_Command class provides a base class for handling all <SyncBody>
+ * commands.
  *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
+ * A SyncML command is a protocol primitive. Each SyncML command specifies to
+ * a recipient an individual operation that is to be performed.
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ * The SyncML_Command objects are hooked into the XML parser of the
+ * SyncML_ContentHandler class and are reponsible for parsing a single command
+ * inside the SyncBody section of a SyncML message. All actions that must be
+ * executed for a single SyncML command are handled by these objects, by means
+ * of the handleCommand() method.
  *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Jan Schneider <jan@horde.org>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
+include_once 'Horde/SyncML/State_egw.php';
+
 class Horde_SyncML_Command {
 
+    /**
+     * Name of the command, like 'Put'.
+     *
+     * Must be overwritten by a sub class.
+     *
+     * @var string
+     */
+    var $_cmdName;
+
+    /**
+     * The command ID (<CmdID>).
+     *
+     * @var integer
+     */
     var $_cmdID;
 
-    var $_xmlStack;
+    /**
+     * Stack for holding the XML elements during creation of the object from
+     * the XML event flow.
+     *
+     * @var array
+     */
+    var $_stack = array();
 
-    var $_chars;
+    /**
+     * Buffer for the parsed character data.
+     *
+     * @var string
+     */
+    var $_chars = '';
 
-    function &factory($command, $params = null)
+    /**
+     * Start element handler for the XML parser, delegated from
+     * SyncML_ContentHandler::startElement().
+     *
+     * @param string $uri      The namespace URI of the element.
+     * @param string $element  The element tag name.
+     * @param array $attrs     A hash with the element's attributes.
+     */
+    function startElement($uri, $element, $attrs)
     {
-        include_once 'Horde/SyncML/Command/' . $command . '.php';
-        $class = 'Horde_SyncML_Command_' . $command;
-        if (class_exists($class)) {
-            return $cmd = new $class($params);
-        } else {
-            Horde::logMessage('SyncML: Class definition of ' . $class . ' not found.', __FILE__, __LINE__, PEAR_LOG_ERR);
-            require_once 'PEAR.php';
-            return PEAR::raiseError('Class definition of ' . $class . ' not found.');
-        }
-    }
-
-    function output($currentCmdID, $output)
-    {
-    }
-
-    function startElement($uri, $localName, $attrs)
-    {
-        $this->_xmlStack++;
+        $this->_stack[] = $element;
     }
 
+    /**
+     * End element handler for the XML parser, delegated from
+     * SyncML_ContentHandler::endElement().
+     *
+     * @param string $uri      The namespace URI of the element.
+     * @param string $element  The element tag name.
+     */
     function endElement($uri, $element)
     {
-        switch ($this->_xmlStack) {
-        case 2:
-            if ($element == 'CmdID') {
-                $this->_cmdID = intval(trim($this->_chars));
-            }
-            break;
+        if (count($this->_stack) == 2 &&
+            $element == 'CmdID') {
+            $this->_cmdID = intval(trim($this->_chars));
         }
 
-        if (isset($this->_chars)) {
-            unset($this->_chars);
+        if (strlen($this->_chars)) {
+            $this->_chars = '';
         }
 
-        $this->_xmlStack--;
+        array_pop($this->_stack);
     }
 
+    /**
+     * Character data handler for the XML parser, delegated from
+     * SyncML_ContentHandler::characters().
+     *
+     * @param string $str  The data string.
+     */
     function characters($str)
     {
-    	$tempValue = trim($str);
-    	
-    	if(empty($tempValue)) return;
-    	
         if (isset($this->_chars)) {
-            $this->_chars = $this->_chars . $str;
+            $this->_chars .= $str;
         } else {
             $this->_chars = $str;
         }
     }
 
+    /**
+     * Returns the command name this instance is reponsible for.
+     *
+     * @return string  The command name this object is handling.
+     */
+    function getCommandName()
+    {
+        return $this->_cmdName;
+    }
+
+    /**
+     * This method is supposed to implement the actual business logic of the
+     * command once the XML parsing is complete.
+     *
+     * @abstract
+     */
+    function output($currentCmdID, &$output)
+    {
+    }
+
+    /**
+     * Attempts to return a concrete Horde_SyncML_Command instance based on
+     * $command.
+     *
+     * @param string $command                  The type of the concrete
+     *                                         SyncML_Comment subclass to
+     *                                         return.
+     * @param  $params         Optional Parameter.
+     *
+     * @return SyncML_Command  The newly created concrete SyncML_Command
+     *                         instance, or false on error.
+     */
+    function &factory($command, $params = null)
+    {
+        $command = basename($command);
+        $class = 'Horde_SyncML_Command_' . $command;
+
+        if (!class_exists($class)) {
+            include_once 'Horde/SyncML/Command/' . $command . '.php';
+        }
+        if (class_exists($class)) {
+            $cmd = new $class($params);
+        } else {
+            $msg = 'SyncML: Class definition of ' . $class . ' not found.';
+            Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+            require_once 'PEAR.php';
+            $cmd = PEAR::raiseError($msg);
+        }
+
+        return $cmd;
+    }
+
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
index 642211165d..9d30115b4e 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
@@ -1,56 +1,87 @@
 <?php
-
-include_once 'Horde/SyncML/State.php';
-include_once 'Horde/SyncML/Command.php';
-
 /**
+ * eGroupWare - SyncML based on Horde 3
+ *
  * The Horde_SyncML_Alert class provides a SyncML implementation of
  * the Alert command as defined in SyncML Representation Protocol,
  * version 1.1 5.5.2.
  *
- * $Horde: framework/SyncML/SyncML/Command/Alert.php,v 1.18 2004/07/03 15:21:14 chuck Exp $
  *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
+ * Using the PEAR Log class (which need to be installed!)
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
+include_once 'Horde/SyncML/State_egw.php';
+include_once 'Horde/SyncML/Command.php';
+
 class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
 
     /**
-     * @var integer $_alert
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Alert';
+
+    /**
+     * The alert type. Should be one of the ALERT_* constants.
+     *
+     * @var integer
      */
     var $_alert;
 
     /**
-     * @var string $_sourceURI
+     * Source database of the Alert command.
+     *
+     * @var string
      */
     var $_sourceLocURI;
 
     /**
-     * @var string $_targetURI
+     * Target database of the Alert command.
+     *
+     * @var string
      */
     var $_targetLocURI;
 
     /**
-     * @var string $_metaAnchorNext
+     * Optional parameter for the Target database.
+     *
+     * @var string
+     */
+    var $_targetLocURIParameters;
+
+    /**
+     * The current time this synchronization happens, from the <Meta><Next>
+     * element.
+     *
+     * @var string
      */
     var $_metaAnchorNext;
 
     /**
-     * @var integer $_metaAnchorLast
+     * The last time when synchronization happened, from the <Meta><Last>
+     * element.
+     *
+     * @var integer
      */
     var $_metaAnchorLast;
 
     /**
-     * Use in xml tag.
+     * The filter expression the client provided
+     *  (e.g. the time range for calendar synchronization)
+     *
+     * @var string
      */
-    var $_isInSource;
+    var $_filterExpression = '';
+
 
     /**
      * Creates a new instance of Alert.
@@ -64,6 +95,8 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
 
     function output($currentCmdID, &$output)
     {
+        global $registry;
+
         $attrs = array();
 
         $state = &$_SESSION['SyncML.state'];
@@ -76,323 +109,389 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command {
             return $currentCmdID;
         }
 
+        $type = $this->_targetLocURI;
 
+        $clientAnchorNext = $this->_metaAnchorNext;
 
-	if($this->_alert < ALERT_RESULT_ALERT) {
+        if ($this->_alert == ALERT_TWO_WAY ||
+            $this->_alert == ALERT_ONE_WAY_FROM_CLIENT ||
+            $this->_alert == ALERT_ONE_WAY_FROM_SERVER) {
+            // Check if we have information about previous sync.
+            $info = $state->getSyncSummary($this->_targetLocURI);
+            if (is_a($info, 'DataTreeObject')) {
+                $x = $info->get('ClientAnchor');
+                $clientlast = $x[$type];
+                $x = $info->get('ServerAnchor');
+                $serverAnchorLast = $x[$type];
+            } elseif (is_array($info)) {
+                $clientlast = $info['ClientAnchor'];
+                $serverAnchorLast = $info['ServerAnchor'];
+            } else {
+                $clientlast = false;
+                $serverAnchorLast = 0;
+            }
+            $state->setServerAnchorLast($type, $serverAnchorLast);
 
-        	$type = $this->_targetLocURI;
+            if ($clientlast !== false){
+                // Info about previous successful sync sessions found.
+                Horde::logMessage('SyncML: Previous sync found for target ' . $type
+                    . '; client timestamp: ' . $clientlast,
+                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-        	// Store client's Next Anchor in State.  After successful sync
-        	// this is then written to persistence for negotiation of
-        	// further syncs.
-        	$state->setClientAnchorNext($type, $this->_metaAnchorNext);
+                // Check if anchor sent from client matches our own stored
+                // data.
+                if ($clientlast == $this->_metaAnchorLast) {
+                    // Last sync anchors matche, TwoWaySync will do.
+                    $anchormatch = true;
+                    Horde::logMessage('SyncML: Anchor timestamps match, TwoWaySync possible. Syncing data since '
+                        . date('Y-m-d H:i:s', $serverAnchorLast),
+                        __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                } else {
+                    // Server and client have different anchors, enforce
+                    // SlowSync/RefreshSync
+                    Horde::logMessage('SyncML: Client requested sync with anchor timestamp '
+                        . $this->_metaAnchorLast
+                        . ' but server has recorded timestamp '
+                        . $clientlast . '. Enforcing SlowSync',
+                        __FILE__, __LINE__, PEAR_LOG_INFO);
+                    $anchormatch = false;
+                    $clientlast = 0;
+                }
+            } else {
+                // No info about previous sync, use SlowSync or RefreshSync.
+                Horde::logMessage('SyncML: No info about previous syncs found for device ' .
+                    $state->getSourceURI() . ' and target ' . $type,
+                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                $clientlast = 0;
+                $serverAnchorLast = 0;
+                $anchormatch = false;
+            }
+        } else {
+            // SlowSync requested, no anchor check required.
+            $anchormatch = true;
+        }
 
-        	$info = $state->getSyncSummary($this->_targetLocURI);
-		#Horde::logMessage("SyncML: Anchor match, TwoWaySync sinceee " . $clientlast, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-        	if (is_a($info, 'DataTreeObject')) {
-        	    $x = $info->get('ClientAnchor');
-        	    $clientlast = $x[$type];
-        	    $x = $info->get('ServerAnchor');
-        	    $state->setServerAnchorLast($type, $x[$type]);
-        	} elseif (is_array($info)) {
-        	    $clientlast = $info['ClientAnchor'];
-        	    $state->setServerAnchorLast($type, $info['ServerAnchor']);
-        	} else {
-        	    $clientlast = false;
-        	    $state->setServerAnchorLast($type, 0);
-        	}
-        	
-        	Horde::logMessage('SyncML: checking anchor targetLocURI: clientlast: ' . $clientlast .' / '. $this->_metaAnchorLast, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-        	
-        	// Set Server Anchor for this sync to current time.
-        	$state->setServerAnchorNext($type,time());
-        	if ($clientlast !== false && $clientlast == $this->_metaAnchorLast) {
-        	    // Last Sync Anchor matches, TwoWaySync will do.
-        	    $code = RESPONSE_OK;
-        	    Horde::logMessage("SyncML: Anchor match, TwoWaySync since " . $clientlast, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-        	} else {
-        	    Horde::logMessage("SyncML: Anchor mismatch, enforcing SlowSync clientlast $clientlast serverlast ".$this->_metaAnchorLast, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-        	    // Mismatch, enforce slow sync.  508=RESPONSE_REFRESH_REQUIRED 201=ALERT_SLOW_SYNC
-        	    $this->_alert = 201;
-        	    $code = 508;  
-        	    // create new synctype
-		    $sync = &Horde_SyncML_Sync::factory($this->_alert);
-		    $sync->_targetLocURI = $this->_targetLocURI;
-		    $sync->_sourceLocURI = $this->_sourceLocURI;
-		    if(isset($this->_targetLocURIParameters))
-		    	$sync->_targetLocURIParameters = $this->_targetLocURIParameters;
-		    $state->setSync($this->_targetLocURI, $sync);
-		    // PH : no longer delete entire content_map entries for client before SlowSync,
-		    //      use content_map to verify if content is mapped correctly
-		    //$state->removeAllUID($this->_targetLocURI);
-        	}
+        // Determine sync type and status response code.
+        Horde::logMessage("SyncML: Alert " . $this->_alert, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+        switch ($this->_alert) {
+	case ALERT_NEXT_MESSAGE:
+		$state->setAlert222Received(true);
+	case ALERT_RESULT_ALERT:
+	case ALERT_NO_END_OF_DATA:
+            // Nothing to do on our side
+            $status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Alert');
+            $status->setCmdRef($this->_cmdID);
+            if ($this->_sourceLocURI != null) {
+                $status->setSourceRef($this->_sourceLocURI);
+            }
+            if ($this->_targetLocURI != null) {
+                $status->setTargetRef((isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI));
+            }
+            if ($this->_alert == ALERT_NEXT_MESSAGE) {
+                if ($this->_sourceLocURI != null) {
+                    $status->setItemSourceLocURI($this->_sourceLocURI);
+                }
+                if ($this->_targetLocURI != null) {
+                    $status->setItemTargetLocURI(isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI);
+                }
+            }
+            $currentCmdID = $status->output($currentCmdID, $output);
+            return $currentCmdID;
+        case ALERT_TWO_WAY:
+            if ($anchormatch) {
+                $synctype = ALERT_TWO_WAY;
+                $response = RESPONSE_OK;
+            } else {
+                $synctype = ALERT_SLOW_SYNC;
+                $response = RESPONSE_REFRESH_REQUIRED;
+            }
+            break;
 
-        	$status = new Horde_SyncML_Command_Status($code, 'Alert');
-        	$status->setCmdRef($this->_cmdID);
-        	if ($this->_sourceLocURI != null) {
-        	    $status->setSourceRef($this->_sourceLocURI);
-        	}
-        	if ($this->_targetLocURI != null) {
-        	    $status->setTargetRef((isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI));
-        	}
+        case ALERT_SLOW_SYNC:
+            $synctype = ALERT_SLOW_SYNC;
+            $response = $anchormatch ? RESPONSE_OK : RESPONSE_REFRESH_REQUIRED;
+            break;
 
-        	// Mirror Next Anchor from client back to client.
-        	if (isset($this->_metaAnchorNext)) {
-        	    $status->setItemDataAnchorNext($this->_metaAnchorNext);
-        	}
+        case ALERT_ONE_WAY_FROM_CLIENT:
+            if ($anchormatch) {
+                $synctype = ALERT_ONE_WAY_FROM_CLIENT;
+                $response = RESPONSE_OK;
+            } else {
+                $synctype = ALERT_REFRESH_FROM_CLIENT;
+                $response = RESPONSE_REFRESH_REQUIRED;
+            }
+            break;
 
-        	// Mirror Last Anchor from client back to client.
-        	if (isset($this->_metaAnchorLast)) {
-        	    $status->setItemDataAnchorLast($this->_metaAnchorLast);
-        	}
+        case ALERT_REFRESH_FROM_CLIENT:
+            $synctype = ALERT_REFRESH_FROM_CLIENT;
+            $response = $anchormatch ? RESPONSE_OK : RESPONSE_REFRESH_REQUIRED;
 
-        	$currentCmdID = $status->output($currentCmdID, $output);
+            // We will erase the current server content,
+            // then we can add the client's contents.
 
-        	if ($state->isAuthorized()) {
-        	    $output->startElement($state->getURI(), 'Alert', $attrs);
+            $hordeType = $state->getHordeType($this->_targetLocURI);
 
-        	    $output->startElement($state->getURI(), 'CmdID', $attrs);
-        	    $chars = $currentCmdID;
-        	    $output->characters($chars);
-        	    $output->endElement($state->getURI(), 'CmdID');
+            $state->setTargetURI($this->_targetLocURI);
+            $deletes = $state->getClientItems();
+            if (is_array($deletes)) {
+                foreach ($deletes as $delete) {
+                    $registry->call($hordeType . '/delete', array($delete));
+                }
+                Horde::logMessage("SyncML: RefreshFromClient " . count($deletes) . " entries deleted for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            }
+            $anchormatch = false;
+            break;
 
-        	    $output->startElement($state->getURI(), 'Data', $attrs);
-        	    $chars = $this->_alert;
-        	    $output->characters($chars);
-        	    $output->endElement($state->getURI(), 'Data');
+       case ALERT_ONE_WAY_FROM_SERVER:
+            if ($anchormatch) {
+                $synctype = ALERT_ONE_WAY_FROM_SERVER;
+                $response = RESPONSE_OK;
+            } else {
+                $synctype = ALERT_REFRESH_FROM_SERVER;
+                $response = RESPONSE_REFRESH_REQUIRED;
+            }
+            break;
 
-        	    $output->startElement($state->getURI(), 'Item', $attrs);
+        case ALERT_REFRESH_FROM_SERVER:
+            $synctype = ALERT_REFRESH_FROM_SERVER;
+            $response = $anchormatch ? RESPONSE_OK : RESPONSE_REFRESH_REQUIRED;
+            break;
 
-        	    if ($this->_sourceLocURI != null) {
-	                $output->startElement($state->getURI(), 'Target', $attrs);
-        	        $output->startElement($state->getURI(), 'LocURI', $attrs);
-        	        $chars = $this->_sourceLocURI;
-        	        $output->characters($chars);
-        	        $output->endElement($state->getURI(), 'LocURI');
-        	        $output->endElement($state->getURI(), 'Target');
-        	    }
-	
-        	    if ($this->_targetLocURI != null) {
-        	        $output->startElement($state->getURI(), 'Source', $attrs);
-        	        $output->startElement($state->getURI(), 'LocURI', $attrs);
-        	        $chars = (isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI);
-        	        $output->characters($chars);
-        	        $output->endElement($state->getURI(), 'LocURI');
-        	        $output->endElement($state->getURI(), 'Source');
-        	    }
+        case ALERT_RESUME:
+            // @TODO: Suspend and Resume is not supported yet
+            $synctype = ALERT_SLOW_SYNC;
+            $response = RESPONSE_REFRESH_REQUIRED;
+            break;
 
-        	    $output->startElement($state->getURI(), 'Meta', $attrs);
+        default:
+            // We can't handle this one
+            Horde::logMessage('SyncML: Unknown sync type ' . $this->_alert,
+                __FILE__, __LINE__, PEAR_LOG_ERR);
+            $status = new Horde_SyncML_Command_Status(RESPONSE_BAD_REQUEST, 'Alert');
+            $status->setCmdRef($this->_cmdID);
+            if ($this->_sourceLocURI != null) {
+                $status->setSourceRef($this->_sourceLocURI);
+            }
+            if ($this->_targetLocURI != null) {
+                $status->setTargetRef((isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI));
+            }
+       	    $currentCmdID = $status->output($currentCmdID, $output);
+            return $currentCmdID;
+        }
 
-        	    $output->startElement($state->getURIMeta(), 'Anchor', $attrs);
+        // Store client's Next Anchor in State and
+        // set server's Next Anchor.  After successful sync
+        // this is then written to persistence for negotiation of
+        // further syncs.
+        $state->setClientAnchorNext($type, $this->_metaAnchorNext);
+        $serverAnchorNext = time();
+        $state->setServerAnchorNext($type, $serverAnchorNext);
 
-        	    $output->startElement($state->getURIMeta(), 'Last', $attrs);
-        	    $chars = $state->getServerAnchorLast($type);
-        	    $output->characters($chars);
-        	    $output->endElement($state->getURIMeta(), 'Last');
+        // Now set interval to retrieve server changes from, defined by
+        // ServerAnchor [Last,Next]
+        if ($synctype != ALERT_TWO_WAY &&
+            $synctype != ALERT_ONE_WAY_FROM_CLIENT &&
+            $synctype != ALERT_ONE_WAY_FROM_SERVER) {
+            $serverAnchorLast = 0;
+            #if (!$anchormatch) {
+                // Erase existing map:
+                $state->removeAllUID($this->_targetLocURI);
+            #}
+        }
+        // Now create the actual SyncML_Sync object, if it doesn't exist yet.
+        $sync = &$state->getSync($this->_targetLocURI);
+        if (!$sync) {
+            Horde::logMessage('SyncML: Creating SyncML_Sync object for target '
+                . $this->_targetLocURI .  '; sync type ' . $synctype,
+                __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            $sync = &Horde_SyncML_Sync::factory($synctype);
+	    $state->clearConflictItems($this->_targetLocURI);
+        }
+        $sync->setTargetLocURI($this->_targetLocURI);
+        $sync->setSourceLocURI($this->_sourceLocURI);
+		$sync->setLocName($state->getLocName()); // We need it for conflict handling
+        $sync->setsyncType($synctype);
+        $sync->setFilterExpression($this->_filterExpression);
+        $state->setSync($this->_targetLocURI, $sync);
 
-        	    $output->startElement($state->getURIMeta(), 'Next', $attrs);
-        	    $chars = $state->getServerAnchorNext($type);
-        	    $output->characters($chars);
-        	    $output->endElement($state->getURIMeta(), 'Next');
+       	$status = new Horde_SyncML_Command_Status($response, 'Alert');
+        $status->setCmdRef($this->_cmdID);
+        if ($this->_sourceLocURI != null) {
+            $status->setSourceRef($this->_sourceLocURI);
+        }
+        if ($this->_targetLocURI != null) {
+            $status->setTargetRef((isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI));
+        }
 
-        	    $output->endElement($state->getURIMeta(), 'Anchor');
-        	    $output->endElement($state->getURI(), 'Meta');
-        	    $output->endElement($state->getURI(), 'Item');
-        	    $output->endElement($state->getURI(), 'Alert');
+       	// Mirror Next Anchor from client back to client.
+       	if (isset($this->_metaAnchorNext)) {
+       	    $status->setItemDataAnchorNext($this->_metaAnchorNext);
+       	}
 
-        	    // still needed? lars
-                    $state->_sendFinal = true;
-                    
-        	    $currentCmdID++;
+       	// Mirror Last Anchor from client back to client.
+       	if (isset($this->_metaAnchorLast)) {
+       	    $status->setItemDataAnchorLast($this->_metaAnchorLast);
+       	}
 
-                    if($state->_devinfoRequested == false && 
-			$this->_sourceLocURI != null && 
-			is_a($state->getPreferedContentTypeClient($this->_sourceLocURI), 'PEAR_Error')) {
-			
-			$output->startElement($state->getURI(), 'Get', $attrs);
+       	$currentCmdID = $status->output($currentCmdID, $output);
 
-			$output->startElement($state->getURI(), 'CmdID', $attrs);
-			$output->characters($currentCmdID);
-			$currentCmdID++;
-			$output->endElement($state->getURI(), 'CmdID');
-			
-			$output->startElement($state->getURI(), 'Meta', $attrs);
-			$output->startElement($state->getURIMeta(), 'Type', $attrs);
-			if(is_a($output, 'XML_WBXML_Encoder')) {
-				$output->characters('application/vnd.syncml-devinf+wbxml');
-			} else {
-				$output->characters('application/vnd.syncml-devinf+xml');
-			}
-			$output->endElement($state->getURIMeta(), 'Type');
-			$output->endElement($state->getURI(), 'Meta');
-			
-			$output->startElement($state->getURI(), 'Item', $attrs);
-			$output->startElement($state->getURI(), 'Target', $attrs);
-			$output->startElement($state->getURI(), 'LocURI', $attrs);
-			$output->characters(($state->getVersion() == 0) ? './devinf10' : './devinf11');
-			$output->endElement($state->getURI(), 'LocURI');
-			$output->endElement($state->getURI(), 'Target');
-			$output->endElement($state->getURI(), 'Item');
-			
-			$output->endElement($state->getURI(), 'Get');
-			
-			$state->_devinfoRequested = true;
-		    }
-        	}
+        $output->startElement($state->getURI(), 'Alert', $attrs);
 
-	} elseif ($this->_alert == ALERT_NEXT_MESSAGE) {
-        	$status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Alert');
-        	$status->setCmdRef($this->_cmdID);
-        	if ($this->_targetLocURI != null) {
-        	    $status->setTargetRef((isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI));
-        	}
-        	if ($this->_sourceLocURI != null) {
-        	    $status->setSourceRef($this->_sourceLocURI);
-        	}
-        	$status->setItemSourceLocURI($this->_sourceLocURI);
-        	$status->setItemTargetLocURI(isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI);
-        	$currentCmdID = $status->output($currentCmdID, $output);
+        $output->startElement($state->getURI(), 'CmdID', $attrs);
+        $chars = $currentCmdID;
+        $output->characters($chars);
+        $output->endElement($state->getURI(), 'CmdID');
 
-        	$state->setAlert222Received(true);
+        $output->startElement($state->getURI(), 'Data', $attrs);
+        $chars = $synctype;
+        $output->characters($chars);
+        $output->endElement($state->getURI(), 'Data');
 
-	} else {
-        	$status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Alert');
-        	$status->setCmdRef($this->_cmdID);
-        	if ($this->_sourceLocURI != null) {
-        	    $status->setSourceRef($this->_sourceLocURI);
-        	}
-        	if ($this->_targetLocURI != null) {
-        	    $status->setTargetRef((isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI));
-        	}
+        $output->startElement($state->getURI(), 'Item', $attrs);
 
-        	$currentCmdID = $status->output($currentCmdID, $output);
-	}
+        if ($this->_sourceLocURI != null) {
+            $output->startElement($state->getURI(), 'Target', $attrs);
+            $output->startElement($state->getURI(), 'LocURI', $attrs);
+            $chars = $this->_sourceLocURI;
+            $output->characters($chars);
+            $output->endElement($state->getURI(), 'LocURI');
+            $output->endElement($state->getURI(), 'Target');
+        }
 
+        if ($this->_targetLocURI != null) {
+            $output->startElement($state->getURI(), 'Source', $attrs);
+            $output->startElement($state->getURI(), 'LocURI', $attrs);
+            $chars = (isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI);
+            $output->characters($chars);
+            $output->endElement($state->getURI(), 'LocURI');
+            $output->endElement($state->getURI(), 'Source');
+        }
+
+        $output->startElement($state->getURI(), 'Meta', $attrs);
+
+        $output->startElement($state->getURIMeta(), 'Anchor', $attrs);
+
+        $output->startElement($state->getURIMeta(), 'Last', $attrs);
+        $chars = $state->getServerAnchorLast($type);
+        $output->characters($chars);
+        $output->endElement($state->getURIMeta(), 'Last');
+
+        $output->startElement($state->getURIMeta(), 'Next', $attrs);
+        $chars = $state->getServerAnchorNext($type);
+        $output->characters($chars);
+        $output->endElement($state->getURIMeta(), 'Next');
+
+        $output->endElement($state->getURIMeta(), 'Anchor');
+        $output->endElement($state->getURI(), 'Meta');
+        $output->endElement($state->getURI(), 'Item');
+        $output->endElement($state->getURI(), 'Alert');
+
+        // Final packet of this message
+        $state->_sendFinal = true;
+
+        $currentCmdID++;
+
+        if ($state->_devinfoRequested == false &&
+            $this->_sourceLocURI != null &&
+            is_a($state->getPreferedContentTypeClient($this->_sourceLocURI), 'PEAR_Error')) {
+
+            Horde::logMessage("SyncML: PreferedContentTypeClient missing, sending <Get>", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+            $output->startElement($state->getURI(), 'Get', $attrs);
+
+            $output->startElement($state->getURI(), 'CmdID', $attrs);
+            $output->characters($currentCmdID);
+            $currentCmdID++;
+            $output->endElement($state->getURI(), 'CmdID');
+
+            $output->startElement($state->getURI(), 'Meta', $attrs);
+            $output->startElement($state->getURIMeta(), 'Type', $attrs);
+            if (is_a($output, 'XML_WBXML_Encoder')) {
+                $output->characters('application/vnd.syncml-devinf+wbxml');
+            } else {
+                $output->characters('application/vnd.syncml-devinf+xml');
+            }
+            $output->endElement($state->getURIMeta(), 'Type');
+            $output->endElement($state->getURI(), 'Meta');
+
+            $output->startElement($state->getURI(), 'Item', $attrs);
+            $output->startElement($state->getURI(), 'Target', $attrs);
+            $output->startElement($state->getURI(), 'LocURI', $attrs);
+	    if ($state->getVersion() == 2) {
+                $output->characters('./devinf12');
+            } elseif ($state->getVersion() == 1) {
+                $output->characters('./devinf11');
+            } else {
+                $output->characters('./devinf10');
+            }
+            $output->endElement($state->getURI(), 'LocURI');
+            $output->endElement($state->getURI(), 'Target');
+            $output->endElement($state->getURI(), 'Item');
+
+            $output->endElement($state->getURI(), 'Get');
+
+            $state->_devinfoRequested = true;
+        }
         return $currentCmdID;
     }
 
     /**
-     * Setter for property sourceURI.
+     * End element handler for the XML parser, delegated from
+     * SyncML_ContentHandler::endElement().
      *
-     * @param string $sourceURI  New value of property sourceURI.
+     * @param string $uri      The namespace URI of the element.
+     * @param string $element  The element tag name.
      */
-    function setSourceLocURI($sourceURI)
+    function endElement($uri, $element)
     {
-        $this->_sourceLocURI = $sourceURI;
-    }
-
-    function getTargetLocURI()
-    {
-        return $this->_targetURI;
-    }
-
-    /**
-     * Setter for property targetURI.
-     *
-     * @param string $targetURI  New value of property targetURI.
-     */
-     // is this function still used???
-    function setTargetURI($targetURI)
-    {
-        $this->_targetLocURI = $targetURI;
-    }
-
-    /**
-     * Setter for property targetURI.
-     *
-     * @param string $targetURI  New value of property targetURI.
-     */
-    function setTargetLocURI($targetURI)
-    {
-        $this->_targetLocURI = $targetURI;
-    }
-
-    function startElement($uri, $element, $attrs)
-    {
-        parent::startElement($uri, $element, $attrs);
-
-        switch ($this->_xmlStack) {
-        case 3:
-            if ($element == 'Target') {
-                $this->_isInSource = false;
-            } else {
-                $this->_isInSource = true;
+        switch (count($this->_stack)) {
+        case 2:
+            if ($element == 'Data') {
+                $this->_alert = intval(trim($this->_chars));
             }
             break;
+
+        case 4:
+            if ($element == 'LocURI') {
+                switch ($this->_stack[2]) {
+                case 'Source':
+                    $this->_sourceLocURI = trim($this->_chars);
+                    break;
+                case 'Target':
+                	$targetLocURIData = explode('?/',trim($this->_chars));
+
+                    $this->_targetLocURI = $targetLocURIData[0];
+
+                    if (isset($targetLocURIData[1])) {
+                        $this->_targetLocURIParameters = $targetLocURIData[1];
+                    }
+                    break;
+                }
+            }
+            break;
+
+        case 5:
+            switch ($element) {
+            case 'Next':
+                $this->_metaAnchorNext = trim($this->_chars);
+                break;
+            case 'Last':
+                $this->_metaAnchorLast = trim($this->_chars);
+                break;
+            }
+            break;
+
+		case 7:
+			if ($element == 'Data'
+				&& $this->_stack[2] == 'Target'
+				&& $this->_stack[3] == 'Filter'
+				&& $this->_stack[4] == 'Record'
+				&& $this->_stack[5] == 'Item') {
+				$this->_filterExpression = 	trim($this->_chars);
+			}
+            break;
         }
-    }
-
-	function endElement($uri, $element)
-	{
-		switch ($this->_xmlStack) {
-			case 1:
-				$state = & $_SESSION['SyncML.state'];
-				$sync = $state->getSync($this->_targetLocURI);
-				
-				if (!$sync && $this->_alert < ALERT_RESULT_ALERT) {
-					Horde::logMessage('SyncML: create new sync for ' . $this->_targetLocURI . ' ' . $this->_alert, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-					$sync = &Horde_SyncML_Sync::factory($this->_alert);
-					
-					$sync->_targetLocURI = $this->_targetLocURI;
-					$sync->_sourceLocURI = $this->_sourceLocURI;
-					if(isset($this->_targetLocURIParameters)) {
-						$sync->_targetLocURIParameters = $this->_targetLocURIParameters;
-					}
-					
-					$state->setSync($this->_targetLocURI, $sync);
-
-					if($this->_alert == ALERT_SLOW_SYNC || $this->_alert == ALERT_REFRESH_FROM_SERVER) {
-						$state->removeAllUID($this->_targetLocURI);
-					}
-				}
-				
-				break;
-				
-			case 2:
-				if ($element == 'Data') {
-					$this->_alert = intval(trim($this->_chars));
-				}
-				
-				break;
-				
-			case 4:
-				if ($element == 'LocURI') {
-					if ($this->_isInSource) {
-						$this->_sourceLocURI = trim($this->_chars);
-					} else {
-						$targetLocURIData = explode('?/',trim($this->_chars));
-						
-						$this->_targetLocURI = $targetLocURIData[0];
-						
-						if(isset($targetLocURIData[1])) {
-							$this->_targetLocURIParameters = $targetLocURIData[1];
-						}
-					}
-				}
-				
-				break;
-				
-			case 5:
-				if ($element == 'Next') {
-					$this->_metaAnchorNext = trim($this->_chars);
-				} else if ($element == 'Last') {
-					$this->_metaAnchorLast = trim($this->_chars);
-				}
-				
-				break;
-		}
-			
-		parent::endElement($uri, $element);
-	}
-
-    function getAlert()
-    {
-        return $this->_alert;
-    }
-
-    function setAlert($alert)
-    {
-        $this->_alert = $alert;
+        parent::endElement($uri, $element);
     }
 
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Final.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Final.php
index cf62408905..0066137665 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Final.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Final.php
@@ -1,24 +1,31 @@
 <?php
-
-include_once 'Horde/SyncML/Command.php';
-
 /**
+ * eGroupWare - SyncML based on Horde 3
+ *
  * The Horde_SyncML_Command_Final class.
  *
- * $Horde: framework/SyncML/SyncML/Command/Final.php,v 1.10 2004/05/26 17:41:30 chuck Exp $
  *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
+ * Using the PEAR Log class (which need to be installed!)
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
+include_once 'Horde/SyncML/Command.php';
+
 class Horde_SyncML_Command_Final extends Horde_SyncML_Command {
 
+    /**
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Final';
+
     function output($currentCmdID, &$output)
     {
         $state = $_SESSION['SyncML.state'];
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
index 82199ab933..96538e401a 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
@@ -1,32 +1,37 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Karsten Fourmont <fourmont@gmx.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/State.php';
 include_once 'Horde/SyncML/Command.php';
 include_once 'Horde/SyncML/Command/Results.php';
 
-/**
- * The Horde_SyncML_Command_Get class.
- *
- * $Horde: framework/SyncML/SyncML/Command/Get.php,v 1.14 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @author  Karsten Fourmont <fourmont@gmx.de>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
 
     function output($currentCmdID, &$output)
     {
         $state = $_SESSION['SyncML.state'];
 
-        $ref = ($state->getVersion() == 0) ? './devinf10' : './devinf11';
+        if ($state->getVersion() == 2) {
+            $ref = './devinf12';
+        } elseif ($state->getVersion() == 1) {
+            $ref = './devinf11';
+        } else {
+            $ref = './devinf10';
+        }
 
         $status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Get');
         $status->setCmdRef($this->_cmdID);
@@ -74,7 +79,13 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
 
             $output->startElement($state->getURIDevInf() , 'DevInf', $attrs);
             $output->startElement($state->getURIDevInf() , 'VerDTD', $attrs);
-            $output->characters(($state->getVersion() == 0) ? '1.0' : '1.1');
+            if ($state->getVersion() == 2) {
+		$output->characters('1.2');
+            } elseif($state->getVersion() == 1) {
+		$output->characters('1.1');
+            } else {
+		$output->characters('1.0');
+            }
             $output->endElement($state->getURIDevInf() , 'VerDTD', $attrs);
             $output->startElement($state->getURIDevInf() , 'Man', $attrs);
             $output->characters('www.egroupware.org');
@@ -85,12 +96,22 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
             $output->startElement($state->getURIDevInf() , 'DevTyp', $attrs);
             $output->characters('server');
             $output->endElement($state->getURIDevInf() , 'DevTyp', $attrs);
+            $output->startElement($state->getURIDevInf() , 'UTC', $attrs);
+            $output->endElement($state->getURIDevInf() , 'UTC', $attrs);
+            $output->startElement($state->getURIDevInf() , 'SupportNumberOfChanges', $attrs);
+            $output->endElement($state->getURIDevInf() , 'SupportNumberOfChanges', $attrs);
+            $output->startElement($state->getURIDevInf() , 'SupportLargeObjs', $attrs);
+            $output->endElement($state->getURIDevInf() , 'SupportLargeObjs', $attrs);
             $this->_writeDataStore('./notes', 'text/x-vnote', '1.1', $output,
                                    array('text/plain' => '1.0'));
-            $this->_writeDataStore('./contacts', 'text/x-vcard', '2.1', $output);
-            $this->_writeDataStore('./tasks', 'text/x-vcalendar', '1.0', $output);
-            $this->_writeDataStore('./calendar', 'text/x-vcalendar', '1.0', $output);
-            $this->_writeDataStore('./caltasks', 'text/x-vcalendar', '1.0', $output);
+            $this->_writeDataStore('./contacts', 'text/vcard', '3.0', $output,
+                                   array('text/x-vcard' => '2.1'));
+            $this->_writeDataStore('./tasks', 'text/calendar', '2.0', $output,
+                                   array('text/x-vcalendar' => '1.0'));
+            $this->_writeDataStore('./calendar', 'text/calendar', '2.0', $output,
+                                   array('text/x-vcalendar' => '1.0'));
+            $this->_writeDataStore('./caltasks', 'text/calendar', '2.0', $output,
+                                   array('text/x-vcalendar' => '1.0'));
             $output->endElement($state->getURIDevInf() , 'DevInf', $attrs);
 
             $output->endElement($state->getURI(), 'Data');
@@ -111,7 +132,7 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
      * @param string $version: data for &lt;(R|T)x-Pref&gt;&lt;VerCT&gt;
      * @param string &$output contenthandler that will received the output.
      * @param array $additionaltypes: array of additional types for Tx and Rx;
-     *              format array('text/vcard' => '2.0')
+     *              format array('text/vcard' => '3.0')
      */
     function _writeDataStore($sourceref, $mimetype, $version, &$output,
                              $additionaltypes = false)
@@ -124,6 +145,9 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
         $output->startElement($state->getURIDevInf() , 'SourceRef', $attrs);
         $output->characters($sourceref);
         $output->endElement($state->getURIDevInf() , 'SourceRef', $attrs);
+        $output->startElement($state->getURIDevInf() , 'MaxGUIDSize', $attrs);
+        $output->characters(255);
+        $output->endElement($state->getURIDevInf() , 'MaxGUIDSize', $attrs);
 
         $output->startElement($state->getURIDevInf() , 'Rx-Pref', $attrs);
         $output->startElement($state->getURIDevInf() , 'CTType', $attrs);
@@ -170,12 +194,13 @@ class Horde_SyncML_Command_Get extends Horde_SyncML_Command {
         }
 
         $output->startElement($state->getURIDevInf() , 'SyncCap', $attrs);
-        $output->startElement($state->getURIDevInf() , 'SyncType', $attrs);
-        $output->characters('1');
-        $output->endElement($state->getURIDevInf() , 'SyncType', $attrs);
-        $output->startElement($state->getURIDevInf() , 'SyncType', $attrs);
-        $output->characters('2');
-        $output->endElement($state->getURIDevInf() , 'SyncType', $attrs);
+		// We support all sync Types from 1-6: two way, slow, refresh|update
+        // from client|server
+        for ($i = 1; $i <= 6; ++$i) {
+            $output->startElement($state->getURIDevInf(), 'SyncType', $attrs);
+            $output->characters($i);
+            $output->endElement($state->getURIDevInf(), 'SyncType', $attrs);
+        }
         $output->endElement($state->getURIDevInf() , 'SyncCap', $attrs);
         $output->endElement($state->getURIDevInf() , 'DataStore', $attrs);
     }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php
index fcca7b266c..17dd7e44fa 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Map.php
@@ -1,43 +1,60 @@
 <?php
-
-include_once 'Horde/SyncML/State.php';
-include_once 'Horde/SyncML/Command.php';
-
 /**
+ * eGroupWare - SyncML based on Horde 3
+ *
  * The Horde_SyncML_Map class provides a SyncML implementation of
  * the Map command as defined in SyncML Representation Protocol,
  * version 1.0.1 5.5.8.
  *
- * $Horde: framework/SyncML/SyncML/Command/Map.php,v 1.1 2004/07/02 19:24:44 chuck Exp $
  *
- * Copyright 2004 Karsten Fourmont <fourmont@gmx.de>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ * Using the PEAR Log class (which need to be installed!)
  *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
  * @author  Karsten Fourmont <fourmont@gmx.de>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
+include_once 'Horde/SyncML/State.php';
+include_once 'Horde/SyncML/Command.php';
+
 class Horde_SyncML_Command_Map extends Horde_SyncML_Command {
 
     /**
-     * @var string $_sourceURI
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Map';
+
+   /**
+     * Source database of the Map command.
+     *
+     * @var string
      */
     var $_sourceLocURI;
 
     /**
-     * @var string $_targetURI
+     * Target database of the Map command.
+     *
+     * @var string
      */
     var $_targetLocURI;
 
     /**
-     * Use in xml tag.
+     * Recipient map item specifier.
+     *
+     * @var string
      */
-    var $_isInSource;
-
     var $_mapTarget;
+
+    /**
+     * Originator map item specifier.
+     *
+     * @var string
+     */
     var $_mapSource;
 
     function output($currentCmdID, &$output)
@@ -60,76 +77,25 @@ class Horde_SyncML_Command_Map extends Horde_SyncML_Command {
         return $currentCmdID;
     }
 
-    /**
-     * Setter for property sourceURI.
-     *
-     * @param string $sourceURI  New value of property sourceURI.
-     */
-    function setSourceLocURI($sourceURI)
-    {
-        $this->_sourceURI = $sourceURI;
-    }
-
-    function getTargetLocURI()
-    {
-        return $this->_targetURI;
-    }
-
-    /**
-     * Setter for property targetURI.
-     *
-     * @param string $targetURI  New value of property targetURI.
-     */
-    function setTargetURI($targetURI)
-    {
-        $this->_targetURI = $targetURI;
-    }
-
     function startElement($uri, $element, $attrs)
     {
         parent::startElement($uri, $element, $attrs);
 
-        switch ($this->_xmlStack) {
-        case 2:
-            if ($element == 'Target') {
-                $this->_isInSource = false;
-            }
-            if ($element == 'Source') {
-                $this->_isInSource = true;
-            }
-            if ($element == 'MapItem') {
-                unset($this->_mapTarget);
-                unset($this->_mapSource);
-            }
-            break;
-
-        case 3:
-            if ($element == 'Target') {
-                $this->_isInSource = false;
-            }
-            if ($element == 'Source') {
-                $this->_isInSource = true;
-            }
-            break;
+        if (count($this->_stack) == 2 &&
+            $element == 'MapItem') {
+            unset($this->_mapTarget);
+            unset($this->_mapSource);
         }
     }
 
     function endElement($uri, $element)
     {
-        switch ($this->_xmlStack) {
-        case 1:
-            $state = $_SESSION['SyncML.state'];
-            $sync = $state->getSync($this->_targetLocURI);
 
-            if (!$sync) {
-            }
-
-            $_SESSION['SyncML.state'] = $state;
-            break;
+        $state = &$_SESSION['SyncML.state'];
 
+        switch (count($this->_stack)) {
         case 2:
             if ($element == 'MapItem') {
-                $state = $_SESSION['SyncML.state'];
                 $sync = $state->getSync($this->_targetLocURI);
                 if (!$state->isAuthorized()) {
                     Horde::logMessage('SyncML: Not Authorized in the middle of MapItem!', __FILE__, __LINE__, PEAR_LOG_ERR);
@@ -149,26 +115,20 @@ class Horde_SyncML_Command_Map extends Horde_SyncML_Command {
 
         case 3:
             if ($element == 'LocURI') {
-                if ($this->_isInSource) {
+                if ($this->_stack[1] == 'Source') {
                     $this->_sourceLocURI = trim($this->_chars);
-                } else {
+                } elseif ($this->_stack[1] == 'Target') {
                     $targetLocURIData = explode('?/',trim($this->_chars));
-
-		    $this->_targetLocURI = $targetLocURIData[0];
-		    
-		    if(isset($targetLocURIData[1]))
-		    {
-		    	$this->_targetLocURIParameters = $targetLocURIData[1];
-		    }
+		    		$this->_targetLocURI = $targetLocURIData[0];
                 }
             }
             break;
 
         case 4:
             if ($element == 'LocURI') {
-                if ($this->_isInSource) {
+                if ($this->_stack[2] == 'Source') {
                     $this->_mapSource = trim($this->_chars);
-                } else {
+                } elseif ($this->_stack[2] == 'Target') {
                     $this->_mapTarget = trim($this->_chars);
                 }
             }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
index 09f78e784f..58e1fb8a4f 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
@@ -1,23 +1,31 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/State.php';
 include_once 'Horde/SyncML/Command.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Put.php,v 1.12 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 
+    /**
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Put';
+
     /**
      * @var string $_manufacturer
      */
@@ -36,6 +44,12 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 
     var $_oem;
 
+    /**
+     * @var array $_deviceInfo
+     */
+
+    var $_deviceInfo;
+
     /**
      * @var string $_softwareVersion
      */
@@ -43,62 +57,63 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
     var $_softwareVersion;
 
 	function endElement($uri, $element) {
-		switch ($this->_xmlStack) {
+		switch (count($this->_stack)) {
 			case 5:
-				switch($element) {
+				switch ($element) {
 					case 'DataStore':
-						$this->_deviceInfo['dataStore'][$this->_sourceReference] = array(
+						$this->_deviceInfo['dataStore'][$this->_sourceReference] = array (
 							'maxGUIDSize'		=> $this->_maxGUIDSize,
 							'rxPreference'		=> $this->_rxPreference,
 							'txPreference'		=> $this->_txPreference,
 							'syncCapabilities'	=> $this->_syncCapabilities,
+							'properties'		=> $this->_properties,
 						);
 						break;
-					
+
 					case 'DevID':
 						$this->_deviceInfo['deviceID'] 		= trim($this->_chars);
 						break;
-					
+
 					case 'DevTyp':
 						$this->_deviceInfo['deviceType']	= trim($this->_chars);
 						break;
-					
+
 					case 'FwV':
 						$this->_deviceInfo['firmwareVersion']	= trim($this->_chars);
 						break;
-						
+
 					case 'HwV':
 						$this->_deviceInfo['hardwareVersion']	= trim($this->_chars);
 						break;
-					
+
 					case 'Man':
 						$this->_deviceInfo['manufacturer']	= trim($this->_chars);
 						break;
-					
+
 					case 'Mod':
 						$this->_deviceInfo['model']		= trim($this->_chars);
 						break;
-					
+
 					case 'OEM':
 						$this->_deviceInfo['oem']		= trim($this->_chars);
 						break;
-					
+
 					case 'SwV':
 						$this->_deviceInfo['softwareVersion']	= trim($this->_chars);
 						break;
-					
+
 					case 'SupportLargeObjs':
 						$this->_deviceInfo['supportLargeObjs']	= true;
 						break;
-					
+
 					case 'SupportNumberOfChanges':
 						$this->_deviceInfo['supportNumberOfChanges'] = true;
 						break;
-					
+
 					case 'UTC':
 						$this->_deviceInfo['UTC']		= true;
 						break;
-						
+
 					case 'VerDTD':
 						$this->_deviceInfo['DTDVersion']	= trim($this->_chars);
 						break;
@@ -109,18 +124,18 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 					case 'MaxGUIDSize':
 						$this->_maxGUIDSize = trim($this->_chars);
 						break;
-					
+
 					case 'Rx-Pref':
 						$this->_rxPreference = array(
 							'contentType'		=> $this->_contentType,
 							'contentVersion'	=> $this->_contentVersion,
 						);
 						break;
-						
+
 					case 'SourceRef':
 						$this->_sourceReference = trim($this->_chars);
 						break;
-					
+
 					case 'Tx-Pref':
 						$this->_txPreference = array(
 							'contentType'		=> $this->_contentType,
@@ -129,7 +144,7 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 						break;
 				}
 				break;
-				
+
 			case 7:
 				switch($element) {
 					case 'CTType':
@@ -178,87 +193,165 @@ class Horde_SyncML_Command_Put extends Horde_SyncML_Command {
 							}
 						}
 						break;
-					
+
 					case 'SyncType':
 						$this->_syncCapabilities[] = trim($this->_chars);
 						break;
-						
+
 					case 'VerCT':
 						$this->_contentVersion = trim($this->_chars);
 						break;
+
+					case 'Property':
+						if (isset($this->_PropName)) {
+							$this->_properties[$this->_contentType][$this->_contentVersion][$this->_PropName] = array(
+								'Size'		=>	$this->_PropSize,
+								'NoTruncate'	=>	$this->_PropNoTruncate,
+							);
+						}
+						break;
 				}
 				break;
+
+			case 8:
+				switch($element) {
+					case 'PropName':
+						$this->_PropName = trim($this->_chars);
+						break;
+
+					case 'Size':
+						$this->_PropSize = trim($this->_chars);
+						break;
+
+					case 'NoTruncate':
+						$this->_PropNoTruncate = true;
+						break;
+				}
+				beak;
 		}
-			
+
 		parent::endElement($uri, $element);
 	}
-    
+
 	function finalizeDeviceInfo()
 	{
 		// get some more information about the device from out of band data
 
 		$ua = $_SERVER['HTTP_USER_AGENT'];
 
-		if (preg_match("/^\s*Funambol (.*) (\d+\.\d+\.\d+)\s*$/i", $ua, $matches))
-		{
-			if (!isset($this->_deviceInfo['manufacturer']))
-				$this->_deviceInfo['manufacturer'] = 'Funambol';
-			if (!isset($this->_deviceInfo['model']))
-				$this->_deviceInfo['model'] = 'Funambol ' . trim($matches[1]);
-			if (!isset($this->_deviceInfo['softwareVersion']))
-				$this->_deviceInfo['softwareVersion'] = $matches[2];
+		if (preg_match("/^\s*Funambol (.*) [^\d]*(\d+\.?\d*)[\.|\d]*\s*$/i", $ua, $matches)) {
+			// Funambol uses the hardware Manufacturer we don't care about
+			$this->_deviceInfo['manufacturer'] = 'Funambol';
+			$this->_deviceInfo['model'] = trim($matches[1]);
+			$this->_deviceInfo['softwareVersion'] = floatval($matches[2]);
 
-			if (!isset($this->_deviceInfo['deviceType']))
-			{
-				switch (strtolower(trim($matches[1])))
-				{
-					case 'outlook plug-in':
-					default:
-						$this->_deviceInfo['deviceType'] = 'workstation';
-						break;
+			if (!isset($this->_deviceInfo['deviceType'])) {
+				switch (strtolower(trim($matches[1]))) {
 					case 'pocket pc plug-in':
 						$this->_deviceInfo['deviceType'] = 'windowsmobile';
 						break;
+					case 'outlook plug-in':
+					default:
+						$this->_deviceInfo['deviceType'] = 'workstation';
+					break;
 				}
 			}
 		}
 
-		$devid = $this->_deviceInfo['deviceID'];
-		switch (strtolower($devid))
-		{
+		switch (strtolower($this->_deviceInfo['deviceID'])) {
 			case 'fmz-thunderbird-plugin':
-				if (empty($this->_devinceInfo['manufacturer']))
+				if (empty($this->_devinceInfo['manufacturer'])) {
 					$this->_deviceInfo['manufacturer'] = 'Funambol';
-				if (empty($this->_devinceInfo['model']))
+				}
+				if (empty($this->_devinceInfo['model'])) {
 					$this->_deviceInfo['model'] = 'ThunderBird';
-				if (empty($this->_devinceInfo['softwareVersion']))
-					$this->_deviceInfo['softwareVersion']	= '0.3';
+				}
+				if (empty($this->_devinceInfo['softwareVersion'])) {
+					$this->_deviceInfo['softwareVersion']	= '3.0';
+				}
+				break;
+		}
+
+		if (preg_match('/Funambol.*/i', $this->_deviceInfo['manufacturer'])) {
+			$this->_deviceInfo['supportLargeObjs'] = true;
+		}
+
+		switch (strtolower($this->_deviceInfo['manufacturer'])) {
+			case 'sonyericsson':
+			case 'sony ericsson':
+				if (strtolower($this->_deviceInfo['model']) == 'w890i') {
+					$this->_deviceInfo['supportLargeObjs'] = false;
+				}
+				break;
+			case 'synthesis ag':
+				foreach ($this->_deviceInfo['dataStore'] as &$ctype) {
+					$ctype['maxGUIDSize'] = 255;
+				}
 				break;
 		}
 	}
-	
+
 	function output($currentCmdID, &$output ) {
 		$state = &$_SESSION['SyncML.state'];
-		
-		$status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Put');
+
+		$status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), $this->_cmdName);
 		$status->setCmdRef($this->_cmdID);
-		
-		$ref = ($state->getVersion() == 0) ? './devinf10' : './devinf11';
-		
+
+        if ($state->getVersion() == 2) {
+		    $ref = './devinf12';
+        } elseif ($state->getVersion() == 1) {
+		    $ref = './devinf11';
+        } else {
+		    $ref = './devinf10';
+        }
+
 		$status->setSourceRef($ref);
-		
+
 		if($state->isAuthorized()) {
 			$this->finalizeDeviceInfo();
+
 			if(count((array)$this->_deviceInfo) > 0) {
-				$state->setClientDeviceInfo($this->_deviceInfo);
+				$devInfo = $state->getClientDeviceInfo();
+				if (is_array($devInfo['dataStore'])
+					&& $devInfo['softwareVersion'] == $this->_deviceInfo['softwareVersion']) {
+					// merge with existing information
+					$devInfo['dataStore'] =
+						array_merge($devInfo['dataStore'],
+							$this->_deviceInfo['dataStore']);
+				} else {
+					// new device
+					$devInfo = $this->_deviceInfo;
+				}
+	            #Horde::logMessage("SyncML: Put DeviceInfo:\n" . print_r($this->_deviceInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				$state->setClientDeviceInfo($devInfo);
 				$state->writeClientDeviceInfo();
 			}
 		}
-		
+
 		return $status->output($currentCmdID, $output);
 	}
 
 	function startElement($uri, $element, $attrs) {
+	       	#Horde::logMessage("SyncML: startElement[" . count($this->_stack) . "] $uri $element", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		switch (count($this->_stack)) {
+			case 4:
+				switch ($element) {
+					case 'DataStore':
+						$this->_properties = array();
+						break;
+				}
+				break;
+
+			case 6:
+				switch ($element) {
+					case 'Property':
+						unset($this->_PropName);
+						$this->_PropSize = -1;
+						$this->_PropNoTruncate = false;
+						break;
+				}
+				break;
+		}
 		parent::startElement($uri, $element, $attrs);
 	}
 
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php
index 73bca5df63..010083bbf2 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Replace.php
@@ -1,22 +1,29 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Command.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Replace.php,v 1.7 2004/05/26 17:41:30 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Final extends Horde_SyncML_Command {
 
+    /**
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Replace';
+
     function output($currentCmdID, &$output)
     {
         return $currentCmdID;
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php
index ca06ebd60c..2541666dc0 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Results.php
@@ -1,291 +1,36 @@
 <?php
-
-include_once 'Horde/SyncML/State.php';
-include_once 'Horde/SyncML/Command.php';
-
 /**
- * $Horde: framework/SyncML/SyncML/Command/Results.php,v 1.11 2004/07/02 19:24:44 chuck Exp $
+ * eGroupWare - SyncML based on Horde 3
  *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
+ * The SyncML_Command_Results class provides a SyncML implementation of the
+ * Results command as defined in SyncML Representation Protocol, version 1.1,
+ * section 5.5.12.
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ * The Results command is used to return the results of a Search or Get
+ * command. Currently SyncML_Command_Results behaves the same as
+ * SyncML_Command_Put. The only results we get is the same DevInf as for the
+ * Put command.
  *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
-class Horde_SyncML_Command_Results extends Horde_SyncML_Command {
+include_once 'Horde/SyncML/Command/Put.php';
 
-	var $_cmdRef;
-	var $_type;
-	var $_data;
-	var $_locSourceURI;
-	var $_deviceInfo;
-	
-	function endElement($uri, $element) {
-		#Horde::logMessage('SyncML: put endelement ' . $element . ' chars ' . $this->_chars, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		
-		switch ($this->_xmlStack) {
-			case 5:
-				switch($element) {
-					case 'DataStore':
-						$this->_deviceInfo['dataStore'][$this->_sourceReference] = array (
-							'maxGUIDSize'		=> $this->_maxGUIDSize,
-							'rxPreference'		=> $this->_rxPreference,
-							'txPreference'		=> $this->_txPreference,
-							'syncCapabilities'	=> $this->_syncCapabilities,
-						);
-						break;
-						
-					case 'DevID':
-						$this->_deviceInfo['deviceID'] = trim($this->_chars);
-						break;
-						
-					case 'DevTyp':
-						$this->_deviceInfo['deviceType']	= trim($this->_chars);
-						break;
-						
-					case 'FwV':
-						$this->_deviceInfo['firmwareVersion']	= trim($this->_chars);
-						break;
-						
-					case 'HwV':
-						$this->_deviceInfo['hardwareVersion']	= trim($this->_chars);
-						break;
-					
-					case 'Man':
-						$this->_deviceInfo['manufacturer']	= trim($this->_chars);
-						break;
-					
-					case 'Mod':
-						$this->_deviceInfo['model']		= trim($this->_chars);
-						break;
-						
-					case 'OEM':
-						$this->_deviceInfo['oem']		= trim($this->_chars);
-						break;
-					
-					case 'SwV':
-						$this->_deviceInfo['softwareVersion']	= trim($this->_chars);
-						break;
-					
-					case 'SupportLargeObjs':
-						$this->_deviceInfo['supportLargeObjs']	= true;
-						break;
-						
-					case 'SupportNumberOfChanges':
-						$this->_deviceInfo['supportNumberOfChanges'] = true;
-						break;
-					
-					case 'UTC':
-						$this->_deviceInfo['UTC']		= true;
-						break;
-						
-					case 'VerDTD':
-						$this->_deviceInfo['DTDVersion']	= trim($this->_chars);
-						break;
-				}
-				break;
+class Horde_SyncML_Command_Results extends Horde_SyncML_Command_Put {
 
-			case 6:
-				switch($element) {
-					case 'MaxGUIDSize':
-						$this->_maxGUIDSize = trim($this->_chars);
-						break;
-					
-					case 'Rx-Pref':
-						$this->_rxPreference = array (
-							'contentType'		=> $this->_contentType,
-							'contentVersion'	=> $this->_contentVersion,
-						);
-						break;
-						
-					case 'SourceRef':
-						$this->_sourceReference = trim($this->_chars);
-						break;
-						
-					case 'Tx-Pref':
-						$this->_txPreference = array(
-							'contentType'		=> $this->_contentType,
-							'contentVersion'	=> $this->_contentVersion,
-						);
-						break;
-				}
-				break;
-			
-			case 7:
-				switch($element) {
-					case 'CTType':
-						$this->_contentType = trim($this->_chars);
-						break;
-					
-					case 'SyncType':
-						$this->_syncCapabilities[] = trim($this->_chars);
-						break;
-					
-					case 'VerCT':
-						$this->_contentVersion = trim($this->_chars);
-						break;
-				}
-				break;
-		}
-		
-		parent::endElement($uri, $element);
-	}
+    /**
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Results';
 
-	function finalizeDeviceInfo()
-	{
-		// get some more information about the device from out of band data
-
-		$ua = $_SERVER['HTTP_USER_AGENT'];
-
-		if (preg_match("/^\s*Funambol (.*) (\d+\.\d+\.\d+)\s*$/i", $ua, $matches))
-		{
-			if (!isset($this->_deviceInfo['manufacturer']))
-				$this->_deviceInfo['manufacturer'] = 'Funambol';
-			if (!isset($this->_deviceInfo['model']))
-				$this->_deviceInfo['model'] = 'Funambol ' . trim($matches[1]);
-			if (!isset($this->_deviceInfo['softwareVersion']))
-				$this->_deviceInfo['softwareVersion'] = $matches[2];
-
-			if (!isset($this->_deviceInfo['deviceType']))
-			{
-				switch (strtolower(trim($matches[1])))
-				{
-					case 'outlook plug-in':
-					default:
-						$this->_deviceInfo['deviceType'] = 'workstation';
-						break;
-					case 'pocket pc plug-in':
-						$this->_deviceInfo['deviceType'] = 'windowsmobile';
-						break;
-				}
-			}
-		}
-
-		$devid = $this->_deviceInfo['deviceID'];
-		switch (strtolower($devid))
-		{
-			case 'fmz-thunderbird-plugin':
-				if (empty($this->_devinceInfo['manufacturer']))
-					$this->_deviceInfo['manufacturer'] = 'Funambol';
-				if (empty($this->_devinceInfo['model']))
-					$this->_deviceInfo['model'] = 'ThunderBird';
-				if (empty($this->_devinceInfo['softwareVersion']))
-					$this->_deviceInfo['softwareVersion']	= '0.3';
-				break;
-		}
-	}
-	
-	function output($currentCmdID, &$output) {
-		if(!isset($this->_locSourceURI)) {
-			#Horde::logMessage('SyncML: BIG TODO!!!!!!!!!!!!!!!!!! parse reply', __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			$state = &$_SESSION['SyncML.state'];
-			
-			$status = new Horde_SyncML_Command_Status((($state->isAuthorized()) ? RESPONSE_OK : RESPONSE_INVALID_CREDENTIALS), 'Results');
-			$status->setCmdRef($this->_cmdID);
-			
-			$ref = ($state->getVersion() == 0) ? './devinf10' : './devinf11';
-			
-			$status->setSourceRef($ref);
-			
-			if($state->isAuthorized()) {
-				$this->finalizeDeviceInfo();
-				if(count((array)$this->_deviceInfo) > 0) {
-					$state->setClientDeviceInfo($this->_deviceInfo);
-					$state->writeClientDeviceInfo();
-				}
-			}
-			
-			return $status->output($currentCmdID, $output);
-		} else {
-			#Horde::logMessage('SyncML: BIG TODO!!!!!!!!!!!!!!!!!! generate reponse', __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			$state = $_SESSION['SyncML.state'];
-			
-			$attrs = array();
-			$output->startElement($state->getURI(), 'Results', $attrs);
-			
-			$output->startElement($state->getURI(), 'CmdID', $attrs);
-			$chars = $currentCmdID;
-			$output->characters($chars);
-			$output->endElement($state->getURI(), 'CmdID');
-			
-			$output->startElement($state->getURI(), 'MsgRef', $attrs);
-			$chars = $state->getMsgID();
-			$output->characters($chars);
-			$output->endElement($state->getURI(), 'MsgRef');
-			
-			$output->startElement($state->getURI(), 'CmdRef', $attrs);
-			$chars = $this->_cmdRef;
-			$output->characters($chars);
-			$output->endElement($state->getURI(), 'CmdRef');
-			
-			$output->startElement($state->getURI(), 'Meta', $attrs);
-			$output->startElement($state->getURIMeta(), 'Type', $attrs);
-			$output->characters($this->_type);
-			$output->endElement($state->getURIMeta(), 'Type');
-			$output->endElement($state->getURI(), 'Meta');
-			
-			$output->startElement($state->getURI(), 'Item', $attrs);
-			$output->startElement($state->getURI(), 'Source', $attrs);
-			$output->startElement($state->getURI(), 'LocURI', $attrs);
-			$chars = $this->_locSourceURI;
-			$output->characters($chars);
-			$output->endElement($state->getURI(), 'LocURI');
-			$output->endElement($state->getURI(), 'Source');
-			
-			$output->startElement($state->getURI(), 'Data', $attrs);
-			
-			// Need to send this information as opaque data so the WBXML
-			// will understand it.
-			$output->opaque($this->_data);
-			
-			$output->endElement($state->getURI(), 'Data');
-			$output->endElement($state->getURI(), 'Item');
-			
-			$output->endElement($state->getURI(), 'Results');
-			
-			$currentCmdID++;
-			
-			return $currentCmdID;
-		}
-	}
-	
-	/**
-	* Setter for property cmdRef.
-	*
-	* @param string $cmdRef  New value of property cmdRef.
-	*/
-	function setCmdRef($cmdRef) {
-		$this->_cmdRef = $cmdRef;
-	}
-	
-	/**
-	* Setter for property Type.
-	*
-	* @param string $type  New value of property type.
-	*/
-	function setType($type) {
-		$this->_type = $type;
-	}
-	
-	/**
-	* Setter for property data.
-	*
-	* @param string $data  New value of property data.
-	*/
-	function setData($data) {
-		$this->_data = $data;
-	}
-	
-	/**
-	* Setter for property locSourceURI.
-	*
-	* @param string $locSourceURI  New value of property locSourceURI.
-	*/
-	function setlocSourceURI($locSourceURI) {
-		$this->_locSourceURI = $locSourceURI;
-	}
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Status.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Status.php
index 2efc029223..32dfeff6ac 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Status.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Status.php
@@ -1,37 +1,76 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/State.php';
 include_once 'Horde/SyncML/Command.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Status.php,v 1.15 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Status extends Horde_SyncML_Command {
 
+   /**
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Status';
+
+    /**
+     * The Response code of the command sent to the client, that this
+     * Status response refers to.
+     *
+     * @var integer
+     */
     var $_response;
 
+    /**
+     * The command ID (CmdID) of the command sent to the client, that this
+     * Status response refers to.
+     *
+     * @var integer
+     */
     var $_cmdRef;
 
     /**
-     * Must be present.
+     * The command (Add, Replace, etc) sent to the client, that this Status
+     * response refers to.
+     *
+     * @var string
      */
     var $_cmd;
 
     /**
-     * Must if not null (what does this mean?).
+     * The server ID of the sent object, that this Status response refers to.
+     *
+     * This element is optional. If specified, Status response refers to a
+     * single Item in the command sent to the client. It refers to all Items in
+     * the sent command otherwise.
+     *
+     * @var string
      */
     var $_sourceRef;
 
+
+    /**
+     * The client ID of the sent object, that this Status response refers to.
+     *
+     * This element is optional. If specified, Status response refers to a
+     * single Item in the command sent to the client. It refers to all Items in
+     * the sent command otherwise.
+     *
+     * @var string
+     */
     var $_targetRef;
 
     var $_chalMetaFormat;
@@ -48,6 +87,15 @@ class Horde_SyncML_Command_Status extends Horde_SyncML_Command {
 
     var $_itemSourceLocURI;
 
+    var $_syncItems;
+
+   /**
+     * Constructor.
+     *
+     * @param integer $response   The response code.
+     * @param string  $cmd        The command sent to the client,
+     *                             that this Status response refers to.
+     */
     function Horde_SyncML_Command_Status($response = null, $cmd = null)
     {
         if ($response != null) {
@@ -61,12 +109,11 @@ class Horde_SyncML_Command_Status extends Horde_SyncML_Command {
 
     function output($currentCmdID, &$output)
     {
+        $state = &$_SESSION['SyncML.state'];
+
         $attrs = array();
 
-        $state = $_SESSION['SyncML.state'];
-
         if ($this->_cmd != null) {
-            $attrs = array();
             $output->startElement($state->getURI(), 'Status', $attrs);
 
             $output->startElement($state->getURI(), 'CmdID', $attrs);
@@ -174,61 +221,41 @@ class Horde_SyncML_Command_Status extends Horde_SyncML_Command {
                 $output->endElement($state->getURI(), 'Item');
             }
 
-            if (isset($this->_itemTargetLocURI) && isset($this->_itemSourceLocURI)) {
-                $output->startElement($state->getURI(), 'Item', $attrs);
+			if (isset($this->_syncItems)) {
+				// Support multible items per command
+				foreach ($this->_syncItems as $locURI => &$syncItem) {
+					$output->startElement($state->getURI(), 'Item', $attrs);
+					$output->startElement($state->getURI(), 'Source', $attrs);
+					$output->startElement($state->getURI(), 'LocURI', $attrs);
+					$output->characters($locURI);
+					$output->endElement($state->getURI(), 'LocURI');
+					$output->endElement($state->getURI(), 'Source');
+					$output->endElement($state->getURI(), 'Item');
+				}
+			} elseif (isset($this->_itemTargetLocURI) || isset($this->_itemSourceLocURI)) {
+				$output->startElement($state->getURI(), 'Item', $attrs);
 
-                $output->startElement($state->getURI(), 'Target', $attrs);
-                $output->startElement($state->getURI(), 'LocURI', $attrs);
-                $output->characters($this->_itemTargetLocURI);
-                $output->endElement($state->getURI(), 'LocURI');
-                $output->endElement($state->getURI(), 'Target');
-
-                $output->startElement($state->getURI(), 'Source', $attrs);
-                $output->startElement($state->getURI(), 'LocURI', $attrs);
-                $output->characters($this->_itemSourceLocURI);
-                $output->endElement($state->getURI(), 'LocURI');
-                $output->endElement($state->getURI(), 'Source');
-
-                $output->endElement($state->getURI(), 'Item');
-            }
+				if (isset($this->_itemTargetLocURI)) {
+					$output->startElement($state->getURI(), 'Target', $attrs);
+					$output->startElement($state->getURI(), 'LocURI', $attrs);
+					$output->characters($this->_itemTargetLocURI);
+					$output->endElement($state->getURI(), 'LocURI');
+					$output->endElement($state->getURI(), 'Target');
+				}
+				if (isset($this->_itemSourceLocURI)) {
+					$output->startElement($state->getURI(), 'Source', $attrs);
+					$output->startElement($state->getURI(), 'LocURI', $attrs);
+					$output->characters($this->_itemSourceLocURI);
+					$output->endElement($state->getURI(), 'LocURI');
+					$output->endElement($state->getURI(), 'Source');
+				}
+				$output->endElement($state->getURI(), 'Item');
+			}
 
             $output->endElement($state->getURI(), 'Status');
 
             $currentCmdID++;
-            
-            // moredata pending request them
-/*            if($this->_response == RESPONSE_CHUNKED_ITEM_ACCEPTED_AND_BUFFERED) {
-		$output->startElement($state->getURI(), 'Alert', $attrs);
 
-		$output->startElement($state->getURI(), 'CmdID', $attrs);
-		$chars = $currentCmdID;
-		$output->characters($chars);
-		$output->endElement($state->getURI(), 'CmdID');
-
-		$output->startElement($state->getURI(), 'Data', $attrs);
-		$output->characters(ALERT_NEXT_MESSAGE);
-		$output->endElement($state->getURI(), 'Data');
-		
-		if (isset($this->_itemTargetLocURI) && isset($this->_itemSourceLocURI)) {
-			$output->startElement($state->getURI(), 'Item', $attrs);
-			
-			$output->startElement($state->getURI(), 'Target', $attrs);
-			$output->startElement($state->getURI(), 'LocURI', $attrs);
-			$output->characters($this->_itemTargetLocURI);
-			$output->endElement($state->getURI(), 'LocURI');
-			$output->endElement($state->getURI(), 'Target');
-			
-			$output->startElement($state->getURI(), 'Source', $attrs);
-			$output->startElement($state->getURI(), 'LocURI', $attrs);
-			$output->characters($this->_itemSourceLocURI);
-			$output->endElement($state->getURI(), 'LocURI');
-			$output->endElement($state->getURI(), 'Source');
-		}
-
-		$output->endElement($state->getURI(), 'Alert');		
-
-		$currentCmdID++;
-            } */
         }
 
         return $currentCmdID;
@@ -323,4 +350,14 @@ class Horde_SyncML_Command_Status extends Horde_SyncML_Command {
     {
         $this->_itemTargetLocURI = $itemTargetLocURI;
     }
+
+    /**
+     * Setter for the the list of handled SyncItems
+     *
+     * @param array $syncItems  The Items of the command
+     */
+    function setSyncItems(&$syncItems)
+    {
+        $this->_syncItems = $syncItems;
+    }
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
index c5ff34d483..eb79a36965 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
@@ -1,220 +1,258 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/State.php';
 include_once 'Horde/SyncML/Command.php';
 include_once 'Horde/SyncML/Command/Sync/SyncElement.php';
 include_once 'Horde/SyncML/Sync/TwoWaySync.php';
 include_once 'Horde/SyncML/Sync/SlowSync.php';
 include_once 'Horde/SyncML/Sync/OneWayFromServerSync.php';
+include_once 'Horde/SyncML/Sync/OneWayFromClientSync.php';
 include_once 'Horde/SyncML/Sync/RefreshFromServerSync.php';
+include_once 'Horde/SyncML/Sync/RefreshFromClientSync.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Sync.php,v 1.17 2004/07/03 15:21:14 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
-class Horde_SyncML_Command_Sync extends Horde_Syncml_Command {
+class Horde_SyncML_Command_Sync extends Horde_SyncML_Command {
 
-	var $_isInSource;
-	var $_currentSyncElement;
-	var $_syncElements = array();
-	
-	function output($currentCmdID, &$output) {
-	
-		$state = &$_SESSION['SyncML.state'];
-		
-		$attrs = array();
-		
-		Horde::logMessage('SyncML: $this->_targetURI = ' . $this->_targetURI, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		
-		$status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Sync');
-		
-		// $status->setState($state);
-		
-		$status->setCmdRef($this->_cmdID);
-		
-		if ($this->_targetURI != null) {
-			$status->setTargetRef((isset($this->_targetURIParameters) ? $this->_targetURI.'?/'.$this->_targetURIParameters : $this->_targetURI));
-		}
-		
-		if ($this->_sourceURI != null) {
-			$status->setSourceRef($this->_sourceURI);
-		}
-		
-		$currentCmdID = $status->output($currentCmdID, $output);
-		
-		if($sync = $state->getSync($this->_targetURI)) {
-			$currentCmdID = $sync->startSync($currentCmdID, $output);
-			
-			foreach ($this->_syncElements as $element) {
-				$currentCmdID = $sync->nextSyncCommand($currentCmdID, $element, $output);
-			}
-		}
+   /**
+     * Name of the command.
+     *
+     * @var string
+     */
+    var $_cmdName = 'Sync';
+
+    /**
+     * Source database of the <Sync> command.
+     *
+     * @var string
+     */
+    var $_sourceURI;
+
+    /**
+     * Target database of the <Sync> command.
+     *
+     * @var string
+     */
+    var $_targetURI;
+
+    /**
+     * Optional parameter for the Target.
+     *
+     * @var string
+     */
+    var $_targetURIParameters;
+
+    /**
+     * SyncML_SyncElement object for the currently parsed sync command.
+     *
+     * @var SyncML_SyncElement
+     */
+    var $_curItem;
+
+    /**
+     * List of all SyncML_SyncElement objects that have parsed.
+     *
+     * @var array
+     */
+    var $_syncElements = array();
+
+    function output($currentCmdID, &$output)
+    {
+        $state = &$_SESSION['SyncML.state'];
+
+        Horde::logMessage('SyncML: $this->_targetURI = ' . $this->_targetURI, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+        $status = new Horde_SyncML_Command_Status(RESPONSE_OK, 'Sync');
+
+        $status->setCmdRef($this->_cmdID);
+
+        if ($this->_targetURI != null) {
+            $status->setTargetRef((isset($this->_targetURIParameters) ? $this->_targetURI.'?/'.$this->_targetURIParameters : $this->_targetURI));
+        }
+
+        if ($this->_sourceURI != null) {
+            $status->setSourceRef($this->_sourceURI);
+        }
+
+        $currentCmdID = $status->output($currentCmdID, $output);
+
+        if ($sync = &$state->getSync($this->_targetURI)) {
+            $currentCmdID = $sync->startSync($currentCmdID, $output);
+
+            foreach ($this->_syncElements as $element) {
+                $currentCmdID = $sync->nextSyncCommand($currentCmdID, $element, $output);
+            }
+        }
+
+	return $currentCmdID;
+    }
 
-		return $currentCmdID;
-	}
-	
-	function getTargetURI() {
-		return $this->_targetURI;
-	}
 
     function startElement($uri, $element, $attrs)
     {
         parent::startElement($uri, $element, $attrs);
 
-        switch ($this->_xmlStack) {
+        switch (count($this->_stack)) {
         case 2:
-            if ($element == 'Replace' || $element == 'Add' || $element == 'Delete') {
-                $this->_currentSyncElement = &Horde_SyncML_Command_Sync_SyncElement::factory($element);
-                // $this->_currentSyncElement->setVersion($this->_version);
-                // $this->_currentSyncElement->setCmdRef($this->_cmdID);
-                // $this->_currentSyncElement->setMsgID($this->_msgID);
-            } elseif ($element == 'Target') {
-                $this->_isInSource = false;
-            } else {
-                $this->_isInSource = true;
+            if ($element == 'Replace' ||
+                $element == 'Add' ||
+                $element == 'Delete') {
+		Horde::logMessage("SyncML: sync element $element found", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                $this->_curItem = &Horde_SyncML_Command_Sync_SyncElement::factory($element);
             }
             break;
         }
-
-        if (isset($this->_currentSyncElement)) {
-            $this->_currentSyncElement->startElement($uri, $element, $attrs);
+        if (isset($this->_curItem)) {
+            $this->_curItem->startElement($uri, $element, $attrs);
         }
     }
-    
+
+
     // We create a seperate Sync Element for the Sync Data sent
     // from the Server to the client as we want to process the
     // client sync information before.
 
     function syncToClient($currentCmdID, &$output)
     {
-        Horde::logMessage('SyncML: starting sync to client', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+	Horde::logMessage('SyncML: starting sync to client', __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-        $state = $_SESSION['SyncML.state'];
-        if($state->getSyncStatus() >= CLIENT_SYNC_ACKNOWLEDGED && $state->getSyncStatus() < SERVER_SYNC_FINNISHED)
-        {
-	        $deviceInfo = $state->getClientDeviceInfo();
-		$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);      
-	        $targets = $state->getTargets();
-	        Horde::logMessage('SyncML: starting sync to client '.$targets[0], __FILE__, __LINE__, PEAR_LOG_DEBUG);
-	        $attrs = array();
+        $state = &$_SESSION['SyncML.state'];
 
+       	if($state->getSyncStatus() >= CLIENT_SYNC_FINNISHED && $state->getSyncStatus() < SERVER_SYNC_FINNISHED)
+       	{
+		$deviceInfo = $state->getClientDeviceInfo();
+		$targets = $state->getTargets();
 		foreach($targets as $target)
 		{
-			$sync = $state->getSync($target);
-			
-			// make sure that the state reflects what is currently being done
-			$state->_currentSourceURI = $sync->_sourceLocURI;
-			$state->_currentTargetURI = $sync->_targetLocURI;
-        	
-			$output->startElement($state->getURI(), 'Sync', $attrs);
-			$output->startElement($state->getURI(), 'CmdID', $attrs);
-			$output->characters($currentCmdID);
-			$currentCmdID++;
-			$output->endElement($state->getURI(), 'CmdID');
-	
-			$output->startElement($state->getURI(), 'Target', $attrs);
-			$output->startElement($state->getURI(), 'LocURI', $attrs);
-			$chars = $sync->_sourceLocURI;
-			$output->characters($chars);
-			$output->endElement($state->getURI(), 'LocURI');
-			$output->endElement($state->getURI(), 'Target');
-	
-			$output->startElement($state->getURI(), 'Source', $attrs);
-			$output->startElement($state->getURI(), 'LocURI', $attrs);
-			#$chars = $sync->_targetLocURI;
-			$chars = (isset($sync->_targetLocURIParameters) ? $sync->_targetLocURI.'?/'.$sync->_targetLocURIParameters : $sync->_targetLocURI);
-			$output->characters($chars);
-			$output->endElement($state->getURI(), 'LocURI');
-			$output->endElement($state->getURI(), 'Source');
-		
-			if(!$sync->_syncDataLoaded)
-			{
-				$numberOfItems = $sync->loadData();
-				if($deviceInfo['supportNumberOfChanges'])
+        	$sync = &$state->getSync($target);
+			Horde::logMessage('SyncML['. session_id() .']: sync alerttype '. $sync->_syncType .' found for target ' . $target, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			if ($sync->_syncType == ALERT_ONE_WAY_FROM_CLIENT ||
+				$sync->_syncType == ALERT_REFRESH_FROM_CLIENT) {
+
+				Horde::logMessage('SyncML['. session_id() .']: From client Sync, no sync of '. $target .' to client', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				$state->clearSync($target);
+
+			} else if ($state->getSyncStatus() >= CLIENT_SYNC_ACKNOWLEDGED) {
+
+				Horde::logMessage("SyncML: starting sync to client $target", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				$attrs = array();
+
+				$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+
+				$output->startElement($state->getURI(), 'Sync', $attrs);
+				$output->startElement($state->getURI(), 'CmdID', $attrs);
+				$output->characters($currentCmdID);
+				$currentCmdID++;
+				$output->endElement($state->getURI(), 'CmdID');
+
+				$output->startElement($state->getURI(), 'Target', $attrs);
+				$output->startElement($state->getURI(), 'LocURI', $attrs);
+				$chars = $sync->_sourceLocURI;
+				$output->characters($chars);
+				$output->endElement($state->getURI(), 'LocURI');
+				$output->endElement($state->getURI(), 'Target');
+
+				$output->startElement($state->getURI(), 'Source', $attrs);
+				$output->startElement($state->getURI(), 'LocURI', $attrs);
+				$chars = (isset($sync->_targetLocURIParameters) ? $sync->_targetLocURI.'?/'.$sync->_targetLocURIParameters : $sync->_targetLocURI);
+				$output->characters($chars);
+				$output->endElement($state->getURI(), 'LocURI');
+				$output->endElement($state->getURI(), 'Source');
+
+				if(!$sync->_syncDataLoaded)
 				{
-					$output->startElement($state->getURI(), 'NumberOfChanged', $attrs);
-					$output->characters($numberOfItems);
-					$output->endElement($state->getURI(), 'NumberOfChanged');
+					$numberOfItems = $sync->loadData();
+					if($deviceInfo['supportNumberOfChanges'])
+					{
+						$output->startElement($state->getURI(), 'NumberOfChanges', $attrs);
+						$output->characters($numberOfItems);
+						$output->endElement($state->getURI(), 'NumberOfChanges');
+					}
 				}
+
+				$currentCmdID = $sync->endSync($currentCmdID, $output);
+
+				$output->endElement($state->getURI(), 'Sync');
+
+				if (isset($state->curSyncItem) ||
+					$state->getNumberOfElements() === false) {
+					break;
+				}
+			} else {
+       		  Horde::logMessage("SyncML: Waiting for client ACKNOWLEDGE for $target", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 			}
-		
-			$currentCmdID = $sync->endSync($currentCmdID, $output);
-		
-			$output->endElement($state->getURI(), 'Sync');
-			
-			break;
 		}
-	
+
 		// no syncs left
-		if($state->getTargets() === FALSE)
+		if($state->getTargets() === FALSE &&
+			!isset($state->curSyncItem)) {
 			$state->setSyncStatus(SERVER_SYNC_FINNISHED);
-	
-		Horde::logMessage('SyncML: syncStatus(server_sync_finnished) '. $state->getSyncStatus, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-	}	
+		}
+
+		Horde::logMessage('SyncML: syncStatus(syncToClient) = '. $state->getSyncStatus(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+	}
 
 	return $currentCmdID;
+
     }
 
     function endElement($uri, $element)
     {
-        if (isset($this->_currentSyncElement)) {
-            $this->_currentSyncElement->endElement($uri, $element);
+        if (isset($this->_curItem)) {
+            $this->_curItem->endElement($uri, $element);
         }
 
-        switch ($this->_xmlStack) {
+        switch (count($this->_stack)) {
         case 2:
-            if ($element == 'Replace' || $element == 'Add' || $element == 'Delete') {
-                $this->_syncElements[] = $this->_currentSyncElement;
-                unset($this->_currentSyncElement);
+            if ($element == 'Replace' ||
+                $element == 'Add' ||
+                $element == 'Delete') {
+                $this->_syncElements[] = &$this->_curItem;
+                unset($this->_curItem);
             }
             break;
 
         case 3:
-      	    $state = & $_SESSION['SyncML.state'];
-      	    
-            if ($element == 'LocURI' && !isset($this->_currentSyncElement)) {
-                if ($this->_isInSource) {
+            if ($element == 'LocURI' && !isset($this->_curItem)) {
+                if ($this->_stack[1] == 'Source') {
                     $this->_sourceURI = trim($this->_chars);
-                    $state->_currentSourceURI = $this->_sourceURI;
-                } else {
-                    $this->_targetURI = trim($this->_chars);
-
+                } elseif ($this->_stack[1] == 'Target') {
                     $targetURIData = explode('?/',trim($this->_chars));
 
-		    $this->_targetURI = $targetURIData[0];
-		    $state->_currentTargetURI = $this->_targetURI;
-		    
-		    if(isset($targetURIData[1]))
-		    {
-		    	$this->_targetURIParameters = $targetURIData[1];
-		    	$state->_currentTargetURIParameters = $this->_targetURIParameters;
-		    }
-                    
+                    $this->_targetURI = $targetURIData[0];
+
+                    if (isset($targetURIData[1])) {
+                        $this->_targetURIParameters = $targetURIData[1];
+                    }
                 }
             }
             break;
         }
 
         parent::endElement($uri, $element);
-        
+
     }
 
     function characters($str)
     {
-        if (isset($this->_currentSyncElement)) {
-            $this->_currentSyncElement->characters($str);
+        if (isset($this->_curItem)) {
+            $this->_curItem->characters($str);
         } else {
             if (isset($this->_chars)) {
-                $this->_chars = $this->_chars . $str;
+                $this->_chars .= $str;
             } else {
                 $this->_chars = $str;
             }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php
index 7b4bec7f43..0517faa76e 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Add.php
@@ -1,20 +1,20 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Command/Sync/SyncElement.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Sync/Add.php,v 1.10 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Sync_Add extends Horde_SyncML_Command_Sync_SyncElement {
 
     var $_status = RESPONSE_ITEM_ADDED;
@@ -24,9 +24,10 @@ class Horde_SyncML_Command_Sync_Add extends Horde_SyncML_Command_Sync_SyncElemen
         $status = new Horde_SyncML_Command_Status($this->_status, 'Add');
         $status->setCmdRef($this->_cmdID);
 
-        if (isset($this->_luid)) {
-            $status->setSourceRef($this->_luid);
+        if (!empty($this->_items)) {
+            $status->setSyncItems($this->_items);
         }
+
         return $status->output($currentCmdID, $output);
     }
 
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/ContentSyncElement.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/ContentSyncElement.php
index 01042f2dd9..4d6f7fac20 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/ContentSyncElement.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/ContentSyncElement.php
@@ -1,106 +1,44 @@
 <?php
-
-include_once 'Horde/SyncML/State.php';
-include_once 'Horde/SyncML/Command/Sync/SyncElement.php';
-
 /**
- * $Horde: framework/SyncML/SyncML/Command/Sync/ContentSyncElement.php,v 1.12 2004/07/02 19:24:44 chuck Exp $
+ * eGroupWare - SyncML based on Horde 3
  *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ * Using the PEAR Log class (which need to be installed!)
  *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
-class Horde_SyncML_Command_Sync_ContentSyncElement extends Horde_SyncML_Command_Sync_SyncElement {
+include_once 'Horde/SyncML/State.php';
+include_once 'Horde/SyncML/Command/Sync/SyncElementItem.php';
 
-    /**
-     * The content: vcard data, etc.
-     */
-    var $_content;
-
-    /**
-     * Local to server: our Horde guid.
-     */
-    var $_locURI;
-
-    var $_targetURI;
-    var $_contentType;
-
-    function setSourceURI($uri)
-    {
-        $this->_locURI = $uri;
-    }
-
-    function getSourceURI()
-    {
-        return $this->_locURI;
-    }
-
-    function setTargetURI($uri)
-    {
-        $this->_targetURI = $uri;
-    }
-
-    function getTargetURI()
-    {
-        return $this->_targetURI;
-    }
-
-    function setContentType($c)
-    {
-        $this->_contentType = $c;
-    }
-
-    function setContentFormat($_format)
-    {
-        $this->_contentFormat = $_format;
-    }
-
-    function getContentType()
-    {
-        return $this->_contentType;
-    }
-
-    function getContent()
-    {
-        return $this->_content;
-    }
-
-    function setContent($content)
-    {
-        $this->_content = $content;
-    }
-
-    function endElement($uri, $element)
-    {
-        switch ($this->_xmlStack) {
-        case 2:
-            if ($element == 'Data') {
-                $this->_content = trim($this->_chars);
-            }
-            break;
-        }
-
-        parent::endElement($uri, $element);
-    }
+class Horde_SyncML_Command_Sync_ContentSyncElement extends Horde_SyncML_Command_Sync_SyncElementItem {
 
     function outputCommand($currentCmdID, &$output, $command)
     {
         $state = $_SESSION['SyncML.state'];
+		$maxMsgSize = $state->getMaxMsgSizeClient();
+		$maxGUIDSize = $state->getMaxGUIDSizeClient();
+
+		if ($this->_moreData) {
+			$command = $this->_command;
+		} else {
+			$this->_command = $command;
+		}
 
         $attrs = array();
         $output->startElement($state->getURI(), $command, $attrs);
 
         $output->startElement($state->getURI(), 'CmdID', $attrs);
-        $chars = $currentCmdID;
-        $output->characters($chars);
+        $output->characters($currentCmdID);
         $output->endElement($state->getURI(), 'CmdID');
 
+/*
         if (isset($this->_contentType)) {
             $output->startElement($state->getURI(), 'Meta', $attrs);
             $output->startElement($state->getURIMeta(), 'Type', $attrs);
@@ -108,43 +46,100 @@ class Horde_SyncML_Command_Sync_ContentSyncElement extends Horde_SyncML_Command_
             $output->endElement($state->getURIMeta(), 'Type');
             $output->endElement($state->getURI(), 'Meta');
         }
+*/
+        if (isset($this->_content) && !$this->_moreData) {
+			$this->_content = trim($this->_content);
+	    	$this->_contentSize = strlen($this->_content);
+			if (strtolower($this->_contentFormat) == 'b64') {
+				$this->_content = base64_encode($this->_content);
+			}
+        } else {
+            $this->_contentSize = 0;
+        }
 
-        if (isset($this->_content)
-            || isset($this->_locURI) || isset($this->targetURI)) {
+            // <command><Meta>
+        if ($this->_contentSize || isset($this->_contentType) || isset($this->_contentFormat)) {
+			$output->startElement($state->getURI(), 'Meta', $attrs);
+        	if (isset($this->_contentType)) {
+				$output->startElement($state->getURIMeta(), 'Type', $attrs);
+				$output->characters($this->_contentType);
+				$output->endElement($state->getURIMeta(), 'Type');
+			}
+			if (isset($this->_contentFormat)) {
+                $output->startElement($state->getURIMeta(), 'Format', $attrs);
+				$output->characters($this->_contentFormat);
+				$output->endElement($state->getURIMeta(), 'Format');
+			}
+			if ($this->_contentSize) {
+				$output->startElement($state->getURIMeta(), 'Size', $attrs);
+				$output->characters(($this->_contentSize));
+				$output->endElement($state->getURIMeta(), 'Size');
+			}
+			$output->endElement($state->getURI(), 'Meta');
+        }
+
+        if (isset($this->_content) || isset($this->_luid) || isset($this->_guid)) {
             $output->startElement($state->getURI(), 'Item', $attrs);
-            // send only when sending adds
-            if ($this->_locURI != null && (strtolower($command) == 'add')) {
+
+            // <command><Item><Source><LocURI>
+            if (isset($this->_guid)) {
                 $output->startElement($state->getURI(), 'Source', $attrs);
                 $output->startElement($state->getURI(), 'LocURI', $attrs);
-                $chars = substr($this->_locURI,0,39);
-                $state->setUIDMapping($this->_locURI, $chars);
+                $chars = substr($this->_guid, 0, $maxGUIDSize);
+                $state->setUIDMapping($this->_guid, $chars);
                 $output->characters($chars);
                 $output->endElement($state->getURI(), 'LocURI');
                 $output->endElement($state->getURI(), 'Source');
             }
-            
-            if(isset($this->_contentFormat)) {
-                $output->startElement($state->getURI(), 'Meta', $attrs);
-                $output->startElement($state->getURIMeta(), 'Format', $attrs);
-                $output->characters($this->_contentFormat);
-                $output->endElement($state->getURIMeta(), 'Format');
-                $output->endElement($state->getURI(), 'Meta');
-            }
 
-            if ($this->_targetURI != null) {
+            // <command><Item><Target><LocURI>
+            if (isset($this->_luid)) {
                 $output->startElement($state->getURI(), 'Target', $attrs);
                 $output->startElement($state->getURI(), 'LocURI', $attrs);
-                $chars = $this->_targetURI;
-                $output->characters($chars);
+                $output->characters($this->_luid);
                 $output->endElement($state->getURI(), 'LocURI');
                 $output->endElement($state->getURI(), 'Target');
             }
+
+
+             // <command><Item><Data>
             if (isset($this->_content)) {
                 $output->startElement($state->getURI(), 'Data', $attrs);
                 #$chars = '<![CDATA['.$this->_content.']]>';
-                $chars = $this->_content;
-                $output->characters($chars);
+				$currentSize = $output->getOutputSize();
+				Horde::logMessage("SyncML: $command: current = $currentSize, max = $maxMsgSize", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				if (!$maxMsgSize ||
+					(($currentSize + MIN_MSG_LEFT + $this->_contentSize) <= $maxMsgSize)) {
+					$chars = $this->_content;
+					unset($this->_content);
+					$this->_moreData = false;
+				} else {
+					$sizeLeft = $maxMsgSize - $currentSize - MIN_MSG_LEFT;
+					if ($sizeLeft < 0) {
+						Horde::logMessage("SyncML: $command: split with $currentSize for $maxMsgSize, increase MIN_MSG_LEFT!", __FILE__, __LINE__, PEAR_LOG_WARNING);
+						$sizeLeft = 0;
+					}
+					// don't let us loose characters by trimming
+					while (($this->_contentSize > $sizeLeft) &&
+							(strlen(trim(substr($this->_content, $sizeLeft - 1, 2))) < 2)) {
+						Horde::logMessage("SyncML: $command: split at $sizeLeft hit WS!", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+						$sizeLeft++;
+					}
+					$chars = substr($this->_content, 0, $sizeLeft);
+					$this->_content = substr($this->_content, $sizeLeft, $this->_contentSize - $sizeLeft);
+					Horde::logMessage("SyncML: $command: "
+						. $this->_contentSize . " split at $sizeLeft:\n"
+						. $chars, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					$this->_moreData = true;
+				}
+               	$output->characters($chars);
                 $output->endElement($state->getURI(), 'Data');
+
+		 		// <command><Item><MoreData/>
+				if ($this->_moreData) {
+                	$output->startElement($state->getURI(), 'MoreData', $attrs);
+                	$output->endElement($state->getURI(), 'MoreData');
+				}
             }
             $output->endElement($state->getURI(), 'Item');
         }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php
index 57132f981d..b64bde926a 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Delete.php
@@ -1,20 +1,20 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Command/Sync/SyncElement.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Sync/Delete.php,v 1.9 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Sync_Delete extends Horde_SyncML_Command_Sync_SyncElement {
 
     function output($currentCmdID, &$output)
@@ -22,8 +22,8 @@ class Horde_SyncML_Command_Sync_Delete extends Horde_SyncML_Command_Sync_SyncEle
         $status = new Horde_SyncML_Command_Status($this->_status, 'Delete');
         $status->setCmdRef($this->_cmdID);
 
-        if (isset($this->_luid)) {
-            $status->setSourceRef($this->_luid);
+        if (!empty($this->_items)) {
+            $status->setSyncItems($this->_items);
         }
 
         return $status->output($currentCmdID, $output);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php
index 2168700d11..3e30982a7a 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/Replace.php
@@ -1,32 +1,30 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Command/Sync/SyncElement.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Sync/Replace.php,v 1.9 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Sync_Replace extends Horde_SyncML_Command_Sync_SyncElement {
+
 	function output($currentCmdID, &$output) {
 		$status = new Horde_SyncML_Command_Status($this->_status, 'Replace');
 		$status->setCmdRef($this->_cmdID);
-		
-		if (isset($this->_luid)) {
-			$status->setSourceRef($this->_luid);
-		}
-		
-		#$status->setItemSourceLocURI($this->_sourceLocURI);
-		#$status->setItemTargetLocURI(isset($this->_targetLocURIParameters) ? $this->_targetLocURI.'?/'.$this->_targetLocURIParameters : $this->_targetLocURI);
-		
+
+		if (!empty($this->_items)) {
+            $status->setSyncItems($this->_items);
+        }
+
 		return $status->output($currentCmdID, $output);
 	}
 
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php
index 9adef9aabf..acad907b0d 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElement.php
@@ -1,37 +1,40 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Command.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Sync/SyncElement.php,v 1.11 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- * Copyright 2005-2006 Lars Kneschke <l.kneschke@metaways.de>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Sync_SyncElement extends Horde_SyncML_Command {
 
 	var $_luid;
 	var $_guid;
-	var $_isSource;
-	var $_content;
+	var $_contentSize;
 	var $_contentType;
+	var $_contentFormat;
 	var $_status = RESPONSE_OK;
-	var $_items;
-	
+	var $_curItem;
+	var $_items = array();
+	var $_moreData = false;
+        var $_command = false;
+
 	function &factory($command, $params = null) {
 		include_once 'Horde/SyncML/Command/Sync/SyncElementItem.php';
 		@include_once 'Horde/SyncML/Command/Sync/' . $command . '.php';
-		
+
 		$class = 'Horde_SyncML_Command_Sync_' . $command;
-		
+
 		if (class_exists($class)) {
 			#Horde::logMessage('SyncML: Class definition of ' . $class . ' found in SyncElement::factory.', __FILE__, __LINE__, PEAR_LOG_DEBUG);
 			return $element = new $class($params);
@@ -44,78 +47,122 @@ class Horde_SyncML_Command_Sync_SyncElement extends Horde_SyncML_Command {
 
 	function startElement($uri, $element, $attrs) {
 		parent::startElement($uri, $element, $attrs);
-		
-		switch ($this->_xmlStack) {
-			case 3:
-				if ($element == 'Source') {
-					$this->_isSource = true;
+		$state = &$_SESSION['SyncML.state'];
+
+		switch (count($this->_stack)) {
+			case 1:
+				$this->_command = $element;
+				break;
+			case 2:
+				if ($element == 'Item') {
+					if (isset($state->curSyncItem)) {
+						// Copy from state in case of <MoreData>.
+						$this->_curItem = &$state->curSyncItem;
+						if (isset($this->_luid) &&
+							($this->_luid != $this->_curItem->_luid)) {
+							Horde::logMessage('SyncML: moreData mismatch for LocURI ' .
+								$this->_curItem->_luid . ' (' . $this->_luid . ')', __FILE__, __LINE__, PEAR_LOG_ERROR);
+						} else {
+							Horde::logMessage('SyncML: moreData item found for LocURI ' . $this->_curItem->_luid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+						}
+						unset($state->curSyncItem);
+					} else {
+						$this->_curItem = new Horde_SyncML_Command_Sync_SyncElementItem();
+					}
+					$this->_moreData = false;
 				}
 				break;
 		}
 	}
-	
+
 	function endElement($uri, $element) {
+		$state = &$_SESSION['SyncML.state'];
 		$search = array('/ *\n/','/ *$/m');
 		$replace = array('','');
-		
-		switch ($this->_xmlStack) {
+
+		switch (count($this->_stack)) {
 			case 1:
+				$this->_command = false;
 				// Need to add sync elements to the Sync method?
 				#error_log('total # of items: '.count($this->_items));
 				#error_log(print_r($this->_items[10], true));
 				break;
 			case 2;
 				if($element == 'Item') {
-					$item = new Horde_SyncML_Command_Sync_SyncElementItem();
-
 					if($this->_luid) {
-						$item->setLocURI($this->_luid);
-						$item->setContent($this->_content);
-						$item->setContentType($this->_contentType);
-					
+						$this->_curItem->setLocURI($this->_luid);
+						$this->_curItem->setContentType($this->_contentType);
+						$this->_curItem->setContentFormat($this->_contentFormat);
+						$this->_curItem->setCommand($this->_command);
+
 						if($this->_contentSize)
-							$item->setContentType($this->_contentSize);
-						if($this->_moreData)
-							$item->setMoreData($this->_moreData);
-							
-						$this->_items[$this->_luid] = $item;
+							$this->_curItem->setContentSize($this->_contentSize);
+						if($this->_moreData) {
+							$state->curSyncItem = &$this->_curItem;
+							Horde::logMessage('SyncML: moreData item saved for LocURI ' . $this->_curItem->_luid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+						} else {
+							if (strtolower($this->_curItem->getContentFormat()) == 'b64') {
+								$content = $this->_curItem->getContent();
+								$content =  ($content ? base64_decode($content) : '');
+								$this->_curItem->setContent($content);
+								#Horde::logMessage('SyncML: BASE64 encoded item for LocURI '
+								#	. $this->_curItem->_luid . ":\n $content", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+							}
+							$this->_items[$this->_luid] = $this->_curItem;
+						}
 					}
-					
-					unset($this->_content);
 					unset($this->_contentSize);
 					unset($this->_luid);
 				}
 				break;
 			case 3:
-				if ($element == 'Source') {
-					$this->_isSource = false;
-				} elseif ($element == 'Data') {
-					$this->_content = $this->_chars;
-				} elseif ($element == 'MoreData') {
-					$this->_moreData = TRUE;
-				} elseif ($element == 'Type') {
-					if(empty($this->_contentType))
-						$this->_contentType = trim($this->_chars);
+				switch ($element) {
+					case 'Data':
+						$this->_curItem->_content .= $this->_chars;
+						break;
+					case 'MoreData':
+						$this->_moreData = true;
+						break;
+					case 'Type':
+						if(empty($this->_contentType)) {
+							$this->_contentType = trim($this->_chars);
+						}
+						break;
+					case 'Format':
+						$this->_contentFormat = strtolower(trim($this->_chars));
+						break;
+					case 'Size':
+						$this->_contentSize = $this->_chars;
+						break;
 				}
 				break;
-			
+
 			case 4:
-				if ($element == 'LocURI' && $this->_isSource) {
-					$this->_luid = trim($this->_chars);
-				} elseif ($element == 'Type') {
-					$this->_contentType = trim($this->_chars);
-				} elseif ($element == 'Size') {
-					$this->_contentSize = trim($this->_chars);
+				switch ($element) {
+					case 'LocURI':
+						if ($this->_stack[2] == 'Source') {
+							$this->_luid = trim($this->_chars);
+						}
+						break;
+					case 'Type':
+						$this->_contentType = trim($this->_chars);
+						break;
+					case 'Format':
+						$this->_contentFormat = strtolower(trim($this->_chars));
+						break;
+					case 'Size':
+						$this->_contentSize = trim($this->_chars);
+						break;
 				}
 				break;
 		}
-		
+
 		parent::endElement($uri, $element);
 	}
-	
-	function getSyncElementItems() {
-		return (array)$this->_items;
-	}
+
+    function getSyncElementItems() {
+         return (array)$this->_items;
+    }
 
     function getLocURI()
     {
@@ -149,14 +196,17 @@ class Horde_SyncML_Command_Sync_SyncElement extends Horde_SyncML_Command {
 
     function getContent()
     {
-        return $this->_content;
+	if ($this->_curItem) {
+        	return $this->_curItem->getcontent();
+	}
+	return false;
     }
 
-    function setContent($content)
+    function hasMoreData()
     {
-        $this->_content = $content;
+        return $this->_moreData;
     }
-    
+
     function setStatus($_status)
     {
     	$this->_status = $_status;
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElementItem.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElementItem.php
index 0d87fe795f..6ef74146bb 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElementItem.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync/SyncElementItem.php
@@ -1,67 +1,95 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Command.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Command/Sync/SyncElement.php,v 1.11 2004/07/02 19:24:44 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- * Copyright 2005-2006 Lars Kneschke <l.kneschke@metaways.de>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Command_Sync_SyncElementItem {
 
 	var $_luid;
 	var $_guid;
-	var $_content;
+	var $_content = '';
 	var $_contentSize;
 	var $_contentType;
+	var $_contentFormat;
+	var $_command;
 	var $_moreData = false;
-	
+
 	function getLocURI() {
 		return $this->_luid;
 	}
-	
+
 	function getGUID() {
 		return $this->_guid;
 	}
-	
+
 	function getContentType() {
 		return $this->_contentType;
 	}
-	
+
+	function getContentFormat() {
+		return $this->_contentFormat;
+	}
+
 	function getContent() {
 		return $this->_content;
 	}
-	
+
+	function getContentSize() {
+		if (isset($this->_contentSize)) {
+			return $this->_contentSize;
+		}
+		return false;
+	}
+
+	function getCommand() {
+		return $this->_command;
+	}
+
 	function setLocURI($luid) {
 		$this->_luid = $luid;
 	}
-	
+
 	function setGUID($guid) {
 		$this->_guid = $guid;
 	}
-	
-	function setContent($content) {
-		$this->_content = $content;
+
+	function setContent($_content) {
+		$this->_content = $_content;
 	}
 
 	function setContentSize($_size) {
 		$this->_contentSize = $_size;
 	}
 
-	function setContentType($_contentType) {
-		$this->_contentType = $_contentType;
+	function setContentType($_type) {
+		$this->_contentType = $_type;
+	}
+
+	function setContentFormat($_format) {
+		$this->_contentFormat = $_format;
 	}
 
 	function setMoreData($_status) {
 		$this->_moreData = $_status;
 	}
+
+	function hasMoreData() {
+		return $this->_moreData;
+	}
+
+	function setCommand($_command) {
+		$this->_command = $_command;
+	}
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State.php b/phpgwapi/inc/horde/Horde/SyncML/State.php
index 515771d6f3..fec43a3884 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State.php
@@ -1,4 +1,18 @@
 <?php
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 
 define('ALERT_DISPLAY', 100);
 
@@ -21,6 +35,10 @@ define('ALERT_RESULT_ALERT', 221);
 define('ALERT_NEXT_MESSAGE', 222);
 define('ALERT_NO_END_OF_DATA', 223);
 
+// Not (really) implemented.
+define('ALERT_SUSPEND',        224); // New in SyncML 1.2
+define('ALERT_RESUME',         225); // New in SyncML 1.2
+
 define('MIME_SYNCML_XML', 'application/vnd.syncml+xml');
 define('MIME_SYNCML_WBXML', 'application/vnd.syncml+wbxml');
 
@@ -107,7 +125,7 @@ define('RESPONSE_COMMAND_FAILED', 500);
 // define('RESPONSE_COMMAND_FAILED', 505);
 // define('RESPONSE_COMMAND_FAILED', 506);
 // define('RESPONSE_COMMAND_FAILED', 507);
-// define('RESPONSE_COMMAND_FAILED', 508);
+define('RESPONSE_REFRESH_REQUIRED', 508);
 // define('RESPONSE_COMMAND_FAILED', 509);
 // define('RESPONSE_COMMAND_FAILED', 510);
 // define('RESPONSE_COMMAND_FAILED', 511);
@@ -117,12 +135,15 @@ define('RESPONSE_COMMAND_FAILED', 500);
 // define('RESPONSE_COMMAND_FAILED', 515);
 define('RESPONSE_ATOMIC_ROLL_BACK_FAILED', 516);
 
-define('NAME_SPACE_URI_SYNCML', 'syncml:syncml1.0');
+define('NAME_SPACE_URI_SYNCML_1_0', 'syncml:syncml1.0');
 define('NAME_SPACE_URI_SYNCML_1_1', 'syncml:syncml1.1');
-define('NAME_SPACE_URI_METINF', 'syncml:metinf');
+define('NAME_SPACE_URI_SYNCML_1_2', 'syncml:syncml1.2');
+define('NAME_SPACE_URI_METINF_1_0', 'syncml:metinf1.0');
 define('NAME_SPACE_URI_METINF_1_1', 'syncml:metinf1.1');
-define('NAME_SPACE_URI_DEVINF', 'syncml:devinf');
+define('NAME_SPACE_URI_METINF_1_2', 'syncml:metinf1.2');
+define('NAME_SPACE_URI_DEVINF_1_0', 'syncml:devinf1.0');
 define('NAME_SPACE_URI_DEVINF_1_1', 'syncml:devinf1.1');
+define('NAME_SPACE_URI_DEVINF_1_2', 'syncml:devinf1.2');
 
 define('CLIENT_SYNC_STARTED',		1);
 define('CLIENT_SYNC_FINNISHED',		2);
@@ -131,8 +152,18 @@ define('SERVER_SYNC_DATA_PENDING',	4);
 define('SERVER_SYNC_FINNISHED',		5);
 define('SERVER_SYNC_ACKNOWLEDGED',	6);
 
+// conflict management
+define('CONFLICT_CLIENT_WINNING',		0);
+define('CONFLICT_SERVER_WINNING',		1);
+define('CONFLICT_MERGE_DATA',			2);
+define('CONFLICT_RESOLVED_WITH_DUPLICATE',	3);
+define('CONFLICT_CLIENT_CHANGES_IGNORED',	4);
+define('CONFLICT_CLIENT_REFRESH_ENFORCED',	5);
+
 define('MAX_DATA',			19);
-define('MAX_ENTRIES',			10);
+define('MAX_ENTRIES',			10); // default
+define('MAX_GUID_SIZE',			64);
+define('MIN_MSG_LEFT',		       200); // Overhead
 
 /**
  * The Horde_SyncML_State class provides a SyncML state object.
@@ -148,6 +179,7 @@ define('MAX_ENTRIES',			10);
  * @version $Revision$
  * @since   Horde 3.0
  * @package Horde_SyncML
+ * @modified Joerg Lehrke <jlehrke@noc.de> 2009/01/20, support all syn types
  */
 class Horde_SyncML_State {
 
@@ -157,6 +189,10 @@ class Horde_SyncML_State {
 
 	var $_msgID;
 
+	var $_maxMsgSize;
+
+	var $_maxGUIDSize;
+
 	var $_targetURI;
 
 	var $_sourceURI;
@@ -169,6 +205,8 @@ class Horde_SyncML_State {
 
 	var $_isAuthorized;
 
+	var $_AuthConfirmed;
+
 	var $_uri;
 
 	var $_uriMeta;
@@ -181,7 +219,7 @@ class Horde_SyncML_State {
 
 	var $_serverAnchorNext = array(); // written to db after successful sync
 
-	var $_clientDeviceInfo = array();
+	var $_clientDeviceInfo;
 
 	// array list of changed items, which need to be synced to the client
 	var $_changedItems;
@@ -192,8 +230,11 @@ class Horde_SyncML_State {
 	// array list of added items, which need to be synced to the client
 	var $_addedItems;
 
-	// bool flag that we need to more data
-	var $_syncStatus;
+	// array list of items, which need to be refreshed at the client
+	var $_conflictItems;
+
+	// current session status
+	var $_syncStatus = 0;
 
 	var $_log = array();
 
@@ -208,6 +249,22 @@ class Horde_SyncML_State {
 	 */
 	var $_uidMappings	= array();
 
+    /**
+     * Current sync element sent from client.
+     *
+     * Stored in state if one element is split into multiple message packets.
+     *
+     * @var SyncML_SyncElement
+     */
+    var $curSyncItem;
+
+    /**
+     * Number of sync elements sent to client within current message.
+     *
+     * @var _numberOfElements
+     */
+    var $_numberOfElements;
+
     /**
      * Creates a new instance of Horde_SyncML_State.
      */
@@ -220,7 +277,8 @@ class Horde_SyncML_State {
             $this->setPassword($password);
         }
 
-        $this->isAuthorized = false;
+        $this->_isAuthorized = false;
+        $this->_isAuthConfirmed = false;
     }
 
     /**
@@ -234,7 +292,7 @@ class Horde_SyncML_State {
      * retrieve the real egw uid for a given send uid
      */
     function getUIDMapping($_sentEgwUid) {
-    	if(isset($this->_uidMappings[$_sentEgwUid])) {
+    	if(strlen("$_sentEgwUid") && isset($this->_uidMappings[$_sentEgwUid])) {
     		return $this->_uidMappings[$_sentEgwUid];
 	}
 
@@ -311,6 +369,16 @@ class Horde_SyncML_State {
     	return false;
     }
 
+    function &getConflictItems($_type)
+    {
+    	if(isset($this->_conflictItems[$_type]))
+    	{
+    		return $this->_conflictItems[$_type];
+    	}
+
+    	return false;
+    }
+
     function getMoreDataPending()
     {
     	return $this->_moreDataPending;
@@ -321,6 +389,14 @@ class Horde_SyncML_State {
         return $this->_msgID;
     }
 
+    function getMaxMsgSizeClient()
+    {
+	if (isset($this->_maxMsgSize)) {
+        	return $this->_maxMsgSize;
+	}
+	return false;
+    }
+
     function setWBXML($wbxml)
     {
         $this->_wbxml = $wbxml;
@@ -341,6 +417,11 @@ class Horde_SyncML_State {
     	$this->_addedItems[$_type] = $_addedItems;
     }
 
+    function pushAddedItem($_type, $_addedItems)
+    {
+    	$this->_addedItems[$_type] = $_addedItems;
+    }
+
     function setChangedItems($_type, $_changedItems)
     {
     	$this->_changedItems[$_type] = $_changedItems;
@@ -356,9 +437,14 @@ class Horde_SyncML_State {
     	$this->_deletedItems[$_type] = $_deletedItems;
     }
 
-    function setMoreDataPending($_state)
+    function addConflictItem($_type, $_conflict)
     {
-    	$this->_moreDataPending = $_state;
+    	$this->_conflictItems[$_type][] = $_conflict;
+    }
+
+    function clearConflictItems($_type)
+    {
+    	$this->_conflictItems[$_type] = array();
     }
 
     /**
@@ -370,6 +456,15 @@ class Horde_SyncML_State {
         $this->_msgID = $msgID;
     }
 
+    /**
+     * Setter for property maxMsgSize.
+     * @param size New value of property maxMsgSize.
+     */
+    function setMaxMsgSize($size)
+    {
+        $this->_maxMsgSize = $size;
+    }
+
     /**
      * Setter for property locName.
      * @param locName New value of property locName.
@@ -408,15 +503,20 @@ class Horde_SyncML_State {
     {
         $this->_version = $version;
 
-        if ($version == 0) {
-            $this->_uri = NAME_SPACE_URI_SYNCML;
-            $this->_uriMeta = NAME_SPACE_URI_METINF;
-            $this->_uriDevInf = NAME_SPACE_URI_DEVINF;
-        } else {
+        if ($version == 2) {
+            $this->_uri = NAME_SPACE_URI_SYNCML_1_2;
+            $this->_uriMeta = NAME_SPACE_URI_METINF_1_2;
+            $this->_uriDevInf = NAME_SPACE_URI_DEVINF_1_2;
+        } elseif ($version == 1) {
             $this->_uri = NAME_SPACE_URI_SYNCML_1_1;
             $this->_uriMeta = NAME_SPACE_URI_METINF_1_1;
             $this->_uriDevInf = NAME_SPACE_URI_DEVINF_1_1;
-        }
+        } else {
+            $this->_uri = NAME_SPACE_URI_SYNCML_1_0;
+            $this->_uriMeta = NAME_SPACE_URI_METINF_1_0;
+            $this->_uriDevInf = NAME_SPACE_URI_DEVINF_1_0;
+	}
+
     }
 
     function setSessionID($sessionID)
@@ -457,6 +557,16 @@ class Horde_SyncML_State {
         return $this->_isAuthorized;
     }
 
+    function isAuthConfirmed()
+    {
+    	return $this->_AuthConfirmed;
+    }
+
+    function AuthConfirmed()
+    {
+    	$this->_AuthConfirmed = true;
+    }
+
     function clearSync($target)
     {
     	unset($this->_syncs[$target]);
@@ -486,6 +596,9 @@ class Horde_SyncML_State {
     		$targets[] = $target;
     	}
 
+    	// Make sure we keep the order
+    	sort($targets);
+
     	return $targets;
     }
 
@@ -502,6 +615,7 @@ class Horde_SyncML_State {
             return '';
         }
     }
+
     function getURIMeta()
     {
         return $this->_uriMeta;
@@ -548,8 +662,9 @@ class Horde_SyncML_State {
      * this->_locName . $this->_sourceURI . $type . $locid so you can
      * have different syncs with different devices.  If an entry
      * already exists, it is overwritten.
+     * Expired entries can be deleted at the next session start.
      */
-    function setUID($type, $locid, $guid, $ts=0)
+    function setUID($type, $locid, $guid, $ts=0, $expired=0)
     {
         $dt = &$this->getDataTree();
 
@@ -558,6 +673,7 @@ class Horde_SyncML_State {
         $gid->set('type', $type);
         $gid->set('locid', $locid);
         $gid->set('ts', $ts);
+        $gid->set('expired', $expired);
 
         $r = $dt->add($gid);
         if (is_a($r, 'PEAR_Error')) {
@@ -657,54 +773,41 @@ class Horde_SyncML_State {
 	*/
 	function adjustContentType($type, $target = null)
 	{
-		$ctype;
-		if (is_array($type))
-		{
+		if (is_array($type)) {
 			$ctype = $type['ContentType'];
 			$res = $type;
-		}
-		else
-		{
+		} else {
 			$ctype = $type;
 			$res = array();
 			$res['ContentType'] = $ctype;
 		}
 
-        $deviceInfo = $this->getClientDeviceInfo();
+		$deviceInfo = $this->getClientDeviceInfo();
+		$manufacturer = isset($deviceInfo['manufacturer']) ? strtolower($deviceInfo['manufacturer']) : 'unknown';
+		switch ($manufacturer) {
+			case 'funambol':
+				switch (strtolower($deviceInfo['model'])) {
+					case 'thunderbird':
+					case 'mozilla plugin':
+						$res['mayFragment'] = 1;
+						break;
+					default:
+						if (isset($deviceInfo['softwareVersion'])
+							&& $deviceInfo['softwareVersion'] < 4.0) {
+							$res['mayFragment'] = 0;
+						} else {
+							$res['mayFragment'] = 1;
+						}
+						break;
+				}
+				break;
+			default:
+				$res['mayFragment'] = 1;
+				break;
+		}
 
-        if (isset($deviceInfo['manufacturer']))
-        {
-            switch (strtolower($deviceInfo['manufacturer']))
-            {
-                case 'funambol':
-                    if (strtolower($deviceInfo['model']) == 'thunderbird')
-                    {
-                        $res['mayFragment'] = 1;
-                    }
-
-                    if (isset($deviceInfo['softwareVersion'])
-                        && $deviceInfo['softwareVersion']{0} == '3')
-                    {
-						// anything beyond 6.0 supports fragmentation
-                        $res['mayFragment'] = 0;
-                    }
-                    else
-                    {
-                        $res['mayFragment'] = 1;
-                    }
-                    break;
-            }
-        }
-
-        if (!isset($res['mayFragment']))
-        {
-            $res['mayFragment'] = 1;
-        }
-
-
-		// the funambol specific types need to be encoded in base 64
-		switch(strtolower($ctype))
-		{
+		// the funambol specific types need to be encoded in base64
+		switch (strtolower($ctype)) {
 			case 'text/x-s4j-sifc':
 			case 'text/x-s4j-sife':
 			case 'text/x-s4j-sift':
@@ -712,17 +815,15 @@ class Horde_SyncML_State {
 				$res['ContentFormat'] = 'b64';
 				break;
 		}
-
 		return $res;
 	}
 
 	function getPreferedContentType($type)
 	{
 		$_type = str_replace('./','',$type);
-		switch(strtolower($_type))
-		{
+		switch (strtolower($_type)) {
 			case 'contacts':
-				return 'text/x-vcard';
+				return 'text/vcard';
 				break;
 
 			case 'notes':
@@ -730,9 +831,10 @@ class Horde_SyncML_State {
 				break;
 
 			case 'calendar':
+			case 'events':
 			case 'tasks':
 			case 'caltasks':
-				return 'text/x-vcalendar';
+				return 'text/calendar';
 				break;
 
 			case 'sifcalendar':
@@ -778,6 +880,7 @@ class Horde_SyncML_State {
 				return 'tasks';
 				break;
 
+			case 'events':
 			case 'calendar':
 				return 'calendar';
 				break;
@@ -815,7 +918,6 @@ class Horde_SyncML_State {
 		}
 	}
 
-	/**
 	/**
 	* Returns the preferred contenttype of the client for the given
 	* sync data type (database).
@@ -826,12 +928,33 @@ class Horde_SyncML_State {
 	function getPreferedContentTypeClient($_sourceLocURI, $_targetLocURI = null) {
 		$deviceInfo = $this->getClientDeviceInfo();
 
-		if(isset($deviceInfo['dataStore'][$_sourceLocURI]['rxPreference']['contentType']))
-		{
-			return $this->adjustContentType($deviceInfo['dataStore'][$_sourceLocURI]['rxPreference']['contentType'], $_targetLocURI);
+		if(isset($deviceInfo['dataStore'][$_sourceLocURI]['maxGUIDSize']['contentType'])) {
+			$this->_maxGUIDSize = $deviceInfo['dataStore'][$this->_sourceURI]['maxGUIDSize']['contentType'];
 		}
 
-		Horde::logMessage('SyncML: sourceLocURI ' . $_sourceLocURI .' not found', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		if(isset($deviceInfo['dataStore'][$_sourceLocURI]['rxPreference']['contentType']))
+		{
+			$ctype = $deviceInfo['dataStore'][$_sourceLocURI]['rxPreference']['contentType'];
+			$cvers = $deviceInfo['dataStore'][$_sourceLocURI]['rxPreference']['contentVersion'];
+			$cfrmt = $deviceInfo['dataStore'][$_sourceLocURI]['rxPreference']['contentFormat'];
+			$cprops = $deviceInfo['dataStore'][$_sourceLocURI]['properties'][$ctype][$cvers];
+			if (isset($deviceInfo['dataStore'][$_sourceLocURI]['maxGUIDSize'])) {
+				// get UID properties from maxGUIDSize
+				$cprops['UID']['Size'] = $deviceInfo['dataStore'][$_sourceLocURI]['maxGUIDSize'];
+				$cprops['UID']['NoTruncate'] = true;
+			}
+			$clientPrefs = array(
+				'ContentType'	=>	$ctype,
+				'ContentFormat'	=>	$cfrmt,
+				'mayFragment'	=>	1,
+				'Properties'	=>	$cprops,
+				);
+			#Horde::logMessage('SyncML: sourceLocURI ' . $_sourceLocURI . " clientPrefs:\n"
+			#	. print_r($clientPrefs, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			return $this->adjustContentType($clientPrefs, $_targetLocURI);
+		}
+
+		Horde::logMessage('SyncML: sourceLocURI ' . $_sourceLocURI . " not found:\n" . print_r($deviceInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		if ($_targetLocURI != null)
 		{
@@ -841,6 +964,19 @@ class Horde_SyncML_State {
 		return PEAR::raiseError(_('sourceLocURI not found'));
 	}
 
+	/**
+	* Returns the MaxGUIDSize of the client
+	*/
+
+	function getMaxGUIDSizeClient() {
+		$maxGUIDSize = MAX_GUID_SIZE;
+
+		if (isset($this->_maxGUIDSize)) {
+			$maxGUIDSize = $this->_maxGUIDSize;
+		}
+		return $maxGUIDSize;
+	}
+
     function setClientAnchorNext($type, $a)
     {
         $this->_clientAnchorNext[$type] = $a;
@@ -900,6 +1036,11 @@ class Horde_SyncML_State {
      */
     function getClientDeviceInfo()
     {
+    	if (isset($this->_clientDeviceInfo) && is_array($this->_clientDeviceInfo)) {
+    		// use cached information
+    		return $this->_clientDeviceInfo;
+    	}
+
         $dt = &$this->getDataTree();
 
         $id = $dt->getId($this->_locName . $this->_sourceURI . 'deviceInfo');
@@ -907,7 +1048,7 @@ class Horde_SyncML_State {
             return false;
         }
 
-	$info = $dt->getObjectById($id);
+		$info = $dt->getObjectById($id);
 
         return $info->get('ClientDeviceInfo');
     }
@@ -1070,4 +1211,23 @@ class Horde_SyncML_State {
 		$this->_receivedAlert222 = (bool)$_status;
 	}
 
+	function incNumberOfElements() {
+		$this->_numberOfElements++;
+	}
+
+	function clearNumberOfElements() {
+		$this->_numberOfElements = 0;
+	}
+
+	function getNumberOfElements() {
+		if (isset($this->_numberOfElements)) {
+			return $this->_numberOfElements;
+		} else {
+			return false;
+		}
+	}
+
+	function maxNumberOfElements() {
+		unset($this->_numberOfElements);
+	}
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
index e1570c9409..0478bad56b 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
@@ -1,14 +1,18 @@
 <?php
 /**
- * eGroupWare SyncML
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
  *
  * @link http://www.egroupware.org
- * @author Lars Kneschke
- * @package syncml
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Lars Kneschke <lkneschke@egroupware.org>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @version $Id$
  */
-
 include_once dirname(__FILE__).'/State.php';
 
 /**
@@ -17,45 +21,42 @@ include_once dirname(__FILE__).'/State.php';
 class EGW_SyncML_State extends Horde_SyncML_State
 {
 	var $table_devinfo	= 'egw_syncmldevinfo';
-	
+
 	/*
 	 * store the mappings of egw uids to client uids
 	 */
 	var $uidMappings	= array();
 
-
-  /**
-		* get the local content id from a syncid
-		*
-		* @param sting $_syncid id used in syncml
-		* @return int local egw content id
-		*/
-	function get_egwID($_syncid)
-	{
+	/**
+	 * get the local content id from a syncid
+	 *
+	 * @param sting $_syncid id used in syncml
+	 * @return int local egw content id
+	 */
+	function get_egwID($_syncid) {
 		$syncIDParts = explode('-',$_syncid);
 		array_shift($syncIDParts);
 		$_id = implode ('', $syncIDParts);
 		return $_id;
-	}			
-  
-  /**
-   * when got a entry last added/modified/deleted
-   *
-   * @param $_syncid containing appName-contentid
-   * @param $_action string can be add, delete or modify 
-   * @return string the last timestamp
-   */
-	function getSyncTSforAction($_syncid, $_action)
-	{
+	}
+
+	/**
+	 * when got a entry last added/modified/deleted
+	 *
+	 * @param $_syncid containing appName-contentid
+	 * @param $_action string can be add, delete or modify
+	 * @return string the last timestamp
+	 */
+	function getSyncTSforAction($_syncid, $_action)	{
 		$syncIDParts = explode('-',$_syncid);
 		$_appName = array_shift($syncIDParts);
 		$_id = implode ('', $syncIDParts);
-		
+
 		$ts = $GLOBALS['egw']->contenthistory->getTSforAction($_appName, $_id, $_action);
-		
+
 		return $ts;
-	}			
-	
+	}
+
 	/**
 	 * get the timestamp for action
 	 *
@@ -63,57 +64,94 @@ 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 string $_ts timestamp where to start searching from
 	 * @return array containing syncIDs with changes
 	 */
-	function getHistory($_appName, $_action, $_ts)
-	{
+	function getHistory($_appName, $_action, $_ts) {
 		$guidList = array ();
 		$syncIdList = array ();
 		$idList = $GLOBALS['egw']->contenthistory->getHistory($_appName, $_action, $_ts);
 		foreach ($idList as $idItem)
 		{
-			$syncIdList[] = $_appName . '-' . $idItem;
+			if ($idItem) // ignore inconsistent entries
+			{
+				$syncIdList[] = $_appName . '-' . $idItem;
+			}
 		}
-    return $syncIdList;	
+		return $syncIdList;
 	}
-	
-    /**
-     * Returns the timestamp (if set) of the last change to the
-     * obj:guid, that was caused by the client. This is stored to
-     * avoid mirroring these changes back to the client.
-     */
-    function getChangeTS($type, $guid)
-    {
-    	$mapID = $this->_locName . $this->_sourceURI . $type;
-
-    	#Horde::logMessage('SyncML: getChangeTS for ' . $mapID .' / '. $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-
-    	if ($ts = $GLOBALS['egw']->db->select('egw_contentmap', 'map_timestamp', array(
-    		'map_id'	=> $mapID,
-    		'map_guid'	=> $guid,
-    	), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn())
-	    {
-    		#Horde::logMessage('SyncML: getChangeTS changets is ' . $GLOBALS['egw']->db->from_timestamp($ts), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			return $GLOBALS['egw']->db->from_timestamp($ts);
-	    }
-     	return false;
-    }
 
 	/**
-	* Retrieves information about the clients device info if any. Returns
-	* false if no info found or a DateTreeObject with at least the
-	* following attributes:
-	*
-	* a array containing all available infos about the device
-	*/
-	function getClientDeviceInfo()
-	{
-		if(($deviceID = $GLOBALS['egw']->db->select('egw_syncmldeviceowner', 'owner_devid',array (
-			'owner_locname'		=> $this->_locName,
-			'owner_deviceid'	=> $this->_sourceURI,
-		), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
+	 * Returns the timestamp (if set) of the last change to the
+	 * obj:guid, that was caused by the client. This is stored to
+	 * avoid mirroring these changes back to the client.
+	 */
+	function getChangeTS($type, $guid) {
+		$mapID = $this->_locName . $this->_sourceURI . $type;
+
+		#Horde::logMessage('SyncML: getChangeTS for ' . $mapID
+		#	. ' / '. $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		if ($ts = $GLOBALS['egw']->db->select('egw_contentmap', 'map_timestamp',
+			array(
+				'map_id'	=> $mapID,
+				'map_guid'	=> $guid,
+			), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()) {
+			#Horde::logMessage('SyncML: getChangeTS changets is '
+			#	. $GLOBALS['egw']->db->from_timestamp($ts),
+			#	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+			return $GLOBALS['egw']->db->from_timestamp($ts);
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the exceptions for a GUID which the client knows of
+	 */
+	function getGUIDExceptions($type, $guid) {
+		$mapID = $this->_locName . $this->_sourceURI . $type;
+
+		#Horde::logMessage('SyncML: getChangeTS for ' . $mapID
+		#	. ' / '. $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		$guid_exceptions = array();
+		$where = array ('map_id'	=> $mapID,);
+		$where[] = "map_guid LIKE '$guid" . ":%'";
+
+		// Fetch all exceptions which the client knows of
+		foreach ($GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', $where,
+			__LINE__,__FILE__, false, '', 'syncml') as $row)
 		{
+			$parts = preg_split('/:/', $row['map_guid']);
+			$Id = $parts[0];
+			$extension = $parts[1];
+			$guid_exceptions[$extension] = $row['map_guid'];
+		}
+		return $guid_exceptions;
+	}
+
+	/**
+	 * Retrieves information about the clients device info if any. Returns
+	 * false if no info found or a DateTreeObject with at least the
+	 * following attributes:
+	 *
+	 * a array containing all available infos about the device
+	 */
+	function getClientDeviceInfo() {
+		#Horde::logMessage("SyncML: getClientDeviceInfo " . $this->_locName
+		#	. ", " . $this->_sourceURI, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		if (isset($this->_clientDeviceInfo)
+				&& is_array($this->_clientDeviceInfo)) {
+			// use cached information
+			return $this->_clientDeviceInfo;
+		}
+
+		if (($deviceID = $GLOBALS['egw']->db->select('egw_syncmldeviceowner',
+			'owner_devid',
+			array (
+				'owner_locname'		=> $this->_locName,
+				'owner_deviceid'	=> $this->_sourceURI,
+			), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn())) {
 			$cols = array(
 				'dev_dtdversion',
 				'dev_numberofchanges',
@@ -129,156 +167,156 @@ class EGW_SyncML_State extends Horde_SyncML_State
 				'dev_utc',
 			);
 
+			#Horde::logMessage("SyncML: getClientDeviceInfo $deviceID", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 			$where = array(
-				'dev_id'	=> $deviceID,
+				'dev_id'		=> $deviceID,
 			);
 
-			if (($row = $GLOBALS['egw']->db->select('egw_syncmldevinfo', $cols, $where, __LINE__, __FILE__, false, '', 'syncml')->fetch()))
-			{
-				return array (
-					'DTDVersion'			=> $row['dev_dtdversion'],
-					'supportNumberOfChanges'=> $row['dev_numberofchanges'],
-					'supportLargeObjs'		=> $row['dev_largeobjs'],
-					'UTC'					=> $row['dev_utc'],
-					'softwareVersion'		=> $row['dev_swversion'],
-					'hardwareVersion'		=> $row['dev_hwversion'],
-					'firmwareVersion'		=> $row['dev_fwversion'],
-					'oem'					=> $row['dev_oem'],
-					'model'					=> $row['dev_model'],
-					'manufacturer'			=> $row['dev_manufacturer'],
-					'deviceType'			=> $row['dev_devicetype'],
-					'dataStore'				=> unserialize($row['dev_datastore']),
+			if (($row = $GLOBALS['egw']->db->select('egw_syncmldevinfo',
+				$cols, $where, __LINE__, __FILE__, false, '', 'syncml')->fetch())) {
+				$deviceMaxEntries = 'maxEntries-' . $this->_sourceURI;
+				$deviceUIDExtension = 'uidExtension-' . $this->_sourceURI;
+				$deviceNonBlockingAllday = 'nonBlockingAllday-' . $this->_sourceURI;
+				$syncml_prefs = $GLOBALS['egw_info']['user']['preferences']['syncml'];
+				$this->_clientDeviceInfo = array (
+					'DTDVersion'				=> $row['dev_dtdversion'],
+					'supportNumberOfChanges'	=> $row['dev_numberofchanges'],
+					'supportLargeObjs'			=> $row['dev_largeobjs'],
+					'UTC'						=> $row['dev_utc'],
+					'softwareVersion'			=> $row['dev_swversion'],
+					'hardwareVersion'			=> $row['dev_hwversion'],
+					'firmwareVersion'			=> $row['dev_fwversion'],
+					'oem'						=> $row['dev_oem'],
+					'model'						=> $row['dev_model'],
+					'manufacturer'				=> $row['dev_manufacturer'],
+					'deviceType'				=> $row['dev_devicetype'],
+					'maxMsgSize'				=> $this->_maxMsgSize,
+					'maxEntries'        		=> $syncml_prefs[$deviceMaxEntries],
+					'uidExtension'        		=> $syncml_prefs[$deviceUIDExtension],
+					'nonBlockingAllday'			=> $syncml_prefs[$deviceNonBlockingAllday],
+					'dataStore'					=> unserialize($row['dev_datastore']),
 				);
+				return $this->_clientDeviceInfo;
 			}
 		}
-
 		return false;
 	}
 
 	/**
- 	 * returns GUIDs of all client items
- 	 */
-	function _getClientItems($type)
-	{
-		$mapID = $this->_locName . $this->_sourceURI . $type;
+	 * returns GUIDs of all client items
+	 */
+	function getClientItems() {
+		$mapID = $this->_locName . $this->_sourceURI . $this->_targetURI;
 
-    	$guids = array();
-    	foreach($GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', array(
-    		'map_id'		=> $mapID,
-    		'map_expired'	=> 0,
-    	), __LINE__, __FILE__, false, '', 'syncml') as $row)
-    	{
-    		$guids[] = $row['map_guid'];
-    	}
-    	return $guids ? $guids : false;
+		$guids = array();
+		foreach($GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', array(
+			'map_id'		=> $mapID,
+			'map_expired'	=> false,
+		), __LINE__, __FILE__, false, '', 'syncml') as $row) {
+			$guids[] = $row['map_guid'];
+		}
+		return $guids ? $guids : false;
 	}
 
-    /**
-     * Retrieves the Horde server guid (like
-     * kronolith:0d1b415fc124d3427722e95f0e926b75) for a given client
-     * locid. Returns false if no such id is stored yet.
-     *
-     * Opposite of getLocId which returns the locid for a given guid.
-     */
-    function getGlobalUID($type, $locid)
-    {
-    	$mapID = $this->_locName . $this->_sourceURI . $type;
+	/**
+	 * Retrieves the Horde server guid (like
+	 * kronolith:0d1b415fc124d3427722e95f0e926b75) for a given client
+	 * locid. Returns false if no such id is stored yet.
+	 *
+	 * Opposite of getLocId which returns the locid for a given guid.
+	 */
+	function getGlobalUID($type, $locid) {
+		$mapID = $this->_locName . $this->_sourceURI . $type;
 
-    	#Horde::logMessage('SyncML: search GlobalUID for  ' . $mapID .' / '.$locid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		#Horde::logMessage('SyncML: search GlobalUID for  ' . $mapID .' / '.$locid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-     	return $GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', array(
-    		'map_id'		=> $mapID,
-    		'map_locuid'	=> $locid,
-    		'map_expired'	=> 0,
-    	), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn();
-    }
+		return $GLOBALS['egw']->db->select('egw_contentmap', 'map_guid',
+			array(
+				'map_id'		=> $mapID,
+				'map_locuid'	=> $locid,
+				'map_expired'	=> false,
+			), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn();
+	}
 
-    /**
-     * Converts a EGW GUID (like
-     * kronolith:0d1b415fc124d3427722e95f0e926b75) to a client ID as
-     * used by the sync client (like 12) returns false if no such id
-     * is stored yet.
-     */
-    function getLocID($type, $guid)
-    {
-    	$mapID = $this->_locName . $this->_sourceURI . $type;
+	/**
+	 * Converts a EGW GUID (like
+	 * kronolith:0d1b415fc124d3427722e95f0e926b75) to a client ID as
+	 * used by the sync client (like 12) returns false if no such id
+	 * is stored yet.
+	 */
+	function getLocID($type, $guid) {
+		$mapID = $this->_locName . $this->_sourceURI . $type;
 
-    	Horde::logMessage('SyncML: search LocID for  ' . $mapID .' / '.$guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		Horde::logMessage('SyncML: search LocID for ' . $mapID . ' / ' . $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-    	if (($locuid = $GLOBALS['egw']->db->select('egw_contentmap', 'map_locuid', array(
-    		'map_id'	=> $mapID,
-    		'map_guid'	=> $guid
-    	), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
-    	{
-	   		Horde::logMessage('SyncML: found LocID: '.$locuid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-    	}
-    	return $locuid;
-    }
+		if (($locuid = $GLOBALS['egw']->db->select('egw_contentmap', 'map_locuid', array(
+			'map_id'	=> $mapID,
+			'map_guid'	=> $guid
+		), __LINE__, __FILE__, false, '', 'syncml')->fetchColumn())) {
+			Horde::logMessage('SyncML: found LocID: '.$locuid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		}
+		return $locuid;
+	}
 
-    /**
-     * Retrieves information about the previous sync if any. Returns
-     * false if no info found or a DateTreeObject with at least the
-     * following attributes:
-     *
-     * ClientAnchor: the clients Next Anchor of the previous sync.
-     * ServerAnchor: the Server Next Anchor of the previous sync.
-     */
-    function getSyncSummary($type)
-    {
+	/**
+	 * Retrieves information about the previous sync if any. Returns
+	 * false if no info found or a DateTreeObject with at least the
+	 * following attributes:
+	 *
+	 * ClientAnchor: the clients Next Anchor of the previous sync.
+	 * ServerAnchor: the Server Next Anchor of the previous sync.
+	 */
+	function getSyncSummary($type) {
 		$deviceID = $this->_locName . $this->_sourceURI;
 
-		#Horde::logMessage("SyncML: get SYNCSummary for $deviceID", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		Horde::logMessage("SyncML: getSyncSummary for $deviceID", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-    	if (($row = $GLOBALS['egw']->db->select('egw_syncmlsummary', array('sync_serverts','sync_clientts'), array(
-    		'dev_id'	=> $deviceID,
-    		'sync_path'	=> $type
-    	), __LINE__, __FILE__, false, '', 'syncml')->fetch()))
-    	{
-			#Horde::logMessage("SyncML: get SYNCSummary for $deviceID serverts: ".$row['sync_serverts']."  clients: ".$row['sync_clientts'], __FILE__, __LINE__, PEAR_LOG_DEBUG);
-    		return array(
-    			'ClientAnchor'	=> $row['sync_clientts'],
-    			'ServerAnchor'	=> $row['sync_serverts'],
-    		);
-    	}
-    	return false;
-    }
+		if (($row = $GLOBALS['egw']->db->select('egw_syncmlsummary', array('sync_serverts','sync_clientts'), array(
+			'dev_id'	=> $deviceID,
+			'sync_path'	=> $type
+		), __LINE__, __FILE__, false, '', 'syncml')->fetch())) {
+			Horde::logMessage("SyncML: getSyncSummary for $deviceID serverts: ".$row['sync_serverts']."  clients: ".$row['sync_clientts'], __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			return array(
+				'ClientAnchor'	=> $row['sync_clientts'],
+				'ServerAnchor'	=> $row['sync_serverts'],
+			);
+		}
+		return false;
+	}
 
-	function isAuthorized()
-	{
-		if (!$this->_isAuthorized)
-		{
-			if(!isset($this->_locName) && !isset($this->_password))
-			{
+	function isAuthorized()	{
+		if (!$this->_isAuthorized) {
+			if(!isset($this->_locName) && !isset($this->_password)) {
 				Horde::logMessage('SyncML: Authentication not yet possible currently. Username and password not available' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				return FALSE;
 			}
 
-			if(!isset($this->_password))
-			{
+			if(!isset($this->_password)) {
 				Horde::logMessage('SyncML: Authentication not yet possible currently. Password not available' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				return FALSE;
 			}
 
-			if(strpos($this->_locName,'@') === False)
-			{
+			if(strpos($this->_locName,'@') === False) {
 				$this->_locName .= '@'.$GLOBALS['egw_info']['server']['default_domain'];
 			}
 
 			#Horde::logMessage('SyncML: authenticate with username: ' . $this->_locName . ' and password: ' . $this->_password, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-			if($GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($this->_locName,$this->_password,'text'))
-			{
-				$this->_isAuthorized = true;
-				Horde::logMessage('SyncML_EGW: Authentication of ' . $this->_locName . '/' . $GLOBALS['sessionid'] . ' succeded' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			}
-			else
-			{
+			if($GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($this->_locName,$this->_password,'text')) {
+
+				if ($GLOBALS['egw_info']['user']['apps']['syncml']) {
+					$this->_isAuthorized = true;
+					Horde::logMessage('SyncML_EGW: Authentication of ' . $this->_locName . '/' . $GLOBALS['sessionid'] . ' succeded' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				} else {
+					$this->_isAuthorized = false;
+					Horde::logMessage('SyncML is not enabled for this user', __FILE__, __LINE__, PEAR_LOG_ERROR);
+				}
+			} else {
 				$this->_isAuthorized = false;
 				Horde::logMessage('SyncML: Authentication of ' . $this->_locName . ' failed' , __FILE__, __LINE__, PEAR_LOG_INFO);
 			}
-		}
-		else
-		{
+		} else {
 			// store sessionID in a variable, because ->verify maybe resets that value
 			$sessionID = session_id();
 			if(!$GLOBALS['egw']->session->verify($sessionID, 'staticsyncmlkp3')) {
@@ -290,11 +328,10 @@ class EGW_SyncML_State extends Horde_SyncML_State
 	}
 
 	/**
-	* Removes all locid<->guid mappings for the given type.
-	* Returns always true.
-	*/
-	function removeAllUID($type)
-	{
+	 * Removes all locid<->guid mappings for the given type.
+	 * Returns always true.
+	 */
+	function removeAllUID($type) {
 		$mapID = $this->_locName . $this->_sourceURI . $type;
 
 		Horde::logMessage("SyncML: state->removeAllUID(type=$type)", __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -302,17 +339,16 @@ class EGW_SyncML_State extends Horde_SyncML_State
 		$GLOBALS['egw']->db->delete('egw_contentmap', array('map_id' => $mapID), __LINE__, __FILE__, 'syncml');
 
 		return true;
-	} 
-	
+	}
+
 	/**
-	* Used in SlowSync
-	* Removes all locid<->guid mappings for the given type,
-	* that are older than $ts. 
-	* 
-	* Returns always true.
-	*/
-	function removeOldUID($type, $ts)
-	{
+	 * Used in SlowSync
+	 * Removes all locid<->guid mappings for the given type,
+	 * that are older than $ts.
+	 *
+	 * Returns always true.
+	 */
+	function removeOldUID($type, $ts) {
 		$mapID = $this->_locName . $this->_sourceURI . $type;
 		$where[] = "map_id = '".$mapID."' AND map_timestamp < '".$GLOBALS['egw']->db->to_timestamp($ts)."'";
 
@@ -324,102 +360,151 @@ class EGW_SyncML_State extends Horde_SyncML_State
 	}
 
 	/**
-	* Removes the locid<->guid mapping for the given locid. Returns
-	* the guid that was removed or false if no mapping entry was
-	* found.
-	*/
-	function removeUID($type, $locid)
-	{
+	 * Used at session end to cleanup expired entries
+	 * Removes all locid<->guid mappings for the given type,
+	 * that are marked as expired and older than $ts.
+	 *
+	 * Returns always true.
+	 */
+	function removeExpiredUID($type, $ts) {
 		$mapID = $this->_locName . $this->_sourceURI . $type;
-		
+		$where['map_id'] = $mapID;
+		$where['map_expired'] = true;
+		$where[] = "map_timestamp <= '".$GLOBALS['egw']->db->to_timestamp($ts)."'";
+
+		Horde::logMessage("SyncML: state->removeExpiredUID(type=$type)",
+			__FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		$GLOBALS['egw']->db->delete('egw_contentmap', $where,
+			__LINE__, __FILE__, 'syncml');
+
+		return true;
+	}
+
+	/**
+	 * Check if an entry is already expired
+	 *
+	 * Returns true for expired mappings.
+	 */
+	function isExpiredUID($type, $locid) {
+		$mapID = $this->_locName . $this->_sourceURI . $type;
+		$expired = false;
+		$where = array(
+			'map_id'	=> $mapID,
+			'map_locuid'	=> $locid,
+		);
+		if (($expired = $GLOBALS['egw']->db->select('egw_contentmap', 'map_expired',
+			$where, __LINE__, __FILE__, false, '', 'syncml')->fetchColumn())) {
+			Horde::logMessage('SyncML: found LocID: '. $locid,
+				__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		}
+		return $expired;
+	}
+
+	/**
+	 * Removes the locid<->guid mapping for the given locid. Returns
+	 * the guid that was removed or false if no mapping entry was
+	 * found.
+	 */
+	function removeUID($type, $locid) {
+		$mapID = $this->_locName . $this->_sourceURI . $type;
+
 		$where = array (
 			'map_id'	=> $mapID,
 			'map_locuid'	=> $locid
 		);
 
-		if (!($guid = $GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', $where, __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
-		{
-			Horde::logMessage("SyncML: state->removeUID(type=$type,locid=$locid) : nothing to remove", __FILE__, __LINE__, PEAR_LOG_INFO);
+		if (!($guid = $GLOBALS['egw']->db->select('egw_contentmap', 'map_guid', $where,
+			__LINE__, __FILE__, false, '', 'syncml')->fetchColumn())) {
+			Horde::logMessage("SyncML: state->removeUID(type=$type,locid=$locid)"
+				. " nothing to remove", __FILE__, __LINE__, PEAR_LOG_INFO);
 			return false;
 		}
 
-		Horde::logMessage("SyncML:  state->removeUID(type=$type,locid=$locid) : removing guid:$guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-    
+		Horde::logMessage("SyncML:  state->removeUID(type=$type,locid=$locid): "
+			. "removing guid $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 		$GLOBALS['egw']->db->delete('egw_contentmap', $where, __LINE__, __FILE__, 'syncml');
 
 		return $guid;
 	}
 
-    /**
-     * Puts a given client $locid and Horde server $guid pair into the
-     * map table to allow mapping between the client's and server's
-     * IDs.  Actually there are two maps: from the localid to the guid
-     * and vice versa.  The localid is converted to a key as follows:
-     * this->_locName . $this->_sourceURI . $type . $locid so you can
-     * have different syncs with different devices.  If an entry
-     * already exists, it is overwritten.
-     */
-    function setUID($type, $locid, $_guid, $ts=0)
-    {
-    	#Horde::logMessage("SyncML: setUID $type, $locid, $guid, $ts ", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-    	#Horde::logMessage("SyncML: setUID ". $this->getUIDMapping($guid), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-    	
-    	// problem: entries created from client, come here with the (long) server guid,
-    	// but getUIDMapping does not know them and can not map server-guid <--> client guid
-    	$guid = $this->getUIDMapping($_guid);
-    	if($guid === false)
-    	{
-    	    // this message is not really usefull here because setUIDMapping is only called when adding content to the client,
-    	    // however setUID is called also when adding content from the client. So in all other conditions this 
-    	    // message will be logged. 
-    	    Horde::logMessage("SyncML: setUID $type, $locid, $guid something went wrong!!! Mapping not found.", __FILE__, __LINE__, PEAR_LOG_INFO);
-    	    $guid = $_guid;
-    	    //return false;
-    	}
-    	Horde::logMessage("SyncML: setUID $_guid => $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+	/**
+	 * Puts a given client $locid and Horde server $guid pair into the
+	 * map table to allow mapping between the client's and server's
+	 * IDs.  Actually there are two maps: from the localid to the guid
+	 * and vice versa.  The localid is converted to a key as follows:
+	 * this->_locName . $this->_sourceURI . $type . $locid so you can
+	 * have different syncs with different devices.  If an entry
+	 * already exists, it is overwritten.
+	 * Expired entries can be deleted at the next session start.
+	 */
+	function setUID($type, $locid, $_guid, $ts=0, $expired=false) {
+		#Horde::logMessage("SyncML: setUID $type, $locid, $_guid, $ts ", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-    	if(!$ts) $ts = time();
+		if (!strlen("$_guid")) {
+			// We can't handle this case otherwise
+			return;
+		}
 
-		Horde::logMessage("SyncML: setUID $type, $locid, $guid, $ts ", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		// problem: entries created from client, come here with the (long) server guid,
+		// but getUIDMapping does not know them and can not map server-guid <--> client guid
+		$guid = $this->getUIDMapping($_guid);
+		if($guid === false)	{
+			// this message is not really usefull here because setUIDMapping is only called when adding content to the client,
+			// however setUID is called also when adding content from the client. So in all other conditions this
+			// message will be logged.
+			//Horde::logMessage("SyncML: setUID $type, $locid, $guid something went wrong!!! Mapping not found.", __FILE__, __LINE__, PEAR_LOG_INFO);
+			$guid = $_guid;
+			//return false;
+		}
+		#Horde::logMessage("SyncML: setUID $_guid => $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-    	$mapID = $this->_locName . $this->_sourceURI . $type;
+		if(!$ts) $ts = time();
 
-    	// delete all client id's
-    	$where = array(
-    		'map_id'	=> $mapID,
-    		'map_locuid'	=> $locid,
-    	);
-    	$GLOBALS['egw']->db->delete('egw_contentmap', $where, __LINE__, __FILE__, 'syncml');
+		Horde::logMessage("SyncML: setUID $type, $locid, $guid, $ts ",
+			__FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-    	// delete all egw id's
-    	$where = array(
-    		'map_id'	=> $mapID,
-    		'map_guid'	=> $guid,
-    	);
-    	$GLOBALS['egw']->db->delete('egw_contentmap', $where, __LINE__, __FILE__, 'syncml');
+		$mapID = $this->_locName . $this->_sourceURI . $type;
 
-    	$data = $where + array(
-    		'map_locuid'	=> $locid,
-    		'map_timestamp'	=> $ts,
-    		'map_expired'	=> 0,
-    	);
-    	$GLOBALS['egw']->db->insert('egw_contentmap', $data, $where, __LINE__, __FILE__, 'syncml');
+		// expire all client id's
+		$where = array(
+			'map_id'	=> $mapID,
+			'map_locuid'	=> $locid,
+		);
+		$data = array (
+			'map_expired'	=> true,
+		);
+		$GLOBALS['egw']->db->delete('egw_contentmap', $where,
+			__LINE__, __FILE__, 'syncml');
 
-		#Horde::logMessage("SyncML: setUID $type, $locid, $guid, $ts $mapID", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-    }
+		// delete all egw id's
+		$where = array(
+			'map_id'	=> $mapID,
+			'map_guid'	=> $guid,
+		);
+		$GLOBALS['egw']->db->delete('egw_contentmap', $where,
+			__LINE__, __FILE__, 'syncml');
+
+		$data = $where + array(
+			'map_locuid'	=> $locid,
+			'map_timestamp'	=> $ts,
+			'map_expired'	=> ($expired ? true : false),
+		);
+		$GLOBALS['egw']->db->insert('egw_contentmap', $data, $where,
+			__LINE__, __FILE__, 'syncml');
+	}
 
 	/**
-	* writes clients deviceinfo into database
-	*/
-	function writeClientDeviceInfo()
-	{
-		if (!isset($this->_clientDeviceInfo) || !is_array($this->_clientDeviceInfo))
-		{
+	 * writes clients deviceinfo into database
+	 */
+	function writeClientDeviceInfo() {
+		if (!isset($this->_clientDeviceInfo)
+				|| !is_array($this->_clientDeviceInfo)) {
 			return false;
 		}
 
-		if(!isset($this->size_dev_hwversion))
-		{
+		if(!isset($this->size_dev_hwversion)) {
 			$tableDefDevInfo = $GLOBALS['egw']->db->get_table_definitions('syncml',$this->table_devinfo);
 			$this->size_dev_hwversion = $tableDefDevInfo['fd']['dev_hwversion']['precision'];
 			unset($tableDefDevInfo);
@@ -437,77 +522,89 @@ class EGW_SyncML_State extends Horde_SyncML_State
 			'dev_fwversion'		=> $firmwareVersion,
 		);
 
-		if (($deviceID = $GLOBALS['egw']->db->select('egw_syncmldevinfo', 'dev_id', $where, __LINE__, __FILE__, false, '', 'syncml')->fetchColumn()))
-		{
+		if (($deviceID = $GLOBALS['egw']->db->select('egw_syncmldevinfo', 'dev_id', $where,
+			__LINE__, __FILE__, false, '', 'syncml')->fetchColumn())) {
 			$data = array (
 				'dev_datastore'		=> serialize($this->_clientDeviceInfo['dataStore']),
 			);
-			$GLOBALS['egw']->db->update('egw_syncmldevinfo', $data, $where, __LINE__, __FILE__, 'syncml');
-		}
-		else
-		{
+			$GLOBALS['egw']->db->update('egw_syncmldevinfo', $data, $where,
+				__LINE__, __FILE__, 'syncml');
+		} else {
 			$data = array (
-				'dev_dtdversion' 	=> $this->_clientDeviceInfo['DTDVersion'],
-				'dev_numberofchanges'	=> $this->_clientDeviceInfo['supportNumberOfChanges'] ? true : false,
-				'dev_largeobjs'		=> $this->_clientDeviceInfo['supportLargeObjs'] ? true : false,
-				'dev_utc'		=> $this->_clientDeviceInfo['UTC'] ? true : false,
-				'dev_swversion'		=> $softwareVersion,
-				'dev_hwversion'		=> $hardwareVersion,
-				'dev_fwversion'		=> $firmwareVersion,
-				'dev_oem'		=> $this->_clientDeviceInfo['oem'],
-				'dev_model'		=> $this->_clientDeviceInfo['model'],
-				'dev_manufacturer'	=> $this->_clientDeviceInfo['manufacturer'],
-				'dev_devicetype'	=> $this->_clientDeviceInfo['deviceType'],
-				'dev_datastore'		=> serialize($this->_clientDeviceInfo['dataStore']),
+				'dev_dtdversion' 		=> $this->_clientDeviceInfo['DTDVersion'],
+				'dev_numberofchanges'	=> ($this->_clientDeviceInfo['supportNumberOfChanges'] ? true : false),
+				'dev_largeobjs'			=> ($this->_clientDeviceInfo['supportLargeObjs'] ? true : false),
+				'dev_utc'				=> ($this->_clientDeviceInfo['UTC'] ? true : false),
+				'dev_swversion'			=> $softwareVersion,
+				'dev_hwversion'			=> $hardwareVersion,
+				'dev_fwversion'			=> $firmwareVersion,
+				'dev_oem'				=> $this->_clientDeviceInfo['oem'],
+				'dev_model'				=> $this->_clientDeviceInfo['model'],
+				'dev_manufacturer'		=> $this->_clientDeviceInfo['manufacturer'],
+				'dev_devicetype'		=> $this->_clientDeviceInfo['deviceType'],
+				'dev_datastore'			=> serialize($this->_clientDeviceInfo['dataStore']),
 			);
 			$GLOBALS['egw']->db->insert('egw_syncmldevinfo', $data, $where, __LINE__, __FILE__, 'syncml');
 
 			$deviceID = $GLOBALS['egw']->db->get_last_insert_id('egw_syncmldevinfo', 'dev_id');
 		}
 
-		$data = array (
-			'owner_locname'		=> $this->_locName,
-			'owner_deviceid'	=> $this->_sourceURI,
-			'owner_devid'		=> $deviceID,
-		);
 		$where = array (
 			'owner_locname'		=> $this->_locName,
 			'owner_deviceid'	=> $this->_sourceURI,
 		);
-		$GLOBALS['egw']->db->insert('egw_syncmldeviceowner', $data, $where, __LINE__, __FILE__, 'syncml');
+
+		if ($GLOBALS['egw']->db->select('egw_syncmldeviceowner', 'owner_devid', $where,
+			__LINE__, __FILE__, false, '', 'syncml')->fetchColumn()) {
+			$data = array (
+				'owner_devid'		=> $deviceID,
+			);
+			$GLOBALS['egw']->db->update('egw_syncmldeviceowner', $data, $where,
+				__LINE__, __FILE__, 'syncml');
+		} else {
+			$data = array (
+				'owner_locname'		=> $this->_locName,
+				'owner_deviceid'	=> $this->_sourceURI,
+				'owner_devid'		=> $deviceID,
+			);
+			$GLOBALS['egw']->db->insert('egw_syncmldeviceowner', $data, $where,
+				__LINE__, __FILE__, 'syncml');
+		}
 	}
 
-    /**
-     * After a successful sync, the client and server's Next Anchors
-     * are written to the database so they can be used to negotiate
-     * upcoming syncs.
-     */
-    function writeSyncSummary()
-    {
-    	#parent::writeSyncSummary();
+	/**
+	 * After a successful sync, the client and server's Next Anchors
+	 * are written to the database so they can be used to negotiate
+	 * upcoming syncs.
+	 */
+	function writeSyncSummary() {
+		#parent::writeSyncSummary();
 
-        if (!isset($this->_serverAnchorNext) || !is_array($this->_serverAnchorNext))
-        {
-            return;
-        }
+		if (!isset($this->_serverAnchorNext)
+				|| !is_array($this->_serverAnchorNext)) {
+			return;
+		}
 
-        $deviceID = $this->_locName . $this->_sourceURI;
+		$deviceID = $this->_locName . $this->_sourceURI;
 
-        foreach((array)$this->_serverAnchorNext as $type => $a)
-        {
-			Horde::logMessage("SyncML: write SYNCSummary for $deviceID $type serverts: $a clients: ".$this->_clientAnchorNext[$type], __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		foreach((array)$this->_serverAnchorNext as $type => $a) {
+			Horde::logMessage("SyncML: write SYNCSummary for $deviceID "
+				. "$type serverts: $a clients: "
+				. $this->_clientAnchorNext[$type],
+				__FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-        	$where = array(
-        		'dev_id'	=> $deviceID,
-        		'sync_path'	=> $type,
-        	);
+			$where = array(
+				'dev_id'	=> $deviceID,
+				'sync_path'	=> $type,
+			);
 
-        	$data  = array(
-        		'sync_serverts' => $a,
-        		'sync_clientts' => $this->_clientAnchorNext[$type]
-        	);
+			$data  = array(
+				'sync_serverts' => $a,
+				'sync_clientts' => $this->_clientAnchorNext[$type]
+			);
 
-        	$GLOBALS['egw']->db->insert('egw_syncmlsummary', $data, $where, __LINE__, __FILE__, 'syncml');
-        }
-    }
+			$GLOBALS['egw']->db->insert('egw_syncmlsummary', $data, $where,
+				__LINE__, __FILE__, 'syncml');
+		}
+	}
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
index 184cb2761d..51609c6864 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
@@ -1,230 +1,466 @@
 <?php
 /**
- * $Horde: framework/SyncML/SyncML/Sync.php,v 1.7 2004/09/14 04:27:05 chuck Exp $
+ * eGroupWare - SyncML based on Horde 3
  *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ * Using the PEAR Log class (which need to be installed!)
  *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
+
 class Horde_SyncML_Sync {
 
-    /**
-     * Target, either contacts, notes, events,
-     */
-    var $_targetLocURI;
+	/**
+	 * Target, either contacts, notes, events,
+	 */
+	var $_targetLocURI;
 
-    var $_sourceLocURI;
+	var $_sourceLocURI;
 
-    /**
-     * Return if all commands success.
-     */
-    var $globalSuccess;
-
-    /**
-     * This is the content type to use to export data.
-     */
-    var $preferedContentType;
-
-    /**
-     * Do have the sync data loaded from the database already?
-     */
-    var $syncDataLoaded;
-
-    function &factory($alert)
-    {
-    	Horde::logMessage('SyncML: new sync for alerttype ' . $alert, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-        switch ($alert) {
-        case ALERT_TWO_WAY:
-            include_once 'Horde/SyncML/Sync/TwoWaySync.php';
-            return $sync = new Horde_SyncML_Sync_TwoWaySync();
-
-        case ALERT_SLOW_SYNC:
-            include_once 'Horde/SyncML/Sync/SlowSync.php';
-            return $sync = new Horde_SyncML_Sync_SlowSync();
-
-        case ALERT_ONE_WAY_FROM_CLIENT:
-            include_once 'Horde/SyncML/Sync/OneWayFromClientSync.php';
-            return $sync = new Horde_SyncML_Sync_OneWayFromClientSync();
-
-        case ALERT_REFRESH_FROM_CLIENT:
-            include_once 'Horde/SyncML/Sync/RefreshFromClientSync.php';
-            return $sync = new Horde_SyncML_Sync_RefreshFromClientSync();
-
-        case ALERT_ONE_WAY_FROM_SERVER:
-            include_once 'Horde/SyncML/Sync/OneWayFromServerSync.php';
-            return $sync = new Horde_SyncML_Sync_OneWayFromServerSync();
-
-        case ALERT_REFRESH_FROM_SERVER:
-            include_once 'Horde/SyncML/Sync/RefreshFromServerSync.php';
-            return $sync = new Horde_SyncML_Sync_RefreshFromServerSync();
-        }
-
-        require_once 'PEAR.php';
-        return PEAR::raiseError('Alert ' . $alert . ' not found.');
-    }
-
-    function nextSyncCommand($currentCmdID, &$syncCommand, &$output)
-    {
-        $result = $this->runSyncCommand($syncCommand);
-        return $syncCommand->output($currentCmdID, $output);
-    }
-
-    function startSync($currentCmdID, &$output)
-    {
-        return $currentCmdID;
-    }
-
-    function endSync($currentCmdID, &$output)
-    {
-        return $currentCmdID;
-    }
+	var $_locName;
 
 	/**
-	* Here's where the actual processing of a client-sent Sync
-	* Command takes place. Entries are added, deleted or replaced
-	* from the server database by using Horde API (Registry) calls.
-	*/
+	 * The synchronization method, one of the ALERT_* constants.
+	 *
+	 * @var integer
+	 */
+	var $_syncType;
+
+	/**
+	 * Return if all commands success.
+	 */
+	var $globalSuccess;
+
+	/**
+	 * This is the content type to use to export data.
+	 */
+	var $preferedContentType;
+
+	/**
+     * Optional filter expression for this content.
+     *
+     * @var string
+     */
+    var $_filterExpression = '';
+
+
+
+	/**
+	 * Do have the sync data loaded from the database already?
+	 */
+	var $syncDataLoaded;
+
+	function &factory($alert) {
+		Horde::logMessage('SyncML: new sync for alerttype ' . $alert, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		switch ($alert) {
+			case ALERT_TWO_WAY:
+				include_once 'Horde/SyncML/Sync/TwoWaySync.php';
+				return $sync = new Horde_SyncML_Sync_TwoWaySync();
+
+			case ALERT_SLOW_SYNC:
+				include_once 'Horde/SyncML/Sync/SlowSync.php';
+				return $sync = new Horde_SyncML_Sync_SlowSync();
+
+			case ALERT_ONE_WAY_FROM_CLIENT:
+				include_once 'Horde/SyncML/Sync/OneWayFromClientSync.php';
+				return $sync = new Horde_SyncML_Sync_OneWayFromClientSync();
+
+			case ALERT_REFRESH_FROM_CLIENT:
+				include_once 'Horde/SyncML/Sync/RefreshFromClientSync.php';
+				return $sync = new Horde_SyncML_Sync_RefreshFromClientSync();
+
+			case ALERT_ONE_WAY_FROM_SERVER:
+				include_once 'Horde/SyncML/Sync/OneWayFromServerSync.php';
+				return $sync = new Horde_SyncML_Sync_OneWayFromServerSync();
+
+			case ALERT_REFRESH_FROM_SERVER:
+				include_once 'Horde/SyncML/Sync/RefreshFromServerSync.php';
+				return $sync = new Horde_SyncML_Sync_RefreshFromServerSync();
+		}
+
+		require_once 'PEAR.php';
+		return PEAR::raiseError('Alert ' . $alert . ' not found.');
+	}
+
+	function nextSyncCommand($currentCmdID, &$syncCommand, &$output) {
+		$result = $this->runSyncCommand($syncCommand);
+		return $syncCommand->output($currentCmdID, $output);
+	}
+
+	function startSync($currentCmdID, &$output) {
+		return $currentCmdID;
+	}
+
+	function endSync($currentCmdID, &$output) {
+		return $currentCmdID;
+	}
+
+	/**
+	 * Setter for property sourceURI.
+	 *
+	 * @param string $sourceURI  New value of property sourceLocURI.
+	 */
+	function setSourceLocURI($sourceURI) {
+		$this->_sourceLocURI = $sourceURI;
+	}
+
+	/**
+	 * Setter for property targetURI.
+	 *
+	 * @param string $targetURI  New value of property targetLocURI.
+	 */
+	function setTargetLocURI($targetURI) {
+		$this->_targetLocURI = $targetURI;
+	}
+
+	/**
+	 * Setter for property syncType.
+	 *
+	 * @param integer $syncType  New value of property syncType.
+	 */
+	function setSyncType($syncType)	{
+		$this->_syncType = $syncType;
+	}
+
+	/**
+	 * Setter for property locName.
+	 *
+	 * @param string $locName  New value of property locName.
+	 */
+	function setLocName($locName) {
+		$this->_locName = $locName;
+	}
+
+	/**
+	 * Setter for property filterExpression.
+	 *
+	 * @param string $expression  New value of property filterExpression.
+	 */
+	function setFilterExpression($expression) {
+		$this->_filterExpression = $expression;
+	}
+
+	/**
+	 * Here's where the actual processing of a client-sent Sync
+	 * Command takes place. Entries are added, deleted or replaced
+	 * from the server database by using Horde API (Registry) calls.
+	 */
 	function runSyncCommand(&$command) {
-		#Horde::logMessage('SyncML: content type is ' . $command->getContentType() .' moreData '. $command->_moreData, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 		global $registry;
-		
 		$history = $GLOBALS['egw']->contenthistory;
-		
 		$state = &$_SESSION['SyncML.state'];
-		
-		if(isset($state->_moreData['luid'])) {
-			if(($command->_luid == $state->_moreData['luid'])) {
-                                Horde::logMessage('SyncML: got next moreData chunk '.$command->getContent(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				$lastChunks = implode('',$state->_moreData['chunks']);
-				$command->_content = $lastChunks.$command->_content;
-				$stringlen1 =  strlen($lastChunks);
-				$stringlen2 =  strlen($command->_content);
-				
-				if(!$command->_moreData && strlen($command->_content) != $state->_moreData['contentSize']) {
-					$command->_status = RESPONSE_SIZE_MISMATCH;
-					$state->_moreData = array();
-					
-					return;
-				} elseif(!$command->_moreData && strlen($command->_content) == $state->_moreData['contentSize']) {
-					$state->_moreData = array();
-					Horde::logMessage('SyncML: chunk ended successful type is ' . $command->getContentType() .' content is '. $command->getContent(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				}
-			} else {
-				// alert 223 needed too
-				#$command->_status = ALERT_NO_END_OF_DATA;
-				
-				$state->_moreData = array();
-				
-				return;
+
+		if ($command->hasMoreData()) {
+			Horde::logMessage('SyncML: moreData: TRUE', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			$command->setStatus(RESPONSE_CHUNKED_ITEM_ACCEPTED_AND_BUFFERED);
+			return true;
+		}
+
+		$type = $this->_targetLocURI;
+
+		$syncml_prefs = $GLOBALS['egw_info']['user']['preferences']['syncml'];
+		if (isset($syncml_prefs[$type])) {
+			$sync_conflicts = $syncml_prefs[$type];
+		} else {
+			$sync_conflicts = CONFLICT_SERVER_WINNING;
+		}
+
+		$state->setLocName($this->_locName);
+		$locName = $state->getLocName();
+		$sourceURI = $state->getSourceURI();
+		$hordeType = $state->getHordeType($type);
+		$refts = $state->getServerAnchorLast($type);
+		$state->setTargetURI($type);
+		$changes = array();
+		// First we get all changes done after the previous sync start
+		foreach ($registry->call($hordeType. '/listBy',
+			array('action' => 'modify',
+					'timestamp' => $refts,
+					'type' => $type,
+					'filter' => $this->_filterExpression)) as $change) {
+			// now we have to remove the ones
+			// that came from the last sync with this client
+			$guid_ts = $state->getSyncTSforAction($change, 'modify');
+			$sync_ts = $state->getChangeTS($type, $change);
+			if ($sync_ts && $sync_ts == $guid_ts) {
+				// Change was done by us upon request of client.
+				Horde::logMessage("SyncML: change: $change ignored, " .
+					"came from client", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				continue;
 			}
+			$changes[] = $change;
 		}
-		
-		// don't add/replace the data currently, they are not yet complete
-		if($command->_moreData == TRUE) {
-			$state->_moreData['chunks'][]	= $command->_content;
-			$state->_moreData['luid']	= $command->_luid;
-			
-			// gets only set with the first chunk of data
-			if(isset($command->_contentSize))
-				$state->_moreData['contentSize'] = $command->_contentSize;
-				
-			$command->_status = RESPONSE_CHUNKED_ITEM_ACCEPTED_AND_BUFFERED;
-                        Horde::logMessage('SyncML: added moreData chunk '.$command->getContent(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			
-			return;
-		}
-		
-		$hordeType = $type = $this->_targetLocURI;
-		$hordeType = $state->getHordeType($hordeType);
+
+		Horde::logMessage('SyncML: runSyncCommand found ' . count($changes) .
+			" possible conflicts for $type", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 		if(!$contentType = $command->getContentType()) {
 			$contentType = $state->getPreferedContentType($type);
 		}
-		
+
 		if (($contentType == 'text/x-vcalendar' || $contentType == 'text/calendar')
-			&& strpos($command->getContent(), 'BEGIN:VTODO') !== false)
-		{
+				&& strpos($command->getContent(), 'BEGIN:VTODO') !== false) {
 			$hordeType = 'tasks';
 		}
 
 		$syncElementItems = $command->getSyncElementItems();
-		
+
 		foreach($syncElementItems as $syncItem) {
-		
+
 			$guid = false;
-		
+
+			$contentSize = strlen($syncItem->_content);
+			if ((($size = $syncItem->getContentSize()) !== false) &&
+					($contentSize != $size) &&
+					($contentSize + 1 != $size)) {
+				Horde::logMessage('SyncML: content size missmatch for LocURI '
+					. $syncItem->getLocURI() . ": $contentSize ($size)",
+					__FILE__, __LINE__, PEAR_LOG_ERROR);
+				$command->setStatus(RESPONSE_SIZE_MISMATCH);
+				return false;
+			}
+
 			if (is_a($command, 'Horde_SyncML_Command_Sync_Add')) {
+				if ($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) {
+					// We enforce the client not to change anything
+					if ($sync_conflicts > CONFLICT_CLIENT_CHANGES_IGNORED) {
+						// delete this item from client
+						Horde::logMessage('SyncML: Server RO! REMOVE '
+							. $syncItem->getLocURI() . ' from client',
+							__FILE__, __LINE__, PEAR_LOG_WARNING);
+						$state->addConflictItem($type, '!D' . $syncItem->getLocURI());
+					} else {
+						Horde::logMessage('SyncML: Server RO! '
+							. 'REJECT all client changes',
+							__FILE__, __LINE__, PEAR_LOG_WARNING);
+						$state->log('Client-AddReplaceIgnored');
+					}
+					continue;
+				}
+
 				$guid = $registry->call($hordeType . '/import',
 					array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType));
+
 				if (!is_a($guid, 'PEAR_Error') && $guid != false) {
 					$ts = $state->getSyncTSforAction($guid, 'add');
 					$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
-					$state->log("Client-Add");
-					Horde::logMessage('SyncML: added client entry as ' . $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					$state->log('Client-Add');
+					Horde::logMessage('SyncML: added client entry as '
+						. $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				} else {
-					$state->log("Client-AddFailure");
-					Horde::logMessage('SyncML: Error in adding client entry:' . $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
+					$state->log('Client-AddFailure');
+					Horde::logMessage('SyncML: Error in adding client entry: '
+						. $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
 				}
 			} elseif (is_a($command, 'Horde_SyncML_Command_Sync_Delete')) {
-				// We can't remove the mapping entry as we need to keep
-				// the timestamp information.
 				$guid = $state->removeUID($type, $syncItem->getLocURI());
-				#$guid = $state->getGlobalUID($type, $syncItem->getLocURI());
-				Horde::logMessage('SyncML: about to delete entry ' . $type .' / '. $guid . ' due to client request '.$syncItem->getLocURI(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			
+				if (!$guid) {
+					// the entry is no longer on the server
+					$state->log('Client-DeleteFailure');
+					Horde::logMessage('SyncML: Failure deleting client entry, '
+						. 'gone already on server!',
+						__FILE__, __LINE__, PEAR_LOG_ERR);
+					continue;
+				}
+				if ($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) {
+					// We enforce the client not to change anything
+					if ($sync_conflicts > CONFLICT_CLIENT_CHANGES_IGNORED) {
+						Horde::logMessage('SyncML: Server RO! ADD '
+							. $guid . ' to client again',
+							__FILE__, __LINE__, PEAR_LOG_WARNING);
+						// $state->addConflictItem($type, $guid);
+					} else {
+						Horde::logMessage('SyncML: '.
+							'Server RO! REJECT all client changes',
+							__FILE__, __LINE__, PEAR_LOG_WARNING);
+					}
+					$state->log('Client-DeleteIgnored');
+					continue;
+				}
+				elseif ($sync_conflicts == CONFLICT_RESOLVED_WITH_DUPLICATE &&
+					in_array($guid, $changes))
+				{
+					Horde::logMessage('SyncML: '.
+						'Server has updated version to keep',
+						__FILE__, __LINE__, PEAR_LOG_WARNING);
+					$state->log('Client-DeleteIgnored');
+					continue;
+				}
+				elseif ($sync_conflicts == CONFLICT_MERGE_DATA)
+				{
+					Horde::logMessage('SyncML: Server Merge Only: ADD '
+							. $guid . ' to client again',
+							__FILE__, __LINE__, PEAR_LOG_WARNING);
+					// $state->addConflictItem($type, $guid);
+					$state->log('Client-DeleteIgnored');
+					continue;
+				}
+
+				Horde::logMessage('SyncML: about to delete entry '
+					. $type .' / '. $guid . ' due to client request '
+					. $syncItem->getLocURI(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 				if (!is_a($guid, 'PEAR_Error') && $guid != false) {
 					$registry->call($hordeType . '/delete', array($guid));
-					#$ts = $state->getSyncTSforAction($guid, 'delete');
-					#$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
-					$state->log("Client-Delete");
-					Horde::logMessage('SyncML: deleted entry ' . $guid . ' due to client request', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					$ts = $state->getSyncTSforAction($guid, 'delete');
+					$state->setUID($type, $syncItem->getLocURI(), $guid, $ts, 1);
+					$state->log('Client-Delete');
+					Horde::logMessage('SyncML: deleted entry '
+						. $guid . ' due to client request',
+						__FILE__, __LINE__, PEAR_LOG_DEBUG);
 				} else {
-					$state->log("Client-DeleteFailure");
-					Horde::logMessage('SyncML: Failure deleting client entry, maybe gone already on server. msg:'. $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
+					$state->log('Client-DeleteFailure');
+					Horde::logMessage('SyncML: Failure deleting client entry, '
+						. 'maybe gone already on server. msg: '
+						. $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
 				}
 			} elseif (is_a($command, 'Horde_SyncML_Command_Sync_Replace')) {
 				$guid = $state->getGlobalUID($type, $syncItem->getLocURI());
+				$replace = true;
 				$ok = false;
-				if ($guid) {
-					Horde::logMessage('SyncML: locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_ERR);
-					// Entry exists: replace current one.
-				  $ok = $registry->call($hordeType . '/replace',
-					array($guid, $state->convertClient2Server($syncItem->getContent(), $contentType), $contentType));
-					if (!is_a($ok, 'PEAR_Error')) {
-						$ts = $state->getSyncTSforAction($guid, 'modify');
-						$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
-						Horde::logMessage('SyncML: replaced entry due to client request guid: ' .$guid. ' ts: ' .$ts, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-						$state->log("Client-Replace");
-						$ok = true;
-					} else {
-						// Entry may have been deleted; try adding it.
-						$ok = false;
+				$merge = false;
+				if ($guid)
+				{
+					Horde::logMessage('SyncML: locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					if (($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) || in_array($guid, $changes))
+					{
+						Horde::logMessage('SyncML: CONFLICT for locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
+						switch ($sync_conflicts)
+						{
+							case CONFLICT_CLIENT_WINNING:
+								$command->setStatus(RESPONSE_CONFLICT_RESOLVED_WITH_CLIENT_WINNING);
+								break;
+							case CONFLICT_SERVER_WINNING:
+								Horde::logMessage('SyncML: REJECT client change for locuri ' .
+									$syncItem->getLocURI() . ' guid ' . $guid ,
+									__FILE__, __LINE__, PEAR_LOG_WARNING);
+								$ok = true;
+								$replace = false;
+								$state->log('Client-AddReplaceIgnored');
+								break;
+							case CONFLICT_MERGE_DATA:
+								Horde::logMessage('SyncML: Merge server and client data for locuri ' .
+									$syncItem->getLocURI() . ' guid ' . $guid ,
+									__FILE__, __LINE__, PEAR_LOG_WARNING);
+							    $merge = true;
+								break;
+							case CONFLICT_RESOLVED_WITH_DUPLICATE:
+								$replace = false;
+								break;
+							case CONFLICT_CLIENT_CHANGES_IGNORED:
+								Horde::logMessage('SyncML: Server RO! REJECT client change for locuri ' .
+									$syncItem->getLocURI() . ' guid ' . $guid ,
+									__FILE__, __LINE__, PEAR_LOG_WARNING);
+								$ok = true;
+								$replace = false;
+								$ts = $state->getSyncTSforAction($guid, 'modify');
+								$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
+								$state->log('Client-AddReplaceIgnored');
+								break;
+							default: // We enforce our data on client
+								Horde::logMessage('SyncML: Server RO! UNDO client change for locuri ' .
+									$syncItem->getLocURI() . ' guid ' . $guid ,
+									__FILE__, __LINE__, PEAR_LOG_WARNING);
+								$state->addConflictItem($type, $guid);
+								$ok = true;
+								$replace = false;
+						}
+					}
+					elseif ($sync_conflicts == CONFLICT_MERGE_DATA)
+					{
+						Horde::logMessage('SyncML: Merge server and client data for locuri ' .
+							$syncItem->getLocURI() . ' guid ' . $guid ,
+							__FILE__, __LINE__, PEAR_LOG_WARNING);
+						$merge = true;
+					}
+
+					if ($replace)
+					{
+						// Entry exists: replace/merge with current one.
+						$ok = $registry->call($hordeType . '/replace',
+							array($guid, $state->convertClient2Server($syncItem->getContent(),
+							$contentType), $contentType, $merge));
+						if (!is_a($ok, 'PEAR_Error') && $ok != false)
+						{
+							$ts = $state->getSyncTSforAction($guid, 'modify');
+							$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
+							if ($merge)
+							{
+								Horde::logMessage('SyncML: Merged entry due to client request guid: ' .
+									$guid . ' ts: ' . $ts, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+							}
+							else
+							{
+								Horde::logMessage('SyncML: replaced entry due to client request guid: ' .
+									$guid . ' ts: ' . $ts, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+							}
+							$state->log('Client-Replace');
+							$ok = true;
+						}
+						else
+						{
+							// Entry may have been deleted; try adding it.
+							$ok = false;
+						}
 					}
 				}
-				
+
 				if (!$ok) {
-					// Entry does not exist in map or database: add a new one.
-					Horde::logMessage('SyncML: try to add contentype ' . $contentType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					// Entry does either not exist in map or database, or should be added due to a conflict
+
+					if ($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) {
+						// We enforce the client not to change anything
+						if ($sync_conflicts > CONFLICT_CLIENT_CHANGES_IGNORED) {
+							// delete this item from client
+							Horde::logMessage('SyncML: Server RO! REMOVE ' . $syncItem->getLocURI() . ' from client',
+								__FILE__, __LINE__, PEAR_LOG_WARNING);
+							$state->addConflictItem($type, '!D' . $syncItem->getLocURI());
+						} else {
+							Horde::logMessage('SyncML: Server RO! REJECT all client changes',
+								__FILE__, __LINE__, PEAR_LOG_WARNING);
+						}
+						continue;
+					}
+					Horde::logMessage('SyncML: try to add contentype '
+						. $contentType . ' for locuri ' . $syncItem->getLocURI(),
+						__FILE__, __LINE__, PEAR_LOG_DEBUG);
+					//continue;
+					$oguid = $guid;
 					$guid = $registry->call($hordeType . '/import',
-						array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType));
+						array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType, $guid));
 					if (!is_a($guid, 'PEAR_Error')) {
-						$ts = $state->getSyncTSforAction($guid, 'add');
+						if ($oguid != $guid) {
+							// We add a new entry
+							$ts = $state->getSyncTSforAction($guid, 'add');
+							Horde::logMessage('SyncML: added entry '
+								. $guid . ' from client',
+								__FILE__, __LINE__, PEAR_LOG_DEBUG);
+							$state->log('Client-Add');
+						} else {
+							// We replaced an entry
+							$ts = $state->getSyncTSforAction($guid, 'modify');
+							Horde::logMessage('SyncML: replaced entry '
+								. $guid . ' from client',
+								__FILE__, __LINE__, PEAR_LOG_DEBUG);
+							$state->log('Client-Replace');
+						}
 						$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
-						$state->log("Client-AddReplace");
-						Horde::logMessage('SyncML: r/ added client entry as ' . $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					} else {
-						Horde::logMessage('SyncML: Error in replacing/add client entry:' . $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
-						$state->log("Client-AddFailure");
+						Horde::logMessage('SyncML: Error in replacing/'
+							. 'add client entry:' . $guid->message,
+							__FILE__, __LINE__, PEAR_LOG_ERR);
+						$state->log('Client-AddFailure');
 					}
 				}
 			}
 		}
-		
 		return $guid;
 	}
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromClientSync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromClientSync.php
index 087105940d..e9ef2c0c23 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromClientSync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromClientSync.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once 'Horde/SyncML/Sync.php';
+include_once 'Horde/SyncML/Sync/SlowSync.php';
 
 /**
  * $Horde: framework/SyncML/SyncML/Sync/RefreshFromClientSync.php,v 1.8 2004/09/14 04:27:06 chuck Exp $
@@ -15,20 +15,9 @@ include_once 'Horde/SyncML/Sync.php';
  * @since   Horde 3.0
  * @package Horde_SyncML
  */
-class Horde_SyncML_Sync_RefreshFromClientSync extends Horde_SyncML_Sync {
-
+class Horde_SyncML_Sync_RefreshFromClientSync extends Horde_SyncML_Sync_SlowSync {
     /**
-     * We need to erase the current server contents, then we can add
+     * We needed to erase the current server contents, then we can add
      * the client's contents.
      */
-    function startSync($currentCmdID, &$output)
-    {
-        $deletes = $registry->call($this->targetLocURI, '/list', array());
-        foreach ($delete as $deletes) {
-            $registry->call($this->targetLocURI . '/delete', array($delete));
-        }
-
-        return $currentCmdID;
-    }
-
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
index 4a5c957f9b..3e37a43345 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
@@ -1,87 +1,167 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Sync.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Sync/RefreshFromServerSync.php,v 1.9 2004/07/03 15:21:15 chuck Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Sync_RefreshFromServerSync extends Horde_SyncML_Sync_TwoWaySync {
 	function handleSync($currentCmdID, $hordeType, $syncType, &$output, $refts) {
 		global $registry;
-		
+
 		$state = &$_SESSION['SyncML.state'];
-		
-		$adds = &$state->getAddedItems($hordeType);
-		
-		Horde::logMessage("SyncML: ".count($adds).   ' added items found for '.$hordeType  , __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		$maxMsgSize = $state->getMaxMsgSizeClient();
+		$deviceInfo = $state->getClientDeviceInfo();
+
+		if (isset($deviceInfo['maxEntries'])) {
+			$maxEntries = $deviceInfo['maxEntries'];
+			if (!$maxMsgSize && !$maxEntries) {
+				// fallback to default
+				$maxEntries = MAX_ENTRIES;
+			}
+		} else {
+			$maxEntries = MAX_ENTRIES;
+		}
 
 		$serverAnchorNext = $state->getServerAnchorNext($syncType);
-		$counter = 0;
-		
+
+		if (isset($state->curSyncItem)) {
+			// Finish the pending sync item
+			$cmd = &$state->curSyncItem;
+			unset($state->curSyncItem);
+			$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Sync');
+
+			// moreData split; save in session state and end current message
+			if ($cmd->hasMoreData()) {
+				$state->curSyncItem = &$cmd;
+				$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+				return $currentCmdID;
+			}
+			$state->incNumberOfElements();
+		}
+
+		$adds = &$state->getAddedItems($syncType);
+		Horde::logMessage("SyncML: ".count($adds).
+			' added items found for '.$syncType  ,
+			__FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 		if(is_array($adds)) {
 			while($guid = array_shift($adds)) {
+				$currentSize = $output->getOutputSize();
+				// return if we have to much data
+				if (($maxEntries && ($state->getNumberOfElements() >= $maxEntries)
+					&& isset($contentType['mayFragment'])
+					&& $contentType['mayFragment'])
+					|| ($maxMsgSize
+						&& (($currentSize + MIN_MSG_LEFT * 2) > $maxMsgSize))) {
+					// put the item back in the queue
+					$adds[] = $guid;
+					$state->maxNumberOfElements();
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+
 				if ($locID = $state->getLocID($syncType, $guid)) {
 					Horde::logMessage("SyncML: RefreshFromServerSync add to client: $guid ignored, already at client($locID)", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					continue;
 				}
-				
+
+				$guid_ts = $state->getSyncTSforAction($guid, 'add');
+                if ($guid_ts > $serverAnchorNext) {
+					// Change was made after we started this sync.
+					// Don't sent this now to the client.
+					Horde::logMessage("SyncML: RefreshFromServerSync add $guid is in our future", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					continue;
+                }
+
 				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
-				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
 				$c = $registry->call($hordeType . '/export', array('guid' => $guid, 'contentType' => $contentType));
-				Horde::logMessage("SyncML: slowsync add $guid to client ". print_r($c, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				if (!is_a($c, 'PEAR_Error')) {
-					$cmd->setContent($c);
-					$cmd->setContentType($contentType['ContentType']);
-					if (isset($contentType['ContentFormat']))
-					{
-						$cmd->setContentFormat($contentType['ContentFormat']);
-					}
-					
-					$cmd->setSourceURI($guid);
-					$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Add');
-					$state->log('Server-Add');
-					
-					// return if we have to much data
-					if(++$counter >= MAX_ENTRIES
-						&& isset($contentType['mayFragment'])
-						&& $contentType['mayFragment'])
-					{
-						$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
-						return $currentCmdID;
-					}
+				if (is_a($c, 'PEAR_Error')) {
+					Horde::logMessage("SyncML: refresh failed to export guid $guid:\n" . print_r($c, true), __FILE__, __LINE__, PEAR_LOG_WARNING);
+					$state->log("Server-ExportFailed");
+					continue;
 				}
+
+                $size = strlen($c);
+                // return if we have to much data
+                if ($maxMsgSize && !$deviceInfo['supportLargeObjs']) {
+                    if (($size + MIN_MSG_LEFT * 2) > $maxMsgSize) {
+                        Horde::logMessage("SyncML: refresh failed to export guid $guid due to size $size", __FILE__, __LINE__, PEAR_LOG_ERROR);
+                        $state->log("Server-ExportFailed");
+                        continue;
+                    }
+                    if (($currentSize + $size + MIN_MSG_LEFT * 2) > $maxMsgSize) {
+                        // put the item back in the queue
+						$adds[] = $guid;
+                        $state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+                        return $currentCmdID;
+					}
+                }
+
+				Horde::logMessage("SyncML: refresh add $guid to client\n$c", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
+
+				$cmd->setContent($c);
+
+				$cmd->setContentType($contentType['ContentType']);
+				if (isset($contentType['ContentFormat'])) {
+					$cmd->setContentFormat($contentType['ContentFormat']);
+				}
+
+				$cmd->setGUID($guid);
+
+				$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Add');
+				$state->log('Server-Add');
+
+				// moreData split; put the guid back in the list and return
+				if ($cmd->hasMoreData()) {
+					$state->curSyncItem = &$cmd;
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+				$state->incNumberOfElements();
 			}
 		}
-		
-		#Horde::logMessage("SyncML: handling sync ".$currentCmdID, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		
+
+		Horde::logMessage("SyncML: All items handled for sync $syncType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		$state->removeExpiredUID($syncType, $serverAnchorNext);
 		$state->clearSync($syncType);
-		
+
 		return $currentCmdID;
 	}
-    
+
 	function loadData() {
 		global $registry;
-		
+
 		$state = &$_SESSION['SyncML.state'];
 		$syncType = $this->_targetLocURI;
 		$hordeType = $state->getHordeType($syncType);
-		
+		$state->setTargetURI($syncType);
+		$future = $state->getServerAnchorNext($syncType);
+		$delta_add = 0;
+
 		Horde::logMessage("SyncML: reading added items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		$state->setAddedItems($hordeType, $registry->call($hordeType. '/list', array()));
-		$adds = &$state->getAddedItems($hordeType);
+		$state->setAddedItems($syncType, $registry->call($hordeType. '/listBy',
+			array('action' => 'add',
+					'timestamp' => $future,
+					'type' => $syncType,
+					'filter' => $this->_filterExpression)));
+		$delta_add = count($state->getAddedItems($hordeType));
+		$state->setAddedItems($syncType, $registry->call($hordeType. '/list', array('filter' => $this->_filterExpression)));
 		$this->_syncDataLoaded = TRUE;
-		
-		return count($state->getAddedItems($hordeType));
+
+		return count($state->getAddedItems($syncType)) - $delta_add;
 	}
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
index de538829c7..51903e2185 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
@@ -1,194 +1,282 @@
 <?php
-
-include_once 'Horde/SyncML/Sync/TwoWaySync.php';
-
 /**
+ * eGroupWare - SyncML based on Horde 3
+ *
  * Slow sync may just work; I think most of the work is going to be
  * done by the API.
  *
- * $Horde: framework/SyncML/SyncML/Sync/SlowSync.php,v 1.7 2004/05/26 17:32:50 chuck Exp $
  *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
+ * Using the PEAR Log class (which need to be installed!)
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
  */
+include_once 'Horde/SyncML/Sync/TwoWaySync.php';
+
 class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
+
 	function handleSync($currentCmdID, $hordeType, $syncType, &$output, $refts) {
 		global $registry;
-		
+
 		$history = $GLOBALS['egw']->contenthistory;
 		$state = &$_SESSION['SyncML.state'];
-		
+		$maxMsgSize = $state->getMaxMsgSizeClient();
+		$deviceInfo = $state->getClientDeviceInfo();
+
+		if (isset($deviceInfo['maxEntries'])) {
+			$maxEntries = $deviceInfo['maxEntries'];
+			if (!$maxMsgSize && !$maxEntries) {
+				// fallback to default
+				$maxEntries = MAX_ENTRIES;
+			}
+		} else {
+			$maxEntries = MAX_ENTRIES;
+		}
+
 		$serverAnchorNext = $state->getServerAnchorNext($syncType);
-		
+
 		// now we remove all UID from contentmap that have not been verified in this slowsync
 		$state->removeOldUID($syncType, $serverAnchorNext);
-		$adds = &$state->getAddedItems($hordeType);
-		Horde::logMessage("SyncML: ".count($adds).   ' added items found for '.$hordeType  , __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		$counter = 0;
-		
+
+		if (isset($state->curSyncItem)) {
+			// Finish the pending sync item
+			$cmd = &$state->curSyncItem;
+			unset($state->curSyncItem);
+			$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Sync');
+
+			// moreData split; save in session state and end current message
+			if ($cmd->hasMoreData()) {
+				$state->curSyncItem = &$cmd;
+				$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+				return $currentCmdID;
+			}
+			$state->incNumberOfElements();
+		}
+
+		$adds = &$state->getAddedItems($syncType);
+		Horde::logMessage("SyncML: ".count($adds).   ' added items found for '.$syncType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 		if(is_array($adds)) {
 			while($guid = array_shift($adds)) {
+
+				$currentSize = $output->getOutputSize();
+
+				// return if we have to much data
+				if (($maxEntries && ($state->getNumberOfElements() >= $maxEntries)
+					&& isset($contentType['mayFragment'])
+					&& $contentType['mayFragment']) ||
+					($maxMsgSize && (($currentSize + MIN_MSG_LEFT * 2) > $maxMsgSize))) {
+					// put the item back in the queue
+					$adds[] = $guid;
+					$state->maxNumberOfElements();
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+
 				if ($locID = $state->getLocID($syncType, $guid)) {
 					Horde::logMessage("SyncML: slowsync add to client: $guid ignored, already at client($locID)", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					continue;
 				}
-				
+
+				$guid_ts = $state->getSyncTSforAction($guid, 'add');
+				if ($guid_ts > $serverAnchorNext) {
+					// Change was made after we started this sync.
+					// Don't sent this now to the client.
+					Horde::logMessage("SyncML: slowsync add $guid is in our future", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					continue;
+				}
+
 				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
-				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
 				$c = $registry->call($hordeType . '/export', array('guid' => $guid, 'contentType' => $contentType));
-				#Horde::logMessage("SyncML: slowsync add guid $guid to client ". print_r($c, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				if (!is_a($c, 'PEAR_Error')) {
-					$cmd->setContent($c);
-					$cmd->setContentType($contentType['ContentType']);
-					if (isset($contentType['ContentFormat']))
-					{
-						$cmd->setContentFormat($contentType['ContentFormat']);
+				if (is_a($c, 'PEAR_Error')) {
+					Horde::logMessage("SyncML: slowsync failed to export guid $guid:\n" . print_r($c, true), __FILE__, __LINE__, PEAR_LOG_WARNING);
+					continue;
+				}
+
+				$size = strlen($c);
+				// return if we have to much data
+				if ($maxMsgSize && !$deviceInfo['supportLargeObjs']) {
+					if (($size + MIN_MSG_LEFT * 2) > $maxMsgSize) {
+						Horde::logMessage("SyncML: slowsync failed to export guid $guid due to size $size", __FILE__, __LINE__, PEAR_LOG_ERROR);
+						continue;
 					}
-					
-					$cmd->setSourceURI($guid);
-					$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Add');
-					$state->log('Server-Add');
-					
-					// return if we have to much data
-					if(++$counter >= MAX_ENTRIES
-						&& isset($contentType['mayFragment'])
-						&& $contentType['mayFragment'])
-					{
+					if (($currentSize + $size + MIN_MSG_LEFT * 2) > $maxMsgSize) {
+						// put the item back in the queue
+						$adds[] = $guid;
 						$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
 						return $currentCmdID;
 					}
 				}
+
+				Horde::logMessage("SyncML: slowsync add guid $guid to client\n$c", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
+				$cmd->setContent($c);
+				$cmd->setContentType($contentType['ContentType']);
+				if (isset($contentType['ContentFormat'])) {
+					$cmd->setContentFormat($contentType['ContentFormat']);
+				}
+				$cmd->setGUID($guid);
+				$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Add');
+				$state->log('Server-Add');
+
+				// moreData split; save in session state and end current message
+				if ($cmd->hasMoreData()) {
+					$state->curSyncItem = &$cmd;
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+				$state->incNumberOfElements();
 			}
 		}
-		
-		#Horde::logMessage("SyncML: handling sync ".$currentCmdID, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		
+
+		Horde::logMessage("SyncML: All items handled for sync $syncType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		$state->removeExpiredUID($syncType, $serverAnchorNext);
 		$state->clearSync($syncType);
-		
+
 		return $currentCmdID;
 	}
-    
+
 	/**
 	* Here's where the actual processing of a client-sent Sync
 	* Command takes place. Entries are added or replaced
 	* from the server database by using Horde API (Registry) calls.
 	*/
 	function runSyncCommand(&$command) {
-		#Horde::logMessage('SyncML: content type is ' . $command->getContentType() .' moreData '. $command->_moreData, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 		global $registry;
-		
 		$history = $GLOBALS['egw']->contenthistory;
-		
 		$state = &$_SESSION['SyncML.state'];
-		
-		if(isset($state->_moreData['luid'])) {
-			if(($command->_luid == $state->_moreData['luid'])) {
-                                Horde::logMessage('SyncML: got next moreData chunk '.$command->getContent(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				$lastChunks = implode('',$state->_moreData['chunks']);
-				$command->_content = $lastChunks.$command->_content;
-				$stringlen1 =  strlen($lastChunks);
-				$stringlen2 =  strlen($command->_content);
-				
-				if(!$command->_moreData && strlen($command->_content) != $state->_moreData['contentSize']) {
-					$command->_status = RESPONSE_SIZE_MISMATCH;
-					$state->_moreData = array();
-					
-					return;
-				} elseif(!$command->_moreData && strlen($command->_content) == $state->_moreData['contentSize']) {
-					$state->_moreData = array();
-					Horde::logMessage('SyncML: chunk ended successful type is ' . $command->getContentType() .' content is '. $command->getContent(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				}
-			} else {
-				// alert 223 needed too
-				#$command->_status = ALERT_NO_END_OF_DATA;
-				
-				$state->_moreData = array();
-				
+
+		if ($command->hasMoreData()) {
+			Horde::logMessage('SyncML: moreData: TRUE', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			$command->setStatus(RESPONSE_CHUNKED_ITEM_ACCEPTED_AND_BUFFERED);
+			return true;
+		}
+
+		$type = $this->_targetLocURI;
+
+		$syncml_prefs = $GLOBALS['egw_info']['user']['preferences']['syncml'];
+		if (isset($syncml_prefs[$type])) {
+			$sync_conflicts = $syncml_prefs[$type];
+		} else {
+			$sync_conflicts = CONFLICT_SERVER_WINNING;
+		}
+
+		$hordeType = $state->getHordeType($type);
+
+		$syncElementItems = $command->getSyncElementItems();
+
+		foreach($syncElementItems as $syncItem) {
+
+			$contentSize = strlen($syncItem->_content);
+			if ((($size = $syncItem->getContentSize()) !== false) &&
+				($contentSize != $size) &&
+				($contentSize + 1 != $size)) {
+				Horde::logMessage('SyncML: content size missmatch for LocURI ' . $syncItem->_luid .
+					": $contentSize ($size)", __FILE__, __LINE__, PEAR_LOG_ERROR);
+				$command->setStatus(RESPONSE_SIZE_MISMATCH);
 				return;
 			}
-		}
-		
-		// don't add/replace the data currently, they are not yet complete
-		if($command->_moreData == TRUE) {
-			$state->_moreData['chunks'][]	= $command->_content;
-			$state->_moreData['luid']	= $command->_luid;
-			
-			// gets only set with the first chunk of data
-			if(isset($command->_contentSize))
-				$state->_moreData['contentSize'] = $command->_contentSize;
-				
-			$command->_status = RESPONSE_CHUNKED_ITEM_ACCEPTED_AND_BUFFERED;
-                        Horde::logMessage('SyncML: added moreData chunk '.$command->getContent(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			
-			return;
-		}
-		
-		$type = $this->_targetLocURI;
-		$hordeType = $state->getHordeType($type);
-		
-		$syncElementItems = $command->getSyncElementItems();
-		
-		foreach($syncElementItems as $syncItem) {
+
 			if(!$contentType = $syncItem->getContentType()) {
 				$contentType = $state->getPreferedContentType($type);
 			}
-			
+
 			if (($contentType == 'text/x-vcalendar' || $contentType == 'text/calendar')
-				&& strpos($syncItem->getContent(), 'BEGIN:VTODO') !== false)
-			{
+				&& strpos($syncItem->getContent(), 'BEGIN:VTODO') !== false) {
 				$hordeType = 'tasks';
 			}
-		
+
 			$guid = false;
-			
+
 			$guid = $registry->call($hordeType . '/search',
 				array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType, $state->getGlobalUID($type, $syncItem->getLocURI()) ));
-			
+
 			if ($guid) {
-				# entry exists in database already. Just update the mapping
-				Horde::logMessage('SyncML: adding mapping for locuri:'. $syncItem->getLocURI() . ' and guid:' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				$state->setUID($type, $syncItem->getLocURI(), $guid, mktime());
-				$state->log("Client-Replace");
-			} else {
-				# Entry does not exist in database: add a new one.
-				$state->removeUID($type, $syncItem->getLocURI());
-				Horde::logMessage('SyncML: try to add contentype ' . $contentType .' to '. $hordeType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-				$guid = $registry->call($hordeType . '/import',
-					array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType));
-				if (!is_a($guid, 'PEAR_Error') && $guid != false) {
-					$ts = $state->getSyncTSforAction($guid, 'add');
-					$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
-					$state->log("Client-AddReplace");
-					Horde::logMessage('SyncML: r/ added client entry as ' . $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				// Check if the found entry came from the client
+				$guid_ts = $state->getSyncTSforAction($guid, 'add');
+				$sync_ts = $state->getChangeTS($type, $guid);
+				if ($sync_ts && $sync_ts == $guid_ts) {
+					// Entry came from the client, so we get a duplicate here
+					Horde::logMessage('SyncML: CONFLICT for locuri ' . $syncItem->getLocURI()
+						. ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
+					if 	($sync_conflicts != CONFLICT_RESOLVED_WITH_DUPLICATE) {
+						$state->log("Client-AddReplaceIgnored");
+						continue;
+					}
 				} else {
-					Horde::logMessage('SyncML: Error in replacing/add client entry:' . $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
-					$state->log("Client-AddFailure");
+					# Entry exists in database already. Just update the mapping
+					Horde::logMessage('SyncML: adding mapping for locuri:'
+						. $syncItem->getLocURI() . ' and guid:' . $guid,
+						__FILE__, __LINE__, PEAR_LOG_DEBUG);
+						$state->setUID($type, $syncItem->getLocURI(), $guid, mktime());
+						$state->log("Client-Map");
+						continue;
 				}
 			}
+			if ($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) {
+				// We enforce the client not to change anything
+				if ($sync_conflicts > CONFLICT_CLIENT_CHANGES_IGNORED) {
+					// delete this item from client
+					Horde::logMessage('SyncML: Server RO! REMOVE ' . $syncItem->getLocURI()
+					. ' from client', __FILE__, __LINE__, PEAR_LOG_WARNING);
+					$state->addConflictItem($type, '!D' . $syncItem->getLocURI());
+				} else {
+					Horde::logMessage('SyncML: Server RO! REJECT all client changes',
+						__FILE__, __LINE__, PEAR_LOG_WARNING);
+					$state->log("Client-AddReplaceIgnored");
+				}
+				$command->setStatus(RESPONSE_NO_EXECUTED);
+				continue;
+			}
+
+			// Add entry to the database.
+			$state->removeUID($type, $syncItem->getLocURI());
+			Horde::logMessage('SyncML: try to add contentype ' . $contentType .' to '. $hordeType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			$guid = $registry->call($hordeType . '/import',
+				array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType));
+			if (!is_a($guid, 'PEAR_Error') && $guid != false) {
+				$ts = $state->getSyncTSforAction($guid, 'modify');
+				if (!$ts) {
+					$ts = $state->getSyncTSforAction($guid, 'add');
+				}
+				$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
+				$state->log("Client-AddReplace");
+				Horde::logMessage('SyncML: r/ added client entry as ' . $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			} else {
+				Horde::logMessage('SyncML: Error in replacing/add client entry:' . $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
+				$state->log("Client-AddFailure");
+			}
 		}
 
 		return true;
 	}
-	
+
 	function loadData() {
 		global $registry;
-		
+
 		$state = &$_SESSION['SyncML.state'];
 		$syncType = $this->_targetLocURI;
 		$hordeType = $state->getHordeType($syncType);
-		
+		$state->setTargetURI($syncType);
+		$future = $state->getServerAnchorNext($syncType);
+		$delta_add = 0;
+
 		Horde::logMessage("SyncML: reading added items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		$state->setAddedItems($hordeType, $registry->call($hordeType. '/list', array()));
-		$adds = &$state->getAddedItems($hordeType);
+		$delta_add = count($registry->call($hordeType. '/listBy',
+			array('action' => 'add',
+					'timestamp' => $future,
+					'type' => $syncType,
+					'filter' => $this->_filterExpression)));
+		$state->setAddedItems($syncType, $registry->call($hordeType. '/list', array('filter' => $this->_filterExpression)));
 		$this->_syncDataLoaded = TRUE;
-		
-		return count($state->getAddedItems($hordeType));
+
+		return count($state->getAddedItems($syncType)) - $delta_add;
 	}
 }
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
index 2ff089d12f..69ccdf9be0 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
@@ -1,175 +1,329 @@
 <?php
-
+/**
+ * eGroupWare - SyncML based on Horde 3
+ *
+ *
+ * Using the PEAR Log class (which need to be installed!)
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Anthony Mills <amills@pyramid6.com>
+ * @author  Karsten Fourmont <fourmont@gmx.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
 include_once 'Horde/SyncML/Sync.php';
 include_once 'Horde/SyncML/Command/Sync/ContentSyncElement.php';
 
-/**
- * $Horde: framework/SyncML/SyncML/Sync/TwoWaySync.php,v 1.12 2004/07/26 09:24:38 jan Exp $
- *
- * Copyright 2003-2004 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Anthony Mills <amills@pyramid6.com>
- * @author  Karsten Fourmont <fourmont@gmx.de>
- *
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_SyncML
- */
 class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
 
-	function endSync($currentCmdID, &$output) {
+	function endSync($currentCmdID, & $output) {
 		global $registry;
 
-		$state = &$_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 
 		$syncType = $this->_targetLocURI;
 
 		$hordeType = $state->getHordeType($syncType);
 
 		$refts = $state->getServerAnchorLast($syncType);
-		$currentCmdID = $this->handleSync($currentCmdID,
-                                          $hordeType,
-                                          $syncType,
-                                          $output,
-                                          $refts);
+		$currentCmdID = $this->handleSync($currentCmdID, $hordeType, $syncType, $output, $refts);
 
 		return $currentCmdID;
 	}
 
-	function handleSync($currentCmdID, $hordeType, $syncType,&$output, $refts) {
+	function handleSync($currentCmdID, $hordeType, $syncType, & $output, $refts) {
 		global $registry;
 
 		// array of Items which got modified, but got never send to the client before
-		$missedAdds = array();
+		$missedAdds = array ();
+		// array of Items which the client wanted to add, but must be deleted due to
+		// user's sync policy
+		$remoteDeletes = array ();
 
 		$history = $GLOBALS['egw']->contenthistory;
-		$state = &$_SESSION['SyncML.state'];
-		$counter = 0;
+		$state = & $_SESSION['SyncML.state'];
+		$maxMsgSize = $state->getMaxMsgSizeClient();
+		$deviceInfo = $state->getClientDeviceInfo();
 
-		$changes = &$state->getChangedItems($hordeType);
-		$deletes = &$state->getDeletedItems($hordeType);
-		$adds = &$state->getAddedItems($hordeType);
+		if (isset($deviceInfo['maxEntries'])) {
+			$maxEntries = $deviceInfo['maxEntries'];
+			if (!$maxMsgSize && !$maxEntries) {
+				// fallback to default
+				$maxEntries = MAX_ENTRIES;
+			}
+		} else {
+			$maxEntries = MAX_ENTRIES;
+		}
 
-		Horde::logMessage("SyncML: ".count($changes).' changed items found for '.$hordeType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		Horde::logMessage("SyncML: ".count($deletes).' deleted items found for '.$hordeType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		Horde::logMessage("SyncML: ".count($adds).   ' added items found for '.$hordeType  , __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		$serverAnchorNext = $state->getServerAnchorNext($syncType);
+
+
+		if (isset ($state->curSyncItem)) {
+			// Finish the pending sync item
+			$cmd = & $state->curSyncItem;
+			unset ($state->curSyncItem);
+			$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Sync');
+
+			// moreData split; save in session state and end current message
+			if ($cmd->hasMoreData()) {
+				$state->curSyncItem = & $cmd;
+				$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+				return $currentCmdID;
+			}
+			$state->incNumberOfElements();
+		}
+
+		$changes = & $state->getChangedItems($syncType);
+		$deletes = & $state->getDeletedItems($syncType);
+		$adds = & $state->getAddedItems($syncType);
+		$conflicts = & $state->getConflictItems($syncType);
+
+		// manage the conflict items
+		foreach ( $conflicts as $refresh) {
+			if (preg_match('/^!D(.*)/', $refresh, $matches)) {
+				// delete locuri
+				$remoteDeletes[] = $matches[1];
+			} else {
+				$adds[] = $refresh;
+			}
+		}
+
+		Horde :: logMessage('SyncML: ' . count($changes) . ' changed items found for ' . $syncType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		Horde :: logMessage('SyncML: ' . count($deletes) . ' deleted items found for ' . $syncType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		Horde :: logMessage('SyncML: ' . count($remoteDeletes) . ' items to delete on client found for ' . $syncType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		Horde :: logMessage('SyncML: ' . count($adds) . ' added items (' . count($refresh) . ' refreshs) found for ' . $syncType, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		// handle changes
-		if(is_array($changes)) {
-			while($guid = array_shift($changes)) {
+		if (is_array($changes)) {
+			while ($guid = array_shift($changes)) {
+				$currentSize = $output->getOutputSize();
+				// return if we have to much data
+				if (($maxEntries
+					&& ($state->getNumberOfElements() >= $maxEntries)
+					&& isset ($contentType['mayFragment'])
+					&& $contentType['mayFragment'])
+					|| ($maxMsgSize
+						&& (($currentSize +MIN_MSG_LEFT * 2) > $maxMsgSize))) {
+					// put the item back in the queue
+					$changes[] = $guid;
+					$state->maxNumberOfElements();
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+
 				$guid_ts = $state->getSyncTSforAction($guid, 'modify');
 				$sync_ts = $state->getChangeTS($syncType, $guid);
-				Horde::logMessage("SyncML: timestamp modify guid_ts: $guid_ts sync_ts: $sync_ts", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				Horde :: logMessage("SyncML: timestamp modify $guid guid_ts: $guid_ts sync_ts: $sync_ts", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				if ($sync_ts && $sync_ts == $guid_ts) {
 					// Change was done by us upon request of client.
 					// Don't mirror that back to the client.
-					Horde::logMessage("SyncML: change: $guid ignored, came from client", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					Horde :: logMessage("SyncML: change: $guid ignored, came from client", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					continue;
+				}
+				if ($guid_ts > $serverAnchorNext) {
+					// Change was made after we started this sync.
+					// Don't sent this now to the client.
+					Horde :: logMessage("SyncML: change $guid is in our future: $serverAnchorNext", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					continue;
 				}
-				Horde::logMessage("SyncML: change $guid hs_ts:$guid_ts dt_ts:" . $state->getChangeTS($syncType, $guid), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				$locid = $state->getLocID($syncType, $guid);
 				if (!$locid) {
 					// somehow we missed to add, lets store the uid, so we add this entry later
 					$missedAdds[] = $guid;
-					Horde::logMessage("SyncML: unable to create change for $guid: locid not found in map", __FILE__, __LINE__, PEAR_LOG_WARNING);
+					Horde :: logMessage("SyncML: unable to create change for $guid: locid not found in map", __FILE__, __LINE__, PEAR_LOG_WARNING);
 					continue;
 				}
 
 				// Create a replace request for client.
 				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
-				$c = $registry->call($hordeType. '/export',
-					array('guid' => $guid, 'contentType' => $contentType));
-				if (!is_a($c, 'PEAR_Error')) {
+				$c = $registry->call($hordeType . '/export', array (
+					'guid' => $guid,
+					'contentType' => $contentType
+				));
+				if (is_a($c, 'PEAR_Error')) {
 					// Item in history but not in database. Strange, but can happen.
-					Horde::logMessage("SyncML: change: $guid export content: $c", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-					$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
-# LK					$cmd->setContent($state->convertServer2Client($c, $contentType));
-					$cmd->setContent($c);
-					$cmd->setSourceURI($guid);
-					$cmd->setTargetURI($locid);
-					$cmd->setContentType($contentType['ContentType']);
-					if (isset($contentType['ContentFormat']))
-					{
-						$cmd->setContentFormat($contentType['ContentFormat']);
+					Horde :: logMessage("SyncML: change: export of guid $guid failed:\n" . print_r($c, true), __FILE__, __LINE__, PEAR_LOG_WARNING);
+					continue;
+				}
+
+				$size = strlen($c);
+				// return if we have to much data
+				if ($maxMsgSize && !$deviceInfo['supportLargeObjs']) {
+					if (($size +MIN_MSG_LEFT * 2) > $maxMsgSize) {
+						Horde :: logMessage("SyncML: change: export of guid $guid failed due to size $size", __FILE__, __LINE__, PEAR_LOG_ERROR);
+						$state->log('Server-ExportFailed');
+						continue;
 					}
-
-					$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Replace');
-					$state->log('Server-Replace');
-
-					// return if we have to much data
-					if (++$counter >= MAX_ENTRIES
-						&& isset($contentType['mayFragment'])
-						&& $contentType['mayFragment'])
-					{
+					if (($currentSize + $size +MIN_MSG_LEFT * 2) > $maxMsgSize) {
+						// put the item back in the queue
+						$changes[] = $guid;
 						$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
 						return $currentCmdID;
 					}
 				}
+
+				Horde :: logMessage("SyncML: change: export guid $guid, content:\n$c", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
+				# LK				$cmd->setContent($state->convertServer2Client($c, $contentType));
+				$cmd->setContent($c);
+				$cmd->setLocURI($locid);
+				$cmd->setContentType($contentType['ContentType']);
+				if (isset ($contentType['ContentFormat'])) {
+					$cmd->setContentFormat($contentType['ContentFormat']);
+				}
+				$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Replace');
+				$state->log('Server-Replace');
+
+				// moreData split; save in session state and end current message
+				if ($cmd->hasMoreData()) {
+					$state->curSyncItem = & $cmd;
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+				$state->incNumberOfElements();
 			}
 		}
-		Horde::logMessage("SyncML: handling sync (changes done) ".$currentCmdID, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		Horde :: logMessage("SyncML: handling sync (changes done) " . $currentCmdID, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		// handle deletes
-		if(is_array($deletes)) {
-			while($guid = array_shift($deletes)) {
+		if (is_array($deletes)) {
+			while ($guid = array_shift($deletes)) {
+				$currentSize = $output->getOutputSize();
+				// return if we have to much data
+				if (($maxEntries && ($state->getNumberOfElements() >= $maxEntries)
+					&& isset ($contentType['mayFragment'])
+					&& $contentType['mayFragment'])
+					|| ($maxMsgSize
+						&& (($currentSize +MIN_MSG_LEFT * 2) > $maxMsgSize))) {
+					// put the item back in the queue
+					$deletes[] = $guid;
+					$state->maxNumberOfElements();
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+
 				$guid_ts = $state->getSyncTSforAction($guid, 'delete');
 				$sync_ts = $state->getChangeTS($syncType, $guid);
-				Horde::logMessage("SyncML: timestamp delete guid_ts: $guid_ts sync_ts: $sync_ts", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				Horde :: logMessage("SyncML: timestamp delete guid_ts: $guid_ts sync_ts: $sync_ts",
+					__FILE__, __LINE__, PEAR_LOG_DEBUG);
 				if ($sync_ts && $sync_ts == $guid_ts) {
 					// Change was done by us upon request of client.
 					// Don't mirror that back to the client.
-					Horde::logMessage("SyncML: delete $guid ignored, came from client", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					Horde :: logMessage("SyncML: delete $guid ignored, came from client",
+						__FILE__, __LINE__, PEAR_LOG_DEBUG);
+					if ($sync_ts < $serverAnchorNext
+						&& ($locid = $state->getLocID($syncType, $guid))) {
+						// Now we can remove the past
+						$state->removeUID($syncType, $locid);
+					}
+					continue;
+				}
+				if ($guid_ts > $serverAnchorNext) {
+					// Change was made after we started this sync.
+					// Don't sent this now to the client.
+					Horde :: logMessage("SyncML: delete $guid is in our future: $serverAnchorNext", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					continue;
 				}
-
 				$locid = $state->getLocID($syncType, $guid);
 				if (!$locid) {
-					Horde::logMessage("SyncML: unable to create delete for $guid: locid not found in map", __FILE__, __LINE__, PEAR_LOG_WARNING);
+					Horde :: logMessage("SyncML: unable to delete $guid: locid not found in map", __FILE__, __LINE__, PEAR_LOG_INFO);
+					$state->log("Server-DeleteFailure");
 					continue;
 				}
 
-				Horde::logMessage("SyncML: delete: $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				Horde :: logMessage("SyncML: delete: $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				// Create a Delete request for client.
 				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
-				$cmd->setTargetURI($locid);
-				$cmd->setSourceURI($guid);
+				$cmd->setLocURI($locid);
 				$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Delete');
 				$state->log('Server-Delete');
 				$state->removeUID($syncType, $locid);
 
-				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
-				// return if we have to much data
-				if(++$counter >= MAX_ENTRIES
-					&& isset($contentType['mayFragment'])
-					&& $contentType['mayFragment'])
-				{
+				// moreData split; save in session state and end current message
+				if ($cmd->hasMoreData()) {
+					$state->curSyncItem = & $cmd;
 					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
 					return $currentCmdID;
 				}
+				$state->incNumberOfElements();
+			}
+		}
+
+		// handle remote deletes due to conflicts
+		if (count($remoteDeletes) > 0) {
+			while ($locid = array_shift($remoteDeletes)) {
+				$currentSize = $output->getOutputSize();
+				// return if we have to much data
+				if (($maxEntries && ($state->getNumberOfElements() >= $maxEntries)
+					&& isset ($contentType['mayFragment'])
+					&& $contentType['mayFragment'])
+					|| ($maxMsgSize
+						&& (($currentSize +MIN_MSG_LEFT * 2) > $maxMsgSize))) {
+					// put the item back in the queue
+					$remoteDeletes[] = $locid;
+					$state->maxNumberOfElements();
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+				Horde :: logMessage("SyncML: delete client locid: $locid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				// Create a Delete request for client.
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
+				$cmd->setLocURI($locid);
+				$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Delete');
+				$state->log('Server-DeletedConflicts');
+				$state->removeUID($syncType, $locid);
+
+				// moreData split; save in session state and end current message
+				if ($cmd->hasMoreData()) {
+					$state->curSyncItem = & $cmd;
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+				$state->incNumberOfElements();
 			}
 		}
 		#Horde::logMessage("SyncML: handling sync ".$currentCmdID, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		// handle missing  adds.
-		if(count($missedAdds) > 0) {
-			Horde::logMessage("SyncML: add missed changes as adds ".count($adds).' / '.$missedAdds[0], __FILE__, __LINE__, PEAR_LOG_DEBUG);
-			$state->setAddedItems($hordeType, array_merge($adds, $missedAdds));
-			$adds = &$state->getAddedItems($hordeType);
-			Horde::logMessage("SyncML: merged adds counter ".count($adds).' / '.$adds[0], __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		if (count($missedAdds) > 0) {
+			Horde :: logMessage("SyncML: add missed changes as adds " . count($adds) . ' / ' . $missedAdds[0], __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			$adds = array_merge($adds, $missedAdds);
+			Horde :: logMessage("SyncML: merged adds counter " . count($adds) . ' / ' . $adds[0], __FILE__, __LINE__, PEAR_LOG_DEBUG);
 		}
 
-		if(is_array($adds)) {
-			while($guid = array_shift($adds)) {
+		if (is_array($adds)) {
+			while ($guid = array_shift($adds)) {
+				$currentSize = $output->getOutputSize();
+				// return if we have to much data
+				if (($maxEntries && ($state->getNumberOfElements() >= $maxEntries)
+					&& isset ($contentType['mayFragment'])
+					&& $contentType['mayFragment'])
+					|| ($maxMsgSize
+						&& (($currentSize +MIN_MSG_LEFT * 2) > $maxMsgSize))) {
+					// put the item back in the queue
+					$adds[] = $guid;
+					$state->maxNumberOfElements();
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+
 				$guid_ts = $state->getSyncTSforAction($guid, 'add');
 				$sync_ts = $state->getChangeTS($syncType, $guid);
-				Horde::logMessage("SyncML: timestamp add $guid guid_ts: $guid_ts sync_ts: $sync_ts", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				Horde :: logMessage("SyncML: timestamp add $guid guid_ts: $guid_ts sync_ts: $sync_ts", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 				if ($sync_ts && $sync_ts == $guid_ts) {
 					// Change was done by us upon request of client.
 					// Don't mirror that back to the client.
-					Horde::logMessage("SyncML: add: $guid ignored, came from client", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					Horde :: logMessage("SyncML: add: $guid ignored, came from client", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					continue;
+				}
+				if ($guid_ts > $serverAnchorNext && !in_array($guid, $conflicts)) {
+					// Change was made after we started this sync.
+					// Don't sent this now to the client.
+					Horde :: logMessage("SyncML: add $guid is in our future: $serverAnchorNext", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					continue;
 				}
 
@@ -179,47 +333,65 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
 					// For slow sync (ts=0): do not add data for which we
 					// have a locid again.  This is a heuristic to avoid
 					// duplication of entries.
-					Horde::logMessage("SyncML: skipping add of guid $guid as there already is a locid $locid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					Horde :: logMessage("SyncML: skipping add of guid $guid as there already is a locid $locid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					continue;
 				}
-				Horde::logMessage("SyncML: add: $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				Horde :: logMessage("SyncML: add: $guid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 				// Create an Add request for client.
 				$contentType = $state->getPreferedContentTypeClient($this->_sourceLocURI, $this->_targetLocURI);
 
-				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
-				$c = $registry->call($hordeType . '/export',
-					array(
-						'guid'		=> $guid ,
-						'contentType'	=> $contentType ,
-					)
-				);
+				$c = $registry->call($hordeType . '/export', array (
+					'guid' => $guid,
+					'contentType' => $contentType,
 
-				if (!is_a($c, 'PEAR_Error')) {
+				));
+
+				if (is_a($c, 'PEAR_Error')) {
 					// Item in history but not in database. Strange, but can happen.
-					$cmd->setContent($c);
-					$cmd->setContentType($contentType['ContentType']);
-					if (isset($contentType['ContentFormat']))
-					{
-						$cmd->setContentFormat($contentType['ContentFormat']);
-					}
-					$cmd->setSourceURI($guid);
-					$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Add');
-					$state->log('Server-Add');
+					Horde :: logMessage("SyncML: add: export of guid $guid failed:\n" . print_r($c, true), __FILE__, __LINE__, PEAR_LOG_WARNING);
+					continue;
+				}
 
-					// return if we have to much data
-					if(++$counter >= MAX_ENTRIES
-						&& isset($contentType['mayFragment'])
-						&& $contentType['mayFragment'])
-					{
+				$size = strlen($c);
+				// return if we have to much data
+				if ($maxMsgSize && !$deviceInfo['supportLargeObjs']) {
+					if (($size +MIN_MSG_LEFT * 2) > $maxMsgSize) {
+						Horde :: logMessage("SyncML: add: export of guid $guid failed due to size $size", __FILE__, __LINE__, PEAR_LOG_ERROR);
+						$state->log("Server-ExportFailed");
+						continue;
+					}
+					if (($currentSize + $size +MIN_MSG_LEFT * 2) > $maxMsgSize) {
+						// put the item back in the queue
+						$adds[] = $guid;
 						$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
 						return $currentCmdID;
 					}
 				}
+
+				Horde :: logMessage("SyncML: add guid $guid to client\n$c", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				$cmd = new Horde_SyncML_Command_Sync_ContentSyncElement();
+				$cmd->setContent($c);
+				$cmd->setContentType($contentType['ContentType']);
+				if (isset ($contentType['ContentFormat'])) {
+					$cmd->setContentFormat($contentType['ContentFormat']);
+				}
+				$cmd->setGUID($guid);
+				$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Add');
+				$state->log('Server-Add');
+
+				// moreData split; put the guid back in the list and return
+				if ($cmd->hasMoreData()) {
+					$state->curSyncItem = & $cmd;
+					$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
+					return $currentCmdID;
+				}
+				$state->incNumberOfElements();
 			}
 		}
-		#Horde::logMessage("SyncML: handling sync ".$currentCmdID, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		Horde::logMessage("SyncML: All items handled for sync $syncType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
+		$state->removeExpiredUID($syncType, time());
 		$state->clearSync($syncType);
 
 		return $currentCmdID;
@@ -228,24 +400,53 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
 	function loadData() {
 		global $registry;
 
-		$state = &$_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 		$syncType = $this->_targetLocURI;
 		$hordeType = $state->getHordeType($syncType);
+		$state->setTargetURI($syncType);
 		$refts = $state->getServerAnchorLast($syncType);
+		$future = $state->getServerAnchorNext($syncType);
+		$delta_mod = 0;
+		$delta_add = 0;
 
-		Horde::logMessage("SyncML: reading changed items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		$state->setChangedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'modify', 'timestamp' => $refts)));
+		Horde :: logMessage("SyncML: reading changed items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		$delta_mod = count($registry->call($hordeType . '/listBy', array (
+			'action' => 'modify',
+			'timestamp' => $future,
+			'type' => $syncType,
+			'filter' => $this->_filterExpression
+		)));
+		$state->setChangedItems($syncType, $registry->call($hordeType . '/listBy', array (
+			'action' => 'modify',
+			'timestamp' => $refts,
+			'type' => $syncType,
+			'filter' => $this->_filterExpression
+		)));
 
-		Horde::logMessage("SyncML: reading deleted items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		$state->setDeletedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'delete', 'timestamp' => $refts)));
+		Horde :: logMessage("SyncML: reading deleted items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		$state->setDeletedItems($syncType, $registry->call($hordeType . '/listBy', array (
+			'action' => 'delete',
+			'timestamp' => $refts,
+			'type' => $syncType,
+			'filter' => $this->_filterExpression
+		)));
 
-		Horde::logMessage("SyncML: reading added items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-		$state->setAddedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'add', 'timestamp' => $refts)));
+		Horde :: logMessage("SyncML: reading added items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		$delta_add = count($registry->call($hordeType . '/listBy', array (
+			'action' => 'add',
+			'timestamp' => $future,
+			'type' => $syncType,
+			'filter' => $this->_filterExpression
+		)));
+		$state->setAddedItems($syncType, $registry->call($hordeType . '/listBy', array (
+			'action' => 'add',
+			'timestamp' => $refts,
+			'type' => $syncType,
+			'filter' => $this->_filterExpression
+		)));
 
 		$this->_syncDataLoaded = TRUE;
 
-		return count($state->getChangedItems($hordeType)) +
-			count($state->getDeletedItems($hordeType)) +
-			count($state->getAddedItems($hordeType));
+		return count($state->getChangedItems($syncType)) - $delta_mod +count($state->getDeletedItems($syncType)) + count($state->getAddedItems($syncType)) - $delta_add +count($state->getConflictItems($syncType));
 	}
-}
+}
\ No newline at end of file
diff --git a/phpgwapi/inc/horde/Horde/iCalendar.php b/phpgwapi/inc/horde/Horde/iCalendar.php
index d11227aaed..d0aecd085e 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar.php
@@ -1,104 +1,149 @@
 <?php
 /**
+ * eGroupWare - iCalendar based on Horde 3
+ *
  * Class representing iCalendar files.
  *
- * $Horde: framework/iCalendar/iCalendar.php,v 1.53 2004/09/24 03:34:43 chuck Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Using the PEAR Log class (which need to be installed!)
  *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
- * @since   Horde 3.0
- * @package Horde_iCalendar
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage horde
+ * @author Mike Cochrane <mike@graftonhall.co.nz>
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) The Horde Project (http://www.horde.org/)
+ * @version $Id$
+ */
+
+/**
+ * Class representing iCalendar files.
  */
 class Horde_iCalendar {
 
     /**
      * The parent (containing) iCalendar object.
      *
-     * @var object Horde_iCalendar $_container
+     * @var Horde_iCalendar
      */
     var $_container = false;
 
+    /**
+     * The name/value pairs of attributes for this object (UID,
+     * DTSTART, etc.). Which are present depends on the object and on
+     * what kind of component it is.
+     *
+     * @var array
+     */
     var $_attributes = array();
 
+    /**
+     * Any children (contained) iCalendar components of this object.
+     *
+     * @var array
+     */
     var $_components = array();
 
     /**
-     * According to RFC 2425, we should always use CRLF-terminated
-     * lines.
+     * According to RFC 2425, we should always use CRLF-terminated lines.
      *
-     * @var string $_newline
+     * @var string
      */
     var $_newline = "\r\n";
 
     /**
-     * Return a reference to a new component.
+     * iCalendar format version (different behavior for 1.0 and 2.0
+     * especially with recurring events).
      *
-     * @param string $type       The type of component to return
-     * @param object $container  A container that this component
-     *                           will be associated with.
-     *
-     * @return object  Reference to a Horde_iCalendar_* object as specified.
+     * @var string
      */
-    function &newComponent($type, &$container)
+    var $_version;
+
+    function Horde_iCalendar($version = '2.0')
     {
-#        require_once 'Horde/String.php';
-        $type = strtolower($type);
-        #error_log("called horde ical new comp". print_r($type,true) );
-		$class = 'Horde_iCalendar_' . strtolower($type);
-		if (!class_exists($class,false)) {
-			include_once dirname(__FILE__) . '/iCalendar/' . $type . '.php';
-		}
-		if (class_exists($class)) {
-			#include_once dirname(__FILE__) . '/iCalendar/' . $type . '.php';
-			$component = new $class();
-			if ($container !== false) {
-				$component->_container = &$container;
-			}
-			return $component;
-		} else {
-			// Should return an dummy x-unknown type class here.
-			return false;
-		}
+        $this->_version = $version;
+        $this->setAttribute('VERSION', $version);
     }
 
     /**
-     * Set the value of an attribute.
+     * Return a reference to a new component.
      *
-     * @param string  $name   The name of the attribute.
-     * @param string  $value  The value of the attribute.
-     * @param array   $params (optional) Array containing any addition
-     *                        parameters for this attribute.
-     * @param boolean $append (optional) True to append the attribute, False
-     *                        to replace the first matching attribute found.
-     * @param array $values   (optional) array representation of $value.
-     *                        For comma/semicolon seperated lists of values.
-     *                        If not set use $value as single array element.
+     * @param string          $type       The type of component to return
+     * @param Horde_iCalendar $container  A container that this component
+     *                                    will be associated with.
+     *
+     * @return object  Reference to a Horde_iCalendar_* object as specified.
+     *
+     * @static
      */
-    function setAttribute($name, $value, $params = array(), $append = true, $values = false)
+    function &newComponent($type, &$container)
     {
-        $found = $append;
+        $type = String::lower($type);
+        $class = 'Horde_iCalendar_' . $type;
+        if (!class_exists($class)) {
+            include 'Horde/iCalendar/' . $type . '.php';
+        }
+        if (class_exists($class)) {
+            $component = new $class();
+            if ($container !== false) {
+                $component->_container = &$container;
+                // Use version of container, not default set by component
+                // constructor.
+                $component->_version = $container->_version;
+            }
+        } else {
+            // Should return an dummy x-unknown type class here.
+            $component = false;
+        }
+
+        return $component;
+    }
+
+    /**
+     * Sets the value of an attribute.
+     *
+     * @param string $name     The name of the attribute.
+     * @param string $value    The value of the attribute.
+     * @param array $params    Array containing any addition parameters for
+     *                         this attribute.
+     * @param boolean $append  True to append the attribute, False to replace
+     *                         the first matching attribute found.
+     * @param array $values    Array representation of $value.  For
+     *                         comma/semicolon seperated lists of values.  If
+     *                         not set use $value as single array element.
+     */
+    function setAttribute($name, $value, $params = array(), $append = true,
+                          $values = false)
+    {
+        // Make sure we update the internal format version if
+        // setAttribute('VERSION', ...) is called.
+        if ($name == 'VERSION') {
+            $this->_version = $value;
+            if ($this->_container !== false) {
+                $this->_container->_version = $value;
+            }
+        }
+
         if (!$values) {
             $values = array($value);
         }
-        $keys = array_keys($this->_attributes);
-        foreach ($keys as $key) {
-            if ($found) break;
-            if ($this->_attributes[$key]['name'] == $name) {
-                $this->_attributes[$key]['params'] = $params;
-                $this->_attributes[$key]['value'] = $value;
-                $this->_attributes[$key]['values'] = $values;
-                $found = true;
+        $found = false;
+        if (!$append) {
+            foreach (array_keys($this->_attributes) as $key) {
+                if ($this->_attributes[$key]['name'] == String::upper($name)) {
+                    $this->_attributes[$key]['params'] = $params;
+                    $this->_attributes[$key]['value'] = $value;
+                    $this->_attributes[$key]['values'] = $values;
+                    $found = true;
+                    break;
+                }
             }
         }
 
         if ($append || !$found) {
             $this->_attributes[] = array(
-                'name'      => $name,
+                'name'      => String::upper($name),
                 'params'    => $params,
                 'value'     => $value,
                 'values'    => $values
@@ -110,18 +155,18 @@ class Horde_iCalendar {
      * Sets parameter(s) for an (already existing) attribute.  The
      * parameter set is merged into the existing set.
      *
-     * @param string $name    The name of the attribute.
-     * @param array  $params  Array containing any additional
-     *                        parameters for this attribute.
+     * @param string $name   The name of the attribute.
+     * @param array $params  Array containing any additional parameters for
+     *                       this attribute.
      * @return boolean  True on success, false if no attribute $name exists.
      */
-    function setParameter($name, $params)
+    function setParameter($name, $params = array())
     {
         $keys = array_keys($this->_attributes);
         foreach ($keys as $key) {
             if ($this->_attributes[$key]['name'] == $name) {
                 $this->_attributes[$key]['params'] =
-                    array_merge((array)$this->_attributes[$key]['params'] , $params);
+                    array_merge($this->_attributes[$key]['params'], $params);
                 return true;
             }
         }
@@ -132,9 +177,9 @@ class Horde_iCalendar {
     /**
      * Get the value of an attribute.
      *
-     * @param string  $name    The name of the attribute.
-     * @param boolean $params  Return the parameters for this attribute
-     *                         instead of its value.
+     * @param string $name     The name of the attribute.
+     * @param boolean $params  Return the parameters for this attribute instead
+     *                         of its value.
      *
      * @return mixed (object)  PEAR_Error if the attribute does not exist.
      *               (string)  The value of the attribute.
@@ -153,7 +198,7 @@ class Horde_iCalendar {
                 }
             }
         }
-        if (count($result) == 0) {
+        if (!count($result)) {
             require_once 'PEAR.php';
             return PEAR::raiseError('Attribute "' . $name . '" Not Found');
         } if (count($result) == 1 && !$params) {
@@ -171,7 +216,7 @@ class Horde_iCalendar {
      *  b) (unsecapd) comma seperated lists.
      *
      * So for a vcard like "KEY:a,b\nKEY:c" getAttributesValues('KEY')
-     * will return array('a','b','c').
+     * will return array('a', 'b', 'c').
      *
      * @param string  $name    The name of the attribute.
      * @return mixed (object)  PEAR_Error if the attribute does not exist.
@@ -195,9 +240,9 @@ class Horde_iCalendar {
      * Returns the value of an attribute, or a specified default value
      * if the attribute does not exist.
      *
-     * @param string $name     The name of the attribute.
-     * @param mixed  $default  (optional) What to return if the attribute
-     *                         specified by $name does not exist.
+     * @param string $name    The name of the attribute.
+     * @param mixed $default  What to return if the attribute specified by
+     *                        $name does not exist.
      *
      * @return mixed (string) The value of $name.
      *               (mixed)  $default if $name does not exist.
@@ -211,7 +256,7 @@ class Horde_iCalendar {
     /**
      * Remove all occurences of an attribute.
      *
-     * @param string  $name   The name of the attribute.
+     * @param string $name  The name of the attribute.
      */
     function removeAttribute($name)
     {
@@ -226,9 +271,10 @@ class Horde_iCalendar {
     /**
      * Get attributes for all tags or for a given tag.
      *
-     * @param string  $tag   (optional) return attributes for this tag.
-     *                       or all attributes if not given
-     * @return array  Array containing all the attributes and their types.
+     * @param string $tag  Return attributes for this tag, or all attributes if
+     *                     not given.
+     *
+     * @return array  An array containing all the attributes and their types.
      */
     function getAllAttributes($tag = false)
     {
@@ -247,7 +293,7 @@ class Horde_iCalendar {
     /**
      * Add a vCalendar component (eg vEvent, vTimezone, etc.).
      *
-     * @param object Horde_iCalendar $component  Component (subclass) to add.
+     * @param Horde_iCalendar $component  Component (subclass) to add.
      */
     function addComponent($component)
     {
@@ -267,6 +313,11 @@ class Horde_iCalendar {
         return $this->_components;
     }
 
+    function getType()
+    {
+        return 'vcalendar';
+    }
+
     /**
      * Return the classes (entry types) we have.
      *
@@ -316,20 +367,18 @@ class Horde_iCalendar {
     }
 
     /**
-     * Locates the first child component of the specified class, and
-     * returns a reference to this component.
+     * Locates the first child component of the specified class, and returns a
+     * reference to it.
      *
      * @param string $type  The type of component to find.
      *
-     * @return mixed (boolean) False if no subcomponent of the specified
-     *                         class exists.
-     *               (Horde_iCalendar_*) A reference to the requested component.
+     * @return boolean|Horde_iCalendar_*  False if no subcomponent of the
+     *                                    specified class exists or a reference
+     *                                    to the requested component.
      */
     function &findComponent($childclass)
     {
-#        require_once 'Horde/String.php';
-#        $childclass = 'Horde_iCalendar_' . String::lower($childclass);
-        $childclass = 'Horde_iCalendar_' . strtolower($childclass);
+        $childclass = 'Horde_iCalendar_' . String::lower($childclass);
         $keys = array_keys($this->_components);
         foreach ($keys as $key) {
             if (is_a($this->_components[$key], $childclass)) {
@@ -337,12 +386,47 @@ class Horde_iCalendar {
             }
         }
 
-        return false;
+        $component = false;
+        return $component;
     }
 
     /**
-     * Clears the iCalendar object (resets the components and
-     * attributes arrays).
+     * Locates the first matching child component of the specified class, and
+     * returns a reference to it.
+     *
+     * @param string $childclass  The type of component to find.
+     * @param string $attribute   This attribute must be set in the component
+     *                            for it to match.
+     * @param string $value       Optional value that $attribute must match.
+     *
+     * @return boolean|Horde_iCalendar_*  False if no matching subcomponent of
+     *                                    the specified class exists, or a
+     *                                    reference to the requested component.
+     */
+    function &findComponentByAttribute($childclass, $attribute, $value = null)
+    {
+        $childclass = 'Horde_iCalendar_' . String::lower($childclass);
+        $keys = array_keys($this->_components);
+        foreach ($keys as $key) {
+            if (is_a($this->_components[$key], $childclass)) {
+                $attr = $this->_components[$key]->getAttribute($attribute);
+                if (is_a($attr, 'PEAR_Error')) {
+                    continue;
+                }
+                if ($value !== null && $value != $attr) {
+                    continue;
+                }
+                return $this->_components[$key];
+            }
+        }
+
+        $component = false;
+        return $component;
+    }
+
+    /**
+     * Clears the iCalendar object (resets the components and attributes
+     * arrays).
      */
     function clear()
     {
@@ -350,15 +434,39 @@ class Horde_iCalendar {
         $this->_attributes = array();
     }
 
+    /**
+     * Checks if entry is vcalendar 1.0, vcard 2.1 or vnote 1.1.
+     *
+     * These 'old' formats are defined by www.imc.org. The 'new' (non-old)
+     * formats icalendar 2.0 and vcard 3.0 are defined in rfc2426 and rfc2445
+     * respectively.
+     *
+     * @since Horde 3.1.2
+     */
+    function isOldFormat()
+    {
+	$retval = true;
+	switch ($this->getType()) {
+		case 'vcard':
+            		$retval = ($this->_version < 3);
+			break;
+		case 'vNote':
+            		$retval = ($this->_version < 2);
+			break;
+		default:
+			$retval = ($this->_version < 2);
+			break;
+	}
+        return $retval;
+    }
+
     /**
      * Export as vCalendar format.
      */
     function exportvCalendar()
     {
-	#error_log(__METHOD__.": called");
         // Default values.
-        $requiredAttributes['VERSION'] = '2.0';
-        $requiredAttributes['PRODID'] = '-//The Horde Project//Horde_iCalendar Library, Horde 3.0-cvs //EN';
+        $requiredAttributes['PRODID'] = '-//The Horde Project//Horde_iCalendar Library' . (defined('HORDE_VERSION') ? ', Horde ' . constant('HORDE_VERSION') : '') . '//EN';
         $requiredAttributes['METHOD'] = 'PUBLISH';
 
         foreach ($requiredAttributes as $name => $default_value) {
@@ -366,17 +474,14 @@ class Horde_iCalendar {
                 $this->setAttribute($name, $default_value);
             }
         }
-	//error_log(__METHOD__.":requiredAttributes->".print_r($requiredAttributes,true));
-	//njv:$buffcontent = ob_get_clean();
-	#error_log(__METHOD__.":".print_r($buffcontent,true));
-	#ob_end_clean();
-        return $this->_exportvData('VCALENDAR') . $this->_newline;
+
+        return $this->_exportvData('VCALENDAR');
     }
 
     /**
      * Export this entry as a hash array with tag names as keys.
      *
-     * @param boolean (optional) $paramsInKeys
+     * @param boolean $paramsInKeys
      *                If false, the operation can be quite lossy as the
      *                parameters are ignored when building the array keys.
      *                So if you export a vcard with
@@ -403,85 +508,112 @@ class Horde_iCalendar {
     }
 
     /**
-     * Parse a string containing vCalendar data.
+     * Parses a string containing vCalendar data.
      *
-     * @param string  $text  The data to parse.
-     * @param string  $base  The type of the base object.
-     * @param string  $charset (optional) The encoding charset for $text. Defaults to utf-8
-     * @param boolean $clear (optional) True to clear() the iCal object before parsing.
+     * @todo This method doesn't work well at all, if $base is VCARD.
+     *
+     * @param string $text     The data to parse.
+     * @param string $base     The type of the base object.
+     * @param string $charset  The encoding charset for $text. Defaults to
+     *                         utf-8 for new format, iso-8859-1 for old format.
+     * @param boolean $clear   If true clears the iCal object before parsing.
      *
      * @return boolean  True on successful import, false otherwise.
      */
-    function parsevCalendar($text, $base = 'VCALENDAR', $charset = 'utf-8', $clear = true)
+    function parsevCalendar($text, $base = 'VCALENDAR', $charset = null,
+                            $clear = true)
     {
         if ($clear) {
             $this->clear();
         }
-        error_log(__FILE__ . __METHOD__ . ":\n".$text."\n xxxxxxxxx");
-	if (preg_match('/(BEGIN:' . $base . '\r?\n)([\W\w]*)(END:' . $base . '\r?\n?)/i', $text, $matches)) {
-            $vCal = $matches[2];
+
+        if (preg_match('/^BEGIN:' . $base . '(.*)^END:' . $base . '/ism', $text, $matches)) {
+            $container = true;
+            $vCal = $matches[1];
         } else {
             // Text isn't enclosed in BEGIN:VCALENDAR
             // .. END:VCALENDAR. We'll try to parse it anyway.
+            $container = false;
             $vCal = $text;
         }
 
+        if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $vCal, $matches)) {
+            // define the version asap
+            #Horde::logMessage("iCalendar VERSION:" . $matches[1], __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            $this->setAttribute('VERSION', $matches[1]);
+        }
+
+	// Preserve a trailing CR
+        $vCal = trim($vCal) . "\n";
+
         // All subcomponents.
         $matches = null;
-        if (preg_match_all('/BEGIN:([\S]*)(\r\n|\r|\n)([\W\w]*)END:\1(\r\n|\r|\n)/U', $vCal, $matches)) {
+        if (preg_match_all('/^BEGIN:(.*)(\r\n|\r|\n)(.*)^END:\1/Uims', $vCal, $matches)) {
+            // vTimezone components are processed first. They are
+            // needed to process vEvents that may use a TZID.
             foreach ($matches[0] as $key => $data) {
-                $type = $matches[1][$key];
-                $component = &Horde_iCalendar::newComponent(trim($type), $this);
+                $type = trim($matches[1][$key]);
+                if ($type != 'VTIMEZONE') {
+                    continue;
+                }
+                $component = &Horde_iCalendar::newComponent($type, $this);
                 if ($component === false) {
                     return PEAR::raiseError("Unable to create object for type $type");
                 }
-                $component->parsevCalendar($data);
+                $component->parsevCalendar($data, $type, $charset);
 
                 $this->addComponent($component);
 
                 // Remove from the vCalendar data.
                 $vCal = str_replace($data, '', $vCal);
             }
+
+            // Now process the non-vTimezone components.
+            foreach ($matches[0] as $key => $data) {
+                $type = trim($matches[1][$key]);
+                if ($type == 'VTIMEZONE') {
+                    continue;
+                }
+                $component = &Horde_iCalendar::newComponent($type, $this);
+                if ($component === false) {
+                    return PEAR::raiseError("Unable to create object for type $type");
+                }
+                $component->parsevCalendar($data, $type, $charset);
+
+                $this->addComponent($component);
+
+                // Remove from the vCalendar data.
+                $vCal = str_replace($data, '', $vCal);
+            }
+        } elseif (!$container) {
+            return false;
+        }
+
+        // Unfold "quoted printable" folded lines like:
+        //  BODY;ENCODING=QUOTED-PRINTABLE:=
+        //  another=20line=
+        //  last=20line
+        while (preg_match_all('/^([^:]+;\s*((ENCODING=)?QUOTED-PRINTABLE|ENCODING=[Q|q])(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches)) {
+            foreach ($matches[1] as $s) {
+                $r = preg_replace('/=\r?\n[ \t]*/', '', $s);
+                $vCal = str_replace($s, $r, $vCal);
+            }
         }
 
         // Unfold any folded lines.
-        #$vCal = preg_replace ('/(\r|\n)+ /', ' ', $vCal);
-
-        // Unfold "quoted printable" folded lines like:
-        //  BODY;ENCODING=QUOTED-PRINTABLE:=
-        //  another=20line=
-        //  last=20line
-#        Horde::logMessage("SymcML: match 1", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-#        if (preg_match_all('/^([^:]+;\s*ENCODING=QUOTED-PRINTABLE(.*=[\r\n|\r|\n])+(.*[^=])[\r\n|\r|\n])/mU', $vCal, $matches)) {
-##        if (preg_match_all('/^(BODY;ENCODING=QUOTED-PRINTABLE(.*=\r\n)+(.*)?\r?\n)/mU', $vCal, $matches)) {
-#	    Horde::logMessage("SymcML: match 2", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-#            foreach ($matches[1] as $s) {
-#	        Horde::logMessage("SymcML: match 3 $s", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-#                $r = preg_replace('/=[\r\n|\r|\n]/', '', $s);
-#	        Horde::logMessage("SymcML: match 4 $r", __FILE__, __LINE__, PEAR_LOG_DEBUG);
-#                $vCal = str_replace($s, $r, $vCal);
-#            }
-#        }
-
-        // Unfold "quoted printable" folded lines like:
-        //  BODY;ENCODING=QUOTED-PRINTABLE:=
-        //  another=20line=
-        //  last=20line
-        #if (preg_match_all('/^([^:]+;\s*ENCODING=QUOTED-PRINTABLE(.*=*\s))/mU', $vCal, $matches)) {
-	#    $matches = preg_split('/=+\s/',$vCal);
-	#    $vCal = implode('',$matches);
-        #}
-        if (preg_match_all('/^([^:]+;\s*ENCODING=QUOTED-PRINTABLE(.*=*\s))/mU', $vCal, $matches)) {
-	    $matches = preg_split('/=(\r\n|\r|\n)/',$vCal);
-	    $vCal = implode('',$matches);
+        if ($this->isOldFormat()) {
+        	$vCal = preg_replace('/[\r\n]+([ \t])/', '\1', $vCal);
+        } else {
+        	$vCal = preg_replace('/[\r\n]+[ \t]/', '', $vCal);
         }
 
-        // Parse the remaining attributes.
+		$isDate = false;
 
-        if (preg_match_all('/(.*):([^\r\n]*)[\r\n]+/', $vCal, $matches)) {
+        // Parse the remaining attributes.
+        if (preg_match_all('/^((?:[^":]+|(?:"[^"]*")+)*):([^\r\n]*)\r?$/m', $vCal, $matches)) {
             foreach ($matches[0] as $attribute) {
-                preg_match('/([^;^:]*)((;[^:]*)?):([^\r\n]*)[\r\n]*/', $attribute, $parts);
-                $tag = $parts[1];
+                preg_match('/([^;^:]*)((;(?:[^":]+|(?:"[^"]*")+)*)?):([^\r\n]*)[\r\n]*/', $attribute, $parts);
+                $tag = trim(String::upper($parts[1]));
                 $value = $parts[4];
                 $params = array();
 
@@ -489,64 +621,91 @@ class Horde_iCalendar {
                 if (!empty($parts[2])) {
                     preg_match_all('/;(([^;=]*)(=([^;]*))?)/', $parts[2], $param_parts);
                     foreach ($param_parts[2] as $key => $paramName) {
+                        $paramName = String::upper($paramName);
                         $paramValue = $param_parts[4][$key];
+                        if ($paramName == 'TYPE') {
+                            $paramValue = preg_split('/(?<!\\\\),/', $paramValue);
+                            if (count($paramValue) == 1) {
+                                $paramValue = $paramValue[0];
+                            }
+                        }
                         $params[$paramName] = $paramValue;
                     }
                 }
 
                 // Charset and encoding handling.
-                
-
-				// njv sanity todo: decode  text fields containing qp but not tagged
-					
-
-				if ((isset($params['ENCODING'])
-                     && $params['ENCODING'] == 'QUOTED-PRINTABLE')
-                    || isset($params['QUOTED-PRINTABLE'])) {
-
-                    $value = quoted_printable_decode($value);
-                }
-
-                if (isset($params['CHARSET'])) {
-                    $value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
+		if (isset($params['QUOTED-PRINTABLE'])) {
+			$params['ENCODING'] = 'QUOTED-PRINTABLE';
+		}
+		if (isset($params['BASE64'])) {
+			$params['ENCODING'] = 'BASE64';
+		}
+                if (isset($params['ENCODING'])) {
+		     switch (String::upper($params['ENCODING'])) {
+                           case 'Q':
+                           case 'QUOTED-PRINTABLE':
+                                 $value = quoted_printable_decode($value);
+                                 if (isset($params['CHARSET'])) {
+									$value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
+                                 } else {
+									$value = $GLOBALS['egw']->translation->convert($value,
+										empty($charset) ? ($this->isOldFormat() ? 'iso-8859-1' : 'utf-8') : $charset);
+                                 }
+                                 break;
+                           case 'B':
+                           case 'BASE64':
+                                 $value = base64_decode($value);
+                                 break;
+                        }
+                } elseif (isset($params['CHARSET'])) {
+					$value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
                 } else {
-                    // As per RFC 2279, assume UTF8 if we don't have
-                    // an explicit charset parameter.
-                    $value = $GLOBALS['egw']->translation->convert($value, 'utf-8');
+                    // As per RFC 2279, assume UTF8 if we don't have an
+                    // explicit charset parameter.
+					$value = $GLOBALS['egw']->translation->convert($value,
+						empty($charset) ? ($this->isOldFormat() ? 'iso-8859-1' : 'utf-8') : $charset);
                 }
 
+                // Get timezone info for date fields from $params.
+                $tzid = isset($params['TZID']) ? trim($params['TZID'], '\"') : false;
+
                 switch ($tag) {
+		case 'VERSION': // already processed
+			break;
                 // Date fields.
-                case 'DTSTAMP':
                 case 'COMPLETED':
                 case 'CREATED':
                 case 'LAST-MODIFIED':
-                case 'BDAY':
-                case 'DTEND':
-                case 'DTSTART':
-                case 'DUE':
-                case 'RECURRENCE-ID':
-                    $this->setAttribute($tag, $this->_parseDateTime($value), $params);
+                    $this->setAttribute($tag, $this->_parseDateTime($value, $tzid), $params);
                     break;
 
-                case 'RDATE':
-                    if (isset($params['VALUE'])) {
-                        if ($params['VALUE'] == 'DATE') {
-                            $this->setAttribute($tag, $this->_parseDate($value), $params);
-                        } elseif ($params['VALUE'] == 'PERIOD') {
-                            $this->setAttribute($tag, $this->_parsePeriod($value), $params);
-                        } else {
-                            $this->setAttribute($tag, $this->_parseDateTime($value), $params);
-                        }
+                case 'BDAY':
+                case 'X-SYNCJE-ANNIVERSARY':
+                    $this->setAttribute($tag, $value, $params, true, $this->_parseDate($value));
+                    break;
+
+                case 'DTEND':
+                case 'DTSTART':
+                case 'DTSTAMP':
+                case 'DUE':
+                case 'AALARM':
+                case 'DALARM':
+                case 'RECURRENCE-ID':
+                    // types like AALARM may contain additional data after a ;
+                    // ignore these.
+                    $ts = explode(';', $value);
+                    if (isset($params['VALUE']) && $params['VALUE'] == 'DATE') {
+                    	$isDate = true;
+                        $this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params, true, $this->_parseDate($ts[0]));
                     } else {
-                        $this->setAttribute($tag, $this->_parseDateTime($value), $params);
+                        $this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params);
                     }
                     break;
 
                 case 'TRIGGER':
                     if (isset($params['VALUE'])) {
                         if ($params['VALUE'] == 'DATE-TIME') {
-                            $this->setAttribute($tag, $this->_parseDateTime($value), $params);
+                            $this->setAttribute($tag, $this->_parseDateTime($value, $tzid), $params);
                         } else {
                             $this->setAttribute($tag, $this->_parseDuration($value), $params);
                         }
@@ -555,24 +714,21 @@ class Horde_iCalendar {
                     }
                     break;
 
-                // Comma and semicolon seperated dates.
+                // Comma or semicolon seperated dates.
                 case 'EXDATE':
-                    $values = array();
-                    $dates = array();
-                    preg_match_all('/[,;]([^,;]*)/', ';' . $value, $values);
+                case 'RDATE':
+	                $dates = array();
+		            preg_match_all('/[;,]([^;,]*)/', ';' . $value, $values);
 
                     foreach ($values[1] as $value) {
-                        if (isset($params['VALUE'])) {
-                            if ($params['VALUE'] == 'DATE-TIME') {
-                                $dates[] = $this->_parseDateTime($value);
-                            } elseif ($params['VALUE'] == 'DATE') {
-                                $dates[] = $this->_parseDate($value);
-                            }
-                        } else {
-                            $dates[] = $this->_parseDateTime($value);
-                        }
+	                    if ((isset($params['VALUE'])
+			                    && $params['VALUE'] == 'DATE') || (!isset($params['VALUE']) && $isDate)) {
+		                    $dates[] = $this->_parseDate($value);
+	                    } else {
+		                    $dates[] = $this->_parseDateTime($value, $tzid);
+	                    }
                     }
-                    $this->setAttribute($tag, $dates, $params);
+                    $this->setAttribute($tag, isset($dates[0]) ? $dates[0] : null, $params, true, $dates);
                     break;
 
                 // Duration fields.
@@ -582,14 +738,13 @@ class Horde_iCalendar {
 
                 // Period of time fields.
                 case 'FREEBUSY':
-                    $values = array();
                     $periods = array();
-                    preg_match_all('/[,;]([^,;]*)/', ';' . $value, $values);
+                    preg_match_all('/,([^,]*)/', ',' . $value, $values);
                     foreach ($values[1] as $value) {
                         $periods[] = $this->_parsePeriod($value);
                     }
 
-                    $this->setAttribute($tag, $periods, $params);
+                    $this->setAttribute($tag, isset($periods[0]) ? $periods[0] : null, $params, true, $periods);
                     break;
 
                 // UTC offset fields.
@@ -608,61 +763,96 @@ class Horde_iCalendar {
 
                 // Geo fields.
                 case 'GEO':
-                    $floats = explode(';', $value);
-                    $value['latitude'] = floatval($floats[0]);
-                    $value['longitude'] = floatval($floats[1]);
+                    if ($this->isOldFormat()) {
+                        $floats = explode(',', $value);
+                        $value = array('latitude' => floatval($floats[1]),
+                                       'longitude' => floatval($floats[0]));
+                    } else {
+                        $floats = explode(';', $value);
+                        $value = array('latitude' => floatval($floats[0]),
+                                       'longitude' => floatval($floats[1]));
+                    }
                     $this->setAttribute($tag, $value, $params);
                     break;
 
-                // Recursion fields.
-                case 'EXRULE':
-                case 'RRULE':
-                    $this->setAttribute($tag, trim($value), $params);
+                // Recursion fields. # add more flexibility
+                #case 'EXRULE':
+                #case 'RRULE':
+                #    $this->setAttribute($tag, trim($value), $params);
+                #    break;
+
+		// Binary fields.
+		case 'PHOTO':
+                    $this->setAttribute($tag, $value, $params);
                     break;
 
-                // ADR an N are lists seperated by unescaped semi-colons.
+                // ADR, ORG and N are lists seperated by unescaped semicolons
+                // with a specific number of slots.
                 case 'ADR':
                 case 'N':
                 case 'ORG':
-
                     $value = trim($value);
-                    // As of rfc 2426 2.4.2 semi-colon, comma, and
-                    // colon must be escaped.
-                    // njv an "urban myth" a colon is tsafe and should not be escaped
-		    		$value = str_replace('\\n', $this->_newline, $value);
-                    $value = str_replace('\\,', ',', $value);
-                    //njv:$value = str_replace('\\:', ':', $value);
+                    // As of rfc 2426 2.4.2 semicolon, comma, and colon must
+                    // be escaped (comma is unescaped after splitting below).
+                    $value = str_replace(array('\\n', '\\N', '\\;', '\\:'),
+                                         array("\n", "\n", ';', ':'),
+                                         $value);
 
-                    // Split by unescaped semi-colons:
-                    $values = preg_split('/(?<!\\\\);/',$value);
+                    // Split by unescaped semicolons:
+                    $values = preg_split('/(?<!\\\\);/', $value);
                     $value = str_replace('\\;', ';', $value);
                     $values = str_replace('\\;', ';', $values);
+                    $value = str_replace('\\,', ',', $value);
+                    $values = str_replace('\\,', ',', $values);
                     $this->setAttribute($tag, trim($value), $params, true, $values);
+                    break;
 
+                // CATEGORIES is a lists seperated by unescaped commas
+                // with a unspecific number of slots.
+                case 'CATEGORIES':
+                    $value = trim($value);
+                    // As of rfc 2426 2.4.2 semicolon, comma, and colon must
+                    // be escaped (semicolon is unescaped after splitting below).
+                    $value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
+                                         array("\n", "\n", ',', ':'),
+                                         $value);
+
+                    // Split by unescaped commas:
+                    $values = preg_split('/(?<!\\\\),/', $value);
+                    $value = str_replace('\\;', ';', $value);
+                    $values = str_replace('\\;', ';', $values);
+                    $value = str_replace('\\,', ',', $value);
+                    $values = str_replace('\\,', ',', $values);
+                    $this->setAttribute($tag, trim($value), $params, true, $values);
                     break;
 
                 // String fields.
                 default:
-                    
-					$value = trim($value);
-                    
-					//sanity $value should not contain qp
-					if(preg_match('/^=[24]/',$value)){
-						error_log(__FILE__ .__METHOD__ ."?qp decoded : ". print_r($value , true));
-						quoted_printable_decode($value);
-					}
-					// As of rfc 2426 2.4.2 semi-colon, comma, and
-                    // colon must be escaped.
-                    $value = str_replace('\\n', $this->_newline, $value);
-                    $value = str_replace('\\;', ';', $value);
-                    //njv:$value = str_replace('\\:', ':', $value);
+                    if ($this->isOldFormat()) {
+                        // vCalendar 1.0 and vCard 2.1 only escape semicolons
+                        // and use unescaped semicolons to create lists.
+                        $value = trim($value);
+                        // Split by unescaped semicolons:
+                        $values = preg_split('/(?<!\\\\);/', $value);
+                        $value = str_replace('\\;', ';', $value);
+                        $values = str_replace('\\;', ';', $values);
+                        $this->setAttribute($tag, trim($value), $params, true, $values);
+                    } else {
+                        $value = trim($value);
+                        // As of rfc 2426 2.4.2 semicolon, comma, and colon
+                        // must be escaped (comma is unescaped after splitting
+                        // below).
+                        $value = str_replace(array('\\n', '\\N', '\\;', '\\:', '\\\\'),
+                                             array("\n", "\n", ';', ':', '\\'),
+                                             $value);
 
-                    // Split by unescaped commas:
-                    $values = preg_split('/(?<!\\\\),/',$value);
-                    $value = str_replace('\\,', ',', $value);
-                    $values = str_replace('\\,', ',', $values);
+                        // Split by unescaped commas.
+                        $values = preg_split('/(?<!\\\\),/', $value);
+                        $value = str_replace('\\,', ',', $value);
+                        $values = str_replace('\\,', ',', $values);
 
-                    $this->setAttribute($tag, trim($value), $params, true, $values);
+                        $this->setAttribute($tag, trim($value), $params, true, $values);
+                    }
                     break;
                 }
             }
@@ -674,20 +864,21 @@ class Horde_iCalendar {
     /**
      * Export this component in vCal format.
      *
-     * @param string $base  (optional) The type of the base object.
+     * @param string $base  The type of the base object.
      *
      * @return string  vCal format data.
      */
     function _exportvData($base = 'VCALENDAR')
     {
-        $result  = 'BEGIN:' . strtoupper($base) . $this->_newline;
+        $result = 'BEGIN:' . String::upper($base) . $this->_newline;
 
-        // Ensure that version is the first attribute.
-        $v = $this->getAttributeDefault('VERSION', false);
-        if ($v) {
-            $result .= 'VERSION:' . $v. $this->_newline;
+        // VERSION is not allowed for entries enclosed in VCALENDAR/ICALENDAR,
+        // as it is part of the enclosing VCALENDAR/ICALENDAR. See rfc2445
+        if ($base !== 'VEVENT' && $base !== 'VTODO' && $base !== 'VALARM' &&
+            $base !== 'VJOURNAL' && $base !== 'VFREEBUSY') {
+            // Ensure that version is the first attribute.
+            $result .= 'VERSION:' . $this->_version . $this->_newline;
         }
-
         foreach ($this->_attributes as $attribute) {
             $name = $attribute['name'];
             if ($name == 'VERSION') {
@@ -695,12 +886,25 @@ class Horde_iCalendar {
                 continue;
             }
 
-            $params = $attribute['params'];
             $params_str = '';
-
-            if (count($params)) {
+            $params = $attribute['params'];
+            if ($params) {
                 foreach ($params as $param_name => $param_value) {
-                    $params_str .= ";$param_name=$param_value";
+                    /* Skip CHARSET for iCalendar 2.0 data, not allowed. */
+                    if ($param_name == 'CHARSET' && !$this->isOldFormat()) {
+                        continue;
+                    }
+                    /* Skip VALUE=DATE for vCalendar 1.0 data, not allowed. */
+                    if ($this->isOldFormat() &&
+                        $param_name == 'VALUE' && $param_value == 'DATE') {
+                        continue;
+                    }
+
+                    if ($param_value === null) {
+                        $params_str .= ";$param_name";
+                    } else {
+                        $params_str .= ";$param_name=$param_value";
+                    }
                 }
             }
 
@@ -708,7 +912,6 @@ class Horde_iCalendar {
 
             switch ($name) {
             // Date fields.
-            case 'DTSTAMP':
             case 'COMPLETED':
             case 'CREATED':
             case 'DCREATED':
@@ -718,11 +921,25 @@ class Horde_iCalendar {
 
             case 'DTEND':
             case 'DTSTART':
+            case 'DTSTAMP':
             case 'DUE':
+            case 'AALARM':
+            case 'DALARM':
             case 'RECURRENCE-ID':
                 if (isset($params['VALUE'])) {
                     if ($params['VALUE'] == 'DATE') {
-                        $value = $this->_exportDate($value);
+                        // VCALENDAR 1.0 uses T000000 - T235959 for all day events:
+                        if ($this->isOldFormat() && $name == 'DTEND') {
+                            $d = new Horde_Date($value);
+                            $value = new Horde_Date(array(
+                                'year' => $d->year,
+                                'month' => $d->month,
+                                'mday' => $d->mday - 1));
+                            $value->correct();
+                            $value = $this->_exportDate($value, '235959');
+                        } else {
+                            $value = $this->_exportDate($value, '000000');
+                        }
                     } else {
                         $value = $this->_exportDateTime($value);
                     }
@@ -731,17 +948,38 @@ class Horde_iCalendar {
                 }
                 break;
 
+            // Comma or semicolon seperated dates.
+            case 'EXDATE':
             case 'RDATE':
-                if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE') {
-                        $value = $this->_exportDate($value);
-                    } elseif ($params['VALUE'] == 'PERIOD') {
-                        $value = $this->_exportPeriod($value);
+	            if (is_array($attribute['values'])) {
+		            $values = $attribute['values'];
+	            } elseif (!empty($value)) {
+	            	if ($this->isOldFormat()) {
+		            	$values = explode(';', $value);
+	            	} else {
+	            		$values = explode(',', $value);
+	            	}
+	            } else {
+		            break;
+	            }
+                $dates = array();
+                foreach ($values as $date) {
+                    if (isset($params['VALUE'])) {
+                        if ($params['VALUE'] == 'DATE') {
+                            $dates[] = $this->_exportDate($date, '000000');
+                        } elseif ($params['VALUE'] == 'PERIOD') {
+                            $dates[] = $this->_exportPeriod($date);
+                        } else {
+                            $dates[] = $this->_exportDateTime($date);
+                        }
                     } else {
-                        $value = $this->_exportDateTime($value);
+                        $dates[] = $this->_exportDateTime($date);
                     }
+                }
+                if ($this->isOldFormat()) {
+	                $value = implode(';', $dates);
                 } else {
-                    $value = $this->_exportDateTime($value);
+	                $value = implode(',', $dates);
                 }
                 break;
 
@@ -788,58 +1026,119 @@ class Horde_iCalendar {
 
             // Geo fields.
             case 'GEO':
-                $value = $value['latitude'] . ',' . $value['longitude'];
+                if ($this->isOldFormat()) {
+                    $value = $value['longitude'] . ',' . $value['latitude'];
+                } else {
+                    $value = $value['latitude'] . ';' . $value['longitude'];
+                }
                 break;
 
             // Recurrence fields.
+            case 'EXRULE':
             case 'RRULE':
                 break;
-            case 'EXRULE':
 
-	    //Text Fields
-	    case 'SUMMARY':
-	    case 'DESCRIPTION':
-	    case 'COMMENT':
-		$value = str_replace('\\', '\\\\', $value);
-		#$value = str_replace($this->_newline, '\n', $value);
-		$value = str_replace(',', '\,', $value);
-		$value = str_replace(';', '\;', $value);
-		//njv:RFC 2445 says very definately NO!
-		//$value = str_replace(':', '\:', $value);
+            case 'PHOTO':
                 break;
 
             default:
+                if ($this->isOldFormat()) {
+                    if (is_array($attribute['values']) &&
+                        count($attribute['values']) > 1) {
+                        $values = $attribute['values'];
+                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+                            $glue = ';';
+                        } else {
+                            $glue = ',';
+                        }
+                        $values = str_replace(';', '\\;', $values);
+                        $value = implode($glue, $values);
+                    } else {
+                        /* vcard 2.1 and vcalendar 1.0 escape only
+                         * semicolons */
+                        $value = str_replace(';', '\\;', $value);
+                    }
+                    // Text containing newlines or ASCII >= 127 must be BASE64
+                    // or QUOTED-PRINTABLE encoded. Currently we use
+                    // QUOTED-PRINTABLE as default.
+                    if (preg_match("/[^\x20-\x7F]/", $value) &&
+                        empty($params['ENCODING']))  {
+                        $params['ENCODING'] = 'QUOTED-PRINTABLE';
+                        $params_str .= ';ENCODING=QUOTED-PRINTABLE';
+                        // Add CHARSET as well. At least the synthesis client
+                        // gets confused otherwise
+                        if (empty($params['CHARSET'])) {
+                            $params['CHARSET'] = NLS::getCharset();
+                            $params_str .= ';CHARSET=' . $params['CHARSET'];
+                        }
+                    }
+                } else {
+                    if (is_array($attribute['values']) &&
+                        count($attribute['values'])) {
+                        $values = $attribute['values'];
+                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+                            $glue = ';';
+                        } else {
+                            $glue = ',';
+                        }
+                        // As of rfc 2426 2.5 semicolon and comma must be
+                        // escaped.
+                        $values = str_replace(array('\\', ';', ','),
+                                              array('\\\\', '\\;', '\\,'),
+                                              $values);
+                        $value = implode($glue, $values);
+                    } else {
+                        // As of rfc 2426 2.5 semicolon and comma must be
+                        // escaped.
+                        $value = str_replace(array('\\', ';', ','),
+                                             array('\\\\', '\\;', '\\,'),
+                                             $value);
+                    }
+                    $value = preg_replace('/\r?\n/', "\n", $value);
+                }
                 break;
             }
 
-            if (!empty($params['ENCODING']) &&
-                $params['ENCODING'] == 'QUOTED-PRINTABLE' && strlen(trim($value)) > 0) {
-                $value = str_replace("\r", '', $value);
-#                $result .= "$name$params_str:=" . $this->_newline
-#                    . $this->_quotedPrintableEncode($value)
-#                    . $this->_newline;
-                $result .= "$name$params_str:"
-                    . $this->_quotedPrintableEncode($value)
-                    . $this->_newline;
+            if (!empty($params['ENCODING']) && strlen(trim($value))) {
+                switch($params['ENCODING']) {
+                      case 'Q':
+                      case 'QUOTED-PRINTABLE':
+                            $value = str_replace("\r", '', $value);
+                            $result .= $name . $params_str . ':'
+                                    . str_replace('=0A', '=0D=0A',
+                                          $this->_quotedPrintableEncode($value))
+                                    . $this->_newline;
+                            break;
+                      case 'B':
+                      case 'BASE64':
+		            		$attr_string = $name . $params_str . ":" . $this->_newline . ' ' . $this->_base64Encode($value);
+                            $attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
+                                                      true, 'utf-8', true);
+                            $result .= $attr_string . $this->_newline;
+                            if ($this->isOldFormat()) {
+                            	$result .= $this->_newline; // Append an empty line
+                            }
+                            break;
+                }
             } else {
-                $attr_string = "$name$params_str:$value";
-
-                $result .= $this->_foldLine($attr_string) . $this->_newline;
-				if (!empty($params['ENCODING']) && $params['ENCODING'] == 'BASE64' &&
-					strlen(trim($value)) > 0)
-				{
-					$result .= $this->_newline;
-				}
+                $value = str_replace(array("\r", "\n"), array('', '\\n'), $value);
+                $attr_string = $name . $params_str;
+                if (!empty($value)) {
+                	$attr_string .= ':' . $value;
+                }
+                if (!$this->isOldFormat()) {
+                    $attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
+                                                    true, 'utf-8', true);
+                }
+                $result .= $attr_string . $this->_newline;
             }
         }
 
-        foreach ($this->getComponents() as $component) {
-            $result .= $component->exportvCalendar() . $this->_newline;
+        foreach ($this->_components as $component) {
+            $result .= $component->exportvCalendar();
         }
 
-        $result .= 'END:' . $base;
-
-        return $result;
+        return $result . 'END:' . $base . $this->_newline;
     }
 
     /**
@@ -849,7 +1148,7 @@ class Horde_iCalendar {
     {
         $offset = array();
         if (preg_match('/(\+|-)([0-9]{2})([0-9]{2})([0-9]{2})?/', $text, $timeParts)) {
-            $offset['ahead']  = (boolean)($timeParts[1] == '+');
+            $offset['ahead']  = (bool)($timeParts[1] == '+');
             $offset['hour']   = intval($timeParts[2]);
             $offset['minute'] = intval($timeParts[3]);
             if (isset($timeParts[4])) {
@@ -908,35 +1207,97 @@ class Horde_iCalendar {
     }
 
     /**
-     * Parse a DateTime field into a unix timestamp.
+     * Grok the TZID and return an offset in seconds from UTC for this
+     * date and time.
      */
-    function _parseDateTime($text)
+    function _parseTZID($date, $time, $tzid)
+    {
+        $vtimezone = $this->_container->findComponentByAttribute('vtimezone', 'TZID', $tzid);
+        if (!$vtimezone) {
+            return false;
+        }
+
+        $change_times = array();
+        foreach ($vtimezone->getComponents() as $o) {
+            $t = $vtimezone->parseChild($o, $date['year']);
+            if ($t !== false) {
+                $change_times[] = $t;
+            }
+        }
+
+        if (!$change_times) {
+            return false;
+        }
+
+        sort($change_times);
+
+        // Time is arbitrarily based on UTC for comparison.
+        $t = @gmmktime($time['hour'], $time['minute'], $time['second'],
+                       $date['month'], $date['mday'], $date['year']);
+
+        if ($t < $change_times[0]['time']) {
+            return $change_times[0]['from'];
+        }
+
+        for ($i = 0, $n = count($change_times); $i < $n - 1; $i++) {
+            if (($t >= $change_times[$i]['time']) &&
+                ($t < $change_times[$i + 1]['time'])) {
+                return $change_times[$i]['to'];
+            }
+        }
+
+        if ($t >= $change_times[$n - 1]['time']) {
+            return $change_times[$n - 1]['to'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Parses a DateTime field and returns a unix timestamp. If the
+     * field cannot be parsed then the original text is returned
+     * unmodified.
+     *
+     * @todo This function should be moved to Horde_Date and made public.
+     */
+    function _parseDateTime($text, $tzid = false)
     {
         $dateParts = explode('T', $text);
         if (count($dateParts) != 2 && !empty($text)) {
             // Not a datetime field but may be just a date field.
-            if (!$date = $this->_parseDate($text)) {
-                return $date;
+            if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
+                // Or not
+                return $text;
             }
-            return @mktime(0, 0, 0, $date['month'], $date['mday'], $date['year']);
+            $newtext = $text.'T000000';
+            $dateParts = explode('T', $newtext);
         }
 
-        if (!$date = $this->_parseDate($dateParts[0])) {
-            return $date;
+        if (!$date = Horde_iCalendar::_parseDate($dateParts[0])) {
+            return $text;
         }
-        if (!$time = $this->_parseTime($dateParts[1])) {
-            return $time;
+        if (!$time = Horde_iCalendar::_parseTime($dateParts[1])) {
+            return $text;
         }
 
-		//error_log("parseDateTime: ".$text." => ".print_r($time, true));
-
-        if ($time['zone'] == 'UTC') {
-            return @gmmktime($time['hour'], $time['minute'], $time['second'],
-                             $date['month'], $date['mday'], $date['year']);
+        // Get timezone info for date fields from $tzid and container.
+        $tzoffset = ($time['zone'] == 'Local' && $tzid && is_a($this->_container, 'Horde_iCalendar'))
+            ? $this->_parseTZID($date, $time, $tzid) : false;
+        if ($time['zone'] == 'UTC' || $tzoffset !== false) {
+            $result = @gmmktime($time['hour'], $time['minute'], $time['second'],
+                                $date['month'], $date['mday'], $date['year']);
+            if ($tzoffset) {
+                $result -= $tzoffset;
+            }
         } else {
-            return @mktime($time['hour'], $time['minute'], $time['second'],
-                           $date['month'], $date['mday'], $date['year']);
+            // We don't know the timezone so assume local timezone.
+            // FIXME: shouldn't this be based on the user's timezone
+            // preference rather than the server's timezone?
+            $result = @mktime($time['hour'], $time['minute'], $time['second'],
+                              $date['month'], $date['mday'], $date['year']);
         }
+
+        return ($result !== false) ? $result : $text;
     }
 
     /**
@@ -944,10 +1305,10 @@ class Horde_iCalendar {
      */
     function _exportDateTime($value)
     {
-        $temp = array();
-        if (!is_object($value) || is_array($value)) {
-            $TZOffset  = 3600 * substr(date('O',$value), 0, 3);
-            $TZOffset += 60 * substr(date('O',$value), 3, 2);
+        if (is_numeric($value)) {
+            $temp = array();
+            $tz = date('O', $value);
+            $TZOffset = (3600 * substr($tz, 0, 3)) + (60 * substr(date('O', $value), 3, 2));
             $value -= $TZOffset;
 
             $temp['zone']   = 'UTC';
@@ -957,47 +1318,18 @@ class Horde_iCalendar {
             $temp['hour']   = date('G', $value);
             $temp['minute'] = date('i', $value);
             $temp['second'] = date('s', $value);
-        } else {
-            $dateOb = (object)$value;
-
-            $TZOffset = date('O',mktime($dateOb->hour,$dateOb->min,$dateOb->sec,$dateOb->month,$dateOb->mday,$dateOb->year));
-
-            // Minutes.
-            $TZOffsetMin = substr($TZOffset, 0, 1) . substr($TZOffset, 3, 2);
-            $thisMin = $dateOb->min - $TZOffsetMin;
-
-            // Hours.
-            $TZOffsetHour = substr($TZOffset, 0, 3);
-            $thisHour = $dateOb->hour - $TZOffsetHour;
-
-            if ($thisMin < 0) {
-                $thisHour -= 1;
-                $thisMin += 60;
-            }
-
-            if ($thisHour < 0) {
-                require_once 'Date/Calc.php';
-                $prevday = Date_Calc::prevDay($dateOb->mday, $dateOb->month, $dateOb->year);
-                $dateOb->mday  = substr($prevday, 6, 2);
-                $dateOb->month = substr($prevday, 4, 2);
-                $dateOb->year  = substr($prevday, 0, 4);
-                $thisHour += 24;
-            }
-
-            $temp['zone']   = 'UTC';
-            $temp['year']   = $dateOb->year;
-            $temp['month']  = $dateOb->month;
-            $temp['mday']   = $dateOb->mday;
-            $temp['hour']   = $thisHour;
-            $temp['minute'] = $dateOb->min;
-            $temp['second'] = $dateOb->sec;
+            return Horde_iCalendar::_exportDate($temp) . 'T' . Horde_iCalendar::_exportTime($temp);
+        } else if (is_object($value) || is_array($value)) {
+            $dateOb = new Horde_Date($value);
+            return Horde_iCalendar::_exportDateTime($dateOb->timestamp());
         }
-
-        return Horde_iCalendar::_exportDate($temp) . 'T' . Horde_iCalendar::_exportTime($temp);
+        return $value; // nothing to do with us, let's not touch it
     }
 
     /**
-     * Parse a Time field.
+     * Parses a Time field.
+     *
+     * @static
      */
     function _parseTime($text)
     {
@@ -1017,7 +1349,7 @@ class Horde_iCalendar {
     }
 
     /**
-     * Export a Time field.
+     * Exports a Time field.
      */
     function _exportTime($value)
     {
@@ -1030,33 +1362,44 @@ class Horde_iCalendar {
     }
 
     /**
-     * Parse a Date field.
+     * Parses a Date field.
+     *
+     * @static
      */
     function _parseDate($text)
     {
-		if (strlen($text) == 10)
-		{
-			$text = str_replace('-','',$text);
-		}
-        if (strlen($text) != 8)
-		{
+        $parts = explode('T', $text);
+        if (count($parts) == 2) {
+            $text = $parts[0];
+        }
+
+        if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
             return false;
         }
 
-        $date['year']  = intval(substr($text, 0, 4));
-        $date['month'] = intval(substr($text, 4, 2));
-        $date['mday']  = intval(substr($text, 6, 2));
-
-        return $date;
+        return array('year' => $match[1],
+                     'month' => $match[2],
+                     'mday' => $match[3]);
     }
 
     /**
-     * Export a Date field.
+     * Exports a date field.
+     *
+     * @param object|array $value  Date object or hash.
+     * @param string $autoconvert  If set, use this as time part to export the
+     *                             date as datetime when exporting to Vcalendar
+     *                             1.0. Examples: '000000' or '235959'
      */
-    function _exportDate($value)
+    function _exportDate($value, $autoconvert = false)
     {
-        return sprintf('%04d%02d%02d',
-                       $value['year'], $value['month'], $value['mday']);
+        if (is_object($value)) {
+            $value = array('year' => $value->year, 'month' => $value->month, 'mday' => $value->mday);
+        }
+        if ($autoconvert !== false && $this->isOldFormat()) {
+            return sprintf('%04d%02d%02dT%s', $value['year'], $value['month'], $value['mday'], $autoconvert);
+        } else {
+            return sprintf('%04d%02d%02d', $value['year'], $value['month'], $value['mday']);
+        }
     }
 
     /**
@@ -1145,310 +1488,77 @@ class Horde_iCalendar {
         return $duration;
     }
 
-    /**
-     * Return the folded version of a line.
-	 * JVL rewritten to fold on any ; or: or = if present before column 75
-	 * this is still rfc2445 section 4.1 compliant
-     */
-    function _foldLine($line)
-    {
-        $line = preg_replace("/\r\n|\n|\r/", '\n', $line);
-        if (strlen($line) > 75) {
-            $foldedline = '';
-            while (!empty($line)) {
-			  $maxLine = substr($line, 0, 75);
-			  $cutPoint = 1+max(is_numeric($p1 = strrpos($maxLine,';')) ? $p1 : -1,
-					    is_numeric($p1 = strrpos($maxLine,':')) ? $p1 : -1,
-					    is_numeric($p1 = strrpos($maxLine,'=')) ? $p1 : -1);
-			  if ($cutPoint <  1)  // nothing found, then fold complete maxLine
-				$cutPoint = 75;
-			  // now fold [0..(cutPoint-1)]
-			  $foldedline .= (empty($foldedline))
-				?   substr($line, 0, $cutPoint)
-				:  $this->_newline . ' ' . substr($line, 0, $cutPoint);
 
-			  $line = (strlen($line) <= $cutPoint)
-				? ''
-				: substr($line, $cutPoint);
-
-			  if (strlen($line) < 75) {
-				$foldedline .=  $this->_newline . ' ' . $line;
-				$line = '';
-			  }
-
-            }
-            return $foldedline;
-        }
-        return $line;
-    }
-
-    /**
-     * Convert an 8bit string to a quoted-printable string according
+   /**
+     * Convert an 8bit string to a base64 string
      * to RFC2045, section 6.7.
      *
-     * Uses imap_8bit if available.
-     *
      * @param  string $input  The string to be encoded.
      *
-     * @return string         The quoted-printable encoded string.
+     * @return string         The base64 encoded string.
+     */
+    function _base64Encode($input = '')
+    {
+        return base64_encode($input);
+    }
+
+
+    /**
+     * Converts an 8bit string to a quoted-printable string according to RFC
+     * 2045, section 6.7.
+     *
+     * imap_8bit() does not apply all necessary rules.
+     *
+     * @param string $input  The string to be encoded.
+     *
+     * @return string  The quoted-printable encoded string.
      */
     function _quotedPrintableEncode($input = '')
     {
-    	return $this->EncodeQP($input);
-
-	#$input = preg_replace('!(\r\n|\r|\n)!',"\n",$input);
-
-        // If imap_8bit() is available, use it.
-        if (function_exists('imap_8bit')) {
-            $retValue = imap_8bit($input);
-	    #$retValue = preg_replace('/=0A/',"=0D=0A=\r\n",$retValue);
-	    return $retValue;
-        }
-
-        // Rather dumb replacment: just encode everything.
-        $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-                     'A', 'B', 'C', 'D', 'E', 'F');
-
-        $output = '';
+        $output = $line = '';
         $len = strlen($input);
+
         for ($i = 0; $i < $len; ++$i) {
-            $c = substr($input, $i, 1);
-            $dec = ord($c);
-            $output .= '=' . $hex[floor($dec / 16)] . $hex[floor($dec % 16)];
-            if (($i + 1) % 25 == 0) {
-                $output .= "=\r\n";
+            $ord = ord($input[$i]);
+            // Encode non-printable characters (rule 2).
+            if ($ord == 9 ||
+                ($ord >= 32 && $ord <= 60) ||
+                ($ord >= 62 && $ord <= 126)) {
+                $chunk = $input[$i];
+            } else {
+                // Quoted printable encoding (rule 1).
+                $chunk = '=' . String::upper(sprintf('%02X', $ord));
+            }
+            $line .= $chunk;
+            // Wrap long lines (rule 5)
+            if (strlen($line) + 1 > 76) {
+                $line = String::wordwrap($line, 75, "=\r\n", true, 'us-ascii', true);
+                $newline = strrchr($line, "\r\n");
+                if ($newline !== false) {
+                    $output .= substr($line, 0, -strlen($newline) + 2);
+                    $line = substr($newline, 2);
+                } else {
+                    $output .= $line;
+                }
+                continue;
+            }
+            // Wrap at line breaks for better readability (rule 4).
+            if (substr($line, -3) == '=0A') {
+                $output .= $line . "=\r\n ";
+                $line = '';
             }
         }
+        $output .= $line;
+
+        // Trailing whitespace must be encoded (rule 3).
+        $lastpos = strlen($output) - 1;
+        if ($output[$lastpos] == chr(9) ||
+            $output[$lastpos] == chr(32)) {
+            $output[$lastpos] = '=';
+            $output .= String::upper(sprintf('%02X', ord($output[$lastpos])));
+        }
+
         return $output;
     }
-    var $LE              = "\r\n";
-
-    /**
-     * Encode string to quoted-printable.
-     * @access private
-     * @return string
-     */
-    function EncodeQP_old ($str) {
-        $encoded = $this->FixEOL($str);
-        #$encoded = $str;
-        #if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-        #    $encoded .= $this->LE;
-
-        // Replace every high ascii, control and = characters
-        #$encoded = preg_replace('/([\000-\010\013\014\016-\037\075\177-\377])/e',
-        #          "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        $encoded = preg_replace('/([\000-\012\015\016\020-\037\075\177-\377])/e',
-                  "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        // Replace every spaces and tabs when it's the last character on a line
-        #$encoded = preg_replace("/([\011\040])".$this->LE."/e",
-        #          "'='.sprintf('%02X', ord('\\1')).'".$this->LE."'", $encoded);
-        $encoded = preg_replace("/([\011\040])".$this->LE."/e",
-                  "'='.sprintf('%02X', ord('\\1')).'".$this->LE."'", $encoded);
-
-        // Maximum line length of 76 characters before CRLF (74 + space + '=')
-        $encoded = $this->WrapText($encoded, 74, true);
-
-        return $encoded;
-    }
-
-    /**
-     * Wraps message for use with mailers that do not
-     * automatically perform wrapping and for quoted-printable.
-     * Original written by philippe.
-     * @access private
-     * @return string
-     */
-    function WrapText_old($message, $length, $qp_mode = false) {
-        $soft_break = ($qp_mode) ? "=\r\n" : $this->LE;
-
-        #$message = $this->FixEOL($message);
-        if (substr($message, -1) == $this->LE)
-            $message = substr($message, 0, -1);
-
-        $line = explode("=0D=0A", $message);
-        $message = "";
-        for ($i=0 ;$i < count($line); $i++)
-        {
-          $line_part = explode(" ", $line[$i]);
-          $buf = "";
-          for ($e = 0; $e<count($line_part); $e++)
-          {
-              $word = $line_part[$e];
-              if ($qp_mode and (strlen($word) > $length))
-              {
-                $space_left = $length - strlen($buf) - 1;
-                if ($e != 0)
-                {
-                    if ($space_left > 20)
-                    {
-                        $len = $space_left;
-                        if (substr($word, $len - 1, 1) == "=")
-                          $len--;
-                        elseif (substr($word, $len - 2, 1) == "=")
-                          $len -= 2;
-                        $part = substr($word, 0, $len);
-                        $word = substr($word, $len);
-                        $buf .= " " . $part;
-                        $message .= $buf . sprintf("=%s", $this->LE);
-                    }
-                    else
-                    {
-                        $message .= $buf . $soft_break;
-                    }
-                    $buf = "";
-                }
-                while (strlen($word) > 0)
-                {
-                    $len = $length;
-                    if (substr($word, $len - 1, 1) == "=")
-                        $len--;
-                    elseif (substr($word, $len - 2, 1) == "=")
-                        $len -= 2;
-                    $part = substr($word, 0, $len);
-                    $word = substr($word, $len);
-
-                    if (strlen($word) > 0)
-                        $message .= $part . sprintf("=%s", $this->LE);
-                    else
-                        $buf = $part;
-                }
-              }
-              else
-              {
-                $buf_o = $buf;
-                $buf .= ($e == 0) ? $word : (" " . $word);
-
-                if (strlen($buf) > $length and $buf_o != "")
-                {
-                    $message .= $buf_o . $soft_break;
-                    $buf = $word;
-                }
-              }
-          }
-          $message .= $buf;
-          if((count($line)-1) > $i)
-          	$message .= "=0D=0A=\r\n";
-        }
-
-        return $message;
-    }
-    /**
-     * Changes every end of line from CR or LF to CRLF.
-     * @access private
-     * @return string
-     */
-    function FixEOL($str) {
-      	$str = str_replace("\r\n", "\n", $str);
-        $str = str_replace("\r", "\n", $str);
-        $str = str_replace("\n", $this->LE, $str);
-        return $str;
-    }
-
-    /**
-     * Encode string to quoted-printable.
-     * @access private
-     * @return string
-     */
-    function EncodeQP ($str) {
-        $encoded = $this->FixEOL($str);
-        # see bug report http://sourceforge.net/tracker/index.php?func=detail&aid=1536674&group_id=78745&atid=554338
-        #if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-        #    $encoded .= $this->LE;
-
-        // Replace every high ascii, control and = characters
-        #$encoded = preg_replace('/([\000-\010\013\014\016-\037\075\177-\377])/e',
-        #          "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        $encoded = preg_replace('/([\000-\012\015\016\020-\037\075\177-\377])/e',
-                  "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        // Replace every spaces and tabs when it's the last character on a line
-        $encoded = preg_replace("/([\011\040])".$this->LE."/e",
-                  "'='.sprintf('%02X', ord('\\1')).'".$this->LE."'", $encoded);
-
-        // Maximum line length of 76 characters before CRLF (74 + space + '=')
-        #$encoded = $this->WrapText($encoded, 74, true);
-
-        return $encoded;
-    }
-
-    /**
-     * Wraps message for use with mailers that do not
-     * automatically perform wrapping and for quoted-printable.
-     * Original written by philippe.
-     * @access private
-     * @return string
-     */
-    function WrapText($message, $length, $qp_mode = false) {
-        $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
-        $soft_break = "..=";
-
-        $message = $this->FixEOL($message);
-        if (substr($message, -1) == $this->LE)
-            $message = substr($message, 0, -1);
-
-        $line = explode($this->LE, $message);
-        $message = "";
-        for ($i=0 ;$i < count($line); $i++)
-        {
-          $line_part = explode(" ", $line[$i]);
-          $buf = "";
-          for ($e = 0; $e<count($line_part); $e++)
-          {
-              $word = $line_part[$e];
-              if ($qp_mode and (strlen($word) > $length))
-              {
-                $space_left = $length - strlen($buf) - 1;
-                if ($e != 0)
-                {
-                    if ($space_left > 20)
-                    {
-                        $len = $space_left;
-                        if (substr($word, $len - 1, 1) == "=")
-                          $len--;
-                        elseif (substr($word, $len - 2, 1) == "=")
-                          $len -= 2;
-                        $part = substr($word, 0, $len);
-                        $word = substr($word, $len);
-                        $buf .= " " . $part;
-                        $message .= $buf . sprintf("=%s", $this->LE);
-                    }
-                    else
-                    {
-                        $message .= $buf . $soft_break;
-                    }
-                    $buf = "";
-                }
-                while (strlen($word) > 0)
-                {
-                    $len = $length;
-                    if (substr($word, $len - 1, 1) == "=")
-                        $len--;
-                    elseif (substr($word, $len - 2, 1) == "=")
-                        $len -= 2;
-                    $part = substr($word, 0, $len);
-                    $word = substr($word, $len);
-
-                    if (strlen($word) > 0)
-                        $message .= $part . sprintf("=%s", $this->LE);
-                    else
-                        $buf = $part;
-                }
-              }
-              else
-              {
-                $buf_o = $buf;
-                $buf .= ($e == 0) ? $word : (" " . $word);
-
-                if (strlen($buf) > $length and $buf_o != "")
-                {
-                    $message .= $buf_o . $soft_break;
-                    $buf = $word;
-                }
-              }
-          }
-          $message .= $buf . $this->LE;
-        }
-
-        return $message;
-    }
 
 }
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/valarm.php b/phpgwapi/inc/horde/Horde/iCalendar/valarm.php
index dee9f2471c..224c44bc5e 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/valarm.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/valarm.php
@@ -2,15 +2,14 @@
 /**
  * Class representing vAlarms.
  *
- * $Horde: framework/iCalendar/iCalendar/valarm.php,v 1.8 2004/08/13 19:11:35 karsten Exp $
+ * $Horde: framework/iCalendar/iCalendar/valarm.php,v 1.8.10.8 2008/07/03 08:42:58 jan Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
@@ -21,11 +20,6 @@ class Horde_iCalendar_valarm extends Horde_iCalendar {
         return 'vAlarm';
     }
 
-    function parsevCalendar($data)
-    {
-        parent::parsevCalendar($data, 'VALARM');
-    }
-
     function exportvCalendar()
     {
         return parent::_exportvData('VALARM');
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vcard.php b/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
index 465e044169..a814246758 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vcard.php
@@ -2,7 +2,6 @@
 
 require_once EGW_API_INC.'/horde/Horde/iCalendar.php';
 
-
 // The following were shamelessly yoinked from Contact_Vcard_Build
 // Part numbers for N components.
 define('VCARD_N_FAMILY',     0);
@@ -27,49 +26,47 @@ define('VCARD_GEO_LON',      1);
 /**
  * Class representing vCard entries.
  *
- * $Horde: framework/iCalendar/iCalendar/vcard.php,v 1.2 2004/08/18 03:16:24 chuck Exp $
+ * $Horde: framework/iCalendar/iCalendar/vcard.php,v 1.3.10.16 2008/09/22 04:16:30 chuck Exp $
  *
- * Copyright 2003-2004 Karsten Fourmont (karsten@horde.org)
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Karsten Fourmont <karsten@horde.org>
- * @version $Revision$
  * @package Horde_iCalendar
  */
 class Horde_iCalendar_vcard extends Horde_iCalendar {
 
+    function Horde_iCalendar_vcard($version = '2.1')
+    {
+        return parent::Horde_iCalendar($version);
+    }
+
     function getType()
     {
         return 'vcard';
     }
 
-    function parsevCalendar($data)
-    {
-        return parent::parsevCalendar($data, 'vcard');
-    }
-
     /**
      * Unlike vevent and vtodo, a vcard is normally not enclosed in an
      * iCalendar container. (BEGIN..END)
      */
     function exportvCalendar()
     {
-        #$requiredAttributes['BODY'] = '';
-        $requiredAttributes['VERSION'] = '2.1';
+        $requiredAttributes['VERSION'] = $this->_version;
+        $requiredAttributes['N'] = ';;;;;;';
+        if ($this->_version == '3.0') {
+            $requiredAttributes['FN'] = '';
+        }
 
         foreach ($requiredAttributes as $name => $default_value) {
-            if (is_a($this->getattribute($name), 'PEAR_Error')) {
+            if (is_a($this->getAttribute($name), 'PEAR_Error')) {
                 $this->setAttribute($name, $default_value);
             }
         }
-		//error_log(__METHOD__.":requiredAttributes->".print_r($requiredAttributes,true));
-		//njv:$buffcontent = ob_get_clean();
-		#error_log(__METHOD__.":".print_r($buffcontent,true));
-		#ob_end_clean();
 
-        return $this->_exportvData('VCARD') . $this->_newline;
+        return $this->_exportvData('VCARD');
     }
 
     /**
@@ -80,8 +77,7 @@ class Horde_iCalendar_vcard extends Horde_iCalendar {
      * to
      *   "Professor Dagobert T Duck Sen"
      *
-     * @return string  Full name of vcard "N" tag
-     *                 or null if no N tag.
+     * @return string  Full name of vcard "N" tag or null if no N tag.
      */
     function printableName()
     {
@@ -90,6 +86,8 @@ class Horde_iCalendar_vcard extends Horde_iCalendar {
             return null;
         }
 
+        $name_arr = array();
+
         if (!empty($name_parts[VCARD_N_PREFIX])) {
             $name_arr[] = $name_parts[VCARD_N_PREFIX];
         }
@@ -118,6 +116,11 @@ class Horde_iCalendar_vcard extends Horde_iCalendar {
      */
     function getBareEmail($address)
     {
+        // Empty values are still empty.
+        if (!$address) {
+            return $address;
+        }
+
         require_once 'Mail/RFC822.php';
         require_once 'Horde/MIME.php';
 
@@ -126,8 +129,9 @@ class Horde_iCalendar_vcard extends Horde_iCalendar {
             $rfc822 = new Mail_RFC822();
         }
 
-        $rfc822->validateMailbox($address);
-
+        if (!$rfc822->validateMailbox($address)) {
+            return $address;
+        }
         return MIME::rfc822WriteAddress($address->mailbox, $address->host);
     }
 
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vevent.php b/phpgwapi/inc/horde/Horde/iCalendar/vevent.php
index bf0bee75ec..3dd520ca62 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vevent.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vevent.php
@@ -2,15 +2,14 @@
 /**
  * Class representing vEvents.
  *
- * $Horde: framework/iCalendar/iCalendar/vevent.php,v 1.31 2004/08/18 03:16:24 chuck Exp $
+ * $Horde: framework/iCalendar/iCalendar/vevent.php,v 1.31.10.15 2008/07/03 08:42:58 jan Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
@@ -21,32 +20,28 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
         return 'vEvent';
     }
 
-    function parsevCalendar($data)
-    {
-        parent::parsevCalendar($data, 'VEVENT');
-    }
-
     function exportvCalendar()
     {
         // Default values.
         $requiredAttributes = array();
         $requiredAttributes['DTSTAMP'] = time();
-        #$requiredAttributes['ORGANIZER'] = 'Unknown Organizer';
-        $requiredAttributes['UID'] = $this->_exportDateTime(time()) . '@' . $_SERVER['SERVER_NAME'];
+        $requiredAttributes['UID'] = $this->_exportDateTime(time())
+            . substr(str_pad(base_convert(microtime(), 10, 36), 16, uniqid(mt_rand()), STR_PAD_LEFT), -16)
+            . '@' . (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost');
 
         $method = !empty($this->_container) ?
             $this->_container->getAttribute('METHOD') : 'PUBLISH';
 
         switch ($method) {
         case 'PUBLISH':
-            $requiredAttributes['DTSTART']  = time();
-            $requiredAttributes['SUMMARY']  = '';
+            $requiredAttributes['DTSTART'] = time();
+            $requiredAttributes['SUMMARY'] = '';
             break;
 
         case 'REQUEST':
             $requiredAttributes['ATTENDEE'] = '';
-            $requiredAttributes['DTSTART']  = time();
-            $requiredAttributes['SUMMARY']  = '';
+            $requiredAttributes['DTSTART'] = time();
+            $requiredAttributes['SUMMARY'] = '';
             break;
 
         case 'REPLY':
@@ -54,9 +49,9 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
             break;
 
         case 'ADD':
-            $requiredAttributes['DTSTART']  = time();
+            $requiredAttributes['DTSTART'] = time();
             $requiredAttributes['SEQUENCE'] = 1;
-            $requiredAttributes['SUMMARY']  = '';
+            $requiredAttributes['SUMMARY'] = '';
             break;
 
         case 'CANCEL':
@@ -88,7 +83,8 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
     function updateAttendee($email, $status, $fullname = '')
     {
         foreach ($this->_attributes as $key => $attribute) {
-            if ($attribute['name'] == 'ATTENDEE' && $attribute['value'] == 'MAILTO:' . $email) {
+            if ($attribute['name'] == 'ATTENDEE' &&
+                $attribute['value'] == 'mailto:' . $email) {
                 $this->_attributes[$key]['params']['PARTSTAT'] = $status;
                 if (!empty($fullname)) {
                     $this->_attributes[$key]['params']['CN'] = $fullname;
@@ -101,7 +97,7 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
         if (!empty($fullname)) {
             $params['CN'] = $fullname;
         }
-        $this->setAttribute('ATTENDEE', 'MAILTO:' . $email, $params);
+        $this->setAttribute('ATTENDEE', 'mailto:' . $email, $params);
     }
 
     /**
@@ -113,7 +109,7 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
     {
         $organizer = $this->getAttribute('ORGANIZER', true);
         if (is_a($organizer, 'PEAR_Error')) {
-            return null;
+            return _("An unknown person");
         }
 
         if (isset($organizer[0]['CN'])) {
@@ -128,7 +124,7 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
     /**
      * Update this event with details from another event.
      *
-     * @param object Horde_iCalendar_vEvent $vevent  The vEvent with latest details.
+     * @param Horde_iCalendar_vEvent $vevent  The vEvent with latest details.
      */
     function updateFromvEvent($vevent)
     {
@@ -137,7 +133,9 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
             $currentValue = $this->getAttribute($newAttribute['name']);
             if (is_a($currentValue, 'PEAR_error')) {
                 // Already exists so just add it.
-                $this->setAttribute($newAttribute['name'], $newAttribute['value'], $newAttribute['params']);
+                $this->setAttribute($newAttribute['name'],
+                                    $newAttribute['value'],
+                                    $newAttribute['params']);
             } else {
                 // Already exists so locate and modify.
                 $found = false;
@@ -178,19 +176,21 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
      * Update just the attendess of event with details from another
      * event.
      *
-     * @param object Horde_iCalendar_vEvent $vevent  The vEvent with latest details
+     * @param Horde_iCalendar_vEvent $vevent  The vEvent with latest details
      */
     function updateAttendeesFromvEvent($vevent)
     {
         $newAttributes = $vevent->getAllAttributes();
         foreach ($newAttributes as $newAttribute) {
-            if (!$newAttribute['name'] == 'ATTENDEE') {
+            if ($newAttribute['name'] != 'ATTENDEE') {
                 continue;
             }
             $currentValue = $this->getAttribute($newAttribute['name']);
             if (is_a($currentValue, 'PEAR_error')) {
                 // Already exists so just add it.
-                $this->setAttribute($newAttribute['name'], $newAttribute['value'], $newAttribute['params']);
+                $this->setAttribute($newAttribute['name'],
+                                    $newAttribute['value'],
+                                    $newAttribute['params']);
             } else {
                 // Already exists so locate and modify.
                 $found = false;
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vfreebusy.php b/phpgwapi/inc/horde/Horde/iCalendar/vfreebusy.php
index 8eed1a07fb..8811cfef0a 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vfreebusy.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vfreebusy.php
@@ -1,52 +1,78 @@
 <?php
 /**
- * Class representing vFreebusys.
+ * Class representing vFreebusy components.
  *
- * $Horde: framework/iCalendar/iCalendar/vfreebusy.php,v 1.16 2004/08/18 03:16:24 chuck Exp $
+ * $Horde: framework/iCalendar/iCalendar/vfreebusy.php,v 1.16.10.17 2008/09/17 08:46:57 jan Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
+ * @todo Don't use timestamps
+ *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
 class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
 
     var $_busyPeriods = array();
+    var $_extraParams = array();
 
+    /**
+     * Returns the type of this calendar component.
+     *
+     * @return string  The type of this component.
+     */
     function getType()
     {
         return 'vFreebusy';
     }
 
-    function parsevCalendar($data)
+    /**
+     * Parses a string containing vFreebusy data.
+     *
+     * @param string $data     The data to parse.
+     */
+    function parsevCalendar($data, $type = null, $charset = null)
     {
-        parent::parsevCalendar($data, 'VFREEBUSY');
+        parent::parsevCalendar($data, 'VFREEBUSY', $charset);
 
         // Do something with all the busy periods.
         foreach ($this->_attributes as $key => $attribute) {
-            if ($attribute['name'] == 'FREEBUSY') {
-                foreach ($attribute['value'] as $value) {
-                    if (array_key_exists('duration', $attribute['value'])) {
-                       $this->addBusyPeriod('BUSY', $value['start'], null, $value['duration']);
-                    } else {
-                       $this->addBusyPeriod('BUSY', $value['start'], $value['end']);
-                    }
-                }
-                unset($this->_attributes[$key]);
+            if ($attribute['name'] != 'FREEBUSY') {
+                continue;
             }
+            foreach ($attribute['values'] as $value) {
+                $params = isset($attribute['params'])
+                    ? $attribute['params']
+                    : array();
+                if (isset($value['duration'])) {
+                    $this->addBusyPeriod('BUSY', $value['start'], null,
+                                         $value['duration'], $params);
+                } else {
+                    $this->addBusyPeriod('BUSY', $value['start'],
+                                         $value['end'], null, $params);
+                }
+            }
+            unset($this->_attributes[$key]);
         }
     }
 
+    /**
+     * Returns the component exported as string.
+     *
+     * @return string  The exported vFreeBusy information according to the
+     *                 iCalender format specification.
+     */
     function exportvCalendar()
     {
         foreach ($this->_busyPeriods as $start => $end) {
             $periods = array(array('start' => $start, 'end' => $end));
-            $this->setAttribute('FREEBUSY', $periods);
+            $this->setAttribute('FREEBUSY', $periods,
+                                isset($this->_extraParams[$start])
+                                ? $this->_extraParams[$start] : array());
         }
 
         $res = parent::_exportvData('VFREEBUSY');
@@ -61,7 +87,9 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
     }
 
     /**
-     * Get a display name for this object.
+     * Returns a display name for this object.
+     *
+     * @return string  A clear text name for displaying this object.
      */
     function getName()
     {
@@ -71,12 +99,12 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
 
         if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
             $attr = 'ORGANIZER';
-        } else if ($method == 'REPLY') {
+        } elseif ($method == 'REPLY') {
             $attr = 'ATTENDEE';
         }
 
         $name = $this->getAttribute($attr, true);
-        if (array_key_exists('CN', $name[0])) {
+        if (!is_a($name, 'PEAR_Error') && isset($name[0]['CN'])) {
             return $name[0]['CN'];
         }
 
@@ -90,7 +118,9 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
     }
 
     /**
-     * Get the email address for this object.
+     * Returns the email address for this object.
+     *
+     * @return string  The email address of this object's owner.
      */
     function getEmail()
     {
@@ -100,7 +130,7 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
 
         if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
             $attr = 'ORGANIZER';
-        } else if ($method == 'REPLY') {
+        } elseif ($method == 'REPLY') {
             $attr = 'ATTENDEE';
         }
 
@@ -113,13 +143,34 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
         }
     }
 
+    /**
+     * Returns the busy periods.
+     *
+     * @return array  All busy periods.
+     */
     function getBusyPeriods()
     {
         return $this->_busyPeriods;
     }
 
     /**
-     * Return all the free periods of time in a given period.
+     * Returns any additional freebusy parameters.
+     *
+     * @return array  Additional parameters of the freebusy periods.
+     */
+    function getExtraParams()
+    {
+        return $this->_extraParams;
+    }
+
+    /**
+     * Returns all the free periods of time in a given period.
+     *
+     * @param integer $startStamp  The start timestamp.
+     * @param integer $endStamp    The end timestamp.
+     *
+     * @return array  A hash with free time periods, the start times as the
+     *                keys and the end times as the values.
      */
     function getFreePeriods($startStamp, $endStamp)
     {
@@ -131,21 +182,21 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
             return $periods;
         }
 
-        // Locate the first time in the requested period we have data
-        // for.
+        // Locate the first time in the requested period we have data for.
         $nextstart = max($startStamp, $this->getStart());
 
         // Check each busy period and add free periods in between.
         foreach ($this->_busyPeriods as $start => $end) {
             if ($start <= $endStamp && $end >= $nextstart) {
-                $periods[$nextstart] = min($start, $endStamp);
+                if ($nextstart <= $start) {
+                    $periods[$nextstart] = min($start, $endStamp);
+                }
                 $nextstart = min($end, $endStamp);
             }
         }
 
-        // If we didn't read the end of the requested period but still
-        // have data then mark as free to the end of the period or
-        // available data.
+        // If we didn't read the end of the requested period but still have
+        // data then mark as free to the end of the period or available data.
         if ($nextstart < $endStamp && $nextstart < $this->getEnd()) {
             $periods[$nextstart] = min($this->getEnd(), $endStamp);
         }
@@ -154,16 +205,29 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
     }
 
     /**
-     * Add a busy period to the info.
+     * Adds a busy period to the info.
+     *
+     * This function may throw away data in case you add a period with a start
+     * date that already exists. The longer of the two periods will be chosen
+     * (and all information associated with the shorter one will be removed).
+     *
+     * @param string $type       The type of the period. Either 'FREE' or
+     *                           'BUSY'; only 'BUSY' supported at the moment.
+     * @param integer $start     The start timestamp of the period.
+     * @param integer $end       The end timestamp of the period.
+     * @param integer $duration  The duration of the period. If specified, the
+     *                           $end parameter will be ignored.
+     * @param array   $extra     Additional parameters for this busy period.
      */
-    function addBusyPeriod($type, $start, $end = null, $duration = null)
+    function addBusyPeriod($type, $start, $end = null, $duration = null,
+                           $extra = array())
     {
-        if ($type == "FREE") {
+        if ($type == 'FREE') {
             // Make sure this period is not marked as busy.
             return false;
         }
 
-        // Calculate the end time is duration was specified.
+        // Calculate the end time if duration was specified.
         $tempEnd = is_null($duration) ? $end : $start + $duration;
 
         // Make sure the period length is always positive.
@@ -171,26 +235,35 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
         $start = min($start, $tempEnd);
 
         if (isset($this->_busyPeriods[$start])) {
-            // Already a period starting at this time. Extend to the
-            // length of the longest of the two.
-            $this->_busyPeriods[$start] = max($end, $this->_busyPeriods[$start]);
+            // Already a period starting at this time. Change the current
+            // period only if the new one is longer. This might be a problem
+            // if the callee assumes that there is no simplification going
+            // on. But since the periods are stored using the start time of
+            // the busy periods we have to throw away data here.
+            if ($end > $this->_busyPeriods[$start]) {
+                $this->_busyPeriods[$start] = $end;
+                $this->_extraParams[$start] = $extra;
+            }
         } else {
             // Add a new busy period.
             $this->_busyPeriods[$start] = $end;
+            $this->_extraParams[$start] = $extra;
         }
 
         return true;
     }
 
     /**
-     * Get the timestamp of the start of the time period this free
-     * busy information covers.
+     * Returns the timestamp of the start of the time period this free busy
+     * information covers.
+     *
+     * @return integer  A timestamp.
      */
     function getStart()
     {
         if (!is_a($this->getAttribute('DTSTART'), 'PEAR_Error')) {
             return $this->getAttribute('DTSTART');
-        } else if (count($this->_busyPeriods)) {
+        } elseif (count($this->_busyPeriods)) {
             return min(array_keys($this->_busyPeriods));
         } else {
             return false;
@@ -198,14 +271,16 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
     }
 
     /**
-     * Get the timestamp of the end of the time period this free busy
+     * Returns the timestamp of the end of the time period this free busy
      * information covers.
+     *
+     * @return integer  A timestamp.
      */
     function getEnd()
     {
         if (!is_a($this->getAttribute('DTEND'), 'PEAR_Error')) {
             return $this->getAttribute('DTEND');
-        } else if (count($this->_busyPeriods)) {
+        } elseif (count($this->_busyPeriods)) {
             return max(array_values($this->_busyPeriods));
         } else {
             return false;
@@ -213,7 +288,16 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
     }
 
     /**
-     * Merge the busy periods of another VFreebusy into this one.
+     * Merges the busy periods of another Horde_iCalendar_vfreebusy object
+     * into this one.
+     *
+     * This might lead to simplification no matter what you specify for the
+     * "simplify" flag since periods with the same start date will lead to the
+     * shorter period being removed (see addBusyPeriod).
+     *
+     * @param Horde_iCalendar_vfreebusy $freebusy  A freebusy object.
+     * @param boolean $simplify                    If true, simplify() will
+     *                                             called after the merge.
      */
     function merge($freebusy, $simplify = true)
     {
@@ -221,70 +305,155 @@ class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
             return false;
         }
 
+        $extra = $freebusy->getExtraParams();
         foreach ($freebusy->getBusyPeriods() as $start => $end) {
-            $this->addBusyPeriod('BUSY', $start, $end);
+            // This might simplify the busy periods without taking the
+            // "simplify" flag into account.
+            $this->addBusyPeriod('BUSY', $start, $end, null,
+                                 isset($extra[$start])
+                                 ? $extra[$start] : array());
         }
 
         $thisattr = $this->getAttribute('DTSTART');
         $thatattr = $freebusy->getAttribute('DTSTART');
         if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
-            $this->setAttribute('DTSTART', $thatattr);
+            $this->setAttribute('DTSTART', $thatattr, array(), false);
         } elseif (!is_a($thatattr, 'PEAR_Error')) {
-            if ($thatattr > $thisattr) {
-                $this->setAttribute('DTSTART', $thatattr);
+            if ($thatattr < $thisattr) {
+                $this->setAttribute('DTSTART', $thatattr, array(), false);
             }
         }
 
         $thisattr = $this->getAttribute('DTEND');
         $thatattr = $freebusy->getAttribute('DTEND');
         if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
-            $this->setAttribute('DTEND', $thatattr);
+            $this->setAttribute('DTEND', $thatattr, array(), false);
         } elseif (!is_a($thatattr, 'PEAR_Error')) {
-            if ($thatattr < $thisattr) {
-                $this->setAttribute('DTEND', $thatattr);
+            if ($thatattr > $thisattr) {
+                $this->setAttribute('DTEND', $thatattr, array(), false);
             }
         }
 
         if ($simplify) {
             $this->simplify();
         }
+
         return true;
     }
 
     /**
-     * Remove all overlaps and simplify the busy periods array as much
-     * as possible.
+     * Removes all overlaps and simplifies the busy periods array as much as
+     * possible.
      */
     function simplify()
+    {
+        $clean = false;
+        $busy  = array($this->_busyPeriods, $this->_extraParams);
+        while (!$clean) {
+            $result = $this->_simplify($busy[0], $busy[1]);
+            $clean = $result === $busy;
+            $busy = $result;
+        }
+
+        ksort($result[1], SORT_NUMERIC);
+        $this->_extraParams = $result[1];
+
+        ksort($result[0], SORT_NUMERIC);
+        $this->_busyPeriods = $result[0];
+    }
+
+    function _simplify($busyPeriods, $extraParams = array())
     {
         $checked = array();
+        $checkedExtra = array();
         $checkedEmpty = true;
-        foreach ($this->_busyPeriods as $start => $end) {
+
+        foreach ($busyPeriods as $start => $end) {
             if ($checkedEmpty) {
                 $checked[$start] = $end;
+                $checkedExtra[$start] = isset($extraParams[$start])
+                    ? $extraParams[$start] : array();
                 $checkedEmpty = false;
             } else {
                 $added = false;
                 foreach ($checked as $testStart => $testEnd) {
-                    if ($start == $testStart) {
-                        $checked[$testStart] = max($testEnd, $end);
-                        $added = true;
-                    } else if ($end <= $testEnd && $end >= $testStart) {
+                    // Replace old period if the new period lies around the
+                    // old period.
+                    if ($start <= $testStart && $end >= $testEnd) {
+                        // Remove old period entry.
                         unset($checked[$testStart]);
-                        $checked[min($testStart, $start)] = max($testEnd, $end);
+                        unset($checkedExtra[$testStart]);
+                        // Add replacing entry.
+                        $checked[$start] = $end;
+                        $checkedExtra[$start] = isset($extraParams[$start])
+                            ? $extraParams[$start] : array();
+                        $added = true;
+                    } elseif ($start >= $testStart && $end <= $testEnd) {
+                        // The new period lies fully within the old
+                        // period. Just forget about it.
+                        $added = true;
+                    } elseif (($end <= $testEnd && $end >= $testStart) ||
+                              ($start >= $testStart && $start <= $testEnd)) {
+                        // Now we are in trouble: Overlapping time periods. If
+                        // we allow for additional parameters we cannot simply
+                        // choose one of the two parameter sets. It's better
+                        // to leave two separated time periods.
+                        $extra = isset($extraParams[$start])
+                            ? $extraParams[$start] : array();
+                        $testExtra = isset($checkedExtra[$testStart])
+                            ? $checkedExtra[$testStart] : array();
+                        // Remove old period entry.
+                        unset($checked[$testStart]);
+                        unset($checkedExtra[$testStart]);
+                        // We have two periods overlapping. Are their
+                        // additional parameters the same or different?
+                        $newStart = min($start, $testStart);
+                        $newEnd = max($end, $testEnd);
+                        if ($extra === $testExtra) {
+                            // Both periods have the same information. So we
+                            // can just merge.
+                            $checked[$newStart] = $newEnd;
+                            $checkedExtra[$newStart] = $extra;
+                        } else {
+                            // Extra parameters are different. Create one
+                            // period at the beginning with the params of the
+                            // first period and create a trailing period with
+                            // the params of the second period. The break
+                            // point will be the end of the first period.
+                            $break = min($end, $testEnd);
+                            $checked[$newStart] = $break;
+                            $checkedExtra[$newStart] =
+                                isset($extraParams[$newStart])
+                                ? $extraParams[$newStart] : array();
+                            $checked[$break] = $newEnd;
+                            $highStart = max($start, $testStart);
+                            $checkedExtra[$break] =
+                                isset($extraParams[$highStart])
+                                ? $extraParams[$highStart] : array();
+
+                            // Ensure we also have the extra data in the
+                            // extraParams.
+                            $extraParams[$break] =
+                                isset($extraParams[$highStart])
+                                ? $extraParams[$highStart] : array();
+                        }
                         $added = true;
                     }
+
                     if ($added) {
                         break;
                     }
                 }
+
                 if (!$added) {
                     $checked[$start] = $end;
+                    $checkedExtra[$start] = isset($extraParams[$start])
+                        ? $extraParams[$start] : array();
                 }
             }
         }
-        ksort($checked, SORT_NUMERIC);
-        $this->_busyPeriods = $checked;
+
+        return array($checked, $checkedExtra);
     }
 
 }
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vjournal.php b/phpgwapi/inc/horde/Horde/iCalendar/vjournal.php
index 632bc1b7ba..2ad56e5a5f 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vjournal.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vjournal.php
@@ -2,15 +2,14 @@
 /**
  * Class representing vJournals.
  *
- * $Horde: framework/iCalendar/iCalendar/vjournal.php,v 1.8 2004/08/13 19:11:35 karsten Exp $
+ * $Horde: framework/iCalendar/iCalendar/vjournal.php,v 1.8.10.8 2008/07/03 08:42:58 jan Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
@@ -21,11 +20,6 @@ class Horde_iCalendar_vjournal extends Horde_iCalendar {
         return 'vJournal';
     }
 
-    function parsevCalendar($data)
-    {
-        parent::parsevCalendar($data, 'VJOURNAL');
-    }
-
     function exportvCalendar()
     {
         return parent::_exportvData('VJOURNAL');
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vnote.php b/phpgwapi/inc/horde/Horde/iCalendar/vnote.php
index 4b76007b42..eb625dbaf4 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vnote.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vnote.php
@@ -5,29 +5,29 @@ require_once EGW_API_INC.'/horde/Horde/iCalendar.php';
 /**
  * Class representing vNotes.
  *
- * $Horde: framework/iCalendar/iCalendar/vnote.php,v 1.2 2004/08/13 19:11:35 karsten Exp $
+ * $Horde: framework/iCalendar/iCalendar/vnote.php,v 1.3.10.9 2008/07/03 08:42:58 jan Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
+ * @author  Mike Cochrane <mike@graftonhall.co.nz>
  * @author  Karsten Fourmont <fourmont@gmx.de>
- * @version $Revision$
  * @package Horde_iCalendar
  */
 class Horde_iCalendar_vnote extends Horde_iCalendar {
 
+    function Horde_iCalendar_vnote($version = '1.1')
+    {
+        return parent::Horde_iCalendar($version);
+    }
+
     function getType()
     {
         return 'vNote';
     }
 
-    function parsevCalendar($data)
-    {
-        return parent::parsevCalendar($data, 'VNOTE');
-    }
-
     /**
      * Unlike vevent and vtodo, a vnote is normally not enclosed in an
      * iCalendar container. (BEGIN..END)
@@ -43,7 +43,7 @@ class Horde_iCalendar_vnote extends Horde_iCalendar {
             }
         }
 
-        return $this->_exportvData('VNOTE') . $this->_newline;
+        return $this->_exportvData('VNOTE');
     }
 
 }
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vtimezone.php b/phpgwapi/inc/horde/Horde/iCalendar/vtimezone.php
index 922b21e85a..332c14f5c3 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vtimezone.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vtimezone.php
@@ -2,15 +2,14 @@
 /**
  * Class representing vTimezones.
  *
- * $Horde: framework/iCalendar/iCalendar/vtimezone.php,v 1.8 2004/08/13 19:11:35 karsten Exp $
+ * $Horde: framework/iCalendar/iCalendar/vtimezone.php,v 1.8.10.9 2008/07/03 08:42:58 jan Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
@@ -21,16 +20,145 @@ class Horde_iCalendar_vtimezone extends Horde_iCalendar {
         return 'vTimeZone';
     }
 
-    function parsevCalendar($data)
-    {
-        parent::parsevCalendar($data, 'VTIMEZONE');
-    }
-
     function exportvCalendar()
     {
         return parent::_exportvData('VTIMEZONE');
     }
 
+    /**
+     * Parse child components of the vTimezone component. Returns an
+     * array with the exact time of the time change as well as the
+     * 'from' and 'to' offsets around the change. Time is arbitrarily
+     * based on UTC for comparison.
+     */
+    function parseChild(&$child, $year)
+    {
+        // Make sure 'time' key is first for sort().
+        $result['time'] = 0;
+
+        $t = $child->getAttribute('TZOFFSETFROM');
+        if (is_a($t, 'PEAR_Error')) {
+            return false;
+        }
+        $result['from'] = ($t['hour'] * 60 * 60 + $t['minute'] * 60) * ($t['ahead'] ? 1 : -1);
+
+        $t = $child->getAttribute('TZOFFSETTO');
+        if (is_a($t, 'PEAR_Error')) {
+            return false;
+        }
+        $result['to'] = ($t['hour'] * 60 * 60 + $t['minute'] * 60) * ($t['ahead'] ? 1 : -1);
+
+        $switch_time = $child->getAttribute('DTSTART');
+        if (is_a($switch_time, 'PEAR_Error')) {
+            return false;
+        }
+
+        $rrules = $child->getAttribute('RRULE');
+        if (is_a($rrules, 'PEAR_Error')) {
+            if (!is_int($switch_time)) {
+                return false;
+            }
+            // Convert this timestamp from local time to UTC for
+            // comparison (All dates are compared as if they are UTC).
+            $t = getdate($switch_time);
+            $result['time'] = @gmmktime($t['hours'], $t['minutes'], $t['seconds'],
+                                        $t['mon'], $t['mday'], $t['year']);
+            return $result;
+        }
+
+        $rrules = explode(';', $rrules);
+        foreach ($rrules as $rrule) {
+            $t = explode('=', $rrule);
+            switch ($t[0]) {
+            case 'FREQ':
+                if ($t[1] != 'YEARLY') {
+                    return false;
+                }
+                break;
+
+            case 'INTERVAL':
+                if ($t[1] != '1') {
+                    return false;
+                }
+                break;
+
+            case 'BYMONTH':
+                $month = intval($t[1]);
+                break;
+
+            case 'BYDAY':
+                $len = strspn($t[1], '1234567890-+');
+                if ($len == 0) {
+                    return false;
+                }
+                $weekday = substr($t[1], $len);
+                $weekdays = array(
+                    'SU' => 0,
+                    'MO' => 1,
+                    'TU' => 2,
+                    'WE' => 3,
+                    'TH' => 4,
+                    'FR' => 5,
+                    'SA' => 6
+                );
+                $weekday = $weekdays[$weekday];
+                $which = intval(substr($t[1], 0, $len));
+                break;
+
+            case 'UNTIL':
+                if (intval($year) > intval(substr($t[1], 0, 4))) {
+                    return false;
+                }
+                break;
+            }
+        }
+
+        if (empty($month) || !isset($weekday)) {
+            return false;
+        }
+
+        if (is_int($switch_time)) {
+            // Was stored as localtime.
+            $switch_time = strftime('%H:%M:%S', $switch_time);
+            $switch_time = explode(':', $switch_time);
+        } else {
+            $switch_time = explode('T', $switch_time);
+            if (count($switch_time) != 2) {
+                return false;
+            }
+            $switch_time[0] = substr($switch_time[1], 0, 2);
+            $switch_time[2] = substr($switch_time[1], 4, 2);
+            $switch_time[1] = substr($switch_time[1], 2, 2);
+        }
+
+        // Get the timestamp for the first day of $month.
+        $when = gmmktime($switch_time[0], $switch_time[1], $switch_time[2],
+                         $month, 1, $year);
+        // Get the day of the week for the first day of $month.
+        $first_of_month_weekday = intval(gmstrftime('%w', $when));
+
+        // Go to the first $weekday before first day of $month.
+        if ($weekday >= $first_of_month_weekday) {
+            $weekday -= 7;
+        }
+        $when -= ($first_of_month_weekday - $weekday) * 60 * 60 * 24;
+
+        // If going backwards go to the first $weekday after last day
+        // of $month.
+        if ($which < 0) {
+            do {
+                $when += 60*60*24*7;
+            } while (intval(gmstrftime('%m', $when)) == $month);
+        }
+
+        // Calculate $weekday number $which.
+        $when += $which * 60 * 60 * 24 * 7;
+
+        $result['time'] = $when;
+
+        return $result;
+    }
+
 }
 
 /**
diff --git a/phpgwapi/inc/horde/Horde/iCalendar/vtodo.php b/phpgwapi/inc/horde/Horde/iCalendar/vtodo.php
index 5dfff21d7e..a7cce95dd0 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar/vtodo.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar/vtodo.php
@@ -2,15 +2,14 @@
 /**
  * Class representing vTodos.
  *
- * $Horde: framework/iCalendar/iCalendar/vtodo.php,v 1.13 2004/08/13 19:11:35 karsten Exp $
+ * $Horde: framework/iCalendar/iCalendar/vtodo.php,v 1.13.10.8 2008/07/03 08:42:58 jan Exp $
  *
- * Copyright 2003-2004 Mike Cochrane <mike@graftonhall.co.nz>
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
@@ -21,11 +20,6 @@ class Horde_iCalendar_vtodo extends Horde_iCalendar {
         return 'vTodo';
     }
 
-    function parsevCalendar($data)
-    {
-        parent::parsevCalendar($data, 'VTODO');
-    }
-
     function exportvCalendar()
     {
         return parent::_exportvData('VTODO');
diff --git a/phpgwapi/inc/horde/XML/WBXML.php b/phpgwapi/inc/horde/XML/WBXML.php
index 382d0bb18b..bbf8ac2bf0 100644
--- a/phpgwapi/inc/horde/XML/WBXML.php
+++ b/phpgwapi/inc/horde/XML/WBXML.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * Constants are from Binary XML Content Format Specification Version
- * 1.3, 25 July 2001 found at http://www.wapforum.org
+ * Constants are from Binary XML Content Format Specification Version 1.3, 25
+ * July 2001 found at http://www.wapforum.org
  */
 
 /**
@@ -49,8 +49,16 @@ define('DPI_DTD_WML_1_3', '-//WAPFORUM//DTD WML 1.3//EN');
 define('DPI_DTD_PROV_1_0', '-//WAPFORUM//DTD PROV 1.0//EN');
 define('DPI_DTD_WTA_WML_1_2', '-//WAPFORUM//DTD WTA-WML 1.2//EN');
 define('DPI_DTD_CHANNEL_1_2', '-//WAPFORUM//DTD CHANNEL 1.2//EN');
+
+define('DPI_DTD_SYNCML_1_0', '-//SYNCML//DTD SyncML 1.0//EN');
+define('DPI_DTD_DEVINF_1_0', '-//SYNCML//DTD DevInf 1.0//EN');
+define('DPI_DTD_METINF_1_0', '-//SYNCML//DTD MetInf 1.0//EN');
 define('DPI_DTD_SYNCML_1_1', '-//SYNCML//DTD SyncML 1.1//EN');
 define('DPI_DTD_DEVINF_1_1', '-//SYNCML//DTD DevInf 1.1//EN');
+define('DPI_DTD_METINF_1_1', '-//SYNCML//DTD MetInf 1.1//EN');
+define('DPI_DTD_SYNCML_1_2', '-//SYNCML//DTD SyncML 1.2//EN');
+define('DPI_DTD_DEVINF_1_2', '-//SYNCML//DTD DevInf 1.2//EN');
+define('DPI_DTD_METINF_1_2', '-//SYNCML//DTD MetInf 1.2//EN');
 
 /**
  * Only default character encodings from J2SE are currently supported.
@@ -63,13 +71,14 @@ define('CHARSET_UTF_16LE', 'UTF-16LE');
 define('CHARSET_UTF_16', 'UTF-16');
 
 /**
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
+ * $Horde: framework/XML_WBXML/WBXML.php,v 1.13.12.11 2008/01/02 11:31:02 jan Exp $
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
- * $Horde: framework/XML_WBXML/WBXML.php,v 1.18 2006/01/01 21:10:25 jan Exp $
- *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML {
@@ -173,8 +182,17 @@ class XML_WBXML {
                            // Not all SyncML clients know this, so we
                            // should use the string table.
                            // 0xFD1 => DPI_DTD_SYNCML_1_1,
-                           4051 => DPI_DTD_SYNCML_1_1,
-                           4052 => DPI_DTD_DEVINF_1_1,
+                           // These codes are taken from libwbxml wbxml_tables.h:
+                           4049 => DPI_DTD_SYNCML_1_0, // 0x0fd1
+                           4050 => DPI_DTD_DEVINF_1_0, // 0x0fd2
+                           4051 => DPI_DTD_SYNCML_1_1, // 0x0fd3
+                           4052 => DPI_DTD_DEVINF_1_1, // 0x0fd4
+                           4609 => DPI_DTD_SYNCML_1_2, // 0x1201
+                           //@todo: verify this:
+                           4611 => DPI_DTD_DEVINF_1_2  // 0x1203
+// taken from libxml but might be wrong:
+//                           4610 => DPI_DTD_DEVINF_1_2, // 0x1202
+//                           4611 => DPI_DTD_METINF_1_2  // 0x1203
                            );
         return isset($DPIString[$i]) ? $DPIString[$i] : null;
     }
@@ -197,8 +215,18 @@ class XML_WBXML {
                         DPI_DTD_WTA_WML_1_2 => 12,
                         DPI_DTD_CHANNEL_1_2 => 13,
 
-                        // Not all SyncML clients know this, so we
+                        // Not all SyncML clients know this, so maybe we
                         // should use the string table.
+                           // These codes are taken from libwbxml wbxml_tables.h:
+                        DPI_DTD_SYNCML_1_0 => 4049,
+                        DPI_DTD_DEVINF_1_0 => 4050,
+                        DPI_DTD_SYNCML_1_1 => 4051,
+                        DPI_DTD_DEVINF_1_1 => 4052,
+                        DPI_DTD_SYNCML_1_2 => 4609, // 0x1201
+//                        DPI_DTD_DEVINF_1_2 => 4610, // 0x1202
+//                        DPI_DTD_METINF_1_2 => 4611  // 0x1203
+                        //@todo: verify this
+                        DPI_DTD_DEVINF_1_2 => 4611  // 0x1203
                         // DPI_DTD_SYNCML_1_1 => 0xFD1,
                         // DPI_DTD_DEVINF_1_1 => 0xFD2,
                         );
diff --git a/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php b/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
index 98cdcba8c7..7306b351cd 100644
--- a/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
+++ b/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * $Horde: framework/XML_WBXML/WBXML/ContentHandler.php,v 1.15 2006/01/01 21:10:25 jan Exp $
- *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
- *
- * See the enclosed file COPYING for license information (LGPL).  If you did
- * not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
  * From Binary XML Content Format Specification Version 1.3, 25 July 2001
  * found at http://www.wapforum.org
  *
+ * $Horde: framework/XML_WBXML/WBXML/ContentHandler.php,v 1.9.10.11 2008/08/26 15:41:13 jan Exp $
+ *
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_ContentHandler {
@@ -35,9 +36,13 @@ class XML_WBXML_ContentHandler {
         $this->_currentUri = new XML_WBXML_LifoQueue();
     }
 
+    /**
+     */
     function raiseError($error)
     {
-        include_once 'PEAR.php';
+        if (!class_exists('PEAR')) {
+            require 'PEAR.php';
+        }
         return PEAR::raiseError($error);
     }
 
@@ -71,7 +76,7 @@ class XML_WBXML_ContentHandler {
         return strlen($this->_output);
     }
 
-    function startElement($uri, $element, $attrs)
+    function startElement($uri, $element, $attrs = array())
     {
         $this->_output .= '<' . $element;
 
@@ -104,12 +109,7 @@ class XML_WBXML_ContentHandler {
 
     function opaque($o)
     {
-        // I can check the first chanracter and see if it is WBXML.
-        if (ord($o[0]) < 10) {
-            // Should decode this, I really need a call back function.
-        } else {
-            $this->_output .= $o;
-        }
+        $this->_output .= $o;
     }
 
     function setOpaqueHandler($opaqueHandler)
@@ -122,6 +122,15 @@ class XML_WBXML_ContentHandler {
         unset($this->_opaqueHandler);
     }
 
+    function createSubHandler()
+    {
+        $name = get_class($this); // clone current class
+        $sh = new $name();
+        $sh->setCharset($this->getCharsetStr());
+        $sh->setVersion($this->getVersion());
+        return $sh;
+    }
+
 }
 
 class XML_WBXML_LifoQueue {
diff --git a/phpgwapi/inc/horde/XML/WBXML/DTD.php b/phpgwapi/inc/horde/XML/WBXML/DTD.php
index 880c3dec00..39c336ea50 100644
--- a/phpgwapi/inc/horde/XML/WBXML/DTD.php
+++ b/phpgwapi/inc/horde/XML/WBXML/DTD.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * $Horde: framework/XML_WBXML/WBXML/DTD.php,v 1.8 2006/01/01 21:10:25 jan Exp $
- *
  * From Binary XML Content Format Specification Version 1.3, 25 July 2001
  * found at http://www.wapforum.org
  *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
+ * $Horde: framework/XML_WBXML/WBXML/DTD.php,v 1.6.12.8 2008/01/02 11:31:02 jan Exp $
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_DTD {
@@ -88,6 +89,11 @@ class XML_WBXML_DTD {
     function toCodePageURI($uri)
     {
         $uri = strtolower($uri);
+        if (!isset($this->strCodePagesURI[$uri])) {
+            //Horde::logMessage("WBXML unable to find codepage for $uri!", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            //die("unable to find codepage for $uri!\n");
+        }
+
         $ret = isset($this->strCodePagesURI[$uri]) ? $this->strCodePagesURI[$uri] : false;
 
         return $ret;
diff --git a/phpgwapi/inc/horde/XML/WBXML/DTD/SyncML.php b/phpgwapi/inc/horde/XML/WBXML/DTD/SyncML.php
index 6f2edfa703..bbee83f931 100644
--- a/phpgwapi/inc/horde/XML/WBXML/DTD/SyncML.php
+++ b/phpgwapi/inc/horde/XML/WBXML/DTD/SyncML.php
@@ -3,16 +3,17 @@
 include_once 'XML/WBXML/DTD.php';
 
 /**
- * $Horde: framework/XML_WBXML/WBXML/DTD/SyncML.php,v 1.11 2006/01/01 21:10:26 jan Exp $
- *
  * From Binary XML Content Format Specification Version 1.3, 25 July 2001
  * found at http://www.wapforum.org
  *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
+ * $Horde: framework/XML_WBXML/WBXML/DTD/SyncML.php,v 1.6.12.8 2008/01/02 11:31:03 jan Exp $
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_DTD_SyncML extends XML_WBXML_DTD {
@@ -72,17 +73,29 @@ class XML_WBXML_DTD_SyncML extends XML_WBXML_DTD {
         $this->setTag(0x30, "Reserved for future use"); // 0x00
         $this->setTag(0x31, "VerDTD"); // 0x00
         $this->setTag(0x32, "VerProto"); // 0x00
-        $this->setTag(0x33, "NumberOfChanged"); // 0x00
+        $this->setTag(0x33, "NumberOfChanges"); // 0x00
         $this->setTag(0x34, "MoreData"); // 0x00
+        $this->setTag(0x35, "Field"); // 0x00
+        $this->setTag(0x36, "Filter"); // 0x00
+        $this->setTag(0x37, "Record"); // 0x00
+        $this->setTag(0x38, "FilterType"); // 0x00
+        $this->setTag(0x39, "SourceParent"); // 0x00
+        $this->setTag(0x3a, "TargetParent"); // 0x00
+        $this->setTag(0x3b, "Move"); // 0x00
+        $this->setTag(0x3c, "Correlator"); // 0x00
 
-        if ($this->version == 0) {
-            $this->setCodePage(0, '-//SYNCML//DTD SyncML 1.0//EN', 'syncml:syncml1.0');
-            $this->setCodePage(1, '-//SYNCML//DTD MetInf 1.0//EN', 'syncml:metinf');
-            $this->setURI('syncml:syncml1.0');
-        } else {
-            $this->setCodePage(0, '-//SYNCML//DTD SyncML 1.1//EN', 'syncml:syncml1.1');
-            $this->setCodePage(1, '-//SYNCML//DTD MetInf 1.1//EN', 'syncml:metinf1.1');
+        if ($this->version == 1) {
+            $this->setCodePage(0, DPI_DTD_SYNCML_1_1, 'syncml:syncml1.1');
+            $this->setCodePage(1, DPI_DTD_METINF_1_1, 'syncml:metinf1.1');
             $this->setURI('syncml:syncml1.1');
+        } elseif ($this->version == 2) {
+            $this->setCodePage(0, DPI_DTD_SYNCML_1_2, 'syncml:syncml1.2');
+            $this->setCodePage(1, DPI_DTD_METINF_1_2, 'syncml:metinf1.2');
+            $this->setURI('syncml:syncml1.2');
+        } else {
+            $this->setCodePage(0, DPI_DTD_SYNCML_1_0, 'syncml:syncml1.0');
+            $this->setCodePage(1, DPI_DTD_METINF_1_0, 'syncml:metinf1.0');
+            $this->setURI('syncml:syncml1.0');
         }
     }
 
diff --git a/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLDevInf.php b/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLDevInf.php
index 076236b4ce..6cb83c88b7 100644
--- a/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLDevInf.php
+++ b/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLDevInf.php
@@ -3,16 +3,17 @@
 include_once 'XML/WBXML/DTD.php';
 
 /**
- * $Horde: framework/XML_WBXML/WBXML/DTD/SyncMLDevInf.php,v 1.11 2006/01/01 21:10:26 jan Exp $
- *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
- *
  * From Binary XML Content Format Specification Version 1.3, 25 July 2001
  * found at http://www.wapforum.org
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * $Horde: framework/XML_WBXML/WBXML/DTD/SyncMLDevInf.php,v 1.4.12.8 2008/01/02 11:31:03 jan Exp $
+ *
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_DTD_SyncMLDevInf extends XML_WBXML_DTD {
@@ -26,6 +27,8 @@ class XML_WBXML_DTD_SyncMLDevInf extends XML_WBXML_DTD {
          * | sed -e 's#^.*\"\([^\"]*\)\", *\(0x..\), \(0x..\) },.*$#        \$this->setTag\(\3, \"\1\"\); // \2#g'
          */
 
+	#Horde::logMessage("XML_WBXML_DTD_SyncMLDevInf version=" . $this->version, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
         $this->setTag(0x05, "CTCap"); // 0x00
         $this->setTag(0x06, "CTType"); // 0x00
         $this->setTag(0x07, "DataStore"); // 0x00
@@ -64,13 +67,25 @@ class XML_WBXML_DTD_SyncMLDevInf extends XML_WBXML_DTD {
         $this->setTag(0x28, "UTC"); // 0x00
         $this->setTag(0x29, "SupportNumberOfChanges"); // 0x00
         $this->setTag(0x2a, "SupportLargeObjs"); // 0x00
+        $this->setTag(0x2b, "Property"); // 0x00
+        $this->setTag(0x2c, "PropParam"); // 0x00
+        $this->setTag(0x2d, "MaxOccur"); // 0x00
+        $this->setTag(0x2e, "NoTruncate"); // 0x00
+        $this->setTag(0x30, "Filter-Rx"); // 0x00
+        $this->setTag(0x31, "FilterCap"); // 0x00
+        $this->setTag(0x32, "FilterKeyword"); // 0x00
+        $this->setTag(0x33, "FieldLevel"); // 0x00
+        $this->setTag(0x34, "SupportHierarchicalSync"); // 0x00
 
-        if ($this->version == 0) {
-            $this->setCodePage(0, '-//SYNCML//DTD DevInf 1.0//EN', 'syncml:devinf');
-            $this->setURI('syncml:devinf');
-        } else {
-            $this->setCodePage(0, '-//SYNCML//DTD DevInf 1.1//EN', 'syncml:devinf1.1');
+        if ($this->version == 1) {
+            $this->setCodePage(0, DPI_DTD_DEVINF_1_1, 'syncml:devinf1.1');
             $this->setURI('syncml:devinf1.1');
+        } elseif ($this->version == 2) {
+            $this->setCodePage(0, DPI_DTD_DEVINF_1_2, 'syncml:devinf1.2');
+            $this->setURI('syncml:devinf1.2');
+        } else {
+            $this->setCodePage(0, DPI_DTD_DEVINF_1_0, 'syncml:devinf1.0');
+            $this->setURI('syncml:devinf1.0');
         }
     }
 
diff --git a/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLMetInf.php b/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLMetInf.php
index 43a5737c2a..650ba74189 100644
--- a/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLMetInf.php
+++ b/phpgwapi/inc/horde/XML/WBXML/DTD/SyncMLMetInf.php
@@ -3,16 +3,17 @@
 include_once 'XML/WBXML/DTD.php';
 
 /**
- * $Horde: framework/XML_WBXML/WBXML/DTD/SyncMLMetInf.php,v 1.9 2006/01/01 21:10:26 jan Exp $
- *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
- *
  * From Binary XML Content Format Specification Version 1.3, 25 July 2001
  * found at http://www.wapforum.org
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * $Horde: framework/XML_WBXML/WBXML/DTD/SyncMLMetInf.php,v 1.4.12.8 2008/01/02 11:31:03 jan Exp $
+ *
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_DTD_SyncMLMetInf extends XML_WBXML_DTD {
@@ -43,17 +44,22 @@ class XML_WBXML_DTD_SyncMLMetInf extends XML_WBXML_DTD {
         $this->setTag(0x12, "Size"); // 0x01
         $this->setTag(0x13, "Type"); // 0x01
         $this->setTag(0x14, "Version"); // 0x01
+        $this->setTag(0x15, "MaxObjSize"); // 0x01
+        $this->setTag(0x16, "FieldLevel"); // 0x01
 
-        if ($this->version == 0) {
-            #$this->setCodePage(0, '-//SYNCML//DTD SyncML 1.0//EN', 'syncml:SYNCML1.0');
-            $this->setCodePage(0, '-//SYNCML//DTD SyncML 1.0//EN', 'syncml:syncml1.0');
-            $this->setCodePage(1, '-//SYNCML//DTD MetInf 1.0//EN', 'syncml:metinf');
-            $this->setURI('syncml:metinf');
-        } else {
-            $this->setCodePage(0, '-//SYNCML//DTD SyncML 1.1//EN', 'syncml:syncml1.1');
-            $this->setCodePage(1, '-//SYNCML//DTD MetInf 1.1//EN', 'syncml:metinf1.1');
+        if ($this->version == 1) {
+            $this->setCodePage(0, DPI_DTD_SYNCML_1_1, 'syncml:syncml1.1');
+            $this->setCodePage(1, DPI_DTD_METINF_1_1, 'syncml:metinf1.1');
             $this->setURI('syncml:metinf1.1');
             //$this->setURI('syncml:metinf'); // for some funny reason, libwbxml produces no :metinf1.1 here
+        } elseif ($this->version == 2) {
+            $this->setCodePage(0, DPI_DTD_SYNCML_1_2, 'syncml:syncml1.2');
+            $this->setCodePage(1, DPI_DTD_METINF_1_2, 'syncml:metinf1.2');
+            $this->setURI('syncml:metinf1.2');
+        } else {
+            $this->setCodePage(0, DPI_DTD_SYNCML_1_0, 'syncml:syncml1.0');
+            $this->setCodePage(1, DPI_DTD_METINF_1_0, 'syncml:metinf1.0');
+            $this->setURI('syncml:metinf1.0');
         }
     }
 
diff --git a/phpgwapi/inc/horde/XML/WBXML/DTDManager.php b/phpgwapi/inc/horde/XML/WBXML/DTDManager.php
index 1f57e28195..d31cb33fdd 100644
--- a/phpgwapi/inc/horde/XML/WBXML/DTDManager.php
+++ b/phpgwapi/inc/horde/XML/WBXML/DTDManager.php
@@ -5,50 +5,94 @@ include_once 'XML/WBXML/DTD/SyncMLMetInf.php';
 include_once 'XML/WBXML/DTD/SyncMLDevInf.php';
 
 /**
- * $Horde: framework/XML_WBXML/WBXML/DTDManager.php,v 1.7 2006/01/01 21:10:25 jan Exp $
+ * From Binary XML Content Format Specification Version 1.3, 25 July 2001
+ * found at http://www.wapforum.org
  *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
+ * $Horde: framework/XML_WBXML/WBXML/DTDManager.php,v 1.3.12.14 2008/01/02 11:31:02 jan Exp $
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
- * From Binary XML Content Format Specification Version 1.3, 25 July
- * 2001 found at http://www.wapforum.org
- *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_DTDManager {
 
+    /**
+     * @var array
+     */
     var $_strDTD = array();
+
+    /**
+     * @var array
+     */
     var $_strDTDURI = array();
 
+    /**
+     */
     function XML_WBXML_DTDManager()
     {
-        $this->registerDTD('-//SYNCML//DTD SyncML 1.0//EN', 'syncml:syncml1.0', new XML_WBXML_DTD_SyncML(0));
-        $this->registerDTD('-//SYNCML//DTD SyncML 1.1//EN', 'syncml:syncml1.1', new XML_WBXML_DTD_SyncML(1));
+        $this->registerDTD(DPI_DTD_SYNCML_1_0, 'syncml:syncml1.0', new XML_WBXML_DTD_SyncML(0));
+        $this->registerDTD(DPI_DTD_SYNCML_1_1, 'syncml:syncml1.1', new XML_WBXML_DTD_SyncML(1));
+        $this->registerDTD(DPI_DTD_SYNCML_1_2, 'syncml:syncml1.2', new XML_WBXML_DTD_SyncML(2));
 
-        $this->registerDTD('-//SYNCML//DTD MetInf 1.0//EN', 'syncml:metinf', new XML_WBXML_DTD_SyncMLMetInf(0));
-        $this->registerDTD('-//SYNCML//DTD MetInf 1.1//EN', 'syncml:metinf1.1', new XML_WBXML_DTD_SyncMLMetInf(1));
+        $this->registerDTD(DPI_DTD_METINF_1_0, 'syncml:metinf1.0', new XML_WBXML_DTD_SyncMLMetInf(0));
+        $this->registerDTD(DPI_DTD_METINF_1_1, 'syncml:metinf1.1', new XML_WBXML_DTD_SyncMLMetInf(1));
+        $this->registerDTD(DPI_DTD_METINF_1_2, 'syncml:metinf1.2', new XML_WBXML_DTD_SyncMLMetInf(2));
 
-        $this->registerDTD('-//SYNCML//DTD DevInf 1.0//EN', 'syncml:devinf', new XML_WBXML_DTD_SyncMLDevInf(0));
-        $this->registerDTD('-//SYNCML//DTD DevInf 1.1//EN', 'syncml:devinf1.1', new XML_WBXML_DTD_SyncMLDevInf(1));
+        $this->registerDTD(DPI_DTD_DEVINF_1_0, 'syncml:devinf1.0', new XML_WBXML_DTD_SyncMLDevInf(0));
+        $this->registerDTD(DPI_DTD_DEVINF_1_1, 'syncml:devinf1.1', new XML_WBXML_DTD_SyncMLDevInf(1));
+        $this->registerDTD(DPI_DTD_DEVINF_1_2, 'syncml:devinf1.2', new XML_WBXML_DTD_SyncMLDevInf(2));
     }
 
-    function getInstance($publicIdentifier)
+    /**
+     */
+    function &getInstance($publicIdentifier)
     {
-        return isset($this->_strDTD[$publicIdentifier]) ? $this->_strDTD[$publicIdentifier] : null;
+        $publicIdentifier = strtolower($publicIdentifier);
+        if (isset($this->_strDTD[$publicIdentifier])) {
+            $dtd = &$this->_strDTD[$publicIdentifier];
+        } else {
+            $dtd = null;
+        }
+        return $dtd;
     }
 
-    function getInstanceURI($uri)
+    /**
+     */
+    function &getInstanceURI($uri)
     {
         $uri = strtolower($uri);
-        return isset($this->_strDTDURI[$uri]) ? $this->_strDTDURI[$uri] : null;
+
+        // some manual hacks:
+        if ($uri == 'syncml:syncml') {
+            $uri = 'syncml:syncml1.0';
+        }
+        if ($uri == 'syncml:metinf') {
+            $uri = 'syncml:metinf1.0';
+        }
+        if ($uri == 'syncml:devinf') {
+            $uri = 'syncml:devinf1.0';
+        }
+
+        if (isset($this->_strDTDURI[$uri])) {
+            $dtd = &$this->_strDTDURI[$uri];
+        } else {
+            $dtd = null;
+        }
+        return $dtd;
     }
 
+    /**
+     */
     function registerDTD($publicIdentifier, $uri, &$dtd)
     {
         $dtd->setDPI($publicIdentifier);
 
+        $publicIdentifier = strtolower($publicIdentifier);
+
         $this->_strDTD[$publicIdentifier] = $dtd;
         $this->_strDTDURI[strtolower($uri)] = $dtd;
     }
diff --git a/phpgwapi/inc/horde/XML/WBXML/Decoder.php b/phpgwapi/inc/horde/XML/WBXML/Decoder.php
index 9ef6695659..c2591619f6 100644
--- a/phpgwapi/inc/horde/XML/WBXML/Decoder.php
+++ b/phpgwapi/inc/horde/XML/WBXML/Decoder.php
@@ -5,16 +5,17 @@ include_once 'XML/WBXML/DTDManager.php';
 include_once 'XML/WBXML/ContentHandler.php';
 
 /**
- * $Horde: framework/XML_WBXML/WBXML/Decoder.php,v 1.36 2006/01/01 21:10:25 jan Exp $
+ * From Binary XML Content Format Specification Version 1.3, 25 July 2001
+ * found at http://www.wapforum.org
  *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
+ * $Horde: framework/XML_WBXML/WBXML/Decoder.php,v 1.22.10.11 2008/01/02 11:31:02 jan Exp $
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
- * From Binary XML Content Format Specification Version 1.3, 25 July
- * 2001 found at http://www.wapforum.org
- *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
@@ -84,7 +85,8 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
      *
      * @param XML_WBXML_ContentHandler $ch The contentHandler
      */
-    function setContentHandler(&$ch) {
+    function setContentHandler(&$ch)
+    {
         $this->_ch = &$ch;
     }
     /**
@@ -96,7 +98,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
     {
         $value =  $input{$this->_strpos++};
         $value =  ord($value);
-        
+
         return $value;
     }
 
@@ -133,12 +135,8 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
      */
     function decode($wbxml)
     {
-	// fix for Nokia Series 60 which seem to send empty data block sometimes
-	if(strlen($wbxml) == 0) {
-        	return true;
-	}
-	
         $this->_error = false; // reset state
+
         $this->_strpos = 0;
 
         if (empty($this->_ch)) {
@@ -149,6 +147,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
         // version = u_int8
         // currently 1, 2 or 3
         $this->_wbxmlVersion = $this->getVersionNumber($wbxml);
+        #Horde::logMessage("WBXML[" . $this->_strpos . "] version " . $this->_wbxmlVersion, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         // Get Document Public Idetifier from Section 5.5
         // publicid = mb_u_int32 | (zero index)
@@ -156,9 +155,11 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
         // Containing the value zero (0)
         // The actual DPI is determined after the String Table is read.
         $dpiStruct = $this->getDocumentPublicIdentifier($wbxml);
+
         // Get Charset from 5.6
         // charset = mb_u_int32
         $this->_charset = $this->getCharset($wbxml);
+        #Horde::logMessage("WBXML[" . $this->_strpos . "] charset " . $this->_charset, __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         // Get String Table from 5.7
         // strb1 = length *byte
@@ -166,8 +167,8 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
 
         // Get Document Public Idetifier from Section 5.5.
         $this->_dpi = $this->getDocumentPublicIdentifierImpl($dpiStruct['dpiType'],
-                                                             $dpiStruct['dpiNumber'],
-                                                             $this->_stringTable);
+                                                             $dpiStruct['dpiNumber']);
+                                                             #$this->_stringTable);
 
         // Now the real fun begins.
         // From Sections 5.2 and 5.8
@@ -180,8 +181,8 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
         $this->_tagDTD = $this->_dtdManager->getInstance($this->_dpi);
 
         if (!$this->_tagDTD) {
-            return $this->raiseError('No DTD found for ' 
-                             . $this->_dpi . '/' 
+            return $this->raiseError('No DTD found for '
+                             . $this->_dpi . '/'
                              . $dpiStruct['dpiNumber']);
         }
 
@@ -204,6 +205,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
     function getDocumentPublicIdentifier($input)
     {
         $i = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
+	
         if ($i == 0) {
             return array('dpiType' => 2,
                          'dpiNumber' => $this->getByte($input));
@@ -218,6 +220,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
         if ($dpiType == 1) {
             return XML_WBXML::getDPIString($dpiNumber);
         } else {
+            #Horde::logMessage("WBXML string table $dpiNumber:\n" . print_r($this->_stringTable, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
             return $this->getStringTableEntry($dpiNumber);
         }
     }
@@ -235,7 +238,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
     }
 
     /**
-     * Retrieves the string table. 
+     * Retrieves the string table.
      * The string table consists of an mb_u_int32 length
      * and then length bytes forming the table.
      * References to the string table refer to the
@@ -254,10 +257,10 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
     {
         if ($index >= strlen($this->_stringTable)) {
             $this->_error =
-                $this->_ch->raiseError('Invalid offset ' . $index
-                                     . ' value encountered around position '
-                                     . $this->_strpos
-                                     . '. Broken wbxml?');
+                $this->raiseError('Invalid offset ' . $index
+                                  . ' value encountered around position '
+                                  . $this->_strpos
+                                  . '. Broken wbxml?');
             return '';
         }
 
@@ -270,17 +273,17 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
         if (ord($ch) == 0) {
             return ''; // don't return '#'
         }
- 
+
         while (ord($ch) != 0) {
             $str[$i++] = $ch;
             if ($index >= strlen($this->_stringTable)) {
-                break;    
+                break;
             }
             $ch = $this->_stringTable[$index++];
         }
         // print "string table entry: $str\n";
         return $str;
-        
+
     }
 
     function _decode($input)
@@ -288,7 +291,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
         $token = $this->getByte($input);
         $str = '';
 
-        #print "position: " . $this->_strpos . " token: " . $token . " str10: " . substr($input, $this->_strpos, 10) . "\n"; // @todo: remove debug output
+        // print "position: " . $this->_strpos . " token: " . $token . " str10: " . substr($input, $this->_strpos, 10) . "\n"; // @todo: remove debug output
 
         switch ($token) {
         case XML_WBXML_GLOBAL_TOKEN_STR_I:
@@ -370,34 +373,36 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
         case XML_WBXML_GLOBAL_TOKEN_OPAQUE:
             // Section 5.8.4.6
             $size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
-            // print "opaque of size $size\n"; // @todo remove debug
-            $b = $this->_substr($input, $this->_strpos, $size);
-            #$b = mb_substr($input, $this->_strpos, $size, 'ISO-8859-1');
-            $this->_strpos += $size;
+            if ($size > 0) {
+                #Horde::logMessage("WBXML opaque document size=$size, next=" . ord($input{$this->_strpos}), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                $b = $this->_substr($input, $this->_strpos, $size);
+                // print "opaque of size $size: ($b)\n"; // @todo remove debug
+                $this->_strpos += $size;
+                // opaque data inside a <data> element may or may not be
+                // a nested wbxml document (for example devinf data).
+                // We find out by checking the first byte of the data: if it's
+                // 1, 2 or 3 we expect it to be the version number of a wbxml
+                // document and thus start a new wbxml decoder instance on it.
 
-            // opaque data inside a <data> element may or may not be
-            // a nested wbxml document (for example devinf data).
-            // We find out by checking the first byte of the data: if it's
-            // 1, 2 or 3 we expect it to be the version number of a wbxml
-            // document and thus start a new wbxml decoder instance on it.
-
-            if ($this->_isData && ord($b) <= 10) {
-                $decoder = new XML_WBXML_Decoder(true);
-                $decoder->setContentHandler($this->_ch);
-                $s = $decoder->decode($b);
-        //                /* // @todo: FIXME currently we can't decode Nokia
-                // DevInf data. So ignore error for the time beeing.
-        if (is_a($s, 'PEAR_Error')) {
-                    $this->_error = $s;
-                    return;
+                if ($this->_isData && ord($b) < 10) {
+            	    #Horde::logMessage("WBXML opaque document size=$size, \$b[0]=" . ord($b), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                    $decoder = new XML_WBXML_Decoder(true);
+                    $decoder->setContentHandler($this->_ch);
+                    $s = $decoder->decode($b);
+            //                /* // @todo: FIXME currently we can't decode Nokia
+                    // DevInf data. So ignore error for the time beeing.
+                    if (is_a($s, 'PEAR_Error')) {
+                        $this->_error = $s;
+                        return;
+                    }
+                    // */
+                    // $this->_ch->characters($s);
+                } else {
+                    /* normal opaque behaviour: just copy the raw data: */
+                    // print "opaque handled as string=$b\n"; // @todo remove debug
+                    $this->_ch->characters($b);
                 }
-                // */
-                // $this->_ch->characters($s);
-            } else {
-                /* normal opaque behaviour: just copy the raw data: */
-                $this->_ch->characters( $b);
             }
-
             // old approach to deal with opaque data inside ContentHandler:
             // FIXME Opaque is used by SYNCML.  Opaque data that depends on the context
             // if (contentHandler instanceof OpaqueContentHandler) {
@@ -650,7 +655,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
      */
     function termstr($input)
     {
-        $str = '#'; // must start with nonempty string to allow array access 
+        $str = '#'; // must start with nonempty string to allow array access
         $i = 0;
         $ch = $input[$this->_strpos++];
         if (ord($ch) == 0) {
@@ -679,6 +684,5 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
          }
          return $ret;
      }
-
 }
 
diff --git a/phpgwapi/inc/horde/XML/WBXML/Encoder.php b/phpgwapi/inc/horde/XML/WBXML/Encoder.php
index 2633302443..39860df82f 100644
--- a/phpgwapi/inc/horde/XML/WBXML/Encoder.php
+++ b/phpgwapi/inc/horde/XML/WBXML/Encoder.php
@@ -6,16 +6,17 @@ include_once 'XML/WBXML/DTDManager.php';
 include_once 'Horde/String.php';
 
 /**
- * $Horde: framework/XML_WBXML/WBXML/Encoder.php,v 1.39 2006/01/01 21:10:25 jan Exp $
+ * From Binary XML Content Format Specification Version 1.3, 25 July 2001
+ * found at http://www.wapforum.org
  *
- * Copyright 2003-2006 Anthony Mills <amills@pyramid6.com>
+ * $Horde: framework/XML_WBXML/WBXML/Encoder.php,v 1.25.10.17 2008/08/26 15:41:21 jan Exp $
  *
- * See the enclosed file COPYING for license information (LGPL).  If you
+ * Copyright 2003-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
- * From Binary XML Content Format Specification Version 1.3, 25 July
- * 2001 found at http://www.wapforum.org
- *
+ * @author  Anthony Mills <amills@pyramid6.com>
  * @package XML_WBXML
  */
 class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
@@ -38,7 +39,7 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
 
     var $_subParser = null;
     var $_subParserStack = 0;
-    
+
     /**
      * The XML parser.
      *
@@ -97,7 +98,10 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
     function writeHeader($uri)
     {
         $this->_dtd = &$this->_dtdManager->getInstanceURI($uri);
-
+        if (!$this->_dtd) {
+            // TODO: proper error handling
+            die('Unable to find dtd for ' . $uri);
+        }
         $dpiString = $this->_dtd->getDPI();
 
         // Set Version Number from Section 5.4
@@ -132,7 +136,11 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
 
     function writeDocumentPublicIdentifier($dpiString, &$strings)
     {
-        $i = XML_WBXML::getDPIInt($dpiString);
+        $i = 0;
+
+        // The OMA test suite doesn't like DPI as integer code.
+        // So don't try lookup and always send full DPI string.
+        // $i = XML_WBXML::getDPIInt($dpiString);
 
         if ($i == 0) {
             $strings[0] = $dpiString;
@@ -191,7 +199,7 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
 
     function _getBytes($string, $cs)
     {
-        $string = String::convertCharset($string, $cs, 'utf-8');
+	$string = String::convertCharset($string, $cs, 'utf-8');
         $nbytes = strlen($string);
 
         $bytes = array();
@@ -210,8 +218,10 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
         return array($uri, $name);
     }
 
-    function startElement($uri, $name, $attributes)
+    function startElement($uri, $name, $attributes = array())
     {
+	#Horde::logMessage("WBXML Encoder $uri, " . ($this->_hasWrittenHeader ? 'true' : 'false'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
         if ($this->_subParser == null) {
             if (!$this->_hasWrittenHeader) {
                 $this->writeHeader($uri);
@@ -222,11 +232,11 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
             if ($this->_subParser == null) {
                 $this->writeTag($name, $attributes, true, $this->_charset);
             } else {
-                $this->_subParser->startElement($uri,$name, $attributes);
+                $this->_subParser->startElement($uri, $name, $attributes);
             }
         } else {
             $this->_subParserStack++;
-            $this->_subParser->startElement($uri,$name,$attributes);
+            $this->_subParser->startElement($uri, $name, $attributes);
         }
     }
 
@@ -237,12 +247,12 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
         $this->startElement($uri, $name, $attributes);
     }
 
-    function opaque($bytes)
+    function opaque($o)
     {
         if ($this->_subParser == null) {
             $this->_output .= chr(XML_WBXML_GLOBAL_TOKEN_OPAQUE);
-            XML_WBXML::intToMBUInt32($this->_output, count($bytes));
-            $this->_output .= $bytes;
+            XML_WBXML::intToMBUInt32($this->_output, strlen($o));
+            $this->_output .= $o;
         }
     }
 
@@ -274,7 +284,6 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
 
     function writeTag($name, $attrs, $hasContent, $cs)
     {
-
         if ($attrs != null && !count($attrs)) {
             $attrs = null;
         }
@@ -309,7 +318,7 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
             }
         }
 
-        if ($attrs != null && is_array($attrs) && count($attrs) > 0 ) {
+        if ($attrs != null && is_array($attrs) && count($attrs) > 0) {
             $this->writeAttributes($attrs, $cs);
         }
     }
@@ -376,11 +385,16 @@ class XML_WBXML_Encoder extends XML_WBXML_ContentHandler {
 
     function changecodepage($uri)
     {
-        // @todo: this is a hack!
-        // what's the reason for this hack???? Lars
-        if ($uri != 'syncml:devinf' && $uri != 'syncml:metinf' && $uri != 'syncml:syncml1.0' && !preg_match('/1\.1$/', $uri)) {
+        if ($this->_dtd->getVersion() == 2 && !preg_match('/1\.2$/', $uri)) {
+            $uri .= '1.2';
+        }
+        if ($this->_dtd->getVersion() == 1 && !preg_match('/1\.1$/', $uri)) {
             $uri .= '1.1';
         }
+        if ($this->_dtd->getVersion() == 0 && !preg_match('/1\.0$/', $uri)) {
+            $uri .= '1.0';
+        }
+
         $cp = $this->_dtd->toCodePageURI($uri);
         if (strlen($cp)) {
             $this->_dtd = &$this->_dtdManager->getInstanceURI($uri);
diff --git a/phpgwapi/inc/horde/config/conf.php b/phpgwapi/inc/horde/config/conf.php
index 1e981e0ee9..27ac1dc063 100644
--- a/phpgwapi/inc/horde/config/conf.php
+++ b/phpgwapi/inc/horde/config/conf.php
@@ -21,7 +21,7 @@ $conf['auth']['driver'] = 'auto';
 $conf['log']['priority'] = PEAR_LOG_DEBUG;
 $conf['log']['ident'] = 'EGWSYNC';
 $conf['log']['params'] = array();
-$conf['log']['name'] = '/tmp/egroupware_syncml.log';
+$conf['log']['name'] = '/tmp/egroupware_syncml-1.6.log';
 $conf['log']['params']['append'] = true;
 $conf['log']['type'] = 'error_log';
 $conf['log']['enabled'] = true;
diff --git a/phpgwapi/inc/horde/lib/core.php b/phpgwapi/inc/horde/lib/core.php
index c3fe658592..1eac9a0eb7 100644
--- a/phpgwapi/inc/horde/lib/core.php
+++ b/phpgwapi/inc/horde/lib/core.php
@@ -21,8 +21,16 @@ ini_set('magic_quotes_runtime', 0);
  * include_path, you must add an ini_set() call here to add their location to
  * the include_path. */
 // ini_set('include_path', dirname(__FILE__) . PATH_SEPARATOR . ini_get('include_path'));
-set_include_path(dirname(__FILE__). '/../../horde/' . PATH_SEPARATOR . dirname(__FILE__). '/../../../../egw-pear/' . PATH_SEPARATOR . get_include_path());
+//set_include_path(dirname(__FILE__). '/../../horde/' . PATH_SEPARATOR . dirname(__FILE__). '/../../../../egw-pear/' . PATH_SEPARATOR . get_include_path());
 
+@define('EGW_BASE', dirname(dirname(__FILE__) . '/../../../../rpc.php'));
+// Check for a prior definition of HORDE_BASE (perhaps by an
+// auto_prepend_file definition for site customization).
+if (!defined('HORDE_BASE')) {
+    @define('HORDE_BASE', EGW_BASE . '/phpgwapi/inc/horde/');
+}
+
+set_include_path(HORDE_BASE . PATH_SEPARATOR . EGW_BASE . '/egw-pear/' . PATH_SEPARATOR . get_include_path());
 /* PEAR base class. */
 include_once 'PEAR.php';
 
@@ -30,14 +38,17 @@ include_once 'PEAR.php';
 include_once 'Horde.php';
 include_once 'Horde/Registry.php';
 #include_once 'Horde/DataTree.php';
-#include_once 'Horde/String.php';
+include_once 'Horde/String.php';
+include_once 'Horde/Date.php';
 include_once 'Horde/NLS.php';
-#include_once 'Horde/Notification.php';
-#include_once 'Horde/Auth.php';
-#include_once 'Horde/Browser.php';
-#include_once 'Horde/Perms.php';
+include_once 'Horde/iCalendar.php';
+//include_once 'Horde/Notification.php';
+//include_once 'Horde/Auth.php';
+//include_once 'Horde/Browser.php';
+//include_once 'Horde/Perms.php';
 
-#/* Browser detection object. */
-#if (class_exists('Browser')) {
-#    $browser = &Browser::singleton();
-#}
+/* Browser detection object. *
+if (class_exists('Browser')) {
+    $browser = &Browser::singleton();
+}
+*/
\ No newline at end of file

From d333605510fcf8151ec4598e5dbceb302f5e44d9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Jul 2009 19:44:09 +0000
Subject: [PATCH 478/510] - merged SyncML-1.2 branch with trunk: svn merge
 ^/trunk/addressbook@27378 ^/branches/SyncML-1.2/addressbook . - re-added to
 trunk commits, which were somehow not in SyncML-1.2 branch: svn merge -c
 26581 ^/trunk/addressbook svn merge -c 26582 ^/trunk/addressbook

---
 addressbook/inc/class.addressbook_bo.inc.php  | 275 +++++-
 .../inc/class.addressbook_groupdav.inc.php    |   4 +-
 addressbook/inc/class.addressbook_sif.inc.php |  73 +-
 addressbook/inc/class.addressbook_sql.inc.php |  24 +-
 .../inc/class.addressbook_vcal.inc.php        | 912 +++++++++++++-----
 5 files changed, 987 insertions(+), 301 deletions(-)

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index ed72bbc640..33f067f65d 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -5,6 +5,7 @@
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @package addressbook
  * @copyright (c) 2005-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @copyright (c) 2005/6 by Cornelius Weiss <egw@von-und-zu-weiss.de>
@@ -441,8 +442,13 @@ class addressbook_bo extends addressbook_so
 	 */
 	function fullname($contact)
 	{
+		if (empty($contact['n_family']) && empty($contact['n_given'])) {
+			$cpart = array('org_name');
+		} else {
+			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
+		}
 		$parts = array();
-		foreach(array('n_prefix','n_given','n_middle','n_family','n_suffix') as $n)
+		foreach($cpart as $n)
 		{
 			if ($contact[$n]) $parts[] = $contact[$n];
 		}
@@ -611,8 +617,7 @@ class addressbook_bo extends addressbook_so
 		$contact['modifier'] = $this->user;
 		$contact['modified'] = $this->now_su;
 		// set full name and fileas from the content
-		if (isset($contact['n_family']) && isset($contact['n_given']))
-		{
+		if (!isset($contact['n_fn'])) {
 			$contact['n_fn'] = $this->fullname($contact);
 			if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact);
 		}
@@ -1432,7 +1437,7 @@ class addressbook_bo extends addressbook_so
 				{
 					$cat_name = substr($cat_name, 2);
 				}
-				$cat_id = $this->categories->add(array('name' => $cat_name,'descr' => $cat_name));
+				$cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private'));
 			}
 
 			if ($cat_id)
@@ -1474,15 +1479,273 @@ class addressbook_bo extends addressbook_so
 
 	function fixup_contact(&$contact)
 	{
-		if (!isset($contact['n_fn']) || empty($contact['n_fn']))
+		if (empty($contact['n_fn']))
 		{
 			$contact['n_fn'] = $this->fullname($contact);
 		}
 
-		if (!isset($contact['n_fileas']) || empty($contact['n_fileas']))
+		if (empty($contact['n_fileas']))
 		{
 			$contact['n_fileas'] = $this->fileas($contact);
 		}
 	}
 
+	function all_empty(&$_contact, &$fields)
+	{
+		$retval = true;
+		foreach ($fields as $field) {
+			if (isset($_contact[$field]) && !empty($_contact[$field])) {
+				$retval = false;
+				break;
+			}
+		}
+		return $retval;
+	}
+
+
+	/**
+	 * Try to find a matching db entry
+	 *
+	 * @param array $contact   the contact data we try to find
+	 * @param boolean $relax=false if asked to relax, we only match against some key fields
+	 * @return the contact_id of the matching entry or false (if none matches)
+	 */
+	function find_contact($contact, $relax=false)
+	{
+		if ($contact['id'] && ($found = $this->read($contact['id'])))
+		{
+			// We only do a simple consistency check
+			if ((empty($found['n_family']) || $found['n_family'] == $contact['n_family'])
+					&& (empty($found['n_given']) || $found['n_given'] == $contact['n_given'])
+					&& (empty($found['org_name']) || $found['org_name'] == $contact['org_name']))
+			{
+				return $found['id'];
+			}
+		}
+		unset($contact['id']);
+
+		$columns_to_search = array('contact_id',
+					   'n_family', 'n_given', 'n_middle', 'n_prefix', 'n_suffix',
+						'bday', 'org_name', 'org_unit', 'title', 'role',
+						'email', 'email_home', 'url', 'url_home');
+		$tolerance_fields = array('contact_id',
+					  'n_middle', 'n_prefix', 'n_suffix',
+					  'org_unit', 'role',
+					  'bday',
+					  'email', 'email_home',
+					  'url', 'url_home');
+		$addr_one_fields = array('adr_one_street', 'adr_one_street2',
+					 'adr_one_locality', 'adr_one_region',
+					 'adr_one_postalcode', 'adr_one_countryname');
+		$addr_two_fields = array('adr_two_street', 'adr_two_street2',
+					 'adr_two_locality', 'adr_two_region',
+					 'adr_two_postalcode', 'adr_two_countryname');
+		$no_addr_one = array();
+		$no_addr_two = array();
+
+		$backend =& $this->get_backend();
+
+		// define filter for empty address one
+		foreach ($addr_one_fields as $field)
+		{
+			if (!($db_col = array_search($field, $backend->db_cols)))
+			{
+				$db_col = $field;
+			}
+			$no_addr_one[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+		}
+
+		// define filter for empty address two
+		foreach ($addr_two_fields as $field)
+		{
+			if (!($db_col = array_search($field, $backend->db_cols)))
+			{
+				$db_col = $field;
+			}
+			$no_addr_two[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+		}
+
+		$result = false;
+
+		$criteria = array();
+		$empty_columns = array();
+		foreach ($columns_to_search as $field)
+		{
+			if (!isset($contact[$field]) || empty($contact[$field])) {
+				// Not every device supports all fields
+				if (!in_array($field, $tolerance_fields))
+				{
+					if (!($db_col = array_search($field, $backend->db_cols)))
+					{
+						$db_col = $field;
+					}
+					$empty_columns[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+				}
+			}
+			else
+			{
+				if (!$relax || !in_array($field, $tolerance_fields))
+				{
+					$criteria[$field] = $contact[$field];
+				}
+			}
+		}
+
+		$filter = $empty_columns;
+
+		if (!$relax)
+		{
+			// We use addresses only for strong matching
+
+			if ($this->all_empty($contact, $addr_one_fields))
+			{
+				$filter = $filter + $no_addr_one;
+			}
+			else
+			{
+				foreach ($addr_one_fields as $field)
+				{
+					if (!isset($contact[$field]) || empty($contact[$field]))
+					{
+						if (!($db_col = array_search($field, $backend->db_cols)))
+						{
+							$db_col = $field;
+						}
+						$filter[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+					}
+					else
+					{
+						$criteria[$field] = $contact[$field];
+					}
+				}
+			}
+
+			if ($this->all_empty($contact, $addr_two_fields))
+			{
+				$filter = $filter + $no_addr_two;
+			}
+			else
+			{
+				foreach ($addr_two_fields as $field)
+				{
+					if (!isset($contact[$field]) || empty($contact[$field]))
+					{
+						if (!($db_col = array_search($field, $backend->db_cols)))
+						{
+							$db_col = $field;
+						}
+						$filter[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+					}
+					else
+					{
+						$criteria[$field] = $contact[$field];
+					}
+				}
+			}
+		}
+
+		Horde::logMessage("Addressbook find step 1:\n" . print_r($criteria, true) .
+				  "filter:\n" . print_r($filter, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		// first try full match
+		if (($foundContacts = parent::search($criteria, true, '', '', '', False, 'AND', false, $filter)))
+		{
+			$result =  $foundContacts[0]['id'];
+		}
+
+		// No need for more searches for relaxed matching
+		if (!$relax && !$result && !$this->all_empty($contact, $addr_one_fields)
+				&& $this->all_empty($contact, $addr_two_fields))
+		{
+			// try given address and ignore the second one in EGW
+			$filter = array_diff($filter, $no_addr_two);
+
+			Horde::logMessage("Addressbook find step 2:\n" . print_r($criteria, true) .
+				"filter:\n" . print_r($filter, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			if (($foundContacts = parent::search($criteria, true, '', '', '', False, 'AND', false, $filter)))
+			{
+				$result =  $foundContacts[0]['id'];
+			}
+			else
+			{
+				// try address as home address -- some devices don't qualify addresses
+				$filter = $empty_columns;
+				foreach ($addr_two_fields as $key => $field)
+				{
+					if (isset($criteria[$addr_one_fields[$key]]))
+					{
+						$criteria[$field] = $criteria[$addr_one_fields[$key]];
+						unset($criteria[$addr_one_fields[$key]]);
+					}
+					else
+					{
+						if (!($db_col = array_search($field,$backend->db_cols)))
+						{
+							$db_col = $field;
+						}
+						$filter[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+					}
+				}
+
+				$filter = $filter + $no_addr_one;
+
+				Horde::logMessage("Addressbook find step 3:\n" . print_r($criteria, true) .
+					"filter:\n" . print_r($filter, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+				if (($foundContacts = parent::search($criteria, true, '', '', '', False, 'AND', false, $filter)))
+				{
+					$result =  $foundContacts[0]['id'];
+				}
+			}
+		}
+		elseif (!$relax && !$result)
+		{ // No more searches for relaxed matching, try again after address swap
+
+			$filter = $empty_columns;
+
+			foreach ($addr_one_fields as $key => $field)
+			{
+				$_temp_set = false;
+				if (isset($criteria[$field]))
+				{
+					$_temp = $criteria[$field];
+					$_temp_set = true;
+					unset($criteria[$field]);
+				}
+				if (isset($criteria[$addr_two_fields[$key]]))
+				{
+					$criteria[$field] = $criteria[$addr_two_fields[$key]];
+					unset($criteria[$addr_two_fields[$key]]);
+				}
+				else
+				{
+					if (!($db_col = array_search($field,$backend->db_cols)))
+					{
+						$db_col = $field;
+					}
+					$filter[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+				}
+				if ($_temp_set)
+				{
+					$criteria[$addr_two_fields[$key]] = $_temp;
+				}
+				else
+				{
+					if (!($db_col = array_search($addr_two_fields[$key],$backend->db_cols)))
+					{
+						$db_col = $field;
+					}
+					$filter[] = "(" . $db_col . " IS NULL OR " . $db_col . " = '')";
+				}
+			}
+
+			Horde::logMessage("Addressbook find step 4:\n" . print_r($criteria, true) .
+					  "filter:\n" . print_r($filter, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			if(($foundContacts = parent::search($criteria, true, '', '', '', False, 'AND', false, $filter)))
+			{
+				$result =  $foundContacts[0]['id'];
+			}
+		}
+		return $result;
+	}
+
 }
diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index 9c9275bafc..1a82d68193 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -310,7 +310,7 @@ class addressbook_groupdav extends groupdav_handler
 	 */
 	private function _get_handler()
 	{
-		$handler = new addressbook_vcal();
+		$handler = new addressbook_vcal('addressbook','text/vcard');
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 
 		return $handler;
@@ -358,4 +358,4 @@ class addressbook_groupdav extends groupdav_handler
 	{
 		return $this->bo->check_perms($acl,$contact);
 	}
-}
\ No newline at end of file
+}
diff --git a/addressbook/inc/class.addressbook_sif.inc.php b/addressbook/inc/class.addressbook_sif.inc.php
index e527a242cc..158303342f 100644
--- a/addressbook/inc/class.addressbook_sif.inc.php
+++ b/addressbook/inc/class.addressbook_sif.inc.php
@@ -5,6 +5,7 @@
  * @link http://www.egroupware.org
  * @author Lars Kneschke <lkneschke@egroupware.org>
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @package addressbook
  * @subpackage export
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -94,6 +95,10 @@ class addressbook_sif extends addressbook_bo
 		'Folder'			=> '',
 	);
 
+	// standard headers
+	const xml_decl = '<?xml version="1.0" encoding="UTF-8"?>';
+	const SIF_decl = '<SIFVersion>1.1</SIFVersion>';
+
 	function startElement($_parser, $_tag, $_attributes) {
 	}
 
@@ -108,13 +113,12 @@ class addressbook_sif extends addressbook_bo
 		$this->sifData .= $_data;
 	}
 
-	function siftoegw($_sifdata) {
-		$sifData	= base64_decode($_sifdata);
+	function siftoegw($sifData) {
 
 		#$tmpfname = tempnam('/tmp/sync/contents','sifc_');
 
 		#$handle = fopen($tmpfname, "w");
-		#fwrite($handle, $sifdata);
+		#fwrite($handle, $sifData);
 		#fclose($handle);
 
 		$this->xml_parser = xml_parser_create('UTF-8');
@@ -131,6 +135,7 @@ class addressbook_sif extends addressbook_bo
 		}
 
 		foreach($this->contact as $key => $value) {
+			$value = preg_replace('/<\!\[CDATA\[(.+)\]\]>/Usim', '$1', $value);
 			$value = $GLOBALS['egw']->translation->convert($value, 'utf-8');
 			switch($key) {
 				case 'cat_id':
@@ -164,25 +169,17 @@ class addressbook_sif extends addressbook_bo
 	 * @param string $_sifdata
 	 * @return boolean/int/string contact-id or false, if not found
 	 */
-	function search($_sifdata,$contentID=null)
+	function search($_sifdata, $contentID=null, $relax=false)
 	{
-		if(!$contact = $this->siftoegw($_sifdata))
-		{
-			return false;
-		}
-		if ($contentID) {
-			$contact['contact_id'] = $contentID;
-		}
-		// patch from Di Guest says: we need to ignore the n_fileas
-		unset($contact['n_fileas']);
-		// we probably need to ignore even more as we do in vcaladdressbook
+	  	$result = false;
 
-		if(($foundContacts = addressbook_bo::search($contact)))
-		{
-			error_log(print_r($foundContacts,true));
-			return $foundContacts[0]['id'];
+		if($contact = $this->siftoegw($_sifdata)) {
+		        if ($contentID) {
+			        $contact['contact_id'] = $contentID;
+			}
+			$result = $this->find_contact($contact, $relax);
 		}
-		return false;
+		return $result;
 	}
 
 	/**
@@ -191,8 +188,9 @@ class addressbook_sif extends addressbook_bo
 	* @return int contact id
 	* @param string	$_vcard		the vcard
 	* @param int/string	$_abID=null		the internal addressbook id or !$_abID for a new enty
+	* @param boolean $merge=false	merge data with existing entry
 	*/
-	function addSIF($_sifdata, $_abID=null)
+	function addSIF($_sifdata, $_abID=null, $merge=false)
 	{
 		#error_log('ABID: '.$_abID);
 		#error_log(base64_decode($_sifdata));
@@ -209,24 +207,25 @@ class addressbook_sif extends addressbook_bo
 	}
 
 	/**
-	* return a vcard
+	* return a sifc
 	*
 	* @param int	$_id		the id of the contact
-	* @param int	$_vcardProfile	profile id for mapping from vcard values to egw addressbook
 	* @return string containing the vcard
 	*/
 	function getSIF($_id)
 	{
+		$sysCharSet	= $GLOBALS['egw']->translation->charset();
+
 		$fields = array_unique(array_values($this->sifMapping));
 		sort($fields);
 
-		if(!($entry = $this->read($_id)))
-		{
+		if(!($entry = $this->read($_id))) {
 			return false;
 		}
-		$sifContact = '<contact>';
+
+		$sifContact = self::xml_decl . "\n<contact>" . self::SIF_decl;
+
 		#error_log(print_r($entry,true));
-		$sysCharSet	= $GLOBALS['egw']->translation->charset();
 
 		// fillup some defaults such as n_fn and n_fileas is needed
 		$this->fixup_contact($entry);
@@ -242,15 +241,6 @@ class addressbook_sif extends addressbook_bo
 
 			switch($sifField)
 			{
-				// TODO handle multiple categories
-				case 'Categories':
-					if(!empty($value)) {
-						$value = implode("; ", $this->get_categories($value));
-						$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
-					}
-					$sifContact .= "<$sifField>$value</$sifField>";
-					break;
-
 				case 'Sensitivity':
 					$value = 2 * $value;	// eGW private is 0 (public) or 1 (private)
 					$sifContact .= "<$sifField>$value</$sifField>";
@@ -261,13 +251,22 @@ class addressbook_sif extends addressbook_bo
 					#$sifContact .= "<$sifField>/</$sifField>";
 					break;
 
+				case 'Categories':
+					if(!empty($value)) {
+						$value = implode("; ", $this->get_categories($value));
+						$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
+					} else {
+						break;
+					}
+
 				default:
-					$sifContact .= "<$sifField>".trim($value)."</$sifField>";
+					$value = @htmlspecialchars(trim($value), ENT_QUOTES, 'utf-8');
+					$sifContact .= "<$sifField>$value</$sifField>";
 					break;
 			}
 		}
 		$sifContact .= "</contact>";
 
-		return base64_encode($sifContact);
+		return $sifContact;
 	}
 }
diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 57c0d43831..f38c5ad421 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -607,11 +607,23 @@ class addressbook_sql extends so_sql
 	 */
 	function read($keys,$extra_cols='',$join='')
 	{
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		} else {
+			$minimum_uid_length = 8;
+		}
+
 		if (!is_array($keys) && !is_numeric($keys))
 		{
 			$keys = array('contact_uid' => $keys);
 		}
-		return parent::read($keys,$extra_cols,$join);
+		$contact = parent::read($keys,$extra_cols,$join);
+		// enforce a minium uid strength
+		if (is_array($contact) && (!isset($contact['uid'])
+				|| strlen($contact['uid']) < $minimum_uid_length)) {
+			parent::update(array('uid' => common::generate_uid('addressbook',$contact['id'])));
+		}
+		return $contact;
 	}
 
 	/**
@@ -623,6 +635,12 @@ class addressbook_sql extends so_sql
 	 */
 	function save($keys=null)
 	{
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		} else {
+			$minimum_uid_length = 8;
+		}
+
 		if (is_array($keys) && count($keys)) $this->data_merge($keys);
 
 		$new_entry = !$this->data['id'];
@@ -649,8 +667,8 @@ class addressbook_sql extends so_sql
 			}
 		}
 		// enforce a minium uid strength
-		if (!$err && ($new_entry || isset($this->data['uid'])) && (strlen($this->data['uid']) < 20 || is_numeric($this->data['uid'])))
-		{
+		if (!$err && (!isset($this->data['uid'])
+				|| strlen($this->data['uid']) < $minimum_uid_length)) {
 			parent::update(array('uid' => common::generate_uid('addressbook',$this->data['id'])));
 			//echo "<p>set uid={$this->data['uid']}, etag={$this->data['etag']}</p>";
 		}
diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index 8712a1b7e9..113af384cb 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -5,13 +5,15 @@
  * @link http://www.egroupware.org
  * @author Lars Kneschke <lkneschke@egroupware.org>
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @package addressbook
  * @subpackage export
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php';
+require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/lib/core.php';
+require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/SyncML/State.php');
 
 /**
  * Addressbook - vCard parser
@@ -24,28 +26,80 @@ class addressbook_vcal extends addressbook_bo
 	 *
 	 * @var string
 	 */
-	var $productManufacturer='file';
+	var $productManufacturer = 'file';
 	/**
 	 * product name from setSupportedFields (lowercase!)
 	 *
 	 * @var string
 	 */
 	var $productName;
+	/**
+	 * VCard version
+	 *
+	 * @var string
+	 */
+	var $version;
+	/**
+	 * Client CTCap Properties
+	 *
+	 * @var array
+	 */
+	var $clientProperties;
+
+	/**
+	* Constructor
+	*
+	* @param string $contact_app			the current application
+	* @param string	$_contentType			the content type (version)
+	* @param array $_clientProperties		client properties
+	*/
+	function __construct($contact_app='addressbook', $_contentType='text/x-vcard', &$_clientProperties = array())
+	{
+		parent::__construct($contact_app);
+		#Horde::logMessage("vCalAddressbook Constructor for $_contentType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		switch($_contentType)
+		{
+			case 'text/vcard':
+				$this->version = '3.0';
+				break;
+			default:
+				$this->version = '2.1';
+			break;
+		}
+		$this->clientProperties = $_clientProperties;
+	}
 
 	/**
 	* import a vard into addressbook
 	*
 	* @param string	$_vcard		the vcard
 	* @param int/string	$_abID=null		the internal addressbook id or !$_abID for a new enty
+	* @param boolean $merge=false	merge data with existing entry
 	* @return int contact id
 	*/
-	function addVCard($_vcard, $_abID)
+	function addVCard($_vcard, $_abID=null, $merge=false)
 	{
-		if(!$contact = $this->vcardtoegw($_vcard)) {
+		if(!$contact = $this->vcardtoegw($_vcard))
+		{
 			return false;
 		}
 
-		if($_abID) {
+		if($_abID)
+		{
+			if ($merge)
+			{
+				$old_contact = $this->read($_abID);
+				if ($old_contact)
+				{
+					foreach ($contact as $key => $value)
+					{
+						if (!empty($old_contact[$key]))
+						{
+							$contact[$key] = $old_contact[$key];
+						}
+					}
+				}
+			}
 			// update entry
 			$contact['id'] = $_abID;
 		}
@@ -56,35 +110,73 @@ class addressbook_vcal extends addressbook_bo
 	* return a vcard
 	*
 	* @param int/string	$_id the id of the contact
-	* @param string $_charset='utf-8' encoding of the vcard, default utf-8
+	* @param string $_charset='UTF-8' encoding of the vcard, default UTF-8
 	* @param boolean $extra_charset_attribute=true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it
 	* @return string containing the vcard
 	*/
-	function getVCard($_id,$_charset='utf-8',$extra_charset_attribute=true)
+	function getVCard($_id,$_charset='UTF-8',$extra_charset_attribute=true)
 	{
 		require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php');
 
-		$vCard = new Horde_iCalendar_vcard;
+		#Horde::logMessage("vCalAddressbook clientProperties:\n" . print_r($this->clientProperties, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-		if(!is_array($this->supportedFields)) {
+		$vCard = new Horde_iCalendar_vcard($this->version);
+
+		if (!is_array($this->supportedFields))
+		{
 			$this->setSupportedFields();
 		}
 		$sysCharSet = $GLOBALS['egw']->translation->charset();
-		$called = microtime(true);
-		if(!($entry = $this->read($_id))) {
+
+		if (!($entry = $this->read($_id)))
+		{
 			return false;
 		}
-		//error_log("entry before fixed:\n".print_r($entry,true));
 
 		$this->fixup_contact($entry);
 
-
-		foreach($this->supportedFields as $vcardField => $databaseFields)
+		foreach ($this->supportedFields as $vcardField => $databaseFields)
 		{
 			$values = array();
 			$options = array();
 			$hasdata = 0;
-			foreach($databaseFields as $databaseField)
+			// seperate fields from their options/attributes
+			$vcardFields = explode(';', $vcardField);
+			$vcardField = $vcardFields[0];
+			$i = 1;
+			while (isset($vcardFields[$i]))
+			{
+				list($oname, $oval) = explode('=', $vcardFields[$i]);
+				if (!$oval && ($this->version == '3.0'))
+				{
+					// declare OPTION as TYPE=OPTION
+					$options['TYPE'][] = $oname ;
+				}
+				else
+				{
+					$options[$oname] = $oval;
+				}
+				$i++;
+			}
+			if (is_array($options['TYPE']))
+			{
+				$oval = implode(",", $options['TYPE']);
+				unset($options['TYPE']);
+				$options['TYPE'] = $oval;
+			}
+			if (isset($this->clientProperties[$vcardField]['Size']))
+			{
+				$size = $this->clientProperties[$vcardField]['Size'];
+				$noTruncate = $this->clientProperties[$vcardField]['NoTruncate'];
+				//Horde::logMessage("vCalAddressbook $vcardField Size: $size, NoTruncate: " .
+				//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			}
+			else
+			{
+				$size = -1;
+				$noTruncate = false;
+			}
+			foreach ($databaseFields as $databaseField)
 			{
 				$value = "";
 
@@ -103,34 +195,92 @@ class addressbook_vcal extends addressbook_bo
 					case 'bday':
 						if (!empty($value))
 						{
-							$value = str_replace('-','',$value).'T000000Z';
+							if ($size == 8)
+							{
+								$value = str_replace('-','',$value);
+							}
+							elseif (isset($options['TYPE']) && (
+								$options['TYPE'] == 'BASIC'))
+							{
+								unset($options['TYPE']);
+								// used by old SyncML implementations
+								$value = str_replace('-','',$value).'T000000Z';
+							}
 							$hasdata++;
 						}
 						break;
 
 					case 'jpegphoto':
-						if(!empty($value))
+						if (!empty($value) &&
+								(($size < 0) || (strlen($value) < $size)))
 						{
-							error_log(__FILE__ ."\nThis vcard contains a JPEG\n '".$value."'");
-							$options['ENCODING'] = 'BASE64';
-							$options['TYPE'] = 'JPEG';
-							$value = base64_encode($value);
- 							$hasdata++;
+							if (!isset($options['TYPE']))
+							{
+								$options['TYPE'] = 'JPEG';
+							}
+							if (!isset($options['ENCODING']))
+							{
+								$options['ENCODING'] = 'BASE64';
+							}
+							$hasdata++;
+						}
+						else
+						{
+							$value = '';
 						}
 						break;
 
 					case 'cat_id':
 						if (!empty($value))
 						{
-							$value = implode(",", $this->get_categories($value));
+							$values = &$this->get_categories($value);
+							$values = (array) $GLOBALS['egw']->translation->convert($values, $sysCharSet, $_charset);
+							$value = implode(',', $values); // just for the CHARSET recognition
+							if(($extra_charset_attribute || $this->productName == 'kde')
+									&& preg_match('/([\177-\377])/',$value))
+							{
+								$options['CHARSET'] = $_charset;
+								// KAddressbook requires non-ascii chars to be qprint encoded, other clients eg. nokia phones have trouble with that
+								if ($this->productName == 'kde')
+								{
+									$options['ENCODING'] = 'QUOTED-PRINTABLE';
+								}
+							}
+ 							$hasdata++;
 						}
-						// fall-through to the normal processing of string values
-					default:
-						if(!empty($value) || in_array($vcardField,array('FN','ORG','N')))
-						{
-							$value = $GLOBALS['egw']->translation->convert(trim($value), $sysCharSet,$_charset);
+						break;
 
-							if(($extra_charset_attribute || $this->productName == 'kde') && preg_match('/([\177-\377])/',$value))
+					default:
+						if (($size > 0) && strlen(implode(',', $values) . $value) > $size)
+						{
+							if ($noTruncate)
+							{
+								Horde::logMessage("vCalAddressbook $vcardField omitted due to maximum size $size",
+										__FILE__, __LINE__, PEAR_LOG_WARNING);
+								continue;
+							}
+							// truncate the value to size
+							$cursize = strlen(implode('', $values));
+							$left = $size - $cursize - count($databaseFields) + 1;
+							if ($left > 0)
+							{
+								$value = substr($value, 0, $left);
+							}
+							else
+							{
+								$value = '';
+							}
+							Horde::logMessage("vCalAddressbook $vcardField truncated to maximum size $size",
+									__FILE__, __LINE__, PEAR_LOG_INFO);
+						}
+						if (!empty($value) // required field
+							|| in_array($vcardField,array('FN','ORG','N'))
+							|| ($size >= 0 && !$noTruncate))
+						{
+							$value = $GLOBALS['egw']->translation->convert(trim($value), $sysCharSet, $_charset);
+							$values[] = $value;
+							if(($extra_charset_attribute || $this->productName == 'kde')
+									&& preg_match('/([\177-\377])/',$value))
 							{
 								$options['CHARSET'] = $_charset;
 								// KAddressbook requires non-ascii chars to be qprint encoded, other clients eg. nokia phones have trouble with that
@@ -140,22 +290,27 @@ class addressbook_vcal extends addressbook_bo
 								}
 							}
 							// protect the CardDAV
-							elseif(($extra_charset_attribute && preg_match('/([\000-\012\015\016\020-\037\075])/',$value)))
+							elseif (($extra_charset_attribute && preg_match('/([\000-\012\015\016\020-\037\075])/',$value)))
 							{
 								$options['ENCODING'] = 'QUOTED-PRINTABLE';
 							}
+							if ($vcardField == 'TEL' && $entry['tel_prefer'] &&
+								($databaseField == $entry['tel_prefer']))
+							{
+								if ($options['TYPE'])
+								{
+									$options['TYPE'] .= ',';
+								}
+								$options['TYPE'] .= 'PREF';
+							}
 							$hasdata++;
 						}
+						else
+						{
+							$values[] = '';
+						}
 						break;
 				}
-
-				if (empty($value))
-				{
-					$value = "";
-				}
-				//if(preg_match('/([\000-\010])/',$value)) error_log(__FILE__."#".__METHOD__."\nThis value has 000-010: $value");
-
-				$values[] = $value;
 			}
 
 			if ($hasdata <= 0)
@@ -165,57 +320,64 @@ class addressbook_vcal extends addressbook_bo
 				continue;
 			}
 
-			$vCard->setAttribute($vcardField, implode(';', $values));
-			$vCard->setParameter($vcardField, $options);
+			$vCard->setAttribute($vcardField, $value, $options, true, $values);
+			//$vCard->setParameter($vcardField, $options);
 		}
+
 		$result = $vCard->exportvCalendar();
-		//error_log(__FILE__ . __METHOD__ ."\nvcard:".print_r($result,true));
+
+		Horde::logMessage("vCalAddressbook getVCard:\n" . print_r($result, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 		return $result;
 	}
 
-	function search($_vcard, $contentID=null)
+	function search($_vcard, $contentID=null, $relax=false)
 	{
-		if(!($contact = $this->vcardtoegw($_vcard))) {
-			return false;
+		$result = false;
+
+		if (($contact = $this->vcardtoegw($_vcard)))
+		{
+			if ($contentID)
+			{
+				$contact['contact_id'] = $contentID;
+			}
+			$result = $this->find_contact($contact, $relax);
+		}
+		return $result;
+	}
+
+	function setSupportedFields($_productManufacturer='', $_productName='')
+	{
+		$state = &$_SESSION['SyncML.state'];
+		if (isset($state))
+		{
+			$deviceInfo = $state->getClientDeviceInfo();
 		}
 
-		if ($contentID) {
-			$contact['contact_id'] = $contentID;
+		// store product manufacturer and name, to be able to use it elsewhere
+		if ($_productManufacturer)
+		{
+			$this->productManufacturer = strtolower($_productManufacturer);
+			$this->productName = strtolower($_productName);
 		}
 
-		unset($contact['private']);
-		unset($contact['note']);
-		unset($contact['n_fn']);
-		unset($contact['email']);
-		unset($contact['email_home']);
-		unset($contact['url']);
-		unset($contact['url_home']);
-		unset($contact['n_fileas']);
-
-		// some clients cut the values, because they do not support the same length of data like eGW
-		// at least the first 10 characters must match
-		$maybeCuttedFields = array('org_unit', 'org_name','title');
-		foreach($maybeCuttedFields as $fieldName) {
-			if(!empty($contact[$fieldName]) && strlen($contact[$fieldName]) > 10) {
-				$contact[$fieldName] .= '*';
+		if(isset($deviceInfo) && is_array($deviceInfo))
+		{
+			if(!isset($this->productManufacturer) ||
+				$this->productManufacturer == '' ||
+				$this->productManufacturer == 'file')
+			{
+				$this->productManufacturer = strtolower($deviceInfo['manufacturer']);
+			}
+			if(!isset($this->productName) || $this->productName == '')
+			{
+				$this->productName = strtolower($deviceInfo['model']);
 			}
 		}
 
-		//error_log(print_r($contact, true));
+		Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', ' . $this->productName .')',
+			__FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-		#if($foundContacts = parent::search($contact, true, '', '', '%')) {
-		if($foundContacts = parent::search($contact)) {
-			return $foundContacts[0]['id'];
-		}
-		return false;
-	}
-
-	function setSupportedFields($_productManufacturer='file', $_productName='')
-	{
-		// store product manufacturer and name, to be able to use it elsewhere
-		$this->productManufacturer = strtolower($_productManufacturer);
-		$this->productName = strtolower($_productName);
-		//error_log("prodM- prodN".print_r($_productManufacturer,true).print_r($_productName,true));
 		/**
 		 * ToDo Lars:
 		 * + changes / renamed fields in 1.3+:
@@ -256,6 +418,7 @@ class addressbook_vcal extends addressbook_bo
 			'TEL;HOME'	=> array('tel_home'),
 			'TEL;WORK'	=> array('tel_work'),
 			'TITLE'		=> array('title'),
+			'UID'       => array('uid'),
 		);
 
 		$defaultFields[1] = array(	// all entries, nexthaus corporation, groupdav, ...
@@ -265,9 +428,8 @@ class addressbook_vcal extends addressbook_bo
 							'adr_two_postalcode','adr_two_countryname'),
 			'BDAY'		=> array('bday'),
 			'CATEGORIES'	=> array('cat_id'),
-			'EMAIL;INTERNET' => array('email'),//tp4 tp43
-			'EMAIL;INTERNET;HOME' => array('email_home'),//tp42 tp42
-			#'EMAIL;INTERNET;WORK' => array('#email_work'),//tp43 lost
+			'EMAIL;INTERNET;WORK' => array('email'),
+			'EMAIL;INTERNET;HOME' => array('email_home'),
 			'N'		=> array('n_family','n_given','n_middle','n_prefix','n_suffix'),
 			'FN'		=> array('n_fn'),
 			'NOTE'		=> array('note'),
@@ -305,6 +467,7 @@ class addressbook_vcal extends addressbook_bo
 			'TEL;WORK'	=> array('tel_work'),
 			'TITLE'		=> array('title'),
 			'URL;WORK'	=> array('url'),
+			'UID'       => array('uid'),
 		);
 
 		$defaultFields[3] = array(	// siemens
@@ -318,7 +481,7 @@ class addressbook_vcal extends addressbook_bo
 			'N'		=> array('n_family','n_given','','',''),
 			'FN'		=> array('n_fn'),
 			'NOTE'		=> array('note'),
-			'ORG'		=> array('org_name','org_unit'),
+			'ORG'		=> array('org_name'), // only one company field is supported
 			'TEL;CELL;WORK'	=> array('tel_cell'),
 			'TEL;FAX;WORK'	=> array('tel_fax'),
 			'TEL;HOME'	=> array('tel_home'),
@@ -326,6 +489,7 @@ class addressbook_vcal extends addressbook_bo
 			'TEL;WORK'	=> array('tel_work'),
 			'TITLE'		=> array('title'),
 			'URL;WORK'	=> array('url'),
+			'UID'       => array('uid'),
 		);
 
 		$defaultFields[4] = array(	// nokia 6600
@@ -333,7 +497,7 @@ class addressbook_vcal extends addressbook_bo
 							'adr_one_postalcode','adr_one_countryname'),
 			'ADR;HOME'	=> array('','','adr_two_street','adr_two_locality','adr_two_region',
 							'adr_two_postalcode','adr_two_countryname'),
-			'BDAY'		=> array('bday'),
+			'BDAY;TYPE=BASIC'		=> array('bday'),
 			'EMAIL;INTERNET;WORK' => array('email'),
 			'EMAIL;INTERNET;HOME' => array('email_home'),
 			'N'		=> array('n_family','n_given','','',''),
@@ -350,6 +514,7 @@ class addressbook_vcal extends addressbook_bo
 			'TITLE'		=> array('title'),
 			'URL;WORK'	=> array('url'),
 			'URL;HOME'	=> array('url_home'),
+			'UID'       => array('uid'),
 		);
 
 		$defaultFields[5] = array(	// nokia e61
@@ -357,7 +522,7 @@ class addressbook_vcal extends addressbook_bo
 							'adr_one_postalcode','adr_one_countryname'),
 			'ADR;HOME'	=> array('','','adr_two_street','adr_two_locality','adr_two_region',
 							'adr_two_postalcode','adr_two_countryname'),
-			'BDAY'		=> array('bday'),
+			'BDAY;TYPE=BASIC'		=> array('bday'),
 			'EMAIL;INTERNET;WORK' => array('email'),
 			'EMAIL;INTERNET;HOME' => array('email_home'),
 			'N'		=> array('n_family','n_given','','n_prefix','n_suffix'),
@@ -374,6 +539,7 @@ class addressbook_vcal extends addressbook_bo
 			'TITLE'		=> array('title'),
 			'URL;WORK'	=> array('url'),
 			'URL;HOME'	=> array('url_home'),
+			'UID'       => array('uid'),
 		);
 
 		$defaultFields[6] = array(	// funambol: fmz-thunderbird-plugin
@@ -384,7 +550,7 @@ class addressbook_vcal extends addressbook_bo
 			'EMAIL'         => array('email'),
 			'EMAIL;HOME'    => array('email_home'),
 			'N'             => array('n_family','n_given','','',''),
-			'FN'			=> array('n_fn'),
+			'FN'		=> array('n_fn'),
 			'NOTE'          => array('note'),
 			'ORG'           => array('org_name','org_unit'),
 			'TEL;CELL'      => array('tel_cell'),
@@ -420,12 +586,12 @@ class addressbook_vcal extends addressbook_bo
 			'NOTE'		=> array('note'),
 			'X-EVOLUTION-ASSISTANT'		=> array('assistent'),
 			'PHOTO'		=> array('jpegphoto'),
+			'UID'       => array('uid'),
 		);
 
 		$defaultFields[8] = array_merge($defaultFields[1],array(	// KDE Addressbook, only changes from all=1
 			'ORG' => array('org_name'),
 			'X-KADDRESSBOOK-X-Department' => array('org_unit'),
-			'PHOTO'		=> array('jpegphoto'),
 		));
 
 		$defaultFields[9] = array(	// nokia e90
@@ -433,7 +599,7 @@ class addressbook_vcal extends addressbook_bo
 							'adr_one_postalcode','adr_one_countryname'),
 			'ADR;HOME'	=> array('','adr_two_street2','adr_two_street','adr_two_locality','adr_two_region',
 							'adr_two_postalcode','adr_two_countryname'),
-			'BDAY'		=> array('bday'),
+			'BDAY;TYPE=BASIC'		=> array('bday'),
 			'X-CLASS'	=> array('private'),
 			'EMAIL;INTERNET;WORK' => array('email'),
 			'EMAIL;INTERNET;HOME' => array('email_home'),
@@ -455,6 +621,7 @@ class addressbook_vcal extends addressbook_bo
 			'X-ASSISTANT'		=> array('assistent'),
 			'X-ASSISTANT-TEL'	=> array('tel_assistent'),
 			'PHOTO'		=> array('jpegphoto'),
+			'UID'       => array('uid'),
 		);
 
 		$defaultFields[10] = array(	// nokia 9300
@@ -476,50 +643,106 @@ class addressbook_vcal extends addressbook_bo
 			'TEL;HOME;VOICE' => array('tel_home'),
 			'TITLE'		=> array('contact_role'),
 			'URL'	=> array('url'),
+			'UID'       => array('uid'),
 		);
 
-
-		$defaultFields[11] = array(	// funambol: iphone
+		$defaultFields[11] = array(	// funambol: iphone, blackberry, wm pocket pc
 			'ADR;WORK'      => array('','','adr_one_street','adr_one_locality','adr_one_region',
 									'adr_one_postalcode','adr_one_countryname'),
 			'ADR;HOME'      => array('','','adr_two_street','adr_two_locality','adr_two_region',
 									'adr_two_postalcode','adr_two_countryname'),
+			'BDAY'		=> array('bday'),
+			'CATEGORIES'	=> array('cat_id'),
 			'EMAIL;INTERNET;WORK'         => array('email'),
 			'EMAIL;INTERNET;HOME'    => array('email_home'),
 			'N'		=> array('n_family','n_given','n_middle','n_prefix','n_suffix'),
-			'FN'			=> array('n_fn'),
+			'FN'		=> array('n_fn'),
 			'NOTE'          => array('note'),
 			'ORG'           => array('org_name','org_unit'),
 			'TEL;CELL'      => array('tel_cell'),
-			'TEL;HOME;FAX'  => array('tel_fax_home'),
-			'TEL;WORK;FAX'  => array('tel_fax'),
+			'TEL;FAX;HOME'  => array('tel_fax_home'),
+			'TEL;FAX;WORK'  => array('tel_fax'),
 			'TEL;VOICE;HOME' => array('tel_home'),
 			'TEL;VOICE;WORK' => array('tel_work'),
 			'TEL;PAGER'     => array('tel_pager'),
-			'TEL;CAR'     => array('tel_car'),
+			'TEL;CAR'	=> array('tel_car'),
 			'TITLE'         => array('title'),
 			'URL;WORK'      => array('url'),
-			'URL;HOME'           => array('url_home'),
+			'URL;HOME'	=> array('url_home'),
 			'PHOTO'		=> array('jpegphoto'),
+			'UID'       => array('uid'),
+		);
+
+		$defaultFields[12] = array(	// Synthesis 4 iPhone
+			'ADR;WORK'	=> array('','','adr_one_street','adr_one_locality','adr_one_region',
+							'adr_one_postalcode','adr_one_countryname'),
+			'ADR;HOME'	=> array('','','adr_two_street','adr_two_locality','adr_two_region',
+							'adr_two_postalcode','adr_two_countryname'),
+			'BDAY'		=> array('bday'),
+			'CATEGORIES'	=> array('cat_id'),
+			'EMAIL;WORK;INTERNET' => array('email'),
+			'EMAIL;HOME;INTERNET' => array('email_home'),
+			'N'		=> array('n_family','n_given','n_middle','n_prefix','n_suffix'),
+			'FN'		=> array('n_fn'),
+			'NOTE'		=> array('note'),
+			'ORG'		=> array('org_name','org_unit'),
+			'TEL;VOICE;CELL'	=> array('tel_cell'),
+			'TEL;WORK;FAX'		=> array('tel_fax'),
+			'TEL;HOME;FAX'		=> array('tel_fax_home'),
+			'TEL;WORK;VOICE'	=> array('tel_work'),
+			'TEL;HOME;VOICE'	=> array('tel_home'),
+			'TEL;PAGER'		=> array('tel_pager'),
+			'TEL;X-CustomLabel-car'	=> array('tel_car'),
+			'TITLE'		=> array('title'),
+			'URL;WORK'	=> array('url'),
+			'ROLE'		=> array('role'),
+			'URL;HOME'	=> array('url_home'),
+			'PHOTO'		=> array('jpegphoto'),
+			'UID'       => array('uid'),
+		);
+
+		$defaultFields[13] = array(	// sonyericsson
+			'ADR;WORK'	=> array('','','adr_one_street','adr_one_locality','adr_one_region',
+							'adr_one_postalcode','adr_one_countryname'),
+			'ADR;HOME'	=> array('','','adr_two_street','adr_two_locality','adr_two_region',
+							'adr_two_postalcode','adr_two_countryname'),
+			'BDAY'		=> array('bday'),
+			'EMAIL;WORK'	=> array('email'),
+			'EMAIL;HOME'	=> array('email_home'),
+			'N'		=> array('n_family','n_given','n_middle','n_prefix','n_suffix'),
+			'NOTE'		=> array('note'),
+			'ORG'		=> array('org_name',''),
+			'TEL;CELL;WORK'	=> array('tel_cell'),
+			'TEL;CELL;HOME'	=> array('tel_cell_private'),
+			'TEL;FAX'	=> array('tel_fax'),
+			'TEL;HOME'	=> array('tel_home'),
+			'TEL;WORK'	=> array('tel_work'),
+			'TITLE'		=> array('title'),
+			'URL'		=> array('url'),
+			'UID'       => array('uid'),
+			//'PHOTO'		=> array('jpegphoto'),
 		);
 
 		//error_log("Client: $_productManufacturer $_productName");
-		switch($this->productManufacturer)
+		switch ($this->productManufacturer)
 		{
 			case 'funambol':
 			case 'funambol inc.':
 				switch ($this->productName)
 				{
 					case 'thunderbird':
+					case 'mozilla plugin':
 						$this->supportedFields = $defaultFields[6];
 						break;
 
+					case 'pocket pc plug-in':
+					case 'blackberry plug-in':
 					case 'iphone':
 						$this->supportedFields = $defaultFields[11];
 						break;
 
 					default:
-						//error_log("Funambol product '$_productName', assuming same as thunderbird");
+						error_log("Funambol product '$this->productName', assuming same as thunderbird");
 						$this->supportedFields = $defaultFields[6];
 						break;
 				}
@@ -527,20 +750,20 @@ class addressbook_vcal extends addressbook_bo
 
 			case 'nexthaus corporation':
 			case 'nexthaus corp':
-				switch($this->productName)
+				switch ($this->productName)
 				{
 					case 'syncje outlook edition':
 						$this->supportedFields = $defaultFields[1];
 						break;
 					default:
-						error_log("Nethaus product '$_productName', assuming same as 'syncje outlook'");
+						error_log("Nexthaus product '$this->productName', assuming same as 'syncje outlook'");
 						$this->supportedFields = $defaultFields[1];
 						break;
 				}
 				break;
 
 			case 'nokia':
-				switch($this->productName)
+				switch ($this->productName)
 				{
 					case 'e61':
 						$this->supportedFields = $defaultFields[5];
@@ -556,8 +779,11 @@ class addressbook_vcal extends addressbook_bo
 					case '6600':
 						$this->supportedFields = $defaultFields[4];
 						break;
+					case 'nokia 6131':
+						$this->supportedFields = $defaultFields[4];
+						break;
 					default:
-						error_log("Unknown Nokia phone '$_productName', assuming same as '6600'");
+						error_log("Unknown Nokia phone 'this->$productName', assuming same as '6600'");
 						$this->supportedFields = $defaultFields[4];
 						break;
 				}
@@ -567,7 +793,7 @@ class addressbook_vcal extends addressbook_bo
 			// multisync does not provide anymore information then the manufacturer
 			// we suppose multisync with evolution
 			case 'the multisync project':
-				switch($this->productName)
+				switch ($this->productName)
 				{
 					default:
 						$this->supportedFields = $defaultFields[0];
@@ -576,13 +802,13 @@ class addressbook_vcal extends addressbook_bo
 				break;
 
 			case 'siemens':
-				switch($this->productName)
+				switch ($this->productName)
 				{
 					case 'sx1':
 						$this->supportedFields = $defaultFields[3];
 						break;
 					default:
-						error_log("Unknown Siemens phone '$_productName', assuming same as 'sx1'");
+						error_log("Unknown Siemens phone '$this->productName', assuming same as 'sx1'");
 						$this->supportedFields = $defaultFields[3];
 						break;
 				}
@@ -590,29 +816,45 @@ class addressbook_vcal extends addressbook_bo
 
 			case 'sonyericsson':
 			case 'sony ericsson':
-				switch($this->productName)
+				switch ($this->productName)
 				{
+					case 'p910i':
 					case 'd750i':
 						$this->supportedFields = $defaultFields[2];
 						break;
-					case 'p910i':
+					case 'w760i':
+					case 'w890i':
+						$this->supportedFields = $defaultFields[13];
+						break;
 					default:
-						error_log("unknown Sony Ericsson phone '$_productName', assuming same as 'd750i'");
-						$this->supportedFields = $defaultFields[2];
+						if ($this->productName[0] == 'w')
+						{
+							error_log("unknown Sony Ericsson phone '$this->productName', assuming same as 'W760i'");
+							$this->supportedFields = $defaultFields[13];
+						}
+						else
+						{
+							error_log("unknown Sony Ericsson phone '$this->productName', assuming same as 'D750i'");
+							$this->supportedFields = $defaultFields[2];
+						}
 						break;
 				}
 				break;
 
 			case 'synthesis ag':
-				switch($this->productName)
+				switch ($this->productName)
 				{
 					case 'sysync client pocketpc pro':
 					case 'sysync client pocketpc std':
 						$this->supportedFields = $defaultFields[1];
-						#$this->supportedFields['PHOTO'] = array('jpegphoto');
+						$this->supportedFields['TEL;CELL;CAR;VOICE'] = array('tel_car');
+						break;
+					case 'sysync client iphone contacts':
+					case 'sysync client iphone contacts+todoz':
+						$this->supportedFields = $defaultFields[12];
 						break;
 					default:
-						error_log("Synthesis connector '$_productName', using default fields");
+						error_log("Synthesis connector '$this->productName', using default fields");
 						$this->supportedFields = $defaultFields[0];
 						break;
 				}
@@ -625,8 +867,9 @@ class addressbook_vcal extends addressbook_bo
 			case 'file':	// used outside of SyncML, eg. by the calendar itself ==> all possible fields
 				$this->supportedFields = $defaultFields[1];
 				break;
-			case 'groupdav':                // all GroupDAV access goes through here
-				switch($this->productName)
+
+			case 'groupdav':		// all GroupDAV access goes through here
+				switch ($this->productName)
 				{
 					case 'kde':             // KDE Addressbook
 						$this->supportedFields = $defaultFields[1];
@@ -636,9 +879,10 @@ class addressbook_vcal extends addressbook_bo
 						$this->supportedFields = $defaultFields[1];
 				}
 				break;
+
 			// the fallback for SyncML
 			default:
-				error_log(__FILE__. __METHOD__ ."\nManufacturer-Product not found: '$_productManufacturer' '$_productName'");
+				error_log(__FILE__ . __METHOD__ ."\nClient not found:'" . $this->productManufacturer . "' '" . $this->productName . "'");
 				$this->supportedFields = $defaultFields[0];
 				break;
 		}
@@ -647,207 +891,358 @@ class addressbook_vcal extends addressbook_bo
 	function vcardtoegw($_vcard)
 	{
 		// the horde class does the charset conversion. DO NOT CONVERT HERE.
+		// be as flexible as possible
 
-		//error_log("vcardin vtoe".print_r($_vcard, true));
-		if(!is_array($this->supportedFields))
-		{
-			$this->setSupportedFields();
-		}
+
+		$databaseFields = array(
+			'ADR;WORK'		=> array('','','adr_one_street','adr_one_locality','adr_one_region',
+								'adr_one_postalcode','adr_one_countryname'),
+			'ADR;HOME'		=> array('','','adr_two_street','adr_two_locality','adr_two_region',
+								'adr_two_postalcode','adr_two_countryname'),
+			'BDAY'			=> array('bday'),
+			'X-CLASS'		=> array('private'),
+			'CATEGORIES'		=> array('cat_id'),
+			'EMAIL;WORK'		=> array('email'),
+			'EMAIL;HOME'		=> array('email_home'),
+			'N'			=> array('n_family','n_given','n_middle',
+								'n_prefix','n_suffix'),
+			#'FN'			=> array('n_fn'),
+			'NOTE'			=> array('note'),
+			'ORG'			=> array('org_name','org_unit'),
+			'TEL;CELL;WORK'		=> array('tel_cell'),
+			'TEL;CELL;HOME'		=> array('tel_cell_private'),
+			'TEL;CAR'		=> array('tel_car'),
+			'TEL;OTHER'		=> array('tel_other'),
+			'TEL;WORK'		=> array('tel_work'),
+			'TEL;FAX;WORK'		=> array('tel_fax'),
+			'TEL;HOME'		=> array('tel_home'),
+			'TEL;FAX;HOME'		=> array('tel_fax_home'),
+			'TEL;PAGER'		=> array('tel_pager'),
+			'TITLE'			=> array('title'),
+			'URL;WORK'		=> array('url'),
+			'URL;HOME'		=> array('url_home'),
+			'ROLE'			=> array('role'),
+			'NICKNAME'		=> array('label'),
+			'FBURL'			=> array('freebusy_uri'),
+			'PHOTO'			=> array('jpegphoto'),
+			'X-ASSISTANT'		=> array('assistent'),
+			'X-ASSISTANT-TEL'	=> array('tel_assistent'),
+			'UID'			=> array('uid'),
+		);
+
+		Horde::logMessage("vCalAddressbook vcardtoegw:\n$_vcard", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php');
 
+		$container = false;
 		$vCard = Horde_iCalendar::newComponent('vcard', $container);
 
-		// Unfold any folded lines.
-		$vCardUnfolded = preg_replace ('/(\r|\n)+ /', ' ', $_vcard);
-
-		if(!$vCard->parsevCalendar($vCardUnfolded, 'VCARD'))
+		if (!$vCard->parsevCalendar($_vcard, 'VCARD'))
 		{
 			return False;
 		}
 		$vcardValues = $vCard->getAllAttributes();
 
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		}
+		else
+		{
+			$minimum_uid_length = 8;
+		}
+
 		#print "<pre>$_vcard</pre>";
 
 		#error_log(print_r($vcardValues, true));
+		Horde::logMessage("vCalAddressbook vcardtoegw: " . print_r($vcardValues, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		$email = 0;
+		$tel = 1;
+		$cell = 1;
+		$url = 0;
+		$pref_tel = false;
 
 		foreach($vcardValues as $key => $vcardRow)
 		{
-			$rowName  = $vcardRow['name'];
-
-			$vcardElementCount = count($vcardRow['params'],COUNT_RECURSIVE);
-
-			if( $vcardElementCount > 0 )
+			$rowName  = strtoupper($vcardRow['name']);
+			switch ($rowName)
 			{
-				foreach($vcardRow['params'] as $VKey => $vcardParam)
+				case 'EMAIL':
+					$email++;
+					break;
+				case 'URL':
+					$url++;
+					break;
+			}
+			if ($vcardRow['value'] == ''  && implode('', $vcardRow['values']) == '')
+			{
+				unset($vcardRow);
+				continue;
+			}
+			$rowTypes = array();
+
+			$vcardRow['uparams'] = array();
+			foreach ($vcardRow['params'] as $pname => $params)
+			{
+				$pname = strtoupper($pname);
+				$vcardRow['uparams'][$pname] = $params;
+			}
+			ksort($vcardRow['uparams']);
+
+			foreach ($vcardRow['uparams'] as $pname => $params)
+			{
+				switch ($pname)
 				{
-					if( ! strlen($vcardParam) )
-					{
-						$rowName .= ';'.$VKey;
-					}
-					if( $VKey == 'TYPE' && in_array(strtoupper($vcardParam),array('CELL','FAX','PAGER','WORK','HOME','VOICE','CAR')))
-					{
-						$rowName .= ';'.strtoupper($vcardParam);
-					}
+					case 'TYPE':
+						if (is_array($params))
+						{
+							$rowTypes = array();
+							foreach ($params as $param)
+							{
+								$rowTypes[] = strtoupper($param);
+							}
+							sort($rowTypes);
+						}
+						else
+						{
+							$rowTypes[] = strtoupper($params);
+						}
+						foreach ($rowTypes as $type)
+						{
+							switch ($type)
+							{
+								case 'PAGER':
+								case 'FAX':
+								case 'VOICE':
+								case 'OTHER':
+								case 'CELL':
+								case 'WORK':
+								case 'HOME':
+									$rowName .= ';' . $type;
+									break;
+								case 'PREF':
+									if ($vcardRow['name'] == 'TEL')
+									{
+										$pref_tel = $key;
+									}
+									break;
+								case 'CAR':
+								case 'X-CUSTOMLABEL-CAR':
+									$rowName = 'TEL;CAR';
+									break;
+								default:
+									break;
+							}
+						}
+						break;
+						//case 'INTERNET':
+					case 'PREF':
+						if (strtoupper($vcardRow['name']) == 'TEL')
+						{
+							$pref_tel = $key;
+						}
+						break;
+					case 'FAX':
+					case 'PAGER':
+					case 'VOICE':
+					case 'OTHER':
+					case 'CELL':
+					case 'WORK':
+					case 'HOME':
+						$rowName .= ';' . $pname;
+						break;
+					case 'CAR':
+					case 'X-CUSTOMLABEL-CAR':
+						$rowName = 'TEL;CAR';
+						break;
+					default:
+						break;
 				}
-        	}
+			}
+
+			if($rowName == 'EMAIL')
+			{
+				$rowName .= ';X-egw-Ref' . $email;
+			}
+
+			if(($rowName == 'TEL;CELL') ||
+					($rowName == 'TEL;CELL;VOICE'))
+			{
+				$rowName = 'TEL;CELL;X-egw-Ref' . $cell++;
+			}
+
+			if(($rowName == 'TEL') ||
+					($rowName == 'TEL;VOICE'))
+			{
+				$rowName = 'TEL;X-egw-Ref' . $tel++;
+			}
+
+			if($rowName == 'URL')
+			{
+				$rowName = 'URL;X-egw-Ref' . $url;
+			}
+
 			$rowNames[$rowName] = $key;
 		}
 
 
 		#error_log(print_r($rowNames, true));
 
-		// now we have all rowNames the vcard provides
-		// we just need to map to the right addressbook fieldnames
-		// we need also to take care about ADR for example. we do not
-		// support this. We support only ADR;WORK or ADR;HOME
+        // All rowNames of the vCard are now concatenated with their qualifiers.
+        // If qualifiers are missing we apply a default strategy.
+        // E.g. ADR will be either ADR;WORK, if no ADR;WORK is given,
+        // or else ADR;HOME, if not available elsewhere.
 
-		// njv: As the order of tag occurence is undefined and tags 1... to  n are mapped to one addressbook
-		//	fieldname and tags 1... to n may have conflicting content eg EMAIL is set but EMAIL;INTERNET is empty
-		//  and both are mapped to "email" who wins?
+		$finalRowNames = array();
 
-		foreach($rowNames as $rowName => $vcardKey)
+		foreach ($rowNames as $rowName => $vcardKey)
 		{
-			//	error_log("eachrownane:".print_r($rowName,true));
-
 			switch($rowName)
 			{
-				case 'TEL;VOICE;HOME':
-				case 'TEL;VOICE;WORK':	// check if we have a mapping without VOICE
-					$replace = str_replace('VOICE;','',$rowName);
-					if (!isset($rowNames[$replace]) && array_key_exists($replace, $this->supportedFields))
-					{
-						$finalRowNames[$replace] = $vcardKey;	// if yes use that
-					}
-					else
-					{
-						$finalRowNames[$rowName] = $vcardKey;	// else use existing mapping
-					}
-					break;
-
 				case 'ADR':
-				case 'TEL':
-				case 'URL':
+					if (!isset($rowNames[$rowName . ';WORK']))
+					{
+						$finalRowNames[$rowName . ';WORK'] = $vcardKey;
+					}
+					elseif (!isset($rowNames[$rowName . ';HOME']))
+					{
+						$finalRowNames[$rowName . ';HOME'] = $vcardKey;
+					}
+					break;
 				case 'TEL;FAX':
-				case 'TEL;CELL':
-				case 'TEL;PAGER':
-				case 'TEL;VOICE':
-					if(!isset($rowNames[$rowName. ';WORK']) && array_key_exists($rowName. ';WORK', $this->supportedFields) )
+					if (!isset($rowNames['TEL;FAX;WORK'])
+							&& !isset($finalRowNames['TEL;FAX;WORK']))
 					{
-						$finalRowNames[$rowName. ';WORK'] = $vcardKey;
+						$finalRowNames['TEL;FAX;WORK'] = $vcardKey;
 					}
-					else
+					elseif (!isset($rowNames['TEL;FAX;HOME'])
+						&& !isset($finalRowNames['TEL;FAX;HOME']))
+						{
+						$finalRowNames['TEL;FAX;HOME'] = $vcardKey;
+						}
+					break;
+				case 'TEL;VOICE;WORK':
+					$finalRowNames['TEL;WORK'] = $vcardKey;
+					break;
+				case 'TEL;HOME;VOICE':
+					$finalRowNames['TEL;HOME'] = $vcardKey;
+					break;
+				case 'TEL;OTHER;VOICE':
+					$finalRowNames['TEL;OTHER'] = $vcardKey;
+					break;
+				case 'TEL;CAR;VOICE':
+				case 'TEL;CAR;CELL':
+				case 'TEL;CAR;CELL;VOICE':
+					$finalRowNames['TEL;CAR'] = $vcardKey;
+					break;
+				case 'TEL;X-egw-Ref1':
+					if (!isset($rowNames['TEL;VOICE;WORK'])
+							&& !isset($rowNames['TEL;WORK'])
+							&& !isset($finalRowNames['TEL;WORK']))
 					{
-						$InvolvedValues = explode(';',$rowName.';WORK');
-						foreach($this->supportedFields as $suppFields => $suppFieldsValue )
-						{
-							$InvolvedHits = 0;
-							foreach($InvolvedValues as $hlparr => $hlparrKey )
-							{
-								if( ! stristr( $suppFields,$hlparrKey ) === FALSE )
-								{
-									$InvolvedHits++;
-								}
-							}
-							if( count($InvolvedValues) == $InvolvedHits && !isset($finalRowNames[$suppFields]) )
-							{
-								$finalRowNames[$suppFields] = $vcardKey;
-								break;   // if a combination of all words in $InvolvedValues were found
-							}
-						}
-						if( count($InvolvedValues) != $InvolvedHits  && ! isset($finalRowNames[$rowName]) &&  array_key_exists($rowName, $this->supportedFields) )
-						{
-							$finalRowNames[$rowName] = $vcardKey;
-						}
+						$finalRowNames['TEL;WORK'] = $vcardKey;
+						break;
+					}
+				case 'TEL;X-egw-Ref2':
+					if (!isset($rowNames['TEL;HOME;VOICE'])
+							&& !isset($rowNames['TEL;HOME'])
+							&& !isset($finalRowNames['TEL;HOME']))
+					{
+						$finalRowNames['TEL;HOME'] = $vcardKey;
 					}
 					break;
-				case 'EMAIL':
-				case 'EMAIL;INTERNET':
-					$ckey = false;
-                                        foreach($this->supportedFields as $tag => $value)
-                                        {
-                                        if(in_array ('email', $value))
-                                            {
-                                            $ckey = $tag;
-                                            }
-                                        }
-                        //              error_log("key:$ckey:$vcardKey");
-
-                                        if( $ckey && !empty($vcardValues[$vcardKey]['value']))
-                                        {
-                        //                error_log("$akey : ".print_r($vcardKey,true));
-                                        $finalRowNames[$ckey] = $vcardKey;
-                                        }
-                                        break;
-
-				case 'EMAIL;WORK':
-					if(!isset($rowNames['EMAIL;INTERNET;WORK']))
+				case 'TEL;CELL;X-egw-Ref1':
+					if (!isset($rowNames['TEL;CELL;WORK'])
+							&& !isset($finalRowNames['TEL;CELL;WORK']))
 					{
-						if(in_array ('#email_work', $value))
-						{
-							$akey = $tag;
-						}
+						$finalRowNames['TEL;CELL;WORK'] = $vcardKey;
+						break;
 					}
-					//		error_log("key:$akey:$vcardKey");
-
-					if( $akey && !empty($vcardValues[$vcardKey]['value']))
+				case 'TEL;CELL;X-egw-Ref2':
+					if (!isset($rowNames['TEL;CELL;HOME'])
+							&& !isset($finalRowNames['TEL;CELL;HOME']))
 					{
-						//error_log("$akey : ".print_r($vcardKey,true));
-						$finalRowNames[$akey] = $vcardKey;
+						$finalRowNames['TEL;CELL;HOME'] = $vcardKey;
+						break;
+					}
+				case 'TEL;CELL;X-egw-Ref3':
+					if (!isset($rowNames['TEL;CAR'])
+							&& !isset($rowNames['TEL;CAR;VOICE'])
+							&& !isset($rowNames['TEL;CAR;CELL'])
+							&& !isset($rowNames['TEL;CAR;CELL;VOICE'])
+							&& !isset($finalRowNames['TEL;CAR']))
+					{
+						$finalRowNames['TEL;CAR'] = $vcardKey;
 					}
 					break;
-				case 'EMAIL;HOME':
-					if(!isset($rowNames['EMAIL;INTERNET;HOME']))
+				case 'EMAIL;X-egw-Ref1':
+					if (!isset($rowNames['EMAIL;WORK']) &&
+							!isset($finalRowNames['EMAIL;WORK']))
 					{
-						$finalRowNames['EMAIL;INTERNET;HOME'] = $vcardKey;
+						$finalRowNames['EMAIL;WORK'] = $vcardKey;
+						break;
 					}
-
-					//	error_log("email_home-key: ".print_r($bkey, true));
-
-					if($bkey && !empty($vcardValues[$vcardKey]['value']))
+				case 'EMAIL;X-egw-Ref2':
+					if (!isset($rowNames['EMAIL;HOME']) &&
+							!isset($finalRowNames['EMAIL;HOME']))
 					{
-						//	error_log("$bkey :".print_r($vcardKey,true));
-						$finalRowNames[$bkey] = $vcardKey;
+						$finalRowNames['EMAIL;HOME'] = $vcardKey;
+					}
+					break;
+				case 'URL;X-egw-Ref1':
+					if (!isset($rowNames['URL;WORK']) &&
+							!isset($finalRowNames['URL;WORK']))
+					{
+						$finalRowNames['URL;WORK'] = $vcardKey;
+						break;
+					}
+				case 'URL;X-egw-Ref2':
+					if (!isset($rowNames['URL;HOME']) &&
+							!isset($finalRowNames['URL;HOME']))
+					{
+						$finalRowNames['URL;HOME'] = $vcardKey;
 					}
 					break;
-
 				case 'VERSION':
 					break;
-
-				default:
-					//error_log("default row map".print_r($vcardKey,true));
-					$finalRowNames[$rowName] = $vcardKey;
+				case 'X-EVOLUTION-ASSISTANT':
+					$finalRowNames['X-ASSISTANT'] = $vcardKey;
 					break;
+				default:
+					$finalRowNames[$rowName] = $vcardKey;
+				break;
 			}
 		}
-		//error_log("finalrownames".print_r($finalRowNames, true));
+
+		#error_log(print_r($finalRowNames, true));
+		#Horde::logMessage("vCalAddressbook vcardtoegw finalRowNames: " . print_r($finalRowNames, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 
 		$contact = array();
 
-		foreach($finalRowNames as $key => $vcardKey)
+		foreach ($finalRowNames as $key => $vcardKey)
 		{
-			if(isset($this->supportedFields[$key]))
+			if (isset($databaseFields[$key]))
 			{
-				$fieldNames = $this->supportedFields[$key];
-				foreach($fieldNames as $fieldKey => $fieldName)
+				$fieldNames = $databaseFields[$key];
+				foreach ($fieldNames as $fieldKey => $fieldName)
 				{
-					if(!empty($fieldName))
+					if (!empty($fieldName))
 					{
-						if ($fieldName == 'jpegphoto' || $vcardValues[$vcardKey]['params']['ENCODING'] == 'b')
+						$value = trim($vcardValues[$vcardKey]['values'][$fieldKey]);
+						if ($pref_tel && (($vcardKey == $pref_tel) ||
+								($vcardValues[$vcardKey]['name'] == 'TEL') &&
+								($vcardValues[$vcardKey]['value'] == $vcardValues[$pref_tel]['value'])))
 						{
-							$value = base64_decode($vcardValues[$vcardKey]['values'][$fieldKey]);
+							$contact['tel_prefer'] = $fieldName;
 						}
-						else
-						{
-							$value = trim($vcardValues[$vcardKey]['values'][$fieldKey]);
-						}
-
 						switch($fieldName)
 						{
 							case 'bday':
-								if(!empty($value)) {
-									$contact[$fieldName] = date('Y-m-d', $value);
-								}
+								$contact[$fieldName] = $vcardValues[$vcardKey]['values']['year'] .
+									'-' . $vcardValues[$vcardKey]['values']['month'] .
+									'-' . $vcardValues[$vcardKey]['values']['mday'];
 								break;
 
 							case 'private':
@@ -855,17 +1250,26 @@ class addressbook_vcal extends addressbook_bo
 								break;
 
 							case 'cat_id':
-								$contact[$fieldName] = implode(',',$this->find_or_add_categories(explode(',',$value),'private'));
+								$contact[$fieldName] = implode(',',$this->find_or_add_categories($vcardValues[$vcardKey]['values']));
+								break;
+
+							case 'jpegphoto':
+								$contact[$fieldName] = $vcardValues[$vcardKey]['value'];
 								break;
 
 							case 'note':
 								// note may contain ','s but maybe this needs to be fixed in vcard parser...
-								//$contact[$fieldName] = trim($vcardValues[$vcardKey]['value']);
-								//break;
+								$contact[$fieldName] = $vcardValues[$vcardKey]['value'];
+								break;
 
+							case 'uid':
+								if (strlen($value) < $minimum_uid_length) {
+									// we don't use it
+									break;
+								}
 							default:
 								$contact[$fieldName] = $value;
-								break;
+							break;
 						}
 					}
 				}
@@ -873,7 +1277,9 @@ class addressbook_vcal extends addressbook_bo
 		}
 
 		$this->fixup_contact($contact);
-		//error_log(__FILE__ . __METHOD__ . "\nContact:\n " .print_r($contact,true));
+
+		Horde::logMessage("vCalAddressbook vcardtoegw: " . print_r($contact, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 		return $contact;
 	}
 
@@ -883,7 +1289,7 @@ class addressbook_vcal extends addressbook_bo
 	 * @param array $ids contact-ids
 	 * @param string $file filename or null for download
 	 */
-	function export($ids,$file=null)
+	function export($ids, $file=null)
 	{
 		if (!$file)
 		{
@@ -894,7 +1300,7 @@ class addressbook_vcal extends addressbook_bo
 		{
 			return false;
 		}
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			fwrite($fp,$this->getVCard($id));
 		}

From 036b2cd14ea82b837f3f1bf7001f28d5675e8314 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Jul 2009 20:04:17 +0000
Subject: [PATCH 479/510] - merged SyncML-1.2 branch with trunk: svn merge
 ^/trunk/infolog@27329 ^/branches/SyncML-1.2/infolog . - completly reverted
 changes in inc/class.boinfolog.inc.php, as they are   not related to SyncML
 at all: svn revert inc/class.boinfolog.inc.php

---
 infolog/inc/class.infolog_bo.inc.php       | 156 +++++-
 infolog/inc/class.infolog_hooks.inc.php    |   9 +
 infolog/inc/class.infolog_ical.inc.php     | 537 +++++++++++++------
 infolog/inc/class.infolog_sif.inc.php      | 592 ++++++++++++---------
 infolog/inc/class.infolog_so.inc.php       |  36 +-
 infolog/inc/class.infolog_tracking.inc.php |   1 +
 infolog/inc/class.infolog_ui.inc.php       |   3 +-
 7 files changed, 895 insertions(+), 439 deletions(-)

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index f80cf427ec..ed152dc31a 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -4,6 +4,7 @@
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @package infolog
  * @copyright (c) 2003-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -154,7 +155,7 @@ class infolog_bo
 				'billed' => 'billed',			// -->  DONE
 				'template' => 'template',		// -->  cancelled
 				'nonactive' => 'nonactive',		// -->  cancelled
-				'archive' => 'archive' ),		// -->  cancelled
+				'archive' => 'archive' ), 		// -->  cancelled
 			'phone' => array(
 				'not-started' => 'call',		// iCal NEEDS-ACTION
 				'ongoing' => 'will-call',		// iCal IN-PROCESS
@@ -513,7 +514,6 @@ class infolog_bo
 			$GLOBALS['egw']->contenthistory->updateTimeStamp('infolog_'.$info['info_type'], $info_id, 'delete', time());
 
 			// send email notifications and do the history logging
-			require_once(EGW_INCLUDE_ROOT.'/infolog/inc/class.infolog_tracking.inc.php');
 			if (!is_object($this->tracking))
 			{
 				$this->tracking = new infolog_tracking($this);
@@ -533,7 +533,7 @@ class infolog_bo
 	* @param boolean $touch_modified=true touch the modification data and sets the modiefier's user-id
 	* @return int/boolean info_id on a successfull write or false
 	*/
-	function write(&$values,$check_defaults=True,$touch_modified=True)
+	function write(&$values, $check_defaults=True, $touch_modified=True)
 	{
 		//echo "boinfolog::write()values="; _debug_array($values);
 		if ($status_only = $values['info_id'] && !$this->check_access($values['info_id'],EGW_ACL_EDIT))
@@ -578,7 +578,7 @@ class infolog_bo
 			if ($set_completed)
 			{
 				$values['info_datecompleted'] = $this->user_time_now;
-				$values['info_percent'] = '100%';
+				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
 				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
@@ -608,7 +608,7 @@ class infolog_bo
 			}
 			if (in_array($values['info_status'],array('done','billed')))
 			{
-				$values['info_percent'] = '100';
+				$values['info_percent'] = 100;
 			}
 			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'],array('done','billed','cancelled')))
 			{
@@ -659,7 +659,7 @@ class infolog_bo
 			// Should only an entry be updated which includes the original modification date?
 			// Used in the web-GUI to check against a modification by an other user while editing the entry.
 			// It's now disabled for xmlrpc, as otherwise the xmlrpc code need to be changed!
-			$xmprpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method;
+			$xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method;
 			$check_modified = $values['info_datemodified'] && !$xmlrpc ? $values['info_datemodified']-$this->tz_offset_s : false;
 			$values['info_datemodified'] = $this->user_time_now;
 		}
@@ -1080,7 +1080,7 @@ class infolog_bo
 			$cat_id = $this->categories->name2id($cat_name, 'X-');
 			if (!$cat_id)
 			{
-				$cat_id = $this->categories->add(array('name' => $cat_name,'descr' => $cat_name));
+				$cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private'));
 			}
 
 			if ($cat_id)
@@ -1172,32 +1172,32 @@ class infolog_bo
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
 					if (in_array($info['info_id'],$notified_info_ids)) continue;
 
-					if (is_null($tracking) || $tracking->user != $user)
+					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
 						require_once(EGW_INCLUDE_ROOT.'/infolog/inc/class.infolog_tracking.inc.php');
-						$tracking = new infolog_tracking($this);
+						$this->tracking = new infolog_tracking($this);
 					}
 					switch($pref)
 					{
 						case 'notify_due_responsible':
 							$info['message'] = lang('%1 you are responsible for is due at %2',$this->enums['type'][$info['info_type']],
-								$tracking->datetime($info['info_enddate']-$this->tz_offset_s,false));
+								$this->tracking->datetime($info['info_enddate']-$this->tz_offset_s,false));
 							break;
 						case 'notify_due_delegated':
 							$info['message'] = lang('%1 you delegated is due at %2',$this->enums['type'][$info['info_type']],
-								$tracking->datetime($info['info_enddate']-$this->tz_offset_s,false));
+								$this->tracking->datetime($info['info_enddate']-$this->tz_offset_s,false));
 							break;
 						case 'notify_start_responsible':
 							$info['message'] = lang('%1 you are responsible for is starting at %2',$this->enums['type'][$info['info_type']],
-								$tracking->datetime($info['info_startdate']-$this->tz_offset_s,null));
+								$this->tracking->datetime($info['info_startdate']-$this->tz_offset_s,null));
 							break;
 						case 'notify_start_delegated':
 							$info['message'] = lang('%1 you delegated is starting at %2',$this->enums['type'][$info['info_type']],
-								$tracking->datetime($info['info_startdate']-$this->tz_offset_s,null));
+								$this->tracking->datetime($info['info_startdate']-$this->tz_offset_s,null));
 							break;
 					}
 					error_log("notifiying $user($email) about $info[info_subject]: $info[message]");
-					$tracking->send_notification($info,null,$email,$user,$pref);
+					$this->tracking->send_notification($info,null,$email,$user,$pref);
 
 					$notified_info_ids[] = $info['info_id'];
 				}
@@ -1221,6 +1221,8 @@ class infolog_bo
 		'template'    => 'CANCELLED',
 		'nonactive'   => 'CANCELLED',
 		'archive'     => 'CANCELLED',
+		'deferred'    => 'NEEDS-ACTION',
+		'waiting'     => 'IN-PROCESS',
 	);
 
 	/** conversion of vtodo status to infolog status
@@ -1229,7 +1231,9 @@ class infolog_bo
 	 */
 	var $_vtodo2status = array(
 		'NEEDS-ACTION' => 'not-started',
+		'NEEDS ACTION' => 'not-started',
 		'IN-PROCESS'   => 'ongoing',
+		'IN PROCESS'   => 'ongoing',
 		'COMPLETED'    => 'done',
 		'CANCELLED'    => 'cancelled',
 	);
@@ -1285,4 +1289,128 @@ class infolog_bo
 		}
 		return 'ongoing';
 	}
+
+	/**
+	 * Get the Parent ID of an InfoLog entry
+	 *
+	 * @param string $_guid
+	 * @return string parentID
+	 */
+	function getParentID($_guid)
+	{
+		#Horde::logMessage("getParentID($_guid)",  __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+		$parentID = False;
+		$myfilter = array('col_filter' => array('info_uid'=>$_guid)) ;
+		if ($_guid && ($found=$this->search($myfilter)) && ($uidmatch = array_shift($found))) {
+			$parentID = $uidmatch['info_id'];
+		};
+		return $parentID;
+	}
+
+	/**
+	 * Try to find a matching db entry
+	 *
+	 * @param array $egwData   the vTODO data we try to find
+	 * @param boolean $relax=false if asked to relax, we only match against some key fields
+	 * @return the infolog_id of the matching entry or false (if none matches)
+	 */
+	function findVTODO($egwData, $relax=false)
+	{
+		$myfilter = array('col_filter' => array('info_uid'=>$egwData['info_uid'])) ;
+		if ($egwData['info_uid']
+			&& ($found = $this->search($myfilter))
+			&& ($uidmatch = array_shift($found)))
+		{
+			return $uidmatch['info_id'];
+		};
+		unset($egwData['info_uid']);
+
+		$filter = array();
+
+		$description = '';
+		if (!empty($egwData['info_des'])) {
+			$description = trim(preg_replace("/\r?\n?\\[[A-Z_]+:.*\\]/i", '', $egwData['info_des']));
+			unset($egwData['info_des']);
+			// Avoid quotation problems
+			$description = preg_replace("/[^\x20-\x7F].*/", '', $description);
+			if (strlen($description)) {
+				$filter['search'] = $description;
+			}
+		}
+
+		if ($egwData['info_id']
+			&& ($found = $this->read($egwData['info_id'])))
+		{
+			// We only do a simple consistency check
+			if ($found['info_subject'] == $egwData['info_subject']
+				&& strpos($found['info_des'], $description) === 0)
+			{
+				return $found['info_id'];
+			}
+		}
+		unset($egwData['info_id']);
+
+		// priority does not need to match
+		unset($egwData['info_priority']);
+
+		$filter['col_filter'] = $egwData;
+
+		if($foundItems = $this->search($filter)) {
+			if(count($foundItems) > 0) {
+				$itemIDs = array_keys($foundItems);
+				return $itemIDs[0];
+			}
+		}
+
+		$filter = array();
+
+		if (!$relax && strlen($description)) {
+			$filter['search'] = $description;
+		}
+
+		$filter['col_filter'] = $egwData;
+
+		// search for date only match
+		unset($filter['col_filter']['info_startdate']);
+		unset($filter['col_filter']['info_datecompleted']);
+
+		// try tasks without category
+		unset($filter['col_filter']['info_cat']);
+
+		#Horde::logMessage("findVTODO Filter\n"
+		#		. print_r($filter, true),
+		#		__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		foreach ($this->search($filter) as $itemID => $taskData) {
+		#	Horde::logMessage("findVTODO Trying\n"
+		#		. print_r($taskData, true),
+		#		__FILE__, __LINE__, PEAR_LOG_DEBUG);
+			if (isset($egwData['info_cat'])
+					&& isset($taskData['info_cat']) && $taskData['info_cat']
+					&& $egwData['info_cat'] != $taskData['info_cat']) continue;
+			if (isset($egwData['info_startdate'])
+					&& isset($taskData['info_startdate']) && $taskData['info_startdate']) {
+				$parts = @getdate($taskData['info_startdate']);
+				$startdate = @mktime(0, 0, 0, $parts['mon'], $parts['mday'], $parts['year']);
+				if ($egwData['info_startdate'] != $startdate) continue;
+			}
+			// some clients don't support DTSTART
+			if (isset($egwData['info_startdate'])
+					&& (!isset($taskData['info_startdate']) || !$taskData['info_startdate'])
+					&& !$relax) continue;
+			if (isset($egwData['info_datecompleted'])
+					&& isset($taskData['info_datecompleted']) && $taskData['info_datecompleted']) {
+				$parts = @getdate($taskData['info_datecompleted']);
+				$enddate = @mktime(0, 0, 0, $parts['mon'], $parts['mday'], $parts['year']);
+				if ($egwData['info_datecompleted'] != $enddate) continue;
+			}
+			if ((isset($egwData['info_datecompleted'])
+					&& (!isset($taskData['info_datecompleted']) || !$taskData['info_datecompleted'])) ||
+				(!isset($egwData['info_datecompleted'])
+					&& isset($taskData['info_datecompleted']) && $taskData['info_datecompleted'])
+					&& !$relax) continue;
+			return($itemID);
+		}
+		return false;
+	}
 }
diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php
index 28dbd9fb81..d823f26f0b 100644
--- a/infolog/inc/class.infolog_hooks.inc.php
+++ b/infolog/inc/class.infolog_hooks.inc.php
@@ -331,6 +331,7 @@ class infolog_hooks
 	private static function all_cats()
 	{
 		$categories = new categories('','infolog');
+		$accountId = $GLOBALS['egw_info']['user']['account_id'];
 
 		foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat)
 		{
@@ -340,6 +341,14 @@ class infolog_hooks
 			{
 				$s .= ' &#9830;';
 			}
+			elseif ($cat['owner'] != $accountId)
+			{
+				$s .= '&lt;' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '&gt;';
+			}
+			elseif ($cat['access'] == 'private')
+			{
+				$s .= ' &#9829;';
+			}
 			$sel_options[$cat['id']] = $s;	// 0.9.14 only
 		}
 		return $sel_options;
diff --git a/infolog/inc/class.infolog_ical.inc.php b/infolog/inc/class.infolog_ical.inc.php
index 5dd4609b77..a33e63a7d3 100644
--- a/infolog/inc/class.infolog_ical.inc.php
+++ b/infolog/inc/class.infolog_ical.inc.php
@@ -4,15 +4,14 @@
  *
  * @link http://www.egroupware.org
  * @author Lars Kneschke <lkneschke@egroupware.org>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @package infolog
  * @subpackage syncml
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-require_once EGW_API_INC.'/horde/Horde/iCalendar.php';
-require_once EGW_API_INC.'/horde/Horde/iCalendar/vnote.php';
-require_once EGW_API_INC.'/horde/Horde/iCalendar/vtodo.php';
+require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/lib/core.php';
 
 /**
  * InfoLog: Create and parse iCal's
@@ -20,17 +19,24 @@ require_once EGW_API_INC.'/horde/Horde/iCalendar/vtodo.php';
  */
 class infolog_ical extends infolog_bo
 {
+	/**
+	 * @var array conversion of the priority egw => ical
+	 */
 	var $egw_priority2vcal_priority = array(
-		0	=> 3,
-		1	=> 2,
-		2	=> 1,
-		3	=> 1,
+		0 => 9,         // low
+		1 => 5,         // normal
+		2 => 3,         // high
+		3 => 1,         // urgent
 	);
 
+	/**
+	 * @var array conversion of the priority ical => egw
+	 */
 	var $vcal_priority2egw_priority = array(
-		1       => 2,
-		2       => 1,
-		3       => 0,
+		9 => 0, 8 => 0, 7 => 0,		// low
+		6 => 1, 5 => 1, 4 => 1, 0 => 1, // normal
+		3 => 2, 2 => 2,			// high
+		1 => 3,				// urgent
 	);
 
 	/**
@@ -41,6 +47,32 @@ class infolog_ical extends infolog_bo
 	var $productManufacturer = 'file';
 	var $productName = '';
 
+	/**
+	* Shall we use the UID extensions of the description field?
+	*
+	* @var boolean
+	*/
+	var $uidExtension = false;
+
+	/**
+	 * Client CTCap Properties
+	 *
+	 * @var array
+	 */
+	var $clientProperties;
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $_clientProperties		client properties
+	 */
+	function __construct(&$_clientProperties = array())
+	{
+		parent::__construct();
+
+		$this->clientProperties = $_clientProperties;
+	}
+
 	/**
 	 * Exports one InfoLog tast to an iCalendar VTODO
 	 *
@@ -53,9 +85,36 @@ class infolog_ical extends infolog_bo
 	{
 		$taskData = $this->read($_taskID);
 
-		$taskData = $GLOBALS['egw']->translation->convert($taskData, $GLOBALS['egw']->translation->charset(), 'UTF-8');
+		if ($taskData['info_id_parent'])
+		{
+			$parent = $this->read($taskData['info_id_parent']);
+			$taskData['info_id_parent'] = $parent['info_uid'];
+		}
+		else
+		{
+			$taskData['info_id_parent'] = '';
+		}
 
-		$taskGUID = $GLOBALS['egw']->common->generate_uid('infolog_task',$_taskID);
+		if ($this->uidExtension)
+		{
+			if (!preg_match('/\[UID:.+\]/m', $taskData['info_des']))
+			{
+				$taskData['info_des'] .= "\n[UID:" . $taskData['info_uid'] . "]";
+				if ($taskData['info_id_parent'] != '')
+				{
+					$taskData['info_des'] .= "\n[PARENT_UID:" . $taskData['info_id_parent'] . "]";
+				}
+			}
+		}
+
+		if (!empty($taskData['info_cat']))
+		{
+			$cats = $this->get_categories(array($taskData['info_cat']));
+			$taskData['info_cat'] = $cats[0];
+		}
+
+		$taskData = $GLOBALS['egw']->translation->convert($taskData,
+			$GLOBALS['egw']->translation->charset(), 'UTF-8');
 
 		$vcal = new Horde_iCalendar;
 		$vcal->setAttribute('VERSION',$_version);
@@ -63,35 +122,91 @@ class infolog_ical extends infolog_bo
 
 		$vevent = Horde_iCalendar::newComponent('VTODO',$vcal);
 
-		// set fields that may contain non-ascii chars and encode them if necessary
-		foreach(array(
-			'SUMMARY'     => $taskData['info_subject'],
-			'DESCRIPTION' => $taskData['info_des'],
-			'LOCATION'    => $taskData['info_location'],
-		) as $field => $value)
+		if (!isset($this->clientProperties['SUMMARY']['Size']))
 		{
-			$vevent->setAttribute($field,$value);
-			$options = array();
-			if($this->productManufacturer != 'GroupDAV' &&  preg_match('/([\000-\012\015\016\020-\037\075])/',$value))
+			// make SUMMARY a required field
+			$this->clientProperties['SUMMARY']['Size'] = 0xFFFF;
+			$this->clientProperties['SUMMARY']['NoTruncate'] = false;
+		}
+		// set fields that may contain non-ascii chars and encode them if necessary
+		foreach (array(
+					'SUMMARY'     => $taskData['info_subject'],
+					'DESCRIPTION' => $taskData['info_des'],
+					'LOCATION'    => $taskData['info_location'],
+					'RELATED-TO'  => $taskData['info_id_parent'],
+					'UID'		  => $taskData['info_uid'],
+					'CATEGORIES'  => $taskData['info_cat'],
+				) as $field => $value)
+		{
+			if (isset($this->clientProperties[$field]['Size']))
 			{
-				$options['ENCODING'] = 'QUOTED-PRINTABLE';
+				$size = $this->clientProperties[$field]['Size'];
+				$noTruncate = $this->clientProperties[$field]['NoTruncate'];
+				#Horde::logMessage("VTODO $field Size: $size, NoTruncate: " .
+				#	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 			}
-			if($this->productManufacturer != 'GroupDAV' && preg_match('/([\177-\377])/',$value))
+			else
+			{
+				$size = -1;
+				$noTruncate = false;
+			}
+			$cursize = strlen($value);
+			if (($size > 0) && $cursize > $size)
+			{
+				if ($noTruncate)
+				{
+					Horde::logMessage("VTODO $field omitted due to maximum size $size",
+						__FILE__, __LINE__, PEAR_LOG_WARNING);
+					continue; // skip field
+				}
+				// truncate the value to size
+				$value = substr($value, 0, $size -1);
+				#Horde::logMessage("VTODO $field truncated to maximum size $size",
+				#	__FILE__, __LINE__, PEAR_LOG_INFO);
+			}
+
+			if (empty($value) && ($size < 0 || $noTruncate)) continue;
+
+			if ($field == 'RELATED-TO')
+			{
+				$options = array('RELTYPE' => 'PARENT');
+			}
+			else
+			{
+				$options = array();
+			}
+
+			/*if(preg_match('/([\000-\012\015\016\020-\037\075])/', $value)) {
+				$options['ENCODING'] = 'QUOTED-PRINTABLE';
+			}*/
+			if ($this->productManufacturer != 'groupdav'
+				&& preg_match('/([\177-\377])/',$value))
 			{
 				$options['CHARSET'] = 'UTF-8';
 			}
-			if ($options) $vevent->setParameter($field, $options);
+			$vevent->setAttribute($field, $value, $options);
 		}
-		if($taskData['info_startdate'])
+
+		if ($taskData['info_startdate'])
+		{
 			$vevent->setAttribute('DTSTART',$taskData['info_startdate']);
-		if($taskData['info_enddate'])
-			$vevent->setAttribute('DUE',$taskData['info_enddate']);
-		if($taskData['info_datecompleted'])
+		}
+
+		if ($taskData['info_enddate'])
+		{
+			$parts = @getdate($taskData['info_enddate']);
+			$value = @mktime(12, 0, 0, $parts['mon'], $parts['mday'], $parts['year']);
+			$vevent->setAttribute('DUE', $value);
+		}
+
+		if ($taskData['info_datecompleted'])
+		{
 			$vevent->setAttribute('COMPLETED',$taskData['info_datecompleted']);
+		}
+
 		$vevent->setAttribute('DTSTAMP',time());
 		$vevent->setAttribute('CREATED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_task',$_taskID,'add'));
 		$vevent->setAttribute('LAST-MODIFIED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_task',$_taskID,'modify'));
-		$vevent->setAttribute('UID',$taskData['info_uid']);
 		$vevent->setAttribute('CLASS',$taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
 		$vevent->setAttribute('STATUS',$this->status2vtodo($taskData['info_status']));
 		// we try to preserv the original infolog status as X-INFOLOG-STATUS, so we can restore it, if the user does not modify STATUS
@@ -99,16 +214,12 @@ class infolog_ical extends infolog_bo
 		$vevent->setAttribute('PERCENT-COMPLETE',$taskData['info_percent']);
 		$vevent->setAttribute('PRIORITY',$this->egw_priority2vcal_priority[$taskData['info_priority']]);
 
-		if (!empty($taskData['info_cat']))
-		{
-			$cats = $this->get_categories(array($taskData['info_cat']));
-			$vevent->setAttribute('CATEGORIES', $cats[0]);
-		}
-		//error_log("\n\nexportvcal\n". print_r($vcal,true));
-		//error_log("\n\nexportvcal\n". print_r($vevent,true));
+
 		$vcal->addComponent($vevent);
-		error_log("\n\nexportvcal from infolog\n");
-		return $vcal->exportvCalendar();
+
+		$retval = $vcal->exportvCalendar();
+		Horde::logMessage("exportVTODO:\n" . print_r($retval, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		return $retval;
 	}
 
 	/**
@@ -116,104 +227,143 @@ class infolog_ical extends infolog_bo
 	 *
 	 * @param string $_vcalData
 	 * @param int $_taskID=-1 info_id, default -1 = new entry
+	 * @param boolean $merge=false	merge data with existing entry
 	 * @return int|boolean integer info_id or false on error
 	 */
-	function importVTODO(&$_vcalData, $_taskID=-1)
+	function importVTODO(&$_vcalData, $_taskID=-1, $merge=false)
 	{
-		if(!$taskData = $this->vtodotoegw($_vcalData,$_taskID))
-		{
-			return false;
-		}
+		if (!$taskData = $this->vtodotoegw($_vcalData,$_taskID)) return false;
+
 		// we suppose that a not set status in a vtodo means that the task did not started yet
-		if(empty($taskData['info_status']))
+		if (empty($taskData['info_status']))
 		{
 			$taskData['info_status'] = 'not-started';
 		}
+
+		if (empty($taskData['info_datecompleted']))
+		{
+			$taskData['info_datecompleted'] = 0;
+		}
+
 		return $this->write($taskData);
 	}
 
-	function searchVTODO($_vcalData, $contentID=null)
-	{
-		if(!$egwData = $this->vtodotoegw($_vcalData)) {
-			return false;
-		}
-    
-		$myfilter = array('col_filter' => array('info_uid'=>$egwData['info_uid'])) ;
-		if ($egwData['info_uid'] && ($found=parent::search($myfilter)) && ($uidmatch = array_shift($found)))
+	/**
+	 * Search a matching infolog entry for the VTODO data
+	 *
+	 * @param string $_vcalData		VTODO
+	 * @param int $contentID=null 	infolog_id (or null, if unkown)
+	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
+	 * @return infolog_id of a matching entry or false, if nothing was found
+	 */
+	function searchVTODO($_vcalData, $contentID=null, $relax=false) {
+		$result = false;
+
+		if (($egwData = $this->vtodotoegw($_vcalData)))
 		{
-			return $uidmatch['info_id'];
-		};
-		unset($egwData['info_uid']);
-    		
-		if ($contentID) {
-			$egwData['info_id'] = $contentID;
-		}
-
-		#unset($egwData['info_priority']);
-
-		$filter = array('col_filter' => $egwData);
-		if($foundItems = $this->search($filter)) {
-			if(count($foundItems) > 0) {
-				$itemIDs = array_keys($foundItems);
-				return $itemIDs[0];
+			if ($contentID)
+			{
+				$egwData['info_id'] = $contentID;
 			}
+			$result = $this->findVTODO($egwData, $relax);
 		}
-
-		return false;
+		return $result;
 	}
 
-	function vtodotoegw($_vcalData,$_taskID=-1)
+	/**
+	 * Convert VTODO into a eGW infolog entry
+	 *
+	 * @param string $_vcalData 	VTODO data
+	 * @param int $_taskID=-1		infolog_id of the entry
+	 * @return array infolog entry or false on error
+	 */
+	function vtodotoegw($_vcalData, $_taskID=-1)
 	{
 		$vcal = new Horde_iCalendar;
-		if(!$vcal->parsevCalendar($_vcalData))
+		if (!($vcal->parsevCalendar($_vcalData))) return false;
+
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
-			return FALSE;
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		}
+		else
+		{
+			$minimum_uid_length = 8;
 		}
 
 		$components = $vcal->getComponents();
 
-		if(count($components) > 0)
+		foreach ($components as $component)
 		{
-			$component = $components[0];
-			if(is_a($component, 'Horde_iCalendar_vtodo'))
+			if (is_a($component, 'Horde_iCalendar_vtodo'))
 			{
 				$taskData = array();
-				if($_taskID > 0)
+				$taskData['info_type'] = 'task';
+
+				if ($_taskID > 0)
 				{
 					$taskData['info_id'] = $_taskID;
 				}
-				foreach($component->_attributes as $attributes)
+				foreach ($component->_attributes as $attributes)
 				{
-					switch($attributes['name'])
+					//$attributes['value'] = trim($attributes['value']);
+					if (empty($attributes['value'])) continue;
+					switch ($attributes['name'])
 					{
 						case 'CLASS':
-							$taskData['info_access']		= strtolower($attributes['value']);
+							$taskData['info_access'] = strtolower($attributes['value']);
 							break;
+
 						case 'DESCRIPTION':
-							$taskData['info_des']			= $attributes['value'];
+							$value = $attributes['value'];
+							if (preg_match('/\s*\[UID:(.+)?\]/Usm', $value, $matches))
+							{
+								if (!isset($taskData['info_uid'])
+										&& strlen($matches[1]) >= $minimum_uid_length)
+								{
+									$taskData['info_uid'] = $matches[1];
+								}
+								//$value = str_replace($matches[0], '', $value);
+							}
+							if (preg_match('/\s*\[PARENT_UID:(.+)?\]/Usm', $value, $matches))
+							{
+								if (!isset($taskData['info_id_parent'])
+										&& strlen($matches[1]) >= $minimum_uid_length)
+								{
+									$taskData['info_id_parent'] = $this->getParentID($matches[1]);
+								}
+								//$value = str_replace($matches[0], '', $value);
+							}
+							$taskData['info_des'] = $value;
 							break;
+
 						case 'LOCATION':
-							$taskData['info_location']		= $attributes['value'];
+							$taskData['info_location'] = $attributes['value'];
 							break;
+
 						case 'DUE':
-							$taskData['info_enddate']		= $attributes['value'];
+							// eGroupWare uses date only
+							$parts = @getdate($attributes['value']);
+							$value = @mktime(0, 0, 0, $parts['mon'], $parts['mday'], $parts['year']);
+							$taskData['info_enddate'] = $value;
 							break;
+
 						case 'COMPLETED':
 							$taskData['info_datecompleted']	= $attributes['value'];
 							break;
+
 						case 'DTSTART':
-							$taskData['info_startdate']		= $attributes['value'];
+							$taskData['info_startdate']	= $attributes['value'];
 							break;
+
 						case 'PRIORITY':
-							if (1 <= $attributes['value'] && $attributes['value'] <= 3)
-							{
-								$taskData['info_priority']	= $this->vcal_priority2egw_priority[$attributes['value']];
-							}
-							else
-							{
-								$taskData['info_priority']	= 1;	// default = normal
+							if (1 <= $attributes['value'] && $attributes['value'] <= 3)	{
+								$taskData['info_priority'] = $this->vcal_priority2egw_priority[$attributes['value']];
+							} else {
+								$taskData['info_priority'] = 1;	// default = normal
 							}
 							break;
+
 						case 'STATUS':
 							// check if we (still) have X-INFOLOG-STATUS set AND it would give an unchanged status (no change by the user)
 							foreach($component->_attributes as $attr)
@@ -223,28 +373,26 @@ class infolog_ical extends infolog_bo
 							$taskData['info_status'] = $this->vtodo2status($attributes['value'],
 								$attr['name'] == 'X-INFOLOG-STATUS' ? $attr['value'] : null);
 							break;
+
 						case 'SUMMARY':
-							$taskData['info_subject']		= $attributes['value'];
+							$taskData['info_subject'] = $attributes['value'];
+							break;
+
+						case 'RELATED-TO':
+							$taskData['info_id_parent'] = $this->getParentID($attributes['value']);
 							break;
 
 						case 'CATEGORIES':
 							$cats = $this->find_or_add_categories(explode(',', $attributes['value']));
 							$taskData['info_cat'] = $cats[0];
 							break;
+
 						case 'UID':
-							$taskData['info_uid'] = $attributes['value'];
-							if ($_taskID <= 0 && !empty($attributes['value']) && ($uid_task = $this->read($attributes['value'])))
-							{
-								$taskData['info_id'] = $uid_task['id'];
-								unset($uid_task);
+							if (strlen($attributes['value']) >= $minimum_uid_length) {
+								$taskData['info_uid'] = $attributes['value'];
 							}
-							// not use weak uids that might come from syncml clients
-							if (isset($event['uid']) && (strlen($event['uid']) < 20 || is_numeric($event['uid'])))
-							{
-								unset ($event['uid']);
-							}	
-							
 							break;
+
 						case 'PERCENT-COMPLETE':
 							$taskData['info_percent'] = (int) $attributes['value'];
 							break;
@@ -254,18 +402,28 @@ class infolog_ical extends infolog_bo
 				# do NOT convert here
 				#$taskData = $GLOBALS['egw']->translation->convert($taskData, 'UTF-8');
 
+				Horde::logMessage("vtodotoegw:\n" . print_r($taskData, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 				return $taskData;
 			}
 		}
-		return FALSE;
+		return false;
 	}
 
+	/**
+	 * Export an infolog entry as VNOTE
+	 *
+	 * @param int $_noteID		the infolog_id of the entry
+	 * @param string $_type		content type (e.g. text/plain)
+	 * @return string VNOTE representation of the infolog entry
+	 */
 	function exportVNOTE($_noteID, $_type)
 	{
 		$note = $this->read($_noteID);
-		$note = $GLOBALS['egw']->translation->convert($note, $GLOBALS['egw']->translation->charset(), 'UTF-8');
+		$note = $GLOBALS['egw']->translation->convert($note,
+			$GLOBALS['egw']->translation->charset(), 'UTF-8');
 
-		switch($_type)
+		switch	($_type)
 		{
 			case 'text/plain':
 				$txt = $note['info_subject']."\n\n".$note['info_des'];
@@ -273,66 +431,101 @@ class infolog_ical extends infolog_bo
 				break;
 
 			case 'text/x-vnote':
-				$noteGUID = $GLOBALS['egw']->common->generate_uid('infolog_note',$_noteID);
 				$vnote = new Horde_iCalendar_vnote();
+				$options = array('CHARSET' => 'UTF-8');
 				$vNote->setAttribute('VERSION', '1.1');
-				$vnote->setAttribute('SUMMARY',$note['info_subject']);
-				$vnote->setAttribute('BODY',$note['info_des']);
-				if($note['info_startdate'])
+				foreach (array(	'SUMMARY'	=> $note['info_subject'],
+								'BODY' 		=> $note['info_des'],
+							) as $field => $value)
+				{
+					$vnote->setAttribute($field, $value);
+					if ($this->productManufacturer != 'groupdav'
+						&& preg_match('/([\177-\377])/', $value))
+					{
+						$vevent->setParameter($field, $options);
+					}
+				}
+				if ($note['info_startdate'])
+				{
 					$vnote->setAttribute('DCREATED',$note['info_startdate']);
+				}
 				$vnote->setAttribute('DCREATED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_note',$_noteID,'add'));
 				$vnote->setAttribute('LAST-MODIFIED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_note',$_noteID,'modify'));
+
 				if (!empty($note['info_cat']))
 				{
 					$cats = $this->get_categories(array($note['info_cat']));
-					$vnote->setAttribute('CATEGORIES', $cats[0]);
+					$value = $cats[0];
+					$vnote->setAttribute('CATEGORIES', $value);
+					if ($this->productManufacturer != 'groupdav'
+						&& preg_match('/([\177-\377])/', $value))
+					{
+						$vevent->setParameter('CATEGORIES', $options);
+					}
 				}
 
-				#$vnote->setAttribute('UID',$noteGUID);
 				#$vnote->setAttribute('CLASS',$taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
 
-				#$options = array('CHARSET' => 'UTF-8','ENCODING' => 'QUOTED-PRINTABLE');
-				#$vnote->setParameter('SUMMARY', $options);
-				#$vnote->setParameter('DESCRIPTION', $options);
-
 				return $vnote->exportvCalendar();
 				break;
 		}
 		return false;
 	}
 
-	function importVNOTE(&$_vcalData, $_type, $_noteID = -1)
+	/**
+	 * Import a VNOTE component of an iCal
+	 *
+	 * @param string $_vcalData
+	 * @param string $_type		content type (eg.g text/plain)
+	 * @param int $_taskID=-1 info_id, default -1 = new entry
+	 * @param boolean $merge=false	merge data with existing entry
+	 * @return int|boolean integer info_id or false on error
+	 */
+	function importVNOTE(&$_vcalData, $_type, $_noteID = -1, $merge=false)
 	{
-		if(!$note = $this->vnotetoegw($_vcalData, $_type))
-		{
-			return false;
-		}
+		if (!($note = $this->vnotetoegw($_vcalData, $_type))) return false;
 
-		if($_noteID > 0)
-		{
-			$note['info_id'] = $_noteID;
-		}
+		if($_noteID > 0) $note['info_id'] = $_noteID;
 
-		if(empty($note['info_status'])) {
-			$note['info_status'] = 'done';
-		}
+		if (empty($note['info_status'])) $note['info_status'] = 'done';
 
 		#_debug_array($taskData);exit;
 		return $this->write($note);
 	}
 
+	/**
+	 * Search a matching infolog entry for the VNOTE data
+	 *
+	 * @param string $_vcalData		VNOTE
+	 * @param int $contentID=null 	infolog_id (or null, if unkown)
+	 * @return infolog_id of a matching entry or false, if nothing was found
+	 */
 	function searchVNOTE($_vcalData, $_type, $contentID=null)
 	{
-		if(!$note = $this->vnotetoegw($_vcalData,$_type)) {
-			return false;
-		}
-		if ($contentID) {
-			$note['info_id'] = $contentID;
+		if (!($note = $this->vnotetoegw($_vcalData,$_type))) return false;
+
+		if ($contentID)	$note['info_id'] = $contentID;
+
+		unset($note['info_startdate']);
+
+		$filter = array();
+
+		if (!empty($note['info_des']))
+		{
+			$description = trim(preg_replace("/\r?\n?\\[[A-Z_]+:.*\\]/i", '', $note['info_des']));
+			unset($note['info_des']);
+			if (strlen($description))
+			{
+				$filter['search'] = $description;
+			}
 		}
 
-		$filter = array('col_filter' => $note);
-		if($foundItems = $this->search($filter)) {
-			if(count($foundItems) > 0) {
+		$filter['col_filter'] = $note;
+
+		if (($foundItems = $this->search($filter)))
+		{
+			if (count($foundItems) > 0)
+			{
 				$itemIDs = array_keys($foundItems);
 				return $itemIDs[0];
 			}
@@ -341,9 +534,16 @@ class infolog_ical extends infolog_bo
 		return false;
 	}
 
+	/**
+	 * Convert VTODO into a eGW infolog entry
+	 *
+	 * @param string $_data 	VNOTE data
+	 * @param string $_type		content type (eg.g text/plain)
+	 * @return array infolog entry or false on error
+	 */
 	function vnotetoegw($_data, $_type)
 	{
-		switch($_type)
+		switch ($_type)
 		{
 			case 'text/plain':
 				$note = array();
@@ -360,7 +560,7 @@ class infolog_ical extends infolog_bo
 				else
 				{
 					// should better be imported as subject, but causes duplicates
-					// TODO: should be qexamined
+					// TODO: should be examined
 					$note['info_des'] = $txt;
 				}
 
@@ -369,34 +569,31 @@ class infolog_ical extends infolog_bo
 
 			case 'text/x-vnote':
 				$vnote = new Horde_iCalendar;
-				if (!$vcal->parsevCalendar($_data))
-				{
-					return FALSE;
-				}
+				if (!$vcal->parsevCalendar($_data))	return false;
+
 				$components = $vnote->getComponent();
-				if(count($components) > 0)
+				foreach ($components as $component)
 				{
-					$component = $components[0];
-					if(is_a($component, 'Horde_iCalendar_vnote'))
+					if (is_a($component, 'Horde_iCalendar_vnote'))
 					{
 						$note = array();
 						$note['info_type'] = 'note';
 
-						foreach($component->_attributes as $attribute)
+						foreach ($component->_attributes as $attribute)
 						{
 							switch ($attribute['name'])
 							{
 								case 'BODY':
 									$note['info_des'] = $attribute['value'];
 									break;
+
 								case 'SUMMARY':
 									$note['info_subject'] = $attribute['value'];
 									break;
+
 								case 'CATEGORIES':
-									{
-										$cats = $this->find_or_add_categories(explode(',', $attribute['value']));
-										$note['info_cat'] = $cats[0];
-									}
+									$cats = $this->find_or_add_categories(explode(',', $attribute['value']));
+									$note['info_cat'] = $cats[0];
 									break;
 							}
 						}
@@ -404,7 +601,7 @@ class infolog_ical extends infolog_bo
 					return $note;
 				}
 		}
-		return FALSE;
+		return false;
 	}
 
 	/**
@@ -415,11 +612,41 @@ class infolog_ical extends infolog_bo
 	 * @param string $_productManufacturer
 	 * @param string $_productName
 	 */
-	function setSupportedFields($_productManufacturer='file', $_productName='')
+	function setSupportedFields($_productManufacturer='', $_productName='')
 	{
-		// save them vor later use
-		$this->productManufacturer = $_productManufacturer;
-		$this->productName = $_productName;
+		$state = &$_SESSION['SyncML.state'];
+		if (isset($state))
+		{
+			$deviceInfo = $state->getClientDeviceInfo();
+		}
+
+		// store product manufacturer and name, to be able to use it elsewhere
+		if ($_productManufacturer)
+		{
+			$this->productManufacturer = strtolower($_productManufacturer);
+			$this->productName = strtolower($_productName);
+		}
+
+		if (isset($deviceInfo) && is_array($deviceInfo))
+		{
+			if (!isset($this->productManufacturer)
+				|| $this->productManufacturer == ''
+				|| $this->productManufacturer == 'file')
+			{
+				$this->productManufacturer = strtolower($deviceInfo['manufacturer']);
+			}
+			if (!isset($this->productName) || $this->productName == '')
+			{
+				$this->productName = strtolower($deviceInfo['model']);
+			}
+			if (isset($deviceInfo['uidExtension'])
+				&& $deviceInfo['uidExtension'])
+			{
+					$this->uidExtension = true;
+			}
+		}
+
+		Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', ' . $this->productName .')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
 	}
 }
-
diff --git a/infolog/inc/class.infolog_sif.inc.php b/infolog/inc/class.infolog_sif.inc.php
index 8c24beda10..c35e4e61ac 100644
--- a/infolog/inc/class.infolog_sif.inc.php
+++ b/infolog/inc/class.infolog_sif.inc.php
@@ -4,13 +4,14 @@
  *
  * @link http://www.egroupware.org
  * @author Lars Kneschke <lkneschke@egroupware.org>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @package infolog
  * @subpackage syncml
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-require_once EGW_API_INC.'/horde/Horde/iCalendar.php';
+require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/lib/core.php';
 
 /**
  * InfoLog: Create and parse SIF
@@ -38,58 +39,88 @@ class infolog_sif extends infolog_bo
 
 	// mappings for SIFTask to InfologTask
 	var $_sifTaskMapping = array(
-		'ActualWork'		=> '',
+		'ActualWork'			=> '',
 		'BillingInformation'	=> '',
-		'Body'			=> 'info_des',
-		'Categories'		=> 'info_cat',
-		'Companies'		=> '',
-		'Complete'		=> '',
-		'DateCompleted'		=> 'info_datecompleted',
-		'DueDate'		=> 'info_enddate',
-		'Importance'		=> 'info_priority',
-		'IsRecurring'		=> '',
-		'Mileage'		=> '',
-		'PercentComplete'	=> 'info_percent',
-		'ReminderSet'		=> '',
-		'ReminderTime'		=> '',
-		'Sensitivity'		=> 'info_access',
-		'StartDate'		=> 'info_startdate',
-		'Status'		=> 'info_status',
-		'Subject'		=> 'info_subject',
-		'TeamTask'		=> '',
-		'TotalWork'		=> '',
-		'RecurrenceType'	=> '',
-		'Interval'		=> '',
-		'MonthOfYear'		=> '',
-		'DayOfMonth'		=> '',
-		'DayOfWeekMask'		=> '',
-		'Instance'		=> '',
-		'PatternStartDate'	=> '',
-		'NoEndDate'		=> '',
-		'PatternEndDate'	=> '',
-		'Occurrences'		=> '',
+		'Body'					=> 'info_des',
+		'Categories'			=> 'info_cat',
+		'Companies'				=> '',
+		'Complete'				=> 'complete',
+		'DateCompleted'			=> 'info_datecompleted',
+		'DueDate'				=> 'info_enddate',
+		'Importance'			=> 'info_priority',
+		'IsRecurring'			=> '',
+		'Mileage'				=> '',
+		'PercentComplete'		=> 'info_percent',
+		'ReminderSet'			=> '',
+		'ReminderTime'			=> '',
+		'Sensitivity'			=> 'info_access',
+		'StartDate'				=> 'info_startdate',
+		'Status'				=> 'info_status',
+		'Subject'				=> 'info_subject',
+		'TeamTask'				=> '',
+		'TotalWork'				=> '',
+		'RecurrenceType'		=> '',
+		'Interval'				=> '',
+		'MonthOfYear'			=> '',
+		'DayOfMonth'			=> '',
+		'DayOfWeekMask'			=> '',
+		'Instance'				=> '',
+		'PatternStartDate'		=> '',
+		'NoEndDate'				=> '',
+		'PatternEndDate'		=> '',
+		'Occurrences'			=> '',
 	);
 
+	// standard headers
+    const xml_decl = '<?xml version="1.0" encoding="UTF-8"?>';
+	const SIF_decl = '<SIFVersion>1.1</SIFVersion>';
+
+	/**
+	* name and version of the sync-client
+	*
+	* @var string
+	*/
+	var $productName = 'mozilla plugin';
+	var $productSoftwareVersion = '0.3';
+
+	/**
+	* Shall we use the UID extensions of the description field?
+	*
+	* @var boolean
+	*/
+	var $uidExtension = false;
 
 
-	function startElement($_parser, $_tag, $_attributes) {
+	function startElement($_parser, $_tag, $_attributes)
+	{
+		// nothing to do
 	}
 
-	function endElement($_parser, $_tag) {
-		error_log("infolog: tag=$_tag data=".trim($this->sifData));
-		if(!empty($this->_currentSIFMapping[$_tag])) {
+	function endElement($_parser, $_tag)
+	{
+		#error_log("infolog: tag=$_tag data=".trim($this->sifData));
+		if (!empty($this->_currentSIFMapping[$_tag]))
+		{
 			$this->_extractedSIFData[$this->_currentSIFMapping[$_tag]] = trim($this->sifData);
 		}
 		unset($this->sifData);
 	}
 
-	function characterData($_parser, $_data) {
+	function characterData($_parser, $_data)
+	{
 		$this->sifData .= $_data;
 	}
 
-	function siftoegw($_sifData, $_sifType) {
+	/**
+	 * Convert SIF data into a eGW infolog entry
+	 *
+	 * @param string $sifData 	the SIF data
+	 * @param string $_sifType	type (note/task)
+	 * @return array infolog entry or false on error
+	 */
+	function siftoegw($sifData, $_sifType)
+	{
 		$sysCharSet	= $GLOBALS['egw']->translation->charset();
-		$sifData	= base64_decode($_sifData);
 
 		#$tmpfname = tempnam('/tmp/sync/contents','sift_');
 
@@ -115,29 +146,44 @@ class infolog_sif extends infolog_bo
 		xml_set_element_handler($this->xml_parser, "startElement", "endElement");
 		xml_set_character_data_handler($this->xml_parser, "characterData");
 		$this->strXmlData = xml_parse($this->xml_parser, $sifData);
-		if(!$this->strXmlData) {
+
+		if (!$this->strXmlData)
+		{
 			error_log(sprintf("XML error: %s at line %d",
 				xml_error_string(xml_get_error_code($this->xml_parser)),
 				xml_get_current_line_number($this->xml_parser)));
 			return false;
 		}
 
-		if(!array($this->_extractedSIFData)) {
-			return false;
-		}
+		if (!array($this->_extractedSIFData)) return false;
 
-		switch($_sifType) {
+		switch ($_sifType)
+		{
 			case 'task':
 				$taskData	= array();
 				$vcal		= new Horde_iCalendar;
 
 				$taskData['info_type'] = 'task';
+				$taskData['info_status'] = 'not-started';
 
-				foreach($this->_extractedSIFData as $key => $value) {
+				if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+				{
+					$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+				}
+				else
+				{
+					$minimum_uid_length = 8;
+				}
+
+				foreach ($this->_extractedSIFData as $key => $value)
+				{
+					$value = preg_replace('/<\!\[CDATA\[(.+)\]\]>/Usim', '$1', $value);
 					$value = $GLOBALS['egw']->translation->convert($value, 'utf-8', $sysCharSet);
-					error_log("infolog key=$key => value=$value");
+					#error_log("infolog key=$key => value=$value");
+					if (empty($value)) continue;
 
-					switch($key) {
+					switch($key)
+					{
 						case 'info_access':
 							$taskData[$key] = ((int)$value > 0) ? 'private' : 'public';
 							break;
@@ -145,19 +191,18 @@ class infolog_sif extends infolog_bo
 						case 'info_datecompleted':
 						case 'info_enddate':
 						case 'info_startdate':
-							if(!empty($value)) {
+							if (!empty($value))
+							{
 								$taskData[$key] = $vcal->_parseDateTime($value);
 								// somehow the client always deliver a timestamp about 3538 seconds, when no startdate set.
-								if($taskData[$key] < 10000)
-									$taskData[$key] = '';
-							} else {
-								$taskData[$key] = '';
+								if ($taskData[$key] < 10000) unset($taskData[$key]);
 							}
 							break;
 
 
 						case 'info_cat':
-							if (!empty($value)) {
+							if (!empty($value))
+							{
 								$categories = $this->find_or_add_categories(explode(';', $value));
 								$taskData['info_cat'] = $categories[0];
 							}
@@ -168,8 +213,8 @@ class infolog_sif extends infolog_bo
 							break;
 
 						case 'info_status':
-							$taskData[$key] = ((int)$value == 2) ? 'done' : 'ongoing';
-							switch($value) {
+							switch ($value)
+							{
 								case '0':
 									$taskData[$key] = 'not-started';
 									break;
@@ -178,9 +223,20 @@ class infolog_sif extends infolog_bo
 									break;
 								case '2':
 									$taskData[$key] = 'done';
+									$taskData['info_percent'] = 100;
+									break;
+								case '3':
+									$taskData[$key] = 'waiting';
 									break;
 								case '4':
-									$taskData[$key] = 'cancelled';
+									if ($this->productName == 'blackberry plug-in')
+									{
+										$taskData[$key] = 'deferred';
+									}
+									else
+									{
+										$taskData[$key] = 'cancelled';
+									}
 									break;
 								default:
 									$taskData[$key] = 'ongoing';
@@ -188,11 +244,35 @@ class infolog_sif extends infolog_bo
 							}
 							break;
 
+						case 'complete':
+							$taskData['info_status'] = 'done';
+							$taskData['info_percent'] = 100;
+							break;
+
+						case 'info_des':
+							// extract our UID and PARENT_UID information
+							if (preg_match('/\s*\[UID:(.+)?\]/Usm', $value, $matches))
+							{
+								if (strlen($matches[1]) >= $minimum_uid_length)
+								{
+									$taskData['info_uid'] = $matches[1];
+								}
+								//$value = str_replace($matches[0], '', $value);
+							}
+							if (preg_match('/\s*\[PARENT_UID:(.+)?\]/Usm', $value, $matches))
+							{
+								if (strlen($matches[1]) >= $minimum_uid_length)
+								{
+									$taskData['info_id_parent'] = $this->getParentID($matches[1]);
+								}
+								//$value = str_replace($matches[0], '', $value);
+							}
+
 						default:
 							$taskData[$key] = $value;
 							break;
 					}
-					error_log("infolog task key=$key => value=".$taskData[$key]);
+					#error_log("infolog task key=$key => value=" . $taskData[$key]);
 				}
 
 				return $taskData;
@@ -203,28 +283,32 @@ class infolog_sif extends infolog_bo
 				$noteData['info_type'] = 'note';
 				$vcal		= new Horde_iCalendar;
 
-				foreach($this->_extractedSIFData as $key => $value)
+				foreach ($this->_extractedSIFData as $key => $value)
 				{
+					$value = preg_replace('/<\!\[CDATA\[(.+)\]\]>/Usim', '$1', $value);
 					$value = $GLOBALS['egw']->translation->convert($value, 'utf-8', $sysCharSet);
 
-					error_log("infolog client key=$key => value=".$value);
+					#error_log("infolog client key=$key => value=" . $value);
 					switch ($key)
 					{
 						case 'info_startdate':
-							if(!empty($value)) {
+							if (!empty($value))
+							{
 								$noteData[$key] = $vcal->_parseDateTime($value);
 								// somehow the client always deliver a timestamp about 3538 seconds, when no startdate set.
-								if($noteData[$key] < 10000)
-									$noteData[$key] = '';
-							} else {
+								if ($noteData[$key] < 10000) $noteData[$key] = '';
+							}
+							else
+							{
 								$noteData[$key] = '';
 							}
 							break;
 
 						case 'info_cat':
-							if (!empty($value)) {
+							if (!empty($value))
+							{
 								$categories = $this->find_or_add_categories(explode(';', $value));
-								$taskData['info_cat'] = $categories[0];
+								$noteData['info_cat'] = $categories[0];
 							}
 							break;
 
@@ -232,7 +316,7 @@ class infolog_sif extends infolog_bo
 							$noteData[$key] = $value;
 							break;
 					}
-					error_log("infolog note key=$key => value=".$noteData[$key]);
+					#error_log("infolog note key=$key => value=".$noteData[$key]);
 				}
 				return $noteData;
 				break;
@@ -243,17 +327,33 @@ class infolog_sif extends infolog_bo
 		}
 	}
 
-	function searchSIF($_sifData, $_sifType, $contentID=null) {
-		if(!$egwData = $this->siftoegw($_sifData, $_sifType)) {
-			return false;
-		}
-		if ($contentID) {
-			$egwData['info_id'] = $contentID;
-		}
+	/**
+	 * Search for SIF data a matching infolog entry
+	 *
+	 * @param string $sifData		the SIF data
+	 * @param string $_sifType		type (note/task)
+	 * @param int $contentID=null 	infolog_id (or null, if unkown)
+	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
+	 * @return infolog_id of a matching entry or false, if nothing was found
+	 */
+	function searchSIF($_sifData, $_sifType, $contentID=null, $relax=false)
+	{
+		if (!($egwData = $this->siftoegw($_sifData, $_sifType))) return false;
 
-		$filter = array('col_filter' => $egwData);
-		if($foundItems = $this->search($filter)) {
-			if(count($foundItems) > 0) {
+		if ($contentID) $egwData['info_id'] = $contentID;
+
+		if ($_sifType == 'task') return $this->findVTODO($egwData, $relax);
+
+		if ($_sifType == 'note') unset($egwData['info_startdate']);
+
+		$filter = array();
+
+		$filter['col_filter'] = $egwData;
+
+		if ($foundItems = $this->search($filter))
+		{
+			if (count($foundItems) > 0)
+			{
 				$itemIDs = array_keys($foundItems);
 				return $itemIDs[0];
 			}
@@ -262,46 +362,119 @@ class infolog_sif extends infolog_bo
 		return false;
 	}
 
-	function addSIF($_sifData, $_id, $_sifType) {
-		if(!$egwData = $this->siftoegw($_sifData, $_sifType)) {
-			return false;
-		}
+	/**
+	 * Add SIF data entry
+	 *
+	 * @param string $sifData		the SIF data
+	 * @param string $_sifType		type (note/task)
+	 * @param boolean $merge=false	reserved for future use
+	 * @return infolog_id of the new entry or false, for errors
+	 */
+	function addSIF($_sifData, $_id, $_sifType, $merge=false)
+	{
+		if (!($egwData = $this->siftoegw($_sifData, $_sifType))) return false;
 
-		if($_id > 0)
-			$egwData['info_id'] = $_id;
+		if ($_id > 0) $egwData['info_id'] = $_id;
+
+		if (empty($taskData['info_datecompleted']))
+		{
+			$taskData['info_datecompleted'] = 0;
+		}
 
 		$egwID = $this->write($egwData, false);
 
 		return $egwID;
 	}
 
-	function getSIF($_id, $_sifType) {
-		switch($_sifType) {
+
+	/**
+	 * Export an infolog entry as SIF data
+	 *
+	 * @param int $_id			the infolog_id of the entry
+	 * @param string $_sifType	type (note/task)
+	 * @return string SIF representation of the infolog entry
+	 */
+	function getSIF($_id, $_sifType)
+	{
+		$sysCharSet	= $GLOBALS['egw']->translation->charset();
+
+		switch($_sifType)
+		{
 			case 'task':
-				if($taskData = $this->read($_id)) {
-					$sysCharSet	= $GLOBALS['egw']->translation->charset();
-					$vcal		= new Horde_iCalendar;
+				if (($taskData = $this->read($_id)))
+				{
+					$vcal		= new Horde_iCalendar('1.0');
 
-					$sifTask = '<task>';
-
-					foreach($this->_sifTaskMapping as $sifField => $egwField)
+					if ($taskData['info_id_parent'])
 					{
-						if(empty($egwField)) continue;
+						$parent = $this->read($taskData['info_id_parent']);
+						$taskData['info_id_parent'] = $parent['info_uid'];
+					}
+					else
+					{
+						$taskData['info_id_parent'] = '';
+					}
+
+					if (!preg_match('/\[UID:.+\]/m', $taskData['info_des']))
+					{
+						$taskData['info_des'] .= "\r\n[UID:" . $taskData['info_uid'] . "]";
+						if ($taskData['info_id_parent'] != '')
+						{
+							$taskData['info_des'] .= "\r\n[PARENT_UID:" . $taskData['info_id_parent'] . "]";
+						}
+					}
+
+					$sifTask = self::xml_decl . "\n<task>" . self::SIF_decl;
+
+					foreach ($this->_sifTaskMapping as $sifField => $egwField)
+					{
+						if (empty($egwField)) continue;
 
 						$value = $GLOBALS['egw']->translation->convert($taskData[$egwField], $sysCharSet, 'utf-8');
 
-						switch($sifField) {
+						switch ($sifField)
+						{
+
+							case 'Complete':
+								// is handled with DateCompleted
+								break;
+
 							case 'DateCompleted':
-							case 'DueDate':
-							case 'StartDate':
-								if(!empty($value)) {
-									$value = $vcal->_exportDateTime($value);
+								if ($taskData[info_status] == 'done')
+								{
+									$sifTask .= "<Complete>1</Complete>";
+								}
+								else
+								{
+									$sifTask .= "<DateCompleted></DateCompleted><Complete>0</Complete>";
+									continue;
+								}
+							case 'DueDate':
+								if (!empty($value))
+								{
+									$hdate	= new Horde_Date($value);
+									$value = $vcal->_exportDate($hdate, '000000Z');
+									$sifTask .= "<$sifField>$value</$sifField>";
+								}
+								else
+								{
+									$sifTask .= "<$sifField></$sifField>";
+								}
+								break;
+							case 'StartDate':
+								if (!empty($value))
+								{
+									$value = $vcal->_exportDateTime($value);
+									$sifTask .= "<$sifField>$value</$sifField>";
+								}
+								else
+								{
+									$sifTask .= "<$sifField></$sifField>";
 								}
-								$sifTask .= "<$sifField>$value</$sifField>";
 								break;
 
 							case 'Importance':
-								if($value > 3) $value = 3;
+								if ($value > 3) $value = 3;
 								$sifTask .= "<$sifField>$value</$sifField>";
 								break;
 
@@ -311,20 +484,26 @@ class infolog_sif extends infolog_bo
 								break;
 
 							case 'Status':
-								switch($value) {
+								switch ($value)
+								{
 									case 'cancelled':
+									case 'deferred':
 										$value = '4';
 										break;
+									case 'waiting':
+									case 'nonactive':
+										$value = '3';
+										break;
 									case 'done':
+									case 'archive':
+									case 'billed':
 										$value = '2';
 										break;
 									case 'not-started':
+									case 'template':
 										$value = '0';
 										break;
-									case 'ongoing':
-										$value = '1';
-										break;
-									default:
+									default: //ongoing
 										$value = 1;
 										break;
 								}
@@ -332,102 +511,69 @@ class infolog_sif extends infolog_bo
 								break;
 
 							case 'Categories':
-								if (!empty($value))
+								if (!empty($value) && $value)
 								{
 									$value = implode('; ', $this->get_categories(array($value)));
 									$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
 								}
-								$sifTask .= "<$sifField>$value</$sifField>";
-								break;
+								else
+								{
+									break;
+								}
 
 							default:
+								$value = @htmlspecialchars($value, ENT_QUOTES, 'utf-8');
 								$sifTask .= "<$sifField>$value</$sifField>";
 								break;
 						}
 					}
-
-					$sifTask .= '<ActualWork>0</ActualWork><IsRecurring>0</IsRecurring>';
-					return base64_encode($sifTask);
-
-/*						return base64_encode("<task>
-					<ActualWork>0</ActualWork>
-					<BillingInformation></BillingInformation>
-					<Body></Body>
-					<Categories></Categories>
-					<Companies></Companies>
-					<Complete>0</Complete>
-					<DateCompleted></DateCompleted>
-					<DueDate></DueDate>
-					<Importance>1</Importance>
-					<IsRecurring>0</IsRecurring>
-					<Mileage></Mileage>
-					<PercentComplete>0</PercentComplete>
-					<ReminderSet>0</ReminderSet>
-					<ReminderTime></ReminderTime>
-					<Sensitivity>0</Sensitivity>
-					<StartDate>45001231T230000Z</StartDate>
-					<Status>3</Status>
-					<Subject>TARAAA3</Subject>
-					<TeamTask>0</TeamTask>
-					<TotalWork>0</TotalWork>
-					<RecurrenceType>1</RecurrenceType>
-					<Interval>1</Interval>
-					<MonthOfYear>0</MonthOfYear>
-					<DayOfMonth>0</DayOfMonth>
-					<DayOfWeekMask>4</DayOfWeekMask>
-					<Instance>0</Instance>
-					<PatternStartDate>20060320T230000Z</PatternStartDate>
-					<NoEndDate>1</NoEndDate>
-					<PatternEndDate></PatternEndDate>
-					<Occurrences>10</Occurrences>
-					</task>
-					"); */
+					$sifTask .= '<ActualWork>0</ActualWork><IsRecurring>0</IsRecurring></task>';
+					return $sifTask;
 				}
 				break;
 
 			case 'note':
-				if($taskData = $this->read($_id)) {
-					$sysCharSet	= $GLOBALS['egw']->translation->charset();
-					$vcal		= new Horde_iCalendar;
+				if (($taskData = $this->read($_id)))
+				{
+					$vcal		= new Horde_iCalendar('1.0');
 
-					$sifNote = '<note>';
+					$sifNote = self::xml_decl . "\n<note>" . self::SIF_decl;
 
-					foreach($this->_sifNoteMapping as $sifField => $egwField)
+					foreach ($this->_sifNoteMapping as $sifField => $egwField)
 					{
 						if(empty($egwField)) continue;
 
 						$value = $GLOBALS['egw']->translation->convert($taskData[$egwField], $sysCharSet, 'utf-8');
 
-						switch($sifField) {
+						switch ($sifField)
+						{
 							case 'Date':
-								if(!empty($value)) {
+								if (!empty($value))
+								{
 									$value = $vcal->_exportDateTime($value);
 								}
 								$sifNote .= "<$sifField>$value</$sifField>";
 								break;
 
-							case 'Body':
-								$value = $GLOBALS['egw']->translation->convert($taskData['info_subject'], $sysCharSet, 'utf-8') . "\n" . $value;
-								$sifNote .= "<$sifField>$value</$sifField>";
-								break;
-
 							case 'Categories':
 								if (!empty($value))
 								{
 									$value = implode('; ', $this->get_categories(array($value)));
 									$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
 								}
-								$sifNote .= "<$sifField>$value</$sifField>";
-								break;
-
+								else
+								{
+									break;
+								}
 
 							default:
+								$value = @htmlspecialchars($value, ENT_QUOTES, 'utf-8');
 								$sifNote .= "<$sifField>$value</$sifField>";
 								break;
 						}
 					}
-
-					return base64_encode($sifNote);
+					$sifNote .= '</note>';
+					return $sifNote;
 				}
 				break;
 
@@ -437,117 +583,35 @@ class infolog_sif extends infolog_bo
 
 	}
 
-	function exportVTODO($_taskID, $_version)
+	/**
+	* Set the supported fields
+	*
+	* Currently we only store name and version, manucfacturer is always Funambol
+	*
+	* @param string $_productName
+	* @param string $_productSoftwareVersion
+	*/
+	function setSupportedFields($_productName='', $_productSoftwareVersion='')
 	{
-		error_log(__METHOD__."called : $_version ,$_taskID");
-		$taskData = $this->read($_taskID);
+		$state = &$_SESSION['SyncML.state'];
+		$deviceInfo = $state->getClientDeviceInfo();
 
-		$taskData = $GLOBALS['egw']->translation->convert($taskData,$GLOBALS['egw']->translation->charset(),'UTF-8');
-
-		//_debug_array($taskData);
-
-		$taskGUID = $GLOBALS['phpgw']->common->generate_uid('infolog_task',$_taskID);
-
-		$vcal = new Horde_iCalendar;
-		$vcal->setAttribute('VERSION',$_version);
-		$vcal->setAttribute('METHOD','PUBLISH');
-
-		$vevent = Horde_iCalendar::newComponent('VTODO',$vcal);
-
-		$options = array();
-
-		$vevent->setAttribute('SUMMARY',$taskData['info_subject']);
-		$vevent->setAttribute('DESCRIPTION',$taskData['info_des']);
-		if($taskData['info_startdate'])
-			$vevent->setAttribute('DTSTART',$taskData['info_startdate']);
-		if($taskData['info_enddate'])
-			$vevent->setAttribute('DUE',$taskData['info_enddate']);
-		$vevent->setAttribute('DTSTAMP',time());
-		$vevent->setAttribute('CREATED',$GLOBALS['phpgw']->contenthistory->getTSforAction('infolog_task',$_taskID,'add'));
-		$vevent->setAttribute('LAST-MODIFIED',$GLOBALS['phpgw']->contenthistory->getTSforAction('infolog_task',$_taskID,'modify'));
-		$vevent->setAttribute('UID',$taskGUID);
-		$vevent->setAttribute('CLASS',(($taskData['info_access'] == 'public')?'PUBLIC':'PRIVATE'));
-		$vevent->setAttribute('STATUS',(($taskData['info_status'] == 'completed')?'COMPLETED':'NEEDS-ACTION'));
-		// 3=urgent => 1, 2=high => 2, 1=normal => 3, 0=low => 4
-		$vevent->setAttribute('PRIORITY',4-$taskData['info_priority']);
-
-		#$vevent->setAttribute('TRANSP','OPAQUE');
-		# status
-		# ATTENDEE
-
-		$options = array('CHARSET' => 'UTF-8','ENCODING' => 'QUOTED-PRINTABLE');
-		$vevent->setParameter('SUMMARY', $options);
-		$vevent->setParameter('DESCRIPTION', $options);
-
-		$vcal->addComponent($vevent);
-
-		#print "<pre>";
-		#print $vcal->exportvCalendar();
-		#print "</pre>";
-
-		return $vcal->exportvCalendar();
-	}
-
-	function importVTODO(&$_vcalData, $_taskID=-1)
-	{
-		$botranslation  = CreateObject('phpgwapi.translation');
-
-		$vcal = new Horde_iCalendar;
-		if(!$vcal->parsevCalendar($_vcalData))
+		if (isset($deviceInfo) && is_array($deviceInfo))
 		{
-			return FALSE;
-		}
-		$components = $vcal->getComponents();
-		if(count($components) > 0)
-		{
-			$component = $components[0];
-			if(is_a($component, 'Horde_iCalendar_vtodo'))
+			if (isset($deviceInfo['uidExtension']) &&
+				$deviceInfo['uidExtension'])
 			{
-				if($_taskID>0)
-					$taskData['info_id'] = $_taskID;
-
-				foreach($component->_attributes as $attributes)
-				{
-					#print $attributes['name'].' - '.$attributes['value'].'<br>';
-					#$attributes['value'] = $GLOBALS['egw']->translation->convert($attributes['value'],'UTF-8');
-					switch($attributes['name'])
-					{
-						case 'CLASS':
-							$taskData['info_access']		= strtolower($attributes['value']);
-							break;
-						case 'DESCRIPTION':
-							$taskData['info_des']			= $attributes['value'];
-							break;
-						case 'DUE':
-							$taskData['info_enddate']		= $attributes['value'];
-							break;
-						case 'DTSTART':
-							$taskData['info_startdate']		= $attributes['value'];
-							break;
-						case 'PRIORITY':
-							// 1 => 3=urgent, 2 => 2=high, 3 => 1=normal, 4 => 0=low
-							if (1 <= $attributes['value'] && $attributes['value'] <= 4)
-							{
-								$taskData['info_priority']	= 4 - $attributes['value'];
-							}
-							else
-							{
-								$taskData['info_priority']	= 1;	// default = normal
-							}
-							break;
-						case 'STATUS':
-							$taskData['info_status']		= (strtolower($attributes['value']) == 'completed') ? 'done' : 'ongoing';
-							break;
-						case 'SUMMARY':
-							$taskData['info_subject']		= $attributes['value'];
-							break;
-					}
-				}
-				#_debug_array($eventData);exit;
-				return $this->write($taskData);
+					$this->uidExtension = true;
+			}
+		}
+		// store product name and version, to be able to use it elsewhere
+		if ($_productName)
+		{
+			$this->productName = strtolower($_productName);
+			if (preg_match('/^[^\d]*(\d+\.?\d*)[\.|\d]*$/', $_productSoftwareVersion, $matches))
+			{
+				$this->productSoftwareVersion = $matches[1];
 			}
 		}
-
-		return FALSE;
 	}
 }
diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index 56fd37819b..8c79ac7530 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -344,6 +344,12 @@ class infolog_so
 	 */
 	function read($info_id)		// did _not_ ensure ACL
 	{
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		} else {
+			$minimum_uid_length = 8;
+		}
+
 		//echo "<p>read($info_id) ".function_backtrace()."</p>\n";
 		if ($info_id && ((int)$info_id == $this->data['info_id'] || $info_id == $this->data['info_uid']))
 		{
@@ -356,6 +362,14 @@ class infolog_so
 			$this->init( );
 			return False;
 		}
+		if (!$this->data['info_uid'] || strlen($this->data['info_uid']) < $minimum_uid_length) {
+		// entry without uid --> create one based on our info_id and save it
+
+			$this->data['info_uid'] = $GLOBALS['egw']->common->generate_uid('infolog', $info_id);
+			$this->db->update($this->info_table,
+				array('info_uid' => $this->data['info_uid']),
+				array('info_id' => $this->data['info_id']), __LINE__,__FILE__);
+		}
 		if (!is_array($this->data['info_responsible']))
 		{
 			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',',$this->data['info_responsible']) : array();
@@ -499,6 +513,12 @@ class infolog_so
 	 */
 	function write($values,$check_modified=0)  // did _not_ ensure ACL
 	{
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		} else {
+			$minimum_uid_length = 8;
+		}
+
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
 		$info_id = (int) $values['info_id'];
 
@@ -540,12 +560,17 @@ class infolog_so
 			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
 			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
 
-			if (!$this->data['info_uid'])		// new entry without uid --> create one based on our info_id and save it
-			{
-				$this->data['info_uid'] = $GLOBALS['egw']->common->generate_uid('infolog',$info_id);
-				$this->db->update($this->info_table,array('info_uid'=>$this->data['info_uid']),array('info_id'=>$info_id),__LINE__,__FILE__);
-			}
 		}
+
+		if (!$this->data['info_uid'] || strlen($this->data['info_uid']) < $minimum_uid_length) {
+			// entry without uid --> create one based on our info_id and save it
+
+			$this->data['info_uid'] = $GLOBALS['egw']->common->generate_uid('infolog', $info_id);
+			$this->db->update($this->info_table,
+				array('info_uid' => $this->data['info_uid']),
+				array('info_id' => $info_id), __LINE__,__FILE__);
+		}
+
 		//echo "<p>soinfolog.write values= "; _debug_array($values);
 
 		// write customfields now
@@ -775,6 +800,7 @@ class infolog_so
 		if ($action == '' || $action == 'sp' || count($links))
 		{
 			$sql_query = "FROM $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
+			#error_log("infolog.so.search:\n" . print_r($sql_query, true));
 
 			if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 			{
diff --git a/infolog/inc/class.infolog_tracking.inc.php b/infolog/inc/class.infolog_tracking.inc.php
index 7871b58026..16d21a0256 100644
--- a/infolog/inc/class.infolog_tracking.inc.php
+++ b/infolog/inc/class.infolog_tracking.inc.php
@@ -186,6 +186,7 @@ class infolog_tracking extends bo_tracking
 	 */
 	function get_details($data)
 	{
+		$header_done = false;
 		$responsible = array();
 		if ($data['info_responsible'])
 		{
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index eae3c2cc03..2784470fe5 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -654,6 +654,7 @@ class infolog_ui
 	 *
 	 * @param int|array $values=0 info_id (default _GET[info_id])
 	 * @param string $referer=''
+	 * @param boolean $closesingle=false
 	 */
 	function close($values=0,$referer='',$closesingle=false)
 	{
@@ -973,6 +974,7 @@ class infolog_ui
 				}
 				$parent = $this->bo->so->data;
 				$content['info_id'] = $info_id = 0;
+				$content['info_uid'] = ''; // ensure that we have our own UID
 				$content['info_owner'] = $this->user;
 				$content['info_id_parent'] = $parent['info_id'];
 				/*
@@ -1432,7 +1434,6 @@ class infolog_ui
 						#continue;
 					}
 					$message .= $bofelamimail->wordwrap($value,75,"\n");
-					#$message .= $bodyAppend;
 				}
 			}
 

From cb0fc5db82d96d2ba40df3621dad727b14aa00b3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Jul 2009 20:35:56 +0000
Subject: [PATCH 480/510] - merged SyncML-1.2 branch with trunk: svn merge -r
 26935:HEAD ^/branches/SyncML-1.2/calendar . - with the exception of
 class.calendar_uiforms.inc.php,   as it was not updated with the latest
 changes from trunk   and I'm not sure about the changes --> needs further
 discussion, sorry :-( svn revert inc/class.calendar_uiforms.inc.php

---
 calendar/inc/class.calendar_bo.inc.php       |   37 +-
 calendar/inc/class.calendar_boupdate.inc.php |  126 +-
 calendar/inc/class.calendar_ical.inc.php     | 2377 ++++++++++--------
 calendar/inc/class.calendar_sif.inc.php      |  217 +-
 calendar/inc/class.calendar_so.inc.php       |  292 ++-
 5 files changed, 1908 insertions(+), 1141 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 4fdcfb695c..933acf834f 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -5,6 +5,7 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @copyright (c) 2004-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
@@ -134,6 +135,7 @@ class calendar_bo
 	 */
 	protected static $cached_event = array();
 	protected static $cached_event_date_format = false;
+	protected static $cached_event_date = 0;
 	/**
 	 * @var array $cached_holidays holidays plus birthdays (gets cached in the session for performance reasons)
 	 */
@@ -570,9 +572,17 @@ class calendar_bo
 
 		$events = array();
 		$this->insert_all_repetitions($event,$start,$this->date2ts($this->config['horizont'],true),$events,null);
-
+		$days = $this->so->get_recurrence_exceptions($event);
+		$days = is_array($days) ? $days : array();
+		//error_log('set_recurrences: days' . print_r($days, true) );
 		foreach($events as $event)
 		{
+			//error_log('set_recurrences: start = ' . $event['start'] );
+			if (in_array($event['start'], $days))
+			{
+				// we don't change the stati of recurrence exceptions
+				$event['participants'] = array();
+			}
 			$this->so->recurrence($event['id'],$this->date2ts($event['start'],true),$this->date2ts($event['end'],true),$event['participants']);
 		}
 	}
@@ -657,8 +667,8 @@ class calendar_bo
 		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms(EGW_ACL_READ,$ids,0,$date_format,$date)))
 		{
 			if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
-			self::$cached_event_date_format != $date_format ||
-			self::$cached_event['recur_type'] != MCAL_RECUR_NONE && !is_null($date) && (!$date || self::$cached_event['start'] < $date))
+				self::$cached_event_date_format != $date_format ||
+				self::$cached_event['recur_type'] != MCAL_RECUR_NONE && !is_null($date) && self::$cached_event_date != $date || (!$date || self::$cached_event['start'] < $date))
 			{
 				$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0);
 
@@ -674,6 +684,7 @@ class calendar_bo
 					{
 						self::$cached_event = array_shift($events);
 						self::$cached_event_date_format = $date_format;
+						self::$cached_event_date = $date;
 						$return =& self::$cached_event;
 					}
 				}
@@ -753,6 +764,8 @@ class calendar_bo
 		{
 			$search_date_ymd = (int)$this->date2string($ts);
 
+			//error_log('insert_all_repetitions search_date = ' . $search_date_ymd . ' => ' . print_r($recur_exceptions, true));
+
 			$have_exception = !is_null($recur_exceptions) && isset($recur_exceptions[$search_date_ymd]);
 
 			if (!$have_exception)	// no execption by an edited event => check the deleted ones
@@ -928,7 +941,7 @@ class calendar_bo
 		{
 			if (is_numeric($uid))
 			{
-					$info = array(
+				$info = array(
 					'res_id'    => $uid,
 					'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
 					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
@@ -1840,4 +1853,20 @@ class calendar_bo
 			$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.urlencode($user).
 			($pw ? '&password='.urlencode($pw) : '');
 	}
+
+	/**
+	 * Check if the event is the whole day
+	 *
+	 * @param event
+	 * @return boolean true for whole day events
+	 */
+	function isWholeDay($event)
+	{
+		// check if the event is the whole day
+			$start = $this->date2array($event['start']);
+			$end = $this->date2array($event['end']);
+			$result = (!$start['hour'] && !$start['minute']
+				&& $end['hour'] == 23 && $end['minute'] == 59);
+			return $result;
+	}
 }
diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index cf1c578c84..eba25745da 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -5,6 +5,7 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @copyright (c) 2005-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
@@ -73,7 +74,7 @@ class calendar_boupdate extends calendar_bo
 	 * @param array &$event event-array, on return some values might be changed due to set defaults
 	 * @param boolean $ignore_conflicts=false just ignore conflicts or do a conflict check and return the conflicting events
 	 * @param boolean $touch_modified=true touch modificatin time and set modifing user, default true=yes
-	 * @param boolean $ignore_acl=flase should we ignore the acl
+	 * @param boolean $ignore_acl=false should we ignore the acl
 	 * @return mixed on success: int $cal_id > 0, on error false or array with conflicting events (only if $check_conflicts)
 	 * 		Please note: the events are not garantied to be readable by the user (no read grant or private)!
 	 */
@@ -256,7 +257,7 @@ class calendar_boupdate extends calendar_bo
 		//echo "saving $event[id]="; _debug_array($event);
 		$event2save = $event;
 
-		if (!($cal_id = $this->save($event)))
+		if (!($cal_id = $this->save($event, $ignore_acl)))
 		{
 			return $cal_id;
 		}
@@ -572,7 +573,7 @@ class calendar_boupdate extends calendar_bo
 						break;
 
 					case  'ical':
-						$ics = ExecMethod2('calendar.calendar_ical.exportVCal',$event['id'],'2.0',$method,false);
+						$ics = ExecMethod2('calendar.calendar_ical.exportVCal',$event['id'],'2.0',$method);
 						if ($method == 'REQUEST')
 						{
 							$attachment = array(	'string' => $ics,
@@ -666,15 +667,16 @@ class calendar_boupdate extends calendar_bo
 	 * This methode converts from user to server time and handles the insertion of users and dates of repeating events
 	 *
 	 * @param array $event
+	 * @param boolean $ignore_acl=false should we ignore the acl
 	 * @return int/boolean $cal_id > 0 or false on error (eg. permission denied)
 	 */
-	function save($event)
+	function save($event, $ignore_acl=false)
 	{
 		//error_log(__METHOD__."(".str_replace(array("\n",'    '),'',print_r($event,true)).",$etag)");
 		// check if user has the permission to update / create the event
-		if ($event['id'] && !$this->check_perms(EGW_ACL_EDIT,$event['id']) ||
+		if (!$ignore_acl && ($event['id'] && !$this->check_perms(EGW_ACL_EDIT,$event['id']) ||
 			!$event['id'] && !$this->check_perms(EGW_ACL_EDIT,0,$event['owner']) &&
-			!$this->check_perms(EGW_ACL_ADD,0,$event['owner']))
+			!$this->check_perms(EGW_ACL_ADD,0,$event['owner'])))
 		{
 			return false;
 		}
@@ -705,10 +707,11 @@ class calendar_boupdate extends calendar_bo
 				$event['alarm'][$id]['time'] = $this->date2ts($alarm['time'],true);
 			}
 		}
-		if (($cal_id = $this->so->save($event,$set_recurrences,NULL,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
+		$set_recurrences = false;
+		if (($cal_id = $this->so->save($event,$set_recurrences,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
 		{
 			$save_event['id'] = $cal_id;
-			$this->set_recurrences($save_event);
+			$this->set_recurrences($save_event, 0);
 		}
 		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,$event['id'] ? 'modify' : 'add',time());
 
@@ -749,13 +752,14 @@ class calendar_boupdate extends calendar_bo
 	 * @param string/int $uid account_id or 1-char type-identifer plus id (eg. c15 for addressbook entry #15)
 	 * @param int/char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
 	 * @param int $recur_date=0 date to change, or 0 = all since now
+	 * @param boolean $ignore_acl=false do not check the permisions for the $uid, if true
 	 * @return int number of changed recurrences
 	 */
-	function set_status($event,$uid,$status,$recur_date=0)
+	function set_status($event,$uid,$status,$recur_date=0, $ignore_acl=false)
 	{
 		$cal_id = is_array($event) ? $event['id'] : $event;
 		//echo "<p>bocalupdate::set_status($cal_id,$uid,$status,$recur_date)</p>\n";
-		if (!$cal_id || !$this->check_status_perms($uid,$event))
+		if (!$cal_id || (!$ignore_acl && !$this->check_status_perms($uid,$event)))
 		{
 			return false;
 		}
@@ -1006,7 +1010,9 @@ class calendar_boupdate extends calendar_bo
 		}
 		$alarm['time'] = $this->date2ts($alarm['time'],true);	// user to server-time
 
-		return $this->so->save_alarm($cal_id,$alarm);
+		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id, 'modify', time());
+
+		return $this->so->save_alarm($cal_id,$alarm, $this->now_su);
 	}
 
 	/**
@@ -1023,7 +1029,10 @@ class calendar_boupdate extends calendar_bo
 		{
 			return false;	// no rights to delete the alarm
 		}
-		return $this->so->delete_alarm($id);
+
+		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id, 'modify', time());
+
+		return $this->so->delete_alarm($id, $this->now_su);
 	}
 
 	var $categories;
@@ -1046,7 +1055,7 @@ class calendar_boupdate extends calendar_bo
 				{
 					$cat_name = substr($cat_name, 2);
 				}
-				$cat_id = $this->categories->add(array('name' => $cat_name,'descr' => $cat_name));
+				$cat_id = $this->categories->add(array('name' => $cat_name, 'descr' => $cat_name, 'access' => 'private'));
 			}
 
 			if ($cat_id)
@@ -1086,4 +1095,95 @@ class calendar_boupdate extends calendar_bo
 
 		return $cat_list;
 	}
+
+	/**
+	 * Try to find a matching db entry
+	 *
+	 * @param array $event	the vCalendar data we try to find
+	 * @param boolean $relax=false if asked to relax, we only match against some key fields
+	 * @return the calendar_id of the matching entry or false (if none matches)
+	 */
+	function find_event($event, $relax=false)
+	{
+		if ($event['uid'] && ($uidmatch = $this->read($event['uid'])))
+		{
+			if ($event['reference']
+				&& ($egw_event = $this->read($uidmatch['id'], $event['reference'])))
+			{
+				// Do we work with a "status only" exception here?
+				$match = true;
+				foreach (array('start','end','title','description','priority',
+						'location','public','non_blocking') as $name)
+				{
+					if (isset($event[$name])
+						&& $event[$name] != $egw_event[$name])
+					{
+						$match = false;
+						break;
+					}
+				}
+				if ($match)
+				{
+					//return ($uidmatch['id'] . ':' . $event['reference']);
+					foreach ($event['participants'] as $attendee => $status)
+					{
+						if (!isset($egw_event['participants'][$attendee])
+							|| $egw_event['participants'][$attendee] != $status)
+						{
+							$match = false;
+							break;
+						}
+						else
+						{
+							unset($egw_event['participants'][$attendee]);
+						}
+					}
+					if ($match && !empty($egw_event['participants'])) $match = false;
+				}
+				if ($match)	return ($uidmatch['id'] . ':' . $event['reference']);
+
+				return false; // We need to create a new "status only" exception
+			}
+			else
+			{
+				return $uidmatch['id'];
+			}
+		}
+
+		if ($event['id'] && ($found = $this->read($event['id'])))
+		{
+			// We only do a simple consistency check
+			if ($found['title'] == $event['title']
+				&& $found['start'] == $event['start']
+				&& $found['end'] == $event['end'])
+				{
+					return $found['id'];
+				}
+		}
+		unset($event['id']);
+
+		$query = array(
+			'cal_start='.$event['start'],
+			'cal_end='.$event['end'],
+		);
+
+		#foreach(array('title','location','priority','public','non_blocking','category') as $name) {
+		foreach (array('title','location','public','non_blocking','category') as $name)
+		{
+			if (!empty($event[$name])) $query['cal_'.$name] = $event[$name];
+		}
+
+		if($foundEvents = parent::search(array(
+			//'user'  => $this->user,
+			'query' => $query,
+		)))
+		{
+			if(is_array($foundEvents))
+			{
+				$event = array_shift($foundEvents);
+				return $event['id'];
+			}
+		}
+		return false;
+	}
 }
diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 2eb8a5a962..c1bc53e8fe 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -5,13 +5,14 @@
  * @link http://www.egroupware.org
  * @author Lars Kneschke <lkneschke@egroupware.org>
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package calendar
  * @subpackage export
  * @version $Id$
  */
 
-require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php';
+require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/lib/core.php';
 
 /**
  * iCal import and export via Horde iCalendar classes
@@ -47,13 +48,14 @@ class calendar_ical extends calendar_boupdate
 	 */
 	var $status_ical2egw = array(
 		'NEEDS-ACTION' => 'U',
+		'NEEDS ACTION' => 'U',
 		'ACCEPTED'     => 'A',
 		'DECLINED'     => 'R',
 		'TENTATIVE'    => 'T',
 	);
 
 	/**
-	 * @var array $status_ical2egw conversation of the priority egw => ical
+	 * @var array $status_ical2egw conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
 		0 => 0,		// undefined
@@ -61,14 +63,15 @@ class calendar_ical extends calendar_boupdate
 		2 => 5,		// normal
 		3 => 1,		// high
 	);
+
 	/**
-	 * @var array $status_ical2egw conversation of the priority ical => egw
+	 * @var array $status_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
 		0 => 0,		// undefined
 		9 => 1,	8 => 1, 7 => 1, 6 => 1,	// low
 		5 => 2,		// normal
-		4 => 3, 2 => 3, 3 => 3, 1 => 3,	// high
+		4 => 3, 3 => 3, 2 => 3, 1 => 3,	// high
 	);
 
 	/**
@@ -101,17 +104,60 @@ class calendar_ical extends calendar_boupdate
 	var $productManufacturer = 'file';
 	var $productName = '';
 
+	/**
+	 * user preference: import all-day events as non blocking
+	 *
+	 * @var boolean
+	 */
+	var $nonBlockingAllday = false;
+
+	/**
+	 * user preference: attach UID entries to the DESCRIPTION
+	 *
+	 * @var boolean
+	 */
+	var $uidExtension = false;
+
+	/**
+	 * Device CTCap Properties
+	 *
+	 * @var array
+	 */
+	var $clientProperties;
+
+	/**
+	 * vCalendar Instance for parsing
+	 *
+	 * @var array
+	 */
+	var $vCalendar;
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $_clientProperties		client properties
+	 */
+	function __construct(&$_clientProperties = array()) {
+		parent::__construct();
+
+		$this->clientProperties = $_clientProperties;
+		$this->vCalendar = new Horde_iCalendar;
+	}
+
+
 	/**
 	 * Exports one calendar event to an iCalendar item
 	 *
 	 * @param int/array $events (array of) cal_id or array of the events
 	 * @param string $version='1.0' could be '2.0' too
 	 * @param string $method='PUBLISH'
+	 * @param int $recur_date=0	if set export the next recurrance at or after the timestamp,
+	 *                          	default 0 => export whole series (or events, if not recurring)
 	 * @return string/boolean string with iCal or false on error (eg. no permission to read the event)
 	 */
-	function &exportVCal($events,$version='1.0', $method='PUBLISH')
+	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0)
 	{
-	//	error_log(__FILE__ . __METHOD__ ."exportVCal is called ");
+		// error_log(__FILE__ . __METHOD__ ."exportVCal is called ");
 		$egwSupportedFields = array(
 			'CLASS'			=> array('dbName' => 'public'),
 			'SUMMARY'		=> array('dbName' => 'title'),
@@ -126,39 +172,50 @@ class calendar_ical extends calendar_boupdate
 			'PRIORITY'		=> array('dbName' => 'priority'),
 			'TRANSP'		=> array('dbName' => 'non_blocking'),
 			'CATEGORIES'	=> array('dbName' => 'category'),
+			'UID'			=> array('dbName' => 'uid'),
+			'RECURRENCE-ID' => array('dbName' => 'reference'),
 		);
-		if(!is_array($this->supportedFields))
-		{
-			$this->setSupportedFields();
-		}
 
-		if($this->productManufacturer == '' )
+		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+
+		if ($this->productManufacturer == '' )
 		{	// syncevolution is broken
-			$version = "2.0";
+			$version = '2.0';
 		}
 
-		$palm_enddate_workaround=False;
-		if($this->productManufacturer == 'Synthesis AG'
-			&& strpos($this->productName, "PalmOS") )
+		$servertime = false;
+		$date_format = 'server';
+		if (strpos($this->productName, "palmos") )
 		{
-			// This workaround adds 1 day to the recur_enddate if it exists, to fix a palm bug
-			$palm_enddate_workaround=True;
+			$servertime = true;
+			$date_format = 'ts';
 		}
 
 		$vcal = new Horde_iCalendar;
 		$vcal->setAttribute('PRODID','-//eGroupWare//NONSGML eGroupWare Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
-		$vcal->setAttribute('VERSION',$version);
-		$vcal->setAttribute('METHOD',$method);
+		$vcal->setAttribute('VERSION', $version);
+		$vcal->setAttribute('METHOD', $method);
 
 		if (!is_array($events)) $events = array($events);
 
-		foreach($events as $event)
+		while ($event = array_pop($events))
 		{
-			if (!is_array($event) && !($event = $this->read($event,null,false,'server')))	// server = timestamp in server-time(!)
+			if (!is_array($event)
+				&& !($event = $this->read($event, $recur_date, false, $date_format)))
 			{
+				// server = timestamp in server-time(!)
 				return false;	// no permission to read $cal_id
 			}
+			if ($recur_date)
+			{
+				// force single event
+				foreach (array('recur_enddate','recur_interval','recur_exception','recur_data','recur_date','id','etag') as $name)
+				{
+					unset($event[$name]);
+				}
+				$event['recur_type'] = MCAL_RECUR_NONE;
+			}
 			//_debug_array($event);
 
 			// correct daylight saving time
@@ -171,13 +228,31 @@ class calendar_ical extends calendar_boupdate
 			$event['end']	= $event['end'] + $DSTCorrection;
 			*/
 
-			$vevent = Horde_iCalendar::newComponent('VEVENT',$vcal);
-			$parameters = $attributes = array();
+			if ($this->productManufacturer != 'file'
+				&& $this->uidExtension) {
+				// Append UID to DESCRIPTION
+				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
+					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+				}
+			}
+
+			$vevent = Horde_iCalendar::newComponent('VEVENT', $vcal);
+			$parameters = $attributes = $values = array();
+
+			if ($this->productManufacturer == 'sonyericsson')
+			{
+				$eventDST = date('I', $event['start']);
+				if ($eventDST)
+				{
+					$attributes['X-SONYERICSSON-DST'] = 4;
+				}
+			}
 
 			foreach($egwSupportedFields as $icalFieldName => $egwFieldInfo)
 			{
-				if($this->supportedFields[$egwFieldInfo['dbName']])
+				if ($this->supportedFields[$egwFieldInfo['dbName']])
 				{
+					$values[$icalFieldName] = array();
 					switch($icalFieldName)
 					{
 						case 'ATTENDEE':
@@ -185,6 +260,7 @@ class calendar_ical extends calendar_boupdate
 							foreach((array)$event['participants'] as $uid => $status)
 							{
 								if (!($info = $this->resource_info($uid))) continue;
+								if ($uid == $event['owner']) continue; // Organizer
 								// RB: MAILTO href contains only the email-address, NO cn!
 								$attributes['ATTENDEE'][]	= $info['email'] ? 'MAILTO:'.$info['email'] : '';
 								// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT} NOT used by eGW atm.
@@ -221,53 +297,40 @@ class calendar_ical extends calendar_boupdate
 							}
 							break;
 
-            			case 'CLASS':
-            				$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
-    	    				break;
+            				case 'CLASS':
+            					$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'CONFIDENTIAL';
+    	    					break;
 
         				case 'ORGANIZER':	// according to iCalendar standard, ORGANIZER not used for events in the own calendar
         					//if ($event['owner'] != $this->user)
-        					if (!isset($event['participants'][$event['owner']]) || count($event['participants']) > 1)
-        					{
+        					//if (!isset($event['participants'][$event['owner']]) || count($event['participants']) > 1)
+        					//{
 								$mailtoOrganizer = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
 								$attributes['ORGANIZER'] = $mailtoOrganizer ? 'MAILTO:'.$mailtoOrganizer : '';
 								$parameters['ORGANIZER']['CN'] = '"'.trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname').' '.
 									$GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')).'"';
-        					}
+        					//}
+							break;
+
+						case 'DTSTART':
+							if ($servertime)
+							{
+								$attributes['DTSTART'] = date('Ymd\THis', $event['start']);
+							}
+							else
+							{
+								$attributes['DTSTART'] = $event['start'];
+							}
 							break;
 
 						case 'DTEND':
 							// write start + end of whole day events as dates
-							//  $event['end'] += 12*3600;
-                            // we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
-                            //njv: This appears to be another urban myth misinterpretation 20090220
-
-							 /*
-                            DTSTART;VALUE=DATE:20090317 implies 000000Z
-                            DTEND;VALUE=DATE:20090317 implies 235959Z
-                            And DEFINES an ALLDAY event
-                            and as such is "inclusive"
-                            some clients(Lightning, Korganiser?) use "exclusive"
-                            Legacy: EGW held 235900 As DTEND allday, such entries in databases will exist
-                            EGW is internally correct on 235959 "inclusive"
-                            */
-							// Whats in DTSTART/DTEND	
-							//error_log(__FILE__ . __METHOD__. "\nDTSTART:". print_r($event['start'],true)."\nDTEND:".print_r($event['end'],true));
-							//Lets do it right first:
- 							//If (YMD DTSTART == YMD DTEND) and (His DTSTART == 00:00:00 )and (His DTEND in 235900 or 235959) then we are oneday allday return YMD DTSTART DTEND
-							//if (YMD DTSTART <= YMD DTEND) and (HIS DTSTART == 00:00:00) (His DTEND in 235900 or 235959) then we are all day or allday multiday ending in an allday return DTG DTSTART and DTEND
-							//error_log(__FILE__ . __METHOD__ ." :$this->productManufacturer :$this->productName" ); 
-							// returns "GroupDAV" "kde"
-								
-							if (date('H:i:s',$event['start']) == '00:00:00' && in_array(date('H:i:s',$event['end']),array('23:59:59','23:59:00')))
+							if ($this->isWholeDay($event))
 							{
-								//if kde or lightning increase dtend by 24 hours? 86400 secs
-								if($this->productName == "kde" || $this->productName == "lightning"){
-								$event['end'] += 86400;
-								}
-								foreach(array('start' => 'DTSTART','end' => 'DTEND') as $f => $t)
+								$event['end-nextday'] = $event['end'] + 12*3600;	// we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+								foreach(array('start' => 'DTSTART','end-nextday' => 'DTEND') as $f => $t)
 								{
-									$arr = calendar_bo::date2array($event[$f]);
+									$arr = $this->date2array($event[$f]);
 									$vevent->setAttribute($t, array('year' => $arr['year'],'month' => $arr['month'],'mday' => $arr['day']),
 										array('VALUE' => 'DATE'));
 								}
@@ -275,7 +338,14 @@ class calendar_ical extends calendar_boupdate
 							}
 							else
 							{
-								$attributes['DTEND']	= $event['end'];
+								if ($servertime)
+								{
+									$attributes['DTEND'] = date('Ymd\THis', $event['end']);
+								}
+								else
+								{
+									$attributes['DTEND'] = $event['end'];
+								}
 							}
 							break;
 
@@ -309,12 +379,15 @@ class calendar_ical extends calendar_boupdate
 								if ($event['recur_enddate'])
 								{
 									$recur_enddate = (int)$event['recur_enddate'];
-									if ($palm_enddate_workaround)
+									$recur_enddate += 24 * 60 * 60 - 1;
+									if ($servertime)
 									{
-										$recur_enddate += 86400;
+										$rrule['UNTIL'] = date('Ymd\THis', $recur_enddate);
+									}
+									else
+									{
+										$rrule['UNTIL'] = $vcal->_exportDateTime($recur_enddate);
 									}
-									# append T and the Endtime, since the RRULE seems not to be understood by the client without it
-									$rrule['UNTIL'] = date('Ymd',$recur_enddate).'T'.date('His',($event['end']?$event['end']:$event['start'])) ;
 								}
 								else
 								{
@@ -344,9 +417,31 @@ class calendar_ical extends calendar_boupdate
 												strtoupper(substr(date('l',$event['start']),0,2));
 										break;
 								}
-								if ($event['recur_interval'] > 1) $rrule['INTERVAL'] = $event['recur_interval'];
-								if ($event['recur_enddate']) $rrule['UNTIL'] = date('Ymd',$event['recur_enddate']);	// only day is set in eGW
-
+								if ($event['recur_interval'] > 1)
+								{
+									$rrule['INTERVAL'] = $event['recur_interval'];
+								}
+								if ($event['recur_enddate'])
+								{
+									// We use end of day in vCal
+									$recur_enddate = (int)$event['recur_enddate'];
+									$recur_enddate += 24 * 60 * 60 - 1;
+									if ($this->isWholeDay($event))
+									{
+										$rrule['UNTIL'] = date('Ymd', $recur_enddate);
+									}
+									else
+									{
+										if ($servertime)
+										{
+											$rrule['UNTIL'] = date('Ymd\THis', $recur_enddate);
+										}
+										else
+										{
+											$rrule['UNTIL'] = $vcal->_exportDateTime($recur_enddate);
+										}
+									}
+								}
 								// no idea how to get the Horde parser to produce a standard conformant
 								// RRULE:FREQ=... (note the double colon after RRULE, we cant use the $parameter array)
 								// so we create one value manual ;-)
@@ -359,15 +454,69 @@ class calendar_ical extends calendar_boupdate
 							break;
 
 						case 'EXDATE':
-							if ($event['recur_exception'])
+							if ($event['recur_type'] == MCAL_RECUR_NONE) break;
+							$days = array();
+							$participants = $this->so->get_participants($event['id'], 0);
+
+							// Check if the stati for all participants are identical for all recurrences
+							foreach ($participants as $uid => $attendee)
 							{
-								$days = array();
-								foreach($event['recur_exception'] as $day)
+								switch ($attendee['type'])
 								{
-									$days[] = date('Ymd',$day);
+									case 'u':	// account
+									case 'c':	// contact
+									case 'e':	// email address
+										$recurrences = $this->so->get_recurrences($event['id'], $uid);
+										foreach ($recurrences as $rdate => $recur_status)
+										{
+											if ($rdate && $recur_status != $recurrences[0])
+											{
+												// Every distinct status results in an exception
+												$days[] = $rdate;
+											}
+										}
+										break;
+									default: // We don't handle the rest
+										break;
 								}
-								$attributes['EXDATE'] = implode(',',$days);
-								$parameters['EXDATE']['VALUE'] = 'DATE';
+							}
+							if (is_array($event['recur_exception']))
+							{
+								$days = $days + $event['recur_exception'];
+							}
+							if (!empty($days))
+							{
+								$days = array_unique($days);
+								sort($days);
+								// use 'DATE' instead of 'DATE-TIME' on whole day events
+								if ($this->isWholeDay($event))
+								{
+									$value_type = 'DATE';
+									foreach($days as $id => $timestamp)
+									{
+										$arr = $this->date2array($timestamp);
+										$days[$id] = array(
+											'year'  => $arr['year'],
+											'month' => $arr['month'],
+											'mday'  => $arr['day'],
+										);
+									}
+								}
+								else
+								{
+									$value_type = 'DATE-TIME';
+									if ($servertime)
+									{
+										foreach($days as $id => $timestamp)
+										{
+											$days[$id] = date('Ymd\THis', $timestamp);
+
+										}
+									}
+								}
+								$attributes['EXDATE'] = '';
+								$values['EXDATE'] = $days;
+								$parameters['EXDATE']['VALUE'] = $value_type;
 							}
 							break;
 
@@ -377,30 +526,104 @@ class calendar_ical extends calendar_boupdate
 
  						case 'TRANSP':
 							if ($version == '1.0') {
-								$attributes['TRANSP'] = $event['non_blocking'] ? 1 : 0;
+								$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
 							} else {
-								$attributes['TRANSP'] = $event['non_blocking'] ? 'TRANSPARENT' : 'OPAQUE';
+								$attributes['TRANSP'] = ($event['non_blocking'] ? 'TRANSPARENT' : 'OPAQUE');
 							}
 							break;
 
 						case 'CATEGORIES':
 							if ($event['category'])
 							{
-								$attributes['CATEGORIES'] = implode(',',$this->get_categories($event['category']));
+								$attributes['CATEGORIES'] = '';
+								$values['CATEGORIES'] = $this->get_categories($event['category']);
+							}
+							break;
+
+						case 'RECURRENCE-ID':
+							if ($recur_date)
+							{
+								// We handle a status only exception
+								if ($this->isWholeDay($event))
+								{
+									$arr = $this->date2array($recur_date);
+									$vevent->setAttribute('RECURRENCE-ID', array(
+										'year' => $arr['year'],
+										'month' => $arr['month'],
+										'mday' => $arr['day']),
+										array('VALUE' => 'DATE')
+									);
+								}
+								else
+								{
+									if ($servertime)
+									{
+										$attributes['RECURRENCE-ID'] = date('Ymd\THis', $recur_date);
+									}
+									else
+									{
+										$attributes['RECURRENCE-ID'] = $recur_date;
+									}
+								}
+							}
+							elseif ($event['reference'])
+							{
+								if ($this->isWholeDay($event))
+								{
+									$arr = $this->date2array($event['reference']);
+									$vevent->setAttribute('RECURRENCE-ID', array(
+										'year' => $arr['year'],
+										'month' => $arr['month'],
+										'mday' => $arr['day']),
+										array('VALUE' => 'DATE')
+									);
+								}
+								else
+								{
+									if ($servertime)
+									{
+										$attributes['RECURRENCE-ID'] = date('Ymd\THis', $event['reference']);
+									}
+									else
+									{
+										$attributes['RECURRENCE-ID'] = $event['reference'];
+									}
+								}
 							}
 							break;
 
 						default:
-							if ($event[$egwFieldInfo['dbName']])	// dont write empty fields
-							{
-								$attributes[$icalFieldName]	= $event[$egwFieldInfo['dbName']];
+							if (isset($this->clientProperties[$icalFieldName]['Size'])) {
+								$size = $this->clientProperties[$icalFieldName]['Size'];
+								$noTruncate = $this->clientProperties[$icalFieldName]['NoTruncate'];
+								#Horde::logMessage("vCalendar $icalFieldName Size: $size, NoTruncate: " .
+								#	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+							} else {
+								$size = -1;
+								$noTruncate = false;
 							}
-							break;
+							$value = $event[$egwFieldInfo['dbName']];
+							$cursize = strlen($value);
+							if (($size > 0) && $cursize > $size) {
+								if ($noTruncate) {
+									Horde::logMessage("vCalendar $icalFieldName omitted due to maximum size $size",
+										__FILE__, __LINE__, PEAR_LOG_WARNING);
+									continue; // skip field
+								}
+								// truncate the value to size
+								$value = substr($value, 0, $size - 1);
+								Horde::logMessage("vCalendar $icalFieldName truncated to maximum size $size",
+									__FILE__, __LINE__, PEAR_LOG_INFO);
+							}
+							if (!empty($value) || ($size >= 0 && !$noTruncate)) {
+								$attributes[$icalFieldName] = $value;
+							}
+						break;
 					}
 				}
 			}
 
-			if(strtolower($this->productManufacturer) == 'nokia') {
+			if($this->productManufacturer == 'nokia') {
 				if($event['special'] == '1') {
 					$attributes['X-EPOCAGENDAENTRYTYPE'] = 'ANNIVERSARY';
 					$attributes['DTEND'] = $attributes['DTSTART'];
@@ -415,701 +638,492 @@ class calendar_ical extends calendar_boupdate
 			$modified = $GLOBALS['egw']->contenthistory->getTSforAction('calendar',$event['id'],'modify');
 			$created = $GLOBALS['egw']->contenthistory->getTSforAction('calendar',$event['id'],'add');
 			if (!$created && !$modified) $created = $event['modified'];
-			if ($created) $attributes['CREATED'] = $created;
-			if (!$modified) $modified = $event['modified'];
-			if ($modified) $attributes['LAST-MODIFIED'] = $modified;
-
-			foreach($event['alarm'] as $alarmID => $alarmData)
+			if ($created)
 			{
-				if ($version == '1.0')
+				if ($servertime)
 				{
-					$attributes['DALARM'] = $vcal->_exportDateTime($alarmData['time']);
-					$attributes['AALARM'] = $vcal->_exportDateTime($alarmData['time']);
-					// lets take only the first alarm
-					break;
+					$attributes['CREATED'] = date('Ymd\THis', $created);
 				}
 				else
 				{
+					$attributes['CREATED'] = $created;
+				}
+			}
+			if (!$modified) $modified = $event['modified'];
+			if ($modified)
+			{
+				if ($servertime)
+				{
+					$attributes['LAST-MODIFIED'] = date('Ymd\THis', $modified);
+				}
+				else
+				{
+					$attributes['LAST-MODIFIED'] = $modified;
+				}
+			}
+			if ($servertime)
+			{
+				$attributes['DTSTAMP'] = date('Ymd\THis', time());
+			}
+			else
+			{
+				$attributes['DTSTAMP'] = time();
+			}
+			foreach($event['alarm'] as $alarmID => $alarmData) {
+				if ($version == '1.0') {
+					if ($servertime)
+					{
+						$attributes['DALARM'] = date('Ymd\THis', $alarmData['time']);
+						$attributes['AALARM'] = date('Ymd\THis', $alarmData['time']);
+					}
+					else
+					{
+						$attributes['DALARM'] = $alarmData['time'];
+						$attributes['AALARM'] = $alarmData['time'];
+					}
+					// lets take only the first alarm
+					break;
+				} else {
 					// VCalendar 2.0 / RFC 2445
 
+					$description = trim(preg_replace("/\r?\n?\\[[A-Z_]+:.*\\]/i", '', $event['description']));
+
 					// skip over alarms that don't have the minimum required info
-					if (!$alarmData['offset'] && !$alarmData['time'])
-					{
+					if (!$alarmData['offset'] && !$alarmData['time']) {
 						error_log("Couldn't add VALARM (no alarm time info)");
 						continue;
 					}
 
 					// RFC requires DESCRIPTION for DISPLAY
-					if (!$event['title'] && !$event['description'])
-					{
+					if (!$event['title'] && !$description) {
 						error_log("Couldn't add VALARM (no description)");
 						continue;
 					}
 
 					$valarm = Horde_iCalendar::newComponent('VALARM',$vevent);
-					if ($alarmData['offset'])
-					{
+					if ($alarmData['offset']) {
 						$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
 								array('VALUE' => 'DURATION', 'RELATED' => 'START'));
-					}
-					else
-					{
-						$valarm->setAttribute('TRIGGER', $alarmData['time'],
-								array('VALUE' => 'DATE-TIME'));
+					} else {
+						if ($servertime)
+						{
+							$value = date('Ymd\THis', $alarmData['time']);
+						}
+						else
+						{
+							$value = $alarmData['time'];
+						}
+						$valarm->setAttribute('TRIGGER', $value, array('VALUE' => 'DATE-TIME'));
 					}
 
 					$valarm->setAttribute('ACTION','DISPLAY');
-					$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $event['description']);
+					$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $description);
 					$vevent->addComponent($valarm);
 				}
 			}
 
-			$attributes['UID'] = $event['uid'];
-			foreach($attributes as $key => $value)
-			{
-				foreach(is_array($value)&&$parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
-				{
+			foreach($attributes as $key => $value) {
+				foreach(is_array($value)&&$parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData) {
 					$valueData = $GLOBALS['egw']->translation->convert($valueData,$GLOBALS['egw']->translation->charset(),'UTF-8');
-					$paramData = (array) $GLOBALS['egw']->translation->convert(is_array($value) ? $parameters[$key][$valueID] : $parameters[$key],
-						$GLOBALS['egw']->translation->charset(),'UTF-8');
-					$vevent->setAttribute($key, $valueData, $paramData);
+                    $paramData = (array) $GLOBALS['egw']->translation->convert(is_array($value) ?
+                    		$parameters[$key][$valueID] : $parameters[$key],
+                            $GLOBALS['egw']->translation->charset(),'UTF-8');
+                    $valuesData = (array) $GLOBALS['egw']->translation->convert($values[$key],
+                    		$GLOBALS['egw']->translation->charset(),'UTF-8');
+					//echo "$key:$valueID: value=$valueData, param=".print_r($paramDate,true)."\n";
+					$vevent->setAttribute($key, $valueData, $paramData, true, $valuesData);
 					$options = array();
 					if ($paramData['CN']) $valueData .= $paramData['CN'];	// attendees or organizer CN can contain utf-8 content
-					
-					if($this->productManufacturer == 'file' || $this->productManufacturer == 'GroupDAV') {
-					} 
-					else
-					{							
-						if($key != 'RRULE' && preg_match('/([\000-\012\015\016\020-\037\075])/',$valueData))
-						{
-							error_log(__FILE__ . __METHOD__ . "QP key $key:  ".print_r($valueData,true));
-							$options['ENCODING'] = 'QUOTED-PRINTABLE';
-						}
-					}
-
-					if($this->productManufacturer != 'GroupDAV'  && preg_match('/([\177-\377])/',$valueData))
+					/*if($key != 'RRULE' && preg_match('/([\000-\012\015\016\020-\037\075])/',$valueData)) {
+						$options['ENCODING'] = 'QUOTED-PRINTABLE';
+					}*/
+					if ($this->productManufacturer != 'groupdav' && preg_match('/([\177-\377])/', $valueData))
 					{
 						$options['CHARSET'] = 'UTF-8';
 					}
-				 	if(preg_match('/([\000-\012])/',$valueData))
+					if (preg_match('/([\000-\012])/', $valueData))
 					{
-					error_log(__FILE__ . __METHOD__ ."Has invalid XML data :$valueData");	
+						error_log(__FILE__ . __METHOD__ ."Has invalid XML data :$valueData");
 					}
-				$vevent->setParameter($key, $options);
+					$vevent->setParameter($key, $options);
 				}
 			}
 			$vcal->addComponent($vevent);
 		}
+		//_debug_array($vcal->exportvCalendar());
+
+		$retval = $vcal->exportvCalendar();
+                Horde::logMessage("exportVCAL:\n" . print_r($retval, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		return $retval;
 
-		return $vcal->exportvCalendar();
 	}
 
 	/**
 	 * Import an iCal
 	 *
 	 * @param string $_vcalData
-	 * @param int $cal_id=-1 must be -1 for new entrys!
+	 * @param int $cal_id=-1 must be -1 for new entries!
 	 * @param string $etag=null if an etag is given, it has to match the current etag or the import will fail
+	 * @param boolean $merge=false	merge data with existing entry
+	 * @param int $recur_date=0 if set, import the recurrance at this timestamp,
+	 *                          default 0 => import whole series (or events, if not recurring)
 	 * @return int|boolean cal_id > 0 on success, false on failure or 0 for a failed etag
 	 */
-	function importVCal($_vcalData, $cal_id=-1,$etag=null)
+	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0)
 	{
-		// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
-		$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
+		$Ok = false;	// returning false, if file contains no components
+
 		$vcal = new Horde_iCalendar;
-		if(!$vcal->parsevCalendar($_vcalData))
+		if (!$vcal->parsevCalendar($_vcalData))
 		{
-			return FALSE;
+			return $Ok;
+		}
+
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		}
+		else
+		{
+			$minimum_uid_length = 8;
 		}
 
 		$version = $vcal->getAttribute('VERSION');
-		error_log(__FILE__ . __METHOD__ ."Called with :\n ". print_r($_vcalData,true));
-		if(!is_array($this->supportedFields))
-		{
-			$this->setSupportedFields();
-		}
-		//echo "supportedFields="; _debug_array($this->supportedFields);
 
-		$syncevo_enddate_fix = False;
-		if( $this->productManufacturer == '' && $this->productName == '' )
-		{
-			// syncevolution needs an adjusted recur_enddate
-			$syncevo_enddate_fix = True;
-		}
+		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
-		$Ok = false;	// returning false, if file contains no components
-		foreach($vcal->getComponents() as $component)
+		foreach ($vcal->getComponents() as $component)
 		{
-			if(is_a($component, 'Horde_iCalendar_vevent'))
+			if (is_a($component, 'Horde_iCalendar_vevent'))
 			{
-				$supportedFields = $this->supportedFields;
-				#$event = array('participants' => array());
-				$event		= array();
-				$alarms		= array();
-				$vcardData	= array(
-					'recur_type'		=> MCAL_RECUR_NONE,
-					'recur_exception'	=> array(),
-				);
 
-				// lets see what we can get from the vcard
-				foreach($component->_attributes as $attributes)
-				{
-					//error_log(__FILE__ . __METHOD__ .":" . print_r($attributes,true));
-					switch($attributes['name'])
-					{
-						case 'AALARM':
-						case 'DALARM':
-							if (preg_match('/.*Z$/',$attributes['value'],$matches)) {
-								$alarmTime = $vcal->_parseDateTime($attributes['value']);
-								$alarms[$alarmTime] = array(
-									'time' => $alarmTime
-								);
-							} elseif (preg_match('/(........T......);;(\d*);$/',$attributes['value'],$matches)) {
-								//error_log(print_r($matches,true));
-								$alarmTime = $vcal->_parseDateTime($matches[1]);
-								$alarms[$alarmTime] = array(
-									'time' => $alarmTime
-								);
-							} elseif (preg_match('/(........T......Z);;(\d*);$/',$attributes['value'],$matches)) {
-								//error_log(print_r($matches,true));
-								$alarmTime = $vcal->_parseDateTime($matches[1]);
-								$alarms[$alarmTime] = array(
-									'time' => $alarmTime
-								);
-							} elseif (preg_match('/(........T......)$/',$attributes['value'],$matches)) {
-								$alarmTime = $vcal->_parseDateTime($attributes['value']);
-								$alarms[$alarmTime] = array(
-									'time' => $alarmTime
-								);
-							}
-							break;
-						case 'CLASS':
-							$vcardData['public']		= (int)(strtolower($attributes['value']) == 'public');
-							break;
-						case 'DESCRIPTION':
-							$vcardData['description']	= $attributes['value'];
-							break;
-						case 'DTEND':
-							/* 
-							DTSTART;VALUE=DATE:20090317 implies 000000Z
-                            DTEND;VALUE=DATE:20090317 implies 235959Z
-                            And DEFINES an ALLDAY event
-                            and as such is "inclusive"
-                            some clients(Lightning, Korganiser?) use "exclusive"
-                            Legacy: EGW held 235900 As DTEND allday, such entries in databases will exist
-                            EGW is internally correct on 235959 "inclusive"
-                            */
-							// We aren't allday
-							$allday = false;
-							// get and ensure the DTSTART/DTEND is a numeric Timestamp
-							$dtstart_ts  =	self::_get_attribute($component->_attributes,'DTSTART');
-							$dtstart_ts = is_numeric($dtstart_ts) ? $dtstart_ts : $this->date2ts($dtstart_ts);
-							$dtend_ts = self::_get_attribute($component->_attributes,'DTEND');
-							$dtend_ts = is_numeric($dtend_ts) ? $dtend_ts : $this->date2ts($dtend_ts);
-							//Plausibility Check and Convert Vcal/ical Allday to EGW Allday
-							if($dtstart_ts <= $dtend_ts && date('H:i:s',$dtend_ts) == '00:00:00'){ 
-							// We are a one day Allday event or Allday last day of a sequence
-							// dtend_ts += 23:59:59 +=86339 = EGW intern
-							$allday = true;
-							$dtend_ts += 86399;
-							}
-							 //if kde or lightning reduce dtend by 24 hours? 86400 secs
-                            if($allday && ($this->productName == "kde" || $this->productName == "lightning")){
-                            $dtend_ts -= 86400;
-                                }
-							$vcardData['end']		= $dtend_ts;
-							break;
-						case 'DTSTART':
-							$vcardData['start']		= $attributes['value'];
-							break;
-						case 'LOCATION':
-							$vcardData['location']	= $attributes['value'];
-							break;
-						case 'RRULE':
-							$recurence = $attributes['value'];
-							$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
-							// vCard 2.0 values for all types
-							if (preg_match('/UNTIL=([0-9T]+)/',$recurence,$matches))
-							{
-								$vcardData['recur_enddate'] = $vcal->_parseDateTime($matches[1]);
-							}
-							elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
-							{
-								$vcardData['recur_count'] = (int)$matches[1];
-							}
-							if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
-							{
-								// 1 is invalid,, egw uses 0 for interval
-								$vcardData['recur_interval'] = (int) $matches[1] != 0 ? (int) $matches[1] : 0;
-							}
-							if (!isset($vcardData['start']))	// it might not yet be set, because the RRULE is before it
-							{
-								$vcardData['start'] = self::_get_attribute($component->_attributes,'DTSTART');
-								$vcardData['end'] = self::_get_attribute($component->_attributes,'DTEND');
-							}
-							$vcardData['recur_data'] = 0;
-							switch($type)
-							{
-								case 'W':
-								case 'WEEKLY':
-									$days = array();
-									if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))		// 1.0
-									{
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										$days = explode(' ',trim($recurenceMatches[2]));
-										if($recurenceMatches[3] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[3]);
-										$recur_days = $this->recur_days_1_0;
-									}
-									elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
-									{
-										$days = explode(',',$recurenceMatches[1]);
-										$recur_days = $this->recur_days;
-									}
-									else	// no day given, use the day of dtstart
-									{
-										$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
-										$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
-									}
-									if ($days)
-									{
-										foreach($recur_days as $id => $day)
-	            						{
-	            							if (in_array(strtoupper(substr($day,0,2)),$days))
-        									{
-        										$vcardData['recur_data'] |= $id;
-        									}
-        								}
-										$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
-									}
+				$event = $this->vevent2egw($component, $version, $this->supportedFields);
 
-									if (!empty($vcardData['recur_count']))
-									{
-										$vcardData['recur_enddate'] = mktime(0,0,0,
-											date('m',$vcardData['start']),
-											date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)*7),
-											date('Y',$vcardData['start']));
-									}
-									break;
-
-								case 'D':	// 1.0
-									if(preg_match('/D(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] > 0 && $vcardData['end']) {
-											$vcardData['recur_enddate'] = mktime(
-												date('H', $vcardData['end']),
-												date('i', $vcardData['end']),
-												date('s', $vcardData['end']),
-												date('m', $vcardData['end']),
-												date('d', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
-												date('Y', $vcardData['end'])
-											);
-										}
-									} elseif(preg_match('/D(\d+) (.*)/', $recurence, $recurenceMatches)) {
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] != '#0') {
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-										}
-									} else {
-										break;
-									}
-									// fall-through
-								case 'DAILY':	// 2.0
-									$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-
-									if (!empty($vcardData['recur_count']))
-									{
-										$vcardData['recur_enddate'] = mktime(0,0,0,
-											date('m',$vcardData['start']),
-											date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
-											date('Y',$vcardData['start']));
-									}
-									break;
-
-								case 'M':
-									if(preg_match('/MD(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
-										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] > 0 && $vcardData['end']) {
-											$vcardData['recur_enddate'] = mktime(
-												date('H', $vcardData['end']),
-												date('i', $vcardData['end']),
-												date('s', $vcardData['end']),
-												date('m', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
-												date('d', $vcardData['end']),
-												date('Y', $vcardData['end'])
-											);
-										}
-									} elseif(preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches)) {
-										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
-										if($recurenceMatches[1] > 1)
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-									} elseif(preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches)) {
-										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
-										if($recurenceMatches[1] > 1)
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[4] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[4]);
-									}
-									break;
-								case 'MONTHLY':
-									$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
-										MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
-
-									if (!empty($vcardData['recur_count']))
-									{
-										$vcardData['recur_enddate'] = mktime(0,0,0,
-											date('m',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
-											date('d',$vcardData['start']),
-											date('Y',$vcardData['start']));
-									}
-									break;
-
-								case 'Y':		// 1.0
-									if(preg_match('/YM(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] > 0 && $vcardData['end']) {
-											$vcardData['recur_enddate'] = mktime(
-												date('H', $vcardData['end']),
-												date('i', $vcardData['end']),
-												date('s', $vcardData['end']),
-												date('m', $vcardData['end']),
-												date('d', $vcardData['end']),
-												date('Y', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval'])
-											);
-										}
-									} elseif(preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches)) {
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] != '#0') {
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-										}
-									} else {
-										break;
-									}
-									// fall-through
-								case 'YEARLY':	// 2.0
-									$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
-
-									if (!empty($vcardData['recur_count']))
-									{
-										$vcardData['recur_enddate'] = mktime(0,0,0,
-											date('m',$vcardData['start']),
-											date('d',$vcardData['start']),
-											date('Y',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)));
-									}
-									break;
-							}
-							if( $syncevo_enddate_fix && $vcardData['recur_enddate'] )
-							{
-								// Does syncevolution need to adjust recur_enddate
-								$vcardData['recur_enddate'] = (int)$vcardData['recur_enddate'] + 86400;
-							}
-							break;
-						case 'EXDATE':
-							$vcardData['recur_exception'] = array_merge($vcardData['recur_exception'],$attributes['value']);
-							break;
-						case 'SUMMARY':
-							$vcardData['title']		= $attributes['value'];
-							break;
-						case 'UID':
-							$event['uid'] = $vcardData['uid'] = $attributes['value'];
-							if ($cal_id <= 0 && !empty($vcardData['uid']) && ($uid_event = $this->read($vcardData['uid'])))
-							{
-								$cal_id = $event['id'] = $uid_event['id'];
-								unset($uid_event);
-							}
-							break;
- 						case 'TRANSP':
- 							if($version == '1.0') {
- 								$vcardData['non_blocking'] = $attributes['value'] == 1;
- 							} else {
-								$vcardData['non_blocking'] = $attributes['value'] == 'TRANSPARENT';
-							}
-							break;
-						case 'PRIORITY':
- 							$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
- 							break;
- 						case 'CATEGORIES':
- 							if ($attributes['value'])
- 							{
- 								$vcardData['category'] = $this->find_or_add_categories(explode(',',$attributes['value']));
- 							}
-							else
-							{
- 								$vcardData['category'] = array();
-							}
- 							break;
- 						case 'ATTENDEE':
- 							error_log(__FILE__ . __METHOD__ . "case:ATTENDEE:" . print_r($attributes,true));
-							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) ||
- 								preg_match('/<([@.a-z0-9_-]+)>/i',$attributes['value'],$matches))
-							{
-								$email = $matches[1];
-							}
-							elseif(strpos($attributes['value'],'@') !== false)
-							{
-								$email = $attributes['value'];
-							}
-							else
-							{
-								$email = false;	// no email given
-							}
-							$searcharray = array();
-							if ($email) $searcharray = array('email' => $email, 'email_home' => $email);
-							if (isset($attributes['params']['CN']) && $attributes['params']['CN'])
-							{
-								if($attributes['params']['CN'][0] == '"' && substr($attributes['params']['CN'],-1) == '"')
-								{
-									$attributes['params']['CN'] = substr($attributes['params']['CN'],1,-1);
-								}
-								$searcharray['n_fn'] = $attributes['params']['CN'];
-							}
-							if (($uid = $attributes['params']['X-EGROUPWARE-UID']) &&
- 								($info = $this->resource_info($uid)) && (!$email || $info['email'] == $email))
- 							{
- 								// we use the (checked) X-EGROUPWARE-UID
- 							}
- 							/*elseif($attributes['params']['CUTYPE'] == 'RESOURCE')
- 							{
-
- 							}*/
-	 						elseif($attributes['value'] == 'Unknown')
- 							{
- 								$uid = $GLOBALS['egw_info']['user']['account_id'];
- 							}
- 							elseif ($email && ($uid = $GLOBALS['egw']->accounts->name2id($email,'account_email')))
- 							{
- 								// we use the account we found
- 							}
- 							elseif(!$searcharray)
- 							{
- 								continue;	// participants without email AND CN --> ignore it
- 							}
-							elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
-								array('id','egw_addressbook.account_id as account_id','n_fn'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
-							{
-								$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
-							}
- 							else
- 							{
- 								if (!$email) $email = 'no-email@egroupware.org';	// set dummy email to store the CN
- 								$uid = 'e'.($attributes['params']['CN'] ? $attributes['params']['CN'].' <'.$email.'>' : $email);
- 							}
- 							
- 							error_log(__FILE__ . __METHOD__ . "\n ATTENDEE:" . print_r($attributes['value'],true));
-							$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
- 									$this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])] :
- 									($uid == $event['owner'] ? 'A' : 'U');
- 							
-							break;
- 						case 'ORGANIZER':	// will be written direct to the event
- 							error_log(__FILE__ . __METHOD__ . "\n ORGANIZER:" . print_r($attributes['value'],true));
-							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
- 								($uid = $GLOBALS['egw']->accounts->name2id($matches[1],'account_email')))
- 							{
- 								$event['owner'] = $uid;
- 							}
- 							break;
- 						case 'CREATED':		// will be written direct to the event
- 							if ($event['modified']) break;
- 							// fall through
- 						case 'LAST-MODIFIED':	// will be written direct to the event
-							$event['modified'] = $attributes['value'];
-							break;
-					}
-				}
-				//error_log(__FILE__ . __METHOD__ . "\n after case:" . print_r($event['participants'],true));
-				// check if the entry is a birthday
-				// this field is only set from NOKIA clients
-				$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
-				if (!is_a($agendaEntryType, 'PEAR_Error')) {
-					if(strtolower($agendaEntryType) == 'anniversary') {
-						$event['special'] = '1';
-						$event['non_blocking'] = '1';
-						// make it a whole day event for eGW
-						$vcardData['end'] = $vcardData['start'] + 86399;
-					 }
-					 elseif(strtolower($agendaEntryType) == 'event') {
-					 	$event['special'] = '2';
-					 	$event['non_blocking'] = '1';
-					}
-				}
-
-				if(!empty($vcardData['recur_enddate']))
-				{
-					// reset recure_enddate to 00:00:00 on the last day
-					$vcardData['recur_enddate'] = mktime(0, 0, 0,
-						date('m',$vcardData['recur_enddate']),
-						date('d',$vcardData['recur_enddate']),
-						date('Y',$vcardData['recur_enddate'])
-					);
-				}
-				//echo "event=";_debug_array($vcardData);
-
-				// now that we know what the vard provides, we merge that data with the information we have about the device
-				$event['priority']		= 2;
-				if($cal_id > 0)
-				{
+				if ($cal_id > 0) {
 					$event['id'] = $cal_id;
 				}
-				while(($fieldName = array_shift($supportedFields)))
+
+				if ($this->productManufacturer == '' && $this->productName == ''
+					&& !empty($event['recur_enddate']))
 				{
-					switch($fieldName)
-					{
-						case 'alarms':
-							// not handled here
-							break;
-						case 'recur_type':
-							$event['recur_type'] = $vcardData['recur_type'];
-							if ($event['recur_type'] != MCAL_RECUR_NONE)
-							{
-								foreach(array('recur_interval','recur_enddate','recur_data','recur_exception') as $r)
-								{
-									if(isset($vcardData[$r]))
-									{
-										$event[$r] = $vcardData[$r];
-									}
-								}
-							}
-							unset($supportedFields['recur_type']);
-							unset($supportedFields['recur_interval']);
-							unset($supportedFields['recur_enddate']);
-							unset($supportedFields['recur_data']);
-							break;
-						default:
-							if (isset($vcardData[$fieldName]))
-							{
-								$event[$fieldName] = $vcardData[$fieldName];
-							}
-							unset($supportedFields[$fieldName]);
-							break;
-					}
+					// syncevolution needs an adjusted recur_enddate
+					$event['recur_enddate'] = (int)$event['recur_enddate'] + 86400;
 				}
 
-				// add ourself to new events as participant
- 				if ($cal_id == -1 && (!isset($this->supportedFields['participants']) ||
+ 				if ($cal_id < 0 && (!isset($this->supportedFields['participants']) ||
  					!isset($event['participants'][$GLOBALS['egw_info']['user']['account_id']])))
  				{
+ 					// add ourself to new events as participant
 					$event['participants'][$GLOBALS['egw_info']['user']['account_id']] = 'A';
  				}
 
-				// If this is an updated meeting, and the client doesn't support
-				// participants OR the event no longer contains participants, add them back
-				if( $cal_id > 0 && (!isset($this->supportedFields['participants']) || !count($event['participants'])))
-				{
-					
-					if (($egw_event = $this->read($cal_id)))
-					{
-						$event['participants'] = $egw_event['participants'];
-						$event['participant_types'] = $egw_event['participant_types'];
-					}
-				}
+ 				if ($event['recur_type'] != MCAL_RECUR_NONE)
+ 				{
+ 					// No RECCURENCE-ID for series events
+ 					$event['reference'] = 0;
+ 				}
 
-				// Check for resources, and don't remove them
-				if( $cal_id > 0 )
+				if ($cal_id > 0 && ($egw_event = $this->read($cal_id, $recur_date)))
 				{
-					// for each existing participant:
-					if (($egw_event = $this->read($cal_id)))
+					// overwrite with server data for merge
+					if ($merge)
 					{
-						foreach( $egw_event['participants'] as $uid => $status )
+						if ($egw_event['recur_type'] != MCAL_RECUR_NONE && $recur_date)
 						{
-							// Is it a resource and not longer present in the event?
+							// update only the stati of the exception
+							if ($this->check_perms(EGW_ACL_EDIT, $cal_id))
+							{
+								$this->update_status($event, $egw_event, $recur_date);
+							}
+							$Ok = $cal_id . ':' . $recur_date;
+							continue; // nothing more to do
+						}
+						foreach ($egw_event as $key => $value)
+						{
+							switch ($key)
+							{
+								case 'participants_types':
+									continue;
+
+								case 'participants':
+									foreach ($egw_event['participants'] as $uid => $status)
+									{
+										// Is a participant and no longer present in the event?
+										if (!isset($event['participants'][$uid]))
+										{
+											// Add it back in
+											$event['participants'][$uid] = $event['participant_types']['r'][substr($uid,1)] = $status;
+										}
+									}
+									break;
+
+								default:
+									if (!empty($value))
+									{
+										$event[$key] = $value;
+									}
+							}
+						}
+					}
+					else // not merge
+					{
+						if (!isset($this->supportedFields['participants']) || !count($event['participants']))
+						{
+							// If this is an updated meeting, and the client doesn't support
+							// participants OR the event no longer contains participants, add them back
+							$event['participants'] = $egw_event['participants'];
+							$event['participant_types'] = $egw_event['participant_types'];
+						}
+
+						foreach ($egw_event['participants'] as $uid => $status)
+						{
+							// Is it a resource and no longer present in the event?
 							if ( $uid[0] == 'r' && !isset($event['participants'][$uid]) )
 							{
 								// Add it back in
 								$event['participants'][$uid] = $event['participant_types']['r'][substr($uid,1)] = $status;
 							}
 						}
+						// avoid that iCal changes the organizer, which is not allowed
+						$event['owner'] = $egw_event['owner'];
+					}
+				}
+				else
+				{
+					// new event
+					$cal_id = -1;
+					$recur_date = $event['reference'];
+				}
+
+				if (empty($event['uid']) && $cal_id > 0 &&
+					($egw_event = $this->read($cal_id)))
+				{
+					$event['uid'] = $egw_event['uid'];
+				}
+
+				if ($event['recur_type'] == MCAL_RECUR_NONE
+						&& !empty($event['uid']) && $recur_date)
+				{
+					// We handle a recurrence exception
+					$recur_exceptions = $this->so->get_related($event['uid']);
+					$recur_id = array_search($recur_date, $recur_exceptions);
+					if ($recur_id === false || !($egw_event = $this->read($recur_id)))
+					{
+						// We found no real exception, let't try "status only"
+						if (($egw_event = $this->read($event['uid']))
+							&& $egw_event['recur_type'] != MCAL_RECUR_NONE)
+						{
+							$unchanged = true;
+							foreach (array('uid','owner','title','description',
+								'location','priority','public','special','non_blocking') as $key)
+							{
+								//Horde::logMessage('importVCAL test ' .$key . ': '. $egw_event[$key] . ' == ' .$event[$key],
+								//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+								if (!empty($event[$key]) //|| !empty($egw_event[$key]))
+									&& $egw_event[$key] != $event[$key])
+								{
+									$unchanged = false;
+									break;
+								}
+							}
+							if ($unchanged)
+							{
+								Horde::logMessage('importVCAL event unchanged',
+									__FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+								// We can handle this without an exception entry
+								$recur_exceptions = array();
+								foreach ($egw_event['recur_exception'] as $recur_exception)
+								{
+									//Horde::logMessage('importVCAL exception ' .$recur_exception,
+									//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+									if ($recur_exception != $recur_date)
+									{
+										$recur_exceptions[] = $recur_exception;
+									}
+								}
+								//Horde::logMessage("importVCAL exceptions\n" . print_r($recur_exceptions, true),
+								//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+								$egw_event['recur_exception'] = $recur_exceptions;
+								$this->update($egw_event, true);
+
+								// update the stati from the exception
+								if ($this->check_perms(EGW_ACL_EDIT, $egw_event['id']))
+								{
+									$this->update_status($event, $egw_event, $recur_date);
+								}
+								elseif (isset($egw_event['participants'][$this->user]))
+								{
+									// check if current user is an attendee and tried to change his status
+									$this->set_status($egw_event, $this->user,
+										($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recur_date, true);
+								}
+								$Ok = $egw_event['id'] . ':' . $recur_date;
+								continue; // nothing more to do
+							}
+							else
+							{
+								// We need to create an new exception
+								$egw_event['recur_exception'] = array_unique(array_merge($egw_event['recur_exception'], array($recur_date)));
+								$this->update($egw_event, true);
+								$event['category'] = $egw_event['category'];
+								$cal_id = -1;
+							}
+						}
+						else
+						{
+							// The series event was not found
+							$cal_id = -1;
+						}
+					}
+					else
+					{
+						// We update an existing exception
+						$cal_id = $egw_event['id'];
+						$event['id'] = $egw_event['id'];
+						$event['category'] = $egw_event['category'];
+					}
+				}
+				else
+				{
+					// We handle a single event or the series master
+					$days = $this->so->get_recurrence_exceptions($event);
+					if (is_array($days))
+					{
+						Horde::logMessage("importVCAL event\n" . print_r($event, true),
+							__FILE__, __LINE__, PEAR_LOG_DEBUG);
+						Horde::logMessage("importVCAL days\n" . print_r($days, true),
+							__FILE__, __LINE__, PEAR_LOG_DEBUG);
+						// remove all known "stati only" exceptions
+						$recur_exceptions = array();
+						foreach ($event['recur_exception'] as $recur_exception)
+						{
+							if (!in_array($recur_exception, $days))
+							{
+								$recur_exceptions[] = $recur_exception;
+							}
+						}
+						Horde::logMessage("importVCAL exceptions\n" . print_r($recur_exceptions, true),
+							__FILE__, __LINE__, PEAR_LOG_DEBUG);
+						$event['recur_exception'] = $recur_exceptions;
 					}
 				}
 
-				// check if iCal changes the organizer, which is not allowed
-				if ($cal_id > 0 && ($egw_event = $this->read($cal_id)))
+				if ($cal_id <= 0)
 				{
-					$event['owner'] = $egw_event['owner'];	// do NOT change the original owner
-				}
-				// check for new events if an owner is set and the current user has add rights for that owners calendar
-				elseif (!isset($event['owner']) || $this->check_perms(EGW_ACL_ADD,0,$event['owner']))
-				{
-					$event['owner'] = $GLOBALS['egw_info']['user']['account_id'];	// if not set the current user
-				}
+					// new entry
+					if ($this->isWholeDay($event) && $this->nonBlockingAllday)
+					{
+						$event['non_blocking'] = 1;
+					}
 
-				#error_log('ALARMS');
-				//error_log(__FILE__ . __METHOD__ ."whats in event". print_r($event, true));
+					if (!isset($event['owner'])
+							|| !$this->check_perms(EGW_ACL_ADD,0,$event['owner']))
+					{
+						// check for new events if an owner is set and the current user has add rights
+						// for that owners calendar; if not set the current user
+						$event['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+					}
+				}
 
 				// if an etag is given, include it in the update
 				if (!is_null($etag))
 				{
 					$event['etag'] = $etag;
 				}
-				/*
-				We have for CREATE:
-				if vcal OWNER set then either this->user = OWNER or has add rights to owners Calendar
-				We have for UPDATE:
-				vcal OWNER = EGW owner
-				case: this->user = OWNER then all rights (C-ok,R-ok,U-?,D-ok)
-				*/
-				if($this->user == $event['owner']){
-				//error_log("\nuser:$this->user owner:". print_r($event['owner'],true));
-				}
-				/*
-				case: this->user = participant then only change own status
-				*/
-				if(array_key_exists($this->user,$event['participants'])){
-				//	error_log("\nuser:$this->user : ". print_r($egw_event,true)); 
-				}
-				$original_event = $event;
-				//error_log(__FILE__ . __METHOD__ . "\n after case:" . print_r($event['participants'],true));
-				if (!($Ok = $this->update($event, TRUE)))
-				{
-					// check if current user is an attendee and tried to change his status
-					//error_log(__FILE__ . __METHOD__ . "\n:in update" . print_r($egw_event,true));
-					if ($Ok === false && $cal_id && ($egw_event = $this->read($cal_id)) && isset($egw_event['participants'][$this->user]) &&
-						$egw_event['participants'][$this->user] !== $event['participants'][$this->user])
-					{
-						//error_log(__FILE__ . __METHOD__ . "\n:set status" . print_r($egw_event,true));
-						$this->set_status($egw_event,$this->user,$status = $event['participants'][$this->user] ? $event['participants'][$this->user] : 'R');
 
-						$Ok = $cal_id;
-						continue;
+				$original_event = $event;
+
+				if (!($Ok = $this->update($event, true)))
+				{
+					if ($Ok === false && $cal_id > 0 && ($egw_event = $this->read($cal_id)))
+					{
+						$unchanged = true;
+						if ($event['recur_type'] != MCAL_RECUR_NONE)
+						{
+							// Check if a recurring event "status only" exception is created by the client
+							foreach (array('uid','owner','title','description',
+								'location','priority','public','special','non_blocking') as $key)
+							{
+								//Horde::logMessage('importVCAL test ' .$key . ': '. $egw_event[$key] . ' == ' .$event[$key],
+								//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+								if (!empty($event[$key]) //|| !empty($egw_event[$key]))
+										&& $egw_event[$key] != $event[$key])
+								{
+									$unchanged = false;
+									break;
+								}
+							}
+						}
+						// check if current user is an attendee and tried to change his status
+						if (isset($egw_event['participants'][$this->user]))
+						{
+							$this->set_status($egw_event, $this->user,
+								($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recur_date);
+
+							$Ok = $cal_id;
+							continue;
+						}
+
+						if ($unchanged)
+						{
+							$Ok = $cal_id;
+							continue;
+						}
 					}
 					break;	// stop with the first error
 				}
 				else
 				{
-					$eventID =& $Ok;
-					if(isset($egw_event) && $original_event['participants'] != $egw_event['participants'])$this->update_status($original_event,$egw_event);
-					
+					$eventID = &$Ok;
+					/* if(isset($egw_event)
+						&& $original_event['participants'] != $egw_event['participants'])
+					{
+						$this->update_status($original_event, $egw_event, $recur_date);
+					} */
+
+					$alarms = $event['alarm'];
+
 					// handle the alarms
 					foreach ($component->getComponents() as $valarm)
 					{
 						if (is_a($valarm, 'Horde_iCalendar_valarm'))
 						{
-							$this->valarm2egw($alarms,$valarm);
+							$this->valarm2egw($alarms, $valarm);
 						}
 					}
 
-					if(count($alarms) > 0 || (isset($this->supportedFields['alarms'])  && count($alarms) == 0))
+					if (count($alarms) > 0
+						|| (isset($this->supportedFields['alarms'])
+							&& count($alarms) == 0))
 					{
 						// delete the old alarms
 						$updatedEvent = $this->read($eventID);
-						foreach($updatedEvent['alarm'] as $alarmID => $alarmData)
+						foreach ($updatedEvent['alarm'] as $alarmID => $alarmData)
 						{
 							$this->delete_alarm($alarmID);
 						}
 					}
 
-					foreach($alarms as $alarm)
+					foreach ($alarms as $alarm)
 					{
-						$alarm['offset'] = $event['start'] - $alarm['time'];
+						if (!isset($alarm['offset']))
+						{
+							$alarm['offset'] = $event['start'] - $alarm['time'];
+						}
+						if (!isset($alarm['time']))
+						{
+							$alarm['time'] = $event['start'] - $alarm['offset'];
+						}
 						$alarm['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						$alarm['all'] = true;
 						$this->save_alarm($eventID, $alarm);
 					}
 				}
 				$cal_id = -1;
 			}
+			$egw_event = $this->read($eventID);
+            Horde::logMessage("importVCAL:\n" . print_r($egw_event, true),
+            	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		}
 		return $Ok;
 	}
@@ -1167,23 +1181,56 @@ class calendar_ical extends calendar_boupdate
 							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
 					}
 					break;
-				// case 'ACTION':
-				// 	break;
-				// case 'DISPLAY':
-				// 	break;
+				case 'ACTION':
+				case 'DISPLAY':
+				case 'DESCRIPTION':
+				case 'SUMMARY':
+				case 'ATTACH':
+				case 'ATTENDEE':
+					// we ignore these fields silently
+				 	break;
 
 				default:
-				//	error_log('VALARM field:' .$vattr['name'] .':' . print_r($vattrval,true) . ' HAS NO CONVERSION YET');
+					error_log('VALARM field ' .$vattr['name'] . ': ' . $vattr['value'] . ' HAS NO CONVERSION YET');
 			}
 		}
 		return $count;
 	}
 
-	function setSupportedFields($_productManufacturer='file', $_productName='')
+	function setSupportedFields($_productManufacturer='', $_productName='')
 	{
-		// save them vor later use
-		$this->productManufacturer = $_productManufacturer;
-		$this->productName = $_productName;
+		$state = &$_SESSION['SyncML.state'];
+		if (isset($state)) {
+			$deviceInfo = $state->getClientDeviceInfo();
+		}
+
+		// store product manufacturer and name, to be able to use it elsewhere
+		if ($_productManufacturer) {
+				$this->productManufacturer = strtolower($_productManufacturer);
+				$this->productName = strtolower($_productName);
+		}
+
+		if(isset($deviceInfo) && is_array($deviceInfo)) {
+			if(isset($deviceInfo['uidExtension']) &&
+				$deviceInfo['uidExtension']){
+					$this->uidExtension = true;
+				}
+			if(isset($deviceInfo['nonBlockingAllday']) &&
+				$deviceInfo['nonBlockingAllday']){
+					$this->nonBlockingAllday = true;
+				}
+			if(!isset($this->productManufacturer) ||
+				 $this->productManufacturer == '' ||
+				 $this->productManufacturer == 'file') {
+				$this->productManufacturer = strtolower($deviceInfo['manufacturer']);
+			}
+			if(!isset($this->productName) || $this->productName == '') {
+				$this->productName = strtolower($deviceInfo['model']);
+			}
+		}
+
+		Horde::logMessage('setSupportedFields(' . $this->productManufacturer
+				. ', ' . $this->productName .')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		$defaultFields['minimal'] = array(
 			'public'			=> 'public',
@@ -1196,7 +1243,7 @@ class calendar_ical extends calendar_boupdate
 			'recur_data'		=> 'recur_data',
 			'recur_enddate'		=> 'recur_enddate',
 			'title'				=> 'title',
-			'alarms'			=> 'alarms',
+			'alarm'				=> 'alarm',
 		);
 
 		$defaultFields['basic'] = $defaultFields['minimal'] + array(
@@ -1206,17 +1253,28 @@ class calendar_ical extends calendar_boupdate
 
 		$defaultFields['nexthaus'] = $defaultFields['basic'] + array(
 			'participants'		=> 'participants',
+			'uid'				=> 'uid',
+		);
+
+		$defaultFields['s60'] = $defaultFields['basic'] + array(
+			'category'			=> 'category',
+			'uid'				=> 'uid',
 		);
 
 		$defaultFields['synthesis'] = $defaultFields['basic'] + array(
-			'non_blocking'		=> 'non_blocking',
+			'participants'		=> 'participants',
+			'owner'				=> 'owner',
 			'category'			=> 'category',
+			'non_blocking'		=> 'non_blocking',
+			'uid'				=> 'uid',
+			'reference'			=> 'reference',
 		);
 
 		$defaultFields['evolution'] = $defaultFields['basic'] + array(
 			'participants'		=> 'participants',
 			'owner'				=> 'owner',
 			'category'			=> 'category',
+			'uid'				=> 'uid',
 		);
 
 		$defaultFields['full'] = $defaultFields['basic'] + array(
@@ -1224,14 +1282,16 @@ class calendar_ical extends calendar_boupdate
 			'owner'				=> 'owner',
 			'category'			=> 'category',
 			'non_blocking'		=> 'non_blocking',
+			'uid'				=> 'uid',
+			'reference'			=> 'reference',
 		);
 
 
-		switch(strtolower($_productManufacturer))
+		switch($this->productManufacturer)
 		{
 			case 'nexthaus corporation':
 			case 'nexthaus corp':
-				switch(strtolower($_productName))
+				switch($this->productName)
 				{
 					default:
 						$this->supportedFields = $defaultFields['nexthaus'];
@@ -1242,7 +1302,7 @@ class calendar_ical extends calendar_boupdate
 			// multisync does not provide anymore information then the manufacturer
 			// we suppose multisync with evolution
 			case 'the multisync project':
-				switch(strtolower($_productName))
+				switch($this->productName)
 				{
 					default:
 						$this->supportedFields = $defaultFields['basic'];
@@ -1250,8 +1310,21 @@ class calendar_ical extends calendar_boupdate
 				}
 				break;
 
+			case 'siemens':
+				switch($this->productName)
+				{
+					case 'sx1':
+						$this->supportedFields = $defaultFields['minimal'];
+						break;
+					default:
+						error_log("Unknown Siemens phone '$_productName', using minimal set");
+						$this->supportedFields = $defaultFields['minimal'];
+						break;
+				}
+				break;
+
 			case 'nokia':
-				switch(strtolower($_productName))
+				switch($this->productName)
 				{
 					case 'e61':
 						$this->supportedFields = $defaultFields['minimal'];
@@ -1259,7 +1332,10 @@ class calendar_ical extends calendar_boupdate
 					case 'e51':
 					case 'e90':
 					case 'e71':
-						$this->supportedFields = $defaultFields['basic'];
+					case 'e66':
+					case '6120c':
+					case 'nokia 6131':
+						$this->supportedFields = $defaultFields['s60'];
 						break;
 					default:
 						error_log("Unknown Nokia phone '$_productName', assuming E61");
@@ -1270,26 +1346,27 @@ class calendar_ical extends calendar_boupdate
 
 			case 'sonyericsson':
 			case 'sony ericsson':
-				switch(strtolower($_productName))
+				switch($this->productName)
 				{
 					case 'd750i':
 					case 'p910i':
+					case 'g705i':
 						$this->supportedFields = $defaultFields['basic'];
 						break;
 					default:
-						error_log("Unknown Sony Ericsson phone '$_productName' assuming d750i");
+						error_log("Unknown Sony Ericsson phone '$this->productName' assuming d750i");
 						$this->supportedFields = $defaultFields['basic'];
 						break;
 				}
 				break;
 
 			case 'synthesis ag':
-				switch(strtolower($_productName))
+				switch($this->productName)
 				{
 					case 'sysync client pocketpc std':
 					case 'sysync client pocketpc pro':
-						$this->supportedFields = $defaultFields['full'];
-						break;
+					case 'sysync client iphone contacts':
+					case 'sysync client iphone contacts+todoz':
 					default:
 						$this->supportedFields = $defaultFields['synthesis'];
 						break;
@@ -1320,335 +1397,589 @@ class calendar_ical extends calendar_boupdate
 
 			// the fallback for SyncML
 			default:
-				error_log("Unknown calendar SyncML client: manufacturer='$_productManufacturer'  product='$_productName'");
-				$this->supportedFields = $defaultFields['full'];
+				error_log("Unknown calendar SyncML client: manufacturer='$this->productManufacturer'  product='$this->productName'");
+				$this->supportedFields = $defaultFields['synthesis'];
 				break;
 		}
 	}
 
-	function icaltoegw($_vcalData)
+	function icaltoegw($_vcalData, $cal_id=-1)
 	{
-		// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
-		$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
+		$event = false;	// returning false, if file contains no components
 
 		$vcal = new Horde_iCalendar;
-		if(!$vcal->parsevCalendar($_vcalData))
-		{
-			return FALSE;
-		}
+		if (!$vcal->parsevCalendar($_vcalData)) return false;
 
-		if(!is_array($this->supportedFields))
-		{
-			$this->setSupportedFields();
-		}
-		//echo "supportedFields="; _debug_array($this->supportedFields);
+		$version = $vcal->getAttribute('VERSION');
 
-		$Ok = false;	// returning false, if file contains no components
-		foreach($vcal->getComponents() as $component)
+		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+
+		foreach ($vcal->getComponents() as $component)
 		{
-			if(is_a($component, 'Horde_iCalendar_vevent'))
+			if (is_a($component, 'Horde_iCalendar_vevent'))
 			{
-				$supportedFields = $this->supportedFields;
-				#$event = array('participants' => array());
-				$event		= array();
-				$alarms		= array();
-				$vcardData	= array('recur_type' => 0);
-
-				// lets see what we can get from the vcard
-				foreach($component->_attributes as $attributes)
+				// We expect only a single VEVENT
+				$event = $this->vevent2egw($component, $version, $this->supportedFields);
+				if ($event)
 				{
-					switch($attributes['name'])
+					if ($cal_id > 0) {
+						$event['id'] = $cal_id;
+					}
+					else
 					{
-						case 'AALARM':
-						case 'DALARM':
-							if (preg_match('/.*Z$/',$attributes['value'],$matches))
-							{
-								$alarmTime = $vcal->_parseDateTime($attributes['value']);
-								$alarms[$alarmTime] = array(
-									'time' => $alarmTime
-								);
-							}
-							break;
-						case 'CLASS':
-							$vcardData['public']		= (int)(strtolower($attributes['value']) == 'public');
-							break;
-						case 'DESCRIPTION':
-							$vcardData['description']	= $attributes['value'];
-							break;
-						case 'DTEND':
-						/* write start + end of whole day events as dates
-                            DTSTART;VALUE=DATE:20090317 implies 000000Z
-                            DTEND;VALUE=DATE:20090317 implies 235959Z
-                            And DEFINES an ALLDAY event
-                            and as such is "inclusive"
-                            some clients(Lightning, Korganiser?) need an "exclusive"
-                            Legacy: EGW held 235900 As DTEND allday, such entries in databases will exist
-                            EGW is internally correct on 235959 "inclusive"
-                            */
-                            //error_log(__FILE__ . __METHOD__. "DTEND:". print_r($attributes['value'],true));
-	
-							if(date('H:i:s',$attributes['value']) == '00:00:00')
-								$attributes['value']--;
-							$vcardData['end']		= $attributes['value'];
-							break;
-						case 'DTSTART':
-							$vcardData['start']		= $attributes['value'];
-							break;
-						case 'LOCATION':
-							$vcardData['location']	= $attributes['value'];
-							break;
-						case 'RRULE':
-							$recurence = $attributes['value'];
-							$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
-							// vCard 2.0 values for all types
-							if (preg_match('/UNTIL=([0-9T]+)/',$recurence,$matches))
-							{
-								$vcardData['recur_enddate'] = $vcal->_parseDateTime($matches[1]);
-							}
-							if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
-							{
-								$vcardData['recur_interval'] = (int) $matches[1];
-							}
-							$vcardData['recur_data'] = 0;
-							switch($type)
-							{
-								case 'W':
-								case 'WEEKLY':
-									$days = array();
-									if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))		// 1.0
-									{
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										$days = explode(' ',trim($recurenceMatches[2]));
-										if($recurenceMatches[3] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[3]);
-										$recur_days = $this->recur_days_1_0;
-									}
-									elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
-									{
-										$days = explode(',',$recurenceMatches[1]);
-										$recur_days = $this->recur_days;
-									}
-									if ($days)
-									{
-										foreach($recur_days as $id => $day)
-			            						{
-			            							if (in_array(strtoupper(substr($day,0,2)),$days))
-	            									{
-	            										$vcardData['recur_data'] |= $id;
-	            									}
-	            								}
-										$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
-									}
-									break;
-
-								case 'D':		// 1.0
-									if(!preg_match('/D(\d+) (.*)/',$recurence, $recurenceMatches)) break;
-									$vcardData['recur_interval'] = $recurenceMatches[1];
-									if($recurenceMatches[2] != '#0')
-										$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-									// fall-through
-								case 'DAILY':	// 2.0
-									$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-									break;
-
-								case 'M':
-									if(preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches))
-									{
-										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
-										if($recurenceMatches[1] > 1)
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-									}
-									elseif(preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
-									{
-										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
-										if($recurenceMatches[1] > 1)
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[4] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[4]);
-									}
-									break;
-								case 'MONTHLY':
-									$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
-										MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
-									break;
-
-								case 'Y':		// 1.0
-									if(!preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches)) break;
-									$vcardData['recur_interval'] = $recurenceMatches[1];
-									if($recurenceMatches[2] != '#0')
-										$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-									// fall-through
-								case 'YEARLY':	// 2.0
-									$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
-									break;
-							}
-							break;
-						case 'EXDATE':
-							$vcardData['recur_exception'] = $attributes['value'];
-							break;
-						case 'SUMMARY':
-							$vcardData['title']		= $attributes['value'];
-							break;
-						case 'UID':
-							$event['uid'] = $vcardData['uid'] = $attributes['value'];
-							if ($cal_id <= 0 && !empty($vcardData['uid']) && ($uid_event = $this->read($vcardData['uid'])))
-							{
-								$event['id'] = $uid_event['id'];
-								unset($uid_event);
-							}
-							// not use weak uids that might come from syncml clients
-							if (isset($event['uid']) && (strlen($event['uid']) < 20 || is_numeric($event['uid'])))
-							{
-								error_log ("unset weak uid");
-								unset ($event['uid']);
-							}
-						  break;
- 						case 'TRANSP':
-							$vcardData['non_blocking'] = $attributes['value'] == 'TRANSPARENT';
-							break;
-						case 'PRIORITY':
-							if ($this->productManufacturer == 'nexthaus corporation'
-								|| $this->productManufacturer == 'nexthaus corp')
-							{
-								$vcardData['priority'] = $attributes['value'] == 1 ? 3 : 2; // 1=high, 2=normal
-							}
-							else
-							{
- 								$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
-							}
- 							break;
- 						case 'CATEGORIES':
- 							if ($attributes['value'])
- 							{
-								$vcardData['category'] = $this->find_or_add_categories(explode(',',$attributes['value']));
-							}
-							else
-							{
- 								$vcardData['category'] = array();
-							}
- 							break;
- 						case 'ATTENDEE':
- 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
- 								($uid = $GLOBALS['egw']->accounts->name2id($matches[1],'account_email')))
- 							{
- 								$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
- 									$this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])] :
- 									($uid == $event['owner'] ? 'A' : 'U');
- 							}
- 							break;
- 						case 'ORGANIZER':	// will be written direct to the event
- 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
- 								($uid = $GLOBALS['egw']->accounts->name2id($matches[1],'account_email')))
- 							{
- 								$event['owner'] = $uid;
- 							}
- 							break;
- 						case 'CREATED':		// will be written direct to the event
- 							if ($event['modified']) break;
- 							// fall through
- 						case 'LAST-MODIFIED':	// will be written direct to the event
-							$event['modified'] = $attributes['value'];
-							break;
+						if($this->isWholeDay($event)
+							&& $this->nonBlockingAllday)
+						{
+							$event['non_blocking'] = 1;
+						}
 					}
-				}
-
-				// check if the entry is a birthday
-				// this field is only set from NOKIA clients
-				$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
-				if (!is_a($agendaEntryType, 'PEAR_Error')) {
-					if(strtolower($agendaEntryType) == 'anniversary') {
-						$event['special'] = '1';
-						$vcardData['end'] = $vcardData['start'] + 86399;
-					}
-				}
-
-				if(!empty($vcardData['recur_enddate']))
-				{
-					// reset recure_enddate to 00:00:00 on the last day
-					$vcardData['recur_enddate'] = mktime(0, 0, 0,
-						date('m',$vcardData['recur_enddate']),
-						date('d',$vcardData['recur_enddate']),
-						date('Y',$vcardData['recur_enddate'])
-					);
-				}
-				//echo "event=";_debug_array($vcardData);
-
-				while(($fieldName = array_shift($supportedFields)))
-				{
-					switch($fieldName)
+					if ($this->productManufacturer == '' && $this->productName == ''
+						&& !empty($event['recur_enddate']))
 					{
-						case 'recur_interval':
-						case 'recur_enddate':
-						case 'recur_data':
-						case 'recur_exception':
-						case 'alarms':
-							// not handled here
-							break;
-						case 'recur_type':
-							$event['recur_type'] = $vcardData['recur_type'];
-							if ($event['recur_type'] != MCAL_RECUR_NONE)
-							{
-								foreach(array('recur_interval','recur_enddate','recur_data','recur_exception') as $r)
-								{
-									if(isset($vcardData[$r]))
-									{
-										$event[$r] = $vcardData[$r];
-									}
-								}
-							}
-							break;
-						default:
-							if (isset($vcardData[$fieldName]))
-							{
-								$event[$fieldName] = $vcardData[$fieldName];
-							}
-							break;
+						// syncevolution needs an adjusted recur_enddate
+						$event['recur_enddate'] = (int)$event['recur_enddate'] + 86400;
 					}
 				}
-
 				return $event;
 			}
 		}
-
 		return false;
 	}
 
-	function search($_vcalData, $contentID=null)
+	/**
+	 * Parse an VEVENT
+	 *
+	 * @param array $component			VEVENT
+	 * @param string $version			vCal version (1.0/2.0)
+	 * @param array $supportedFields	supported fields of the device
+	 *
+	 * @return array|boolean			event on success, false on failure
+	 */
+	function vevent2egw(&$component, $version, $supportedFields)
 	{
-		if(!$event = $this->icaltoegw($_vcalData)) {
-			return false;
+		if (!is_a($component, 'Horde_iCalendar_vevent')) return false;
+
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
 		}
-		if ($event['uid'] && ($uidmatch = $this->read($event['uid'])))
+		else
 		{
-			return $uidmatch['id'];
+			$minimum_uid_length = 8;
 		}
 
-		$query = array(
-			'cal_start='.$this->date2ts($event['start'],true),	// true = Server-time
-			'cal_end='.$this->date2ts($event['end'],true),
+		$isDate = false;
+		$event		= array();
+		$alarms		= array();
+		$vcardData	= array(
+			'recur_type'		=> MCAL_RECUR_NONE,
+			'recur_exception'	=> array(),
 		);
-
-		if ($contentID) {
-			$query[] = 'egw_cal.cal_id='.(int)$contentID;
-		}
-
-		#foreach(array('title','location','priority','public','non_blocking') as $name) {
-		foreach(array('title','location','public','non_blocking') as $name) {
-			if (isset($event[$name])) $query['cal_'.$name] = $event[$name];
-		}
-
-		if($foundEvents = parent::search(array(
-			'user'  => $this->user,
-			'query' => $query,
-		))) {
-			if(is_array($foundEvents)) {
-				$event = array_shift($foundEvents);
-				return $event['id'];
+		// we parse DTSTART first
+		foreach ($component->_attributes as $attributes)
+		{
+			if ($attributes['name'] == 'DTSTART')
+			{
+				if (isset($attributes['params']['VALUE'])
+						&& $attributes['params']['VALUE'] == 'DATE')
+				{
+					$isDate = true;
+				}
+				$vcardData['start']		= $attributes['value'];
 			}
 		}
-		return false;
+		if (!isset($vcardData['start'])) return false; // not a valid entry
+
+		// lets see what we can get from the vcard
+		foreach ($component->_attributes as $attributes)
+		{
+			switch ($attributes['name'])
+			{
+				case 'AALARM':
+				case 'DALARM':
+					$alarmTime = $attributes['value'];
+					$alarms[$alarmTime] = array(
+						'time' => $alarmTime
+					);
+					break;
+				case 'CLASS':
+					$vcardData['public']		= (int)(strtolower($attributes['value']) == 'public');
+					break;
+				case 'DESCRIPTION':
+					$vcardData['description']	= $attributes['value'];
+					if (preg_match('/\s*\[UID:(.+)?\]/Usm', $attributes['value'], $matches)) {
+						if (!isset($vCardData['uid'])
+								&& strlen($matches[1]) >= $minimum_uid_length) {
+							$vcardData['uid'] = $matches[1];
+						}
+					}
+					break;
+				case 'DTEND':
+					$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
+					if(date('H:i:s',$dtend_ts) == '00:00:00') {
+						$dtend_ts -= 60;
+					}
+					$vcardData['end']		= $dtend_ts;
+					break;
+				case 'RECURRENCE-ID':
+					$vcardData['reference']	= $attributes['value'];
+					break;
+				case 'LOCATION':
+					$vcardData['location']	= $attributes['value'];
+					break;
+				case 'RRULE':
+					$recurence = $attributes['value'];
+					$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
+					// vCard 2.0 values for all types
+					if (preg_match('/UNTIL=([0-9T]+)/',$recurence,$matches))
+					{
+						$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($matches[1]);
+					}
+					elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
+					{
+						$vcardData['recur_count'] = (int)$matches[1];
+					}
+					if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
+					{
+						// 1 is invalid,, egw uses 0 for interval
+						$vcardData['recur_interval'] = (int) $matches[1] != 0 ? (int) $matches[1] : 0;
+					}
+					if (!isset($vcardData['start']))	// it might not yet be set, because the RRULE is before it
+					{
+						$vcardData['start'] = self::_get_attribute($component->_attributes,'DTSTART');
+						$vcardData['end'] = self::_get_attribute($component->_attributes,'DTEND');
+					}
+					$vcardData['recur_data'] = 0;
+					switch($type)
+					{
+						case 'W':
+						case 'WEEKLY':
+							$days = array();
+							if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))		// 1.0
+							{
+								$vcardData['recur_interval'] = $recurenceMatches[1];
+								$days = explode(' ',trim($recurenceMatches[2]));
+								if($recurenceMatches[3] != '#0')
+									$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[3]);
+								$recur_days = $this->recur_days_1_0;
+							}
+							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							{
+								$days = explode(',',$recurenceMatches[1]);
+								$recur_days = $this->recur_days;
+							}
+							else	// no day given, use the day of dtstart
+							{
+								$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
+								$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
+							}
+							if ($days)
+							{
+								foreach($recur_days as $id => $day) {
+									if (in_array(strtoupper(substr($day,0,2)),$days)) {
+										$vcardData['recur_data'] |= $id;
+									}
+								}
+								$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
+							}
+
+							if (!empty($vcardData['recur_count']))
+							{
+								$vcardData['recur_enddate'] = mktime(0,0,0,
+									date('m',$vcardData['start']),
+									date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)*7),
+									date('Y',$vcardData['start']));
+							}
+							break;
+
+						case 'D':	// 1.0
+							if(preg_match('/D(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
+								$vcardData['recur_interval'] = $recurenceMatches[1];
+								if($recurenceMatches[2] > 0 && $vcardData['end']) {
+									$vcardData['recur_enddate'] = mktime(
+										date('H', $vcardData['end']),
+										date('i', $vcardData['end']),
+										date('s', $vcardData['end']),
+										date('m', $vcardData['end']),
+										date('d', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
+										date('Y', $vcardData['end'])
+									);
+								}
+							} elseif(preg_match('/D(\d+) (.*)/', $recurence, $recurenceMatches)) {
+								$vcardData['recur_interval'] = $recurenceMatches[1];
+								if($recurenceMatches[2] != '#0') {
+									$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
+								}
+							} else {
+								break;
+							}
+							// fall-through
+						case 'DAILY':	// 2.0
+							$vcardData['recur_type'] = MCAL_RECUR_DAILY;
+
+							if (!empty($vcardData['recur_count']))
+							{
+								$vcardData['recur_enddate'] = mktime(0,0,0,
+									date('m',$vcardData['start']),
+									date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
+									date('Y',$vcardData['start']));
+							}
+							break;
+
+						case 'M':
+							if (preg_match('/MD(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
+								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
+								$vcardData['recur_interval'] = $recurenceMatches[1];
+								if($recurenceMatches[2] > 0 && $vcardData['end']) {
+									$vcardData['recur_enddate'] = mktime(
+										date('H', $vcardData['end']),
+										date('i', $vcardData['end']),
+										date('s', $vcardData['end']),
+										date('m', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
+										date('d', $vcardData['end']),
+										date('Y', $vcardData['end'])
+									);
+								}
+							}
+							elseif (preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches))
+							{
+								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
+								if($recurenceMatches[1] > 1)
+								{
+									$vcardData['recur_interval'] = $recurenceMatches[1];
+								}
+								if($recurenceMatches[2] != '#0')
+								{
+									$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
+								}
+							}
+							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
+							{
+								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
+								if ($recurenceMatches[1] > 1)
+								{
+									$vcardData['recur_interval'] = $recurenceMatches[1];
+								}
+								if ($recurenceMatches[4] != '#0')
+								{
+									$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[4]);
+								}
+							}
+							break;
+						case 'MONTHLY':
+							$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
+									MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
+
+							if (!empty($vcardData['recur_count']))
+							{
+								$vcardData['recur_enddate'] = mktime(0,0,0,
+									date('m',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
+									date('d',$vcardData['start']),
+									date('Y',$vcardData['start']));
+							}
+							break;
+
+						case 'Y':		// 1.0
+							if (preg_match('/YM(\d+) #(.\d)/', $recurence, $recurenceMatches))
+							{
+								$vcardData['recur_interval'] = $recurenceMatches[1];
+								if ($recurenceMatches[2] > 0 && $vcardData['end'])
+								{
+									$vcardData['recur_enddate'] = mktime(
+										date('H', $vcardData['end']),
+										date('i', $vcardData['end']),
+										date('s', $vcardData['end']),
+										date('m', $vcardData['end']),
+										date('d', $vcardData['end']),
+										date('Y', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval'])
+									);
+								}
+							}
+							elseif (preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches))
+							{
+								$vcardData['recur_interval'] = $recurenceMatches[1];
+								if($recurenceMatches[2] != '#0') {
+									$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
+								}
+							} else {
+								break;
+							}
+							// fall-through
+						case 'YEARLY':	// 2.0
+							$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
+
+							if (!empty($vcardData['recur_count']))
+							{
+								$vcardData['recur_enddate'] = mktime(0,0,0,
+									date('m',$vcardData['start']),
+									date('d',$vcardData['start']),
+									date('Y',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)));
+							}
+							break;
+					}
+					break;
+				case 'EXDATE':
+					if ((isset($attributes['params']['VALUE'])
+							&& $attributes['params']['VALUE'] == 'DATE') ||
+						(!isset($attributes['params']['VALUE']) && $isDate))
+					{
+						$days = array();
+						$hour = date('H', $vcardData['start']);
+						$minutes = date('i', $vcardData['start']);
+						$seconds = date('s', $vcardData['start']);
+						foreach ($attributes['values'] as $day)
+						{
+							$days[] = mktime(
+								$hour,
+								$minutes,
+								$seconds,
+								$day['month'],
+								$day['mday'],
+								$day['year']);
+						}
+						$vcardData['recur_exception'] = array_merge($vcardData['recur_exception'], $days);
+					}
+					else
+					{
+						$vcardData['recur_exception'] = array_merge($vcardData['recur_exception'], $attributes['values']);
+					}
+					break;
+				case 'SUMMARY':
+					$vcardData['title']		= $attributes['value'];
+					break;
+				case 'UID':
+					if (strlen($attributes['value']) >= $minimum_uid_length)
+					{
+						$event['uid'] = $vcardData['uid'] = $attributes['value'];
+					}
+					break;
+				case 'TRANSP':
+					if ($version == '1.0')
+					{
+						$vcardData['non_blocking'] = ($attributes['value'] == 1);
+					}
+					else
+					{
+						$vcardData['non_blocking'] = ($attributes['value'] == 'TRANSPARENT');
+					}
+					break;
+				case 'PRIORITY':
+					$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+					break;
+				case 'CATEGORIES':
+					if ($attributes['value'])
+					{
+						if($version == '1.0')
+						{
+							$vcardData['category'] = $this->find_or_add_categories(explode(';',$attributes['value']));
+						}
+						else
+						{
+							$vcardData['category'] = $this->find_or_add_categories(explode(',',$attributes['value']));
+						}
+					}
+					else
+					{
+						$vcardData['category'] = array();
+					}
+					break;
+				case 'ATTENDEE':
+				case 'ORGANIZER':	// will be written direct to the event
+					$cn = '';
+					if (preg_match('/MAILTO:([@.a-z0-9_-]+)|MAILTO:"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
+						$attributes['value'],$matches)) {
+						$email = $matches[1] ? $matches[1] : $matches[3];
+						$cn = isset($matches[2]) ? $matches[2]: '';
+					}
+					elseif (preg_match('/"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
+						$attributes['value'],$matches))
+						{
+						$cn = $matches[1];
+						$email = $matches[2];
+						}
+					elseif (strpos($attributes['value'],'@') !== false)
+					{
+						$email = $attributes['value'];
+					}
+					else
+					{
+						$email = false;	// no email given
+					}
+					$searcharray = array();
+					if ($email)
+					{
+						$searcharray = array('email' => $email, 'email_home' => $email);
+					}
+					if (isset($attributes['params']['CN']) && $attributes['params']['CN'])
+					{
+						if ($attributes['params']['CN'][0] == '"'
+							&& substr($attributes['params']['CN'],-1) == '"')
+						{
+							$attributes['params']['CN'] = substr($attributes['params']['CN'],1,-1);
+						}
+						$searcharray['n_fn'] = $attributes['params']['CN'];
+					}
+					elseif ($cn)
+					{
+						$searcharray['n_fn'] = $cn;
+					}
+					if (($uid = $attributes['params']['X-EGROUPWARE-UID'])
+							&& ($info = $this->resource_info($uid))
+							&& (!$email || $info['email'] == $email))
+					{
+						// we use the (checked) X-EGROUPWARE-UID
+					}
+					/*elseif($attributes['params']['CUTYPE'] == 'RESOURCE')
+					 {
+
+					 }*/
+					elseif ($attributes['value'] == 'Unknown')
+					{
+						$uid = $GLOBALS['egw_info']['user']['account_id'];
+					}
+					elseif ($email && ($uid = $GLOBALS['egw']->accounts->name2id($email,'account_email')))
+					{
+						// we use the account we found
+					}
+					elseif(!$searcharray)
+					{
+						continue;	// participants without email AND CN --> ignore it
+					}
+					elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
+						array('id','egw_addressbook.account_id as account_id','n_fn'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
+						{
+						$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
+						}
+					else
+					{
+						if (!$email)
+						{
+							$email = 'no-email@egroupware.org';	// set dummy email to store the CN
+						}
+						$uid = 'e'.($attributes['params']['CN'] ? $attributes['params']['CN'].' <'.$email.'>' : $email);
+					}
+					switch($attributes['name'])
+					{
+						case 'ATTENDEE':
+							if (isset($attributes['params']['PARTSTAT']))
+							{
+								$event['participants'][$uid] = $this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])];
+							}
+							elseif (isset($attributes['params']['STATUS']))
+							{
+								$event['participants'][$uid] = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
+							}
+							else
+							{
+								$event['participants'][$uid] = ($uid == $event['owner'] ? 'A' : 'U');
+							}
+							break;
+						case 'ORGANIZER':
+							if (is_numeric($uid))
+							{
+								$event['owner'] = $uid;
+							}
+							else
+							{
+								$event['owner'] = $this->user;
+							}
+							$event['participants'][$uid] = 'A';
+							break;
+					}
+					break;
+				case 'CREATED':		// will be written direct to the event
+					if ($event['modified']) break;
+					// fall through
+				case 'LAST-MODIFIED':	// will be written direct to the event
+					$event['modified'] = $attributes['value'];
+					break;
+			}
+		}
+
+		// check if the entry is a birthday
+		// this field is only set from NOKIA clients
+		$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
+		if (!is_a($agendaEntryType, 'PEAR_Error'))
+		{
+			if (strtolower($agendaEntryType) == 'anniversary')
+			{
+				$event['special'] = '1';
+				$event['non_blocking'] = 1;
+				// make it a whole day event for eGW
+				$vcardData['end'] = $vcardData['start'] + 86399;
+			}
+			elseif(strtolower($agendaEntryType) == 'event')
+			{
+				$event['special'] = '2';
+				$event['non_blocking'] = 1;
+			}
+		}
+
+		if (!empty($vcardData['recur_enddate']))
+		{
+			// reset recure_enddate to 00:00:00 on the last day
+			$vcardData['recur_enddate'] = mktime(0, 0, 0,
+				date('m',$vcardData['recur_enddate']),
+				date('d',$vcardData['recur_enddate']),
+				date('Y',$vcardData['recur_enddate'])
+			);
+		}
+
+		$event['priority'] = 2; // default
+		$event['alarm'] = $alarms;
+
+		// now that we know what the vard provides,
+		// we merge that data with the information we have about the device
+		while (($fieldName = array_shift($supportedFields)))
+		{
+			switch($fieldName)
+			{
+				case 'recur_interval':
+				case 'recur_enddate':
+				case 'recur_data':
+				case 'recur_exception':
+					// not handled here
+					break;
+
+				case 'recur_type':
+					$event['recur_type'] = $vcardData['recur_type'];
+					if ($event['recur_type'] != MCAL_RECUR_NONE)
+					{
+						$event['reference'] = 0;
+						foreach(array('recur_interval','recur_enddate','recur_data','recur_exception') as $r)
+						{
+							if(isset($vcardData[$r]))
+							{
+								$event[$r] = $vcardData[$r];
+							}
+						}
+					}
+					break;
+
+				default:
+					if (isset($vcardData[$fieldName]))
+					{
+						$event[$fieldName] = $vcardData[$fieldName];
+					}
+				break;
+			}
+		}
+		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
+        //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		return $event;
+	}
+
+	function search($_vcalData, $contentID=null, $relax=false)
+	{
+		$result = false;
+
+		if($event = $this->icaltoegw($_vcalData))
+		{
+			if ($contentID) {
+				$event['id'] = $contentID;
+			}
+			$result = $this->find_event($event, $relax);
+		}
+		return $result;
 	}
 
 	/**
@@ -1656,9 +1987,10 @@ class calendar_ical extends calendar_boupdate
 	 *
 	 * @param int $user account_id
 	 * @param mixed $end=null end-date, default now+1 month
+	 * @param boolean $servertime=false if true, use severtime for dates
 	 * @return string
 	 */
-	function freebusy($user,$end=null)
+	function freebusy($user,$end=null,$servertime=false)
 	{
 		if (!$end) $end = $this->now_su + 100*DAY_s;	// default next 100 days
 
@@ -1674,15 +2006,31 @@ class calendar_ical extends calendar_boupdate
 				$GLOBALS['egw']->accounts->id2name($user,'account_lastname'),
 				$GLOBALS['egw']->translation->charset(),'utf-8'),
 		);
-		foreach(array(
-			'URL' => $this->freebusy_url($user),
-			'DTSTART' => $this->date2ts($this->now_su,true),	// true = server-time
-			'DTEND' => $this->date2ts($end,true),	// true = server-time
-		  	'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
-			'DTSTAMP' => time(),
-		) as $attr => $value)
+		if ($servertime)
 		{
-			$vfreebusy->setAttribute($attr, $value, $parameters[$name]);
+			foreach(array(
+				'URL' => $this->freebusy_url($user),
+				'DTSTART' => date('Ymd\THis',$this->date2ts($this->now_su,true)),	// true = server-time
+				'DTEND' => date('Ymd\THis',$this->date2ts($end,true)),	// true = server-time
+		  		'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
+				'DTSTAMP' => date('Ymd\THis',time()),
+			) as $attr => $value)
+			{
+				$vfreebusy->setAttribute($attr, $value);
+			}
+		}
+		else
+		{
+			foreach(array(
+				'URL' => $this->freebusy_url($user),
+				'DTSTART' => $this->date2ts($this->now_su,true),	// true = server-time
+				'DTEND' => $this->date2ts($end,true),	// true = server-time
+		  		'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
+				'DTSTAMP' => time(),
+			) as $attr => $value)
+			{
+				$vfreebusy->setAttribute($attr, $value);
+			}
 		}
 		$fbdata = parent::search(array(
 					'start' => $this->now_su,
@@ -1697,10 +2045,20 @@ class calendar_ical extends calendar_boupdate
 			{
 				if ($event['non_blocking']) continue;
 
-				$vfreebusy->setAttribute('FREEBUSY',array(array(
-					'start' => $event['start'],
-					'end' => $event['end'],
-				)));
+				if ($servertime)
+				{
+					$vfreebusy->setAttribute('FREEBUSY',array(array(
+						'start' => date('Ymd\THis',$event['start']),
+						'end' => date('Ymd\THis',$event['end']),
+					)));
+				}
+				else
+				{
+					$vfreebusy->setAttribute('FREEBUSY',array(array(
+						'start' => $event['start'],
+						'end' => $event['end'],
+					)));
+				}
 			}
 		}
 		$vcal->addComponent($vfreebusy);
@@ -1708,36 +2066,35 @@ class calendar_ical extends calendar_boupdate
 		return $vcal->exportvCalendar();
 	}
 
-	function update_status($new_event,$old_event)
+	/**
+	 * update the status of all participant for a given recurrence or for all recurrences since now (includes recur_date=0)
+	 *
+	 * @param array $new_event event-array with the new stati
+	 * @param array $old_event event-array with the old stati
+	 * @param int $recur_date=0 date to change, or 0 = all since now
+	 */
+	function update_status($new_event, $old_event , $recur_date)
    	{
-       	$modified = $added = $deleted = array();
-		//error_log(__FILE__ . __METHOD__ . "\nnew_event:" . print_r($new_event,true));
-        
-		// check the old list against the new list and write the changes
-		foreach($old_event['participants'] as $old_userid => $old_status)
+		//error_log(__FILE__ . __METHOD__ . "\nold_event:" . print_r($old_event, true)
+		//			. "\nnew_event:" . print_r($new_event, true));
+
+		// check the old list against the new list
+		foreach ($old_event['participants'] as $userid => $status)
         {
-            if(isset($new_event['participants'][$old_userid])){
-				if($new_event['participants'][$old_userid] != $old_event['participants'][$old_userid]){
-                //$modified[$old_userid] = $new_event['participants'][$old_userid];
-					$this->set_status($old_event,$old_userid,$status = $new_event['participants'][$old_userid] ? $new_event['participants'][$old_userid] : 'R');
-        		}
-			}
-            else
-            {
-                // this doesn't get written from here at the moment
-				$deleted[$old_userid] = $old_status;
+            if(!isset($new_event['participants'][$userid])){
+            	// Attendee will be deleted this way
+            	$new_event['participants'][$userid] = 'G';
+            } elseif ($new_event['participants'][$userid] == $status){
+            	// Same status -- nothing to do.
+            	unset($new_event['participants'][$userid]);
             }
         }
-        // Find new participants ... 
-        foreach($new_event['participants'] as $new_userid => $new_status)
+        // write the changes
+        foreach ($new_event['participants'] as $userid => $status)
         {
-            if(!isset($old_event['participants'][$new_userid]))
-            {
-                // this doesn't get written from here at the moment
-				$added[$new_userid] = 'U';
-            }
+        	//error_log(__FILE__ . __METHOD__ . "\n$userid => $status:");
+			$this->set_status($old_event, $userid, $status, $recur_date, true);
         }
     }
 
-
 }
diff --git a/calendar/inc/class.calendar_sif.inc.php b/calendar/inc/class.calendar_sif.inc.php
index 85c1338a8e..13ae2c6fc0 100644
--- a/calendar/inc/class.calendar_sif.inc.php
+++ b/calendar/inc/class.calendar_sif.inc.php
@@ -4,6 +4,7 @@
  *
  * @link http://www.egroupware.org
  * @author Lars Kneschke <lkneschke@egroupware.org>
+ * @author Joerg Lehrke <jlehrke@noc.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package calendar
  * @subpackage export
@@ -21,6 +22,7 @@ class calendar_sif extends calendar_boupdate
 		'Start'				=> 'start',
 		'End'				=> 'end',
 		'AllDayEvent'			=> 'alldayevent',
+		'Attendees'			=> '',
 		'BillingInformation'		=> '',
 		'Body'				=> 'description',
 		'BusyStatus'			=> '',
@@ -33,6 +35,11 @@ class calendar_sif extends calendar_boupdate
 		'Mileage'			=> '',
 		'ReminderMinutesBeforeStart'	=> 'reminderstart',
 		'ReminderSet'			=> 'reminderset',
+		'ReminderSoundFile'		=> '',
+		'ReminderOptions'		=> '',
+		'ReminderInterval'		=> '',
+		'ReminderRepeatCount'		=> '',
+		'Exceptions'			=> '',
 		'ReplyTime'			=> '',
 		'Sensitivity'			=> 'public',
 		'Subject'			=> 'title',
@@ -51,6 +58,11 @@ class calendar_sif extends calendar_boupdate
 	// the calendar event array
 	var $event;
 
+	// device specific settings
+	var $productName = 'mozilla plugin';
+	var $productSoftwareVersion = '0.3';
+	var $uidExtension = false;
+
 	// constants for recurence type
 	const olRecursDaily	= 0;
 	const olRecursWeekly	= 1;
@@ -68,6 +80,10 @@ class calendar_sif extends calendar_boupdate
 	const olFriday = 32;
 	const olSaturday = 64;
 
+	// standard headers
+	const xml_decl = '<?xml version="1.0" encoding="UTF-8"?>';
+	const SIF_decl = '<SIFVersion>1.1</SIFVersion>';
+
 	function startElement($_parser, $_tag, $_attributes) {
 	}
 
@@ -87,14 +103,13 @@ class calendar_sif extends calendar_boupdate
 		$vcal		= new Horde_iCalendar;
 		$finalEvent	= array();
 		$sysCharSet	= $GLOBALS['egw']->translation->charset();
-		$sifData	= base64_decode($_sifdata);
 		#error_log($sifData);
 
-		$tmpfname = tempnam('/tmp/sync/contents','sife_');
+		#$tmpfname = tempnam('/tmp/sync/contents','sife_');
 
-		$handle = fopen($tmpfname, "w");
-		fwrite($handle, $sifData);
-		fclose($handle);
+		#$handle = fopen($tmpfname, "w");
+		#fwrite($handle, $sifData);
+		#fclose($handle);
 
 		$this->xml_parser = xml_parser_create('UTF-8');
 		xml_set_object($this->xml_parser, $this);
@@ -111,11 +126,13 @@ class calendar_sif extends calendar_boupdate
 		#error_log(print_r($this->event, true));
 
 		foreach($this->event as $key => $value) {
+			$value = preg_replace('/<\!\[CDATA\[(.+)\]\]>/Usim', '$1', $value);
 			$value = $GLOBALS['egw']->translation->convert($value, 'utf-8', $sysCharSet);
 			#error_log("$key => $value");
 			switch($key) {
 				case 'alldayevent':
 					if($value == 1) {
+						$finalEvent['whole_day'] = true;
 						$startParts = explode('-',$this->event['start']);
 						$finalEvent['start'] = mktime(0, 0, 0, $startParts[1], $startParts[2], $startParts[0]);
 						$endParts = explode('-',$this->event['end']);
@@ -191,6 +208,11 @@ class calendar_sif extends calendar_boupdate
 					// do nothing, get's handled in isrecuring clause
 					break;
 
+				case 'description':
+					if (preg_match('/\s*\[UID:(.+)?\]/Usm', $value, $matches)) {
+						$finalEvent['uid'] = $matches[1];
+					}
+
 				default:
 					$finalEvent[$key] = $value;
 					break;
@@ -205,69 +227,32 @@ class calendar_sif extends calendar_boupdate
 		return $finalEvent;
 	}
 
-	function search($_sifdata, $contentID=null) {
-		if(!$event = $this->siftoegw($_sifdata)) {
-			return false;
-		}
+	function search($_sifdata, $contentID=null, $relax=false)
+	{
+		$result = false;
 
-		$query = array(
-			'cal_start='.$this->date2ts($event['start'],true),	// true = Server-time
-			'cal_end='.$this->date2ts($event['end'],true),
-		);
-		
-		if ($contentID) {
-			$query[] = 'egw_cal.cal_id='.(int)$contentID;
-		}
-		
-		#foreach(array('title','location','priority','public','non_blocking') as $name) {
-		foreach(array('title','location','public','non_blocking') as $name) {
-			if (isset($event[$name])) $query['cal_'.$name] = $event[$name];
-		}
-
-		if($foundEvents = parent::search(array(
-			'user'  => $this->user,
-			'query' => $query,
-		))) {
-			if(is_array($foundEvents)) {
-				$event = array_shift($foundEvents);
-				return $event['id'];
+		if($event = $this->siftoegw($_sifdata))
+		{
+			if ($contentID) {
+				$event['id'] = $contentID;
 			}
+			$result = $this->find_event($event, $relax);
 		}
-		return false;
-
-		$search['start'] = $event['start'];
-		$search['end']	= $event['end'];
-
-		unset($event['description']);
-		unset($event['start']);
-		unset($event['end']);
-
-		foreach($event as $key => $value) {
-			if (substr($key,0,6) != 'recur_' && substr($key,0,5) != 'alarm') {
-				$search['query']['cal_'.$key] = $value;
-			} else {
-				#$search['query'][$key] = $value;
-			}
-		}
-
-		if($foundEvents = parent::search($search)) {
-			if(is_array($foundEvents)) {
-				$event = array_shift($foundEvents);
-				return $event['id'];
-			}
-		}
-
-		return false;
+		return $result;
 	}
 
 	/**
 	* @return int contact id
 	* @param string	$_vcard		the vcard
 	* @param int	$_abID		the internal addressbook id
+	* @param boolean $merge=false	merge data with existing entry
 	* @desc import a vard into addressbook
 	*/
-	function addSIF($_sifdata, $_calID)
+	function addSIF($_sifdata, $_calID, $merge=false)
 	{
+		$state = &$_SESSION['SyncML.state'];
+		$deviceInfo = $state->getClientDeviceInfo();
+
 		$calID = false;
 
 		#error_log('ABID: '.$_abID);
@@ -282,10 +267,16 @@ class calendar_sif extends calendar_boupdate
 			unset($event['alarm']);
 		}
 
-		if($_calID > 0)
-		{
+		if($_calID > 0)	{
 			// update entry
 			$event['id'] = $_calID;
+		} else {
+			if (isset($event['whole_day']) && $event['whole_day']
+				&& isset ($deviceInfo) && is_array($deviceInfo)
+				&& isset($deviceInfo['nonBlockingAllday'])
+				&& $deviceInfo['nonBlockingAllday']) {
+				$event['non_blocking'] = '1';
+			}
 		}
 
 		if($eventID = $this->update($event, TRUE)) {
@@ -308,14 +299,15 @@ class calendar_sif extends calendar_boupdate
 	}
 
 	/**
-	* return a vcard
+	* return a sife
 	*
-	* @param int	$_id		the id of the contact
-	* @param int	$_vcardProfile	profile id for mapping from vcard values to egw addressbook
+	* @param int	$_id		the id of the event
 	* @return string containing the vcard
 	*/
 	function getSIF($_id)
 	{
+		$sysCharSet	= $GLOBALS['egw']->translation->charset();
+
 		$fields = array_unique(array_values($this->sifMapping));
 		sort($fields);
 
@@ -323,11 +315,17 @@ class calendar_sif extends calendar_boupdate
 		#error_log("FOUND EVENT: ". print_r($event, true));
 
 		if($event = $this->read($_id,null,false,'server')) {
-			$sysCharSet	= $GLOBALS['egw']->translation->charset();
-			$vcal		= new Horde_iCalendar;
+
+			if ($this->uidExtension) {
+				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
+					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+				}
+			}
+
+			$vcal		= &new Horde_iCalendar('1.0');
 
 
-			$sifEvent = '<appointment>';
+			$sifEvent = self::xml_decl . "\n<appointment>" . self::SIF_decl;
 
 			foreach($this->sifMapping as $sifField => $egwField)
 			{
@@ -340,14 +338,6 @@ class calendar_sif extends calendar_boupdate
 
 				switch($sifField)
 				{
-					case 'Categories':
-						if(!empty($value)) {
-							$value = implode('; ', $this->get_categories(explode(',',$value)));
-							$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
-						}
-						$sifEvent .= "<$sifField>$value</$sifField>";
-						break;
-
 					case 'Importance':
 						$value = $value-1;
 						$sifEvent .= "<$sifField>$value</$sifField>";
@@ -437,6 +427,48 @@ class calendar_sif extends calendar_boupdate
 									$sifEvent .= '<Occurrences>'. $occurrences .'</Occurrences>';
 								}
 								break;
+							case MCAL_RECUR_MONTHLY_MDAY:
+								$eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1);
+								$recurStartDate = mktime(0,0,0,date('m',$event['start']), date('d', $event['start']), date('Y', $event['start']));
+
+								$sifEvent .= "<$sifField>1</$sifField>";
+								$sifEvent .= '<RecurrenceType>'. self::olRecursMonthly .'</RecurrenceType>';
+								$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
+								$sifEvent .= '<PatternStartDate>'. $vcal->_exportDateTime($recurStartDate) .'</PatternStartDate>';
+								if($event['recur_enddate'] == 0) {
+									$sifEvent .= '<NoEndDate>1</NoEndDate>';
+								} else {
+									$recurEndDate = mktime(24, 0, 0, date('m',$event['recur_enddate']), date('d', $event['recur_enddate']), date('Y', $event['recur_enddate']));
+
+									$sifEvent .= '<NoEndDate>0</NoEndDate>';
+									$sifEvent .= '<PatternEndDate>'. $vcal->_exportDateTime($recurEndDate) .'</PatternEndDate>';
+								}
+								break;
+							case MCAL_RECUR_MONTHLY_WDAY:
+								$weekMaskMap = array('Sun' => self::olSunday, 'Mon' => self::olMonday, 'Tue' => self::olTuesday,
+													 'Wed' => self::olWednesday, 'Thu' => self::olThursday, 'Fri' => self::olFriday,
+													 'Sat' => self::olSaturday);
+								$eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1);
+								$recurStartDate = mktime(0,0,0,date('m',$event['start']), date('d', $event['start']), date('Y', $event['start']));
+
+								$sifEvent .= "<$sifField>1</$sifField>";
+								$sifEvent .= '<RecurrenceType>'. self::olRecursMonthNth .'</RecurrenceType>';
+								$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
+								$sifEvent .= '<PatternStartDate>'. $vcal->_exportDateTime($recurStartDate) .'</PatternStartDate>';
+								$sifEvent .= '<Instance>' . (1 + (int) ((date('d',$event['start'])-1) / 7)) . '</Instance>';
+								if($event['recur_enddate'] == 0) {
+									$sifEvent .= '<NoEndDate>1</NoEndDate>';
+									$sifEvent .= '<DayOfWeekMask>' . $weekMaskMap[date('D',$event['start'])] . '</DayOfWeekMask>';
+								} else {
+									$recurEndDate = mktime(24, 0, 0, date('m',$event['recur_enddate']), date('d', $event['recur_enddate']), date('Y', $event['recur_enddate']));
+
+									$sifEvent .= '<NoEndDate>0</NoEndDate>';
+									$sifEvent .= '<PatternEndDate>'. $vcal->_exportDateTime($recurEndDate) .'</PatternEndDate>';
+									$sifEvent .= '<DayOfWeekMask>' . $weekMaskMap[date('D',$event['start'])] . '</DayOfWeekMask>';
+								}
+								break;
+							case MCAL_RECUR_YEARLY:
+								break;
 						}
 						break;
 
@@ -456,9 +488,10 @@ class calendar_sif extends calendar_boupdate
 						break;
 
 					case 'Start':
-						if($event['end'] - $event['start'] == 86399 && date('Y-m-d', $event['end']) == date('Y-m-d', $event['start'])) {
+						if ($this->isWholeDay($event)) {
 							$value = date('Y-m-d', $event['start']);
 							$sifEvent .= "<Start>$value</Start>";
+							$vaule = date('Y-m-d', $event['end']);
 							$sifEvent .= "<End>$value</End>";
 							$sifEvent .= "<AllDayEvent>1</AllDayEvent>";
 						} else {
@@ -487,14 +520,23 @@ class calendar_sif extends calendar_boupdate
 						}
 						break;
 
+					case 'Categories':
+						if(!empty($value)) {
+							$value = implode('; ', $this->get_categories(explode(',',$value)));
+							$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
+						} else {
+							break;
+						}
+
 					default:
+						$value = @htmlspecialchars($value, ENT_QUOTES, 'utf-8');
 						$sifEvent .= "<$sifField>$value</$sifField>";
 						break;
 				}
 			}
 			$sifEvent .= '</appointment>';
 
-			return base64_encode($sifEvent);
+			return $sifEvent;
 		}
 
 		if($this->xmlrpc)
@@ -504,4 +546,31 @@ class calendar_sif extends calendar_boupdate
 		return False;
 	}
 
+	/**
+	* Set the supported fields
+	*
+	* Currently we only store name and version, manucfacturer is always Funambol
+	*
+	* @param string $_productName
+	* @param string $_productSoftwareVersion
+	*/
+	function setSupportedFields($_productName='', $_productSoftwareVersion='')
+	{
+		$state = &$_SESSION['SyncML.state'];
+		$deviceInfo = $state->getClientDeviceInfo();
+
+		if(isset($deviceInfo) && is_array($deviceInfo)) {
+			if(isset($deviceInfo['uidExtension']) &&
+				$deviceInfo['uidExtension']){
+					$this->uidExtension = true;
+				}
+		}
+		// store product name and version, to be able to use it elsewhere
+		if ($_productName) {
+			$this->productName = strtolower($_productName);
+			if (preg_match('/^[^\d]*(\d+\.?\d*)[\.|\d]*$/', $_productSoftwareVersion, $matches)) {
+				$this->productSoftwareVersion = $matches[1];
+			}
+		}
+	}
 }
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 8d07d90ce9..069e1cfeb3 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -5,7 +5,8 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2005-9 by RalfBecker-At-outdoor-training.de
+ * @author Joerg Lehrke <jlehrke@noc.de>
+ * @copyright (c) 2005-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -105,12 +106,18 @@ class calendar_so
 	 *
 	 * All times (start, end and modified) are returned as timesstamps in servertime!
 	 *
-	 * @param int|array/string $ids id or array of id's of the entries to read, or string with a single uid
+	 * @param int|array|string $ids id or array of id's of the entries to read, or string with a single uid
 	 * @param int $recur_date=0 if set read the next recurrance at or after the timestamp, default 0 = read the initital one
 	 * @return array|boolean array with id => data pairs or false if entry not found
 	 */
 	function read($ids,$recur_date=0)
 	{
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		} else {
+			$minimum_uid_length = 8;
+		}
+
 		//echo "<p>socal::read(".print_r($ids,true).",$recur_date)<br />\n".function_backtrace()."<p>\n";
 
 		$table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
@@ -131,7 +138,9 @@ class calendar_so
 		}
 		else
 		{
+			// We only what the parents to match
 			$where['cal_uid'] = $ids;
+			$where['cal_reference'] = 0;
 		}
 		if ((int) $recur_date)
 		{
@@ -153,6 +162,15 @@ class calendar_so
 		}
 		if (!$events) return false;
 
+		foreach ($events as $event) {
+			if (!isset($event['uid']) || strlen($event['uid']) < $minimum_uid_length) {
+				// event (without uid), not strong enough uid => create new uid
+				$event['uid'] = $GLOBALS['egw']->common->generate_uid('calendar',$event['id']);
+				$this->db->update($this->cal_table, array('cal_uid' => $event['uid']),
+					array('cal_id' => $event['id']),__LINE__,__FILE__,'calendar');
+			}
+		}
+
 		// check if we have a real recurance, if not set $recur_date=0
 		if (is_array($ids) || $events[(int)$ids]['recur_type'] == MCAL_RECUR_NONE)
 		{
@@ -222,7 +240,7 @@ class calendar_so
 		$sql = '';
 		if ($cat_id)
 		{
-			if (!is_array($cat_ids) && !@$GLOBALS['egw_info']['user']['preferences']['common']['cats_no_subs'])
+			if (!is_array($cat_id) && !@$GLOBALS['egw_info']['user']['preferences']['common']['cats_no_subs'])
 			{
 				$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
 			}
@@ -260,12 +278,11 @@ class calendar_so
 	 * @param string|array $_cols=null what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date"
 	 *                     if specified an iterator for the rows is returned
 	 * @param string $append='' SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @return array|boolean|iterator of cal_id => event pairs, or false if error in the parameters, or iterator if !is_null($_cols)
+	 * @return array of cal_ids, or false if error in the parameters
 	 *
 	 * ToDo: search custom-fields too
 	 */
-	function &search($start,$end,$users,$cat_id=0,$filter='',$query='',$offset=False,$num_rows=0,$order = 'cal_start',$show_rejected=true,
-		$_cols=null,$append='')
+	function &search($start,$end,$users,$cat_id=0,$filter='',$query='',$offset=False,$num_rows=0,$order='cal_start',$show_rejected=true,$_cols=null,$append='')
 	{
 		//echo '<p>'.__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($query).",$offset,$num_rows,$order,$show_rejected,".array2string($_cols).",$append)</p>\n";
 
@@ -344,6 +361,7 @@ class calendar_so
 
 				$selects[0]['cols'] = $selects[1]['cols'] = $select['cols'];	// restore the original cols
 			}
+			// error_log("calendar_so_search:\n" . print_r($selects, true));
 			$rs = $this->db->union($selects,__LINE__,__FILE__,$order,$offset,$num_rows);
 		}
 		else	// MsSQL oder MySQL 3.23
@@ -487,6 +505,12 @@ ORDER BY cal_user_type, cal_usre_id
 	 */
 	function save($event,&$set_recurrences,$change_since=0,&$etag=null)
 	{
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
+		} else {
+			$minimum_uid_length = 8;
+		}
+
 		//echo "<p>socal::save(,$change_since) event="; _debug_array($event);
 		//error_log(__METHOD__."(".str_replace(array("\n",'    '),'',print_r($event,true)).",$set_recurrences,$change_since,$etag)");
 
@@ -520,9 +544,17 @@ ORDER BY cal_user_type, cal_usre_id
 				return 0;	// wrong etag, someone else updated the entry
 			}
 			if (!is_null($etag)) ++$etag;
+			//  events need to have at least one participant, default to the owner
+			if (!isset($event['cal_participants'])) {
+				$event['cal_participants'] = array($event['cal_owner'] => 'A');
+			}
+			if (!isset($event['cal_participants'][$event['cal_owner']])) {
+				$event['cal_participants'][$event['cal_owner']] = 'A';
+			}
 		}
 		else
 		{
+			// new event
 			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
 			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
@@ -532,45 +564,54 @@ ORDER BY cal_user_type, cal_usre_id
 			{
 				return false;
 			}
-			// new event (without uid), not strong enough uid or new created referencing event => create new uid
-			if (strlen($event['cal_uid']) < 20 || is_numeric($event['cal_uid']) ||
-				$event['cal_reference'] && strpos($event['cal_uid'],'cal-'.$event['calreference'].'-') !== false)
-			{
-				$event['cal_uid'] = $GLOBALS['egw']->common->generate_uid('calendar',$cal_id);
-				$this->db->update($this->cal_table,array('cal_uid' => $event['cal_uid']),array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
-			}
 			$etag = 0;
 			// new events need to have at least one participant, default to the owner
-			if (!isset($event['cal_participants']))
-			{
+			if (!isset($event['cal_participants'])) {
 				$event['cal_participants'] = array($event['cal_owner'] => 'A');
 			}
+			if (!isset($event['cal_participants'][$event['cal_owner']])) {
+				$event['cal_participants'][$event['cal_owner']] = 'A';
+			}
+		}
+		if (!isset($event['cal_uid']) || strlen($event['cal_uid']) < $minimum_uid_length
+				|| ($event['cal_reference'] && strpos($event['cal_uid'],
+							'cal-'.$event['calreference'].'-') !== false)) {
+			// event (without uid), not strong enough uid
+			// or new created referencing event => create new uid
+			$event['cal_uid'] = $GLOBALS['egw']->common->generate_uid('calendar',$cal_id);
+			$this->db->update($this->cal_table, array('cal_uid' => $event['cal_uid']),
+				array('cal_id' => $event['cal_id']),__LINE__,__FILE__,'calendar');
 		}
 		// write information about recuring event, if recur_type is present in the array
 		if (isset($event['recur_type']))
 		{
+			// save the original start
+			$min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchSingle();
+
 			if (isset($event['recur_exception']) && is_array($event['recur_exception']) && count($event['recur_exception']))
 			{
-				// delete execeptions from the user and dates table, it could be the first time
+				// delete the execeptions from the user and dates table, it could be the first time
 				$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
 				$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
-
-				$event['recur_exception'] = implode(',',$event['recur_exception']);
 			}
 			else
 			{
-				$event['recur_exception'] = null;
+				$event['recur_exception'] = array();
 			}
 			if (!$set_recurrences)
 			{
-				// check if the recure-information changed
+				// check if the recurrence-information changed
 				$old_recur = $this->db->select($this->repeats_table,'*',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
 				$old_exceptions = $old_recur['recur_exception'] ? explode(',',$old_recur['recur_exception']) : array();
-				$exceptions = $event['recur_exception'] ? explode(',',$event['recur_exception']) : array();
-				$set_recurrences = $event['recur_type'] != $old_recur['recur_type'] || $event['recur_data'] != $old_recur['recur_data'] ||
-					$event['recur_interval'] != $old_recur['recur_interval'] || $event['recur_enddate'] != $old_recur['recur_enddate'] ||
-					count(array_diff($old_exceptions,$exceptions));	// exception deleted or added
+				$set_recurrences = (isset($event['cal_start']) && (int)$min != (int) $event['cal_start']) ||
+				    $event['recur_type'] != $old_recur['recur_type'] || $event['recur_data'] != $old_recur['recur_data'] ||
+					(int)$event['recur_interval'] != (int)$old_recur['recur_interval'] || $event['recur_enddate'] != $old_recur['recur_enddate'] ||
+					count(array_diff($old_exceptions,$event['recur_exception']));	// exception deleted or added
+				$max = (int) $this->db->select($this->dates_table,'MAX(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchSingle();
+			} else {
+				$max = 0;
 			}
+			$event['recur_exception'] = empty($event['recur_exception']) ? null : implode(',',$event['recur_exception']);
 			unset($event[0]);	// unset the 'etag=etag+1', as it's not in the repeats table
 			if($event['recur_type'] != MCAL_RECUR_NONE)
 			{
@@ -582,17 +623,21 @@ ORDER BY cal_user_type, cal_usre_id
 			}
 			if ($set_recurrences)
 			{
+				if ((int)$min != (int)$event['cal_start'])
+				{
+					// We need to reset all recurrences
+					$max = -1;
+				}
 				// delete all, but the lowest dates record
-				$min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
-
 				$this->db->delete($this->dates_table,array(
 					'cal_id' => $cal_id,
 					'cal_start > '.(int)$min,
 				),__LINE__,__FILE__,'calendar');
-				// delete all user-records, with recur-date != 0
+
+				// delete all user-records, with recur-date > old enddate
 				$this->db->delete($this->user_table,array(
 					'cal_id' => $cal_id,
-					'cal_recur_date != 0',
+					'cal_recur_date > '.(int)$max,
 				),__LINE__,__FILE__,'calendar');
 			}
 		}
@@ -647,10 +692,10 @@ ORDER BY cal_user_type, cal_usre_id
 				}
 
 				//pgoerzen: don't add an alarm if it is before the current date.
-				if ($event['recur_type'] && ($tmp_event = $this->read($eventID, time() + $alarm['offset'])))
+				/*if ($event['recur_type'] && ($tmp_event = $this->read($eventID, time() + $alarm['offset'])))
 				{
 					$alarm['time'] = $tmp_event['cal_start'] - $alarm['offset'];
-				}
+				} */
 
 				$this->save_alarm($cal_id,$alarm);
 			}
@@ -708,7 +753,7 @@ ORDER BY cal_user_type, cal_usre_id
 		{
 			// move the recur-date of the participants
 			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
-				((int)$change_since ? '>= '.(int)$change_since : '!= 0'),__LINE__,__FILE__);
+				((int)$change_since ? '>= '.(int)$change_since : '!= 0') + " ORDER BY cal_recur_date DESC",__LINE__,__FILE__);
 		}
 		if ($move_start || $move_end)
 		{
@@ -762,7 +807,6 @@ ORDER BY cal_user_type, cal_usre_id
 	 * @param int $cal_id
 	 * @param array $participants id => status pairs
 	 * @param int|boolean $change_since=0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
-	 * @param int $recur_date=0 time of which repetitions should be updated, default 0=all
 	 * @return int|boolean number of updated recurrences or false on error
 	 */
 	function participants($cal_id,$participants,$change_since=0)
@@ -786,6 +830,7 @@ ORDER BY cal_user_type, cal_usre_id
 		if ($change_since !== false)	// existing entries only
 		{
 			// delete not longer set participants
+			$where[0] = 'cal_recur_date=0';
 			$deleted = array();
 			foreach($this->db->select($this->user_table,'DISTINCT cal_user_type,cal_user_id,cal_quantity',$where,
 				__LINE__,__FILE__,false,'','calendar') as $row)
@@ -795,11 +840,15 @@ ORDER BY cal_user_type, cal_usre_id
 				{
 					$deleted[$row['cal_user_type']][] = $row['cal_user_id'];
 				}
-				elseif($row['cal_quantity'] == (substr($participants[$uid],1) ? substr($participants[$uid],1) : 1))
+				elseif((($row['cal_user_type'] == 'r') &&
+					// quantity of resource unchanged
+					($row['cal_quantity'] == (substr($participants[$uid],1) ? substr($participants[$uid],1) : 1))) ||
+					($row['cal_status'] == $participants[$uid]))
 				{
-					unset($participants[$uid]);	// we dont touch them
+					unset($participants[$uid]);	// we don't touch them
 				}
 			}
+			unset($where[0]);
 
 			if (count($deleted))
 			{
@@ -815,21 +864,32 @@ ORDER BY cal_user_type, cal_usre_id
 				$this->db->delete($this->user_table,$where + array('('.implode(' OR ',$to_or).')'),__LINE__,__FILE__,'calendar');
 			}
 		}
-		if (count($participants))	// these are NEW participants now
+		if (count($participants))	// these are ALL participants now - we exclude the existing ones later
 		{
 			// find all recurrences, as they all need the new parts to be added
 			$recurrences = array();
+			$existing_participants = array();
+
 			if ($change_since !== false)	// existing entries only
 			{
 				foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
 				{
 					$recurrences[] = $row['cal_recur_date'];
 				}
+
+				// existing participants must not be updated
+				foreach($this->db->select($this->user_table,'DISTINCT cal_user_type,cal_user_id',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+				{
+					$existing_participants[] = $this->combine_user($row['cal_user_type'],$row['cal_user_id']);
+				}
 			}
 			if (!count($recurrences)) $recurrences[] = 0;	// insert the default one
 
 			foreach($participants as $uid => $status)
 			{
+				if (in_array($uid,$existing_participants)) continue; // don't update existing participants
+
+				$id = null;
 				$this->split_user($uid,$type,$id);
 				foreach($recurrences as $recur_date)
 				{
@@ -854,7 +914,7 @@ ORDER BY cal_user_type, cal_usre_id
 	 * @param int $cal_id
 	 * @param char $user_type 'u' regular user, 'r' resource, 'c' contact
 	 * @param int $user_id
-	 * @param int|string $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
+	 * @param int|char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
 	 * @param int $recur_date=0 date to change, or 0 = all since now
 	 * @return int number of changed recurrences
 	 */
@@ -897,7 +957,7 @@ ORDER BY cal_user_type, cal_usre_id
 			),$where,__LINE__,__FILE__,'calendar');
 		}
 		$ret = $this->db->affected_rows();
-		error_log(__METHOD__."($cal_id,$user_type,$user_id,$status,$recur_date) = $ret");
+		//error_log(__METHOD__."($cal_id,$user_type,$user_id,$status,$recur_date) = $ret");
 		return $this->db->affected_rows();
 	}
 
@@ -923,6 +983,8 @@ ORDER BY cal_user_type, cal_usre_id
 		{
 			if ($status == 'G') continue;	// dont save group-invitations
 
+			$type = '';
+			$id = null;
 			$this->split_user($uid,$type,$id);
 			$this->db->insert($this->user_table,array(
 				'cal_status'	 => $status !== true ? $status[0] : 'U',
@@ -1024,9 +1086,10 @@ ORDER BY cal_user_type, cal_usre_id
 	 *
 	 * @param int $cal_id Id of the calendar-entry
 	 * @param array $alarm array with fields: text, owner, enabled, ..
+	 * @param timestamp $now_su=0 timestamp for modification of related event
 	 * @return string id of the alarm
 	 */
-	function save_alarm($cal_id,$alarm)
+	function save_alarm($cal_id, $alarm, $now_su = 0)
 	{
 		//echo "<p>save_alarm(cal_id=$cal_id, alarm="; print_r($alarm); echo ")</p>\n";
 		if (!($id = $alarm['id']))
@@ -1050,6 +1113,13 @@ ORDER BY cal_user_type, cal_usre_id
 		{
 			return False;
 		}
+
+		// update the modification information of the related event
+		$datetime = $GLOBALS['egw']->datetime;
+		$now = ($now_su ? $now_su : time() + $datetime->this->tz_offset);
+		$modifier = $GLOBALS['egw_info']['user']['account_id'];
+                $this->db->update($this->cal_table, array('cal_modified' => $now, 'cal_modifier' => $modifier),
+			array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		return $id;
 	}
 
@@ -1074,10 +1144,20 @@ ORDER BY cal_user_type, cal_usre_id
 	 * delete one alarms identified by its id
 	 *
 	 * @param string $id alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
+	 * @param timestamp $now_su=0 timestamp for modification of related event
 	 * @return int number of alarms deleted
 	 */
-	function delete_alarm($id)
+	function delete_alarm($id, $now_su = 0)
 	{
+		// update the modification information of the related event
+		list(,$cal_id) = explode(':',$id);
+		if ($cal_id) {
+			$datetime = $GLOBALS['egw']->datetime;
+			$now = ($now_su ? $now_su : time() + $datetime->this->tz_offset);
+			$modifier = $GLOBALS['egw_info']['user']['account_id'];
+                	$this->db->update($this->cal_table, array('cal_modified' => $now, 'cal_modifier' => $modifier),
+				array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
+		}
 		return $this->async->cancel_timer($id);
 	}
 
@@ -1087,7 +1167,7 @@ ORDER BY cal_user_type, cal_usre_id
 	 * @param array|int $old_user integer old user or array with keys 'account_id' and 'new_owner' as the deleteaccount hook uses it
 	 * @param int $new_user=null
 	 */
-	function deleteaccount($data)
+	function deleteaccount($old_user, $newuser=null)
 	{
 		if (is_array($old_user))
 		{
@@ -1096,6 +1176,8 @@ ORDER BY cal_user_type, cal_usre_id
 		}
 		if (!(int)$new_user)
 		{
+			$user_type = '';
+			$user_id = null;
 			$this->split_user($old_user,$user_type,$user_id);
 
 			if ($user_type == 'u')	// only accounts can be owners of events
@@ -1144,4 +1226,134 @@ ORDER BY cal_user_type, cal_usre_id
 			),__LINE__,__FILE__,'calendar');
 		}
 	}
+
+	/**
+	 * get stati of all recurrences of an event for a specific participant
+	 *
+	 * @param int $cal_id
+	 * @param int $uid participant uid
+	 * @return array recur_date => status pairs (index 0 => main status)
+	 */
+	function get_recurrences($cal_id, $uid)
+	{
+		$user_type = $user_id = null;
+		$this->split_user($uid, $user_type, $user_id);
+		$participant_status = array();
+		$where = array('cal_id' => $cal_id);
+		foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+		{
+			// inititalize the array
+			$participant_status[$row['cal_recur_date']] = null;
+		}
+		$where = array(
+			'cal_id'		=> $cal_id,
+			'cal_user_type'	=> $user_type ? $user_type : 'u',
+			'cal_user_id'   => $user_id,
+		);
+		foreach ($this->db->select($this->user_table,'cal_recur_date,cal_status',$where,
+				__LINE__,__FILE__,false,'','calendar') as $row)
+		{
+			$participant_status[$row['cal_recur_date']] = $row['cal_status'];
+		}
+		return $participant_status;
+	}
+
+	/**
+	 * get all participants of an event
+	 *
+	 * @param int $cal_id
+	 * @param int $recur_date=0 gives participants of this recurrence, default 0=all
+	 *
+	 * @return array participants
+	 */
+	function get_participants($cal_id, $recur_date=0)
+	{
+		$participants = array();
+		$where = array('cal_id' => $cal_id);
+		if ($recur_date)
+		{
+			$where['cal_recur_date'] = $recur_date;
+		}
+
+		foreach ($this->db->select($this->user_table,'DISTINCT cal_user_type,cal_user_id', $where,
+				__LINE__,__FILE__,false,'','calendar') as $row)
+		{
+			$uid = $this->combine_user($row['cal_user_type'], $row['cal_user_id']);
+			$id = $row['cal_user_type'] . $row['cal_user_id'];
+			$participants[$id]['type'] = $row['cal_user_type'];
+			$participants[$id]['id'] = $row['cal_user_id'];
+			$participants[$id]['uid'] = $uid;
+		}
+		return $participants;
+	}
+
+	/**
+	 * get all releated events
+	 *
+	 * @param int $uid					UID of the series
+	 *
+	 * @return array of event exception ids for all events which share $uid
+	 */
+	function get_related($uid)
+	{
+		$where = array(
+			'cal_uid'		=> $uid,
+		);
+		$related = array();
+		foreach ($this->db->select($this->cal_table,'cal_id,cal_reference',$where,
+				__LINE__,__FILE__,false,'','calendar') as $row)
+		{
+			if ($row['cal_reference'])
+			{
+				// not the series entry itself
+				$related[$row['cal_id']] = $row['cal_reference'];
+			}
+		}
+		return $related;
+	}
+
+	/**
+	 * Gets the exception days of a given recurring event caused by
+	 * irregular participant stati
+	 *
+	 * @param array $event	Recurring Event.
+	 *
+	 * @return array		Array of exception days (false for non-recurring events).
+	 */
+	function get_recurrence_exceptions(&$event)
+	{
+		$cal_id = (int) $event['id'];
+		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
+
+		$days = array();
+
+		$participants = $this->get_participants($event['id'], 0);
+
+		// Check if the stati for all participants are identical for all recurrences
+		foreach ($participants as $uid => $attendee)
+		{
+			switch ($attendee['type'])
+			{
+				case 'u':	// account
+				case 'c':	// contact
+				case 'e':	// email address
+					$recurrences = $this->get_recurrences($event['id'], $uid);
+					foreach ($recurrences as $recur_date => $recur_status)
+					{
+						if ($recur_date && $recur_status != $recurrences[0])
+						{
+							// Every distinct status results in an exception
+							$days[] = $recur_date;
+						}
+					}
+					break;
+				default: // We don't handle the rest
+					break;
+			}
+		}
+		$days = array_unique($days);
+		sort($days);
+		return $days;
+	}
+
 }

From 332901742bed18834cfc2e81df93f3188db83f9f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 16 Jul 2009 08:02:37 +0000
Subject: [PATCH 481/510] "- document and clearify option: required mimetype or
 regular expression for mimetype to match, eg. '/^text\//i' for all text files
 - unset onchange, if $id is empty"

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

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index fd0a9e6725..717e5e0b58 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -25,6 +25,7 @@
  *   value is either a vfs path or colon separated $app:$id:$relative_path, eg: infolog:123:special/offer
  *   if empty($id) / new entry, file is created in a hidden temporary directory in users home directory
  *   and calling app is responsible to move content of that dir to entry directory, after entry is saved
+ *   option: required mimetype or regular expression for mimetype to match, eg. '/^text\//i' for all text files
  *
  * All widgets accept as value a full path.
  * vfs-mime and vfs itself also allow an array with values like stat (incl. 'path'!) as value.
@@ -90,7 +91,7 @@ class vfs_widget
 
 		switch($type)
 		{
-			case 'vfs-upload':		// option: allowed mime types (regular expression) if limited
+			case 'vfs-upload':		// option: required mimetype or regular expression for mimetype to match, eg. '/^text\//i' for all text files
 				if (empty($value) && preg_match('/^exec.*\[([^]]+)\]$/',$form_name,$matches))	// if no value via content array, use widget name
 				{
 					$value = $matches[1].$matches[2];
@@ -104,6 +105,7 @@ class vfs_widget
 						static $tmppath = array();	// static var, so all vfs-uploads get created in the same temporary dir
 						if (!isset($tmppath[$app])) $tmppath[$app] = '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.'.$app.'_'.md5(time().session_id());
 						$value = $tmppath[$app];
+						unset($cell['onchange']);	// no onchange, if we have to use a temporary dir
 					}
 					else
 					{
@@ -419,10 +421,8 @@ class vfs_widget
 		if (!empty($extension_data['mimetype']))
 		{
 			$type = etemplate::get_array($_FILES['exec']['type'],$name);
-			$is_preg = $extension_data['mimetype'][0] == '/' || $extension_data['mimetype'] != preg_quote($extension_data['mimetype']);
-			//echo "<p>preg_quote('{$extension_data['mimetype']}')='".preg_quote($extension_data['mimetype'])."' --> is_preg=".array2string($is_preg)."</p>\n";
-			if (!$is_preg && strcasecmp($extension_data['mimetype'],$type) ||
-				$is_preg && !preg_match($extension_data['mimetype'][0]=='/'?$extension_data['mimetype']:'/'.$extension_data['mimetype'].'/',$type))
+			$is_preg = $extension_data['mimetype'][0] == '/';
+			if (!$is_preg && strcasecmp($extension_data['mimetype'],$type) || $is_preg && !preg_match($extension_data['mimetype'],$type))
 			{
 				etemplate::set_validation_error($name,lang('File is of wrong type (%1 != %2)!',$type,$extension_data['mimetype']));
 				return false;

From 2cfa5530c3beb70fd4a1030e75bda70235593ee7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 16 Jul 2009 12:57:00 +0000
Subject: [PATCH 482/510] "if path ends in a slash, multiple files can be
 uploaded, their original filename is kept then"

---
 etemplate/inc/class.vfs_widget.inc.php | 125 ++++++++++++++++++-------
 1 file changed, 90 insertions(+), 35 deletions(-)

diff --git a/etemplate/inc/class.vfs_widget.inc.php b/etemplate/inc/class.vfs_widget.inc.php
index 717e5e0b58..ba43649a58 100644
--- a/etemplate/inc/class.vfs_widget.inc.php
+++ b/etemplate/inc/class.vfs_widget.inc.php
@@ -22,10 +22,11 @@
  * - vfs-uid  aka File owner:       Owner of file, or 'root' if none
  * - vfs-gid  aka File group:       Group of file, or 'root' if none
  * - vfs-upload aka VFS file:       displays either download and delete (x) links or a file upload
- *   value is either a vfs path or colon separated $app:$id:$relative_path, eg: infolog:123:special/offer
- *   if empty($id) / new entry, file is created in a hidden temporary directory in users home directory
- *   and calling app is responsible to move content of that dir to entry directory, after entry is saved
- *   option: required mimetype or regular expression for mimetype to match, eg. '/^text\//i' for all text files
+ *   + value is either a vfs path or colon separated $app:$id:$relative_path, eg: infolog:123:special/offer
+ *   + if empty($id) / new entry, file is created in a hidden temporary directory in users home directory
+ *     and calling app is responsible to move content of that dir to entry directory, after entry is saved
+ *   + option: required mimetype or regular expression for mimetype to match, eg. '/^text\//i' for all text files
+ *   + if path ends in a slash, multiple files can be uploaded, their original filename is kept then
  *
  * All widgets accept as value a full path.
  * vfs-mime and vfs itself also allow an array with values like stat (incl. 'path'!) as value.
@@ -94,7 +95,7 @@ class vfs_widget
 			case 'vfs-upload':		// option: required mimetype or regular expression for mimetype to match, eg. '/^text\//i' for all text files
 				if (empty($value) && preg_match('/^exec.*\[([^]]+)\]$/',$form_name,$matches))	// if no value via content array, use widget name
 				{
-					$value = $matches[1].$matches[2];
+					$value = $matches[1];
 				}
 				$extension_data = array('value' => $value, 'mimetype' => $cell['size'], 'type' => $type);
 				if ($value[0] != '/')
@@ -114,31 +115,10 @@ class vfs_widget
 					if (!empty($relpath)) $value .= '/'.$relpath;
 				}
 				$path = $extension_data['path'] = $value;
-				if (self::file_exists($path))	// display download link and delete icon
+				if (substr($path,-1) != '/' && self::file_exists($path) && !egw_vfs::is_dir($path))	// display download link and delete icon
 				{
 					$extension_data['path'] = $path;
-					$value = empty($cell['label']) ? basename($path) : lang($cell['label']);	// display (translated) Label or filename (if label empty)
-
-					$vfs_link = etemplate::empty_cell('label',$cell['name'],array(
-						'size' => ','.egw_vfs::download_url($path).',,,,,'.$path,
-					));
-					// if dir is writable, add delete link
-					if (egw_vfs::is_writable(egw_vfs::dirname($path)))
-					{
-						$cell = etemplate::empty_cell('hbox','',array('size' => ',,0,0'));
-						etemplate::add_child($cell,$vfs_link);
-						$delete_icon = etemplate::empty_cell('button',$path,array(
-							'label' => 'delete',
-							'size'  => 'delete',	// icon
-							'onclick' => "return confirm('Delete this file');",
-							'span' => ',leftPad5',
-						));
-						etemplate::add_child($cell,$delete_icon);
-					}
-					else
-					{
-						$cell = $vfs_link;
-					}
+					$cell = $this->file_widget($value,$path,$cell['name'],$cell['label']);
 				}
 				else	// file does NOT exists --> display file upload
 				{
@@ -157,6 +137,24 @@ class vfs_widget
 						$cell['help'] = lang('Allowed file type: %1',$type);
 					}
 				}
+				// check if directory (trailing slash) is given --> upload of multiple files
+				if (substr($path,-1) == '/' && egw_vfs::file_exists($path) && ($files = egw_vfs::scandir($path)))
+				{
+					//echo $path; _debug_array($files);
+					$upload = $cell;
+					$cell = etemplate::empty_cell('box','',array('size' => ',,0,0'));
+					$extension_data['files'] = $files;
+					$value = array();
+					foreach($files as $file)
+					{
+						$file = $path.$file;
+						$basename = basename($file);
+						unset($widget);
+						$widget = $this->file_widget($value[$basename],$file,$upload['name']."[$basename]");
+						etemplate::add_child($cell,$widget);
+					}
+					etemplate::add_child($cell,$upload);
+				}
 				break;
 
 			case 'vfs-size':	// option: add size in bytes in brackets
@@ -331,10 +329,45 @@ class vfs_widget
 			default:
 				$value = 'Not yet implemented';
 		}
-
 		return true;
 	}
 
+	/**
+	 * Create widget with download and delete (only if dir is writable) link
+	 *
+	 * @param mixed &$value
+	 * @param string $path vfs path of download
+	 * @param string $name name of widget
+	 * @param string $label=null label, if not set basename($path) is used
+	 * @return array
+	 */
+	static function file_widget(&$value,$path,$name,$label=null)
+	{
+		$value = empty($label) ? basename($path) : lang($label);	// display (translated) Label or filename (if label empty)
+
+		$vfs_link = etemplate::empty_cell('label',$name,array(
+			'size' => ','.egw_vfs::download_url($path).',,,_blank,,'.$path,
+		));
+		// if dir is writable, add delete link
+		if (egw_vfs::is_writable(egw_vfs::dirname($path)))
+		{
+			$cell = etemplate::empty_cell('hbox','',array('size' => ',,0,0'));
+			etemplate::add_child($cell,$vfs_link);
+			$delete_icon = etemplate::empty_cell('button',$path,array(
+				'label' => 'delete',
+				'size'  => 'delete',	// icon
+				'onclick' => "return confirm('Delete this file');",
+				'span' => ',leftPad5',
+			));
+			etemplate::add_child($cell,$delete_icon);
+		}
+		else
+		{
+			$cell = $vfs_link;
+		}
+		return $cell;
+	}
+
 	/**
 	 * Check if vfs file exists *without* using the extension
 	 *
@@ -393,9 +426,24 @@ class vfs_widget
 		//echo '<p>'.__METHOD__."('$name',".array2string($value).','.array2string($extension_data).",$loop,,".array2string($value_in)."</p>\n";
 
 		// check if delete icon clicked
-		if ($_POST['submit_button'] == str_replace($extension_data['value'],$extension_data['path'],$name))
+		if ($_POST['submit_button'] == ($fname = str_replace($extension_data['value'],$extension_data['path'],$name)) ||
+			substr($extension_data['path'],-1) == '/' && substr($_POST['submit_button'],0,strlen($fname)-1) == substr($fname,0,-1))
 		{
-			if (!egw_vfs::remove($extension_data['path']))
+			if (substr($extension_data['path'],-1) == '/')	// multiple files?
+			{
+				foreach($extension_data['files'] as $file)	// check of each single file, to not allow deleting of arbitrary files
+				{
+					if ($_POST['submit_button'] == substr($fname,0,-1).$file.']')
+					{
+						if (!egw_vfs::unlink($extension_data['path'].$file))
+						{
+							etemplate::set_validation_error($name,lang('Error deleting %1!',$extension_data['path'].$file));
+						}
+						break;
+					}
+				}
+			}
+			elseif (!egw_vfs::unlink($extension_data['path']))
 			{
 				etemplate::set_validation_error($name,lang('Error deleting %1!',$extension_data['path']));
 			}
@@ -429,11 +477,18 @@ class vfs_widget
 			}
 		}
 		$path = $extension_data['path'];
-		// add extension to path
-		$parts = explode('.',$filename);
-		if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))	// really an extension --> add it to path
+		if (substr($path,-1) != '/')
 		{
-			$path .= '.'.$extension;
+			// add extension to path
+			$parts = explode('.',$filename);
+			if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))	// really an extension --> add it to path
+			{
+				$path .= '.'.$extension;
+			}
+		}
+		else	// multiple upload with dir given (trailing slash)
+		{
+			$path .= $filename;
 		}
 		if (!egw_vfs::file_exists($dir = egw_vfs::dirname($path)) && !egw_vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
 		{

From a5ff2eb03710995f60454c145c68500fd844c63c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 16 Jul 2009 16:05:40 +0000
Subject: [PATCH 483/510] fix for invalid category ids, eg. delete categories

---
 addressbook/inc/class.addressbook_bo.inc.php   | 4 ++--
 addressbook/inc/class.addressbook_vcal.inc.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index 33f067f65d..6f11157080 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -1468,9 +1468,9 @@ class addressbook_bo extends addressbook_so
 		$cat_list = array();
 		foreach($cat_id_list as $cat_id)
 		{
-			if ($cat_data = $this->categories->return_single($cat_id))
+			if ($cat_id && ($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
 			{
-				$cat_list[] = $cat_data[0]['name'];
+				$cat_list[] = $cat_name;
 			}
 		}
 
diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index 113af384cb..7b954521e1 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -231,9 +231,8 @@ class addressbook_vcal extends addressbook_bo
 						break;
 
 					case 'cat_id':
-						if (!empty($value))
+						if (!empty($value) && ($values = $this->get_categories($value)))
 						{
-							$values = &$this->get_categories($value);
 							$values = (array) $GLOBALS['egw']->translation->convert($values, $sysCharSet, $_charset);
 							$value = implode(',', $values); // just for the CHARSET recognition
 							if(($extra_charset_attribute || $this->productName == 'kde')

From 99eaf8921bd4c5c362ba28ef4a1b3db9b340cf31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Thu, 16 Jul 2009 19:40:02 +0000
Subject: [PATCH 484/510] Enable FN again

---
 .../inc/class.addressbook_vcal.inc.php        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index 7b954521e1..d23d64be91 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -900,22 +900,22 @@ class addressbook_vcal extends addressbook_bo
 								'adr_two_postalcode','adr_two_countryname'),
 			'BDAY'			=> array('bday'),
 			'X-CLASS'		=> array('private'),
-			'CATEGORIES'		=> array('cat_id'),
-			'EMAIL;WORK'		=> array('email'),
-			'EMAIL;HOME'		=> array('email_home'),
-			'N'			=> array('n_family','n_given','n_middle',
+			'CATEGORIES'	=> array('cat_id'),
+			'EMAIL;WORK'	=> array('email'),
+			'EMAIL;HOME'	=> array('email_home'),
+			'N'				=> array('n_family','n_given','n_middle',
 								'n_prefix','n_suffix'),
-			#'FN'			=> array('n_fn'),
+			'FN'			=> array('n_fn'),
 			'NOTE'			=> array('note'),
 			'ORG'			=> array('org_name','org_unit'),
-			'TEL;CELL;WORK'		=> array('tel_cell'),
-			'TEL;CELL;HOME'		=> array('tel_cell_private'),
+			'TEL;CELL;WORK'	=> array('tel_cell'),
+			'TEL;CELL;HOME'	=> array('tel_cell_private'),
 			'TEL;CAR'		=> array('tel_car'),
 			'TEL;OTHER'		=> array('tel_other'),
 			'TEL;WORK'		=> array('tel_work'),
-			'TEL;FAX;WORK'		=> array('tel_fax'),
+			'TEL;FAX;WORK'	=> array('tel_fax'),
 			'TEL;HOME'		=> array('tel_home'),
-			'TEL;FAX;HOME'		=> array('tel_fax_home'),
+			'TEL;FAX;HOME'	=> array('tel_fax_home'),
 			'TEL;PAGER'		=> array('tel_pager'),
 			'TITLE'			=> array('title'),
 			'URL;WORK'		=> array('url'),
@@ -924,7 +924,7 @@ class addressbook_vcal extends addressbook_bo
 			'NICKNAME'		=> array('label'),
 			'FBURL'			=> array('freebusy_uri'),
 			'PHOTO'			=> array('jpegphoto'),
-			'X-ASSISTANT'		=> array('assistent'),
+			'X-ASSISTANT'	=> array('assistent'),
 			'X-ASSISTANT-TEL'	=> array('tel_assistent'),
 			'UID'			=> array('uid'),
 		);

From 9f377914c92c4f252422eb6039ae6b4805f16077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Thu, 16 Jul 2009 19:42:50 +0000
Subject: [PATCH 485/510] fix recurrence exception issue

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

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index c1bc53e8fe..9f865f89c5 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -912,13 +912,16 @@ class calendar_ical extends calendar_boupdate
 						if (($egw_event = $this->read($event['uid']))
 							&& $egw_event['recur_type'] != MCAL_RECUR_NONE)
 						{
-							$unchanged = true;
+							// Same start and duration is obligatory for status only
+							$old_duration = $egw_event['end'] - $egw_event['start'];
+							$new_duration = $event['end'] - $event['start'];
+							$unchanged = ($event['start'] == $recur_date && $old_duration == $new_duration);
 							foreach (array('uid','owner','title','description',
 								'location','priority','public','special','non_blocking') as $key)
 							{
 								//Horde::logMessage('importVCAL test ' .$key . ': '. $egw_event[$key] . ' == ' .$event[$key],
 								//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
-								if (!empty($event[$key]) //|| !empty($egw_event[$key]))
+								if (!$unchanged && !empty($event[$key]) //|| !empty($egw_event[$key]))
 									&& $egw_event[$key] != $event[$key])
 								{
 									$unchanged = false;
@@ -930,7 +933,6 @@ class calendar_ical extends calendar_boupdate
 								Horde::logMessage('importVCAL event unchanged',
 									__FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-								// We can handle this without an exception entry
 								$recur_exceptions = array();
 								foreach ($egw_event['recur_exception'] as $recur_exception)
 								{
@@ -941,9 +943,10 @@ class calendar_ical extends calendar_boupdate
 										$recur_exceptions[] = $recur_exception;
 									}
 								}
+								$egw_event['recur_exception'] = $recur_exceptions;
 								//Horde::logMessage("importVCAL exceptions\n" . print_r($recur_exceptions, true),
 								//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
-								$egw_event['recur_exception'] = $recur_exceptions;
+
 								$this->update($egw_event, true);
 
 								// update the stati from the exception

From 0e3f456fe1186dac7675e9a499d46d31a66f07e5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Jul 2009 10:15:22 +0000
Subject: [PATCH 486/510] "RECURRENCE-ID: $event['reference'] is a calendar_id,
 not a timestamp"

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

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 9f865f89c5..c1d9c970f1 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -568,9 +568,12 @@ class calendar_ical extends calendar_boupdate
 							}
 							elseif ($event['reference'])
 							{
-								if ($this->isWholeDay($event))
+								// $event['reference'] is a calendar_id, not a timestamp
+								$revent = $this->read($event['reference']);
+
+								if ($this->isWholeDay($revent))
 								{
-									$arr = $this->date2array($event['reference']);
+									$arr = $this->date2array($revent['start']);
 									$vevent->setAttribute('RECURRENCE-ID', array(
 										'year' => $arr['year'],
 										'month' => $arr['month'],
@@ -582,13 +585,14 @@ class calendar_ical extends calendar_boupdate
 								{
 									if ($servertime)
 									{
-										$attributes['RECURRENCE-ID'] = date('Ymd\THis', $event['reference']);
+										$attributes['RECURRENCE-ID'] = date('Ymd\THis', $revent['start']);
 									}
 									else
 									{
-										$attributes['RECURRENCE-ID'] = $event['reference'];
+										$attributes['RECURRENCE-ID'] = $revent['start'];
 									}
 								}
+								unset($revent);
 							}
 							break;
 

From b6f0321b526aed1fd7e8902e01b64323aa71e93f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 17 Jul 2009 10:32:57 +0000
Subject: [PATCH 487/510] prevent using the numeric value of a group or user
 twice, by checking if it already exists for both sides

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

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index c8fbcc9dba..56fd084d11 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -1081,7 +1081,7 @@ class accounts_ldap
 		{
 			$account_id = (int) $GLOBALS['egw']->common->next_id($type,$min,$max);
 		}
-		while ($account_id && $this->frontend->exists($sign * $account_id));	// check need to include the sign!
+		while ($account_id && ($this->frontend->exists($sign * $account_id) || $this->frontend->exists(-1 * $sign * $account_id)));	// check need to include the sign!
 
 		if	(!$account_id || $this->frontend->config['account_max_id'] &&
 			$account_id > $this->frontend->config['account_max_id'])

From d3e2130c2502bd6c5df708acca8bf9db8ddcedf7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Jul 2009 11:29:15 +0000
Subject: [PATCH 488/510] removed depricated assignment by reference

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

diff --git a/calendar/inc/class.calendar_sif.inc.php b/calendar/inc/class.calendar_sif.inc.php
index 13ae2c6fc0..ccf33b5655 100644
--- a/calendar/inc/class.calendar_sif.inc.php
+++ b/calendar/inc/class.calendar_sif.inc.php
@@ -322,7 +322,7 @@ class calendar_sif extends calendar_boupdate
 				}
 			}
 
-			$vcal		= &new Horde_iCalendar('1.0');
+			$vcal		= new Horde_iCalendar('1.0');
 
 
 			$sifEvent = self::xml_decl . "\n<appointment>" . self::SIF_decl;

From 81a4097818bbccf2994cc4cc5b19b13a8c4e361f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Jul 2009 11:29:45 +0000
Subject: [PATCH 489/510] removed depricated assignment by reference

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

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 069e1cfeb3..c77c477e43 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -586,7 +586,7 @@ ORDER BY cal_user_type, cal_usre_id
 		if (isset($event['recur_type']))
 		{
 			// save the original start
-			$min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchSingle();
+			$min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
 
 			if (isset($event['recur_exception']) && is_array($event['recur_exception']) && count($event['recur_exception']))
 			{
@@ -607,7 +607,7 @@ ORDER BY cal_user_type, cal_usre_id
 				    $event['recur_type'] != $old_recur['recur_type'] || $event['recur_data'] != $old_recur['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_recur['recur_interval'] || $event['recur_enddate'] != $old_recur['recur_enddate'] ||
 					count(array_diff($old_exceptions,$event['recur_exception']));	// exception deleted or added
-				$max = (int) $this->db->select($this->dates_table,'MAX(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchSingle();
+				$max = (int) $this->db->select($this->dates_table,'MAX(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
 			} else {
 				$max = 0;
 			}

From 86db825cbf56278ec466a29869c37c56a77aa80c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Jul 2009 12:08:45 +0000
Subject: [PATCH 490/510] "more RECURRENCE-ID stuff: - disabling it on import,
 as we cant overwrite a cal_id with a timestamp - fixing it on export, finding
 the closest exception to return it - using array_merge to merge virtual and
 real exceptions, as + overwrites numeric keys"

---
 calendar/inc/class.calendar_ical.inc.php | 79 +++++++++++++++---------
 1 file changed, 50 insertions(+), 29 deletions(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index c1d9c970f1..2d2a0baa3b 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -137,7 +137,8 @@ class calendar_ical extends calendar_boupdate
 	 *
 	 * @param array $_clientProperties		client properties
 	 */
-	function __construct(&$_clientProperties = array()) {
+	function __construct(&$_clientProperties = array())
+	{
 		parent::__construct();
 
 		$this->clientProperties = $_clientProperties;
@@ -161,7 +162,7 @@ class calendar_ical extends calendar_boupdate
 		$egwSupportedFields = array(
 			'CLASS'			=> array('dbName' => 'public'),
 			'SUMMARY'		=> array('dbName' => 'title'),
-			'DESCRIPTION'	=> array('dbName' => 'description'),
+			'DESCRIPTION'		=> array('dbName' => 'description'),
 			'LOCATION'		=> array('dbName' => 'location'),
 			'DTSTART'		=> array('dbName' => 'start'),
 			'DTEND'			=> array('dbName' => 'end'),
@@ -171,9 +172,9 @@ class calendar_ical extends calendar_boupdate
 			'EXDATE'		=> array('dbName' => 'recur_exception'),
 			'PRIORITY'		=> array('dbName' => 'priority'),
 			'TRANSP'		=> array('dbName' => 'non_blocking'),
-			'CATEGORIES'	=> array('dbName' => 'category'),
+			'CATEGORIES'		=> array('dbName' => 'category'),
 			'UID'			=> array('dbName' => 'uid'),
-			'RECURRENCE-ID' => array('dbName' => 'reference'),
+			'RECURRENCE-ID' 	=> array('dbName' => 'reference'),
 		);
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
@@ -456,33 +457,37 @@ class calendar_ical extends calendar_boupdate
 						case 'EXDATE':
 							if ($event['recur_type'] == MCAL_RECUR_NONE) break;
 							$days = array();
-							$participants = $this->so->get_participants($event['id'], 0);
-
-							// Check if the stati for all participants are identical for all recurrences
-							foreach ($participants as $uid => $attendee)
+							// dont use "virtual" exceptions created by participant status for GroupDAV or file export
+							if (!in_array($this->productManufacturer,array('file','groupdav')))
 							{
-								switch ($attendee['type'])
+								$participants = $this->so->get_participants($event['id'], 0);
+
+								// Check if the stati for all participants are identical for all recurrences
+								foreach ($participants as $uid => $attendee)
 								{
-									case 'u':	// account
-									case 'c':	// contact
-									case 'e':	// email address
-										$recurrences = $this->so->get_recurrences($event['id'], $uid);
-										foreach ($recurrences as $rdate => $recur_status)
-										{
-											if ($rdate && $recur_status != $recurrences[0])
+									switch ($attendee['type'])
+									{
+										case 'u':	// account
+										case 'c':	// contact
+										case 'e':	// email address
+											$recurrences = $this->so->get_recurrences($event['id'], $uid);
+											foreach ($recurrences as $rdate => $recur_status)
 											{
-												// Every distinct status results in an exception
-												$days[] = $rdate;
+												if ($rdate && $recur_status != $recurrences[0])
+												{
+													// Every distinct status results in an exception
+													$days[] = $rdate;
+												}
 											}
-										}
-										break;
-									default: // We don't handle the rest
-										break;
+											break;
+										default: // We don't handle the rest
+											break;
+									}
 								}
 							}
 							if (is_array($event['recur_exception']))
 							{
-								$days = $days + $event['recur_exception'];
+								$days = array_merge($days,$event['recur_exception']);	// can NOT use +, as it overwrites numeric indexes
 							}
 							if (!empty($days))
 							{
@@ -569,11 +574,24 @@ class calendar_ical extends calendar_boupdate
 							elseif ($event['reference'])
 							{
 								// $event['reference'] is a calendar_id, not a timestamp
-								$revent = $this->read($event['reference']);
+								if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+
+								// find recur_exception closest to $event['start'],
+								// as our db-model does NOT store for which recurrence the exception is
+								$exception_start = $exception_diff = null;
+								foreach($revent['recur_exception'] as $exception)
+								{
+									if (!isset($exception_start) || $exception_diff > abs($exception-$event['start']))
+									{
+										$exception_start = $exception;
+										$exception_diff = abs($exception-$event['start']);
+									}
+								}
+								if (!isset($exception_start)) break;	// referenced event has no exception
 
 								if ($this->isWholeDay($revent))
 								{
-									$arr = $this->date2array($revent['start']);
+									$arr = $this->date2array($exception_start);
 									$vevent->setAttribute('RECURRENCE-ID', array(
 										'year' => $arr['year'],
 										'month' => $arr['month'],
@@ -585,11 +603,11 @@ class calendar_ical extends calendar_boupdate
 								{
 									if ($servertime)
 									{
-										$attributes['RECURRENCE-ID'] = date('Ymd\THis', $revent['start']);
+										$attributes['RECURRENCE-ID'] = date('Ymd\THis', $exception_start);
 									}
 									else
 									{
-										$attributes['RECURRENCE-ID'] = $revent['start'];
+										$attributes['RECURRENCE-ID'] = $exception_start;
 									}
 								}
 								unset($revent);
@@ -778,6 +796,7 @@ class calendar_ical extends calendar_boupdate
 		$Ok = false;	// returning false, if file contains no components
 
 		$vcal = new Horde_iCalendar;
+		error_log(__LINE__.__METHOD__.__FILE__.print_r($_vcalData,true));
 		if (!$vcal->parsevCalendar($_vcalData))
 		{
 			return $Ok;
@@ -822,7 +841,7 @@ class calendar_ical extends calendar_boupdate
 
  				if ($event['recur_type'] != MCAL_RECUR_NONE)
  				{
- 					// No RECCURENCE-ID for series events
+ 					// No RECURRENCE-ID for series events
  					$event['reference'] = 0;
  				}
 
@@ -1528,7 +1547,9 @@ class calendar_ical extends calendar_boupdate
 					$vcardData['end']		= $dtend_ts;
 					break;
 				case 'RECURRENCE-ID':
-					$vcardData['reference']	= $attributes['value'];
+					// event['reference'] is a cal_id, not a date!
+					// setting it to a date makes no sense, not setting it keeps an existing correct reference
+					//$vcardData['reference']	= $attributes['value'];
 					break;
 				case 'LOCATION':
 					$vcardData['location']	= $attributes['value'];

From e77ed49566703bfa0fbab8e60819a39320fe42e8 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Fri, 17 Jul 2009 14:49:19 +0000
Subject: [PATCH 491/510] so class STEP1: reverted wrong recurrence rebuild
 with $max. fixed not working move() method for egw_cal_user. fixed
 participant status orphans

---
 calendar/inc/class.calendar_so.inc.php | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index c77c477e43..d3a903f4b6 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -606,11 +606,9 @@ ORDER BY cal_user_type, cal_usre_id
 				$set_recurrences = (isset($event['cal_start']) && (int)$min != (int) $event['cal_start']) ||
 				    $event['recur_type'] != $old_recur['recur_type'] || $event['recur_data'] != $old_recur['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_recur['recur_interval'] || $event['recur_enddate'] != $old_recur['recur_enddate'] ||
-					count(array_diff($old_exceptions,$event['recur_exception']));	// exception deleted or added
-				$max = (int) $this->db->select($this->dates_table,'MAX(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
-			} else {
-				$max = 0;
+					count(array_diff($old_exceptions,$event['recur_exception']));	// exception deleted (jaytraxx: handling this better follows soon)
 			}
+			
 			$event['recur_exception'] = empty($event['recur_exception']) ? null : implode(',',$event['recur_exception']);
 			unset($event[0]);	// unset the 'etag=etag+1', as it's not in the repeats table
 			if($event['recur_type'] != MCAL_RECUR_NONE)
@@ -623,21 +621,16 @@ ORDER BY cal_user_type, cal_usre_id
 			}
 			if ($set_recurrences)
 			{
-				if ((int)$min != (int)$event['cal_start'])
-				{
-					// We need to reset all recurrences
-					$max = -1;
-				}
 				// delete all, but the lowest dates record
 				$this->db->delete($this->dates_table,array(
 					'cal_id' => $cal_id,
 					'cal_start > '.(int)$min,
 				),__LINE__,__FILE__,'calendar');
 
-				// delete all user-records, with recur-date > old enddate
+				// delete all user-records, with recur-date != 0
 				$this->db->delete($this->user_table,array(
 					'cal_id' => $cal_id,
-					'cal_recur_date > '.(int)$max,
+					'cal_recur_date != 0',
 				),__LINE__,__FILE__,'calendar');
 			}
 		}
@@ -753,7 +746,7 @@ ORDER BY cal_user_type, cal_usre_id
 		{
 			// move the recur-date of the participants
 			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
-				((int)$change_since ? '>= '.(int)$change_since : '!= 0') + " ORDER BY cal_recur_date DESC",__LINE__,__FILE__);
+				((int)$change_since ? '>= '.(int)$change_since : '!= 0') . " ORDER BY cal_recur_date DESC",__LINE__,__FILE__);
 		}
 		if ($move_start || $move_end)
 		{
@@ -830,7 +823,6 @@ ORDER BY cal_user_type, cal_usre_id
 		if ($change_since !== false)	// existing entries only
 		{
 			// delete not longer set participants
-			$where[0] = 'cal_recur_date=0';
 			$deleted = array();
 			foreach($this->db->select($this->user_table,'DISTINCT cal_user_type,cal_user_id,cal_quantity',$where,
 				__LINE__,__FILE__,false,'','calendar') as $row)
@@ -848,7 +840,6 @@ ORDER BY cal_user_type, cal_usre_id
 					unset($participants[$uid]);	// we don't touch them
 				}
 			}
-			unset($where[0]);
 
 			if (count($deleted))
 			{

From 3d1cb839cec26b0a917bf59b58e281e3a1073e80 Mon Sep 17 00:00:00 2001
From: Christian Binder <christian@jaytraxx.de>
Date: Fri, 17 Jul 2009 17:16:34 +0000
Subject: [PATCH 492/510] so class STEP2: re-insert recurrences for deleted
 exceptions manually to avoid the forced rebuild of all recurrences and states

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

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index d3a903f4b6..309de5558e 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -585,12 +585,15 @@ ORDER BY cal_user_type, cal_usre_id
 		// write information about recuring event, if recur_type is present in the array
 		if (isset($event['recur_type']))
 		{
-			// save the original start
-			$min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+			// fetch information about the currently saved (old) event
+			$old_min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+			$old_duration = (int) $this->db->select($this->dates_table,'MIN(cal_end)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn() - $old_min;
+			$old_repeats = $this->db->select($this->repeats_table,'*',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			$old_exceptions = $old_repeats['recur_exception'] ? explode(',',$old_repeats['recur_exception']) : array();
 
 			if (isset($event['recur_exception']) && is_array($event['recur_exception']) && count($event['recur_exception']))
 			{
-				// delete the execeptions from the user and dates table, it could be the first time
+				// added and existing exceptions: delete the execeptions from the user and dates table, it could be the first time
 				$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
 				$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
 			}
@@ -598,15 +601,32 @@ ORDER BY cal_user_type, cal_usre_id
 			{
 				$event['recur_exception'] = array();
 			}
+
+			// deleted exceptions: re-insert recurrences into the user and dates table
+			if(count($deleted_exceptions = array_diff($old_exceptions,$event['recur_exception'])))
+			{
+				foreach($deleted_exceptions as $id => $deleted_exception)
+				{
+					// rebuild participants for the re-inserted recurrence
+					$participants = array();
+					$participants_only = $this->get_participants($cal_id); // participants without states
+					foreach($participants_only as $id => $participant_only)
+					{
+						$states = $this->get_recurrences($cal_id, $participant_only['uid']);
+						$participants[$participant_only['uid']] = $states[0]; // insert main status as default
+					}
+					$this->recurrence($cal_id, $deleted_exception, $deleted_exception + $old_duration, $participants);
+				}
+			}
+
 			if (!$set_recurrences)
 			{
 				// check if the recurrence-information changed
-				$old_recur = $this->db->select($this->repeats_table,'*',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
-				$old_exceptions = $old_recur['recur_exception'] ? explode(',',$old_recur['recur_exception']) : array();
-				$set_recurrences = (isset($event['cal_start']) && (int)$min != (int) $event['cal_start']) ||
-				    $event['recur_type'] != $old_recur['recur_type'] || $event['recur_data'] != $old_recur['recur_data'] ||
-					(int)$event['recur_interval'] != (int)$old_recur['recur_interval'] || $event['recur_enddate'] != $old_recur['recur_enddate'] ||
-					count(array_diff($old_exceptions,$event['recur_exception']));	// exception deleted (jaytraxx: handling this better follows soon)
+				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) ||
+				    $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
+					(int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] ||
+					$event['recur_enddate'] != $old_repeats['recur_enddate'];
+				 // ToDo jaytraxx: manually handle recur_enddate change without recurrences rebuild
 			}
 			
 			$event['recur_exception'] = empty($event['recur_exception']) ? null : implode(',',$event['recur_exception']);
@@ -624,7 +644,7 @@ ORDER BY cal_user_type, cal_usre_id
 				// delete all, but the lowest dates record
 				$this->db->delete($this->dates_table,array(
 					'cal_id' => $cal_id,
-					'cal_start > '.(int)$min,
+					'cal_start > '.(int)$old_min,
 				),__LINE__,__FILE__,'calendar');
 
 				// delete all user-records, with recur-date != 0

From 8fb60be7d766973e45af0724c73d5729ddd8ad96 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 09:12:52 +0000
Subject: [PATCH 493/510] checking if attachment or attachment dir exists,
 before trying to delete it, to quieten warning, also improved warning to be
 precise if file does not exist, is no directory, or permission missing

---
 phpgwapi/inc/class.egw_link.inc.php             | 6 +++---
 phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index fafa46e973..8d37279be9 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -827,12 +827,12 @@ class egw_link extends solink
 		}
 		if (self::DEBUG)
 		{
-			echo "<p>egw_link::delete_attached('$app','$id','$fname') url=$url</p>\n";
+			echo '<p>'.__METHOD__."('$app','$id','$fname') url=$url</p>\n";
 		}
-		if (($Ok = egw_vfs::remove($url,true)) && ((int)$app > 0 || $fname))
+		if (($Ok = !file_exists($url) || egw_vfs::remove($url,true)) && ((int)$app > 0 || $fname))
 		{
 			// try removing the dir, in case it's empty
-			@rmdir(egw_vfs::dirname($url));
+			@egw_vfs::rmdir(egw_vfs::dirname($url));
 		}
 		if (!is_null($current_is_root))
 		{
diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 8622932dd1..480cbe8318 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -695,10 +695,12 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 			!egw_vfs::check_access($parent,egw_vfs::WRITABLE))
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$options) (type=$type) permission denied!");
+			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' :
+				($stat['mime'] != self::DIR_MIME_TYPE ? 'not a directory!' : 'permission denied!'));
+			if (self::LOG_LEVEL) error_log($err_msg);
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
-				trigger_error(__METHOD__."('$url',$options) (type=$type) permission denied!",E_USER_WARNING);
+				trigger_error($err_msg,E_USER_WARNING);
 			}
 			return false;	// no permission or file does not exist
 		}

From e1a25587c8d9271b557e532023c3e9d45766bbe9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 10:00:33 +0000
Subject: [PATCH 494/510] update from 1.6.002

---
 phpgwapi/setup/tables_update.inc.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index acc596f248..e599dd90e5 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -28,6 +28,11 @@ function phpgwapi_upgrade1_6_001()
 	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
 }
 
+function phpgwapi_upgrade1_6_002()
+{
+	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
+}
+
 function phpgwapi_upgrade1_7_001()
 {
 	$GLOBALS['egw_setup']->oProc->AddColumn('egw_sqlfs','fs_link',array(

From 10006c16ec7bddc1c7332d6b4848a13f36075e55 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 12:15:20 +0000
Subject: [PATCH 495/510] "Fix for bug #1992 from Hans-Juergen Tappe: The
 sitemgr login module does not cleanup session."

---
 login.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/login.php b/login.php
index 73476c1d30..907390d9aa 100755
--- a/login.php
+++ b/login.php
@@ -34,6 +34,19 @@ else
 	exit;
 }
 
+/*
+ * Destroy any existing anonymous session.
+ * Copied from logout.php. Maybe make it a common function?
+ */
+if(isset($GLOBALS['sitemgr_info']) && $GLOBALS['egw_info']['user']['userid'] == $GLOBALS['sitemgr_info']['anonymous_user'])
+{
+	if($GLOBALS['egw']->session->verify())
+	{
+		$GLOBALS['egw']->hooks->process('logout');
+		$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'],$GLOBALS['kp3']);
+	}
+}
+
 // CAS :
 if($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
 {

From 67913ad1922bf3828fc483b048bb933ec930b368 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 12:22:14 +0000
Subject: [PATCH 496/510] "Fix for bug #1891: CAS auth seems to fail"

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

diff --git a/login.php b/login.php
index 907390d9aa..cef2d33175 100755
--- a/login.php
+++ b/login.php
@@ -93,7 +93,7 @@ if($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
 
 	$login = phpCAS::getUser();
 	$password = phpCAS::retrievePT("imap://".$GLOBALS['egw_info']['server']['mail_server'],$err_code,$output);
-	$GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($login,$password,'text','u');
+	$GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($login,$password,'text');
 
 	/* set auth_cookie */
 	$GLOBALS['egw']->redirect_link($forward,$extra_vars);

From 48538a6ced363c55c7f1b4432d1be52d5424911e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 18 Jul 2009 12:31:00 +0000
Subject: [PATCH 497/510] Give higher levels a chance to avoid QP

---
 phpgwapi/inc/horde/Horde/iCalendar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/horde/Horde/iCalendar.php b/phpgwapi/inc/horde/Horde/iCalendar.php
index d0aecd085e..8eb38e6d89 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar.php
@@ -1062,12 +1062,12 @@ class Horde_iCalendar {
                     // or QUOTED-PRINTABLE encoded. Currently we use
                     // QUOTED-PRINTABLE as default.
                     if (preg_match("/[^\x20-\x7F]/", $value) &&
-                        empty($params['ENCODING']))  {
+                        !isset($params['ENCODING']))  {
                         $params['ENCODING'] = 'QUOTED-PRINTABLE';
                         $params_str .= ';ENCODING=QUOTED-PRINTABLE';
                         // Add CHARSET as well. At least the synthesis client
                         // gets confused otherwise
-                        if (empty($params['CHARSET'])) {
+                        if (!isset($params['CHARSET'])) {
                             $params['CHARSET'] = NLS::getCharset();
                             $params_str .= ';CHARSET=' . $params['CHARSET'];
                         }

From cdb601da56a6686047eeedafc3732299dae093fc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 12:33:52 +0000
Subject: [PATCH 498/510] "Fix for bug #1885: egw_db->row doesn't work as
 expected reverted r25031, as it returns the first record with numeric indexes
 (it's anyway a depricated function)"

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

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index aa9b67281a..902fbb96ad 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -958,7 +958,17 @@ class egw_db
 		{
 			return False;
 		}
-		return $strip ? self::strip_array_keys($this->Record,$strip) : $this->Record;
+		$result = array();
+		foreach($this->Record as $column => $value)
+		{
+			if (!is_numeric($column))
+			{
+				if ($strip) $column = str_replace($strip,'',$column);
+
+				$result[$column] = $value;
+			}
+		}
+		return $result;
 	}
 
 	/**

From 3fdb693e359aadf14300b3539695cb5b67d46a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 18 Jul 2009 12:40:58 +0000
Subject: [PATCH 499/510] Fix whole day events

---
 calendar/inc/class.calendar_sif.inc.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/calendar/inc/class.calendar_sif.inc.php b/calendar/inc/class.calendar_sif.inc.php
index ccf33b5655..582895f602 100644
--- a/calendar/inc/class.calendar_sif.inc.php
+++ b/calendar/inc/class.calendar_sif.inc.php
@@ -134,9 +134,18 @@ class calendar_sif extends calendar_boupdate
 					if($value == 1) {
 						$finalEvent['whole_day'] = true;
 						$startParts = explode('-',$this->event['start']);
-						$finalEvent['start'] = mktime(0, 0, 0, $startParts[1], $startParts[2], $startParts[0]);
+						$finalEvent['start']['hour'] = $finalEvent['start']['minute'] = $finalEvent['start']['second'] = 0;
+						$finalEvent['start']['year'] = $startParts[0];
+						$finalEvent['start']['month'] = $startParts[1];
+						$finalEvent['start']['day'] = $startParts[2];
+						$finalEvent['start'] = $this->date2ts($finalEvent['start']);
 						$endParts = explode('-',$this->event['end']);
-						$finalEvent['end'] = mktime(23, 59, 59, $endParts[1], $endParts[2], $endParts[0]);
+						$finalEvent['end']['hour'] = 23; $finalEvent['end']['minute'] = $finalEvent['end']['second'] = 59;
+						$finalEvent['end']['hour'] = $finalEvent['start']['minute'] = $finalEvent['start']['second'] = 0;
+						$finalEvent['end']['year'] = $endParts[0];
+						$finalEvent['end']['month'] = $endParts[1];
+						$finalEvent['end']['day'] = $endParts[2];
+						$finalEvent['end'] = $this->date2ts($finalEvent['end']);
 					}
 					break;
 

From 52dbb060d27705ae5450432789277a04ec09e799 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 12:44:38 +0000
Subject: [PATCH 500/510] "Fix for bug #2111: xml_functions.inc.php calls to an
 undefined method as suggested by Igor Blanco"

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

diff --git a/phpgwapi/inc/xml_functions.inc.php b/phpgwapi/inc/xml_functions.inc.php
index 76a37a75e1..dab7bb2cd6 100644
--- a/phpgwapi/inc/xml_functions.inc.php
+++ b/phpgwapi/inc/xml_functions.inc.php
@@ -191,12 +191,12 @@
 	* into their equivalent 'charset entity'. Charset entities enumerated this way
 	* are independent of the charset encoding used to transmit them, and all XML
 	* parsers are bound to understand them.
-	* 
+	*
 	* @author Eugene Pivnev
 	*/
 	function xmlrpc_encode_entities($data)
 	{
-		return htmlspecialchars($data,ENT_QUOTES,$GLOBALS['egw']->translation->system_charset ? 
+		return htmlspecialchars($data,ENT_QUOTES,$GLOBALS['egw']->translation->system_charset ?
 			$GLOBALS['egw']->translation->system_charset : 'latin1');
 	}
 
@@ -789,7 +789,7 @@
 
 		if($server_name)
 		{
-			list($sessionid,$kp3) = $GLOBALS['egw']->session->create_server($username.'@'.$server_name,$password,"text");
+			list($sessionid,$kp3) = $GLOBALS['egw']->session->create($username.'@'.$server_name,$password,"text");
 		}
 		else
 		{

From a34f7faec52218cd31cb0e030f5ed4ea2163b5ef Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 12:57:21 +0000
Subject: [PATCH 501/510] Fix for bug #2074 + #2075: Postgres update error to
 1.6

---
 phpgwapi/setup/tables_update_1_4.inc.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/phpgwapi/setup/tables_update_1_4.inc.php b/phpgwapi/setup/tables_update_1_4.inc.php
index 2ba3866a58..cbee8a1dfc 100644
--- a/phpgwapi/setup/tables_update_1_4.inc.php
+++ b/phpgwapi/setup/tables_update_1_4.inc.php
@@ -92,21 +92,27 @@ $test[] = '1.5.003';
 function phpgwapi_upgrade1_5_003()
 {
 	// import the current egw_vfs into egw_sqlfs
-	// ToDo: moving /infolog and /infolog/$app to /apps in the files dir!!!
 	$debug = $GLOBALS['DEBUG'];
 
-	// delete the table in case this update runs multiple times
-	$GLOBALS['egw_setup']->db->query('DELETE FROM egw_sqlfs',__LINE__,__FILE__);
-	if ($GLOBALS['egw_setup']->db->Type == 'mysql')
-	{
-		$GLOBALS['egw_setup']->db->query('ALTER TABLE egw_sqlfs  AUTO_INCREMENT=1',__LINE__,__FILE__);
-	}
 	// make sure the required dirs are there and have the following id's
 	$dirs = array(
 		'/' => 1,
 		'/home' => 2,
 		'/apps' => 3,
 	);
+
+	// delete the table in case this update runs multiple times
+	$GLOBALS['egw_setup']->db->query('DELETE FROM egw_sqlfs',__LINE__,__FILE__);
+	
+	if ($GLOBALS['egw_setup']->db->Type == 'mysql')
+	{
+		$GLOBALS['egw_setup']->db->query('ALTER TABLE egw_sqlfs  AUTO_INCREMENT=1',__LINE__,__FILE__);
+	}
+	elseif ( $GLOBALS['egw_setup']->db->Type == 'pgsql' )
+	{
+		$GLOBALS['egw_setup']->db->query('ALTER SEQUENCE egw_sqlfs_fs_id_seq RESTART WITH '.(count($dirs) + 1),__LINE__,__FILE__); 
+	}
+
 	foreach($dirs as $path => $id)
 	{
 		$nrow = array(
@@ -127,7 +133,8 @@ function phpgwapi_upgrade1_5_003()
 		);
 		$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
 	}
-	$query = $GLOBALS['egw_setup']->db->select('egw_vfs','*',"vfs_mime_type != 'journal' AND vfs_mime_type != 'journal-deleted'",__LINE__,__FILE__,false,'ORDER BY length(vfs_directory) ASC','phpgwapi');
+	
+	$query = $GLOBALS['egw_setup']->db->select('egw_vfs','*',"vfs_mime_type != 'journal' AND vfs_mime_type != 'journal-deleted'",__LINE__,__FILE__,false,'ORDER BY vfs_file_id ASC','phpgwapi');
 	if ($debug) echo "rows=<pre>\n";
 
 	foreach($query as $row)

From 89d848658388b8e5263cfbc354c887bbb496133a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 18 Jul 2009 13:11:43 +0000
Subject: [PATCH 502/510] Support of Funambol Outlook Sync Client

---
 .../inc/class.addressbook_vcal.inc.php        | 90 +++++++++++++++----
 1 file changed, 74 insertions(+), 16 deletions(-)

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index d23d64be91..d0d51cb481 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -128,6 +128,9 @@ class addressbook_vcal extends addressbook_bo
 		}
 		$sysCharSet = $GLOBALS['egw']->translation->charset();
 
+		// KAddressbook always requires non-ascii chars to be qprint encoded.
+		if ($this->productName == 'kde') $extra_charset_attribute = true;
+
 		if (!($entry = $this->read($_id)))
 		{
 			return false;
@@ -235,8 +238,7 @@ class addressbook_vcal extends addressbook_bo
 						{
 							$values = (array) $GLOBALS['egw']->translation->convert($values, $sysCharSet, $_charset);
 							$value = implode(',', $values); // just for the CHARSET recognition
-							if(($extra_charset_attribute || $this->productName == 'kde')
-									&& preg_match('/([\177-\377])/',$value))
+							if ($extra_charset_attribute && preg_match('/([\177-\377])/', $value))
 							{
 								$options['CHARSET'] = $_charset;
 								// KAddressbook requires non-ascii chars to be qprint encoded, other clients eg. nokia phones have trouble with that
@@ -244,6 +246,10 @@ class addressbook_vcal extends addressbook_bo
 								{
 									$options['ENCODING'] = 'QUOTED-PRINTABLE';
 								}
+								else
+								{
+									$options['ENCODING'] = '';
+								}
 							}
  							$hasdata++;
 						}
@@ -254,8 +260,9 @@ class addressbook_vcal extends addressbook_bo
 						{
 							if ($noTruncate)
 							{
-								Horde::logMessage("vCalAddressbook $vcardField omitted due to maximum size $size",
-										__FILE__, __LINE__, PEAR_LOG_WARNING);
+								error_log(__FILE__ . __LINE__ . __METHOD__ . " vCalAddressbook $vcardField omitted due to maximum size $size");
+								// Horde::logMessage("vCalAddressbook $vcardField omitted due to maximum size $size",
+								//		__FILE__, __LINE__, PEAR_LOG_WARNING);
 								continue;
 							}
 							// truncate the value to size
@@ -269,8 +276,9 @@ class addressbook_vcal extends addressbook_bo
 							{
 								$value = '';
 							}
-							Horde::logMessage("vCalAddressbook $vcardField truncated to maximum size $size",
-									__FILE__, __LINE__, PEAR_LOG_INFO);
+							error_log(__FILE__ . __LINE__ . __METHOD__ . " vCalAddressbook $vcardField truncated to maximum size $size");
+							//Horde::logMessage("vCalAddressbook $vcardField truncated to maximum size $size",
+							//		__FILE__, __LINE__, PEAR_LOG_INFO);
 						}
 						if (!empty($value) // required field
 							|| in_array($vcardField,array('FN','ORG','N'))
@@ -278,20 +286,32 @@ class addressbook_vcal extends addressbook_bo
 						{
 							$value = $GLOBALS['egw']->translation->convert(trim($value), $sysCharSet, $_charset);
 							$values[] = $value;
-							if(($extra_charset_attribute || $this->productName == 'kde')
-									&& preg_match('/([\177-\377])/',$value))
+							if ($extra_charset_attribute)
 							{
-								$options['CHARSET'] = $_charset;
-								// KAddressbook requires non-ascii chars to be qprint encoded, other clients eg. nokia phones have trouble with that
-								if ($this->productName == 'kde')
+								if (preg_match('/([\177-\377])/', $value))
+								{
+									$options['CHARSET'] = $_charset;
+									// KAddressbook requires non-ascii chars to be qprint encoded, other clients eg. nokia phones have trouble with that
+									if ($this->productName == 'kde')
+									{
+										$options['ENCODING'] = 'QUOTED-PRINTABLE';
+									}
+									else
+									{
+										$options['ENCODING'] = '';
+									}
+								}
+								// protect the CardDAV
+								if (preg_match('/([\000-\012\015\016\020-\037\075])/', $value))
 								{
 									$options['ENCODING'] = 'QUOTED-PRINTABLE';
 								}
 							}
-							// protect the CardDAV
-							elseif (($extra_charset_attribute && preg_match('/([\000-\012\015\016\020-\037\075])/',$value)))
+							else
 							{
-								$options['ENCODING'] = 'QUOTED-PRINTABLE';
+								// avoid that these options are inserted from horde code
+								$options['CHARSET'] = '';
+								$options['ENCODING'] = '';
 							}
 							if ($vcardField == 'TEL' && $entry['tel_prefer'] &&
 								($databaseField == $entry['tel_prefer']))
@@ -325,7 +345,10 @@ class addressbook_vcal extends addressbook_bo
 
 		$result = $vCard->exportvCalendar();
 
-		Horde::logMessage("vCalAddressbook getVCard:\n" . print_r($result, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+        error_log(__FILE__ . __LINE__ . __METHOD__ . ':'
+        	. str_replace(array("\n",'    '),'',print_r($result,true)));
+		// Horde::logMessage("vCalAddressbook getVCard:\n" . print_r($result, true),
+			// __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		return $result;
 	}
@@ -722,6 +745,35 @@ class addressbook_vcal extends addressbook_bo
 			//'PHOTO'		=> array('jpegphoto'),
 		);
 
+		$defaultFields[14] = array(	// Funambol Outlook Sync Client
+			'ADR;WORK'      => array('','','adr_one_street','adr_one_locality','adr_one_region',
+									'adr_one_postalcode','adr_one_countryname'),
+			'ADR;HOME'      => array('','','adr_two_street','adr_two_locality','adr_two_region',
+									'adr_two_postalcode','adr_two_countryname'),
+			'BDAY'		=> array('bday'),
+			'CATEGORIES'	=> array('cat_id'),
+			'EMAIL;INTERNET'         => array('email'),
+			'EMAIL;INTERNET;HOME'    => array('email_home'),
+			'N'		=> array('n_family','n_given','n_middle','n_prefix','n_suffix'),
+			'FN'			=> array('n_fn'),
+			'NOTE'          => array('note'),
+			'ORG'           => array('org_name','org_unit','room'),
+			'ROLE'			=> array('role'),
+			'CLASS'			=> array('private'),
+			'NICKNAME'		=> array('label'),
+			'TEL;CELL'      => array('tel_cell'),
+			'TEL;HOME;FAX'  => array('tel_fax_home'),
+			'TEL;WORK;FAX'  => array('tel_fax'),
+			'TEL;VOICE;HOME' => array('tel_home'),
+			'TEL;VOICE;WORK' => array('tel_work'),
+			'TEL;PAGER'     => array('tel_pager'),
+			'TEL;CAR;VOICE'	=> array('tel_car'),
+			'TITLE'         => array('title'),
+			'URL'      		=> array('url'),
+			'URL;HOME'		=> array('url_home'),
+			'PHOTO'			=> array('jpegphoto'),
+		);
+
 		//error_log("Client: $_productManufacturer $_productName");
 		switch ($this->productManufacturer)
 		{
@@ -740,6 +792,10 @@ class addressbook_vcal extends addressbook_bo
 						$this->supportedFields = $defaultFields[11];
 						break;
 
+					case 'outlook sync client v.':
+						$this->supportedFields = $defaultFields[14];
+						break;
+
 					default:
 						error_log("Funambol product '$this->productName', assuming same as thunderbird");
 						$this->supportedFields = $defaultFields[6];
@@ -770,6 +826,7 @@ class addressbook_vcal extends addressbook_bo
 					case 'e51':
 					case 'e90':
 					case 'e71':
+					case 'n95':
 						$this->supportedFields = $defaultFields[9];
 						break;
 					case '9300':
@@ -900,6 +957,7 @@ class addressbook_vcal extends addressbook_bo
 								'adr_two_postalcode','adr_two_countryname'),
 			'BDAY'			=> array('bday'),
 			'X-CLASS'		=> array('private'),
+			'CLASS'			=> array('private'),
 			'CATEGORIES'	=> array('cat_id'),
 			'EMAIL;WORK'	=> array('email'),
 			'EMAIL;HOME'	=> array('email_home'),
@@ -907,7 +965,7 @@ class addressbook_vcal extends addressbook_bo
 								'n_prefix','n_suffix'),
 			'FN'			=> array('n_fn'),
 			'NOTE'			=> array('note'),
-			'ORG'			=> array('org_name','org_unit'),
+			'ORG'			=> array('org_name','org_unit','room'),
 			'TEL;CELL;WORK'	=> array('tel_cell'),
 			'TEL;CELL;HOME'	=> array('tel_cell_private'),
 			'TEL;CAR'		=> array('tel_car'),

From d679a00d1d64fde8b144be68c56659b151c94714 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 13:14:13 +0000
Subject: [PATCH 503/510] "fix for bug #2112: fix maybe wrong case in username
 on login makes problems eg. in filemanager (name of homedir)"

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

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index f80865b2fb..089d699690 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -481,7 +481,6 @@ class egw_session
 			}
 			return false;
 		}
-
 		if (!$this->account_id && $GLOBALS['egw_info']['server']['auto_create_acct'])
 		{
 			if ($GLOBALS['egw_info']['server']['auto_create_acct'] == 'lowercase')
@@ -490,6 +489,12 @@ class egw_session
 			}
 			$this->account_id = $GLOBALS['egw']->accounts->auto_add($this->account_lid, $passwd);
 		}
+		// fix maybe wrong case in username, it makes problems eg. in filemanager (name of homedir)
+		if ($this->account_lid != ($lid = $GLOBALS['egw']->accounts->id2name($this->account_id)))
+		{
+			$this->account_lid = $lid;
+			$this->login = $lid.substr($this->login,strlen($lid));
+		}
 
 		$GLOBALS['egw_info']['user']['account_id'] = $this->account_id;
 		$GLOBALS['egw']->accounts->accounts($this->account_id);

From 947e09e02fa17163dbccc23f4b1d550f1a5aa25d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 15:17:41 +0000
Subject: [PATCH 504/510] "fix for bug: checking  \"whole query\" sets number
 of rows to -1"

---
 addressbook/inc/class.addressbook_ui.inc.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 2baf95f122..706deffc11 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -758,8 +758,14 @@ class addressbook_ui extends addressbook_bo
 		$do_email = $query['do_email'];
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
 
-		$old_state = $GLOBALS['egw']->session->appsession($what,'addressbook',$query);
-
+		if (!$id_only)
+		{
+			$old_state = $GLOBALS['egw']->session->appsession($what,'addressbook',$query);
+		}
+		else
+		{
+			$old_state = $GLOBALS['egw']->session->appsession($what,'addressbook');
+		}
 		if (!isset($this->org_views[(string) $query['org_view']]))   // we dont have an org view, unset the according col_filters
 		{
 			if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);

From e9a7336a35310fac59f8e038bb1fd82dd8f0f286 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 18 Jul 2009 15:35:42 +0000
Subject: [PATCH 505/510] "removed onclick alert"

---
 .../inc/class.customfields_widget.inc.php     | 416 +++++++++---------
 1 file changed, 209 insertions(+), 207 deletions(-)

diff --git a/etemplate/inc/class.customfields_widget.inc.php b/etemplate/inc/class.customfields_widget.inc.php
index f63bf0118b..3d8bc2f4f5 100644
--- a/etemplate/inc/class.customfields_widget.inc.php
+++ b/etemplate/inc/class.customfields_widget.inc.php
@@ -166,234 +166,236 @@ class customfields_widget
 		$n = 1;
 		foreach($fields as $lname => $field)
 		{
-		   if (!(array_search($lname,$fields_with_vals)===false))
-		   {
-			if ($stop_at_field && $lname == $stop_at_field) break;	// no further row necessary
+			if (array_search($lname,$fields_with_vals) !== false)
+			{
+				if ($stop_at_field && $lname == $stop_at_field) break;	// no further row necessary
 
-			// check if the customfield get's displayed for type $value, we can have multiple comma-separated types now
-			if (!empty($type2) && !empty($field['type2']) && strpos(','.$field['type2'].',',','.$type2.',') === false)
-			{
-				continue;	// not for our content type
-			}
-			$new_row = null; etemplate::add_child($cell,$new_row);
-			if ($type != 'customfields-list' && $type == 'customfields')
-			{
-				$row_class = 'row';
-				etemplate::add_child($cell,$label =& etemplate::empty_cell('label','',array(
-					'label' => $field['label'],
-					'no_lang' => substr(lang($field['label']),-1) == '*' ? 2 : 0,
-					'span' => $field['type'] === 'label' ? '2' : '',
-				)));
-			} elseif ($type == 'customfields-list') {
-				if (isset($value[$this->prefix.$lname]) && $value[$this->prefix.$lname] !== '') {
-					switch ((string)$field['type'])
-					{
-						case 'checkbox':
-							if ($value[$this->prefix.$lname]==0) break;
-						default:
-							etemplate::add_child($cell,$input =& etemplate::empty_cell('image','info.png',
-								array('label'=>/*lang("custom fields").": ".*/$field['label'],'width'=>"16px",
-									'onclick'=>"return alert('".lang("custom fields").": ".$field['label']."');")));
-					}
+				// check if the customfield get's displayed for type $value, we can have multiple comma-separated types now
+				if (!empty($type2) && !empty($field['type2']) && strpos(','.$field['type2'].',',','.$type2.',') === false)
+				{
+					continue;	// not for our content type
 				}
-			}
-
-			switch ((string)$field['type'])
-			{
-				case 'select' :
-					if (count($field['values']) == 1 && isset($field['values']['@']))
+				$new_row = null; etemplate::add_child($cell,$new_row);
+				if ($type != 'customfields-list' && $type == 'customfields')
+				{
+					$row_class = 'row';
+					etemplate::add_child($cell,$label =& etemplate::empty_cell('label','',array(
+						'label' => $field['label'],
+						'no_lang' => substr(lang($field['label']),-1) == '*' ? 2 : 0,
+						'span' => $field['type'] === 'label' ? '2' : '',
+					)));
+				}
+				elseif ($type == 'customfields-list')
+				{
+					if (isset($value[$this->prefix.$lname]) && $value[$this->prefix.$lname] !== '')
 					{
-						$field['values'] = $this->_get_options_from_file($field['values']['@']);
-					}
-					if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
-					foreach($field['values'] as $key => $val)
-					{
-						if (substr($val = lang($val),-1) != '*')
+						switch ((string)$field['type'])
 						{
-							$field['values'][$key] = $val;
+							case 'checkbox':
+								if ($value[$this->prefix.$lname]==0) break;
+							default:
+								etemplate::add_child($cell,$input =& etemplate::empty_cell('image','info.png',
+									array('label'=> $field['label'],'width'=>"16px")));
 						}
 					}
-					$input =& etemplate::empty_cell('select',$this->prefix.$lname,array(
-						'sel_options' => $field['values'],
-						'size'        => $field['rows'],
-						'no_lang'     => True,
-					));
-					if($this->advanced_search)
-					{
-						$select =& $input; unset($input);
-						$input =& etemplate::empty_cell('hbox');
-						etemplate::add_child($input, $select); unset($select);
-						/* the following seem to double the select fields in advanced search.
-						etemplate::add_child($input, etemplate::empty_cell('select',$this->prefix.$lname,array(
+				}
+
+				switch ((string)$field['type'])
+				{
+					case 'select' :
+						if (count($field['values']) == 1 && isset($field['values']['@']))
+						{
+							$field['values'] = $this->_get_options_from_file($field['values']['@']);
+						}
+						if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
+						foreach($field['values'] as $key => $val)
+						{
+							if (substr($val = lang($val),-1) != '*')
+							{
+								$field['values'][$key] = $val;
+							}
+						}
+						$input =& etemplate::empty_cell('select',$this->prefix.$lname,array(
 							'sel_options' => $field['values'],
 							'size'        => $field['rows'],
-							'no_lang'     => True
-						)));
-						*/
-					}
-					break;
-				case 'label' :
-					$row_class = 'th';
-					break;
-				case 'radio' :
-					$showthis = '#a#l#l#';
-					if (count($field['values']) == 1 && isset($field['values']['@']))
-					{
-						$field['values'] = $this->_get_options_from_file($field['values']['@']);
-					}
-					if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
-					if ($readonly) {
-						$showthis = $value[$this->prefix.$lname];
-						$input =& etemplate::empty_cell('hbox');
-					} else {
-						$input =& etemplate::empty_cell('groupbox');
-					}
-					$m = 0;
-					foreach ($field['values'] as $key => $val)
-					{
-						$radio = etemplate::empty_cell('radio',$this->prefix.$lname);
-						$radio['label'] = $val;
-						$radio['size'] = $key;
-						if ($showthis == '#a#l#l#' || $showthis == $key) etemplate::add_child($input,$radio);
-						unset($radio);
-					}
-					break;
-				case 'text' :
-				case 'textarea' :
-				case '' :	// not set
-					$field['len'] = $field['len'] ? $field['len'] : 20;
-					if ($type != 'customfields-list')
-					{
-						if($field['rows'] <= 1)
-						{//text
-							list($max,$shown) = explode(',',$field['len']);
-							$tmparray=array(
-								'size' => intval($shown > 0 ? $shown : $max).','.intval($max),
-								'maxlength'=>intval($max),
-							);
-							if (is_array($field['values']))
-							{
-								if (array_key_exists('readonly',$field['values']))
+							'no_lang'     => True,
+						));
+						if($this->advanced_search)
+						{
+							$select =& $input; unset($input);
+							$input =& etemplate::empty_cell('hbox');
+							etemplate::add_child($input, $select); unset($select);
+							/* the following seem to double the select fields in advanced search.
+							etemplate::add_child($input, etemplate::empty_cell('select',$this->prefix.$lname,array(
+								'sel_options' => $field['values'],
+								'size'        => $field['rows'],
+								'no_lang'     => True
+							)));
+							*/
+						}
+						break;
+					case 'label' :
+						$row_class = 'th';
+						break;
+					case 'radio' :
+						$showthis = '#a#l#l#';
+						if (count($field['values']) == 1 && isset($field['values']['@']))
+						{
+							$field['values'] = $this->_get_options_from_file($field['values']['@']);
+						}
+						if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
+						if ($readonly)
+						{
+							$showthis = $value[$this->prefix.$lname];
+							$input =& etemplate::empty_cell('hbox');
+						}
+						else
+						{
+							$input =& etemplate::empty_cell('groupbox');
+						}
+						$m = 0;
+						foreach ($field['values'] as $key => $val)
+						{
+							$radio = etemplate::empty_cell('radio',$this->prefix.$lname);
+							$radio['label'] = $val;
+							$radio['size'] = $key;
+							if ($showthis == '#a#l#l#' || $showthis == $key) etemplate::add_child($input,$radio);
+							unset($radio);
+						}
+						break;
+					case 'text' :
+					case 'textarea' :
+					case '' :	// not set
+						$field['len'] = $field['len'] ? $field['len'] : 20;
+						if ($type != 'customfields-list')
+						{
+							if($field['rows'] <= 1)
+							{//text
+								list($max,$shown) = explode(',',$field['len']);
+								$tmparray=array(
+									'size' => intval($shown > 0 ? $shown : $max).','.intval($max),
+									'maxlength'=>intval($max),
+								);
+								if (is_array($field['values']))
+								{
+									if (array_key_exists('readonly',$field['values']))
+									{
+										if(!$this->advanced_search) $tmparray['readonly']='readonly';
+									}
+								}
+								$input =& etemplate::empty_cell('text',$this->prefix.$lname,$tmparray);
+							}
+							else
+							{//textarea
+								$tmparray=array(
+									'size' => $field['rows'].($field['len'] >0 ? ','.(int)$field['len'] : '')
+								);
+								if (is_array($field['values']) && array_key_exists('readonly',$field['values']))
 								{
 									if(!$this->advanced_search) $tmparray['readonly']='readonly';
 								}
+								$input =& etemplate::empty_cell('textarea',$this->prefix.$lname,$tmparray);
 							}
-							$input =& etemplate::empty_cell('text',$this->prefix.$lname,$tmparray);
 						}
 						else
-						{//textarea
-							$tmparray=array(
-								'size' => $field['rows'].($field['len'] >0 ? ','.(int)$field['len'] : '')
-							);
-							if (is_array($field['values']) && array_key_exists('readonly',$field['values']))
+						{
+							$input =& etemplate::empty_cell('label',$this->prefix.$lname);
+						}
+						break;
+					case 'date':
+					case 'date-time':
+						$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname,array(
+							'size' => $field['len'] ? $field['len'] : ($field['type'] == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s'),
+						));
+						break;
+					case 'select-account':
+						list($opts) = explode('=',$field['values'][0]);
+						$input =& etemplate::empty_cell('select-account',$this->prefix.$lname,array(
+							'size' => ($field['rows']>1?$field['rows']:lang('None')).','.$opts,
+						));
+						break;
+					case 'button':  // button(s) to execute javascript (label=onclick) or textinputs (empty label, readonly with neg. length)
+						// a button does not seem to be helpful in advanced search ???,
+						if($this->advanced_search) break;
+						$input =& etemplate::empty_cell('hbox');
+						foreach($field['values'] as $label => $js)
+						{
+							if (!$label)    // display an readonly input
 							{
-								if(!$this->advanced_search) $tmparray['readonly']='readonly';
+								$tmparray = array(
+									'size' => $field['len'] ? $field['len'] : 20,
+									'readonly' => $field['len'] < 0,
+									'onchange' => $js,
+								);
+								$widget =& etemplate::empty_cell('text',$this->prefix.$lname.$label,$tmparray);
 							}
-							$input =& etemplate::empty_cell('textarea',$this->prefix.$lname,$tmparray);
+							else
+							{
+								if ($readonly) continue;        // dont display buttons if we're readonly
+								$widget =& etemplate::empty_cell('buttononly',$this->prefix.$lname.$label,array(
+									'label' => $label ? $label : lang('Submit'),
+									'onclick' => $js,
+									'no_lang' => True
+								));
+							}
+							etemplate::add_child($input,$widget);
+							unset($widget);
 						}
-					} else {
-						$input =& etemplate::empty_cell('label',$this->prefix.$lname,
-							array(
-								'onclick'=>"return alert('".lang("custom fields").": ".
-									$lname."=>".htmlentities(str_replace("\r","",str_replace("\n"," ",$value[$this->prefix.$lname]))) ."');",
-							)
-						);
-					}
-					break;
-				case 'date':
-				case 'date-time':
-					$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname,array(
-						'size' => $field['len'] ? $field['len'] : ($field['type'] == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s'),
-					));
-					break;
-				case 'select-account':
-					list($opts) = explode('=',$field['values'][0]);
-					$input =& etemplate::empty_cell('select-account',$this->prefix.$lname,array(
-						'size' => ($field['rows']>1?$field['rows']:lang('None')).','.$opts,
-					));
-					break;
-				case 'button':  // button(s) to execute javascript (label=onclick) or textinputs (empty label, readonly with neg. length)
-					// a button does not seem to be helpful in advanced search ???, 
-					if($this->advanced_search) break;
-					$input =& etemplate::empty_cell('hbox');
-					foreach($field['values'] as $label => $js)
+						break;
+					case 'url-email':
+						list($max,$shown,$validation_type,$default) = explode(',',$field['len'],4);
+						if (empty($max)) $max =128;
+						if (empty($shown)) $shown = 28;
+						if (empty($validation_type)) $validation_type = 1;
+						$field['len'] = implode(',',array($shown, $max, $validation_type, $default));
+						$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname,array(
+							'size' => $field['len']
+						));
+						break;
+					case 'url':
+					case 'url-phone':
+						list($max,$shown,$validation_type) = explode(',',$field['len'],3);
+						if (empty($max)) $max =128;
+						if (empty($shown)) $shown = 28;
+						$field['len']=implode(',',array( $shown, $max, $validation_type));
+						$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname,array(
+							 'size' => $field['len']
+						));
+						break;
+					// other etemplate types, which are used just as is
+					case 'checkbox' :
+						$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname);
+						break;
+					case 'link-entry':
+					default :	// link-entry to given app
+						$input =& etemplate::empty_cell('link-entry',$this->prefix.$lname,array(
+							'size' => $field['type'] == 'link-entry' ? '' : $field['type'],
+						));
+				}
+				$cell['data'][0]['c'.$n++] = $row_class.',top';
+
+				if (!is_null($input))
+				{
+					if ($readonly) $input['readonly'] = true;
+
+					if ($cell['needed']) $input['needed'] = $cell['needed'];
+
+					if (!empty($field['help']) && $row_class != 'th')
 					{
-						if (!$label)    // display an readonly input
-						{
-							$tmparray = array(
-								'size' => $field['len'] ? $field['len'] : 20,
-								'readonly' => $field['len'] < 0,
-								'onchange' => $js,
-							);
-							$widget =& etemplate::empty_cell('text',$this->prefix.$lname.$label,$tmparray);
-						}
-						else
-						{
-							if ($readonly) continue;        // dont display buttons if we're readonly
-							$widget =& etemplate::empty_cell('buttononly',$this->prefix.$lname.$label,array(
-								'label' => $label ? $label : lang('Submit'),
-								'onclick' => $js,
-								'no_lang' => True
-							));
-						}
-						etemplate::add_child($input,$widget);
-						unset($widget);
+						$input['help'] = $field['help'];
+						$input['no_lang'] = substr(lang($help),-1) == '*' ? 2 : 0;
 					}
-					break;
-				case 'url-email':
-					list($max,$shown,$validation_type,$default) = explode(',',$field['len'],4);
-					if (empty($max)) $max =128;
-					if (empty($shown)) $shown = 28;
-					if (empty($validation_type)) $validation_type = 1;
-					$field['len'] = implode(',',array($shown, $max, $validation_type, $default));
-					$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname,array(
-						'size' => $field['len']
-					));
-					break;
-				case 'url':
-				case 'url-phone':
-					list($max,$shown,$validation_type) = explode(',',$field['len'],3);
-					if (empty($max)) $max =128;
-					if (empty($shown)) $shown = 28;
-					$field['len']=implode(',',array( $shown, $max, $validation_type));
-					$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname,array(
-						 'size' => $field['len']
-					));
-					break;
-				// other etemplate types, which are used just as is
-				case 'checkbox' :
-					$input =& etemplate::empty_cell($field['type'],$this->prefix.$lname);
-					break;
-				case 'link-entry':
-				default :	// link-entry to given app
-					$input =& etemplate::empty_cell('link-entry',$this->prefix.$lname,array(
-						'size' => $field['type'] == 'link-entry' ? '' : $field['type'],
-					));
-			}
-			$cell['data'][0]['c'.$n++] = $row_class.',top';
-
-			if (!is_null($input))
-			{
-				if ($readonly) $input['readonly'] = true;
-
-				if ($cell['needed']) $input['needed'] = $cell['needed'];
-
-				if (!empty($field['help']) && $row_class != 'th')
-				{
-					$input['help'] = $field['help'];
-					$input['no_lang'] = substr(lang($help),-1) == '*' ? 2 : 0;
+					if ($singlefield)	// a single field, can & need to be returned instead of the cell (no grid)
+					{
+						$cell = $input;
+						if ($type == 'customfields') $cell['label'] = $field['label'];
+						return true;
+					}
+					etemplate::add_child($cell,$input);
+					unset($input);
 				}
-				if ($singlefield)	// a single field, can & need to be returned instead of the cell (no grid)
-				{
-					$cell = $input;
-					if ($type == 'customfields') $cell['label'] = $field['label'];
-					return true;
-				}
-				etemplate::add_child($cell,$input);
-				unset($input);
+				unset($label);
 			}
-			unset($label);
-		   }
 		}
 		if ($type != 'customfields-list')
 		{

From 91f0b9ad9dd9581cefbbe3c4787a3abe5a7d2d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 18 Jul 2009 18:00:39 +0000
Subject: [PATCH 506/510] Empty ENCODING and CHARSET

---
 phpgwapi/inc/horde/Horde/iCalendar.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/horde/Horde/iCalendar.php b/phpgwapi/inc/horde/Horde/iCalendar.php
index 8eb38e6d89..6144a3c5f2 100644
--- a/phpgwapi/inc/horde/Horde/iCalendar.php
+++ b/phpgwapi/inc/horde/Horde/iCalendar.php
@@ -891,9 +891,12 @@ class Horde_iCalendar {
             if ($params) {
                 foreach ($params as $param_name => $param_value) {
                     /* Skip CHARSET for iCalendar 2.0 data, not allowed. */
-                    if ($param_name == 'CHARSET' && !$this->isOldFormat()) {
+                    if ($param_name == 'CHARSET' && (!$this->isOldFormat() || empty($param_value))) {
                         continue;
                     }
+                    if ($param_name == 'ENCODING' && empty($param_value)) {
+                    	continue;
+                    }
                     /* Skip VALUE=DATE for vCalendar 1.0 data, not allowed. */
                     if ($this->isOldFormat() &&
                         $param_name == 'VALUE' && $param_value == 'DATE') {

From 71dfd3b2bb19cd14fa6139656c6e0b81c6e7372d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 18 Jul 2009 22:36:44 +0000
Subject: [PATCH 507/510] Fix SIF Parser

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

diff --git a/calendar/inc/class.calendar_sif.inc.php b/calendar/inc/class.calendar_sif.inc.php
index 582895f602..bb8d5cd60f 100644
--- a/calendar/inc/class.calendar_sif.inc.php
+++ b/calendar/inc/class.calendar_sif.inc.php
@@ -101,6 +101,7 @@ class calendar_sif extends calendar_boupdate
 
 	function siftoegw($_sifdata) {
 		$vcal		= new Horde_iCalendar;
+		$this->event = array();
 		$finalEvent	= array();
 		$sysCharSet	= $GLOBALS['egw']->translation->charset();
 		#error_log($sifData);

From 81afb6f8e90d4aa404126f917b9b5d7c58e50dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 18 Jul 2009 23:02:31 +0000
Subject: [PATCH 508/510] Fix Funambol Outlook Client Issues

---
 .../inc/class.addressbook_vcal.inc.php        | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index d0d51cb481..e2ce7a7c1c 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -1014,24 +1014,15 @@ class addressbook_vcal extends addressbook_bo
 		#error_log(print_r($vcardValues, true));
 		Horde::logMessage("vCalAddressbook vcardtoegw: " . print_r($vcardValues, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
-		$email = 0;
+		$email = 1;
 		$tel = 1;
 		$cell = 1;
-		$url = 0;
+		$url = 1;
 		$pref_tel = false;
 
 		foreach($vcardValues as $key => $vcardRow)
 		{
 			$rowName  = strtoupper($vcardRow['name']);
-			switch ($rowName)
-			{
-				case 'EMAIL':
-					$email++;
-					break;
-				case 'URL':
-					$url++;
-					break;
-			}
 			if ($vcardRow['value'] == ''  && implode('', $vcardRow['values']) == '')
 			{
 				unset($vcardRow);
@@ -1095,7 +1086,7 @@ class addressbook_vcal extends addressbook_bo
 						break;
 						//case 'INTERNET':
 					case 'PREF':
-						if (strtoupper($vcardRow['name']) == 'TEL')
+						if (strtoupper($vcardRow['name']) == 'TEL' && !$pref_tel)
 						{
 							$pref_tel = $key;
 						}
@@ -1114,13 +1105,18 @@ class addressbook_vcal extends addressbook_bo
 						$rowName = 'TEL;CAR';
 						break;
 					default:
+						if (strpos($pname, 'X-FUNAMBOL-') === 0)
+						{
+							// Propriatary Funambol extension will be ignored
+							$rowName .= ';' . $pname;
+						}
 						break;
 				}
 			}
 
 			if($rowName == 'EMAIL')
 			{
-				$rowName .= ';X-egw-Ref' . $email;
+				$rowName .= ';X-egw-Ref' . $email++;
 			}
 
 			if(($rowName == 'TEL;CELL') ||
@@ -1137,7 +1133,7 @@ class addressbook_vcal extends addressbook_bo
 
 			if($rowName == 'URL')
 			{
-				$rowName = 'URL;X-egw-Ref' . $url;
+				$rowName = 'URL;X-egw-Ref' . $url++;
 			}
 
 			$rowNames[$rowName] = $key;

From 367d2b5ad66a62c3740246108b80a377f21922a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 19 Jul 2009 20:05:06 +0000
Subject: [PATCH 509/510] Keep Field Order

---
 .../inc/class.addressbook_vcal.inc.php        | 113 ++++++++++--------
 1 file changed, 65 insertions(+), 48 deletions(-)

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index e2ce7a7c1c..2f3d9b7b94 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -951,40 +951,40 @@ class addressbook_vcal extends addressbook_bo
 
 
 		$databaseFields = array(
-			'ADR;WORK'		=> array('','','adr_one_street','adr_one_locality','adr_one_region',
-								'adr_one_postalcode','adr_one_countryname'),
-			'ADR;HOME'		=> array('','','adr_two_street','adr_two_locality','adr_two_region',
-								'adr_two_postalcode','adr_two_countryname'),
-			'BDAY'			=> array('bday'),
-			'X-CLASS'		=> array('private'),
-			'CLASS'			=> array('private'),
-			'CATEGORIES'	=> array('cat_id'),
-			'EMAIL;WORK'	=> array('email'),
-			'EMAIL;HOME'	=> array('email_home'),
-			'N'				=> array('n_family','n_given','n_middle',
-								'n_prefix','n_suffix'),
-			'FN'			=> array('n_fn'),
-			'NOTE'			=> array('note'),
-			'ORG'			=> array('org_name','org_unit','room'),
-			'TEL;CELL;WORK'	=> array('tel_cell'),
-			'TEL;CELL;HOME'	=> array('tel_cell_private'),
-			'TEL;CAR'		=> array('tel_car'),
-			'TEL;OTHER'		=> array('tel_other'),
-			'TEL;WORK'		=> array('tel_work'),
-			'TEL;FAX;WORK'	=> array('tel_fax'),
-			'TEL;HOME'		=> array('tel_home'),
-			'TEL;FAX;HOME'	=> array('tel_fax_home'),
-			'TEL;PAGER'		=> array('tel_pager'),
-			'TITLE'			=> array('title'),
-			'URL;WORK'		=> array('url'),
-			'URL;HOME'		=> array('url_home'),
-			'ROLE'			=> array('role'),
-			'NICKNAME'		=> array('label'),
-			'FBURL'			=> array('freebusy_uri'),
-			'PHOTO'			=> array('jpegphoto'),
-			'X-ASSISTANT'	=> array('assistent'),
+			'ADR;WORK'			=> array('','','adr_one_street','adr_one_locality','adr_one_region',
+									'adr_one_postalcode','adr_one_countryname'),
+			'ADR;HOME'			=> array('','','adr_two_street','adr_two_locality','adr_two_region',
+									'adr_two_postalcode','adr_two_countryname'),
+			'BDAY'				=> array('bday'),
+			'X-CLASS'			=> array('private'),
+			'CLASS'				=> array('private'),
+			'CATEGORIES'		=> array('cat_id'),
+			'EMAIL;WORK'		=> array('email'),
+			'EMAIL;HOME'		=> array('email_home'),
+			'N'					=> array('n_family','n_given','n_middle',
+									'n_prefix','n_suffix'),
+			'FN'				=> array('n_fn'),
+			'NOTE'				=> array('note'),
+			'ORG'				=> array('org_name','org_unit','room'),
+			'TEL;CELL;WORK'		=> array('tel_cell'),
+			'TEL;CELL;HOME'		=> array('tel_cell_private'),
+			'TEL;CAR'			=> array('tel_car'),
+			'TEL;OTHER;VOICE'	=> array('tel_other'),
+			'TEL;VOICE;WORK'	=> array('tel_work'),
+			'TEL;FAX;WORK'		=> array('tel_fax'),
+			'TEL;HOME;VOICE'	=> array('tel_home'),
+			'TEL;FAX;HOME'		=> array('tel_fax_home'),
+			'TEL;PAGER'			=> array('tel_pager'),
+			'TITLE'				=> array('title'),
+			'URL;WORK'			=> array('url'),
+			'URL;HOME'			=> array('url_home'),
+			'ROLE'				=> array('role'),
+			'NICKNAME'			=> array('label'),
+			'FBURL'				=> array('freebusy_uri'),
+			'PHOTO'				=> array('jpegphoto'),
+			'X-ASSISTANT'		=> array('assistent'),
 			'X-ASSISTANT-TEL'	=> array('tel_assistent'),
-			'UID'			=> array('uid'),
+			'UID'				=> array('uid'),
 		);
 
 		Horde::logMessage("vCalAddressbook vcardtoegw:\n$_vcard", __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1154,11 +1154,13 @@ class addressbook_vcal extends addressbook_bo
 			switch($rowName)
 			{
 				case 'ADR':
-					if (!isset($rowNames[$rowName . ';WORK']))
+					if (!isset($rowNames[$rowName . ';WORK'])
+							&& !isset($finalRowNames[$rowName . ';WORK']))
 					{
 						$finalRowNames[$rowName . ';WORK'] = $vcardKey;
 					}
-					elseif (!isset($rowNames[$rowName . ';HOME']))
+					elseif (!isset($rowNames[$rowName . ';HOME'])
+							&& !isset($finalRowNames[$rowName . ';HOME']))
 					{
 						$finalRowNames[$rowName . ';HOME'] = $vcardKey;
 					}
@@ -1171,38 +1173,53 @@ class addressbook_vcal extends addressbook_bo
 					}
 					elseif (!isset($rowNames['TEL;FAX;HOME'])
 						&& !isset($finalRowNames['TEL;FAX;HOME']))
-						{
+					{
 						$finalRowNames['TEL;FAX;HOME'] = $vcardKey;
-						}
+					}
 					break;
-				case 'TEL;VOICE;WORK':
-					$finalRowNames['TEL;WORK'] = $vcardKey;
+				case 'TEL;WORK':
+					if (!isset($rowNames['TEL;VOICE;WORK'])
+							&& !isset($finalRowNames['TEL;VOICE;WORK']))
+					{
+						$finalRowNames['TEL;VOICE;WORK'] = $vcardKey;
+					}
 					break;
-				case 'TEL;HOME;VOICE':
-					$finalRowNames['TEL;HOME'] = $vcardKey;
+				case 'TEL;HOME':
+					if (!isset($rowNames['TEL;HOME;VOICE'])
+							&& !isset($finalRowNames['TEL;HOME;VOICE']))
+					{
+						$finalRowNames['TEL;HOME;VOICE'] = $vcardKey;
+					}
 					break;
-				case 'TEL;OTHER;VOICE':
-					$finalRowNames['TEL;OTHER'] = $vcardKey;
+				case 'TEL;OTHER':
+				    if (!isset($rowNames['TEL;OTHER;VOICE'])
+							&& !isset($finalRowNames['TEL;OTHER;VOICE']))
+					{
+						$finalRowNames['TEL;OTHER;VOICE'] = $vcardKey;
+					}
 					break;
 				case 'TEL;CAR;VOICE':
 				case 'TEL;CAR;CELL':
 				case 'TEL;CAR;CELL;VOICE':
-					$finalRowNames['TEL;CAR'] = $vcardKey;
+					if (!isset($finalRowNames['TEL;CAR']))
+					{
+						$finalRowNames['TEL;CAR'] = $vcardKey;
+					}
 					break;
 				case 'TEL;X-egw-Ref1':
 					if (!isset($rowNames['TEL;VOICE;WORK'])
 							&& !isset($rowNames['TEL;WORK'])
-							&& !isset($finalRowNames['TEL;WORK']))
+							&& !isset($finalRowNames['TEL;VOICE;WORK']))
 					{
-						$finalRowNames['TEL;WORK'] = $vcardKey;
+						$finalRowNames['TEL;VOICE;WORK'] = $vcardKey;
 						break;
 					}
 				case 'TEL;X-egw-Ref2':
 					if (!isset($rowNames['TEL;HOME;VOICE'])
 							&& !isset($rowNames['TEL;HOME'])
-							&& !isset($finalRowNames['TEL;HOME']))
+							&& !isset($finalRowNames['TEL;HOME;VOICE']))
 					{
-						$finalRowNames['TEL;HOME'] = $vcardKey;
+						$finalRowNames['TEL;HOME;VOICE'] = $vcardKey;
 					}
 					break;
 				case 'TEL;CELL;X-egw-Ref1':

From ba346ab68b40002b2758b5962163bb039ae14add Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 20 Jul 2009 07:30:34 +0000
Subject: [PATCH 510/510] "replaced split with preg_split"

---
 doc/rpm-build/checkout-build-archives.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index 0425ce6b14..e4d562fde2 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -63,11 +63,11 @@ while(($arg = array_shift($argv)))
 			case 'run':
 				if ($value[0] == '+')
 				{
-					$config[$name] = array_unique(array_merge($config['name'],split('[ ,]+',$value)));
+					$config[$name] = array_unique(array_merge($config['name'],preg_split('/[ ,]+/',$value)));
 				}
 				elseif ($value[0] == '-')
 				{
-					$config[$name] = array_diff($config['name'],split('[ ,]+',$value));
+					$config[$name] = array_diff($config['name'],preg_split('/[ ,]+/',$value));
 				}
 				else
 				{